diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po
index 12df09fb44b..5ace728ad48 100644
--- a/addons/account/i18n/hu.po
+++ b/addons/account/i18n/hu.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-09 07:08+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-21 08:15+0000\n"
+"Last-Translator: Dukai Gábor <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -4442,7 +4442,7 @@ msgstr ""
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_unreconciled
 msgid "Receivables & Payables"
-msgstr ""
+msgstr "Követelések és kötelezettségek"
 
 #. module: account
 #: rml:account.general.ledger:0
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index d8f3772f7d4..63ac7694aec 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-21 03:35+0000\n"
-"Last-Translator: Jacara <Unknown>\n"
+"PO-Revision-Date: 2010-10-21 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: 2010-10-21 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/wizard/account_move_journal.py b/addons/account/wizard/account_move_journal.py
index 4c6784e03e9..5756fed4264 100644
--- a/addons/account/wizard/account_move_journal.py
+++ b/addons/account/wizard/account_move_journal.py
@@ -21,6 +21,7 @@
 
 from osv import osv
 from tools.translate import _
+import tools
 
 class account_move_journal(osv.osv_memory):
     _name = "account.move.journal"
@@ -100,7 +101,7 @@ class account_move_journal(osv.osv_memory):
                 <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                 <button icon="terp-gtk-go-back-rtl" string="Open" name="action_open_window" default_focus="1" type="object"/>
             </group>
-        </form>""" % (str(journal), str(period))
+        </form>""" % (tools.ustr(journal), tools.ustr(period))
 
         res.update({
             'arch':view
diff --git a/addons/account_analytic_analysis/i18n/nl.po b/addons/account_analytic_analysis/i18n/nl.po
index fb352fefe68..c2cd72119d8 100644
--- a/addons/account_analytic_analysis/i18n/nl.po
+++ b/addons/account_analytic_analysis/i18n/nl.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: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-20 09:43+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-21 11: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: 2010-10-21 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_analysis
diff --git a/addons/account_analytic_default/i18n/nl.po b/addons/account_analytic_default/i18n/nl.po
index 187500f691b..79d9acb4873 100644
--- a/addons/account_analytic_default/i18n/nl.po
+++ b/addons/account_analytic_default/i18n/nl.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: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-20 09:51+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-21 11: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: 2010-10-21 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
diff --git a/addons/account_analytic_plans/i18n/nl.po b/addons/account_analytic_plans/i18n/nl.po
index 07a53c07544..072b21b1656 100644
--- a/addons/account_analytic_plans/i18n/nl.po
+++ b/addons/account_analytic_plans/i18n/nl.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: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-20 09:41+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-21 11:23+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: 2010-10-21 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
diff --git a/addons/account_budget/i18n/nl.po b/addons/account_budget/i18n/nl.po
index 4460800c5c6..ba639c6a5f2 100644
--- a/addons/account_budget/i18n/nl.po
+++ b/addons/account_budget/i18n/nl.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: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-20 13:01+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-21 11: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: 2010-10-21 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
diff --git a/addons/account_payment/i18n/fr.po b/addons/account_payment/i18n/fr.po
index 37a966027e1..e67b4d415e8 100644
--- a/addons/account_payment/i18n/fr.po
+++ b/addons/account_payment/i18n/fr.po
@@ -7,15 +7,38 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-20 08:09+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2010-10-21 11:22+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: 2010-10-21 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr "Débit total"
+
+#. module: account_payment
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valide pour l'architecture de la vue !"
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr "Crédit total"
+
+#. module: account_payment
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer par x_ et ne doit pas contenir de "
+"caractères spéciaux !"
+
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
 msgid "Scheduled date if fixed"
@@ -246,11 +269,6 @@ msgstr ""
 msgid "Error !"
 msgstr "Erreur !"
 
-#. module: account_payment
-#: view:account.move.line:0
-msgid "Total debit"
-msgstr "Débit total"
-
 #. module: account_payment
 #: field:payment.order,date_done:0
 msgid "Execution date"
@@ -277,11 +295,6 @@ msgstr "Compte de destination"
 msgid "Search Payment Orders"
 msgstr ""
 
-#. module: account_payment
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue !"
-
 #. module: account_payment
 #: field:payment.line,create_date:0
 msgid "Created"
@@ -406,11 +419,6 @@ msgstr "Adresse du client qui a passé la commande"
 msgid "Populate Statement:"
 msgstr ""
 
-#. module: account_payment
-#: view:account.move.line:0
-msgid "Total credit"
-msgstr "Crédit total"
-
 #. module: account_payment
 #: help:payment.order,date_scheduled:0
 msgid "Select a date if you have chosen Preferred Date to be fixed."
@@ -548,14 +556,6 @@ msgstr "Annuler"
 msgid "Information"
 msgstr "Informations"
 
-#. module: account_payment
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Le nom de l'objet doit commencer par x_ et ne doit pas contenir de "
-"caractères spéciaux !"
-
 #. module: account_payment
 #: model:ir.actions.report.xml,name:account_payment.payment_order1
 #: model:ir.model,name:account_payment.model_payment_order
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index a8f827e7bb8..f6b41f318ed 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -181,9 +181,6 @@
                                     <field name="amount_unreconciled" sum="Open Balance" readonly="1"/>
                                     <field name="amount" sum="Payment"/>
                                 </tree>
-                                <form string="Payment Information">
-                                    <label string="Form view not available for Payment Lines"/>
-                                </form>
                             </field>
                             <field name="line_cr_ids" colspan="4" nolabel="1" attrs="{'invisible': [('pre_line','=',False)]}" default_get="{'journal_id':journal_id, 'partner_id':partner_id}">
                                 <tree string="Credits" editable="bottom">
diff --git a/addons/analytic/i18n/it.po b/addons/analytic/i18n/it.po
index 8a11d0bb0a7..458d38da3e7 100644
--- a/addons/analytic/i18n/it.po
+++ b/addons/analytic/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: 2010-06-18 10:59+0000\n"
-"PO-Revision-Date: 2010-08-17 10:07+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-21 20:20+0000\n"
+"Last-Translator: Andrea Amoroso <andrea.amoroso@alice.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: 2010-09-29 05:17+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: analytic
@@ -22,15 +22,6 @@ msgstr ""
 msgid "Child Accounts"
 msgstr "Conto figlio"
 
-#. module: analytic
-#: help:account.analytic.line,amount_currency:0
-msgid ""
-"The amount expressed in the related account currency if not equal to the "
-"company one."
-msgstr ""
-"L'importo espresso nella valuta del conto non è uguale a quella della "
-"Compagnia"
-
 #. module: analytic
 #: constraint:ir.model:0
 msgid ""
@@ -49,11 +40,6 @@ msgstr "Nome del conto"
 msgid "Specifies the amount of quantity to count."
 msgstr "Specifica la quantità da sommare"
 
-#. module: analytic
-#: help:account.analytic.line,currency_id:0
-msgid "The related account currency if not equal to the company one."
-msgstr "La relativa valuta del conto non è uguale a quella della Compagnia"
-
 #. module: analytic
 #: model:ir.module.module,description:analytic.module_meta_information
 msgid ""
@@ -88,36 +74,6 @@ msgstr "Chiuso"
 msgid "Debit"
 msgstr "Debito"
 
-#. module: analytic
-#: help:account.analytic.account,state:0
-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 ""
-"* Quando un conto è creato è nello stato \"Draft\".                          "
-"        \n"
-"* Se c'è qualche partner associato, puà essere nello stato \"Open\".\n"
-"* Se c'è qualche pendenza  può essere in \"Pending\".\n"
-"* E, per conlcudere, quando tutte le transazioni sono finite, può essere "
-"nello stato \"Closed\".\n"
-"* Il progetto può essere in entrambe gli stati \"Template\" e \"Running\".\n"
-"Se è nello stato template, allora possiamo creare progetti basati su di "
-"esso. Se è in \"Running\" state è in progetto normale. Se deve essere "
-"revisionato allora lo stato è \"Pending\".\n"
-"Quando il progetto è completato lo stato è \"Done\"."
-
 #. module: analytic
 #: field:account.analytic.account,type:0
 msgid "Account Type"
@@ -145,13 +101,9 @@ msgid "Description"
 msgstr "Descrizione"
 
 #. module: analytic
-#: help:account.analytic.line,amount:0
-msgid ""
-"Calculated by multiplying the quantity and the price given in the Product's "
-"cost price."
-msgstr ""
-"Calcolato multiplicando la quantità e il prezzo dato nel campo "
-"\"costo/prezzo del prodotto\""
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr "Normale"
 
 #. module: analytic
 #: field:account.analytic.account,company_id:0
@@ -181,14 +133,23 @@ msgstr "Data"
 
 #. module: analytic
 #: field:account.analytic.account,currency_id:0
-#: field:account.analytic.line,currency_id:0
 msgid "Account currency"
 msgstr "Valuta del Conto"
 
 #. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "View"
-msgstr "Visualizza"
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr "Quantità"
+
+#. 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
 #: help:account.analytic.account,quantity_max:0
@@ -221,31 +182,29 @@ msgid "Balance"
 msgstr "Saldo"
 
 #. module: analytic
-#: field:account.analytic.account,date_start:0
-msgid "Date Start"
-msgstr "Data Inizio"
-
-#. module: analytic
-#: field:account.analytic.account,quantity:0
-#: field:account.analytic.line,unit_amount:0
-msgid "Quantity"
-msgstr "Quantità"
+#: 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."
+msgstr ""
+"Se si seleziona il Tipo di Visualizzazione, significa che si vuol permettere "
+"la creazione delle voci del giornale che usano quell'account."
 
 #. module: analytic
 #: field:account.analytic.account,date:0
 msgid "Date End"
 msgstr "Data Fine"
 
+#. module: analytic
+#: constraint:ir.rule:0
+msgid "Rules are not supported for osv_memory objects !"
+msgstr "Le regole non sono supportate per oggetti osv_memory !"
+
 #. module: analytic
 #: field:account.analytic.account,code:0
 msgid "Account Code"
 msgstr "Codifica Conto"
 
-#. module: analytic
-#: selection:account.analytic.account,type:0
-msgid "Normal"
-msgstr "Normale"
-
 #. module: analytic
 #: field:account.analytic.account,complete_name:0
 msgid "Full Account Name"
@@ -259,19 +218,19 @@ msgid "Analytic Account"
 msgstr "Conto Analitico"
 
 #. module: analytic
-#: field:account.analytic.account,company_currency_id:0
-msgid "Currency"
-msgstr "Valuta"
-
-#. module: analytic
-#: field:account.analytic.line,amount_currency:0
-msgid "Amount currency"
-msgstr "Importo valuta"
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr "Visualizza"
 
 #. module: analytic
 #: field:account.analytic.account,partner_id:0
-msgid "Associated Partner"
-msgstr "Partner associato"
+msgid "Partner"
+msgstr "Partner"
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr "Data Inizio"
 
 #. module: analytic
 #: selection:account.analytic.account,state:0
@@ -282,3 +241,57 @@ msgstr "Aperto"
 #: field:account.analytic.account,line_ids:0
 msgid "Analytic Entries"
 msgstr "Voci Conto Analitico"
+
+#~ 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 ""
+#~ "* Quando un conto è creato è nello stato \"Draft\".                          "
+#~ "        \n"
+#~ "* Se c'è qualche partner associato, puà essere nello stato \"Open\".\n"
+#~ "* Se c'è qualche pendenza  può essere in \"Pending\".\n"
+#~ "* E, per conlcudere, quando tutte le transazioni sono finite, può essere "
+#~ "nello stato \"Closed\".\n"
+#~ "* Il progetto può essere in entrambe gli stati \"Template\" e \"Running\".\n"
+#~ "Se è nello stato template, allora possiamo creare progetti basati su di "
+#~ "esso. Se è in \"Running\" state è in progetto normale. Se deve essere "
+#~ "revisionato allora lo stato è \"Pending\".\n"
+#~ "Quando il progetto è completato lo stato è \"Done\"."
+
+#~ msgid ""
+#~ "Calculated by multiplying the quantity and the price given in the Product's "
+#~ "cost price."
+#~ msgstr ""
+#~ "Calcolato multiplicando la quantità e il prezzo dato nel campo "
+#~ "\"costo/prezzo del prodotto\""
+
+#~ msgid "Currency"
+#~ msgstr "Valuta"
+
+#~ msgid "Associated Partner"
+#~ msgstr "Partner associato"
+
+#~ msgid ""
+#~ "The amount expressed in the related account currency if not equal to the "
+#~ "company one."
+#~ msgstr ""
+#~ "L'importo espresso nella valuta del conto non è uguale a quella della "
+#~ "Compagnia"
+
+#~ msgid "The related account currency if not equal to the company one."
+#~ msgstr "La relativa valuta del conto non è uguale a quella della Compagnia"
+
+#~ msgid "Amount currency"
+#~ msgstr "Importo valuta"
diff --git a/addons/audittrail/i18n/mn.po b/addons/audittrail/i18n/mn.po
index f1761fbbc58..cccb429cad6 100644
--- a/addons/audittrail/i18n/mn.po
+++ b/addons/audittrail/i18n/mn.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 09:37+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-21 09:31+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: 2010-09-30 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: audittrail
@@ -31,9 +31,9 @@ msgstr ""
 "болохгүй!"
 
 #. module: audittrail
-#: field:audittrail.log.line,log_id:0
-msgid "Log"
-msgstr "Лог"
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
 
 #. module: audittrail
 #: selection:audittrail.rule,state:0
@@ -41,17 +41,13 @@ msgid "Subscribed"
 msgstr "Захиалсан"
 
 #. module: audittrail
-#: view:audittrail.log:0
-msgid "Old Value : "
-msgstr "Хуучин утга: "
+#: model:ir.model,name:audittrail.model_audittrail_rule
+msgid "Audittrail Rule"
+msgstr "Audittrail дүрэм"
 
 #. module: audittrail
-#: selection:audittrail.log,method:0
-msgid "Create"
-msgstr "Үүсгэх"
-
-#. module: audittrail
-#: wizard_view:audittrail.view.log,init:0
+#: view:audittrail.view.log:0
+#: model:ir.actions.act_window,name:audittrail.action_audittrail_log_tree
 msgid "Audit Logs"
 msgstr "Аудит логууд"
 
@@ -71,19 +67,21 @@ msgid "Old Value"
 msgstr "Хуучин утга"
 
 #. module: audittrail
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Алдаа! Та рекурсив цэс үүсгэж чадахгүй."
 
 #. module: audittrail
-#: model:ir.actions.wizard,name:audittrail.wizard_audittrail_log
+#: model:ir.actions.act_window,name:audittrail.action_audittrail_view_log
 msgid "View log"
 msgstr "Лог харах"
 
 #. module: audittrail
-#: model:ir.model,name:audittrail.model_audittrail_log_line
-msgid "audittrail.log.line"
-msgstr "audittrail.log.line"
+#: help:audittrail.rule,log_read:0
+msgid ""
+"Select this if you want to keep track of read/open on any record of the "
+"object of this rule"
+msgstr ""
 
 #. module: audittrail
 #: field:audittrail.log,method:0
@@ -91,14 +89,14 @@ msgid "Method"
 msgstr "Метод"
 
 #. module: audittrail
-#: wizard_field:audittrail.view.log,init,from:0
+#: field:audittrail.view.log,from:0
 msgid "Log From"
 msgstr "Лог эхлэл"
 
 #. module: audittrail
-#: field:audittrail.log.line,log:0
-msgid "Log ID"
-msgstr "Лог ID"
+#: field:audittrail.log.line,log_id:0
+msgid "Log"
+msgstr "Лог"
 
 #. module: audittrail
 #: field:audittrail.log,res_id:0
@@ -106,14 +104,21 @@ msgid "Resource Id"
 msgstr "Нөөц Id"
 
 #. module: audittrail
-#: selection:audittrail.log,method:0
-msgid "Write"
-msgstr "Бичих"
+#: help:audittrail.rule,user_id:0
+msgid "if  User is not added then it will applicable for all users"
+msgstr ""
 
 #. module: audittrail
-#: model:ir.ui.menu,name:audittrail.menu_action_audittrail
-msgid "Audittrails"
-msgstr "Аудит шалгалт"
+#: help:audittrail.rule,log_workflow:0
+msgid ""
+"Select this if you want to keep track of workflow on any record of the "
+"object of this rule"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,user_id:0
+msgid "Users"
+msgstr "Хэрэглэгчид"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -121,14 +126,14 @@ msgid "Log Lines"
 msgstr "Лог мөрүүд"
 
 #. module: audittrail
-#: view:audittrail.rule:0
-msgid "Subscribe"
-msgstr "Захиалах"
+#: model:ir.actions.act_window,name:audittrail.action_audittrail_rule_tree_sub
+msgid "Subscribed Rules"
+msgstr "Захиалсан дүрмүүд"
 
 #. module: audittrail
-#: selection:audittrail.log,method:0
-msgid "Read"
-msgstr "Унших"
+#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
+msgid "Rules"
+msgstr "Дүрэм"
 
 #. module: audittrail
 #: field:audittrail.log,object_id:0
@@ -142,7 +147,7 @@ msgid "AuditTrail Rule"
 msgstr "AuditTrail Rule дүрэм"
 
 #. module: audittrail
-#: wizard_field:audittrail.view.log,init,to:0
+#: field:audittrail.view.log,to:0
 msgid "Log To"
 msgstr "Лог төгсгөл"
 
@@ -152,16 +157,19 @@ msgid "New Value Text: "
 msgstr "Шинэ утга: "
 
 #. module: audittrail
-#: model:ir.module.module,description:audittrail.module_meta_information
-msgid ""
-"Allows the administrator to track every user operations on all objects of "
-"the system.\n"
-"    Subscribe Rules for read, write, create and delete on objects and check "
-"logs"
-msgstr ""
-"Системийн объектууд дээр хийгдсэн бүх үйлдлийг мөшгих боломж олгоно.\n"
-"    Объектууд дээр унших, бичих, үүсгэх, устгах үйлдлийг мөшгих дүрмүүд "
-"бичнэ, тэгээд логоо шалгана"
+#: model:ir.actions.act_window,name:audittrail.action_audittrail_rule_tree
+msgid "Audit Rules"
+msgstr "Аудитын дүрмүүд"
+
+#. module: audittrail
+#: view:audittrail.log:0
+msgid "Old Value : "
+msgstr "Хуучин утга: "
+
+#. module: audittrail
+#: field:audittrail.log,name:0
+msgid "Resource Name"
+msgstr "Нөөцийн нэр"
 
 #. module: audittrail
 #: field:audittrail.log,timestamp:0
@@ -169,24 +177,52 @@ msgid "Date"
 msgstr "Огноо"
 
 #. module: audittrail
-#: field:audittrail.log,user_id:0
-msgid "User"
-msgstr "Хэрэглэгч"
+#: help:audittrail.rule,log_write:0
+msgid ""
+"Select this if you want to keep track of modification on any record of the "
+"object of this rule"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log.line,log:0
+msgid "Log ID"
+msgstr "Лог ID"
+
+#. module: audittrail
+#: field:audittrail.rule,log_create:0
+msgid "Log Creates"
+msgstr "Үүсэлтийг хөтлөх"
+
+#. module: audittrail
+#: help:audittrail.rule,object_id:0
+msgid "Select object for which you want to generate log."
+msgstr "Түүх хөтлөх объектоо сонгоно"
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "Old Value Text : "
 msgstr "Хуучин утгын текст: "
 
+#. module: audittrail
+#: field:audittrail.rule,log_workflow:0
+msgid "Log Workflow"
+msgstr "Ажлын урсгалыг хянах"
+
 #. module: audittrail
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Дэлгэцийн XML алдаатай!"
 
 #. module: audittrail
-#: field:audittrail.log,name:0
-msgid "Name"
-msgstr "Нэр"
+#: field:audittrail.rule,log_read:0
+msgid "Log Reads"
+msgstr "Уншилтыг хянах"
+
+#. module: audittrail
+#: code:addons/audittrail/audittrail.py:0
+#, python-format
+msgid "Change audittrail depends -- Setting rule as DRAFT"
+msgstr ""
 
 #. module: audittrail
 #: field:audittrail.log,line_ids:0
@@ -194,9 +230,14 @@ msgid "Log lines"
 msgstr "Лог мөрүүд"
 
 #. module: audittrail
-#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree_sub
-msgid "Subscribed Rules"
-msgstr "Захиалсан дүрмүүд"
+#: code:addons/audittrail/audittrail.py:0
+#, python-format
+msgid ""
+"'%s' Model does not exist...\" %(model))\n"
+"        model = model_pool.browse(cr, uid, model_id)\n"
+"\n"
+"        if method in ('create"
+msgstr ""
 
 #. module: audittrail
 #: field:audittrail.log.line,field_id:0
@@ -209,9 +250,26 @@ msgid "AuditTrail Rules"
 msgstr "AuditTrail дүрмүүд"
 
 #. module: audittrail
-#: model:ir.model,name:audittrail.model_audittrail_rule
-msgid "audittrail.rule"
-msgstr "audittrail.rule"
+#: help:audittrail.rule,log_unlink:0
+msgid ""
+"Select this if you want to keep track of deletion on any record of the "
+"object of this rule"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.log,user_id:0
+msgid "User"
+msgstr "Хэрэглэгч"
+
+#. module: audittrail
+#: field:audittrail.rule,action_id:0
+msgid "Action ID"
+msgstr "Үйлдлийн ID"
+
+#. module: audittrail
+#: view:audittrail.rule:0
+msgid "Users (if User is not added then it will applicable for all users)"
+msgstr "Хэрэглэгчид (хэрэв хэрэглэгч нэмээгүй бол бүх хэрэглэгчид хамаатай)"
 
 #. module: audittrail
 #: view:audittrail.rule:0
@@ -219,14 +277,15 @@ msgid "UnSubscribe"
 msgstr "Захиалга болих"
 
 #. module: audittrail
-#: field:audittrail.rule,log_write:0
-msgid "Log writes"
-msgstr "Бичилтийг хөтлөх"
+#: code:addons/audittrail/audittrail.py:0
+#, python-format
+msgid "WARNING: audittrail is not part of the pool"
+msgstr "АНХААР: audittrail нь pool-ээс хамааралгүй"
 
 #. module: audittrail
-#: model:ir.model,name:audittrail.model_audittrail_log
-msgid "audittrail.log"
-msgstr "audittrail.log"
+#: field:audittrail.rule,log_unlink:0
+msgid "Log Deletes"
+msgstr "Устгалыг хянах"
 
 #. module: audittrail
 #: field:audittrail.log.line,field_description:0
@@ -234,12 +293,38 @@ msgid "Field Description"
 msgstr "Талбарын тодорхойлолт"
 
 #. module: audittrail
-#: selection:audittrail.log,method:0
-msgid "Delete"
-msgstr "Устгах"
+#: code:addons/audittrail/audittrail.py:0
+#, python-format
+msgid ""
+"'%s' field does not exist in '%s' model\" %(field_name, model.model))\n"
+"\n"
+"        field = field_pool.read(cr, uid, field_id)\n"
+"        relation_model = field['relation']\n"
+"        relation_model_pool = relation_model and pool.get(relation_model) or "
+"False\n"
+"\n"
+"        if field['ttype'] == 'many2one':\n"
+"            res = False\n"
+"            relation_id = False\n"
+"            if values and type(values) == tuple:\n"
+"                relation_id = values[0]\n"
+"                if relation_id and relation_model_pool:\n"
+"                    relation_model_object = relation_model_pool.read(cr, "
+"uid, relation_id, [relation_model_pool._rec_name])\n"
+"                    res = "
+"relation_model_object[relation_model_pool._rec_name]\n"
+"            return res\n"
+"\n"
+"        elif field['ttype'] in ('many2many','one2many"
+msgstr ""
 
 #. module: audittrail
-#: wizard_button:audittrail.view.log,init,open:0
+#: field:audittrail.rule,log_write:0
+msgid "Log Writes"
+msgstr "Бичилтийг хянах"
+
+#. module: audittrail
+#: view:audittrail.view.log:0
 msgid "Open Logs"
 msgstr "Лог нээх"
 
@@ -253,11 +338,6 @@ msgstr "Шинэ утгын текст"
 msgid "Rule Name"
 msgstr "Дүрмийн нэр"
 
-#. module: audittrail
-#: field:audittrail.rule,log_read:0
-msgid "Log reads"
-msgstr "Уншилтыг хөтлөх"
-
 #. module: audittrail
 #: model:ir.ui.menu,name:audittrail.menu_action_audittrail_log_tree
 msgid "Logs"
@@ -269,14 +349,9 @@ msgid "New Value"
 msgstr "Шинэ утга"
 
 #. module: audittrail
-#: model:ir.ui.menu,name:audittrail.menu_action_log_tree2
-msgid "View Logs"
-msgstr "Лог харах"
-
-#. module: audittrail
-#: field:audittrail.rule,log_create:0
-msgid "Log creates"
-msgstr "Үүсгэлтийг хөтлөх"
+#: model:ir.model,name:audittrail.model_audittrail_log_line
+msgid "Log Line"
+msgstr "Мөрийг хянах"
 
 #. module: audittrail
 #: view:audittrail.log:0
@@ -284,31 +359,155 @@ msgid "AuditTrail Logs"
 msgstr "AuditTrail логууд"
 
 #. module: audittrail
-#: model:ir.ui.menu,name:audittrail.menu_action_audittrail_rule_tree
-msgid "Rules"
-msgstr "Дүрэм"
+#: view:audittrail.rule:0
+msgid "Subscribe"
+msgstr "Захиалах"
+
+#. module: audittrail
+#: model:ir.model,name:audittrail.model_audittrail_log
+msgid "Audittrail Log"
+msgstr "Audittrail түүх"
+
+#. module: audittrail
+#: help:audittrail.rule,log_action:0
+msgid ""
+"Select this if you want to keep track of actions on the object of this rule"
+msgstr ""
 
 #. module: audittrail
 #: view:audittrail.log:0
 msgid "New Value : "
 msgstr "Шинэ утга: "
 
-#. module: audittrail
-#: field:audittrail.rule,user_id:0
-msgid "Users"
-msgstr "Хэрэглэгчид"
-
 #. module: audittrail
 #: field:audittrail.log.line,old_value_text:0
 msgid "Old value Text"
 msgstr "Хуучин утгын текст"
 
 #. module: audittrail
-#: wizard_button:audittrail.view.log,init,end:0
+#: view:audittrail.view.log:0
 msgid "Cancel"
 msgstr "Цуцлах"
 
 #. module: audittrail
-#: field:audittrail.rule,log_unlink:0
-msgid "Log deletes"
-msgstr "Устгалыг хөтлөх"
+#: model:ir.model,name:audittrail.model_audittrail_view_log
+msgid "View Log"
+msgstr "Түүх харах"
+
+#. module: audittrail
+#: code:addons/audittrail/audittrail.py:0
+#, python-format
+msgid ""
+"'%s' field does not exist in '%s' model\" %(line['name'], model.model))\n"
+"\n"
+"            field = field_pool.read(cr, uid, field_id)\n"
+"            old_value = 'old_value' in line and  line['old_value'] or ''\n"
+"            new_value = 'new_value' in line and  line['new_value'] or ''\n"
+"            old_value_text = 'old_value_text' in line and  "
+"line['old_value_text'] or ''\n"
+"            new_value_text = 'new_value_text' in line and  "
+"line['new_value_text'] or ''\n"
+"\n"
+"            if old_value_text == new_value_text:\n"
+"                continue\n"
+"            if field['ttype'] == 'many2one':\n"
+"                if type(old_value) == tuple:\n"
+"                    old_value = old_value[0]\n"
+"                if type(new_value) == tuple:\n"
+"                    new_value = new_value[0]\n"
+"            vals = {\n"
+"                    \"log_id\": log_id,\n"
+"                    \"field_id\": field_id,\n"
+"                    \"old_value\": old_value,\n"
+"                    \"new_value\": new_value,\n"
+"                    \"old_value_text\": old_value_text,\n"
+"                    \"new_value_text\": new_value_text,\n"
+"                    \"field_description\": field['field_description']\n"
+"                    }\n"
+"            line_id = log_line_pool.create(cr, uid, vals)\n"
+"        #End Loop\n"
+"        return True\n"
+"\n"
+"\n"
+"    def log_fct(self, db, uid, model, method, fct_src, *args):\n"
+"        \"\"\"\n"
+"        Logging function: This function is performs logging oprations "
+"according to method\n"
+"        @param db: the current database\n"
+"        @param uid: the current user’s ID for security checks,\n"
+"        @param object: Object who's values are being changed\n"
+"        @param method: method to log: create, read, write, unlink\n"
+"        @param fct_src: execute method of Object proxy\n"
+"\n"
+"        @return: Returns result as per method of Object proxy\n"
+"        \"\"\"\n"
+"        res2 = args\n"
+"        pool = pooler.get_pool(db)\n"
+"        cr = pooler.get_db(db).cursor()\n"
+"        resource_pool = pool.get(model)\n"
+"        log_pool = pool.get('audittrail.log"
+msgstr ""
+
+#. module: audittrail
+#: field:audittrail.rule,log_action:0
+msgid "Log Action"
+msgstr "Үйлдлийг хянах"
+
+#. module: audittrail
+#: help:audittrail.rule,log_create:0
+msgid ""
+"Select this if you want to keep track of creation on any record of the "
+"object of this rule"
+msgstr ""
+
+#~ msgid "Create"
+#~ msgstr "Үүсгэх"
+
+#~ msgid "Write"
+#~ msgstr "Бичих"
+
+#~ msgid "audittrail.log.line"
+#~ msgstr "audittrail.log.line"
+
+#~ msgid "Read"
+#~ msgstr "Унших"
+
+#~ msgid "Name"
+#~ msgstr "Нэр"
+
+#~ msgid "audittrail.log"
+#~ msgstr "audittrail.log"
+
+#~ msgid "audittrail.rule"
+#~ msgstr "audittrail.rule"
+
+#~ msgid "Delete"
+#~ msgstr "Устгах"
+
+#~ msgid "View Logs"
+#~ msgstr "Лог харах"
+
+#~ msgid "Log writes"
+#~ msgstr "Бичилтийг хөтлөх"
+
+#~ msgid "Log reads"
+#~ msgstr "Уншилтыг хөтлөх"
+
+#~ msgid "Log creates"
+#~ msgstr "Үүсгэлтийг хөтлөх"
+
+#~ msgid "Log deletes"
+#~ msgstr "Устгалыг хөтлөх"
+
+#~ msgid "Audittrails"
+#~ msgstr "Аудит шалгалт"
+
+#~ msgid ""
+#~ "Allows the administrator to track every user operations on all objects of "
+#~ "the system.\n"
+#~ "    Subscribe Rules for read, write, create and delete on objects and check "
+#~ "logs"
+#~ msgstr ""
+#~ "Системийн объектууд дээр хийгдсэн бүх үйлдлийг мөшгих боломж олгоно.\n"
+#~ "    Объектууд дээр унших, бичих, үүсгэх, устгах үйлдлийг мөшгих дүрмүүд "
+#~ "бичнэ, тэгээд логоо шалгана"
diff --git a/addons/base_action_rule/i18n/it.po b/addons/base_action_rule/i18n/it.po
index cbb144813bf..7d50a359c50 100644
--- a/addons/base_action_rule/i18n/it.po
+++ b/addons/base_action_rule/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: 2010-08-19 12:20+0000\n"
-"PO-Revision-Date: 2010-09-29 10:07+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-21 16:06+0000\n"
+"Last-Translator: simone.sandri <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: 2010-09-30 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_action_rule
@@ -68,6 +68,11 @@ msgstr "Invia mail a questi indirizzi"
 msgid "Set State to"
 msgstr "Imposta lo Stato per"
 
+#. module: base_action_rule
+#: field:base.action.rule,act_email_from:0
+msgid "Email From"
+msgstr "Email da"
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Email Body"
@@ -116,11 +121,6 @@ msgstr ""
 "Seleziona questo se vuoi la regola di spedire un promemoria tramite email al "
 "partner"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "Email Reminders"
-msgstr "Promemoria Email"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "Conditions on Model Partner"
@@ -142,9 +142,9 @@ msgid "%(object_subject)s = Object subject"
 msgstr "%(object_subject)s = Oggetto Soggetto"
 
 #. module: base_action_rule
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per la struttura della vista!"
+#: view:base.action.rule:0
+msgid "Email Reminders"
+msgstr "Promemoria Email"
 
 #. module: base_action_rule
 #: view:base.action.rule:0
@@ -217,6 +217,13 @@ msgstr "Imposta il responsabile a"
 msgid "None"
 msgstr "Nessuno"
 
+#. module: base_action_rule
+#: help:base.action.rule,act_email_to:0
+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 ""
+
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_user_phone)s = Responsible phone"
@@ -237,6 +244,11 @@ msgstr ""
 msgid "Delay type"
 msgstr "Tipo Ritardo"
 
+#. module: base_action_rule
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valido per la struttura della vista!"
+
 #. module: base_action_rule
 #: help:base.action.rule,regex_name:0
 msgid ""
@@ -255,6 +267,11 @@ msgstr ""
 msgid "Call Object Method"
 msgstr "Metodo Chiamata Oggetto"
 
+#. module: base_action_rule
+#: field:base.action.rule,act_email_to:0
+msgid "Email To"
+msgstr "Email per"
+
 #. module: base_action_rule
 #: help:base.action.rule,act_mail_to_watchers:0
 msgid ""
@@ -274,6 +291,13 @@ msgstr "%(partner)s = Nome Partner"
 msgid "Note"
 msgstr "Nota"
 
+#. module: base_action_rule
+#: help:base.action.rule,act_email_from:0
+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 ""
+
 #. module: base_action_rule
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
@@ -401,11 +425,6 @@ msgstr "Responsabile"
 msgid "%(partner_email)s = Partner Email"
 msgstr "%(partner_email)s = Email Partner"
 
-#. module: base_action_rule
-#: view:base.action.rule:0
-msgid "%(object_date)s = Creation date"
-msgstr "%(object_date)s = Data creazione"
-
 #. module: base_action_rule
 #: view:base.action.rule:0
 msgid "%(object_user_email)s = Responsible Email"
@@ -509,3 +528,6 @@ msgstr "Condizioni sugli stati"
 #: field:base.action.rule,trg_date_type:0
 msgid "Trigger Date"
 msgstr "Data Programmata"
+
+#~ msgid "%(object_date)s = Creation date"
+#~ msgstr "%(object_date)s = Data creazione"
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index df5aaa4287d..c4c719c5008 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -477,7 +477,7 @@ property or property parameter."),
         @param context: A standard dictionary for contextual values
         @return: True
         """
-        if not context:
+        if context is None:
             context = {}
 
         company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.name
@@ -555,7 +555,7 @@ property or property parameter."),
         @param context: A standard dictionary for contextual values
         @return: True
         """
-        if not context:
+        if context is None:
             context = {}
 
         for vals in self.browse(cr, uid, ids, context=context):
@@ -575,7 +575,7 @@ property or property parameter."),
         @param ids: List of calendar attendee’s IDs
         @param *args: Get Tupple value
         @param context: A standard dictionary for contextual values """
-        if not context:
+        if context is None:
             context = {}
         return self.write(cr, uid, ids, {'state': 'declined'}, context)
 
@@ -587,7 +587,7 @@ property or property parameter."),
         @param vals: Get Values
         @param context: A standard dictionary for contextual values """
 
-        if not context:
+        if context is None:
             context = {}
         if not vals.get("email") and vals.get("cn"):
             cnval = vals.get("cn").split(':')
@@ -641,7 +641,7 @@ true, it will allow you to hide the event alarm information without removing it.
         @param context: A standard dictionary for contextual values
         @return: True
         """
-        if not context:
+        if context is None:
             context = {}
         alarm_obj = self.pool.get('calendar.alarm')
         res_alarm_obj = self.pool.get('res.alarm')
@@ -713,7 +713,7 @@ true, it will allow you to hide the event alarm information without removing it.
         @param model: Model name for which alarm is to be cleared.
         @return: True
         """
-        if not context:
+        if context is None:
             context = {}
         alarm_obj = self.pool.get('calendar.alarm')
         ir_obj = self.pool.get('ir.model')
@@ -781,7 +781,7 @@ class calendar_alarm(osv.osv):
         @param context: A standard dictionary for contextual values
         @return: new record id for calendar_alarm.
         """
-        if not context:
+        if context is None:
             context = {}
         event_date = vals.get('event_date', False)
         if event_date:
@@ -808,7 +808,7 @@ class calendar_alarm(osv.osv):
         @param context: A standard dictionary for contextual values
         """
         return True # XXX FIXME REMOVE THIS AFTER FIXING get_recurrent_dates!!
-        if not context:
+        if context is None:
             context = {}
         current_datetime = datetime.now()
         request_obj = self.pool.get('res.request')
@@ -943,8 +943,9 @@ class calendar_event(osv.osv):
         @param end_date: Ending Datee
         @param context: A standard dictionary for contextual values
         """
-        if not context:
+        if context is None:
             context = {}
+
         value = {}
         if not start_date:
             return value
@@ -967,6 +968,14 @@ class calendar_event(osv.osv):
         elif not end_date:
             end = start + timedelta(hours=duration)
             value['date_deadline'] = end.strftime("%Y-%m-%d %H:%M:%S")
+        elif end_date and duration:
+            # we have both, keep them synchronized:
+            # set duration based on end_date (arbitrary decision: this avoid 
+            # getting dates like 06:31:48 instead of 06:32:00)
+            end = datetime.strptime(end_date, "%Y-%m-%d %H:%M:%S")
+            diff = end - start
+            duration = float(diff.days)* 24 + (float(diff.seconds) / 3600)
+            value['duration'] = round(duration, 2)
 
         return {'value': value}
 
@@ -975,7 +984,7 @@ class calendar_event(osv.osv):
         This function deletes event which are linked with the event with recurrent_uid
                 (Removes the events which refers to the same UID value)
         """
-        if not context:
+        if context is None:
             context = {}
         for event_id in ids:
             cr.execute("select id from %s where recurrent_uid=%%s" % (self._table), (event_id,))
@@ -992,7 +1001,7 @@ class calendar_event(osv.osv):
         @param context: A standard dictionary for contextual values
         @return: dictionary of rrule value.
         """
-        if not context:
+        if context is None:
             context = {}
         cr.execute("UPDATE %s set freq='None',interval=0,count=0,end_date=Null,\
                     mo=False,tu=False,we=False,th=False,fr=False,sa=False,su=False,\
@@ -1203,7 +1212,7 @@ true, it will allow you to hide the event alarm information without removing it.
         @param context: A standard dictionary for contextual values
         @return: Dictionary value which open Crm Meeting form.
         """
-        if not context:
+        if context is None:
             context = {}
 
         data_obj = self.pool.get('ir.model.data')
@@ -1448,7 +1457,7 @@ true, it will allow you to hide the event alarm information without removing it.
         @param context: A standard dictionary for contextual values
         @return: True
         """
-        if not context:
+        if context is None:
             context = {}
         if isinstance(ids, (str, int, long)):
             select = [ids]
@@ -1477,14 +1486,23 @@ true, it will allow you to hide the event alarm information without removing it.
 
         if vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
             vals['vtimezone'] = vals['vtimezone'][40:]
+
+        updated_vals = self.onchange_dates(cr, uid, new_ids,
+            vals.get('date', False),
+            vals.get('duration', False),
+            vals.get('date_deadline', False),
+            vals.get('allday', False),
+            context=context)
+        vals.update(updated_vals.get('value', {}))
+
         if new_ids:
             res = super(calendar_event, self).write(cr, uid, new_ids, vals, context=context)
-        if (vals.has_key('alarm_id') or vals.has_key('base_calendar_alarm_id'))\
-                or (vals.has_key('date') or vals.has_key('duration') or vals.has_key('date_deadline')):
+
+        if ('alarm_id' in vals or 'base_calendar_alarm_id' in vals)\
+                or ('date' in vals or 'duration' in vals or 'date_deadline' in vals):
             # change alarm details
             alarm_obj = self.pool.get('res.alarm')
-            alarm_obj.do_alarm_create(cr, uid, new_ids, self._name, 'date', \
-                                            context=context)
+            alarm_obj.do_alarm_create(cr, uid, new_ids, self._name, 'date', context=context)
         return res
 
     def browse(self, cr, uid, ids, context=None, list_class=None, fields_process=None):
@@ -1520,7 +1538,7 @@ true, it will allow you to hide the event alarm information without removing it.
         @return: List of Dictionary of form [{‘name_of_the_field’: value, ...}, ...]
         """
         # FIXME This whole id mangling has to go!
-        if not context:
+        if context is None:
             context = {}
 
         if isinstance(ids, (str, int, long)):
@@ -1558,7 +1576,7 @@ true, it will allow you to hide the event alarm information without removing it.
         @param context: A standard dictionary for contextual values
         @return: Duplicate record id.
         """
-        if not context:
+        if context is None:
             context = {}
         res = super(calendar_event, self).copy(cr, uid, base_calendar_id2real_id(id), default, context)
         alarm_obj = self.pool.get('res.alarm')
@@ -1607,10 +1625,12 @@ true, it will allow you to hide the event alarm information without removing it.
         @param context: A standard dictionary for contextual values
         @return: new created record id.
         """
-        if not context:
+        if context is None:
             context = {}
+
         if vals.get('vtimezone', '') and vals.get('vtimezone', '').startswith('/freeassociation.sourceforge.net/tzfile/'):
             vals['vtimezone'] = vals['vtimezone'][40:]
+
         res = super(calendar_event, self).create(cr, uid, vals, context)
         alarm_obj = self.pool.get('res.alarm')
         alarm_obj.do_alarm_create(cr, uid, [res], self._name, 'date', context=context)
@@ -1770,7 +1790,7 @@ class ir_values(osv.osv):
         @param uid: the current user’s ID for security checks,
         @param model: Get The Model
         """
-        if not context:
+        if context is None:
             context = {}
         new_model = []
         for data in models:
@@ -1798,7 +1818,7 @@ class ir_model(osv.osv):
         @param context: A standard dictionary for contextual values
         """
         new_ids = isinstance(ids, (str, int, long)) and [ids] or ids
-        if not context:
+        if context is None:
             context = {}
         data = super(ir_model, self).read(cr, uid, new_ids, fields=fields, \
                         context=context, load=load)
diff --git a/addons/base_iban/i18n/fr.po b/addons/base_iban/i18n/fr.po
index 78acbbd0178..d4a9f815e8c 100644
--- a/addons/base_iban/i18n/fr.po
+++ b/addons/base_iban/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 16:41+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-21 07:36+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: 2010-09-29 04:52+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_iban
@@ -21,6 +21,29 @@ msgstr ""
 msgid "Invalid XML for View Architecture!"
 msgstr "XML non valide pour l'architecture de la vue"
 
+#. module: base_iban
+#: model:ir.module.module,shortdesc:base_iban.module_meta_information
+msgid "Create IBAN bank accounts"
+msgstr "Création de comptes bancaires IBAN"
+
+#. module: base_iban
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Le nom de l'objet doit commencer par x_ et ne doit pas contenir de "
+"caractères spéciaux !"
+
+#. module: base_iban
+#: code:addons/base_iban/base_iban.py:0
+#, python-format
+msgid ""
+"The IBAN does not seems to be correct. You should have entered something "
+"like this %s"
+msgstr ""
+"L'IBAN semble être incorrect. La saisie devrait être de la forme suivante : "
+"%s"
+
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_zip_field
 msgid "zip"
@@ -31,6 +54,11 @@ msgstr "zip"
 msgid "International Bank Account Number"
 msgstr "Numéro International de Compte Bancaire"
 
+#. module: base_iban
+#: model:ir.model,name:base_iban.model_res_partner_bank
+msgid "Bank Accounts"
+msgstr "Comptes bancaires"
+
 #. module: base_iban
 #: model:res.partner.bank.type.field,name:base_iban.bank_country_field
 msgid "country_id"
@@ -47,7 +75,12 @@ msgid "iban"
 msgstr "IBAN"
 
 #. module: base_iban
-#: model:ir.module.module,shortdesc:base_iban.module_meta_information
+#: code:addons/base_iban/base_iban.py:0
+#, python-format
+msgid "The IBAN is invalid, It should begin with the country code"
+msgstr "L'IBAN est incorrect : il devrait commencer par le code pays"
+
+#. module: base_iban
 #: field:res.partner.bank,iban:0
 msgid "IBAN"
 msgstr "IBAN"
diff --git a/addons/base_setup/i18n/sv.po b/addons/base_setup/i18n/sv.po
index 2c0be791696..890f789c864 100644
--- a/addons/base_setup/i18n/sv.po
+++ b/addons/base_setup/i18n/sv.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: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-20 19:13+0000\n"
-"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2010-10-21 11: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: 2010-10-21 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index fb45e8a7b1b..1b1e7ec04e9 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -26,6 +26,7 @@
             <field name="res_model">crm.case.categ</field>
             <field name="view_type">form</field>
             <field name="view_id" ref="crm_case_categ_tree-view"/>
+            <field name="context">{'object_id': 'crm.lead'}</field>
             <field name="domain">[('object_id.model', '=', 'crm.lead')]</field>
             <field name="help">Create specific categories that fit your company's  activities in order to better classify and analyse them after they have been maintained in your leads and opportunities. You can use categories to reflect your product structure or the different types of sales you do.</field>
         </record>
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index 1dd0ea96aa6..9179efe10ca 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/i18n/nl.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: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-20 20:03+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-10-21 11:24+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: 2010-10-21 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
diff --git a/addons/crm_profiling/i18n/it.po b/addons/crm_profiling/i18n/it.po
index 610d86e505a..2c57b5b6f8d 100644
--- a/addons/crm_profiling/i18n/it.po
+++ b/addons/crm_profiling/i18n/it.po
@@ -6,16 +6,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-17 09:49+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-21 16:07+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-29 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
+msgid "Questions List"
+msgstr "Lista delle Domande"
+
 #. module: crm_profiling
 #: constraint:ir.model:0
 msgid ""
@@ -24,6 +29,11 @@ msgstr ""
 "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
 "speciali!"
 
+#. module: crm_profiling
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nome di modulo non valido nella definizione dell'azione."
+
 #. module: crm_profiling
 #: field:crm_profiling.answer,question_id:0
 #: field:crm_profiling.question,name:0
@@ -42,14 +52,14 @@ msgid "Child Profiles"
 msgstr "Profili figli"
 
 #. module: crm_profiling
-#: model:ir.module.module,shortdesc:crm_profiling.module_meta_information
-msgid "crm_profiling management"
-msgstr "Gestione crm_profiling"
+#: view:crm.segmentation:0
+msgid "Partner Segmentations"
+msgstr "Segmentazione Partner"
 
 #. module: crm_profiling
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Nome di modulo non valido nella definizione dell'azione."
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Errore ! Non puoi creare un menù ricorsivo"
 
 #. module: crm_profiling
 #: field:crm_profiling.answer,name:0
@@ -57,12 +67,23 @@ msgstr "Nome di modulo non valido nella definizione dell'azione."
 msgid "Answer"
 msgstr "Risposta"
 
+#. module: crm_profiling
+#: model:ir.model,name:crm_profiling.model_crm_segmentation
+msgid "Partner Segmentation"
+msgstr "Segmentazione Partner"
+
 #. module: crm_profiling
 #: view:res.partner:0
 msgid "Profiling"
 msgstr "Profilatura"
 
 #. module: crm_profiling
+#: model:ir.module.module,shortdesc:crm_profiling.module_meta_information
+msgid "Crm Profiling management - To Perform Segmentation within Partners"
+msgstr ""
+
+#. module: crm_profiling
+#: view:crm_profiling.questionnaire:0
 #: field:crm_profiling.questionnaire,description:0
 msgid "Description"
 msgstr "Descrizione"
@@ -102,11 +123,12 @@ msgid "Questionnaires"
 msgstr "Questionari"
 
 #. module: crm_profiling
-#: field:crm_profiling.questionnaire,name:0
-#: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire
-#: wizard_view:open_questionnaire,init:0
-msgid "Questionnaire"
-msgstr "Questionario"
+#: help:crm.segmentation,profiling_active:0
+msgid ""
+"Check                             this box if you want to use this tab as "
+"part of the                              segmentation rule. If not checked, "
+"the criteria beneath will be ignored"
+msgstr ""
 
 #. module: crm_profiling
 #: constraint:crm.segmentation:0
@@ -129,16 +151,6 @@ msgstr "Risposte Disponibili"
 msgid "Included Answers"
 msgstr "Includi Risposte"
 
-#. module: crm_profiling
-#: help:crm.segmentation,profiling_active:0
-msgid ""
-"Check this box if you want to use this tab as part of the segmentation rule. "
-"If not checked, the criteria beneath will be ignored"
-msgstr ""
-"Seleziona questa casella se si desidera utilizzare questa scheda come parte "
-"della regola di segmentazione. Se non è selezionata, i criteri di sotto "
-"verranno ignorati"
-
 #. module: crm_profiling
 #: view:crm_profiling.question:0
 #: field:crm_profiling.questionnaire,questions_ids:0
@@ -159,9 +171,18 @@ msgid "Cancel"
 msgstr "Annulla"
 
 #. module: crm_profiling
-#: view:crm.segmentation:0
-msgid "Partner Segmentations"
-msgstr "Segmentazione Partner"
+#: model:ir.model,name:crm_profiling.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: crm_profiling
+#: code:addons/crm_profiling/crm_profiling.py:0
+#: field:crm_profiling.questionnaire,name:0
+#: model:ir.model,name:crm_profiling.model_crm_profiling_questionnaire
+#: wizard_view:open_questionnaire,init:0
+#, python-format
+msgid "Questionnaire"
+msgstr "Questionario"
 
 #. module: crm_profiling
 #: model:ir.actions.wizard,name:crm_profiling.wizard_open_questionnaire
@@ -172,3 +193,14 @@ msgstr "Utilizzare un Questionario"
 #: wizard_button:open_questionnaire,open,compute:0
 msgid "Save Data"
 msgstr "Salva Dati"
+
+#~ msgid "crm_profiling management"
+#~ msgstr "Gestione crm_profiling"
+
+#~ msgid ""
+#~ "Check this box if you want to use this tab as part of the segmentation rule. "
+#~ "If not checked, the criteria beneath will be ignored"
+#~ msgstr ""
+#~ "Seleziona questa casella se si desidera utilizzare questa scheda come parte "
+#~ "della regola di segmentazione. Se non è selezionata, i criteri di sotto "
+#~ "verranno ignorati"
diff --git a/addons/delivery/i18n/fr.po b/addons/delivery/i18n/fr.po
index 1b9c82658c5..7d2923348d0 100644
--- a/addons/delivery/i18n/fr.po
+++ b/addons/delivery/i18n/fr.po
@@ -7,15 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-20 08:31+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2010-10-21 11: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: 2010-10-21 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: delivery
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valide pour l'architecture de la vue !"
+
 #. module: delivery
 #: constraint:product.template:0
 msgid "Error: UOS must be in a different category than the UOM"
@@ -230,11 +235,6 @@ msgstr "Tarifs"
 msgid "To Zip"
 msgstr "Code postal destination"
 
-#. module: delivery
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue !"
-
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Order Date"
diff --git a/addons/document/i18n/mn.po b/addons/document/i18n/mn.po
index e0865a6ab23..2a6d4da7af7 100644
--- a/addons/document/i18n/mn.po
+++ b/addons/document/i18n/mn.po
@@ -7,38 +7,244 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 10:18+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-21 09:19+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: 2010-09-30 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
-#: field:document.directory,create_date:0
-msgid "Date Created"
-msgstr "Үүсгэсэн огноо"
+#: field:document.directory,parent_id:0
+msgid "Parent Directory"
+msgstr "Толгой хавтас"
 
 #. module: document
-#: field:document.directory,ressource_id:0
-msgid "Resource ID"
-msgstr "Нөөц ID"
-
-#. module: document
-#: field:document.directory.content,include_name:0
-msgid "Include Record Name"
-msgstr "Бичлэгийн нэрийг багтаах"
-
-#. module: document
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
+#: model:ir.model,name:document.model_document_configuration
+msgid "Auto Directory Configuration"
 msgstr ""
-"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
-"болохгүй!"
+
+#. module: document
+#: field:document.directory,resource_field:0
+msgid "Name field"
+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
+#: view:document.directory:0
+msgid "Search Document Directory"
+msgstr "Баримтын хавтаст хайх"
+
+#. module: document
+#: help:document.directory,resource_field:0
+msgid ""
+"Field to be used as name on resource directories. If empty, the \"name\" "
+"will be used."
+msgstr ""
+
+#. module: document
+#: code:addons/document/document_directory.py:0
+#, python-format
+msgid "Directory name contains special characters!"
+msgstr "Хавтасын нэр тусгай тэмдэгт агуулсан байна!"
+
+#. module: document
+#: view:document.directory:0
+#: view:document.storage:0
+msgid "Group By..."
+msgstr "Бүлэглэх..."
+
+#. module: document
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_content_type
+msgid "Directory Content Type"
+msgstr "Хавтасын агуулгын төрөл"
+
+#. module: document
+#: view:document.directory:0
+msgid "Resources"
+msgstr "Нөөцүүд"
+
+#. module: document
+#: field:document.directory,file_ids:0
+#: view:report.document.user:0
+msgid "Files"
+msgstr "Файлууд"
+
+#. module: document
+#: view:report.files.partner:0
+msgid "Files per Month"
+msgstr "Сарын файлууд"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "March"
+msgstr "3 сар"
+
+#. module: document
+#: field:document.directory,company_id:0
+msgid "Company"
+msgstr "Компани"
+
+#. module: document
+#: model:ir.model,name:document.model_document_directory_content
+msgid "Directory Content"
+msgstr "Хавтасын агуулга"
+
+#. module: document
+#: view:document.directory:0
+msgid "Dynamic context"
+msgstr "Динамик контекст"
+
+#. module: document
+#: model:ir.ui.menu,name:document.menu_document_management_configuration
+msgid "Document Management"
+msgstr "Баримтын менежмент"
+
+#. module: document
+#: help:document.directory.dctx,expr:0
+msgid ""
+"A python expression used to evaluate the field.\n"
+"You can use 'dir_id' for current dir, 'res_id', 'res_model' as a reference "
+"to the current record, in dynamic folders"
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
+msgid "This Year"
+msgstr "Энэ жил"
+
+#. module: document
+#: field:document.storage,path:0
+msgid "Path"
+msgstr "Зам"
+
+#. module: document
+#: code:addons/document/document_directory.py:0
+#, python-format
+msgid "Directory name must be unique!"
+msgstr "Хавтасын нэр давхардаж болохгүй!"
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,index_content:0
+msgid "Indexed Content"
+msgstr "Индекслэсэн агуулга"
+
+#. module: document
+#: help:document.directory,resource_find_all:0
+msgid ""
+"If true, all attachments that match this resource will  be located. If "
+"false, only ones that have this as parent."
+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"
+msgstr "Хавтасууд"
+
+#. module: document
+#: field:document.configuration,sale_order:0
+msgid "Sale Order"
+msgstr "Борлуулах захиалга"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_user
+msgid "Files details by Users"
+msgstr "Файлын дэлгэрэнгүй, хэрэглэгчээр"
+
+#. module: document
+#: field:document.configuration,project:0
+msgid "Project"
+msgstr "Төсөл"
+
+#. module: document
+#: code:addons/document/document_storage.py:0
+#, python-format
+msgid "Error!"
+msgstr "Алдаа!"
+
+#. module: document
+#: help:document.configuration,product:0
+msgid "Auto directory configuration for Products."
+msgstr ""
+
+#. module: document
+#: field:document.directory,resource_find_all:0
+msgid "Find all resources"
+msgstr ""
+
+#. module: document
+#: selection:document.directory,type:0
+msgid "Folders per resource"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,suffix:0
+msgid "Suffix"
+msgstr "Дагавар"
+
+#. module: document
+#: field:report.document.user,change_date:0
+msgid "Modified Date"
+msgstr "Зассан огноо"
+
+#. module: document
+#: view:ir.attachment:0
+#: field:ir.attachment,partner_id:0
+#: field:report.files.partner,partner:0
+msgid "Partner"
+msgstr "Харилцагч"
+
+#. module: document
+#: view:board.board:0
+msgid "Files by Users"
+msgstr "Файлууд, хэрэглэгчээр"
+
+#. module: document
+#: field:process.node,directory_id:0
+msgid "Document directory"
+msgstr "Баримтын хавтас"
+
+#. module: document
+#: code:addons/document/document.py:0
+#: code:addons/document/document_directory.py:0
+#, python-format
+msgid "ValidateError"
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr "ir.actions.report.xml"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.action_document_file_form
+#: view:ir.attachment:0
+#: model:ir.ui.menu,name:document.menu_document_doc
+#: model:ir.ui.menu,name:document.menu_document_files
+msgid "Documents"
+msgstr "Баримтууд"
 
 #. module: document
 #: field:ir.actions.report.xml,model_id:0
@@ -51,63 +257,198 @@ msgid "Error! You can not create recursive Directories."
 msgstr "Алдаа! Рекурсив хавтас үүсгэж болохгүй."
 
 #. module: document
-#: model:ir.ui.menu,name:document.menu_document_configuration
-msgid "Document Configuration"
-msgstr "Баримтын тохиргоо"
+#: view:document.directory:0
+#: field:document.directory,storage_id:0
+msgid "Storage"
+msgstr "Хадгалах төхөөрөмж"
 
 #. module: document
-#: view:ir.attachment:0
-msgid "Preview"
-msgstr "Урьдчилан харах"
-
-#. module: document
-#: field:ir.attachment,store_method:0
-msgid "Storing Method"
-msgstr "Хадгалах арга"
-
-#. module: document
-#: model:ir.actions.act_window,name:document.action_config_auto_directory
-msgid "Auto Configure Directory"
-msgstr ""
+#: 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
+#: field:report.files.partner,file_size:0
 msgid "File Size"
 msgstr "Файлын хэмжээ"
 
 #. module: document
-#: help:document.directory.content,include_name:0
+#: field:document.directory.content.type,name:0
+#: field:ir.attachment,file_type:0
+msgid "Content Type"
+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
+#: help:document.directory,ressource_type_id:0
 msgid ""
-"Check this field if you want that the name of the file start by the record "
-"name."
+"Select an object here and there will be one folder per record of that "
+"resource."
 msgstr ""
-"Хэрэв файлын нэрийг бичлэгийн нэрээр эхлүүлэхийг хүсэж байгаа бол энэ "
-"талбарыг чагтлана."
 
 #. module: document
-#: selection:document.directory,type:0
-msgid "Other Resources"
-msgstr "Бусад нөөц"
+#: help:document.directory,domain:0
+msgid ""
+"Use a domain if you want to apply an automatic filter on visible resources."
+msgstr "Хэрэв нөөцүүд дээр шүүлт хэрэглэх бол домэйн ашиглана."
 
 #. module: document
-#: field:document.directory,ressource_parent_type_id:0
-msgid "Parent Model"
-msgstr "Толгой модель"
+#: model:ir.actions.act_window,name:document.action_view_files_by_partner
+msgid "Files Per Partner"
+msgstr ""
 
 #. module: document
-#: view:document.configuration.wizard:0
-msgid "Document Management System."
-msgstr "Баримтын удирдлагын систем"
+#: field:document.directory,dctx_ids:0
+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
+msgid "Directory Type"
+msgstr "Хавтасын төрөл"
+
+#. module: document
+#: field:document.directory.content,report_id:0
+msgid "Report"
+msgstr "Тайлан"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "July"
+msgstr "7 сар"
+
+#. module: document
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Дэлгэцийн XML алдаатай!"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.open_board_document_manager
+#: model:ir.ui.menu,name:document.menu_reports_document_manager
+msgid "Document Dashboard"
+msgstr "Баримтын хянах самбар"
+
+#. module: document
+#: field:document.directory.content.type,code:0
+msgid "Extension"
+msgstr "Өргөтгөл"
 
 #. module: document
 #: view:ir.attachment:0
-msgid "Attachment"
-msgstr "Хавсралт"
+msgid "Created"
+msgstr "Үүссэн"
 
 #. module: document
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
+#: field:document.directory,content_ids:0
+msgid "Virtual Files"
+msgstr "Виртуаль файлууд"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Modified"
+msgstr "Өөрчилсөн"
+
+#. module: document
+#: code:addons/document/document_storage.py:0
+#, python-format
+msgid "Error at doc write!"
+msgstr ""
+
+#. module: document
+#: view:document.directory:0
+msgid "Generated Files"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,directory_id:0
+#: field:document.directory.dctx,dir_id:0
+#: model:ir.actions.act_window,name:document.action_document_file_directory_form
+#: view:ir.attachment:0
+#: field:ir.attachment,parent_id:0
+#: model:ir.model,name:document.model_document_directory
+#: field:report.document.user,directory:0
+msgid "Directory"
+msgstr "Хавтас"
+
+#. module: document
+#: view:board.board:0
+msgid "Files by Partner"
+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 "Сүүлд зассан хэрэглэгч"
+
+#. module: document
+#: model:ir.actions.act_window,name:document.act_res_partner_document
+#: model:ir.actions.act_window,name:document.zoom_directory
+msgid "Related Documents"
+msgstr "Холбогдох баримтууд"
+
+#. module: document
+#: field:document.configuration,progress:0
+msgid "Configuration Progress"
+msgstr "Тохируулгын явц"
+
+#. module: document
+#: field:document.directory,domain:0
+msgid "Domain"
+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 "Зассан огноо"
+
+#. module: document
+#: model:ir.model,name:document.model_report_document_file
+msgid "Files details by Directory"
+msgstr "Файлын дэлгэрэнгүй, хавтасаар"
+
+#. module: document
+#: view:report.document.user:0
+msgid "All users files"
+msgstr ""
+
+#. module: document
+#: view:board.board:0
+#: model:ir.actions.act_window,name:document.action_view_size_month
+#: view:report.document.file:0
+msgid "File Size by Month"
+msgstr "Файлын хэмжээ, сараар"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "December"
+msgstr "12 сар"
+
+#. module: document
+#: field:document.configuration,config_logo:0
+msgid "Image"
+msgstr "Зураг"
 
 #. module: document
 #: selection:document.directory,type:0
@@ -115,15 +456,97 @@ msgid "Static Directory"
 msgstr "Статик хавтас"
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content_type
-msgid "Directory Content Type"
-msgstr "Хавтасын агуулгын төрөл"
+#: field:document.directory,child_ids:0
+msgid "Children"
+msgstr ""
 
 #. module: document
-#: help:document.directory,domain:0
+#: view:document.directory:0
+msgid "Define words in the context, for all child directories and files"
+msgstr ""
+
+#. module: document
+#: model:ir.module.module,description:document.module_meta_information
 msgid ""
-"Use a domain if you want to apply an automatic filter on visible resources."
-msgstr "Хэрэв нөөцүүд дээр шүүлт хэрэглэх бол домэйн ашиглана."
+"This is a complete document management system:\n"
+"    * User Authentication\n"
+"    * Document Indexation :- .pptx and .docx files are not support 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 by Month (graph)\n"
+"    ATTENTION:\n"
+"    - When you install this module in a running company that have already "
+"PDF files stored into the database,\n"
+"      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: document
+#: help:document.storage,online:0
+msgid ""
+"If not checked, media is currently offline and its contents not available"
+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
+#: field:report.document.wall,user_id:0
+msgid "Owner"
+msgstr "Эзэмшигч"
+
+#. module: document
+#: view:document.directory:0
+msgid "PDF Report"
+msgstr "PDF тайлан"
+
+#. module: document
+#: view:document.directory:0
+msgid "Contents"
+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
+#: help:document.directory.content,include_name:0
+msgid ""
+"Check this field if you want that the name of the file to contain the record "
+"name.\n"
+"If set, the directory will have to be a resource one."
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,include_name:0
+msgid "Include Record Name"
+msgstr "Бичлэгийн нэрийг багтаах"
+
+#. module: document
+#: view:ir.attachment:0
+msgid "Attachment"
+msgstr "Хавсралт"
+
+#. module: document
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Алдаа! Та рекурсив цэс үүсгэж чадахгүй."
+
+#. module: document
+#: field:document.storage,online:0
+msgid "Online"
+msgstr "Онлайн"
 
 #. module: document
 #: help:document.directory,ressource_tree:0
@@ -133,69 +556,117 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: field:document.directory,type:0
-msgid "Type"
-msgstr "Төрөл"
+#: view:document.directory:0
+msgid "Security"
+msgstr "Аюулгүй байдал"
 
 #. module: document
-#: model:ir.actions.act_window,name:document.action_document_directory_tree
-#: model:ir.ui.menu,name:document.menu_document_directories_tree
-msgid "Directorie's Structure"
-msgstr "Хавтасын бүтэц"
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "August"
+msgstr "8 сар"
 
 #. module: document
-#: field:document.directory,parent_id:0
-msgid "Parent Item"
-msgstr "Толгой элемент"
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "June"
+msgstr "6 сар"
+
+#. module: document
+#: field:report.document.user,user:0
+#: field:report.document.wall,user:0
+msgid "User"
+msgstr "Хэрэглэгч"
+
+#. module: document
+#: field:document.directory,group_ids:0
+#: field:document.storage,group_ids:0
+msgid "Groups"
+msgstr "Группүүд"
+
+#. module: document
+#: field:document.directory.content.type,active:0
+msgid "Active"
+msgstr "Идэвхтэй"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "November"
+msgstr "11 сар"
 
 #. module: document
 #: view:ir.attachment:0
-msgid "File Information"
-msgstr "Файлын мэдээлэл"
+#: field:ir.attachment,db_datas:0
+msgid "Data"
+msgstr "Өгөгдөл"
+
+#. module: document
+#: view:document.directory:0
+msgid "Definition"
+msgstr "Тодорхойлолт"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "October"
+msgstr "10 сар"
+
+#. module: document
+#: view:document.directory:0
+msgid "Seq."
+msgstr "Д/д."
+
+#. module: document
+#: selection:document.storage,type:0
+msgid "Database"
+msgstr "Өгөгдлийн сан"
+
+#. module: document
+#: help:document.configuration,project:0
+msgid "Auto directory configuration for Projects."
+msgstr ""
 
 #. module: document
-#: field:document.directory,file_ids:0
 #: view:ir.attachment:0
-msgid "Files"
-msgstr "Файлууд"
+msgid "Related to"
+msgstr "Холбоотой"
 
 #. module: document
-#: field:ir.attachment,store_fname:0
-msgid "Stored Filename"
-msgstr "Нөөцөлсөн файлын нэр"
+#: model:ir.module.module,shortdesc:document.module_meta_information
+msgid "Integrated Document Management System"
+msgstr "Баримтын удирдлагын систем"
 
 #. module: document
-#: field:document.directory,write_uid:0
-#: field:ir.attachment,write_uid:0
-msgid "Last Modification User"
-msgstr "Сүүлд зассан хэрэглэгч"
+#: view:ir.attachment:0
+msgid "Attached To"
+msgstr "Хавсаргах"
 
 #. module: document
-#: view:document.configuration.wizard:0
-msgid "Configure"
-msgstr "Тохиргоо"
+#: model:ir.ui.menu,name:document.menu_reports_document
+msgid "Dashboard"
+msgstr "Хянах самбар"
 
 #. module: document
-#: field:document.directory,ressource_tree:0
-msgid "Tree Structure"
-msgstr "Мод бүтэц"
+#: model:ir.actions.act_window,name:document.action_view_user_graph
+msgid "Files By Users"
+msgstr "Файлууд, хэрэглэгчээр"
 
 #. module: document
-#: field:ir.attachment,title:0
-msgid "Resource Title"
-msgstr "Нөөцийн нэр"
+#: field:document.storage,readonly:0
+msgid "Read Only"
+msgstr "Зөвхөн уншигдах"
 
 #. module: document
-#: model:ir.actions.todo,note:document.config_auto_directory
-msgid ""
-"This wizard will configure the URL of the server of the document management "
-"system."
-msgstr "Энэ визард нь баримтын удирдлагын серверийн хаягыг тохируулна."
+#: field:document.directory.dctx,expr:0
+msgid "Expression"
+msgstr "Илэрхийлэл"
 
 #. module: document
-#: model:ir.model,name:document.model_document_directory_content
-msgid "Directory Content"
-msgstr "Хавтасын агуулга"
+#: field:document.directory,create_uid:0
+#: field:document.storage,create_uid:0
+msgid "Creator"
+msgstr "Үүсгэгч"
 
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
@@ -205,308 +676,82 @@ msgid ""
 msgstr ""
 
 #. module: document
-#: model:ir.ui.menu,name:document.menu_document
-msgid "Document Management"
-msgstr "Баримтын менежмент"
+#: 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"
+msgstr "Файлууд, сараар"
 
 #. module: document
-#: selection:ir.attachment,store_method:0
-msgid "Link"
-msgstr "Холбоос"
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "September"
+msgstr "9 сар"
 
 #. module: document
-#: view:document.directory:0
-msgid "Directory Type"
-msgstr "Хавтасын төрөл"
+#: field:document.directory.content,prefix:0
+msgid "Prefix"
+msgstr "Угтвар"
 
 #. module: document
-#: field:document.directory,group_ids:0
-#: field:ir.attachment,group_ids:0
-msgid "Groups"
-msgstr "Группүүд"
+#: field:report.document.wall,last:0
+msgid "Last Posted Time"
+msgstr "Сүүлд оруулсан огноо"
 
 #. module: document
-#: field:document.directory.content,report_id:0
-msgid "Report"
-msgstr "Тайлан"
+#: field:report.document.user,datas_fname:0
+msgid "File Name"
+msgstr "Файлын нэр"
 
 #. module: document
-#: help:document.configuration.wizard,host:0
+#: field:document.directory,ressource_id:0
+msgid "Resource ID"
+msgstr "Нөөц ID"
+
+#. module: document
+#: selection:document.storage,type:0
+msgid "External file storage"
+msgstr "Гадаад файлын төхөөрөмж"
+
+#. module: document
+#: constraint:ir.model:0
 msgid ""
-"Put here the server address or IP. Keep localhost if you don't know what to "
-"write."
+"The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"Энд серверийн хаяг эсвэл IP дугаарыг бичнэ. Юу бичихээ мэдэхгүй бол "
-"localhost хэвээр нь үлдээнэ."
-
-#. module: document
-#: view:document.configuration.wizard:0
-msgid ""
-"This wizard will automatically configure the document management system "
-"according to modules installed on your system."
-msgstr ""
-
-#. module: document
-#: view:ir.attachment:0
-msgid "Data"
-msgstr "Өгөгдөл"
-
-#. module: document
-#: view:ir.attachment:0
-msgid "Notes"
-msgstr "Тэмдэглэл"
-
-#. module: document
-#: view:ir.attachment:0
-#: field:ir.attachment,index_content:0
-msgid "Indexed Content"
-msgstr "Индекслэсэн агуулга"
-
-#. module: document
-#: view:document.directory:0
-msgid "Definition"
-msgstr "Тодорхойлолт"
-
-#. module: document
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Дэлгэцийн XML алдаатай!"
-
-#. module: document
-#: model:ir.module.module,description:document.module_meta_information
-msgid ""
-"This is a complete document management system:\n"
-"    * FTP Interface\n"
-"    * User Authentication\n"
-"    * Document Indexation\n"
-msgstr ""
-"Баримтын иж бүрэн систем:\n"
-"    * FTP интерфэйс\n"
-"    * Хэрэглэгчийн шалгалт\n"
-"    * Баримтын индекслэлт\n"
-
-#. module: document
-#: field:document.directory,name:0
-msgid "Name"
-msgstr "Нэр"
-
-#. module: document
-#: field:document.directory.content.type,code:0
-msgid "Extension"
-msgstr "Өргөтгөл"
-
-#. module: document
-#: selection:ir.attachment,store_method:0
-msgid "Database"
-msgstr "Өгөгдлийн сан"
-
-#. module: document
-#: field:document.directory,content_ids:0
-msgid "Virtual Files"
-msgstr "Виртуаль файлууд"
-
-#. module: document
-#: view:document.directory:0
-#: model:ir.ui.menu,name:document.menu_document_directories
-msgid "Directories"
-msgstr "Хавтасууд"
-
-#. module: document
-#: view:document.directory:0
-msgid "Seq."
-msgstr "Д/д."
-
-#. module: document
-#: model:ir.module.module,shortdesc:document.module_meta_information
-msgid "Integrated Document Management System"
-msgstr "Баримтын удирдлагын систем"
-
-#. module: document
-#: field:document.directory.content,directory_id:0
-#: field:ir.attachment,parent_id:0
-msgid "Directory"
-msgstr "Хавтас"
-
-#. module: document
-#: field:document.directory,user_id:0
-#: field:ir.attachment,user_id:0
-msgid "Owner"
-msgstr "Эзэмшигч"
-
-#. module: document
-#: model:ir.model,name:document.model_document_configuration_wizard
-msgid "document.configuration.wizard"
-msgstr "document.configuration.wizard"
-
-#. module: document
-#: view:ir.attachment:0
-msgid "Attached To"
-msgstr "Хавсаргах"
-
-#. module: document
-#: selection:ir.attachment,store_method:0
-msgid "Filesystem"
-msgstr "Файлсистем"
-
-#. module: document
-#: field:document.directory,file_type:0
-#: field:document.directory.content.type,name:0
-#: field:ir.attachment,file_type:0
-msgid "Content Type"
-msgstr "Агуулгын төрөл"
-
-#. module: document
-#: view:document.directory:0
-#: view:ir.attachment:0
-msgid "Security"
-msgstr "Аюулгүй байдал"
-
-#. module: document
-#: model:ir.ui.menu,name:document.menu_document_browse
-msgid "Browse Files Using FTP"
-msgstr "FTP-ээр файл хайх"
-
-#. module: document
-#: field:document.directory,ressource_type_id:0
-msgid "Directories Mapped to Objects"
-msgstr ""
-
-#. module: document
-#: view:ir.attachment:0
-msgid "History"
-msgstr "Түүх"
-
-#. module: document
-#: help:document.directory,ressource_type_id:0
-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."
-msgstr ""
-
-#. module: document
-#: view:ir.attachment:0
-msgid "Others Info"
-msgstr "Бусад мэдээлэл"
-
-#. module: document
-#: field:document.directory,domain:0
-msgid "Domain"
-msgstr "Домэйн"
-
-#. module: document
-#: field:document.directory,write_date:0
-#: field:ir.attachment,write_date:0
-msgid "Date Modified"
-msgstr "Зассан огноо"
-
-#. module: document
-#: field:document.directory.content,suffix:0
-msgid "Suffix"
-msgstr "Дагавар"
-
-#. module: document
-#: field:document.configuration.wizard,host:0
-msgid "Server Address"
-msgstr "Сервер хаяг"
-
-#. module: document
-#: model:ir.actions.url,name:document.action_document_browse
-msgid "Browse Files"
-msgstr "Файл ачаалах"
-
-#. module: document
-#: field:document.directory.content,name:0
-msgid "Content Name"
-msgstr "Агуулгын нэр"
-
-#. module: document
-#: model:ir.model,name:document.model_document_directory
-#: field:process.node,directory_id:0
-msgid "Document directory"
-msgstr "Баримтын хавтас"
-
-#. module: document
-#: field:document.directory,create_uid:0
-msgid "Creator"
-msgstr "Үүсгэгч"
-
-#. module: document
-#: view:document.directory:0
-msgid "Auto-Generated Files"
-msgstr "Автоматаар үүссэн файлууд"
-
-#. module: document
-#: field:document.directory.content,sequence:0
-msgid "Sequence"
-msgstr "Дараалал"
-
-#. module: document
-#: model:ir.ui.menu,name:document.menu_document_files
-msgid "Search a File"
-msgstr "Файл хайх"
-
-#. module: document
-#: view:document.configuration.wizard:0
-msgid "Auto Configure"
-msgstr ""
-
-#. module: document
-#: view:document.configuration.wizard:0
-msgid "Cancel"
-msgstr "Болих"
-
-#. module: document
-#: field:ir.attachment,partner_id:0
-msgid "Partner"
-msgstr "Харилцагч"
-
-#. module: document
-#: view:document.directory:0
-msgid "PDF Report"
-msgstr "PDF тайлан"
-
-#. module: document
-#: field:document.directory.content,extension:0
-msgid "Document Type"
-msgstr "Баримтын төрөл"
-
-#. module: document
-#: field:document.directory,child_ids:0
-msgid "Children"
-msgstr ""
-
-#. module: document
-#: view:document.directory:0
-msgid "Contents"
-msgstr "Агуулга"
-
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_files_by_partner
-msgid "Files Per Month"
-msgstr "Сарын файлууд"
+"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+"болохгүй!"
 
 #. module: document
+#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_wall
-#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_shame
 #: view:report.document.wall:0
 msgid "Wall of Shame"
 msgstr ""
 
+#. module: document
+#: help:document.storage,path:0
+msgid "For file storage, the root path of the storage"
+msgstr ""
+
 #. module: document
 #: model:ir.model,name:document.model_report_files_partner
 msgid "Files details by Partners"
 msgstr "Файлын дэлгэрэнгүй, харилцагчаар"
 
 #. module: document
-#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all
-msgid "All Months"
-msgstr "Бүх сар"
+#: field:document.directory.dctx,field:0
+msgid "Field"
+msgstr "Талбар"
 
 #. module: document
-#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_myfile
-#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_myfile
-msgid "My files"
-msgstr "Миний файлууд"
+#: model:ir.model,name:document.model_document_directory_dctx
+msgid "Directory Dynamic Context"
+msgstr ""
+
+#. module: document
+#: field:document.directory,ressource_parent_type_id:0
+msgid "Parent Model"
+msgstr "Толгой модель"
 
 #. module: document
 #: view:report.document.user:0
@@ -514,130 +759,341 @@ msgid "Files by users"
 msgstr "Файлууд, хэрэглэгчээр"
 
 #. module: document
-#: view:report.files.partner:0
-msgid "Files per Month"
-msgstr "Сарын файлууд"
+#: field:report.document.file,month:0
+#: field:report.document.user,month:0
+#: field:report.document.wall,month:0
+#: field:report.document.wall,name:0
+#: field:report.files.partner,month:0
+msgid "Month"
+msgstr "Сар"
 
 #. module: document
-#: model:ir.actions.act_window,name:document.action_view_my_document_tree1
-msgid "My files (All months)"
-msgstr "Миний файлууд (бүх сар)"
-
-#. module: document
-#: field:report.document.wall,file_name:0
-msgid "Last Posted File Name"
-msgstr "Сүүлд оруулсан файл"
-
-#. module: document
-#: model:ir.ui.menu,name:document.menu_action_view_my_document_report
+#: model:ir.ui.menu,name:document.menu_reporting
 msgid "Reporting"
 msgstr "Тайлан"
 
+#. module: document
+#: field:document.configuration,product:0
+msgid "Product"
+msgstr "Бүтээгдэхүүн"
+
+#. module: document
+#: field:document.directory,ressource_tree:0
+msgid "Tree Structure"
+msgstr "Мод бүтэц"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,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
 #: model:ir.model,name:document.model_report_document_wall
 msgid "Users that did not inserted documents since one month"
 msgstr "Нэг сараас хойш баримт оруулаагүй хэрэглэгчид"
 
+#. module: document
+#: view:document.directory:0
+msgid "For each entry here, virtual files will appear in this folder."
+msgstr ""
+
+#. module: document
+#: model:ir.model,name:document.model_ir_attachment
+msgid "ir.attachment"
+msgstr "ir.attachment"
+
+#. module: document
+#: view:board.board:0
+msgid "New Files"
+msgstr "Шинэ файлууд"
+
+#. module: document
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "January"
+msgstr "1 сар"
+
+#. module: document
+#: view:document.directory:0
+msgid "Static"
+msgstr "Статик"
+
 #. module: document
 #: view:report.files.partner:0
 msgid "Files By Partner"
 msgstr "Файлууд, харилцагчаар"
 
 #. module: document
-#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this
+#: help:document.directory.dctx,field:0
+msgid ""
+"The name of the field. Note that the prefix \"dctx_\" will be prepended to "
+"what is typed here."
+msgstr ""
+
+#. module: document
+#: view:report.document.user:0
 msgid "This Month"
 msgstr "Энэ сар"
 
 #. module: document
-#: field:report.document.user,user:0 field:report.document.wall,user:0
-msgid "User"
-msgstr "Хэрэглэгч"
+#: view:ir.attachment:0
+msgid "Notes"
+msgstr "Тэмдэглэл"
 
 #. module: document
-#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_all_userfile
-#: model:ir.ui.menu,name:document.menu_action_view_my_document_report_this_userfile
-msgid "All Users files"
-msgstr "Бүх хэрэглэгчийн файлууд"
+#: help:document.configuration,sale_order:0
+msgid ""
+"Auto directory configuration for Sale Orders and Quotation with report."
+msgstr ""
 
 #. module: document
-#: model:ir.actions.act_window,name:document.action_view_my_document_tree
-msgid "My files (This months)"
-msgstr "Миний файлууд (энэ сар)"
+#: help:document.directory,type:0
+msgid ""
+"Each directory can either have the type Static or be linked to another "
+"resource. A static directory, as with Operating Systems, is the classic "
+"directory that can contain a set of files. The directories linked to systems "
+"resources automatically possess sub-directories for each of resource types "
+"defined in the parent directory."
+msgstr ""
 
 #. module: document
-#: model:ir.model,name:document.model_report_document_user
-msgid "Files details by Users"
-msgstr "Файлын дэлгэрэнгүй, хэрэглэгчээр"
+#: selection:report.document.user,month:0
+#: selection:report.files.partner,month:0
+msgid "February"
+msgstr "2 сар"
 
 #. module: document
-#: field:report.document.file,nbr:0 field:report.document.user,nbr:0
+#: model:ir.actions.act_window,name:document.open_board_document_manager1
+#: model:ir.ui.menu,name:document.menu_reports_document_manager1
+msgid "Statistics by User"
+msgstr ""
+
+#. module: document
+#: field:document.directory,name:0
+#: field:document.storage,name:0
+msgid "Name"
+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
+#: selection:report.files.partner,month:0
+msgid "April"
+msgstr "4 сар"
+
+#. module: document
+#: field:report.document.user,nbr:0
 #: field:report.files.partner,nbr:0
 msgid "# of Files"
 msgstr "Файлын тоо"
 
 #. module: document
-#: model:ir.actions.act_window,name:document.action_view_user_graph
-msgid "Files By Users"
-msgstr "Файлууд, хэрэглэгчээр"
+#: view:document.directory:0
+msgid ""
+"Only members of these groups will have access to this directory and its "
+"files."
+msgstr ""
 
 #. module: document
-#: model:ir.module.module,shortdesc:report_document.module_meta_information
-msgid "Document Management - Reporting"
-msgstr "Баримтын удирдлага - Тайлан"
+#: 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.actions.act_window,name:document.action_view_all_document_tree1
-msgid "All Users files (All months)"
-msgstr "Бүх хэрэглэгчийн файлууд (бүх сар)"
+#: field:document.directory.content.type,mimetype:0
+msgid "Mime Type"
+msgstr "MIME Төрөл"
 
 #. module: document
-#: model:ir.model,name:document.model_report_document_file
-msgid "Files details by Directory"
-msgstr "Файлын дэлгэрэнгүй, хавтасаар"
+#: field:document.directory.content,sequence:0
+msgid "Sequence"
+msgstr "Дараалал"
 
 #. module: document
-#: field:report.document.user,change_date:0
-#: field:report.files.partner,change_date:0
-msgid "Modified Date"
-msgstr "Зассан огноо"
+#: field:document.directory.content,name:0
+msgid "Content Name"
+msgstr "Агуулгын нэр"
 
 #. module: document
-#: model:ir.actions.act_window,name:document.action_view_size_month
-#: view:report.document.file:0
-msgid "File Size by Month"
-msgstr "Файлын хэмжээ, сараар"
+#: code:addons/document/document.py:0
+#, python-format
+msgid "File name must be unique!"
+msgstr "Файлын нэр давхардаж болохгүй!"
 
 #. module: document
-#: field:report.document.user,file_title:0
-#: field:report.files.partner,file_title:0
-msgid "File Name"
-msgstr "Файлын нэр"
+#: selection:document.storage,type:0
+msgid "Internal File storage"
+msgstr "Дотоод файлын төхөөрөмж"
 
 #. module: document
-#: field:report.document.file,month:0 field:report.document.user,month:0
-#: field:report.document.user,name:0 field:report.document.wall,month:0
-#: field:report.document.wall,name:0 field:report.files.partner,name:0
-msgid "Month"
-msgstr "Сар"
-
-#. module: document
-#: model:ir.actions.act_window,name:document.action_view_files_by_month_graph
-#: view:report.document.user:0
-msgid "Files by Month"
-msgstr "Файлууд, сараар"
+#: model:ir.actions.act_window,name:document.action_document_directory_tree
+#: model:ir.ui.menu,name:document.menu_document_directories_tree
+msgid "Directories' Structure"
+msgstr ""
 
 #. module: document
+#: view:board.board:0
 #: model:ir.actions.act_window,name:document.action_view_document_by_resourcetype_graph
 #: view:report.document.user:0
 msgid "Files by Resource Type"
 msgstr "Файлууд, нөөцийн төрлөөр"
 
 #. module: document
-#: model:ir.actions.act_window,name:document.action_view_all_document_tree
-msgid "All Users files (This month)"
-msgstr "Бүх хэрэглэгчийн файлууд (энэ сар)"
+#: field:report.document.user,name:0
+#: field:report.files.partner,name:0
+msgid "Year"
+msgstr ""
 
 #. module: document
-#: field:report.document.wall,last:0
-msgid "Last Posted Time"
-msgstr "Сүүлд оруулсан огноо"
+#: view:document.storage:0
+#: model:ir.model,name:document.model_document_storage
+#: model:ir.ui.menu,name:document.menu_document_storage_media
+msgid "Storage Media"
+msgstr ""
+
+#. module: document
+#: view:document.storage:0
+msgid "Search Document storage"
+msgstr ""
+
+#. module: document
+#: field:document.directory.content,extension:0
+msgid "Document Type"
+msgstr "Баримтын төрөл"
+
+#~ msgid "Preview"
+#~ msgstr "Урьдчилан харах"
+
+#~ msgid "Document Configuration"
+#~ msgstr "Баримтын тохиргоо"
+
+#~ msgid "Storing Method"
+#~ msgstr "Хадгалах арга"
+
+#~ msgid "Other Resources"
+#~ msgstr "Бусад нөөц"
+
+#~ msgid "Document Management System."
+#~ msgstr "Баримтын удирдлагын систем"
+
+#~ msgid "Directorie's Structure"
+#~ msgstr "Хавтасын бүтэц"
+
+#~ msgid "File Information"
+#~ msgstr "Файлын мэдээлэл"
+
+#~ msgid "Resource Title"
+#~ msgstr "Нөөцийн нэр"
+
+#~ msgid "Link"
+#~ msgstr "Холбоос"
+
+#~ msgid "Filesystem"
+#~ msgstr "Файлсистем"
+
+#~ msgid "History"
+#~ msgstr "Түүх"
+
+#~ msgid "Server Address"
+#~ msgstr "Сервер хаяг"
+
+#~ msgid "Search a File"
+#~ msgstr "Файл хайх"
+
+#~ msgid "Cancel"
+#~ msgstr "Болих"
+
+#~ msgid "Files Per Month"
+#~ msgstr "Сарын файлууд"
+
+#~ msgid "All Months"
+#~ msgstr "Бүх сар"
+
+#~ msgid "My files"
+#~ msgstr "Миний файлууд"
+
+#~ msgid "Parent Item"
+#~ msgstr "Толгой элемент"
+
+#~ msgid ""
+#~ "Check this field if you want that the name of the file start by the record "
+#~ "name."
+#~ msgstr ""
+#~ "Хэрэв файлын нэрийг бичлэгийн нэрээр эхлүүлэхийг хүсэж байгаа бол энэ "
+#~ "талбарыг чагтлана."
+
+#~ msgid ""
+#~ "This is a complete document management system:\n"
+#~ "    * FTP Interface\n"
+#~ "    * User Authentication\n"
+#~ "    * Document Indexation\n"
+#~ msgstr ""
+#~ "Баримтын иж бүрэн систем:\n"
+#~ "    * FTP интерфэйс\n"
+#~ "    * Хэрэглэгчийн шалгалт\n"
+#~ "    * Баримтын индекслэлт\n"
+
+#~ msgid "document.configuration.wizard"
+#~ msgstr "document.configuration.wizard"
+
+#~ msgid ""
+#~ "This wizard will configure the URL of the server of the document management "
+#~ "system."
+#~ msgstr "Энэ визард нь баримтын удирдлагын серверийн хаягыг тохируулна."
+
+#~ msgid ""
+#~ "Put here the server address or IP. Keep localhost if you don't know what to "
+#~ "write."
+#~ msgstr ""
+#~ "Энд серверийн хаяг эсвэл IP дугаарыг бичнэ. Юу бичихээ мэдэхгүй бол "
+#~ "localhost хэвээр нь үлдээнэ."
+
+#~ msgid "Others Info"
+#~ msgstr "Бусад мэдээлэл"
+
+#~ msgid "Browse Files Using FTP"
+#~ msgstr "FTP-ээр файл хайх"
+
+#~ msgid "Auto-Generated Files"
+#~ msgstr "Автоматаар үүссэн файлууд"
+
+#~ msgid "My files (This months)"
+#~ msgstr "Миний файлууд (энэ сар)"
+
+#~ msgid "My files (All months)"
+#~ msgstr "Миний файлууд (бүх сар)"
+
+#~ msgid "Last Posted File Name"
+#~ msgstr "Сүүлд оруулсан файл"
+
+#~ msgid "Document Management - Reporting"
+#~ msgstr "Баримтын удирдлага - Тайлан"
+
+#~ msgid "All Users files (All months)"
+#~ msgstr "Бүх хэрэглэгчийн файлууд (бүх сар)"
+
+#~ msgid "All Users files (This month)"
+#~ msgstr "Бүх хэрэглэгчийн файлууд (энэ сар)"
+
+#~ msgid "Browse Files"
+#~ msgstr "Файл ачаалах"
+
+#~ msgid "Configure"
+#~ msgstr "Тохиргоо"
diff --git a/addons/document_ics/i18n/it.po b/addons/document_ics/i18n/it.po
index bfe916d2a0f..1378ef4fab3 100644
--- a/addons/document_ics/i18n/it.po
+++ b/addons/document_ics/i18n/it.po
@@ -6,16 +6,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 09:04+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-21 16:08+0000\n"
+"Last-Translator: simone.sandri <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-30 04:43+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: document_ics
+#: help:document.ics.crm.wizard,claims:0
+msgid ""
+"Manages the supplier and customers claims,including your corrective or "
+"preventive actions."
+msgstr ""
+
+#. module: document_ics
+#: field:document.directory.content,object_id:0
+msgid "Object"
+msgstr "Oggetto"
+
 #. module: document_ics
 #: constraint:ir.model:0
 msgid ""
@@ -30,34 +42,37 @@ msgid "uid"
 msgstr "uid"
 
 #. module: document_ics
-#: constraint:document.directory:0
-msgid "Error! You can not create recursive Directories."
-msgstr "Errore! Non puoi creare Direcroty ricorsive"
+#: help:document.ics.crm.wizard,fund:0
+msgid ""
+"This may help associations in their fund raising process and tracking."
+msgstr ""
+"Questo può aiutare le associazioni nel loro processo di raccolta fondi e nel "
+"mantenimento della traccia."
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,jobs:0
 msgid "Jobs Hiring Process"
 msgstr "Processo di Assunzioni"
 
-#. module: document_ics
-#: view:document.ics.crm.wizard:0
-msgid "Configure Calendars for CRM Sections"
-msgstr "Configura i Calendari per le sezioni CRM"
-
 #. module: document_ics
 #: field:document.ics.crm.wizard,helpdesk:0
 msgid "Helpdesk"
 msgstr "Helpdesk"
 
 #. module: document_ics
-#: field:document.directory.ics.fields,field_id:0
-msgid "Open ERP Field"
-msgstr "Apri campo ERP"
+#: selection:document.directory.ics.fields,fn:0
+msgid "Interval in hours"
+msgstr "Intervallo in ore"
 
 #. module: document_ics
-#: view:document.ics.crm.wizard:0
-msgid "Next"
-msgstr "Prossimo"
+#: selection:document.directory.ics.fields,name:0
+msgid "attendee"
+msgstr "partecipante"
+
+#. module: document_ics
+#: constraint:crm.case.section:0
+msgid "Error ! You cannot create recursive Sales team."
+msgstr ""
 
 #. module: document_ics
 #: field:document.directory.ics.fields,content_id:0
@@ -75,50 +90,42 @@ msgid "Shared Calendar Meetings"
 msgstr "Condividi il Calendario Riunioni"
 
 #. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "url"
-msgstr "URL"
+#: help:document.ics.crm.wizard,helpdesk:0
+msgid "Manages an Helpdesk service."
+msgstr "Gestisci un servizio di Helpdesk"
 
 #. module: document_ics
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "Nome del modello non valido nella definizione dell'azione."
 
-#. module: document_ics
-#: help:document.ics.crm.wizard,bugs:0
-msgid "Used by companies to track bugs and support requests on softwares"
-msgstr ""
-"Usato dalle aziende per tener traccia di errori e rispondere alle richieste "
-"sui software"
-
-#. module: document_ics
-#: model:ir.actions.todo,note:document_ics.config_wizard_step_case_section_menu
-msgid ""
-"This Configuration step use to create Calendars in document for all Case "
-"Sections"
-msgstr ""
-"Questo passaggio di configurazione crea Calendari in documenti per tutte le "
-"Sezioni dei Casi."
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtend"
-msgstr ""
+msgstr "dtend"
 
 #. module: document_ics
-#: help:document.ics.crm.wizard,jobs:0
+#: model:ir.model,name:document_ics.model_crm_meeting
+msgid "Meeting"
+msgstr "Riunione"
+
+#. module: document_ics
+#: help:document.ics.crm.wizard,lead:0
 msgid ""
-"Help you to organise the jobs hiring process: evaluation, meetings, email "
-"integration..."
+"Allows you to track and manage leads which are pre-sales requests or "
+"contacts, the very first contact with a customer request."
 msgstr ""
-"Ti aiuta a organizzare il processo di assunzione: valutazione, riunioni, "
-"integrazione di E-mail..."
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "description"
 msgstr "descrizione"
 
+#. module: document_ics
+#: field:document.directory.ics.fields,fn:0
+msgid "Function"
+msgstr "Funzione"
+
 #. module: document_ics
 #: model:ir.actions.act_window,name:document_ics.action_view_document_ics_config_directories
 msgid "Configure Calendars for Sections "
@@ -130,17 +137,21 @@ msgid "Tracks identified business opportunities for your sales pipeline."
 msgstr "Tracce identificano le opportunità per le vostre linee di vendita."
 
 #. module: document_ics
-#: help:document.ics.crm.wizard,fund:0
-msgid ""
-"This may help associations in their fund raising process and tracking."
-msgstr ""
-"Questo può aiutare le associazioni nel loro processo di raccolta fondi e nel "
-"mantenimento della traccia."
+#: field:document.ics.crm.wizard,progress:0
+msgid "Configuration Progress"
+msgstr "Avanzamento Configurazione"
 
 #. module: document_ics
-#: help:document.ics.crm.wizard,helpdesk:0
-msgid "Manages an Helpdesk service."
-msgstr "Gestisci un servizio di Helpdesk"
+#: help:document.ics.crm.wizard,jobs:0
+msgid ""
+"Helps you to organise the jobs hiring process: evaluation, meetings, email "
+"integration..."
+msgstr ""
+
+#. module: document_ics
+#: view:document.ics.crm.wizard:0
+msgid "title"
+msgstr "titolo"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,fund:0
@@ -148,15 +159,14 @@ msgid "Fund Raising Operations"
 msgstr "Operazioni di ricerca fondi"
 
 #. module: document_ics
-#: field:document.directory.content,ics_object_id:0
-msgid "Object"
-msgstr "Oggetto"
+#: model:ir.model,name:document_ics.model_document_directory_content
+msgid "Directory Content"
+msgstr "Contenuto della Cartella"
 
 #. module: document_ics
-#: constraint:crm.case.section:0
-msgid "Error ! You cannot create recursive sections."
+#: model:ir.model,name:document_ics.model_document_directory_ics_fields
+msgid "Document Directory ICS Fields"
 msgstr ""
-"Errore! Non è possibile creare sezioni ricorsive (che si richiamano)."
 
 #. module: document_ics
 #: model:ir.module.module,shortdesc:document_ics.module_meta_information
@@ -164,9 +174,16 @@ msgid "Support for iCal based on Document Management System"
 msgstr "Il supporto per iCal si basa sul Sistema di Gestione Documentale"
 
 #. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "location"
-msgstr "posizione"
+#: help:document.ics.crm.wizard,phonecall:0
+msgid ""
+"Helps you to encode the result of a phone call or to plan a list of phone "
+"calls to process."
+msgstr ""
+
+#. module: document_ics
+#: field:document.directory.ics.fields,field_id:0
+msgid "OpenERP Field"
+msgstr "Campo OpenERP"
 
 #. module: document_ics
 #: view:document.directory:0
@@ -179,48 +196,39 @@ msgid "ICS Value"
 msgstr "Valore ICS"
 
 #. module: document_ics
-#: model:ir.module.module,description:document_ics.module_meta_information
-msgid "Allows to synchronise calendars with others applications."
-msgstr "Permette di sincronizzare i calendari con altre applicazioni"
+#: selection:document.directory.ics.fields,fn:0
+msgid "Expression as constant"
+msgstr ""
+
+#. module: document_ics
+#: selection:document.directory.ics.fields,name:0
+msgid "location"
+msgstr "posizione"
 
 #. module: document_ics
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "XML non valido per Visualizzazione Architettura!"
 
-#. module: document_ics
-#: help:document.ics.crm.wizard,lead:0
-msgid ""
-"Allows you to track and manage prospects which are pre-sales requests or "
-"contacts, the very first contact with a customer request."
-msgstr ""
-"TI permette di tenere traccia e gestire i \"prospetti\" che sono richieste "
-"prevendita o contatti, il vero \"primo contatto\" con una richiesta del "
-"cliente."
-
 #. module: document_ics
 #: field:document.ics.crm.wizard,name:0
 msgid "Name"
 msgstr "Nome"
 
+#. module: document_ics
+#: help:document.directory.ics.fields,fn:0
+msgid "Alternate method                 of calculating the value"
+msgstr ""
+
 #. module: document_ics
 #: help:document.ics.crm.wizard,meeting:0
 msgid "Manages the calendar of meetings of the users."
 msgstr "Gestisce il calendario delle riunioni degli utenti."
 
 #. module: document_ics
-#: field:document.directory.content,ics_domain:0
-msgid "Domain"
-msgstr "Dominio"
-
-#. module: document_ics
-#: help:document.ics.crm.wizard,claims:0
-msgid ""
-"Manages the supplier and customers claims, including your corrective or "
-"preventive actions."
+#: help:document.ics.crm.wizard,bugs:0
+msgid "Used by companies to track bugs and support requests on software"
 msgstr ""
-"Gestisce le richieste di fornitori e clienti, includendo le tue azioni, "
-"preventive o correttive."
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -232,11 +240,6 @@ msgstr "ultima-modifica"
 msgid "ICS Mapping"
 msgstr "Mappatura ICS"
 
-#. module: document_ics
-#: view:crm.case:0
-msgid "Duration(In Hour)"
-msgstr "Durata (in ore)"
-
 #. module: document_ics
 #: field:document.ics.crm.wizard,document_ics:0
 msgid "Shared Calendar"
@@ -247,24 +250,15 @@ msgstr "Calendario condiviso"
 msgid "Claims"
 msgstr "Richieste"
 
-#. module: document_ics
-#: help:document.ics.crm.wizard,phonecall:0
-msgid ""
-"Help you to encode the result of a phone call or to planify a list of phone "
-"calls to process."
-msgstr ""
-"Ti aiuta a codificare il risultato di una telefonata oppure a pianificare "
-"una lista di telefonate fare."
-
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "dtstart"
 msgstr ""
 
 #. module: document_ics
-#: field:document.ics.crm.wizard,phonecall:0
-msgid "Phone Calls"
-msgstr "Chiamate Telefoniche"
+#: field:document.directory.ics.fields,expr:0
+msgid "Expression"
+msgstr "Espressione"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,bugs:0
@@ -277,14 +271,39 @@ msgid "categories"
 msgstr "categorie"
 
 #. module: document_ics
-#: field:document.ics.crm.wizard,lead:0
-msgid "Prospect"
-msgstr "Prospetto"
+#: selection:document.directory.ics.fields,fn:0
+msgid "Use the field"
+msgstr "Usa il campo"
 
 #. module: document_ics
-#: view:document.ics.crm.wizard:0
-msgid "Create Pre-Configured Calendars"
-msgstr "Crea i Calendari pre-configurati"
+#: field:document.directory.content,ics_domain:0
+msgid "Domain"
+msgstr "Dominio"
+
+#. module: document_ics
+#: field:document.directory.content,fname_field:0
+msgid "Filename field"
+msgstr "Campo del nome del documento"
+
+#. module: document_ics
+#: field:document.directory.content,obj_iterate:0
+msgid "Iterate object"
+msgstr "interagisci oggetti"
+
+#. module: document_ics
+#: field:crm.meeting,code:0
+msgid "Calendar Code"
+msgstr "Codice Calendario"
+
+#. module: document_ics
+#: model:ir.module.module,description:document_ics.module_meta_information
+msgid "Allows to synchronise calendars with others applications."
+msgstr "Permette di sincronizzare i calendari con altre applicazioni"
+
+#. module: document_ics
+#: field:document.ics.crm.wizard,config_logo:0
+msgid "Image"
+msgstr "Immagine"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
@@ -292,29 +311,36 @@ msgid "created"
 msgstr "creato"
 
 #. module: document_ics
-#: field:crm.case,code:0
-msgid "Calendar Code"
-msgstr "Codice Calendario"
+#: help:document.directory.content,obj_iterate:0
+msgid ""
+"If set, a separate                         instance will be created for each "
+"record of Object"
+msgstr ""
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0
 msgid "summary"
 msgstr "sommario"
 
+#. module: document_ics
+#: field:document.ics.crm.wizard,lead:0
+msgid "Leads"
+msgstr ""
+
 #. module: document_ics
 #: model:ir.model,name:document_ics.model_document_ics_crm_wizard
 msgid "document.ics.crm.wizard"
 msgstr "document.ics.crm.wizard"
 
 #. module: document_ics
-#: selection:document.directory.ics.fields,name:0
-msgid "attendee"
-msgstr "partecipante"
+#: view:document.ics.crm.wizard:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
 
 #. module: document_ics
-#: model:ir.model,name:document_ics.model_document_directory_ics_fields
-msgid "document.directory.ics.fields"
-msgstr "Copy text   \t document.directory.ics.fields"
+#: field:document.ics.crm.wizard,phonecall:0
+msgid "Phone Calls"
+msgstr "Chiamate Telefoniche"
 
 #. module: document_ics
 #: field:document.directory.content,ics_field_ids:0
@@ -322,9 +348,9 @@ msgid "Fields Mapping"
 msgstr "Mappatura Campi"
 
 #. module: document_ics
-#: view:document.ics.crm.wizard:0
-msgid "Cancel"
-msgstr "Annulla"
+#: selection:document.directory.ics.fields,name:0
+msgid "url"
+msgstr "URL"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,opportunity:0
@@ -335,3 +361,82 @@ msgstr "Opportunità"
 #: selection:document.directory.ics.fields,name:0
 msgid "dtstamp"
 msgstr ""
+
+#. module: document_ics
+#: help:document.directory.content,fname_field:0
+msgid ""
+"The field of the                         object used in the filename. Has to "
+"be a unique identifier."
+msgstr ""
+
+#~ msgid "Next"
+#~ msgstr "Prossimo"
+
+#~ msgid "Configure Calendars for CRM Sections"
+#~ msgstr "Configura i Calendari per le sezioni CRM"
+
+#~ msgid "Error! You can not create recursive Directories."
+#~ msgstr "Errore! Non puoi creare Direcroty ricorsive"
+
+#~ msgid "Open ERP Field"
+#~ msgstr "Apri campo ERP"
+
+#~ msgid ""
+#~ "This Configuration step use to create Calendars in document for all Case "
+#~ "Sections"
+#~ msgstr ""
+#~ "Questo passaggio di configurazione crea Calendari in documenti per tutte le "
+#~ "Sezioni dei Casi."
+
+#~ msgid "Used by companies to track bugs and support requests on softwares"
+#~ msgstr ""
+#~ "Usato dalle aziende per tener traccia di errori e rispondere alle richieste "
+#~ "sui software"
+
+#~ msgid ""
+#~ "Help you to organise the jobs hiring process: evaluation, meetings, email "
+#~ "integration..."
+#~ msgstr ""
+#~ "Ti aiuta a organizzare il processo di assunzione: valutazione, riunioni, "
+#~ "integrazione di E-mail..."
+
+#~ msgid ""
+#~ "Allows you to track and manage prospects which are pre-sales requests or "
+#~ "contacts, the very first contact with a customer request."
+#~ msgstr ""
+#~ "TI permette di tenere traccia e gestire i \"prospetti\" che sono richieste "
+#~ "prevendita o contatti, il vero \"primo contatto\" con una richiesta del "
+#~ "cliente."
+
+#~ msgid "Error ! You cannot create recursive sections."
+#~ msgstr ""
+#~ "Errore! Non è possibile creare sezioni ricorsive (che si richiamano)."
+
+#~ msgid ""
+#~ "Manages the supplier and customers claims, including your corrective or "
+#~ "preventive actions."
+#~ msgstr ""
+#~ "Gestisce le richieste di fornitori e clienti, includendo le tue azioni, "
+#~ "preventive o correttive."
+
+#~ msgid "Duration(In Hour)"
+#~ msgstr "Durata (in ore)"
+
+#~ msgid ""
+#~ "Help you to encode the result of a phone call or to planify a list of phone "
+#~ "calls to process."
+#~ msgstr ""
+#~ "Ti aiuta a codificare il risultato di una telefonata oppure a pianificare "
+#~ "una lista di telefonate fare."
+
+#~ msgid "Create Pre-Configured Calendars"
+#~ msgstr "Crea i Calendari pre-configurati"
+
+#~ msgid "Prospect"
+#~ msgstr "Prospetto"
+
+#~ msgid "Cancel"
+#~ msgstr "Annulla"
+
+#~ msgid "document.directory.ics.fields"
+#~ msgstr "Copy text   \t document.directory.ics.fields"
diff --git a/addons/google_map/i18n/mn.po b/addons/google_map/i18n/mn.po
index 6eb85e207ef..ffef22d0a5b 100644
--- a/addons/google_map/i18n/mn.po
+++ b/addons/google_map/i18n/mn.po
@@ -7,32 +7,46 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-11 05:37+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-21 09:05+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: 2010-09-29 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
-#: model:ir.actions.wizard,name:google_map.wizard_google_map
-msgid "Launch Google Map"
-msgstr "Google Map ачаалах"
+#: view:res.partner:0
+#: view:res.partner.address:0
+msgid "Map"
+msgstr "Газрын зураг"
 
 #. module: google_map
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "Дэлгэцийн XML алдаатай!"
 
+#. module: google_map
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Объектын нэрний эхлэл x_ байх ёстой бөгөөд бусад тусгай тэмдэгтийг агуулж "
+"болохгүй!"
+
 #. module: google_map
 #: view:res.partner:0
 #: view:res.partner.address:0
 msgid "Street2 : "
 msgstr "Гудамж2 "
 
+#. module: google_map
+#: model:ir.actions.wizard,name:google_map.wizard_google_map
+msgid "Launch Google Map"
+msgstr "Google Map ачаалах"
+
 #. module: google_map
 #: model:ir.module.module,description:google_map.module_meta_information
 msgid ""
@@ -45,7 +59,6 @@ msgstr ""
 "харах боломжтой болгоно."
 
 #. module: google_map
-#: view:res.partner:0
-#: view:res.partner.address:0
-msgid "Map"
-msgstr "Газрын зураг"
+#: model:ir.model,name:google_map.model_res_partner_address
+msgid "Partner Addresses"
+msgstr "Харилцагчийн хаягууд"
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 240511a03a0..3c65e79f11f 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -115,7 +115,7 @@ class hr_job(osv.osv):
     def on_change_expected_employee(self, cr, uid, ids, expected_employee, no_of_employee, context=None):
         if context is None:
             context = {}
-        result={}
+        result = {}
         if expected_employee:
             result['no_of_recruitment'] = expected_employee - no_of_employee
         return {'value': result}
@@ -165,23 +165,19 @@ class hr_employee(osv.osv):
         'passport_id':fields.char('Passport', size=64)
     }
 
-    def onchange_company(self, cr, uid, ids, company, context=None):
-        company_id = self.pool.get('res.company').browse(cr,uid,company)
-        for address in company_id.partner_id.address:
-            return {'value': {'address_id': address.id}}
-        return {'value':{'address_id':False}}
-
-    def onchange_department(self, cr, uid, ids, department_id, context=None):
-        if not department_id:
-            return {'value':{'parent_id': False}}
-        manager = self.pool.get('hr.department').browse(cr, uid, department_id).manager_id
-        return {'value': {'parent_id':manager and manager.id or False}}
+    def onchange_company(self, cr, uid, ids, company, context=None):       
+        address_id = False
+        if company:            
+            company_id = self.pool.get('res.company').browse(cr,uid,company)
+            address = self.pool.get('res.partner').address_get(cr, uid, [company_id.partner_id.id], ['default'])
+            address_id = address and address['default'] or False
+        return {'value': {'address_id' : address_id}}
 
     def onchange_user(self, cr, uid, ids, user_id, context=None):
-        if not user_id:
-            return {'value':{'work_email': False}}
-        mail = self.pool.get('res.users').browse(cr,uid,user_id)
-        return {'value': {'work_email':mail.user_email}}
+        work_email = False
+        if user_id:
+            work_email = self.pool.get('res.users').browse(cr, uid, user_id).user_email
+        return {'value': {'work_email' : work_email}}
 
     def _get_photo(self, cr, uid, context=None):
         return open(os.path.join(
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 9e807d43cab..e4bdad2c3d1 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -27,7 +27,7 @@
                         <field name="company_id" widget="selection" groups="base.group_multi_company,base.group_extended" on_change="onchange_company(company_id)"/>
                         <field name="active" groups="base.group_extended"/>
                         <newline/>
-                        <field name="department_id" widget="selection" on_change="onchange_department(department_id)"/>
+                        <field name="department_id" widget="selection" />
                         <field name="parent_id" />
                         </group>
                         <group colspan="2" col="1">
diff --git a/addons/hr/i18n/fr.po b/addons/hr/i18n/fr.po
index 29900a941a2..1ff63ce7127 100644
--- a/addons/hr/i18n/fr.po
+++ b/addons/hr/i18n/fr.po
@@ -6,33 +6,37 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 04:56+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-21 07:47+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: 2010-09-29 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
-#: model:process.transition,name:hr.process_transition_employeeuser0
 msgid "Openerp user"
 msgstr "Utilisateur OpenERP"
 
 #. module: hr
-#: model:ir.actions.act_window,name:hr.edit_workgroup
-#: model:ir.ui.menu,name:hr.menu_edit_workgroup
-msgid "Working Time Categories"
-msgstr "Catégories de Temps de Travail"
+#: view:hr.job:0
+#: field:hr.job,requirements:0
+msgid "Requirements"
+msgstr "Pré-requis"
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You can not create recursive departments."
 msgstr "Erreur! Vous ne pouvez pas créer de départements récursifs."
 
+#. module: hr
+#: model:process.transition,name:hr.process_transition_contactofemployee0
+msgid "Link the employee to information"
+msgstr "Lier l'employé à l'information"
+
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
@@ -40,19 +44,24 @@ msgstr "Numéro de Sécurité Sociale"
 
 #. module: hr
 #: model:ir.module.module,shortdesc:hr.module_meta_information
+#: model:ir.ui.menu,name:hr.menu_hr_deshboard
+#: model:ir.ui.menu,name:hr.menu_hr_main
+#: model:ir.ui.menu,name:hr.menu_hr_management
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
 msgstr "Ressources humaines"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Sunday"
-msgstr "Dimanche"
+#: view:hr.department:0
+#: view:hr.employee:0
+#: view:hr.job:0
+msgid "Group By..."
+msgstr "Grouper par..."
 
 #. module: hr
-#: view:res.users:0
-msgid "Parents"
-msgstr "Parents"
+#: field:hr.employee,work_email:0
+msgid "Work E-mail"
+msgstr "E-mail professionnel"
 
 #. module: hr
 #: constraint:ir.actions.act_window:0
@@ -60,52 +69,109 @@ msgid "Invalid model name in the action definition."
 msgstr "Nom de modèle invalide pour la définition de l'action."
 
 #. module: hr
-#: view:hr.department:0
+#: view:hr.employee:0
+#: field:hr.employee,department_id:0
+#: view:hr.job:0
+#: field:hr.job,department_id:0
+#: view:res.users:0
 msgid "Department"
 msgstr "Département"
 
 #. module: hr
-#: model:process.transition,name:hr.process_transition_contactofemployee0
-msgid "Contact  of employee"
-msgstr "Contact du salarié"
+#: help:hr.installer,hr_attendance:0
+msgid "Simplifies the management of employee's attendances."
+msgstr "Simplifie la gestion des temps de présence des employés."
 
 #. module: hr
-#: field:hr.employee,work_email:0
-msgid "Work Email"
-msgstr "Adresse électronique professionnelle"
+#: view:hr.job:0
+msgid "Mark as Old"
+msgstr "Marquer comme ancien"
 
 #. module: hr
-#: field:hr.timesheet.group,name:0
-msgid "Group name"
-msgstr "Nom du groupe"
+#: view:hr.job:0
+msgid "Jobs"
+msgstr "Emplois"
+
+#. module: hr
+#: view:hr.job:0
+msgid "In Recruitment"
+msgstr "En recrutement"
+
+#. module: hr
+#: view:hr.installer:0
+msgid "title"
+msgstr "titre"
 
 #. module: hr
 #: field:hr.department,company_id:0
-#: field:hr.employee,company_id:0
+#: view:hr.employee:0
+#: view:hr.job:0
+#: field:hr.job,company_id:0
 msgid "Company"
 msgstr "Société"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Friday"
-msgstr "Vendredi"
+#: field:hr.job,no_of_recruitment:0
+msgid "Expected in Recruitment"
+msgstr "Attendu en recrutement"
 
 #. module: hr
-#: field:hr.department,parent_id:0
-msgid "Parent Department"
-msgstr "Département parent"
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
+msgid "Holidays"
+msgstr "Congés"
+
+#. module: hr
+#: help:hr.installer,hr_holidays:0
+msgid "Tracks employee leaves, allocation requests and planning."
+msgstr "Suivi des absences des employés, demandes de fonds et plannings"
+
+#. module: hr
+#: model:ir.model,name:hr.model_hr_employee_marital_status
+msgid "Employee Marital Status"
+msgstr "Situation matrimonial de l'employé"
+
+#. module: hr
+#: help:hr.employee,partner_id:0
+msgid ""
+"Partner that is related to the current employee. Accounting transaction will "
+"be written on this partner belongs to employee."
+msgstr ""
+
+#. module: hr
+#: model:process.transition,name:hr.process_transition_employeeuser0
+msgid "Link a user to an employee"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_contract:0
+msgid "Employee's Contracts"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_payroll:0
+msgid "Generic Payroll system."
+msgstr ""
 
 #. module: hr
-#: view:hr.department:0
 #: view:hr.employee:0
-#: field:hr.employee,notes:0
-msgid "Notes"
-msgstr "Remarques"
+msgid "My Departments Employee"
+msgstr ""
 
 #. module: hr
-#: field:hr.timesheet,hour_from:0
-msgid "Work from"
-msgstr "Date d'embauche"
+#: constraint:hr.employee:0
+msgid ""
+"Error ! You cannot select a department for which the employee is the manager."
+msgstr ""
+
+#. module: hr
+#: help:hr.employee,passport_id:0
+msgid "Employee Passport Information"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+msgid "Position"
+msgstr ""
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
@@ -113,14 +179,27 @@ msgid "Employee Hierarchy"
 msgstr "Hiérarchie de l'employé"
 
 #. module: hr
-#: model:ir.ui.menu,name:hr.menu_hr_configuration
-msgid "Configuration"
-msgstr "Configuration"
+#: model:process.transition,note:hr.process_transition_employeeuser0
+msgid ""
+"The Related user field on the Employee form allows to link the OpenERP user "
+"(and her rights) to the employee."
+msgstr ""
 
 #. module: hr
-#: selection:hr.employee,marital:0
-msgid "Unmaried"
-msgstr "Non Marié(e)"
+#: view:hr.job:0
+#: selection:hr.job,state:0
+msgid "In Recruitement"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,identification_id:0
+msgid "Identification No"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,no_of_employee:0
+msgid "No of Employee"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -128,13 +207,23 @@ msgid "Female"
 msgstr "Féminin"
 
 #. module: hr
-#: view:hr.timesheet.group:0
-msgid "Working Time Category"
-msgstr "Catégorie de Temps de Travail"
+#: help:hr.installer,hr_timesheet_sheet:0
+msgid ""
+"Tracks and helps employees encode and validate timesheets and attendances."
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_evaluation:0
+msgid "Periodic Evaluations"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_timesheet_sheet:0
+msgid "Timesheets"
+msgstr ""
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
-#: model:ir.ui.menu,name:hr.menu_open_view_employee_tree
 msgid "Employees Structure"
 msgstr "Structure des employés"
 
@@ -143,6 +232,11 @@ msgstr "Structure des employés"
 msgid "Social IDs"
 msgstr "Numéros sociaux"
 
+#. module: hr
+#: help:hr.job,no_of_employee:0
+msgid "Number of employee with that job."
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,work_phone:0
 msgid "Work Phone"
@@ -153,28 +247,50 @@ msgstr "Téléphone professionnel"
 msgid "Child Categories"
 msgstr "Catégories filles"
 
+#. module: hr
+#: view:hr.job:0
+#: field:hr.job,description:0
+#: model:ir.model,name:hr.model_hr_job
+msgid "Job Description"
+msgstr ""
+
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
 msgstr "Localisation du Bureau"
 
+#. module: hr
+#: field:hr.employee,passport_id:0
+msgid "Passport"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
-#: field:hr.employee,name:0
+#: view:hr.job:0
 #: model:ir.model,name:hr.model_hr_employee
 #: model:process.node,name:hr.process_node_employee0
 msgid "Employee"
 msgstr "Employé"
 
 #. module: hr
-#: field:hr.timesheet.group,manager:0
-msgid "Workgroup manager"
-msgstr "Responsable du groupe"
+#: model:process.node,note:hr.process_node_employeecontact0
+msgid "Other information"
+msgstr ""
 
 #. module: hr
-#: field:hr.employee,child_ids:0
-msgid "Subordinates"
-msgstr "Subordonnés"
+#: field:hr.employee,address_id:0
+msgid "Working Address"
+msgstr "Adresse professionnelle"
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action_hr_installer
+msgid "Human Resources Application Configuration"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,birthday:0
+msgid "Date of Birth"
+msgstr ""
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
@@ -182,19 +298,42 @@ msgid "Reporting"
 msgstr "Reporting"
 
 #. module: hr
+#: model:ir.model,name:hr.model_ir_actions_act_window
+msgid "ir.actions.act_window"
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr
+msgid "Human Resources Dashboard"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee:0
+#: field:hr.employee,job_id:0
+#: view:hr.job:0
+msgid "Job"
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
 #: field:hr.department,member_ids:0
 msgid "Members"
 msgstr "Membres"
 
 #. module: hr
-#: field:hr.employee,ssnid:0
-msgid "SSN No"
-msgstr "Numéro de sécurité sociale"
+#: model:ir.ui.menu,name:hr.menu_hr_configuration
+msgid "Configuration"
+msgstr "Configuration"
 
 #. module: hr
-#: model:process.transition,note:hr.process_transition_contactofemployee0
-msgid "Fill up contact information"
-msgstr "Remplir les informations de contact"
+#: view:hr.employee:0
+msgid "Categories"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,expected_employees:0
+msgid "Expected Employees"
+msgstr ""
 
 #. module: hr
 #: constraint:ir.ui.view:0
@@ -202,9 +341,9 @@ msgid "Invalid XML for View Architecture!"
 msgstr "XML non valide pour l'architecture de la vue"
 
 #. module: hr
-#: selection:hr.employee,marital:0
-msgid "Divorced"
-msgstr "Divorcé(e)"
+#: help:hr.employee,sinid:0
+msgid "Social Insurance Number"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
@@ -212,10 +351,16 @@ msgid "Parent Category"
 msgstr "Catégorie mère"
 
 #. module: hr
+#: constraint:hr.employee.category:0
+msgid "Error ! You cannot create recursive Categories."
+msgstr ""
+
+#. module: hr
+#: view:hr.department:0
 #: model:ir.actions.act_window,name:hr.open_module_tree_department
-#: model:ir.actions.act_window,name:hr.open_module_tree_department_tree
-#: model:ir.ui.menu,name:hr.menu_department_def
-#: model:ir.ui.menu,name:hr.menu_department_tree
+#: model:ir.ui.menu,name:hr.menu_hr_department_tree
+#: view:res.users:0
+#: field:res.users,context_department_id:0
 msgid "Departments"
 msgstr "Départements"
 
@@ -225,14 +370,9 @@ msgid "Employee Contact"
 msgstr "Contrat de travail de l'employé"
 
 #. module: hr
-#: selection:hr.employee,marital:0
-msgid "Maried"
-msgstr "Marié(e)"
-
-#. module: hr
-#: field:hr.timesheet,tgroup_id:0
-msgid "Employee's timesheet group"
-msgstr "Groupe de feuille de présence"
+#: view:board.board:0
+msgid "My Board"
+msgstr ""
 
 #. module: hr
 #: selection:hr.employee,gender:0
@@ -240,9 +380,10 @@ msgid "Male"
 msgstr "Masculin"
 
 #. module: hr
-#: model:process.transition,note:hr.process_transition_employeeuser0
-msgid "Create openerp user"
-msgstr "Créer l'utilisateur OpenERP"
+#: model:ir.actions.act_window,name:hr.open_view_categ_form
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_form
+msgid "Categories of Employee"
+msgstr "Catégories d'Employés"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -251,9 +392,21 @@ msgid "Employee Category"
 msgstr "Catégorie de l'employé"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Tuesday"
-msgstr "Mardi"
+#: field:hr.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: hr
+#: model:process.process,name:hr.process_process_employeecontractprocess0
+msgid "Employee Contract"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_evaluation:0
+msgid ""
+"Lets you create and manage the periodic evaluation and performance review of "
+"employees."
+msgstr ""
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
@@ -261,16 +414,26 @@ msgid "hr.department"
 msgstr "hr.department"
 
 #. module: hr
-#: field:hr.employee,user_id:0
-msgid "Related User"
-msgstr "Utilisateur lié"
+#: help:hr.employee,parent_id:0
+msgid "It is linked with manager of Department"
+msgstr ""
 
 #. module: hr
-#: field:hr.employee,category_id:0
+#: field:hr.installer,hr_recruitment:0
+msgid "Recruitment Process"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,category_ids:0
 #: field:hr.employee.category,name:0
 msgid "Category"
 msgstr "Catégorie"
 
+#. module: hr
+#: help:hr.employee,bank_account_id:0
+msgid "Employee bank salary account"
+msgstr ""
+
 #. module: hr
 #: field:hr.department,note:0
 msgid "Note"
@@ -281,15 +444,25 @@ msgstr "Note"
 msgid "Contact Information"
 msgstr "Informations sur le contact"
 
+#. module: hr
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: hr
+#: model:ir.actions.act_window,name:hr.open_board_hr_manager
+msgid "HR Manager Dashboard"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
 msgid "Status"
 msgstr "État"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Monday"
-msgstr "Lundi"
+#: field:hr.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
@@ -298,17 +471,22 @@ msgid "Categories structure"
 msgstr "Structure des catégories"
 
 #. module: hr
-#: field:hr.timesheet,dayofweek:0
-msgid "Day of week"
-msgstr "Jour de la semaine"
+#: field:hr.employee,partner_id:0
+msgid "unknown"
+msgstr ""
 
 #. module: hr
-#: field:hr.employee,birthday:0
-msgid "Birthday"
-msgstr "Date d'anniversaire"
+#: field:hr.installer,hr_holidays:0
+msgid "Holidays / Leaves Management"
+msgstr ""
 
 #. module: hr
-#: field:hr.employee,active:0
+#: field:hr.employee,ssnid:0
+msgid "SSN No"
+msgstr "Numéro de sécurité sociale"
+
+#. module: hr
+#: view:hr.employee:0
 msgid "Active"
 msgstr "Actif"
 
@@ -318,61 +496,72 @@ msgid "Error ! You cannot create recursive Hierarchy of Employees."
 msgstr ""
 "Erreur ! Vous ne pouvez pas créer de hiérarchie d'employés récursives."
 
-#. module: hr
-#: model:process.process,name:hr.process_process_employeecontractprocess0
-msgid "Employee Contract Process"
-msgstr "Processus de contrat d'employé"
-
-#. module: hr
-#: model:process.node,note:hr.process_node_openerpuser0
-msgid "Create OpenERP User"
-msgstr "Créer l'utilisateur OpenERP"
-
-#. module: hr
-#: model:process.node,note:hr.process_node_employee0
-msgid "Employee Complete Form"
-msgstr "Formulaire de l'employé complet"
-
 #. module: hr
 #: view:hr.department:0
 msgid "Companies"
 msgstr "Sociétés"
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Wednesday"
-msgstr "Mercredi"
+#: model:process.transition,note:hr.process_transition_contactofemployee0
+msgid ""
+"In the Employee form, there are different kind of information like Contact "
+"information."
+msgstr ""
 
 #. 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 "Categories of Employee"
-msgstr "Catégories d'Employés"
+#: help:hr.job,expected_employees:0
+msgid "Required number of Employees in total for that job."
+msgstr ""
 
 #. module: hr
-#: field:hr.timesheet,date_from:0
-msgid "Starting date"
-msgstr "Date début"
+#: selection:hr.job,state:0
+msgid "Old"
+msgstr ""
 
 #. module: hr
-#: field:res.users,parent_id:0
-msgid "Parent Users"
-msgstr "Utilisateurs parents"
+#: field:hr.employee.marital.status,description:0
+msgid "Status Description"
+msgstr ""
 
 #. module: hr
-#: field:hr.employee,address_id:0
-msgid "Working Address"
-msgstr "Adresse professionnelle"
+#: view:hr.job:0
+#: field:hr.job,state:0
+msgid "State"
+msgstr ""
 
 #. module: hr
 #: field:hr.employee,marital:0
+#: view:hr.employee.marital.status:0
+#: field:hr.employee.marital.status,name:0
+#: model:ir.actions.act_window,name:hr.action_hr_marital_status
+#: model:ir.ui.menu,name:hr.hr_menu_marital_status
 msgid "Marital Status"
 msgstr "État matrimonial"
 
 #. module: hr
-#: model:ir.model,name:hr.model_hr_timesheet
-msgid "Timesheet Line"
-msgstr "Ligne de feuille de temps"
+#: help:hr.installer,hr_recruitment:0
+msgid "Helps you manage and streamline your recruitment process."
+msgstr ""
+
+#. module: hr
+#: model:process.node,note:hr.process_node_employee0
+msgid "Employee form and structure"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,photo:0
+msgid "Photo"
+msgstr ""
+
+#. module: hr
+#: model:ir.model,name:hr.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_payroll_account:0
+msgid "Payroll Accounting"
+msgstr ""
 
 #. module: hr
 #: view:hr.employee:0
@@ -388,26 +577,26 @@ msgstr ""
 "spéciaux !"
 
 #. module: hr
-#: view:hr.timesheet:0
-#: field:hr.timesheet.group,timesheet_id:0
-#: model:ir.model,name:hr.model_hr_timesheet_group
-msgid "Working Time"
-msgstr "Temps de Travail"
+#: view:res.users:0
+msgid "Current Activity"
+msgstr ""
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Thursday"
-msgstr "Jeudi"
+#: help:hr.installer,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
 
 #. module: hr
-#: field:hr.timesheet,hour_to:0
-msgid "Work to"
-msgstr "Jusqu'à"
+#: view:hr.job:0
+msgid "Current"
+msgstr ""
 
 #. module: hr
-#: selection:hr.employee,marital:0
-msgid "Other"
-msgstr "Autre"
+#: field:hr.department,parent_id:0
+msgid "Parent Department"
+msgstr "Département parent"
 
 #. module: hr
 #: view:hr.employee.category:0
@@ -419,6 +608,39 @@ msgstr "Catégories des employés"
 msgid "Home Address"
 msgstr "Adresse personnelle"
 
+#. module: hr
+#: field:hr.installer,hr_attendance:0
+#: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
+msgid "Attendances"
+msgstr ""
+
+#. module: hr
+#: view:hr.employee.marital.status:0
+#: view:hr.job:0
+msgid "Description"
+msgstr ""
+
+#. module: hr
+#: help:hr.installer,hr_contract:0
+msgid "Extends employee profiles to help manage their contracts."
+msgstr ""
+
+#. module: hr
+#: field:hr.installer,hr_payroll:0
+msgid "Payroll"
+msgstr ""
+
+#. module: hr
+#: field:hr.job,name:0
+msgid "Job Name"
+msgstr ""
+
+#. module: hr
+#: view:hr.job:0
+#: selection:hr.job,state:0
+msgid "In Position"
+msgstr ""
+
 #. module: hr
 #: view:hr.department:0
 msgid "department"
@@ -430,12 +652,30 @@ msgid "Nationality"
 msgstr "Nationalité"
 
 #. module: hr
-#: field:hr.employee,otherid:0
-msgid "Other ID"
-msgstr "Autre identifiant"
+#: view:hr.department:0
+#: view:hr.employee:0
+#: field:hr.employee,notes:0
+msgid "Notes"
+msgstr "Remarques"
 
 #. module: hr
-#: field:hr.timesheet,name:0
+#: model:ir.model,name:hr.model_hr_installer
+msgid "hr.installer"
+msgstr ""
+
+#. module: hr
+#: view:board.board:0
+msgid "HR Manager Board"
+msgstr ""
+
+#. module: hr
+#: field:hr.employee,resource_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: hr
+#: field:hr.department,complete_name:0
+#: field:hr.employee.category,complete_name:0
 msgid "Name"
 msgstr "Nom"
 
@@ -446,50 +686,185 @@ msgstr "Genre"
 
 #. module: hr
 #: view:hr.employee:0
+#: field:hr.job,employee_ids:0
+#: model:ir.actions.act_window,name:hr.hr_employee_normal_action_tree
 #: model:ir.actions.act_window,name:hr.open_view_employee_list
-#: model:ir.ui.menu,name:hr.menu_open_view_employee_list
+#: model:ir.actions.act_window,name:hr.open_view_employee_list_my
+#: model:ir.ui.menu,name:hr.menu_open_view_employee_list_my
+#: model:ir.ui.menu,name:hr.menu_view_employee_category_configuration_form
 msgid "Employees"
 msgstr "Employés"
 
+#. module: hr
+#: field:hr.employee,bank_account_id:0
+msgid "Bank Account"
+msgstr ""
+
 #. module: hr
 #: field:hr.department,name:0
 msgid "Department Name"
 msgstr "Nom du département"
 
+#. module: hr
+#: help:hr.employee,ssnid:0
+msgid "Social Security Number"
+msgstr ""
+
+#. module: hr
+#: model:process.node,note:hr.process_node_openerpuser0
+msgid "Creation of a OpenERP user"
+msgstr ""
+
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
 msgstr "Sous-départements"
 
+#. module: hr
+#: model:ir.actions.act_window,name:hr.action_hr_job
+#: model:ir.ui.menu,name:hr.menu_hr_job
+msgid "Job Positions"
+msgstr ""
+
 #. module: hr
 #: view:hr.employee:0
-msgid "Job Information"
-msgstr "Information sur l'Emploi"
+#: field:hr.employee,coach_id:0
+msgid "Coach"
+msgstr ""
 
 #. module: hr
-#: model:process.node,note:hr.process_node_employeecontact0
-msgid "Fill up employee's contact information"
-msgstr "Remplir les informations de contact du salarié"
+#: field:hr.installer,hr_expense:0
+msgid "Expenses"
+msgstr ""
 
 #. module: hr
+#: view:hr.department:0
 #: field:hr.department,manager_id:0
+#: view:hr.employee:0
 #: field:hr.employee,parent_id:0
 msgid "Manager"
 msgstr "Responsable"
 
 #. module: hr
-#: 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 "All Employees"
-msgstr "Tous les employés"
+#: help:hr.installer,hr_payroll_account:0
+msgid "Generic Payroll system Integrated with Accountings."
+msgstr ""
 
 #. module: hr
-#: selection:hr.timesheet,dayofweek:0
-msgid "Saturday"
-msgstr "Samedi"
+#: field:hr.employee,child_ids:0
+msgid "Subordinates"
+msgstr "Subordonnés"
 
-#. module: hr
-#: model:ir.actions.act_window,name:hr.open_view_employee_new
-#: model:ir.ui.menu,name:hr.menu_open_view_employee_new
-msgid "New Employee"
-msgstr "Nouvel employé"
+#~ msgid "Working Time Categories"
+#~ msgstr "Catégories de Temps de Travail"
+
+#~ msgid "Sunday"
+#~ msgstr "Dimanche"
+
+#~ msgid "Contact  of employee"
+#~ msgstr "Contact du salarié"
+
+#~ msgid "Work Email"
+#~ msgstr "Adresse électronique professionnelle"
+
+#~ msgid "Group name"
+#~ msgstr "Nom du groupe"
+
+#~ msgid "Friday"
+#~ msgstr "Vendredi"
+
+#~ msgid "Work from"
+#~ msgstr "Date d'embauche"
+
+#~ msgid "Unmaried"
+#~ msgstr "Non Marié(e)"
+
+#~ msgid "Working Time Category"
+#~ msgstr "Catégorie de Temps de Travail"
+
+#~ msgid "Workgroup manager"
+#~ msgstr "Responsable du groupe"
+
+#~ msgid "Fill up contact information"
+#~ msgstr "Remplir les informations de contact"
+
+#~ msgid "Divorced"
+#~ msgstr "Divorcé(e)"
+
+#~ msgid "Maried"
+#~ msgstr "Marié(e)"
+
+#~ msgid "Employee's timesheet group"
+#~ msgstr "Groupe de feuille de présence"
+
+#~ msgid "Create openerp user"
+#~ msgstr "Créer l'utilisateur OpenERP"
+
+#~ msgid "Tuesday"
+#~ msgstr "Mardi"
+
+#~ msgid "Related User"
+#~ msgstr "Utilisateur lié"
+
+#~ msgid "Monday"
+#~ msgstr "Lundi"
+
+#~ msgid "Day of week"
+#~ msgstr "Jour de la semaine"
+
+#~ msgid "Birthday"
+#~ msgstr "Date d'anniversaire"
+
+#~ msgid "Employee Contract Process"
+#~ msgstr "Processus de contrat d'employé"
+
+#~ msgid "Create OpenERP User"
+#~ msgstr "Créer l'utilisateur OpenERP"
+
+#~ msgid "Employee Complete Form"
+#~ msgstr "Formulaire de l'employé complet"
+
+#~ msgid "Wednesday"
+#~ msgstr "Mercredi"
+
+#~ msgid "Starting date"
+#~ msgstr "Date début"
+
+#~ msgid "Timesheet Line"
+#~ msgstr "Ligne de feuille de temps"
+
+#~ msgid "Working Time"
+#~ msgstr "Temps de Travail"
+
+#~ msgid "Thursday"
+#~ msgstr "Jeudi"
+
+#~ msgid "Work to"
+#~ msgstr "Jusqu'à"
+
+#~ msgid "Other"
+#~ msgstr "Autre"
+
+#~ msgid "Other ID"
+#~ msgstr "Autre identifiant"
+
+#~ msgid "Job Information"
+#~ msgstr "Information sur l'Emploi"
+
+#~ msgid "Fill up employee's contact information"
+#~ msgstr "Remplir les informations de contact du salarié"
+
+#~ msgid "All Employees"
+#~ msgstr "Tous les employés"
+
+#~ msgid "Saturday"
+#~ msgstr "Samedi"
+
+#~ msgid "New Employee"
+#~ msgstr "Nouvel employé"
+
+#~ msgid "Parents"
+#~ msgstr "Parents"
+
+#~ msgid "Parent Users"
+#~ msgstr "Utilisateurs parents"
diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py
index 143d27f2d9b..eb79dc5c52d 100644
--- a/addons/hr_expense/hr_expense.py
+++ b/addons/hr_expense/hr_expense.py
@@ -99,10 +99,10 @@ class hr_expense_expense(osv.osv):
     }
 
     def onchange_employee_id(self, cr, uid, ids, employee_id, context=None):
-        if not employee_id:
-            return {'value':{'department_id': False}}
-        dept = self.pool.get('hr.employee').browse(cr, uid, employee_id).department_id
-        return {'value': {'department_id':dept and dept.id or False}}
+        department_id = False
+        if employee_id:
+            department_id = self.pool.get('hr.employee').browse(cr, uid, employee_id).department_id.id or False
+        return {'value':{'department_id':department_id}}   
 
     def expense_confirm(self, cr, uid, ids, *args):
         self.write(cr, uid, ids, {
@@ -248,17 +248,17 @@ class hr_expense_line(osv.osv):
     def onchange_product_id(self, cr, uid, ids, product_id, uom_id, employee_id, context=None):
         if context is None:
             context = {}
-        v = {}
+        res = {}
         if product_id:
             product = self.pool.get('product.product').browse(cr, uid, product_id, context=context)
-            v['name'] = product.name
+            res['name'] = product.name
             # Compute based on pricetype of employee company
             context['currency_id'] = self.pool.get('hr.employee').browse(cr, uid, employee_id, context=context).user_id.company_id.currency_id.id
             amount_unit = product.price_get('standard_price', context)[product.id]
-            v['unit_amount'] = amount_unit
+            res['unit_amount'] = amount_unit
             if not uom_id:
-                v['uom_id'] = product.uom_id.id
-        return {'value': v}
+                res['uom_id'] = product.uom_id.id
+        return {'value': res}
 
 hr_expense_line()
 
diff --git a/addons/hr_timesheet/i18n/fr.po b/addons/hr_timesheet/i18n/fr.po
index 2d3ac07ca57..9afa8fff80e 100644
--- a/addons/hr_timesheet/i18n/fr.po
+++ b/addons/hr_timesheet/i18n/fr.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: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-20 08:03+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2010-10-21 11: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: 2010-10-21 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet
diff --git a/addons/knowledge/i18n/mn.po b/addons/knowledge/i18n/mn.po
index cc83849e17b..21218454ed8 100644
--- a/addons/knowledge/i18n/mn.po
+++ b/addons/knowledge/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-20 07:22+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-10-21 09: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: 2010-10-21 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: knowledge
@@ -91,6 +91,8 @@ msgid ""
 "Installer for knowledge-based tools\n"
 "    "
 msgstr ""
+"Мэдлэг-суурьтай багажуудын суулгагч\n"
+"    "
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
@@ -145,8 +147,10 @@ msgid ""
 "Lets you create wiki pages and page groups in order to keep track of "
 "business knowledge and share it with and  between your employees."
 msgstr ""
+"Бусадтай бизнесийн мэдлэгээ хуваалцах, суралцахад зориулан вики хуудас "
+"үүсгэх боломж олгоно."
 
 #. module: knowledge
 #: view:knowledge.installer:0
 msgid "Content templates"
-msgstr ""
+msgstr "Агуулгын загвар"
diff --git a/addons/l10n_fr/i18n/fr.po b/addons/l10n_fr/i18n/fr.po
index fb9dfc839e3..6d76bd2e026 100644
--- a/addons/l10n_fr/i18n/fr.po
+++ b/addons/l10n_fr/i18n/fr.po
@@ -6,80 +6,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 07:02+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-21 07:44+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: 2010-09-29 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Redevances de crédit-bail immobilier"
-msgstr "Redevances de crédit-bail immobilier"
+#: model:account.account.type,name:l10n_fr.account_type_receivable
+msgid "Receivable"
+msgstr "Recevable"
 
 #. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "période du"
-msgstr "période du"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Autres réserves"
-msgstr "Autres réserves"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "ACTIF IMMOBILISÉ"
-msgstr "ACTIF IMMOBILISÉ"
-
-#. module: l10n_fr
-#: model:ir.actions.todo,note:l10n_fr.config_call_account_template_fr_pcg
+#: constraint:ir.model:0
 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."
+"The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"Générer un plan comptable à partir d'un modèle. Vous devrez fournir le nom "
-"de l'entreprise, le modèle de plan comptable utilisé, le nombre de chiffres "
-"des numéros de compte, ainsi que les coordonnées bancaires et la monnaie de "
-"tenue de chaque journal. Ainsi une copie du plan comptable sera générée.\n"
-"\t Cet assistant peut être lancé depuis Finance & "
-"Comptabilité/Configuration/Comptabilité financière/Modèles/Générer le plan "
-"de comptes à partir d'un modèle."
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Capital [dont versé...]"
-msgstr "Capital [dont versé...]"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Réserves statutaires ou contractuelles"
-msgstr "Réserves statutaires ou contractuelles"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "nstallations techniques,matériel et outillage"
-msgstr "installations techniques,matériel et outillage"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-#: rml:l10n.fr.cdr:0
-msgid "TOTAL III"
-msgstr "TOTAL III"
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_asset
-msgid "Asset"
-msgstr "Actifs"
+"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
+"spéciaux !"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_income
@@ -87,211 +35,17 @@ msgid "Income"
 msgstr "Produits"
 
 #. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Charges sociales"
-msgstr "Charges sociales"
+#: model:ir.module.module,description:l10n_fr.module_meta_information
+msgid ""
+"This is the module to manage the accounting chart for France in OpenERP.\n"
+"\n"
+"Credits: Sistheo Zeekom CrysaLEAD\n"
+msgstr ""
 
 #. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "PRODUITS EXCEPTIONNELS"
-msgstr "PRODUITS EXCEPTIONNELS"
-
-#. module: l10n_fr
-#: wizard_view:l10n.fr.bilan.report,init:0
-msgid "Select year"
-msgstr "Sélectionner l'année"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Différences négatives de change"
-msgstr "Différences négatives de change"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Autres charges"
-msgstr "Autres charges"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-#: rml:l10n.fr.cdr:0
-msgid "Tenue de Compte :"
-msgstr "Tenue de Compte :"
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_payable
-msgid "Payable"
-msgstr "À payer"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "( IV )"
-msgstr "( IV )"
-
-#. module: l10n_fr
-#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_4
-msgid "Hors Euro"
-msgstr "Hors Euro"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Fonds commercial"
-msgstr "Fonds commercial"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "isponibilités"
-msgstr "Disponibilités"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "+ IV+ V+ VI"
-msgstr "+ IV+ V+ VI"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "De participation"
-msgstr "De participation"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "TOTAL IV"
-msgstr "TOTAL IV"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "D"
-msgstr "D"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "PROVISIONS"
-msgstr "PROVISIONS"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "vances et acomptes"
-msgstr "Avances et acomptes"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Autres dettes"
-msgstr "Autres dettes"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "articipations"
-msgstr "Participations"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "atières premières et autres approvisionnements"
-msgstr "Matières premières et autres approvisionnements"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "P"
-msgstr "P"
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_stocks
-msgid "Actif circulant"
-msgstr "Actif circulant"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "T"
-msgstr "T"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Dettes fournisseurs et comptes rattachés"
-msgstr "Dettes fournisseurs et comptes rattachés"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Provisions pour charges"
-msgstr "Provisions pour charges"
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_dettes
-msgid "Dettes long terme"
-msgstr "Dettes long terme"
-
-#. module: l10n_fr
-#: wizard_view:l10n.fr.cdr.report,init:0
-msgid "Select period"
-msgstr "Sélectionner une période"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "RÉSERVES"
-msgstr "RÉSERVES"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "TOTAL GÉNÉRAL (I + II + III + IV)"
-msgstr "TOTAL GÉNÉRAL (I + II + III + IV)"
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_tax
-msgid "Tax"
-msgstr "Taxe"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Dotations aux amortissements, aux dépréciations et aux provisions"
-msgstr "Dotations aux amortissements, aux dépréciations et aux provisions"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Achats de matières premières et autres approvisionnements"
-msgstr "Achats de matières premières et autres approvisionnements"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Avances et acomptes reçus sur commandes en cours"
-msgstr "Avances et acomptes reçus sur commandes en cours"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Quotes-parts de résultat sur opérations faites en commun (II)"
-msgstr "Quotes-parts de résultat sur opérations faites en commun (II)"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "VALEURS MOBILIÈRES DE PLACEMENT"
-msgstr "VALEURS MOBILIÈRES DE PLACEMENT"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-#: rml:l10n.fr.cdr:0
-msgid "TOTAL I"
-msgstr "TOTAL I"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Autres intérêts et produits assimilés"
-msgstr "Autres intérêts et produits assimilés"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Dettes sur immobilisations et comptes rattachés"
-msgstr "Dettes sur immobilisations et comptes rattachés"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Créances clients et comptes rattachés"
-msgstr "Créances clients et comptes rattachés"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Report à nouveau"
-msgstr "Report à nouveau"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "IMMOBILISATIONS INCORPORELLES"
-msgstr "IMMOBILISATIONS INCORPORELLES"
+#: model:account.account.type,name:l10n_fr.account_type_immobilisations
+msgid "Immobilisations"
+msgstr "Immobilisations"
 
 #. module: l10n_fr
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_1
@@ -300,45 +54,45 @@ msgid "France"
 msgstr "France"
 
 #. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "rêts"
-msgstr "Prêts"
+#: model:account.account.type,name:l10n_fr.account_type_asset
+msgid "Asset"
+msgstr "Actifs"
 
 #. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Sous-total A - Montant net du chiffre d'affaires"
-msgstr "Sous-total A - Montant net du chiffre d'affaires"
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nom de modèle incorrect pour la définition de l'action"
 
 #. module: l10n_fr
-#: wizard_button:l10n.fr.bilan.report,init,report:0
-#: wizard_button:l10n.fr.cdr.report,init,report:0
+#: model:account.account.type,name:l10n_fr.account_type_equity
+msgid "Equity"
+msgstr "Capitaux propres"
+
+#. module: l10n_fr
+#: view:account.bilan.report:0
+#: view:account.cdr.report:0
 msgid "Print"
 msgstr "Imprimer"
 
 #. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Amortissements et dépréciations"
-msgstr "Amortissements et dépréciations"
+#: model:ir.model,name:l10n_fr.model_l10n_fr_report
+msgid "Report for l10n_fr"
+msgstr "Rapport pour l10n_fr"
 
 #. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Net"
-msgstr "Net"
+#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_2
+msgid "Zone Euro"
+msgstr "Zone Euro"
 
 #. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "TOTAL I ( A + B )"
-msgstr "TOTAL I ( A + B )"
+#: model:account.account.type,name:l10n_fr.account_type_expense
+msgid "Expense"
+msgstr "Charges"
 
 #. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "itres immobilisés de l'activité de portefeuille"
-msgstr "Titres immobilisés de l'activité de portefeuille"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "( VI )"
-msgstr "( VI )"
+#: model:ir.model,name:l10n_fr.model_account_cdr_report
+msgid "Account CDR Report"
+msgstr ""
 
 #. module: l10n_fr
 #: constraint:account.account.template:0
@@ -346,41 +100,14 @@ msgid "Error ! You can not create recursive account templates."
 msgstr "Erreur ! Vous ne pouvez pas créer de modèles de compte récursifs"
 
 #. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_provision
-msgid "Provisions"
-msgstr "Provisions"
+#: model:account.account.type,name:l10n_fr.account_type_payable
+msgid "Payable"
+msgstr "À payer"
 
 #. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Variation des stocks"
-msgstr "Variation des stocks"
-
-#. module: l10n_fr
-#: model:ir.actions.report.xml,name:l10n_fr.l10n_fr_pcg_bilan
-#: model:ir.actions.wizard,name:l10n_fr.wizard_l10n_fr_pcg_bilan_report
-#: rml:l10n.fr.bilan:0
-msgid "Bilan"
-msgstr "Bilan"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Emprunts obligataires convertibles"
-msgstr "Emprunts obligataires convertibles"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "TOTAL ACTIF ("
-msgstr "TOTAL ACTIF ("
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "CHARGES ( hors taxes )"
-msgstr "CHARGES ( hors taxes )"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Produits nets sur cessions de valeurs mobilières de placement"
-msgstr "Produits nets sur cessions de valeurs mobilières de placement"
+#: view:account.cdr.report:0
+msgid "Compte de resultant"
+msgstr ""
 
 #. module: l10n_fr
 #: field:l10n.fr.line,report_id:0
@@ -398,542 +125,24 @@ msgid "Engagements"
 msgstr "Engagements"
 
 #. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Avances et acomptes"
-msgstr "Avances et acomptes"
+#: model:ir.model,name:l10n_fr.model_l10n_fr_line
+msgid "Report Lines for l10n_fr"
+msgstr "Lignes de rapport pour l10n_fr"
 
 #. module: l10n_fr
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_7
 msgid "TVA sur les encaissements"
 msgstr "TVA sur les encaissements"
 
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Sous-total B"
-msgstr "Sous-total B"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "C"
-msgstr "C"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "M"
-msgstr "M"
-
-#. module: l10n_fr
-#: model:ir.module.module,description:l10n_fr.module_meta_information
-msgid ""
-"This is the module to manage the accounting chart for France in Open ERP.\n"
-"\n"
-"Credits: Sistheo Zeekom CrysaLEAD\n"
-msgstr ""
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Concessions, brevets, licences,..., droits et valeurs similaires"
-msgstr "Concessions, brevets, licences,..., droits et valeurs similaires"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Instruments de trésorerie"
-msgstr "Instruments de trésorerie"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Écarts de conversion passif"
-msgstr "Écarts de conversion passif"
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_expense
-msgid "Expense"
-msgstr "Charges"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "ACTIF"
-msgstr "ACTIF"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "DETTES"
-msgstr "DETTES"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Sur immobilisations : dotations aux amortissements"
-msgstr "Sur immobilisations : dotations aux amortissements"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "mmobilisations corporelles en cours"
-msgstr "Immobilisations corporelles en cours"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Autres"
-msgstr "Autres"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Dotation aux amortissements et aux dépréciations"
-msgstr "Dotation aux amortissements et aux dépréciations"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "PRODUITS D'EXPLOITATION"
-msgstr "PRODUITS D'EXPLOITATION"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid ""
-"Reprises sur provisions, dépréciations (et amortissements) et transferts de "
-"charges"
-msgstr ""
-"Reprises sur provisions, dépréciations (et amortissements) et transferts de "
-"charges"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "PRODUITS - CHARGES"
-msgstr "PRODUITS - CHARGES"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "RÉSULTAT DE L'EXERCICE [bénéfice ou perte]"
-msgstr "RÉSULTAT DE L'EXERCICE [bénéfice ou perte]"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Impôts, taxes et versements assimilés"
-msgstr "Impôts, taxes et versements assimilés"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "roduits intermédiaires et finis"
-msgstr "Produits intermédiaires et finis"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "utres"
-msgstr "Autres"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Avances et acomptes versés sur commandes"
-msgstr "Avances et acomptes versés sur commandes"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "onstructions"
-msgstr "Constructions"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Reprises sur provisions, dépréciations et transferts de charges"
-msgstr "Reprises sur provisions, dépréciations et transferts de charges"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "réances rattachées à des participations"
-msgstr "Créances rattachées à des participations"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Dotations aux provisions"
-msgstr "Dotations aux provisions"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "vous sur votre structure juridique et son fonctionnement comptable."
-msgstr "vous sur votre structure juridique et son fonctionnement comptable."
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Sur opérations en capital"
-msgstr "Sur opérations en capital"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Charges constatés d'avance"
-msgstr "Charges constatés d'avance"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "TOTAL II"
-msgstr "TOTAL II"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "CAPITAUX PROPRES"
-msgstr "CAPITAUX PROPRES"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Frais d'établissement"
-msgstr "Frais d'établissement"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Charges à répartir sur plusieurs exercices"
-msgstr "Charges à répartir sur plusieurs exercices"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Subventions d'exploitation"
-msgstr "Subventions d'exploitation"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Provisions réglementées"
-msgstr "Provisions réglementées"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "PRODUITS (hors taxes)"
-msgstr "PRODUITS (hors taxes)"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Écart d'équivalence"
-msgstr "Écart d'équivalence"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Primes d'émission, de fusion, d'apport"
-msgstr "Primes d'émission, de fusion, d'apport"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "utres titres immobilisés"
-msgstr "Autres titres immobilisés"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Réserves réglementées"
-msgstr "Réserves réglementées"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "CHARGES D'EXPLOITATION"
-msgstr "CHARGES D'EXPLOITATION"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "I + II + III + IV + V"
-msgstr "I + II + III + IV + V"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid ""
-"Attention, pour que votre bilan soit correct, vous devez solder les comptes "
-"120 ou 129 (Résultat de l'exercice précédant) dans un compte de report à "
-"nouveau (compte 110 ou 119) ou dans le compte 108. Renseignez"
-msgstr ""
-"Attention, pour que votre bilan soit correct, vous devez solder les comptes "
-"120 ou 129 (Résultat de l'exercice précédant) dans un compte de report à "
-"nouveau (compte 110 ou 119) ou dans le compte 108. Renseignez"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Vente de marchandises"
-msgstr "Vente de marchandises"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "PRODUITS FINANCIERS"
-msgstr ""
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Frais de recherche et de développement"
-msgstr ""
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Autres titres"
-msgstr ""
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Production vendue [biens et services]"
-msgstr ""
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Actions propres"
-msgstr ""
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "D'autres valeurs mobilières et créances de l'actif immobilisé"
-msgstr ""
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "ACTIF CIRCULANT"
-msgstr ""
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "ACTIF - PASSIF"
-msgstr ""
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "apital souscrit - non appelé"
-msgstr "Capital souscrit - non appelé"
-
-#. module: l10n_fr
-#: model:ir.model,name:l10n_fr.model_l10n_fr_report
-msgid "Report for l10n_fr"
-msgstr "Rapport pour l10n_fr"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Compte de résultat"
-msgstr "Compte de résultat"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "CRÉANCES"
-msgstr "CRÉANCES"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Sur opérations de gestion"
-msgstr "Sur opérations de gestion"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Redevances de crédit-bail mobilier"
-msgstr "Redevances de crédit-bail mobilier"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Primes de remboursement des emprunts"
-msgstr "Primes de remboursement des emprunts"
-
-#. module: l10n_fr
-#: field:l10n.fr.report,code:0
-msgid "Code"
-msgstr "Code"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Autres produits"
-msgstr "Autres produits"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Participation des salariés aux résultats"
-msgstr "Participation des salariés aux résultats"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Subventions d'investissement"
-msgstr "Subventions d'investissement"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "STOCK EN COURS"
-msgstr "STOCK EN COURS"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Autres achats et charges externes"
-msgstr "Autres achats et charges externes"
-
-#. module: l10n_fr
-#: wizard_field:l10n.fr.bilan.report,init,fiscalyear:0
-#: wizard_field:l10n.fr.cdr.report,init,fiscalyear:0
-msgid "Fiscal year"
-msgstr "Année fiscale"
-
-#. module: l10n_fr
-#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_3
-msgid "DOM-TOM"
-msgstr "DOM-TOM"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Intérêts et charges assimilées"
-msgstr "Intérêts et charges assimilées"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Immobilisations incorporelles en cours"
-msgstr "Immobilisations incorporelles en cours"
-
-#. module: l10n_fr
-#: wizard_button:l10n.fr.bilan.report,init,end:0
-#: wizard_button:l10n.fr.cdr.report,init,end:0
-msgid "Cancel"
-msgstr "Annuler"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-#: rml:l10n.fr.cdr:0
-msgid "au"
-msgstr "au"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Production immobilisée"
-msgstr "Production immobilisée"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Sur actif circulant : dotations aux dépréciations"
-msgstr "Sur actif circulant : dotations aux dépréciations"
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_receivable
-msgid "Receivable"
-msgstr "Recevable"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Capital souscrit - appelé , non versé"
-msgstr "Capital souscrit - appelé , non versé"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-#: rml:l10n.fr.cdr:0
-msgid "( V )"
-msgstr "( V )"
-
-#. module: l10n_fr
-#: constraint:ir.model:0
-msgid ""
-"The Object name must start with x_ and not contain any special character !"
-msgstr ""
-"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
-"spéciaux !"
-
 #. module: l10n_fr
 #: field:l10n.fr.line,definition:0
 msgid "Definition"
 msgstr "Définition"
 
 #. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Différences positives de change"
-msgstr "Différences positives de change"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "errains"
-msgstr "Terrains"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Brut"
-msgstr "Brut"
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_immobilisations
-msgid "Immobilisations"
-msgstr "Immobilisations"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "PASSIF"
-msgstr "PASSIF"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Écarts de réévaluation"
-msgstr "Écarts de réévaluation"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Production stockée"
-msgstr "Production stockée"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-#: rml:l10n.fr.cdr:0
-msgid "Imprimé le :"
-msgstr "Imprimé le :"
-
-#. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_equity
-msgid "Equity"
-msgstr "Capitaux propres"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Impôts sur les bénéfices"
-msgstr "Impôts sur les bénéfices"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "TOTAL DES PRODUITS ( I + II + III + IV )"
-msgstr "TOTAL DES PRODUITS ( I + II + III + IV )"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Salaires et traitements"
-msgstr "Salaires et traitements"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-#: rml:l10n.fr.cdr:0
-msgid ")"
-msgstr ")"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Provisions pour risques"
-msgstr "Provisions pour risques"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "n-cours de production [biens et services]"
-msgstr "En-cours de production [biens et services]"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Sur immobilisations : dotations aux dépréciations"
-msgstr "Sur immobilisations : dotations aux dépréciations"
-
-#. module: l10n_fr
-#: field:l10n.fr.line,code:0
-msgid "Variable Name"
-msgstr "Nom de la variable"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "TOTAL CHARGES ( I + II + III"
-msgstr "TOTAL CHARGES ( I + II + III"
-
-#. module: l10n_fr
-#: model:ir.actions.report.xml,name:l10n_fr.l10n_fr_pcg_cdr
-#: model:ir.actions.wizard,name:l10n_fr.wizard_l10n_fr_pcg_cdr_report
-msgid "Compte de resultat"
-msgstr "Compte de resultat"
-
-#. module: l10n_fr
-#: model:ir.model,name:l10n_fr.model_l10n_fr_line
-msgid "Report Lines for l10n_fr"
-msgstr "Lignes de rapport pour l10n_fr"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "A"
-msgstr "A"
-
-#. module: l10n_fr
-#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_2
-msgid "Zone Euro"
-msgstr "Zone Euro"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "E"
-msgstr "E"
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML incorrect pour l'architecture de la vue !"
 
 #. module: l10n_fr
 #: field:l10n.fr.line,name:0
@@ -942,9 +151,9 @@ msgid "Name"
 msgstr "Nom"
 
 #. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "I"
-msgstr "I"
+#: model:ir.actions.act_window,name:l10n_fr.action_account_cdr_report
+msgid "Compte de resultat Report"
+msgstr "Rapport Compte de résultat"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_stock
@@ -967,49 +176,35 @@ msgid "Comptes spéciaux"
 msgstr "Comptes spéciaux"
 
 #. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Emprunts et dettes financières diverses"
-msgstr "Emprunts et dettes financières diverses"
+#: field:account.bilan.report,fiscalyear_id:0
+#: field:account.cdr.report,fiscalyear_id:0
+msgid "Fiscal Year"
+msgstr "Exercice fiscal"
 
 #. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Produits constatés d'avance"
-msgstr "Produits constatés d'avance"
+#: field:l10n.fr.report,code:0
+msgid "Code"
+msgstr "Code"
 
 #. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Charges nettes sur cessions de valeurs mobilières de placement"
-msgstr "Charges nettes sur cessions de valeurs mobilières de placement"
+#: model:account.account.type,name:l10n_fr.account_type_dettes
+msgid "Dettes long terme"
+msgstr "Dettes long terme"
 
 #. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "archandises"
-msgstr "Marchandises"
+#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_4
+msgid "Hors Euro"
+msgstr "Hors Euro"
 
 #. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Emprunts et dettes auprès des établissements de crédit"
-msgstr "Emprunts et dettes auprès des établissements de crédit"
+#: model:account.account.type,name:l10n_fr.account_type_stocks
+msgid "Actif circulant"
+msgstr "Actif circulant"
 
 #. module: l10n_fr
-#: model:account.account.type,name:l10n_fr.account_type_view
-msgid "View"
-msgstr "Vue"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "CHARGES FINANCIÈRES"
-msgstr "CHARGES FINANCIÈRES"
-
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Quotes-parts de résultat sur opérations faites en commun ( II )"
-msgstr "Quotes-parts de résultat sur opérations faites en commun ( II )"
-
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "IMMOBILISATIONS CORPORELLES"
-msgstr "IMMOBILISATIONS CORPORELLES"
+#: model:account.account.type,name:l10n_fr.account_type_provision
+msgid "Provisions"
+msgstr "Provisions"
 
 #. module: l10n_fr
 #: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_6
@@ -1017,9 +212,10 @@ msgid "TVA sur le débits"
 msgstr "TVA sur le débits"
 
 #. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "Achat de marchandises"
-msgstr "Achat de marchandises"
+#: view:account.bilan.report:0
+#: model:ir.actions.act_window,name:l10n_fr.action_account_bilan_report
+msgid "Bilan Report"
+msgstr "Rapport Bilan"
 
 #. module: l10n_fr
 #: model:ir.module.module,shortdesc:l10n_fr.module_meta_information
@@ -1027,19 +223,25 @@ msgid "France - Plan Comptable Général"
 msgstr "France - Plan Comptable Général"
 
 #. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Écarts de conversion actif"
-msgstr "Écarts de conversion actif"
+#: model:account.account.type,name:l10n_fr.account_type_tax
+msgid "Tax"
+msgstr "Taxe"
 
 #. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Autres emprunts obligataires"
-msgstr "Autres emprunts obligataires"
+#: model:account.fiscal.position.template,name:l10n_fr.fiscal_position_template_3
+msgid "DOM-TOM"
+msgstr "DOM-TOM"
 
 #. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Réserve légale"
-msgstr "Réserve légale"
+#: model:account.account.type,name:l10n_fr.account_type_view
+msgid "View"
+msgstr "Vue"
+
+#. module: l10n_fr
+#: view:account.bilan.report:0
+#: view:account.cdr.report:0
+msgid "Cancel"
+msgstr "Annuler"
 
 #. module: l10n_fr
 #: model:account.account.type,name:l10n_fr.account_type_cloture
@@ -1047,16 +249,492 @@ msgid "Cloture"
 msgstr "Cloture"
 
 #. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "IMMOBILISATIONS FINANCIÉRES"
-msgstr "IMMOBILISATIONS FINANCIÉRES"
+#: field:l10n.fr.line,code:0
+msgid "Variable Name"
+msgstr "Nom de la variable"
 
-#. module: l10n_fr
-#: rml:l10n.fr.cdr:0
-msgid "CHARGES EXCEPTIONNELLES"
-msgstr "CHARGES EXCEPTIONNELLES"
+#~ msgid "Select period"
+#~ msgstr "Sélectionner une période"
 
-#. module: l10n_fr
-#: rml:l10n.fr.bilan:0
-msgid "Dettes fiscales et sociales"
-msgstr "Dettes fiscales et sociales"
+#~ msgid "Bilan"
+#~ msgstr "Bilan"
+
+#~ msgid "Fiscal year"
+#~ msgstr "Année fiscale"
+
+#~ msgid "Compte de resultat"
+#~ msgstr "Compte de resultat"
+
+#~ msgid "Select year"
+#~ msgstr "Sélectionner l'année"
+
+#~ 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 ""
+#~ "Générer un plan comptable à partir d'un modèle. Vous devrez fournir le nom "
+#~ "de l'entreprise, le modèle de plan comptable utilisé, le nombre de chiffres "
+#~ "des numéros de compte, ainsi que les coordonnées bancaires et la monnaie de "
+#~ "tenue de chaque journal. Ainsi une copie du plan comptable sera générée.\n"
+#~ "\t Cet assistant peut être lancé depuis Finance & "
+#~ "Comptabilité/Configuration/Comptabilité financière/Modèles/Générer le plan "
+#~ "de comptes à partir d'un modèle."
+
+#~ msgid "PRODUITS EXCEPTIONNELS"
+#~ msgstr "PRODUITS EXCEPTIONNELS"
+
+#~ msgid "Charges sociales"
+#~ msgstr "Charges sociales"
+
+#~ msgid "TOTAL III"
+#~ msgstr "TOTAL III"
+
+#~ msgid "nstallations techniques,matériel et outillage"
+#~ msgstr "installations techniques,matériel et outillage"
+
+#~ msgid "Réserves statutaires ou contractuelles"
+#~ msgstr "Réserves statutaires ou contractuelles"
+
+#~ msgid "ACTIF IMMOBILISÉ"
+#~ msgstr "ACTIF IMMOBILISÉ"
+
+#~ msgid "Capital [dont versé...]"
+#~ msgstr "Capital [dont versé...]"
+
+#~ msgid "période du"
+#~ msgstr "période du"
+
+#~ msgid "Autres réserves"
+#~ msgstr "Autres réserves"
+
+#~ msgid "Redevances de crédit-bail immobilier"
+#~ msgstr "Redevances de crédit-bail immobilier"
+
+#~ msgid "Tenue de Compte :"
+#~ msgstr "Tenue de Compte :"
+
+#~ msgid "Autres charges"
+#~ msgstr "Autres charges"
+
+#~ msgid "Différences négatives de change"
+#~ msgstr "Différences négatives de change"
+
+#~ msgid "( IV )"
+#~ msgstr "( IV )"
+
+#~ msgid "Fonds commercial"
+#~ msgstr "Fonds commercial"
+
+#~ msgid "isponibilités"
+#~ msgstr "Disponibilités"
+
+#~ msgid "+ IV+ V+ VI"
+#~ msgstr "+ IV+ V+ VI"
+
+#~ msgid "De participation"
+#~ msgstr "De participation"
+
+#~ msgid "TOTAL IV"
+#~ msgstr "TOTAL IV"
+
+#~ msgid "P"
+#~ msgstr "P"
+
+#~ msgid "atières premières et autres approvisionnements"
+#~ msgstr "Matières premières et autres approvisionnements"
+
+#~ msgid "Dettes fournisseurs et comptes rattachés"
+#~ msgstr "Dettes fournisseurs et comptes rattachés"
+
+#~ msgid "Provisions pour charges"
+#~ msgstr "Provisions pour charges"
+
+#~ msgid "T"
+#~ msgstr "T"
+
+#~ msgid "Autres dettes"
+#~ msgstr "Autres dettes"
+
+#~ msgid "articipations"
+#~ msgstr "Participations"
+
+#~ msgid "D"
+#~ msgstr "D"
+
+#~ msgid "PROVISIONS"
+#~ msgstr "PROVISIONS"
+
+#~ msgid "vances et acomptes"
+#~ msgstr "Avances et acomptes"
+
+#~ msgid "RÉSERVES"
+#~ msgstr "RÉSERVES"
+
+#~ msgid "Dotations aux amortissements, aux dépréciations et aux provisions"
+#~ msgstr "Dotations aux amortissements, aux dépréciations et aux provisions"
+
+#~ msgid "TOTAL GÉNÉRAL (I + II + III + IV)"
+#~ msgstr "TOTAL GÉNÉRAL (I + II + III + IV)"
+
+#~ msgid "Avances et acomptes reçus sur commandes en cours"
+#~ msgstr "Avances et acomptes reçus sur commandes en cours"
+
+#~ msgid "Achats de matières premières et autres approvisionnements"
+#~ msgstr "Achats de matières premières et autres approvisionnements"
+
+#~ msgid "TOTAL I"
+#~ msgstr "TOTAL I"
+
+#~ msgid "Autres intérêts et produits assimilés"
+#~ msgstr "Autres intérêts et produits assimilés"
+
+#~ msgid "Quotes-parts de résultat sur opérations faites en commun (II)"
+#~ msgstr "Quotes-parts de résultat sur opérations faites en commun (II)"
+
+#~ msgid "VALEURS MOBILIÈRES DE PLACEMENT"
+#~ msgstr "VALEURS MOBILIÈRES DE PLACEMENT"
+
+#~ msgid "Dettes sur immobilisations et comptes rattachés"
+#~ msgstr "Dettes sur immobilisations et comptes rattachés"
+
+#~ msgid "TOTAL I ( A + B )"
+#~ msgstr "TOTAL I ( A + B )"
+
+#~ msgid "Net"
+#~ msgstr "Net"
+
+#~ msgid "Amortissements et dépréciations"
+#~ msgstr "Amortissements et dépréciations"
+
+#~ msgid "Sous-total A - Montant net du chiffre d'affaires"
+#~ msgstr "Sous-total A - Montant net du chiffre d'affaires"
+
+#~ msgid "itres immobilisés de l'activité de portefeuille"
+#~ msgstr "Titres immobilisés de l'activité de portefeuille"
+
+#~ msgid "Report à nouveau"
+#~ msgstr "Report à nouveau"
+
+#~ msgid "IMMOBILISATIONS INCORPORELLES"
+#~ msgstr "IMMOBILISATIONS INCORPORELLES"
+
+#~ msgid "Créances clients et comptes rattachés"
+#~ msgstr "Créances clients et comptes rattachés"
+
+#~ msgid "rêts"
+#~ msgstr "Prêts"
+
+#~ msgid "TOTAL ACTIF ("
+#~ msgstr "TOTAL ACTIF ("
+
+#~ msgid "Emprunts obligataires convertibles"
+#~ msgstr "Emprunts obligataires convertibles"
+
+#~ msgid "Variation des stocks"
+#~ msgstr "Variation des stocks"
+
+#~ msgid "( VI )"
+#~ msgstr "( VI )"
+
+#~ msgid "Sous-total B"
+#~ msgstr "Sous-total B"
+
+#~ msgid "CHARGES ( hors taxes )"
+#~ msgstr "CHARGES ( hors taxes )"
+
+#~ msgid "Produits nets sur cessions de valeurs mobilières de placement"
+#~ msgstr "Produits nets sur cessions de valeurs mobilières de placement"
+
+#~ msgid "Avances et acomptes"
+#~ msgstr "Avances et acomptes"
+
+#~ msgid "Sur immobilisations : dotations aux amortissements"
+#~ msgstr "Sur immobilisations : dotations aux amortissements"
+
+#~ msgid "DETTES"
+#~ msgstr "DETTES"
+
+#~ msgid "ACTIF"
+#~ msgstr "ACTIF"
+
+#~ msgid "mmobilisations corporelles en cours"
+#~ msgstr "Immobilisations corporelles en cours"
+
+#~ msgid "C"
+#~ msgstr "C"
+
+#~ msgid "Instruments de trésorerie"
+#~ msgstr "Instruments de trésorerie"
+
+#~ msgid "Écarts de conversion passif"
+#~ msgstr "Écarts de conversion passif"
+
+#~ msgid "M"
+#~ msgstr "M"
+
+#~ msgid "Concessions, brevets, licences,..., droits et valeurs similaires"
+#~ msgstr "Concessions, brevets, licences,..., droits et valeurs similaires"
+
+#~ msgid "Impôts, taxes et versements assimilés"
+#~ msgstr "Impôts, taxes et versements assimilés"
+
+#~ msgid "Dotation aux amortissements et aux dépréciations"
+#~ msgstr "Dotation aux amortissements et aux dépréciations"
+
+#~ msgid "Autres"
+#~ msgstr "Autres"
+
+#~ msgid ""
+#~ "Reprises sur provisions, dépréciations (et amortissements) et transferts de "
+#~ "charges"
+#~ msgstr ""
+#~ "Reprises sur provisions, dépréciations (et amortissements) et transferts de "
+#~ "charges"
+
+#~ msgid "PRODUITS D'EXPLOITATION"
+#~ msgstr "PRODUITS D'EXPLOITATION"
+
+#~ msgid "RÉSULTAT DE L'EXERCICE [bénéfice ou perte]"
+#~ msgstr "RÉSULTAT DE L'EXERCICE [bénéfice ou perte]"
+
+#~ msgid "PRODUITS - CHARGES"
+#~ msgstr "PRODUITS - CHARGES"
+
+#~ msgid "Avances et acomptes versés sur commandes"
+#~ msgstr "Avances et acomptes versés sur commandes"
+
+#~ msgid "roduits intermédiaires et finis"
+#~ msgstr "Produits intermédiaires et finis"
+
+#~ msgid "utres"
+#~ msgstr "Autres"
+
+#~ msgid "CAPITAUX PROPRES"
+#~ msgstr "CAPITAUX PROPRES"
+
+#~ msgid "réances rattachées à des participations"
+#~ msgstr "Créances rattachées à des participations"
+
+#~ msgid "Dotations aux provisions"
+#~ msgstr "Dotations aux provisions"
+
+#~ msgid "onstructions"
+#~ msgstr "Constructions"
+
+#~ msgid "Reprises sur provisions, dépréciations et transferts de charges"
+#~ msgstr "Reprises sur provisions, dépréciations et transferts de charges"
+
+#~ msgid "Charges constatés d'avance"
+#~ msgstr "Charges constatés d'avance"
+
+#~ msgid "TOTAL II"
+#~ msgstr "TOTAL II"
+
+#~ msgid "Frais d'établissement"
+#~ msgstr "Frais d'établissement"
+
+#~ msgid "vous sur votre structure juridique et son fonctionnement comptable."
+#~ msgstr "vous sur votre structure juridique et son fonctionnement comptable."
+
+#~ msgid "Sur opérations en capital"
+#~ msgstr "Sur opérations en capital"
+
+#~ msgid "I + II + III + IV + V"
+#~ msgstr "I + II + III + IV + V"
+
+#~ msgid "CHARGES D'EXPLOITATION"
+#~ msgstr "CHARGES D'EXPLOITATION"
+
+#~ msgid "Réserves réglementées"
+#~ msgstr "Réserves réglementées"
+
+#~ msgid "Charges à répartir sur plusieurs exercices"
+#~ msgstr "Charges à répartir sur plusieurs exercices"
+
+#~ msgid "Subventions d'exploitation"
+#~ msgstr "Subventions d'exploitation"
+
+#~ msgid "Provisions réglementées"
+#~ msgstr "Provisions réglementées"
+
+#~ msgid "PRODUITS (hors taxes)"
+#~ msgstr "PRODUITS (hors taxes)"
+
+#~ msgid "Écart d'équivalence"
+#~ msgstr "Écart d'équivalence"
+
+#~ msgid "Primes d'émission, de fusion, d'apport"
+#~ msgstr "Primes d'émission, de fusion, d'apport"
+
+#~ msgid "utres titres immobilisés"
+#~ msgstr "Autres titres immobilisés"
+
+#~ msgid "Vente de marchandises"
+#~ msgstr "Vente de marchandises"
+
+#~ msgid ""
+#~ "Attention, pour que votre bilan soit correct, vous devez solder les comptes "
+#~ "120 ou 129 (Résultat de l'exercice précédant) dans un compte de report à "
+#~ "nouveau (compte 110 ou 119) ou dans le compte 108. Renseignez"
+#~ msgstr ""
+#~ "Attention, pour que votre bilan soit correct, vous devez solder les comptes "
+#~ "120 ou 129 (Résultat de l'exercice précédant) dans un compte de report à "
+#~ "nouveau (compte 110 ou 119) ou dans le compte 108. Renseignez"
+
+#~ msgid "Participation des salariés aux résultats"
+#~ msgstr "Participation des salariés aux résultats"
+
+#~ msgid "Autres produits"
+#~ msgstr "Autres produits"
+
+#~ msgid "STOCK EN COURS"
+#~ msgstr "STOCK EN COURS"
+
+#~ msgid "Subventions d'investissement"
+#~ msgstr "Subventions d'investissement"
+
+#~ msgid "Redevances de crédit-bail mobilier"
+#~ msgstr "Redevances de crédit-bail mobilier"
+
+#~ msgid "Primes de remboursement des emprunts"
+#~ msgstr "Primes de remboursement des emprunts"
+
+#~ msgid "CRÉANCES"
+#~ msgstr "CRÉANCES"
+
+#~ msgid "Sur opérations de gestion"
+#~ msgstr "Sur opérations de gestion"
+
+#~ msgid "apital souscrit - non appelé"
+#~ msgstr "Capital souscrit - non appelé"
+
+#~ msgid "Compte de résultat"
+#~ msgstr "Compte de résultat"
+
+#~ msgid "Production immobilisée"
+#~ msgstr "Production immobilisée"
+
+#~ msgid "au"
+#~ msgstr "au"
+
+#~ msgid "Différences positives de change"
+#~ msgstr "Différences positives de change"
+
+#~ msgid "Autres achats et charges externes"
+#~ msgstr "Autres achats et charges externes"
+
+#~ msgid "Immobilisations incorporelles en cours"
+#~ msgstr "Immobilisations incorporelles en cours"
+
+#~ msgid "Intérêts et charges assimilées"
+#~ msgstr "Intérêts et charges assimilées"
+
+#~ msgid "Sur actif circulant : dotations aux dépréciations"
+#~ msgstr "Sur actif circulant : dotations aux dépréciations"
+
+#~ msgid "Capital souscrit - appelé , non versé"
+#~ msgstr "Capital souscrit - appelé , non versé"
+
+#~ msgid "( V )"
+#~ msgstr "( V )"
+
+#~ msgid ")"
+#~ msgstr ")"
+
+#~ msgid "Salaires et traitements"
+#~ msgstr "Salaires et traitements"
+
+#~ msgid "TOTAL DES PRODUITS ( I + II + III + IV )"
+#~ msgstr "TOTAL DES PRODUITS ( I + II + III + IV )"
+
+#~ msgid "Impôts sur les bénéfices"
+#~ msgstr "Impôts sur les bénéfices"
+
+#~ msgid "errains"
+#~ msgstr "Terrains"
+
+#~ msgid "Brut"
+#~ msgstr "Brut"
+
+#~ msgid "PASSIF"
+#~ msgstr "PASSIF"
+
+#~ msgid "Écarts de réévaluation"
+#~ msgstr "Écarts de réévaluation"
+
+#~ msgid "Production stockée"
+#~ msgstr "Production stockée"
+
+#~ msgid "Imprimé le :"
+#~ msgstr "Imprimé le :"
+
+#~ msgid "A"
+#~ msgstr "A"
+
+#~ msgid "TOTAL CHARGES ( I + II + III"
+#~ msgstr "TOTAL CHARGES ( I + II + III"
+
+#~ msgid "Sur immobilisations : dotations aux dépréciations"
+#~ msgstr "Sur immobilisations : dotations aux dépréciations"
+
+#~ msgid "n-cours de production [biens et services]"
+#~ msgstr "En-cours de production [biens et services]"
+
+#~ msgid "Provisions pour risques"
+#~ msgstr "Provisions pour risques"
+
+#~ msgid "Produits constatés d'avance"
+#~ msgstr "Produits constatés d'avance"
+
+#~ msgid "Emprunts et dettes financières diverses"
+#~ msgstr "Emprunts et dettes financières diverses"
+
+#~ msgid "E"
+#~ msgstr "E"
+
+#~ msgid "I"
+#~ msgstr "I"
+
+#~ msgid "Achat de marchandises"
+#~ msgstr "Achat de marchandises"
+
+#~ msgid "Écarts de conversion actif"
+#~ msgstr "Écarts de conversion actif"
+
+#~ msgid "Emprunts et dettes auprès des établissements de crédit"
+#~ msgstr "Emprunts et dettes auprès des établissements de crédit"
+
+#~ msgid "CHARGES FINANCIÈRES"
+#~ msgstr "CHARGES FINANCIÈRES"
+
+#~ msgid "Charges nettes sur cessions de valeurs mobilières de placement"
+#~ msgstr "Charges nettes sur cessions de valeurs mobilières de placement"
+
+#~ msgid "archandises"
+#~ msgstr "Marchandises"
+
+#~ msgid "Quotes-parts de résultat sur opérations faites en commun ( II )"
+#~ msgstr "Quotes-parts de résultat sur opérations faites en commun ( II )"
+
+#~ msgid "IMMOBILISATIONS CORPORELLES"
+#~ msgstr "IMMOBILISATIONS CORPORELLES"
+
+#~ msgid "IMMOBILISATIONS FINANCIÉRES"
+#~ msgstr "IMMOBILISATIONS FINANCIÉRES"
+
+#~ msgid "Réserve légale"
+#~ msgstr "Réserve légale"
+
+#~ msgid "Dettes fiscales et sociales"
+#~ msgstr "Dettes fiscales et sociales"
+
+#~ msgid "Autres emprunts obligataires"
+#~ msgstr "Autres emprunts obligataires"
+
+#~ msgid "CHARGES EXCEPTIONNELLES"
+#~ msgstr "CHARGES EXCEPTIONNELLES"
diff --git a/addons/marketing/i18n/mn.po b/addons/marketing/i18n/mn.po
index 8e567cff6e5..14aa1472f6f 100644
--- a/addons/marketing/i18n/mn.po
+++ b/addons/marketing/i18n/mn.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: 2010-08-20 07:04+0000\n"
-"PO-Revision-Date: 2010-09-29 11:39+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-21 09:22+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: 2010-09-30 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
@@ -41,9 +41,9 @@ msgid "title"
 msgstr "гарчиг"
 
 #. module: marketing
-#: field:marketing.installer,email_template:0
-msgid "Automated E-Mails"
-msgstr "Автомат и-мэйлүүд"
+#: model:ir.module.module,shortdesc:marketing.module_meta_information
+msgid "Marketing"
+msgstr "Маркетинг"
 
 #. module: marketing
 #: field:marketing.installer,config_logo:0
@@ -59,15 +59,6 @@ msgstr ""
 "Маркетингийн компанит ажил, харилцаа холбоо, үйл ажиллагааг автоматжуулахад "
 "туслана."
 
-#. module: marketing
-#: help:marketing.installer,marketing_campaign_mailchimp:0
-msgid ""
-"This modules integrate mailchimp.com's service with OpenERP to automate mass "
-"mailings."
-msgstr ""
-"Энэ модуль нь бөөн имэйл илгээх ажлыг автоматжуулах mailchimp.com үйлчилгээг "
-"OpenERP-тай нэгтгэнэ."
-
 #. module: marketing
 #: model:ir.module.module,description:marketing.module_meta_information
 msgid "Menu for Marketing"
@@ -82,10 +73,9 @@ msgstr ""
 "Имэйлийн загварууд бэлдэж янз бүрийн үйл ажиллагаанд хэрэглэхэд туслана."
 
 #. module: marketing
-#: help:marketing.installer,crm_profiling:0
-msgid ""
-"Helps you to perform segmentation within partners and design questionaires."
-msgstr "Харилцагчдыг хувааж асуулга зохион байгуулахад туслана."
+#: model:ir.model,name:marketing.model_marketing_installer
+msgid "marketing.installer"
+msgstr "marketing.installer"
 
 #. module: marketing
 #: constraint:ir.actions.act_window:0
@@ -93,9 +83,9 @@ msgid "Invalid model name in the action definition."
 msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна."
 
 #. module: marketing
-#: model:ir.module.module,shortdesc:marketing.module_meta_information
-msgid "Marketing"
-msgstr "Маркетинг"
+#: model:ir.actions.act_window,name:marketing.action_marketing_installer
+msgid "Marketing Applications Configuration"
+msgstr "Маркетингийн тохируулга"
 
 #. module: marketing
 #: field:marketing.installer,crm_profiling:0
@@ -108,16 +98,29 @@ msgid "Marketing Campaigns"
 msgstr "Маркетингийн компанит ажил"
 
 #. module: marketing
-#: model:ir.model,name:marketing.model_marketing_installer
-msgid "marketing.installer"
-msgstr "marketing.installer"
+#: help:marketing.installer,crm_profiling:0
+msgid ""
+"Helps you to perform segmentation of partners and design segmentation "
+"questionnaires"
+msgstr ""
+"Харилцагчдыг хуваах, дараа нь хуваалтаар асуулга зохиомжлоход туслана"
 
-#. module: marketing
-#: field:marketing.installer,marketing_campaign_mailchimp:0
-msgid "Mailchimp Integration"
-msgstr "Mailchimp нэгтгэл"
+#~ msgid "Marketing Modules Installation"
+#~ msgstr "Маркетинг модулиудын суулгац"
 
-#. module: marketing
-#: model:ir.actions.act_window,name:marketing.action_marketing_installer
-msgid "Marketing Modules Installation"
-msgstr "Маркетинг модулиудын суулгац"
+#~ msgid "Automated E-Mails"
+#~ msgstr "Автомат и-мэйлүүд"
+
+#~ msgid ""
+#~ "Helps you to perform segmentation within partners and design questionaires."
+#~ msgstr "Харилцагчдыг хувааж асуулга зохион байгуулахад туслана."
+
+#~ msgid ""
+#~ "This modules integrate mailchimp.com's service with OpenERP to automate mass "
+#~ "mailings."
+#~ msgstr ""
+#~ "Энэ модуль нь бөөн имэйл илгээх ажлыг автоматжуулах mailchimp.com үйлчилгээг "
+#~ "OpenERP-тай нэгтгэнэ."
+
+#~ msgid "Mailchimp Integration"
+#~ msgstr "Mailchimp нэгтгэл"
diff --git a/addons/marketing/i18n/sv.po b/addons/marketing/i18n/sv.po
index f6fb68f55e9..8bb2f8b81f3 100644
--- a/addons/marketing/i18n/sv.po
+++ b/addons/marketing/i18n/sv.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-20 09:03+0000\n"
-"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2010-10-21 11:30+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: 2010-10-21 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing
diff --git a/addons/marketing_campaign/i18n/sv.po b/addons/marketing_campaign/i18n/sv.po
index 70c4b315b67..5de1e6277d1 100644
--- a/addons/marketing_campaign/i18n/sv.po
+++ b/addons/marketing_campaign/i18n/sv.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-20 09:06+0000\n"
-"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2010-10-21 11:28+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: 2010-10-21 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index 4a27a35cf2d..28c75ec5405 100644
--- a/addons/mrp/i18n/fr.po
+++ b/addons/mrp/i18n/fr.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: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-20 08:17+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2010-10-21 11:23+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: 2010-10-21 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/mrp/i18n/sv.po b/addons/mrp/i18n/sv.po
index 18ed5fc4c27..2d33513a50d 100644
--- a/addons/mrp/i18n/sv.po
+++ b/addons/mrp/i18n/sv.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: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-20 12:32+0000\n"
-"Last-Translator: Magnus Brandt, Aspirix AB <Unknown>\n"
+"PO-Revision-Date: 2010-10-21 11: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: 2010-10-21 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
diff --git a/addons/pad/LICENSE b/addons/pad/LICENSE
new file mode 100644
index 00000000000..cff5dae3a7b
--- /dev/null
+++ b/addons/pad/LICENSE
@@ -0,0 +1,15 @@
+OpenERP, Open Source Management Solution
+Copyright © 2010 OpenERP SA (<http://openerp.com>).
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public Lice
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
\ No newline at end of file
diff --git a/addons/pad/__init__.py b/addons/pad/__init__.py
new file mode 100644
index 00000000000..6a60bdb9799
--- /dev/null
+++ b/addons/pad/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+import company_pad
diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py
new file mode 100644
index 00000000000..4b5e3ca959e
--- /dev/null
+++ b/addons/pad/__openerp__.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+{
+    'name': 'Enhanced support for (Ether)Pad attachments',
+    'version': '1.0',
+    'category': 'Generic Modules/Others',
+    'description': """
+Adds enhanced support for (Ether)Pad attachments in the web client, lets the
+company customize which Pad installation should be used to link to new pads
+(by default, pad.openerp.com)
+    """,
+    'author': 'OpenERP SA',
+    'website': 'http://openerp.com',
+    'depends': ['base'],
+    'update_xml': [
+        'company_pad.xml'
+    ],
+    'installable': True,
+    'active': False,
+    'web': True,
+}
diff --git a/addons/pad/company_pad.py b/addons/pad/company_pad.py
new file mode 100644
index 00000000000..1e687704eac
--- /dev/null
+++ b/addons/pad/company_pad.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from osv import fields, osv
+
+class company_pad(osv.osv):
+    _inherit = 'res.company'
+    _columns = {
+        'pad_index': fields.char('Pad root URL', size=64, required=True,
+                                 help="The root URL of the company's pad "
+                                      "instance"),
+    }
+    _defaults = {
+        'pad_index': 'http://pad.openerp.com'
+    }
+
+company_pad()
diff --git a/addons/pad/company_pad.xml b/addons/pad/company_pad.xml
new file mode 100644
index 00000000000..754776715d7
--- /dev/null
+++ b/addons/pad/company_pad.xml
@@ -0,0 +1,16 @@
+<openerp>
+  <data>
+    <record id="view_company_form_with_pad" model="ir.ui.view">
+      <field name="name">res.company.form.pad</field>
+      <field name="model">res.company</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="base.view_company_form"/>
+      <field name="arch" type="xml">
+        <xpath expr="//page[@string='Configuration']" position="inside">
+          <separator string="Pad" colspan="4"/>
+          <field name="pad_index"/>
+        </xpath>
+      </field>
+    </record>
+  </data>
+</openerp>
diff --git a/addons/pad/web/__init__.py b/addons/pad/web/__init__.py
new file mode 100644
index 00000000000..95542e91e3e
--- /dev/null
+++ b/addons/pad/web/__init__.py
@@ -0,0 +1,2 @@
+import controllers
+import editors
diff --git a/addons/pad/web/controllers.py b/addons/pad/web/controllers.py
new file mode 100644
index 00000000000..faa5d0ad54b
--- /dev/null
+++ b/addons/pad/web/controllers.py
@@ -0,0 +1,34 @@
+import urlparse
+
+import cherrypy
+
+from openobject.tools import expose
+
+import openerp.controllers
+from openerp.utils import rpc, TinyDict
+
+class Piratepad(openerp.controllers.SecuredController):
+    _cp_path = "/piratepad"
+
+    def get_root(self):
+        return rpc.RPCProxy('res.company').read(
+                [rpc.session.company_id], ['pad_index'])[0]['pad_index']
+
+    def make_url(self, pad_name):
+        return urlparse.urljoin(
+            self.get_root(), '-'.join(pad_name.split())
+        )
+
+    @expose('json', methods=('POST',))
+    def link(self, pad_name):
+        params, data = TinyDict.split(cherrypy.session['params'])
+        ctx = dict(rpc.session.context,
+                   default_res_model=params.model, default_res_id=params.id,
+                   active_id=False, active_ids=[])
+
+        pad_link = self.make_url(pad_name)
+        attachment_id = rpc.RPCProxy('ir.attachment').create({
+            'name': pad_name,
+            'url': pad_link,
+            }, ctx)
+        return {'id': attachment_id, 'name': pad_name, 'url': pad_link}
diff --git a/addons/pad/web/editors.py b/addons/pad/web/editors.py
new file mode 100644
index 00000000000..62ff426a623
--- /dev/null
+++ b/addons/pad/web/editors.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+import openobject.templating
+
+class SidebarTemplateEditor(openobject.templating.TemplateEditor):
+    templates = ['/openerp/widgets/templates/sidebar.mako']
+    ADD_ATTACHMENT_BUTTON = u'id="add-attachment"'
+    BINARY_ATTACHMENTS_FORM = u'<form id="attachment-box"'
+
+    def insert_pad_link(self, output):
+        # Insert the link on the line right after the link to open the
+        # attachment form
+        form_opener_insertion = output.index(
+                '\n',
+                output.index(self.ADD_ATTACHMENT_BUTTON)) + 1
+        output = output[:form_opener_insertion] + \
+                 '''<a href="#" id="add-pad" class="button-a"
+                       style="right: 44px;"
+                       >${_("Pad")}</a>\n''' + \
+                 output[form_opener_insertion:]
+        return output
+
+    def edit(self, template, template_text):
+        output = super(SidebarTemplateEditor, self).edit(template, template_text)
+
+        output = self.insert_pad_link(output)
+
+        form_insertion_point = output.index(self.BINARY_ATTACHMENTS_FORM)
+        return output[:form_insertion_point] + '''
+            <form id="pad-form" action="/piratepad/link" method="post">
+                <label for="sidebar_pad_datas">${_("Name")}:</label>
+                <input id="sidebar_pad_datas"
+                       name="pad_name" size="5" />
+                <button>${_("Ok")}</button>
+            </form>
+            <script type="text/javascript">
+                jQuery(document).ready(function() {
+                    var $padForm = jQuery('#pad-form')
+                            .hide()
+                            .submit(createAttachment);
+                    jQuery('#add-pad').click(function(e){
+                        $padForm.show();
+                        e.preventDefault();
+                    });
+                });
+            </script>
+        ''' + output[form_insertion_point:]
diff --git a/addons/procurement/i18n/ru.po b/addons/procurement/i18n/ru.po
index ed26402d8b0..94e6a5bf7f6 100644
--- a/addons/procurement/i18n/ru.po
+++ b/addons/procurement/i18n/ru.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: 2010-08-20 08:51+0000\n"
-"PO-Revision-Date: 2010-09-30 06:44+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-21 17:37+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: 2010-10-01 08:47+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_sched
+msgid "Schedulers"
+msgstr ""
+
 #. module: procurement
 #: model:ir.model,name:procurement.model_make_procurement
 msgid "Make Procurements"
@@ -150,14 +155,8 @@ msgid "Scheduler Parameters"
 msgstr "Параметры планировщика"
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action11
-msgid "Temporary Procurement Exceptions"
-msgstr "Временные исключения снабжения"
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:0
-#, python-format
-msgid "has an exception."
+#: model:ir.model,name:procurement.model_stock_move
+msgid "Stock Move"
 msgstr ""
 
 #. module: procurement
@@ -170,6 +169,11 @@ msgstr "Готово"
 msgid "Automatic orderpoint"
 msgstr ""
 
+#. module: procurement
+#: field:mrp.property,composition:0
+msgid "Properties composition"
+msgstr ""
+
 #. module: procurement
 #: selection:procurement.order,state:0
 msgid "Confirmed"
@@ -203,11 +207,6 @@ msgstr ""
 msgid "Minimum Inventory Rule"
 msgstr ""
 
-#. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action4
-msgid "Procurement Exceptions to Fix"
-msgstr ""
-
 #. module: procurement
 #: field:procurement.order,priority:0
 msgid "Priority"
@@ -226,6 +225,11 @@ msgstr "Состояние"
 msgid "Location"
 msgstr "Местоположение"
 
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
 #. module: procurement
 #: field:make.procurement,warehouse_id:0
 #: view:stock.warehouse.orderpoint:0
@@ -249,8 +253,8 @@ msgid "Compute Procurement"
 msgstr ""
 
 #. module: procurement
-#: model:ir.actions.act_window,name:procurement.procurement_action3
 #: model:ir.module.module,shortdesc:procurement.module_meta_information
+#: field:stock.move,procurements:0
 msgid "Procurements"
 msgstr "Снабжение"
 
@@ -325,10 +329,8 @@ msgid "MRP & Logistic Scheduler"
 msgstr "ПМР и Логистическое планирование"
 
 #. module: procurement
-#: view:procurement.order.compute.all:0
-msgid ""
-"Wizard run all the procurements, and generate task, production order or "
-"purchase order based on the product type"
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement
+msgid "Automatic Procurements"
 msgstr ""
 
 #. module: procurement
@@ -336,11 +338,6 @@ msgstr ""
 msgid "Max Quantity"
 msgstr "Макс. кол-во"
 
-#. module: procurement
-#: view:procurement.order:0
-msgid "Procurement Reason"
-msgstr "Причина снабжения"
-
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_order
 #: model:process.process,name:procurement.process_process_procurementprocess0
@@ -384,19 +381,16 @@ msgstr "Заявка на снабжение"
 msgid "Compute Stock"
 msgstr ""
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Late"
+msgstr "Поздно"
+
 #. module: procurement
 #: model:process.process,name:procurement.process_process_serviceproductprocess0
 msgid "Service"
 msgstr "Сервис"
 
-#. module: procurement
-#: model:ir.module.module,description:procurement.module_meta_information
-msgid ""
-"\n"
-"    This is the module for computing Procurements.\n"
-"    "
-msgstr ""
-
 #. module: procurement
 #: field:stock.warehouse.orderpoint,product_min_qty:0
 msgid "Min Quantity"
@@ -439,6 +433,17 @@ msgstr ""
 msgid "Procurement Lines"
 msgstr "Позиции снабжения"
 
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid ""
+"This wizard allows you to run all procurement, production and/or purchase "
+"orders that should be processed based on their configuration. By default, "
+"the scheduler is launched automatically every night by OpenERP. You can use "
+"this menu to force it to be launched now. Note that it runs in the "
+"background, you may have to wait for a few minutes until it has finished "
+"computing."
+msgstr ""
+
 #. module: procurement
 #: view:procurement.order:0
 #: field:procurement.order,note:0
@@ -450,6 +455,11 @@ msgstr "Примечание"
 msgid "Draft"
 msgstr "Черновик"
 
+#. module: procurement
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
 #. module: procurement
 #: constraint:ir.model:0
 msgid ""
@@ -463,12 +473,6 @@ msgstr ""
 msgid "Status"
 msgstr "Статус"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:0
-#, python-format
-msgid "Procurement "
-msgstr "Снабжение "
-
 #. module: procurement
 #: help:res.company,schedule_range:0
 msgid ""
@@ -495,16 +499,9 @@ msgid ""
 msgstr ""
 
 #. module: procurement
-#: code:addons/procurement/procurement.py:0
-#, python-format
-msgid "is running."
-msgstr ""
-
-#. module: procurement
-#: code:addons/procurement/procurement.py:0
-#, python-format
-msgid "Not enough stock "
-msgstr ""
+#: field:stock.warehouse.orderpoint,active:0
+msgid "Active"
+msgstr "Активно"
 
 #. module: procurement
 #: model:process.node,name:procurement.process_node_procureproducts0
@@ -521,6 +518,12 @@ msgstr "Запланированная дата"
 msgid "Exception"
 msgstr "Исключение"
 
+#. module: procurement
+#: code:addons/procurement/schedulers.py:0
+#, python-format
+msgid "Automatic OP: %s"
+msgstr ""
+
 #. module: procurement
 #: model:ir.model,name:procurement.model_procurement_orderpoint_compute
 msgid "Automatic Order Point"
@@ -547,9 +550,9 @@ msgid "Procurement name."
 msgstr "Название закупки."
 
 #. module: procurement
-#: field:stock.warehouse.orderpoint,active:0
-msgid "Active"
-msgstr "Активно"
+#: view:procurement.order:0
+msgid "Procurement Reason"
+msgstr "Причина снабжения"
 
 #. module: procurement
 #: code:addons/procurement/procurement.py:0
@@ -568,13 +571,15 @@ msgid "Date Closed"
 msgstr "Дата закрытия"
 
 #. module: procurement
-#: view:procurement.order:0
-msgid "Late"
-msgstr "Поздно"
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid "Procurement '%s' is in exception: not enough stock."
+msgstr ""
 
 #. module: procurement
-#: field:mrp.property,composition:0
-msgid "Properties composition"
+#: code:addons/procurement/procurement.py:0
+#, python-format
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
 msgstr ""
 
 #. module: procurement
@@ -660,12 +665,6 @@ msgstr ""
 msgid "Current"
 msgstr "Текущий"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:0
-#, python-format
-msgid "Project_mrp module not installed !"
-msgstr ""
-
 #. module: procurement
 #: view:procurement.order:0
 msgid "Details"
@@ -674,6 +673,9 @@ msgstr "Детали"
 #. module: procurement
 #: view:board.board:0
 #: 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
 msgid "Procurement Exceptions"
 msgstr ""
 
@@ -682,6 +684,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:procurement.act_product_product_2_stock_warehouse_orderpoint
 #: model:ir.actions.act_window,name:procurement.act_stock_warehouse_2_stock_warehouse_orderpoint
 #: model:ir.actions.act_window,name:procurement.action_orderpoint_form
+#: model:ir.ui.menu,name:procurement.menu_stock_order_points
 #: view:stock.warehouse.orderpoint:0
 msgid "Minimum Stock Rules"
 msgstr "Правила минимальных запасов"
@@ -704,6 +707,11 @@ msgstr "Запланированная дата"
 msgid "Product"
 msgstr "ТМЦ"
 
+#. module: procurement
+#: view:procurement.order:0
+msgid "Temporary"
+msgstr ""
+
 #. module: procurement
 #: field:mrp.property,description:0
 #: field:mrp.property.group,description:0
@@ -733,7 +741,7 @@ msgstr "Ед.изм."
 #. module: procurement
 #: model:process.node,name:procurement.process_node_serviceonorder0
 msgid "Make to Order"
-msgstr "Изготовление на заказ"
+msgstr "Изготовить на заказ"
 
 #. module: procurement
 #: view:procurement.order:0
@@ -767,12 +775,6 @@ msgid ""
 "generate task, production orders or purchase orders."
 msgstr ""
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:0
-#, python-format
-msgid "is done."
-msgstr ""
-
 #. module: procurement
 #: field:mrp.property,name:0
 #: field:stock.warehouse.orderpoint,name:0
@@ -797,6 +799,7 @@ msgstr ""
 
 #. module: procurement
 #: model:ir.actions.act_window,name:procurement.action_compute_schedulers
+#: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
 #: view:procurement.order.compute.all:0
 msgid "Compute Schedulers"
 msgstr ""
@@ -832,23 +835,20 @@ msgstr ""
 msgid "Procurement Details"
 msgstr "Детали снабжения"
 
-#. module: procurement
-#: code:addons/procurement/procurement.py:0
-#, python-format
-msgid ""
-"Cannot delete Procurement Order(s) which are in %s State!' % s['state']))\n"
-"        return osv.osv.unlink(self, cr, uid, unlink_ids, context=context)\n"
-"\n"
-"    def onchange_product_id(self, cr, uid, ids, product_id, context={}):\n"
-"        \"\"\" Finds UoM and UoS of changed product.\n"
-"        @param product_id: Changed id of product.\n"
-"        @return: Dictionary of values.\n"
-"        \"\"\"\n"
-"        if product_id:\n"
-"            w = self.pool.get('product.product"
-msgstr ""
-
 #. module: procurement
 #: constraint:ir.rule:0
 msgid "Rules are not supported for osv_memory objects !"
 msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:0
+#, python-format
+msgid "SCHEDULER"
+msgstr ""
+
+#~ msgid "Temporary Procurement Exceptions"
+#~ msgstr "Временные исключения снабжения"
+
+#, python-format
+#~ msgid "Procurement "
+#~ msgstr "Снабжение "
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index 99415636c1d..4f2ba38552f 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/i18n/fr.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: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-20 08:20+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2010-10-21 11:22+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: 2010-10-21 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po
index a0cf0ba3d09..c12aadeef14 100644
--- a/addons/product/i18n/mn.po
+++ b/addons/product/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-21 01:47+0000\n"
-"Last-Translator: Гоби <Unknown>\n"
+"PO-Revision-Date: 2010-10-21 11:14+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: 2010-10-21 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/profile_tools/installer.py b/addons/profile_tools/installer.py
index 6ea024aebbe..fac23e8299d 100644
--- a/addons/profile_tools/installer.py
+++ b/addons/profile_tools/installer.py
@@ -31,6 +31,11 @@ class misc_tools_installer(osv.osv_memory):
         'idea':fields.boolean('Ideas Box',help='Promote ideas of the employees, votes and discussion on best ideas.'),
         'share':fields.boolean('Share Data / Portals',help='This module allows you to easily give restricted access of any filtered list of objects to any customer or supplier.' \
             'Just click on the share icon to give access to your customers on their project\'s tasks, support requests, invoices, etc.'),
+        'pad': fields.boolean('Native pad integration',
+            help="This module creates a tighter integration between a Pad "
+                 "instance of your choosing and your OpenERP Web Client by "
+                 "letting you easily link pads to OpenERP objects via "
+                 "OpenERP attachments."),
     }
     _defaults = {
     }
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index d81936756a6..b3d343d8c30 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -30,6 +30,7 @@
             <field name="idea"/>
             <field name="survey"/>
             <field name="subscription" groups="base.group_extended"/>
+            <field name="pad"/>
           </group>
         </data>
       </field>
diff --git a/addons/purchase/i18n/mn.po b/addons/purchase/i18n/mn.po
index 8e348d89c11..aa236e53666 100644
--- a/addons/purchase/i18n/mn.po
+++ b/addons/purchase/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-29 09:53+0000\n"
-"Last-Translator: ub121 <ubs121@gmail.com>\n"
+"PO-Revision-Date: 2010-10-21 05:41+0000\n"
+"Last-Translator: Jacara <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: 2010-09-30 04:39+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -35,7 +35,7 @@ msgstr "Хаана"
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
 msgid "From Picking"
-msgstr "Түүврээс"
+msgstr "Агуулахын баримтаас"
 
 #. module: purchase
 #: rml:purchase.order:0
@@ -60,7 +60,7 @@ msgstr "Хүргэлт"
 #. module: purchase
 #: field:purchase.order.line,product_qty:0
 msgid "Quantity"
-msgstr "Тоо ширхэг"
+msgstr "Тоо хэмжээ"
 
 #. module: purchase
 #: selection:purchase.order,invoice_method:0
diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po
index 2648a5b55b2..ac98eb33b80 100644
--- a/addons/purchase/i18n/ru.po
+++ b/addons/purchase/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-17 07:59+0000\n"
+"PO-Revision-Date: 2010-10-21 18: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: 2010-10-18 04:55+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: purchase
@@ -322,7 +322,7 @@ msgstr "В ожидании"
 #. module: purchase
 #: field:purchase.order,picking_ids:0
 msgid "Picking List"
-msgstr "Отборочный лист"
+msgstr "Комплектовочный лист"
 
 #. module: purchase
 #: field:purchase.order,warehouse_id:0
diff --git a/addons/sale/i18n/ru.po b/addons/sale/i18n/ru.po
index 812a1861501..89818346f38 100644
--- a/addons/sale/i18n/ru.po
+++ b/addons/sale/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: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-20 12:33+0000\n"
+"PO-Revision-Date: 2010-10-21 19: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: 2010-10-21 05:02+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -24,7 +24,7 @@ msgstr "Недопустимое имя модели в определении 
 #. module: sale
 #: help:sale.installer,delivery:0
 msgid "Allows you to compute delivery costs on your quotations."
-msgstr "Позволяет рассчитать стоимость доставки по вашему предложению"
+msgstr "Позволяет рассчитать стоимость доставки по вашему предложению."
 
 #. module: sale
 #: help:sale.order,picking_policy:0
@@ -150,7 +150,7 @@ msgstr "Условия платежа по умолчанию"
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
 msgid "Configure Picking Policy for Sales Order"
-msgstr ""
+msgstr "Настроить политику комплектования для заказа на продажу"
 
 #. module: sale
 #: view:sale.order:0
@@ -630,6 +630,17 @@ msgid ""
 "  - The 'Invoice from the picking' choice is used to create an invoice "
 "during the picking process."
 msgstr ""
+"Политика доставки используется для синхронизации операций со счетами и "
+"доставкой.\n"
+"  - The 'Pay before delivery' choice will first generate the invoice and "
+"then generate the picking order after the payment of this invoice.\n"
+"  - The 'Shipping & Manual Invoice' will create the picking order directly "
+"and wait for the user to manually click on the 'Invoice' button to generate "
+"the draft invoice.\n"
+"  - The 'Invoice on Order After Delivery' choice will generate the draft "
+"invoice based on sale order after all picking lists have been finished.\n"
+"  - The 'Invoice from the picking' choice is used to create an invoice "
+"during the picking process."
 
 #. module: sale
 #: field:sale.order,pricelist_id:0
@@ -902,7 +913,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order,picking_ids:0
 msgid "Related Picking"
-msgstr ""
+msgstr "Связанное комплектование"
 
 #. module: sale
 #: field:sale.config.picking_policy,name:0
@@ -1027,7 +1038,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice from Delivery"
-msgstr "Счет по доставке"
+msgstr "Счет из доставки"
 
 #. module: sale
 #: view:sale.order:0
@@ -1043,7 +1054,7 @@ msgstr "Это список отборочных листов, созданны
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
 msgid "Document of the move to the output or to the customer."
-msgstr ""
+msgstr "Документ перемещения на выход или заказчику."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
@@ -1159,7 +1170,7 @@ msgstr "Счет, основанный на заказе на продажу"
 #. module: sale
 #: model:ir.model,name:sale.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Комплектовочный лист"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -1204,7 +1215,7 @@ msgstr "Доставка & счет вручную"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Picking Information !"
-msgstr ""
+msgstr "Комплектовочная информация !"
 
 #. module: sale
 #: view:sale.report:0
@@ -1371,7 +1382,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
 msgid "Picking List & Delivery Order"
-msgstr ""
+msgstr "Комплектовочный лист & Заказ на доставку"
 
 #. module: sale
 #: constraint:ir.model:0
@@ -1389,7 +1400,7 @@ msgstr ""
 #. module: sale
 #: field:sale.order,picking_policy:0
 msgid "Picking Policy"
-msgstr ""
+msgstr "Политика комплектования"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_deliveryorder0
@@ -1649,6 +1660,7 @@ msgstr "Подтвердить"
 #, python-format
 msgid "You must first cancel all picking attached to this sale order."
 msgstr ""
+"Сначала вы должны отменить всё комплектование связанное с этим заказом"
 
 #. module: sale
 #: view:sale.order:0
@@ -1665,7 +1677,7 @@ msgstr "Позиции заказа на продажу"
 #. module: sale
 #: field:sale.order.line,delay:0
 msgid "Delivery Lead Time"
-msgstr ""
+msgstr "Время выполнения доставки"
 
 #. module: sale
 #: view:res.company:0
@@ -1681,7 +1693,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice on Order After Delivery"
-msgstr "Счет по заказу после доставки"
+msgstr "Счет на заказ после доставки"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_saleorderprocurement0
@@ -2018,7 +2030,7 @@ msgstr ""
 #. module: sale
 #: field:sale.config.picking_policy,picking_policy:0
 msgid "Picking Default Policy"
-msgstr ""
+msgstr "Политика комплекнования по умолчанию"
 
 #. module: sale
 #: report:sale.order:0
diff --git a/addons/sale_analytic_plans/i18n/it.po b/addons/sale_analytic_plans/i18n/it.po
index 6ab69b446b3..a7c4cde96cc 100644
--- a/addons/sale_analytic_plans/i18n/it.po
+++ b/addons/sale_analytic_plans/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 06:36+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-10-21 20:21+0000\n"
+"Last-Translator: Andrea Amoroso <andrea.amoroso@alice.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: 2010-09-29 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_analytic_plans
@@ -21,6 +21,13 @@ msgstr ""
 msgid "Analytic Distribution"
 msgstr "Distribuzione analitica"
 
+#. module: sale_analytic_plans
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Il nome dell'Oggetto deve iniziare con x_e non contenere caratteri speciali !"
+
 #. module: sale_analytic_plans
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
@@ -30,3 +37,8 @@ msgstr "XML non valido per Visualizzazione Architettura!"
 #: model:ir.module.module,shortdesc:sale_analytic_plans.module_meta_information
 msgid "Sales Analytic Distribution Management"
 msgstr "Gestione Distribuzione di Vendita Analitica"
+
+#. module: sale_analytic_plans
+#: model:ir.model,name:sale_analytic_plans.model_sale_order_line
+msgid "Sale Order Line"
+msgstr "Riga Ordine di Vendita"
diff --git a/addons/sale_order_dates/i18n/ru.po b/addons/sale_order_dates/i18n/ru.po
new file mode 100644
index 00000000000..d2e130f76c8
--- /dev/null
+++ b/addons/sale_order_dates/i18n/ru.po
@@ -0,0 +1,71 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-10-18 17:47+0000\n"
+"PO-Revision-Date: 2010-10-21 19: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: 2010-10-22 04:41+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: sale_order_dates
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Неправильный XML для просмотра архитектуры!"
+
+#. module: sale_order_dates
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Название объекта должно начинаться с x_  и не должно содержать специальных "
+"символов !"
+
+#. module: sale_order_dates
+#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
+msgid "Sale Order Dates"
+msgstr "Даты заказа на продажу"
+
+#. module: sale_order_dates
+#: field:sale.order,commitment_date:0
+msgid "Commitment Date"
+msgstr "Дата предоставления"
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sale Order"
+msgstr "Заказ на продажу"
+
+#. module: sale_order_dates
+#: help:sale.order,effective_date:0
+msgid "Date on which picking is created"
+msgstr "Дата на которую производилось комплектование"
+
+#. module: sale_order_dates
+#: field:sale.order,effective_date:0
+msgid "Effective Date"
+msgstr "Действительно до"
+
+#. module: sale_order_dates
+#: help:sale.order,commitment_date:0
+msgid "Date on which delivery of products is to be made"
+msgstr "Дата на которую должна быть сделана доставка"
+
+#. module: sale_order_dates
+#: help:sale.order,requested_date:0
+msgid "Date on which customer has requested for sales"
+msgstr "Дата на которую заказчик обратился с заказом"
+
+#. module: sale_order_dates
+#: field:sale.order,requested_date:0
+msgid "Requested Date"
+msgstr "Требуемая дата"
diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po
index b21b454fe7a..a435f4c758a 100644
--- a/addons/stock/i18n/fr.po
+++ b/addons/stock/i18n/fr.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: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2010-10-20 08:32+0000\n"
-"Last-Translator: Numérigraphe <Unknown>\n"
+"PO-Revision-Date: 2010-10-21 11: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: 2010-10-21 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
diff --git a/addons/stock/i18n/mn.po b/addons/stock/i18n/mn.po
index 956c54317f7..75ce9b18ff9 100644
--- a/addons/stock/i18n/mn.po
+++ b/addons/stock/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2010-10-21 02:08+0000\n"
+"PO-Revision-Date: 2010-10-21 16:30+0000\n"
 "Last-Translator: Гоби <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: 2010-10-21 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -41,7 +41,7 @@ msgstr "Хэлхээ байрлал (Тогтмол бол)"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Put in a new pack"
-msgstr ""
+msgstr "Шинэ баглаанд оруулах"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -60,6 +60,8 @@ msgid ""
 "There is no journal defined '\\n                                'on the "
 "product category: \"%s\" (id: %d)"
 msgstr ""
+"Бүтээгдэхүүний категори: \"%s\" (id: %d) '\\n                                "
+"' журнал тодорхойлогдоогүй байна."
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -104,11 +106,18 @@ msgid ""
 "            product_currency = partial_data.get('product_currency',False)\n"
 "            prodlot_ids[move.id] = partial_data.get('prodlot_id"
 msgstr ""
+"Агуулахын Хөдөлгөөний Мөрийн зарим өгөгдөл олдсонгүй :%s' %(move.id))\n"
+"            product_qty = partial_data.get('product_qty',0.0)\n"
+"            move_product_qty[move.id] = product_qty\n"
+"            product_uom = partial_data.get('product_uom',False)\n"
+"            product_price = partial_data.get('product_price',0.0)\n"
+"            product_currency = partial_data.get('product_currency',False)\n"
+"            prodlot_ids[move.id] = partial_data.get('prodlot_id"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_inventory_control
 msgid "Inventory Control"
-msgstr ""
+msgstr "Барааны Хяналт"
 
 #. module: stock
 #: help:stock.production.lot,ref:0
@@ -161,7 +170,7 @@ msgstr "Тоо хэмжээ"
 #: view:report.stock.move:0
 #: field:report.stock.move,day:0
 msgid "Day"
-msgstr ""
+msgstr "Өдөр"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -183,7 +192,7 @@ msgstr "Барааны журнал"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
-msgstr ""
+msgstr "Орох"
 
 #. module: stock
 #: help:product.category,property_stock_account_output_categ:0
@@ -222,7 +231,7 @@ msgstr ""
 #: view:stock.picking:0
 #: field:stock.picking,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "Эх үүсэл"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
@@ -247,28 +256,32 @@ msgid ""
 "If checked, all product quantities will be set to zero to help ensure a real "
 "physical inventory is done"
 msgstr ""
+"Тэмдэглэгдсэн бол бүх барааны тоо хэмжээ нь тэг болж тооллого таарч байгаа "
+"баталгааг хангахад туслана."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines
 msgid "Split lines"
-msgstr ""
+msgstr "Мөрийг хуваах"
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Upstream Traceability"
-msgstr ""
+msgstr "Сөрөг урсгалыг Хөтлөх боломж"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "You cannot cancel picking because stock move is in done state !"
 msgstr ""
+"Цуглуулах ажлыг цуцлах боломжгүй. Учир нь барааны шилжилт хийгдсэн төлөвт "
+"байна !"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Сэрэмжлүүлэг!"
 
 #. module: stock
 #: field:stock.invoice.onshipping,group:0
@@ -285,6 +298,12 @@ msgid ""
 "   \n"
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
+"Барааны хөдөлгөөнийг үүсгэсэн дараа 'Ноорог' төлөвтэй байна.\n"
+" Дараа нь 'Батлагдсан' төлөвт оруулна.\n"
+" Бараа байвал 'Байгаа' төлөвтэй байна.\n"
+" Цуглуулах ажил хийгдсэн дараа 'Хийгдсэн' төлөвт шилжинэ.                    "
+"              \n"
+"Харин өөр хөдөлгөөнийг хүлээж байгаа бол 'Хүлээж байгаа' төлөвтэй байна."
 
 #. module: stock
 #: model:ir.model,name:stock.model_res_partner
@@ -303,7 +322,7 @@ msgstr "Харилцагч"
 #: code:addons/stock/wizard/stock_return_picking.py:0
 #, python-format
 msgid "No invoicing"
-msgstr ""
+msgstr "Нэмэжлэх байхгүй"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot
@@ -315,12 +334,12 @@ msgstr "Үйлдвэрлэлийн цуврал"
 #. module: stock
 #: help:stock.incoterms,code:0
 msgid "Code for Incoterms"
-msgstr ""
+msgstr "Олон Улсын Худалдааны Нөхцөл"
 
 #. module: stock
 #: field:stock.tracking,move_ids:0
 msgid "Moves for this pack"
-msgstr ""
+msgstr "Энэ баглааны хөдөлгөөн"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -4276,25 +4295,25 @@ msgstr ""
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "April"
-msgstr ""
+msgstr "4 сар"
 
 #. module: stock
 #: view:report.stock.inventory:0
 #: view:stock.move:0
 msgid "Future"
-msgstr ""
+msgstr "Ирээдүй"
 
 #. module: stock
 #: field:stock.invoice.onshipping,invoice_date:0
 msgid "Invoiced date"
-msgstr ""
+msgstr "Нэхэмжилсэн огноо"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree
 #: model:ir.ui.menu,name:stock.menu_action_picking_tree
 #: view:stock.picking:0
 msgid "Outgoing Deliveries"
-msgstr ""
+msgstr "Гарч байгаа Хүргэлт"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -4302,7 +4321,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_return_picking.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Анхааруулга !"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_output
@@ -4326,21 +4345,23 @@ msgid ""
 "empty to automatically detect the type based on the source and destination "
 "locations)."
 msgstr ""
+"Цуглуулах жагсаалтын Хүргэх төрөл буюу дараалсан гинжин хөдөлгөөнүүд (анхы "
+"болон хүргэх байрлалаас хамаарч автоматаар сонгохоор бол хоосон үлдээ)"
 
 #. module: stock
 #: selection:stock.move.split.lines,action:0
 msgid "Keep in one lot"
-msgstr ""
+msgstr "Нэг цувралд үлдээх"
 
 #. module: stock
 #: view:product.product:0
 msgid "Cost Price:"
-msgstr ""
+msgstr "Өртөг Үнэ:"
 
 #. module: stock
 #: help:stock.move,move_dest_id:0
 msgid "Optional: next stock move when chaining them"
-msgstr ""
+msgstr "Сонголттой: дараалсан хөдөлгөөний үе дах барааны дараагийн хөдөлгөөн"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -4356,7 +4377,7 @@ msgstr "STOCK_REDO"
 #: view:report.stock.move:0
 #: field:report.stock.move,year:0
 msgid "Year"
-msgstr ""
+msgstr "Жил"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations
@@ -4366,7 +4387,7 @@ msgstr "Физик байршил"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_partial_move
 msgid "Partial Move"
-msgstr ""
+msgstr "Хэсэгчилсэн Хөдөлгөөн"
 
 #~ msgid "Move History"
 #~ msgstr "Хөдөлгөөний түүх"
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index 0f8c457820f..1cb93667c6f 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/i18n/ru.po
@@ -7,24 +7,24 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2010-10-20 07:14+0000\n"
+"PO-Revision-Date: 2010-10-21 20:23+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: 2010-10-21 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-rating-rated"
-msgstr ""
+msgstr "terp-rating-rated"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
 msgid "Track Outgoing Lots"
-msgstr ""
+msgstr "Отслеживать исходящие партии"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_ups_upload
@@ -45,12 +45,12 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SAVE"
-msgstr ""
+msgstr "STOCK_SAVE"
 
 #. module: stock
 #: field:stock.move.split.lines,action:0
 msgid "Action"
-msgstr ""
+msgstr "Действие"
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -58,12 +58,12 @@ msgstr ""
 msgid ""
 "There is no journal defined '\\n                                'on the "
 "product category: \"%s\" (id: %d)"
-msgstr ""
+msgstr "Журнал не определен '\\n 'для категории продукции: \"%s\" (id: %d)"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-account"
-msgstr ""
+msgstr "terp-account"
 
 #. module: stock
 #: constraint:ir.actions.act_window:0
@@ -79,17 +79,17 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_SORT_ASCENDING"
-msgstr ""
+msgstr "STOCK_SORT_ASCENDING"
 
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
 msgid "Revision Number"
-msgstr ""
+msgstr "Номер Ревизии"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_FORWARD"
-msgstr ""
+msgstr "STOCK_MEDIA_FORWARD"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -119,18 +119,18 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ZOOM_100"
-msgstr ""
+msgstr "STOCK_ZOOM_100"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list
 #: view:stock.picking:0
 msgid "Picking list"
-msgstr ""
+msgstr "Комплектовочный лист"
 
 #. module: stock
 #: view:board.board:0
 msgid "Outgoing Products delay"
-msgstr ""
+msgstr "Задержка исходящей продукции"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:0
@@ -160,7 +160,7 @@ msgstr "Количество"
 #: view:report.stock.move:0
 #: field:report.stock.move,day:0
 msgid "Day"
-msgstr ""
+msgstr "День"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -182,7 +182,7 @@ msgstr "Складская книга"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
-msgstr ""
+msgstr "Входящий"
 
 #. module: stock
 #: help:product.category,property_stock_account_output_categ:0
@@ -209,19 +209,19 @@ msgstr "Вы не можете удалить любую запись!"
 #. module: stock
 #: field:product.template,property_stock_inventory:0
 msgid "Inventory Location"
-msgstr "Расположение склада"
+msgstr "Место инвентаризации"
 
 #. module: stock
 #: help:stock.tracking,serial:0
 msgid "Other reference or serial number"
-msgstr ""
+msgstr "Другая ссылка или серийный номер"
 
 #. module: stock
 #: field:stock.move,origin:0
 #: view:stock.picking:0
 #: field:stock.picking,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "Источник"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
@@ -267,7 +267,7 @@ msgstr ""
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Внимание!"
 
 #. module: stock
 #: field:stock.invoice.onshipping,group:0
@@ -330,7 +330,7 @@ msgstr "Внутреннее местоположение"
 #. module: stock
 #: view:stock.inventory:0
 msgid "Confirm Inventory"
-msgstr ""
+msgstr "Подтвердить инвентаризацию"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -351,17 +351,17 @@ msgstr "Состояние"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-mail-forward"
-msgstr ""
+msgstr "terp-mail-forward"
 
 #. module: stock
 #: field:stock.location,stock_real_value:0
 msgid "Real Stock Value"
-msgstr ""
+msgstr "Действительные остатки"
 
 #. module: stock
 #: field:report.stock.move,day_diff2:0
 msgid "Lag (Days)"
-msgstr ""
+msgstr "Задержка (в днях)"
 
 #. module: stock
 #: model:ir.model,name:stock.model_action_traceability
@@ -393,18 +393,18 @@ msgstr "Доступно"
 #: view:stock.picking:0
 #: field:stock.picking,min_date:0
 msgid "Expected Date"
-msgstr ""
+msgstr "Ожидаемая дата"
 
 #. module: stock
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_outgoing_product_board
 msgid "Outgoing Product"
-msgstr ""
+msgstr "Исходящая продукция"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_QUIT"
-msgstr ""
+msgstr "STOCK_QUIT"
 
 #. module: stock
 #: field:report.stock.move,product_qty_in:0
@@ -415,43 +415,43 @@ msgstr ""
 #: code:addons/stock/wizard/stock_fill_inventory.py:0
 #, python-format
 msgid "No product in this location."
-msgstr ""
+msgstr "Нет продукции в этом месте"
 
 #. module: stock
 #: field:stock.warehouse,lot_output_id:0
 msgid "Location Output"
-msgstr ""
+msgstr "Место выхода"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.split_into
 #: model:ir.model,name:stock.model_stock_split_into
 msgid "Split into"
-msgstr ""
+msgstr "Разделить на"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Today"
-msgstr ""
+msgstr "Сегодня"
 
 #. module: stock
 #: field:stock.move,price_currency_id:0
 msgid "Currency for average price"
-msgstr ""
+msgstr "Валюта для средней цены"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_TOP"
-msgstr ""
+msgstr "STOCK_GOTO_TOP"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ABOUT"
-msgstr ""
+msgstr "STOCK_ABOUT"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-hr"
-msgstr ""
+msgstr "terp-hr"
 
 #. module: stock
 #: field:report.stock.inventory,location_type:0
@@ -463,17 +463,17 @@ msgstr "Тип месторасположения"
 #: help:report.stock.move,type:0
 #: help:stock.picking,type:0
 msgid "Shipping type specify, goods coming in or going out."
-msgstr ""
+msgstr "Тип доставки определяет приход или расход."
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-stock_effects-object-colorize"
-msgstr ""
+msgstr "terp-stock_effects-object-colorize"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DELETE"
-msgstr ""
+msgstr "STOCK_DELETE"
 
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
@@ -483,12 +483,12 @@ msgstr ""
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_move
 msgid "Moves Statistics"
-msgstr ""
+msgstr "Статистика перемещений"
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Product Lots Filter"
-msgstr ""
+msgstr "Фильтр партий продукции"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -504,11 +504,13 @@ msgid ""
 "Current quantity of products with this Production Lot Number available in "
 "company warehouses"
 msgstr ""
+"Текущее количество продукции, с этим номером партии, доступное на складах "
+"компании"
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
 msgid "Move History (child moves)"
-msgstr ""
+msgstr "История перемещений (подчиненные перемещения)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree6
@@ -520,13 +522,13 @@ msgstr "Внутренние перемещения"
 #. module: stock
 #: field:stock.move,location_dest_id:0
 msgid "Destination Location"
-msgstr ""
+msgstr "Место назначения"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "You can not process picking without stock moves"
-msgstr ""
+msgstr "Вы не можете обработать комплектование без перемещения"
 
 #. module: stock
 #: field:stock.move,product_packaging:0
@@ -536,7 +538,7 @@ msgstr "Упаковка"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Order(Origin)"
-msgstr ""
+msgstr "Заказ(Происхождение)"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -549,7 +551,7 @@ msgstr "Общий итог"
 #: model:ir.ui.menu,name:stock.menu_action_stock_move_report
 #: view:report.stock.move:0
 msgid "Moves Analysis"
-msgstr ""
+msgstr "Анализ перемещений"
 
 #. module: stock
 #: view:stock.location:0
@@ -561,23 +563,23 @@ msgstr "Дополнительная информация"
 #: report:lot.stock.overview:0
 #: report:lot.stock.overview_all:0
 msgid "Location / Product"
-msgstr ""
+msgstr "Место / Продукция"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Reception"
-msgstr ""
+msgstr "Прием"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FLOPPY"
-msgstr ""
+msgstr "STOCK_FLOPPY"
 
 #. module: stock
 #: field:stock.tracking,serial:0
 msgid "Additional Reference"
-msgstr ""
+msgstr "Дополнительная ссылка"
 
 #. module: stock
 #: view:stock.production.lot.revision:0
@@ -590,6 +592,8 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "going to a Customer Location"
 msgstr ""
+"Принудительно определить партию товара для всех перемещений этого товара, "
+"отправляемого в адрес заказчика"
 
 #. module: stock
 #: field:stock.location,complete_name:0
@@ -600,7 +604,7 @@ msgstr "Название местоположения"
 #. module: stock
 #: view:stock.inventory:0
 msgid "Posted Inventory"
-msgstr ""
+msgstr "Добавленная инвентаризация"
 
 #. module: stock
 #: view:stock.move:0
@@ -611,12 +615,12 @@ msgstr "Сведения о перемещении товаров"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Outgoing"
-msgstr ""
+msgstr "Исходящие"
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "August"
-msgstr ""
+msgstr "Август"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_tracking_form
@@ -629,7 +633,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_UNDERLINE"
-msgstr ""
+msgstr "STOCK_UNDERLINE"
 
 #. module: stock
 #: view:res.partner:0
@@ -639,12 +643,12 @@ msgstr "Продажи и закупки"
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "June"
-msgstr ""
+msgstr "Июнь"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-folder-blue"
-msgstr ""
+msgstr "terp-folder-blue"
 
 #. module: stock
 #: field:product.template,property_stock_procurement:0
@@ -664,7 +668,7 @@ msgstr "Партии изделий"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-project"
-msgstr ""
+msgstr "terp-project"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -675,27 +679,27 @@ msgstr "Получатель"
 #: model:ir.actions.act_window,name:stock.action_location_tree
 #: model:ir.ui.menu,name:stock.menu_action_location_tree
 msgid "Location Structure"
-msgstr ""
+msgstr "Структура мест"
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "October"
-msgstr ""
+msgstr "Октябрь"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line
 msgid "Inventory Line"
-msgstr ""
+msgstr "Позиция инвентаризации"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_BOLD"
-msgstr ""
+msgstr "STOCK_BOLD"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-personal+"
-msgstr ""
+msgstr "terp-personal+"
 
 #. module: stock
 #: help:product.category,property_stock_journal:0
@@ -707,17 +711,17 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_picking
 msgid "Process Picking"
-msgstr ""
+msgstr "Процесс комплектования"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-graph"
-msgstr ""
+msgstr "terp-graph"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_FIND_AND_REPLACE"
-msgstr ""
+msgstr "STOCK_FIND_AND_REPLACE"
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -736,7 +740,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-dialog-close"
-msgstr ""
+msgstr "terp-dialog-close"
 
 #. module: stock
 #: field:stock.move,move_dest_id:0
@@ -768,7 +772,7 @@ msgstr "Партии изделий используются для присво
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_REWIND"
-msgstr ""
+msgstr "STOCK_MEDIA_REWIND"
 
 #. module: stock
 #: field:stock.warehouse,lot_input_id:0
@@ -778,22 +782,22 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-personal-"
-msgstr ""
+msgstr "terp-personal-"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_CUT"
-msgstr ""
+msgstr "STOCK_CUT"
 
 #. module: stock
 #: help:stock.picking,date:0
 msgid "Date of Order"
-msgstr ""
+msgstr "Дата заказа"
 
 #. module: stock
 #: selection:product.product,valuation:0
 msgid "Periodical (manual)"
-msgstr ""
+msgstr "Периодически (вручную)"
 
 #. module: stock
 #: model:stock.location,name:stock.location_procurement
@@ -819,7 +823,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_NEW"
-msgstr ""
+msgstr "STOCK_NEW"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_splitinto.py:0
@@ -857,7 +861,7 @@ msgstr "Содержит"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-dolar"
-msgstr ""
+msgstr "terp-dolar"
 
 #. module: stock
 #: view:board.board:0
@@ -890,7 +894,7 @@ msgstr ""
 #. module: stock
 #: field:stock.move,date_expected:0
 msgid "Scheduled Date"
-msgstr ""
+msgstr "Запланированная дата"
 
 #. module: stock
 #: view:stock.tracking:0
@@ -1443,7 +1447,7 @@ msgstr ""
 #. module: stock
 #: field:report.stock.lines.date,id:0
 msgid "Inventory Line Id"
-msgstr ""
+msgstr "Id позиции инвентаризации"
 
 #. module: stock
 #: help:stock.location,address_id:0
@@ -1691,7 +1695,7 @@ msgstr "Отменить доступность"
 #. module: stock
 #: help:stock.move,date_expected:0
 msgid "Scheduled date for the processing of this move"
-msgstr ""
+msgstr "Запланированная дата обработки этого перемещения"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -2240,6 +2244,8 @@ msgid ""
 "Move date: scheduled date until move is done, then date of actual move "
 "processing"
 msgstr ""
+"Дата перемещения: запланированная дата (пока перемещение не сделано) или "
+"дата сделанного перемещения"
 
 #. module: stock
 #: field:report.stock.lines.date,date:0
@@ -2264,7 +2270,7 @@ msgstr "Localizações encadeadas"
 #. module: stock
 #: model:stock.location,name:stock.location_inventory
 msgid "Inventory loss"
-msgstr ""
+msgstr "Потери при инвентаризации"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -2586,7 +2592,7 @@ msgstr ""
 #. module: stock
 #: view:stock.inventory:0
 msgid "Cancel Inventory"
-msgstr ""
+msgstr "Отменить инвентаризацию"
 
 #. module: stock
 #: field:stock.move.split.lines,name:0
@@ -2817,7 +2823,7 @@ msgstr "Доступные запасы"
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Fill Inventory"
-msgstr ""
+msgstr "Полная инвентаризация"
 
 #. module: stock
 #: help:product.category,property_stock_account_input_categ:0
@@ -3448,7 +3454,7 @@ msgstr ""
 #. module: stock
 #: view:stock.inventory:0
 msgid "Lot Inventory"
-msgstr "Inventario do lote"
+msgstr "Инвентаризация партии"
 
 #. module: stock
 #: view:stock.move:0
@@ -3748,7 +3754,7 @@ msgstr ""
 #. module: stock
 #: view:stock.inventory.line:0
 msgid "Stock Inventory Lines"
-msgstr ""
+msgstr "Позиции инвентаризации склада"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_picking.py:0
@@ -4007,7 +4013,7 @@ msgstr ""
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "is scheduled"
-msgstr ""
+msgstr "запланировано"
 
 #. module: stock
 #: field:stock.location,chained_company_id:0
@@ -4017,7 +4023,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Check Availability"
-msgstr "Проверять доступность"
+msgstr "Проверить доступность"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -4303,7 +4309,7 @@ msgstr ""
 #. module: stock
 #: model:stock.location,name:stock.stock_location_output
 msgid "Output"
-msgstr ""
+msgstr "Выход"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -4469,9 +4475,6 @@ msgstr ""
 #~ msgid "Split in Two"
 #~ msgstr "Разделить на два"
 
-#~ msgid "Inventory Account"
-#~ msgstr "Счет учета"
-
 #~ msgid "Low Level"
 #~ msgstr "Низкий уровень"
 
diff --git a/addons/stock_invoice_directly/i18n/ru.po b/addons/stock_invoice_directly/i18n/ru.po
index db0cb9c94f1..04076672e86 100644
--- a/addons/stock_invoice_directly/i18n/ru.po
+++ b/addons/stock_invoice_directly/i18n/ru.po
@@ -6,17 +6,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 01:24+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:47+0000\n"
+"PO-Revision-Date: 2010-10-21 19: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: 2010-09-29 05:16+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
+#. module: stock_invoice_directly
+#: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
+msgid "Partial Picking"
+msgstr "Частичное комплектование"
+
 #. module: stock_invoice_directly
 #: model:ir.module.module,shortdesc:stock_invoice_directly.module_meta_information
 msgid "Invoice Picking Directly"
 msgstr "Напрямую выставляемый счет"
+
+#. module: stock_invoice_directly
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Название объекта должно начинаться с x_  и не должно содержать специальных "
+"символов !"
diff --git a/addons/stock_location/i18n/ru.po b/addons/stock_location/i18n/ru.po
index 03be7d6afc7..81ef790a7a3 100644
--- a/addons/stock_location/i18n/ru.po
+++ b/addons/stock_location/i18n/ru.po
@@ -6,30 +6,105 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-10-02 08:09+0000\n"
-"Last-Translator: irbiserg@mail.ru <irbiserg@mail.ru>\n"
+"POT-Creation-Date: 2010-10-18 17:47+0000\n"
+"PO-Revision-Date: 2010-10-21 19: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: 2010-10-03 04:57+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_location
-#: help:stock.location.path,delay:0
-msgid "Number of days to do this transition"
-msgstr "Количество дней для перемещения"
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Sending Goods"
+msgstr "Отправка товаров"
 
 #. module: stock_location
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
+#: view:product.product:0
+msgid "Pulled Paths"
+msgstr "Входящие пути"
 
 #. module: stock_location
-#: model:ir.module.module,shortdesc:stock_location.module_meta_information
-msgid "Stock Location Paths"
-msgstr "Расположение патча"
+#: view:product.product:0
+msgid "Logistic Flow"
+msgstr "Товарно-транспортный поток"
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_location_path
+msgid "Pushed Flows"
+msgstr "Исходящие потоки"
+
+#. module: stock_location
+#: selection:stock.location.path,auto:0
+msgid "Automatic No Step Added"
+msgstr "Шаги не будут добавляться автоматически"
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Parameters"
+msgstr "Параметры"
+
+#. module: stock_location
+#: field:stock.location.path,location_from_id:0
+msgid "Source Location"
+msgstr "Местоположение источника"
+
+#. module: stock_location
+#: help:product.pulled.flow,cancel_cascade:0
+msgid "Allow you to cancel moves related to the product pull flow"
+msgstr ""
+"Позволяет вам отменить перемещения связанные с входящим потоком продукции"
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_product_pulled_flow
+#: field:product.product,flow_pull_ids:0
+msgid "Pulled Flows"
+msgstr "Входящие потоки"
+
+#. module: stock_location
+#: field:product.pulled.flow,type_proc:0
+msgid "Type of Procurement"
+msgstr "Тип снабжения"
+
+#. module: stock_location
+#: help:product.pulled.flow,location_src_id:0
+msgid "Location used by Destination Location to supply"
+msgstr "Местоположение используемое местом назначения поставки"
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Internal"
+msgstr "Внутреннее"
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:0
+#, python-format
+msgid ""
+"Pulled procurement coming from original location %s, pull rule %s, via "
+"original Procurement %s (#%d)"
+msgstr ""
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_location
+#: field:product.pulled.flow,location_id:0
+msgid "Location"
+msgstr "Местоположение"
+
+#. module: stock_location
+#: field:product.pulled.flow,invoice_state:0
+#: field:stock.location.path,invoice_state:0
+msgid "Invoice Status"
+msgstr "Статус счета"
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "Not from Picking"
+msgstr "Не из комплектования"
 
 #. module: stock_location
 #: constraint:ir.model:0
@@ -39,49 +114,6 @@ msgstr ""
 "Название объекта должно начинаться с x_  и не должно содержать специальных "
 "символов !"
 
-#. module: stock_location
-#: selection:stock.location.path,auto:0
-msgid "Automatic No Step Added"
-msgstr "Шаги не будут добавляться автоматически"
-
-#. module: stock_location
-#: help:product.product,path_ids:0
-msgid ""
-"These rules set the right path of the product in the whole location tree."
-msgstr ""
-"В этом параметре указывается конкретный каталог продукта в дереве каталогов."
-
-#. module: stock_location
-#: field:stock.location.path,location_from_id:0
-msgid "Source Location"
-msgstr "Местоположение источника"
-
-#. module: stock_location
-#: field:stock.location.path,location_dest_id:0
-msgid "Destination Location"
-msgstr "Место назначения"
-
-#. module: stock_location
-#: field:stock.location.path,auto:0
-#: selection:stock.location.path,auto:0
-msgid "Automatic Move"
-msgstr "Автоматическое перемещение"
-
-#. module: stock_location
-#: field:stock.location.path,product_id:0
-msgid "Products"
-msgstr "Продукция"
-
-#. module: stock_location
-#: selection:stock.location.path,auto:0
-msgid "Manual Operation"
-msgstr "Ручное управление"
-
-#. module: stock_location
-#: model:ir.model,name:stock_location.model_stock_location_path
-msgid "stock.location.path"
-msgstr "расположение патча"
-
 #. module: stock_location
 #: help:stock.location.path,auto:0
 msgid ""
@@ -94,23 +126,295 @@ msgid ""
 msgstr ""
 
 #. module: stock_location
-#: field:stock.location.path,name:0
-msgid "Operation"
-msgstr "Операция"
+#: view:product.product:0
+msgid "Conditions"
+msgstr "Условия"
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_pack_zone
+msgid "Pack Zone"
+msgstr "Зона упаковки"
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_gate_b
+msgid "Gate B"
+msgstr "Выход B"
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_gate_a
+msgid "Gate A"
+msgstr "Выход A"
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Buy"
+msgstr "Покупка"
 
 #. module: stock_location
 #: view:product.product:0
-#: field:product.product,path_ids:0
-#: view:stock.location.path:0
-msgid "Location Paths"
-msgstr "Расположение каталога"
+msgid "Pushed flows"
+msgstr "Исходящие потоки"
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_dispatch_zone
+msgid "Dispatch Zone"
+msgstr "Зона отгрузки"
+
+#. module: stock_location
+#: model:ir.module.module,shortdesc:stock_location.module_meta_information
+msgid "Warehouse Locations Paths"
+msgstr ""
+
+#. module: stock_location
+#: view:product.product:0
+msgid "Pulled flows"
+msgstr "Входящие потоки"
+
+#. module: stock_location
+#: field:product.pulled.flow,company_id:0
+#: field:stock.location.path,company_id:0
+msgid "Company"
+msgstr "Компания"
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_stock_move
+msgid "Stock Move"
+msgstr "Движение запасов"
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_procurement_order
+msgid "Procurement"
+msgstr "Снабжение"
+
+#. module: stock_location
+#: help:stock.move,cancel_cascade:0
+msgid "If checked, when this move is cancelled, cancel the linked move too"
+msgstr ""
+"Если отмечено, то это перемещение отменено, связанные перемещения тоже "
+"отменяются"
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Produce"
+msgstr "Прозвести"
+
+#. module: stock_location
+#: selection:product.pulled.flow,procure_method:0
+msgid "Make to Order"
+msgstr "Изготовить на заказ"
+
+#. module: stock_location
+#: selection:product.pulled.flow,procure_method:0
+msgid "Make to Stock"
+msgstr "Изготовить на склад"
+
+#. module: stock_location
+#: field:product.pulled.flow,partner_address_id:0
+msgid "Partner Address"
+msgstr "Адрес партнера"
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "To Be Invoiced"
+msgstr "Счет будет выставлен"
+
+#. module: stock_location
+#: help:stock.location.path,delay:0
+msgid "Number of days to do this transition"
+msgstr "Количество дней для перемещения"
+
+#. module: stock_location
+#: help:product.pulled.flow,name:0
+msgid "This field will fill the packing Origin and the name of its moves"
+msgstr ""
+"Это поле будет заполнять происхождение комплектования и название его "
+"перемещений"
+
+#. module: stock_location
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Неправильный XML для просмотра архитектуры!"
+
+#. module: stock_location
+#: help:product.pulled.flow,company_id:0
+msgid "Is used to know to which company belong packings and moves"
+msgstr ""
+"Используется для для того, чтобы знать какой компании принадлежат упаковки и "
+"перемещения"
+
+#. module: stock_location
+#: field:product.pulled.flow,name:0
+msgid "Name"
+msgstr "Имя"
+
+#. module: stock_location
+#: help:product.product,path_ids:0
+msgid ""
+"These rules set the right path of the product in the whole location tree."
+msgstr ""
+"В этом параметре указывается конкретный каталог продукта в дереве каталогов."
+
+#. module: stock_location
+#: selection:stock.location.path,auto:0
+msgid "Manual Operation"
+msgstr "Ручное управление"
+
+#. module: stock_location
+#: model:ir.model,name:stock_location.model_product_product
+#: field:product.pulled.flow,product_id:0
+msgid "Product"
+msgstr "Продукция"
+
+#. module: stock_location
+#: field:product.pulled.flow,procure_method:0
+msgid "Procure Method"
+msgstr "Метод снабжения"
+
+#. module: stock_location
+#: field:product.pulled.flow,picking_type:0
+#: field:stock.location.path,picking_type:0
+msgid "Shipping Type"
+msgstr "Тип доставки"
+
+#. module: stock_location
+#: help:product.pulled.flow,procure_method:0
+msgid ""
+"'Make to Stock': When needed, take from the stock or wait until re-"
+"supplying. 'Make to Order': When needed, purchase or produce for the "
+"procurement request."
+msgstr ""
+"'Изготовить на склад':при необходимости, взять со склада или ждать поставки. "
+"'Изготовить на заказ': при необходимости, закупить или произвести по запросу "
+"на снабжение."
+
+#. module: stock_location
+#: help:product.pulled.flow,location_id:0
+msgid "Is the destination location that needs supplying"
+msgstr "Место назначения которое нуждается в поставке"
+
+#. module: stock_location
+#: field:stock.location.path,product_id:0
+msgid "Products"
+msgstr "Продукция"
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:0
+#, python-format
+msgid "Pulled from another location via procurement %d"
+msgstr "Взято из другого места по снабжению %d"
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.stock_location_qualitytest0
+msgid "Quality Control"
+msgstr "Контроль качества"
 
 #. module: stock_location
 #: field:stock.location.path,delay:0
 msgid "Delay (days)"
 msgstr "Задержка (в днях)"
 
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:0
+#, python-format
+msgid ""
+"Picking for pulled procurement coming from original location %s, pull rule "
+"%s, via original Procurement %s (#%d)"
+msgstr ""
+
+#. module: stock_location
+#: field:product.product,path_ids:0
+msgid "Pushed Flow"
+msgstr "Исходящий поток"
+
+#. module: stock_location
+#: code:addons/stock_location/procurement_pull.py:0
+#, python-format
+msgid ""
+"Move for pulled procurement coming from original location %s, pull rule %s, "
+"via original Procurement %s (#%d)"
+msgstr ""
+
+#. module: stock_location
+#: field:product.pulled.flow,location_src_id:0
+msgid "Location Source"
+msgstr "Источник местоположения"
+
+#. module: stock_location
+#: field:stock.location.path,location_dest_id:0
+msgid "Destination Location"
+msgstr "Место назначения"
+
+#. module: stock_location
+#: field:stock.location.path,auto:0
+#: selection:stock.location.path,auto:0
+msgid "Automatic Move"
+msgstr "Автоматическое перемещение"
+
+#. module: stock_location
+#: selection:product.pulled.flow,picking_type:0
+#: selection:stock.location.path,picking_type:0
+msgid "Getting Goods"
+msgstr "Получение товаров"
+
 #. module: stock_location
 #: view:product.product:0
-msgid "Procurement & Locations"
-msgstr "Снабжение и местоположения"
+msgid "Action Type"
+msgstr "Тип действия"
+
+#. module: stock_location
+#: selection:product.pulled.flow,type_proc:0
+msgid "Move"
+msgstr "Перемещение"
+
+#. module: stock_location
+#: help:product.pulled.flow,picking_type:0
+#: help:stock.location.path,picking_type:0
+msgid ""
+"Depending on the company, choose whatever you want to receive or send "
+"products"
+msgstr ""
+"В зависимости от компании, выберите, что вы хотите: принимать или отправлять "
+"продукцию"
+
+#. module: stock_location
+#: model:stock.location,name:stock_location.location_order
+msgid "Order Processing"
+msgstr "Обработка заказа"
+
+#. module: stock_location
+#: field:stock.location.path,name:0
+msgid "Operation"
+msgstr "Операция"
+
+#. module: stock_location
+#: view:stock.location.path:0
+msgid "Location Paths"
+msgstr "Расположение каталога"
+
+#. module: stock_location
+#: field:product.pulled.flow,journal_id:0
+#: field:stock.location.path,journal_id:0
+msgid "Journal"
+msgstr "Журнал"
+
+#. module: stock_location
+#: field:product.pulled.flow,cancel_cascade:0
+#: field:stock.move,cancel_cascade:0
+msgid "Cancel Cascade"
+msgstr "Отменить каскад"
+
+#. module: stock_location
+#: selection:product.pulled.flow,invoice_state:0
+#: selection:stock.location.path,invoice_state:0
+msgid "Invoiced"
+msgstr "Счет"
+
+#~ msgid "Procurement & Locations"
+#~ msgstr "Снабжение и местоположения"
+
+#~ msgid "Stock Location Paths"
+#~ msgstr "Расположение патча"
+
+#~ msgid "stock.location.path"
+#~ msgstr "расположение патча"
diff --git a/addons/stock_no_autopicking/i18n/ru.po b/addons/stock_no_autopicking/i18n/ru.po
index 4ab465e7fbb..17246197b2f 100644
--- a/addons/stock_no_autopicking/i18n/ru.po
+++ b/addons/stock_no_autopicking/i18n/ru.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 03:06+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:47+0000\n"
+"PO-Revision-Date: 2010-10-21 17: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: 2010-09-29 05:13+0000\n"
+"X-Launchpad-Export-Date: 2010-10-22 04:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_no_autopicking
@@ -21,17 +21,35 @@ msgstr ""
 msgid "Invalid XML for View Architecture!"
 msgstr "Неправильный XML для просмотра архитектуры!"
 
+#. module: stock_no_autopicking
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Название объекта должно начинаться с x_  и не должно содержать специальных "
+"символов !"
+
+#. module: stock_no_autopicking
+#: model:ir.model,name:stock_no_autopicking.model_mrp_production
+msgid "Manufacturing Order"
+msgstr "Производственный заказ"
+
 #. module: stock_no_autopicking
 #: field:product.product,auto_pick:0
 msgid "Auto Picking"
-msgstr "Авто выбор"
+msgstr "Авто комплектование"
+
+#. module: stock_no_autopicking
+#: model:ir.model,name:stock_no_autopicking.model_product_product
+msgid "Product"
+msgstr "Продукция"
 
 #. module: stock_no_autopicking
 #: help:product.product,auto_pick:0
 msgid "Auto picking for raw materials of production orders."
-msgstr ""
+msgstr "Авто комплектация для сырья производственных заказов."
 
 #. module: stock_no_autopicking
 #: model:ir.module.module,shortdesc:stock_no_autopicking.module_meta_information
 msgid "Stock No Auto-Picking"
-msgstr ""
+msgstr "Запасы без авто-комплектации"