diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py
index b0ef5bc6641..c170076cfc8 100644
--- a/addons/account/__openerp__.py
+++ b/addons/account/__openerp__.py
@@ -119,7 +119,7 @@ module named account_voucher.
         'project/project_demo.xml',
         'project/analytic_account_demo.xml',
         'demo/account_minimal.xml',
-        #'account_unit_test.xml',
+#        'account_unit_test.xml',
     ],
     'test': [
         'test/account_customer_invoice.yml',
diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml
index f6de415fd9a..528d986d729 100644
--- a/addons/account/board_account_view.xml
+++ b/addons/account/board_account_view.xml
@@ -44,7 +44,7 @@
                 <form string="Account Board">
                     <hpaned>
                         <child1>
-                            <action colspan="4" height="160" width="400" name="%(account.action_invoice_tree1)d" string="Customer Invoices to Validate" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
+                            <action colspan="4" height="160" width="400" name="%(account.action_invoice_tree1)d" string="Customer Invoices to Approve" domain="[('state','=','draft'),('type','=','out_invoice')]"/>
                             <action colspan="4" height="160" width="400" name="%(action_company_analysis_tree)d" string="Company Analysis" />
                         </child1>
                         <child2>
diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po
index 39693cba28e..83c6af012fd 100644
--- a/addons/account/i18n/el.po
+++ b/addons/account/i18n/el.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-11-11 09:23+0000\n"
-"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
+"PO-Revision-Date: 2010-11-13 13:52+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -635,7 +635,7 @@ msgstr "(Διατηρήστε κενό για να ανοίξετε την τρ
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Mapping"
-msgstr ""
+msgstr "Οικονομική Απεικόνιση Λογαριασμών"
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1033,7 +1033,7 @@ msgstr "Καθαρό Σύνολο:"
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Mapping"
-msgstr ""
+msgstr "Οικονομική Απεικόνιση"
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1055,7 +1055,7 @@ msgstr "Υποκατηγορίες"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Mapping"
-msgstr ""
+msgstr "Φορολογητέα Οικονομική Απεικόνικη"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1144,7 +1144,7 @@ msgstr "Νέος Λογαριασμός Αναλυτικής"
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
 msgid "Fiscal Mapping Templates"
-msgstr ""
+msgstr "Πρότυπο Οικονομικής Απεικόνισης"
 
 #. module: account
 #: rml:account.invoice:0
@@ -1176,7 +1176,7 @@ msgstr "Το ποσό, εκφρασμένο σε ένα (προαιρετικό)
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Mapping Template"
-msgstr ""
+msgstr "Πρότυπα Οικονομικής Απεικόνισης"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1248,7 +1248,7 @@ msgstr "Νόμισμα Εταιρίας"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
 msgid "Template Account Fiscal Mapping"
-msgstr ""
+msgstr "Πρότυπο Οικονομικής Απεικόνισης Λογαριασμού"
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1835,6 +1835,8 @@ msgid ""
 "The fiscal mapping will determine taxes and the accounts used for the "
 "partner."
 msgstr ""
+"Η οικονομική απεικόνιση θα προσδιορίσει τους φόρους ακι τους λογαριασμούς "
+"που χρησιμοποιούνται για τον συνεργάτη"
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2108,7 +2110,7 @@ msgstr "Επεξεργασία Τιμολογίου Πελάτη"
 #. module: account
 #: rml:account.invoice:0
 msgid "Fiscal Mapping Remark :"
-msgstr ""
+msgstr "Παρατήρηση Οικονομικής Απεικόνισης"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3712,7 +3714,7 @@ msgstr "Ιεράρχηση"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
 msgid "Template for Fiscal Mapping"
-msgstr ""
+msgstr "Πρότυπο για Οικονομική Απεικόνιση"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3819,7 +3821,7 @@ msgstr "Πρόχειρα Τιμολόγια"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Mapping"
-msgstr ""
+msgstr "Πρότυπο για Φορολογητέα Οικονομική Απεικόνιση"
 
 #. module: account
 #: rml:account.invoice:0
@@ -6023,7 +6025,7 @@ msgstr "Όρος Πληρωμής"
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
 msgid "Fiscal Mappings"
-msgstr ""
+msgstr "Οικονομικές Απεικονίσεις"
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po
index a018ecb571e..c3c8ee9e060 100644
--- a/addons/account/i18n/fr.po
+++ b/addons/account/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-11-11 09:11+0000\n"
-"Last-Translator: TeMPO <openerp@tempo-consulting.fr>\n"
+"PO-Revision-Date: 2010-11-13 09:41+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -694,7 +694,7 @@ msgstr "(Laisser vide pour consulter la situation courrante)"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Mapping"
-msgstr ""
+msgstr "Correspondance fiscale des comptes"
 
 #. module: account
 #: field:account.analytic.account,contact_id:0
@@ -1085,7 +1085,7 @@ msgstr "Total net :"
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Mapping"
-msgstr ""
+msgstr "Correspondance fiscale"
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -1107,7 +1107,7 @@ msgstr "Enfant"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Mapping"
-msgstr ""
+msgstr "Correspondance fiscale des taxes"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2_new
@@ -1196,7 +1196,7 @@ msgstr "Nouveau compte analytique"
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form_template
 msgid "Fiscal Mapping Templates"
-msgstr ""
+msgstr "Modèles de correspondance fiscale"
 
 #. module: account
 #: rml:account.invoice:0
@@ -1228,7 +1228,7 @@ msgstr "Le montant exprimé dans une autre devise optionelle."
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Mapping Template"
-msgstr ""
+msgstr "Modèle de correspondance fiscale"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -1300,7 +1300,7 @@ msgstr "Devise société"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account_template
 msgid "Template Account Fiscal Mapping"
-msgstr ""
+msgstr "Modèle de correspondance fiscale de compte"
 
 #. module: account
 #: field:account.analytic.account,parent_id:0
@@ -1884,6 +1884,8 @@ msgid ""
 "The fiscal mapping will determine taxes and the accounts used for the "
 "partner."
 msgstr ""
+"La correspondance fiscale déterminera les taxes et les comptes utilisés pour "
+"le partenaire."
 
 #. module: account
 #: rml:account.analytic.account.cost_ledger:0
@@ -2158,7 +2160,7 @@ msgstr "Processus de la facture client"
 #. module: account
 #: rml:account.invoice:0
 msgid "Fiscal Mapping Remark :"
-msgstr ""
+msgstr "Remarque sur la correspondance fiscale :"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
@@ -3747,7 +3749,7 @@ msgstr "Séquence"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
 msgid "Template for Fiscal Mapping"
-msgstr ""
+msgstr "Modèle pour la correspondance fiscale"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -3854,7 +3856,7 @@ msgstr "Factures en brouillon"
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Mapping"
-msgstr ""
+msgstr "Modèle de correspondance fiscale de taxe"
 
 #. module: account
 #: rml:account.invoice:0
@@ -6023,7 +6025,7 @@ msgstr "Condition de paiement"
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
 msgid "Fiscal Mappings"
-msgstr ""
+msgstr "Correspondances fiscales"
 
 #. module: account
 #: model:process.process,name:account.process_process_statementprocess0
@@ -6388,7 +6390,7 @@ msgstr "Comptes par type"
 #. module: account
 #: model:ir.model,name:report_account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "Balance agée clients à aujourd'hui"
 
 #. module: account
 #: model:ir.model,name:report_account.model_report_account_receivable
@@ -6431,7 +6433,7 @@ msgstr "Date de Création"
 #: model:ir.actions.act_window,name:report_account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr ""
+msgstr "Balance agée clients"
 
 #. module: account
 #: view:report.invoice.created:0
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 414b71854f2..892bf8cd655 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.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-11-11 19:48+0000\n"
+"PO-Revision-Date: 2010-11-12 10:24+0000\n"
 "Last-Translator: Lorenzo Battistini <lorenzo.battistini@domsense.com>\n"
 "Language-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-11-12 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po
index 80f349fbefb..cfb13701027 100644
--- a/addons/account/i18n/nl.po
+++ b/addons/account/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-11-11 09:01+0000\n"
-"Last-Translator: qdp (OpenERP) <qdp-launchpad@tinyerp.com>\n"
+"PO-Revision-Date: 2010-11-13 09:41+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:47+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1756,7 +1756,7 @@ msgstr "Richting credit"
 #: model:ir.actions.wizard,name:account.wizard_reconcile_unreconcile
 #: model:ir.actions.wizard,name:account.wizard_unreconcile
 msgid "Unreconcile Entries"
-msgstr "Boekingen niet verrekenen"
+msgstr "Boekingen niet vereffenen"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
@@ -2738,7 +2738,7 @@ msgstr "-"
 #. module: account
 #: rml:account.analytic.account.journal:0
 msgid "asgfas"
-msgstr ""
+msgstr "asgfas"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
@@ -5071,7 +5071,7 @@ msgstr "Afgeletterde transacties"
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting
 msgid "Reporting"
-msgstr "Rapportering"
+msgstr "Overzichten"
 
 #. module: account
 #: rml:account.third_party_ledger:0
diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po
index 535307d6eef..4c190ee9bfa 100644
--- a/addons/account/i18n/ru.po
+++ b/addons/account/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-11-11 08:32+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2010-11-13 07:13+0000\n"
+"Last-Translator: Эдуард <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:48+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -2101,7 +2101,7 @@ msgstr ""
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,period_id:0
 msgid "Opening Entries Period"
-msgstr ""
+msgstr "Период открытия записи"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_validate_account_moves
@@ -2947,7 +2947,7 @@ msgstr ""
 #. module: account
 #: rml:account.overdue:0
 msgid "Document: Customer account statement"
-msgstr ""
+msgstr "Документ: выписка клиенту со счета"
 
 #. module: account
 #: view:product.product:0
diff --git a/addons/account/project/report/analytic_balance.rml b/addons/account/project/report/analytic_balance.rml
index bbd7e409dc0..77182b5bb9f 100644
--- a/addons/account/project/report/analytic_balance.rml
+++ b/addons/account/project/report/analytic_balance.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Analytic Balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Analytic Balance.pdf">
+  <template pageSize="(595.0,842.0)" title="Analytic Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="31.0" y1="30.0" width="531" height="779"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -34,13 +34,13 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table3">
+    <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table2">
+    <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -88,17 +88,9 @@
     <images/>
   </stylesheet>
   <story>
-    <blockTable colWidths="482.0" style="Table_Header_analytic">
-      <tr>
-        <td>
-          <para style="terp_header_Centre">Analytic Balance - [[ company.currency_id.name ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_space">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="55.0,221.0,55.0,52.0,60.0,39.0" style="Table_Header_Tile">
+  <pto>
+  <pto_header>
+  <blockTable colWidths="57.0,192.0,71.0,71.0,71.0,71.0" style="Table_Header_Tile">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Code</para>
@@ -120,24 +112,55 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_2">
+  </pto_header>
+
+    <blockTable colWidths="532.0" style="Table_Header_analytic">
+      <tr>
+        <td>
+          <para style="terp_header_Centre">Analytic Balance - [[ company.currency_id.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_space">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="54.0,222.0,56.0,51.0,62.0,38.0" style="Table1">
+    <blockTable colWidths="57.0,192.0,71.0,71.0,71.0,71.0" style="Table_Header_Tile">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Code</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Account Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Debit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Credit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Balance</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Quantity</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="57.0,192.0,71.0,71.0,71.0,71.0" style="Table1">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Total</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">
-            <font color="white"></font>
+            <font color="white"> </font>
           </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'debit')) ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'debit')) ]] </para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]]</para>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(sum_all(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'],'credit')) ]] </para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">[[ formatLang(sum_balance(get_objects(data['form']['empty_acc']),data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]</para>
@@ -148,8 +171,8 @@
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_8">[[ repeatIn(get_objects(data['form']['empty_acc']),'o') ]]</para>
-      <blockTable colWidths="55.0,221.0,56.0,50.0,62.0,38.0" style="Table3">
+      <para style="terp_default_2">[[ repeatIn(get_objects(data['form']['empty_acc']),'o') ]]</para>
+      <blockTable colWidths="57.0,192.0,71.0,71.0,71.0,71.0" style="Table2">
         <tr>
           <td>
             <para style="terp_default_Bold_9">[[ o['code'] ]]</para>
@@ -158,10 +181,10 @@
             <para style="terp_default_Bold_9">[[ o['complete_name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'debit')) ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'debit')) ]] </para>
           </td>
           <td>
-            <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'credit')) ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum(o['id'],data['form']['date1'],data['form']['date2'],'credit')) ]] </para>
           </td>
           <td>
             <para style="terp_default_Right_9_Bold">[[ formatLang(move_sum_balance(o['id'],data['form']['date1'],data['form']['date2'])) ]] [[ company.currency_id.symbol]]</para>
@@ -171,12 +194,9 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
       <section>
-        <para style="terp_default_8">[[ repeatIn(lines_g(o['id'],data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
-        <blockTable colWidths="55.0,222.0,56.0,49.0,63.0,37.0" style="Table2">
+        <para style="terp_default_2">[[ repeatIn(lines_g(o['id'],data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
+        <blockTable colWidths="57.0,192.0,71.0,71.0,71.0,71.0" style="Table3">
           <tr>
             <td>
               <para style="terp_default_9">[[ move_g['code'] ]]</para>
@@ -188,7 +208,7 @@
               <para style="terp_default_Right_9">[[ formatLang(move_g['debit'])]] </para>
             </td>
             <td>
-              <para style="terp_default_Right_9">[[ formatLang(move_g['credit']) ]]</para>
+              <para style="terp_default_Right_9">[[ formatLang(move_g['credit']) ]] </para>
             </td>
             <td>
               <para style="terp_default_Right_9">[[ formatLang(move_g['balance'])]] [[ company.currency_id.symbol ]]</para>
@@ -202,21 +222,13 @@
           <font color="white"> </font>
         </para>
       </section>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
     </section>
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
     <para style="Standard">
       <font color="white"> </font>
     </para>
+    </pto>
   </story>
 </document>
\ No newline at end of file
diff --git a/addons/account/project/report/cost_ledger.rml b/addons/account/project/report/cost_ledger.rml
index a59e95724d0..90ff16be217 100644
--- a/addons/account/project/report/cost_ledger.rml
+++ b/addons/account/project/report/cost_ledger.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Cost Ledger" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Cost Ledger.pdf">
+  <template pageSize="(595.0,842.0)" title="Cost Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="28.0" y1="30.0" width="539" height="785"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -120,7 +120,29 @@
     <images/>
   </stylesheet>
   <story>
-    <blockTable colWidths="161.0,161.0,161.0" repeatRows="1" style="Table1">
+  <pto>
+  <pto_header>
+  <blockTable colWidths="53.0,276.0,70.0,71.0,68.0" style="Table_Header_Title">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Date/Code</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">J.C. /Move name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Debit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Credit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Balance</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
+    <blockTable colWidths="179.0,179.0,180.0" repeatRows="1" style="Table1">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -137,7 +159,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="161.0,161.0,161.0" style="Table_Date_Sub_detail">
+    <blockTable colWidths="179.0,179.0,179.0" style="Table_Date_Sub_detail">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Period from </para>
@@ -150,7 +172,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="161.0,161.0,161.0" style="Table_Sub_Content">
+    <blockTable colWidths="179.0,179.0,179.0" style="Table_Sub_Content">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(data['form']['date1'],date = True) ]]</para>
@@ -166,7 +188,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="63.0,249.0,57.0,57.0,57.0" style="Table_Header_Title">
+    <blockTable colWidths="53.0,276.0,70.0,71.0,68.0" style="Table_Header_Title">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date/Code</para>
@@ -181,11 +203,11 @@
           <para style="terp_tblheader_Details_Right">Credit</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Balance</para>
+          <para style="terp_tblheader_Details_Right">Balance</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="62.0,250.0,57.0,56.0,57.0" style="Table_Grant_Total">
+    <blockTable colWidths="56.0,273.0,70.0,70.0,70.0" style="Table_Grant_Total">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Total:</para>
@@ -208,7 +230,7 @@
     </blockTable>
     <section>
       <para style="terp_default_2">[[ repeatIn(objects,'o') ]]</para>
-      <blockTable colWidths="62.0,249.0,57.0,57.0,57.0" style="Table_Account_Detail">
+      <blockTable colWidths="56.0,273.0,70.0,70.0,70.0" style="Table_Account_Detail">
         <tr>
           <td>
             <para style="terp_default_Bold_9">[[ o.code ]]</para>
@@ -229,7 +251,7 @@
       </blockTable>
       <section>
         <para style="terp_default_2">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2']),'move_g') ]]</para>
-        <blockTable colWidths="62.0,249.0,58.0,56.0,57.0" style="Table_Move_Line_Detail">
+        <blockTable colWidths="56.0,273.0,70.0,70.0,70.0" style="Table_Move_Line_Detail">
           <tr>
             <td>
               <para style="terp_default_Bold_9">[[ move_g['code'] ]]</para>
@@ -250,7 +272,7 @@
         </blockTable>
         <section>
           <para style="terp_default_2">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2']),'move_a') ]]</para>
-          <blockTable colWidths="60.0,46.0,204.0,59.0,55.0,58.0" style="Table_Move_Line_Content">
+          <blockTable colWidths="56.0,56.0,217.0,70.0,70.0,70.0" style="Table_Move_Line_Content">
             <tr>
               <td>
                 <para style="terp_default_9_Italic">[[ formatLang(move_a['date'],date = True) ]]</para>
@@ -278,5 +300,6 @@
         </section>
       </section>
     </section>
+    </pto>
   </story>
 </document>
\ No newline at end of file
diff --git a/addons/account/project/report/inverted_analytic_balance.rml b/addons/account/project/report/inverted_analytic_balance.rml
index 6de2e28d46e..25a79aa63f9 100644
--- a/addons/account/project/report/inverted_analytic_balance.rml
+++ b/addons/account/project/report/inverted_analytic_balance.rml
@@ -87,6 +87,31 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+  <blockTable colWidths="58.0,238.0,62.0,62.0,60.0,59.0" style="Table_Header_table">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Code</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Debit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Credit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Balance</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Quantity</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <blockTable colWidths="539.0" style="Table_Title">
       <tr>
         <td>
@@ -199,5 +224,6 @@
         </para>
       </section>
     </section>
+    </pto>
   </story>
 </document>
\ No newline at end of file
diff --git a/addons/account/project/report/quantity_cost_ledger.rml b/addons/account/project/report/quantity_cost_ledger.rml
index 68e391223b4..8d83b9512ab 100644
--- a/addons/account/project/report/quantity_cost_ledger.rml
+++ b/addons/account/project/report/quantity_cost_ledger.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Cost Ledger" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Cost Ledger.pdf">
+  <template pageSize="(595.0,842.0)" title="Cost Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="30.0" y1="29.0" width="534" height="783"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -117,7 +117,26 @@
     <images/>
   </stylesheet>
   <story>
-    <blockTable colWidths="161.0,161.0,161.0" repeatRows="1" style="Table_Header_Detail">
+  <pto>
+  <pto_header>
+  <blockTable colWidths="57.0,322.0,85.0,71.0" style="Table_Header_Move_Line">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Code/Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">J.C./Move name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Quantity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Total</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
+    <blockTable colWidths="178.0,178.0,178.0" repeatRows="1" style="Table_Header_Detail">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -134,7 +153,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="161.0,161.0,161.0" style="Table_Date_Detail">
+    <blockTable colWidths="178.0,178.0,178.0" style="Table_Date_Detail">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Period from</para>
@@ -147,7 +166,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="161.0,161.0,161.0" style="Table_Date_Content">
+    <blockTable colWidths="178.0,178.0,178.0" style="Table_Date_Content">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ formatLang(data['form']['date1'],date = True) ]]</para>
@@ -166,7 +185,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="57.0,288.0,77.0,60.0" style="Table_Header_Move_Line">
+    <blockTable colWidths="57.0,322.0,85.0,71.0" style="Table_Header_Move_Line">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Code/Date</para>
@@ -175,14 +194,14 @@
           <para style="terp_tblheader_Details">J.C./Move name</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">Quantity</para>
+          <para style="terp_tblheader_Details_Centre">Quantity</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Total</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="57.0,288.0,77.0,60.0" style="Table_Final_Total">
+    <blockTable colWidths="57.0,322.0,85.0,71.0" style="Table_Final_Total">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Total:</para>
@@ -203,8 +222,8 @@
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
-      <blockTable colWidths="58.0,287.0,78.0,59.0" style="Table_Account_Detail">
+      <para style="terp_default_2">[[ repeatIn(objects,'o') ]]</para>
+      <blockTable colWidths="57.0,322.0,85.0,71.0" style="Table_Account_Detail">
         <tr>
           <td>
             <para style="terp_default_Bold_9">[[ o.code ]]<font face="Helvetica" size="10.0"/></para>
@@ -221,8 +240,8 @@
         </tr>
       </blockTable>
       <section>
-        <para style="terp_default_8">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_g') ]]</para>
-        <blockTable colWidths="58.0,365.0,59.0" style="Table_Analytical_Detail">
+        <para style="terp_default_2">[[ repeatIn(lines_g(o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_g') ]]</para>
+        <blockTable colWidths="57.0,407.0,71.0" style="Table_Analytical_Detail">
           <tr>
             <td>
               <para style="terp_default_Bold_9">[[ move_g['code'] ]] </para>
@@ -235,7 +254,7 @@
             </td>
           </tr>
         </blockTable>
-        <blockTable colWidths="59.0,32.0,332.0,59.0" style="Table_Move_Line_Content">
+        <blockTable colWidths="57.0,71.0,336.0,71.0" style="Table_Move_Line_Content">
           <tr>
             <td>
               <para style="terp_default_9_Italic">[[ repeatIn(lines_a(move_g['id'],o.id,data['form']['date1'],data['form']['date2'],data['form']['journal']),'move_a') ]]</para>
@@ -257,5 +276,6 @@
         </para>
       </section>
     </section>
+    </pto>
   </story>
 </document>
\ No newline at end of file
diff --git a/addons/account/report/account_aged_partner_balance.py b/addons/account/report/account_aged_partner_balance.py
index 879560a5b4a..b99070330f7 100644
--- a/addons/account/report/account_aged_partner_balance.py
+++ b/addons/account/report/account_aged_partner_balance.py
@@ -20,12 +20,10 @@
 ##############################################################################
 
 import time
-
-import rml_parse
 from report import report_sxw
 from common_report_header import common_report_header
 
-class aged_trial_report(rml_parse.rml_parse, common_report_header):
+class aged_trial_report(report_sxw.rml_parse, common_report_header):
 
     def __init__(self, cr, uid, name, context):
         super(aged_trial_report, self).__init__(cr, uid, name, context=context)
diff --git a/addons/account/report/account_aged_partner_balance.rml b/addons/account/report/account_aged_partner_balance.rml
index 8b8336d1c06..cbc4688c368 100644
--- a/addons/account/report/account_aged_partner_balance.rml
+++ b/addons/account/report/account_aged_partner_balance.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-    <template pageSize="(1120.0,770.0)" title="Aged Trial balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Aged Trial Balance.pdf">
+    <template pageSize="(1120.0,770.0)" title="Aged Trial Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
        <frame id="first" x1="20.0" y1="35.0" width="1080" height="650"/>
     </pageTemplate>
@@ -107,7 +107,7 @@
       <tr>
         <td><para style="terp_header"><font color="white"> </font></para>
         </td>
-        <td><para style="terp_header_Centre">Aged Trial balance</para></td>
+        <td><para style="terp_header_Centre">Aged Trial Balance</para></td>
         <td><para style="terp_header"><font color="white"> </font></para></td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py
index 5a6c7700b9d..f9697710f8f 100644
--- a/addons/account/report/account_balance.py
+++ b/addons/account/report/account_balance.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import time
-
 from report import report_sxw
 from common_report_header import common_report_header
 
diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml
index 277d568330c..7c9aa13da2e 100644
--- a/addons/account/report/account_balance.rml
+++ b/addons/account/report/account_balance.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Account Balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Account Balance.pdf">
+  <template pageSize="(595.0,842.0)" title="Account Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="35.0" y1="35.0" width="525" height="772"/>
     </pageTemplate>
@@ -18,7 +18,7 @@
       <blockValign value="TOP"/>
       <blockAlignment value="RIGHT"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0"/>
-  <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,1" stop="-1,-1"/>
     </blockTableStyle>
 
     <blockTableStyle id="Table8">
@@ -148,11 +148,11 @@
     <paraStyle name="P7" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="P8" fontName="Helvetica"/>
     <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="8.0" leading="14" spaceBefore="0.0" spaceAfter="6.0" alignment="RIGHT"/>
+    <paraStyle name="P10" fontName="Helvetica-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="0.0" alignment="RIGHT"/>
     <paraStyle name="P11" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P12" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="P13" fontName="Helvetica-Bold" fontSize="2.0" leading="3" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0" textColor="#ffffff"/>
-      <paraStyle name="P14" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P14" rightIndent="17.0" leftIndent="-0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P15" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="P16" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="P17" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -189,7 +189,7 @@
     <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Heading 3" fontName="Helvetica-Bold" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-     <paraStyle name="P12a" fontName="Helvetica-Bold" fontSize="8.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="P12a" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <images/>
   </stylesheet>
   <story>
@@ -283,7 +283,7 @@
         <para style="P11">
       <font color="white"> </font>
     </para>
-  <blockTable colWidths="67,295.0,60.0,60.0,60.0" style="Table2" repeatRows="1">
+  <blockTable colWidths="80,215.0,80.0,80.0,80.0" style="Table2" repeatRows="1">
       <tr noRowsplits="1">
         <td><para style="P12a">Code</para></td>
         <td><para style="P12a">Account</para></td>
diff --git a/addons/account/report/account_balance_landscape.py b/addons/account/report/account_balance_landscape.py
index 6ec7ec7c10e..8576850ff5e 100644
--- a/addons/account/report/account_balance_landscape.py
+++ b/addons/account/report/account_balance_landscape.py
@@ -22,7 +22,6 @@
 import time
 import locale
 from report import report_sxw
-import rml_parse
 
 parents = {
     'tr':1,
@@ -31,7 +30,7 @@ parents = {
     'section': 0
 }
 
-class account_balance_landscape(rml_parse.rml_parse):
+class account_balance_landscape(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(account_balance_landscape, self).__init__(cr, uid, name, context=context)
         self.flag=1
diff --git a/addons/account/report/account_balance_landscape.rml b/addons/account/report/account_balance_landscape.rml
index 1f695eb36a8..d8e4881bbbe 100644
--- a/addons/account/report/account_balance_landscape.rml
+++ b/addons/account/report/account_balance_landscape.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(842.0,595.0)" title="Account Balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Account Balance.pdf">
+  <template pageSize="(842.0,595.0)" title="Account Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="786" height="539"/>
     </pageTemplate>
diff --git a/addons/account/report/account_balance_landscape_old_backup.rml b/addons/account/report/account_balance_landscape_old_backup.rml
index cd7e9edc860..6790082f8dd 100755
--- a/addons/account/report/account_balance_landscape_old_backup.rml
+++ b/addons/account/report/account_balance_landscape_old_backup.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(1120.0,770.0)" title="Account balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20" >
+<document filename="Account Balance.pdf">
+  <template pageSize="(1120.0,770.0)" title="Account Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20" >
     <pageTemplate id="first">
       <frame id="first" x1="22.0" y1="31.0" width="1080" height="680"/>
     </pageTemplate>
@@ -80,7 +80,7 @@
           </para>
         </td>
         <td>
-          <para style="P1">Account balance</para>
+          <para style="P1">Account Balance</para>
         </td>
         <td>
           <para style="P3">
diff --git a/addons/account/report/account_balance_old_backup.rml b/addons/account/report/account_balance_old_backup.rml
index 1d40e58cbfb..cf67cb6bc3d 100755
--- a/addons/account/report/account_balance_old_backup.rml
+++ b/addons/account/report/account_balance_old_backup.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(635.0,842.0)" title="Account balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Account Balance.pdf">
+  <template pageSize="(635.0,842.0)" title="Account Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="15.0" y1="15.0" width="615" height="772"/>
     </pageTemplate>
diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py
index 4d3e06dee05..b6f39fbbebd 100644
--- a/addons/account/report/account_balance_sheet.py
+++ b/addons/account/report/account_balance_sheet.py
@@ -22,13 +22,12 @@
 import time
 
 import pooler
-import rml_parse
 from report import report_sxw
 from account.report import account_profit_loss
 from common_report_header import common_report_header
 from tools.translate import _
 
-class report_balancesheet_horizontal(rml_parse.rml_parse, common_report_header):
+class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header):
     def __init__(self, cr, uid, name, context=None):
         super(report_balancesheet_horizontal, self).__init__(cr, uid, name, context=context)
         self.obj_pl = account_profit_loss.report_pl_account_horizontal(cr, uid, name, context=context)
diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml
index 076de7bdcd4..74b3bf81190 100644
--- a/addons/account/report/account_balance_sheet.rml
+++ b/addons/account/report/account_balance_sheet.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Balance sheet" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Balance Sheet.pdf">
+  <template pageSize="(595.0,842.0)" title="Balance Sheet" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -35,19 +35,7 @@
     <blockTableStyle id="Table_Net_Profit_Loss">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#cccccc" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,0" stop="-1,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
@@ -230,7 +218,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="426.0,113.0" style="Table3">
+    <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">
       <tr>
         <td>
           <para style="terp_default_Bold_9">Balance:</para>
diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml
index bde0d2786d0..7bfaeb9f33e 100644
--- a/addons/account/report/account_balance_sheet_horizontal.rml
+++ b/addons/account/report/account_balance_sheet_horizontal.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(1120.0,770.0)" title="Balance sheet" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20" >
+<document filename="Balance Sheet.pdf">
+  <template pageSize="(1120.0,770.0)" title="Balance Sheet" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20" >
     <pageTemplate id="first">
       <frame id="first" x1="22.0" y1="15.0" width="1080" height="680"/>
 
diff --git a/addons/account/report/account_central_journal.py b/addons/account/report/account_central_journal.py
index 6ab5b38d03d..d3113b63133 100644
--- a/addons/account/report/account_central_journal.py
+++ b/addons/account/report/account_central_journal.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import time
-
 from report import report_sxw
 from common_report_header import common_report_header
 #
diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml
index 28cb68fcce3..320a38370a2 100644
--- a/addons/account/report/account_central_journal.rml
+++ b/addons/account/report/account_central_journal.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="central_journal.pdf">
-  <template pageSize="(595.0,842.0)" title="Centralized Journal" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Centralized Journal.pdf">
+  <template pageSize="(595.0,842.0)" title="Centralized Journal" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="42.0" width="539" height="758"/>
     </pageTemplate>
@@ -274,7 +274,7 @@
     <para style="P9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Account_detail_Title">[[  display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable colWidths="50.0,260.0,80.0,80.0,80.0" style="Table_Account_detail_Title">[[  display_currency(data) == False or removeParentNode('blockTable') ]]
       <tr>
         <td><para style="terp_tblheader_Details">A/C No.</para></td>
         <td><para style="terp_tblheader_Details">Account Name</para></td>
@@ -283,7 +283,7 @@
   		<td><para style="terp_tblheader_Details_Right">Balance</para></td>
       </tr>
     </blockTable>
-   <blockTable colWidths="50.0,220.0,70.0,70.0,70.0,80.0" style="Table_Account_detail_Title_Currency">[[ display_currency(data)  or removeParentNode('blockTable') ]]
+   <blockTable colWidths="50.0,180.0,80.0,80.0,80.0,80.0" style="Table_Account_detail_Title_Currency">[[ display_currency(data)  or removeParentNode('blockTable') ]]
       <tr>
         <td><para style="terp_tblheader_Details">A/C No.</para></td>
         <td><para style="terp_tblheader_Details">Account Name</para></td>
@@ -293,7 +293,7 @@
 		<td><para style="terp_tblheader_Details_Right">Currency</para></td>
       </tr>
     </blockTable>
-    <blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable colWidths="50.0,260.0,80.0,80.0,80.0" style="Table_Final_Total">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
       <tr>
         <td><para style="terp_default_Bold_9">Total:</para></td>
         <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
@@ -302,7 +302,7 @@
 		<td><para style="terp_default_Bold_9_Right">[[ formatLang( sum_credit(o.period_id.id, o.journal_id.id)-sum_debit(o.period_id.id, o.journal_id.id) ) ]] [[ company.currency_id.symbol ]]</para></td>
       </tr>
     </blockTable>
-    <blockTable colWidths="50.0,220.0,70.0,70.0,70.0,80.0" style="Table_Final_Total_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
+    <blockTable colWidths="50.0,180.0,80.0,80.0,80.0,80.0" style="Table_Final_Total_currency">[[ display_currency(data) or removeParentNode('blockTable') ]]
       <tr>
         <td><para style="terp_default_Bold_9">Total:</para></td>
         <td><para style="terp_default_Bold_9"><font color="white"> </font></para></td>
@@ -314,7 +314,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(lines(o.period_id.id,o.journal_id.id),'line') ]]</para>
-      <blockTable colWidths="50.0,300.0,70.0,70.0,70.0" style="Table_Journal_Line_Content">[[ display_currency(data)  == False or removeParentNode('blockTable') ]]
+      <blockTable colWidths="50.0,260.0,80.0,80.0,80.0" style="Table_Journal_Line_Content">[[ display_currency(data)  == False or removeParentNode('blockTable') ]]
         <tr>
           <td><para style="terp_default_9">[[ line['code'] ]]</para></td>
           <td><para style="terp_default_9">[[ line['name'] ]]</para></td>
@@ -323,7 +323,7 @@
  		  <td><para style="terp_default_Right_9">[[ formatLang(line['credit']-line['debit']) ]] [[ company.currency_id.symbol ]]</para></td>
         </tr>
       </blockTable>
-      <blockTable colWidths="50.0,220.0,70.0,70.0,70.0,80.0" style="Table_Journal_Line_Content_currency">[[ display_currency(data)  or removeParentNode('blockTable') ]]
+      <blockTable colWidths="50.0,180.0,80.0,80.0,80.0,80.0" style="Table_Journal_Line_Content_currency">[[ display_currency(data)  or removeParentNode('blockTable') ]]
         <tr>
           <td><para style="terp_default_9">[[ line['code'] ]]</para></td>
           <td><para style="terp_default_9">[[ line['name'] ]]</para></td>
diff --git a/addons/account/report/account_general_journal.py b/addons/account/report/account_general_journal.py
index 4a20ac9ebc4..9eb81157dba 100644
--- a/addons/account/report/account_general_journal.py
+++ b/addons/account/report/account_general_journal.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import time
-
 from common_report_header import common_report_header
 from report import report_sxw
 
diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml
index f41302408c5..a98eda3fff3 100644
--- a/addons/account/report/account_general_journal.rml
+++ b/addons/account/report/account_general_journal.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="general_journal.pdf">
-  <template pageSize="(596.0,842.0)" title="General Journal" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="General Journal.pdf">
+  <template pageSize="(596.0,842.0)" title="General Journal" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="42.0" width="540" height="758"/>
     </pageTemplate>
diff --git a/addons/account/report/account_general_ledger.py b/addons/account/report/account_general_ledger.py
index 434f9f800cd..6ccfb9343a2 100644
--- a/addons/account/report/account_general_ledger.py
+++ b/addons/account/report/account_general_ledger.py
@@ -28,12 +28,10 @@
 ##############################################################################
 
 import time
-
 from report import report_sxw
 from common_report_header import common_report_header
-import rml_parse
 
-class general_ledger(rml_parse.rml_parse, common_report_header):
+class general_ledger(report_sxw.rml_parse, common_report_header):
     _name = 'report.account.general.ledger'
 
     def set_context(self, objects, data, ids, report_type=None):
@@ -88,9 +86,20 @@ class general_ledger(rml_parse.rml_parse, common_report_header):
             'get_start_date':self._get_start_date,
             'get_end_date':self._get_end_date,
             'get_target_move': self._get_target_move,
+            'strip_name': self._strip_name,
         })
         self.context = context
 
+    def _ellipsis(self, orig_str, maxlen=100, ellipsis='...'):
+        maxlen = maxlen - len(ellipsis)
+        if maxlen <= 0:
+            maxlen = 1
+        new_str = orig_str[:maxlen]
+        return new_str
+
+    def _strip_name(self, name, maxlen=50):
+        return self._ellipsis(name, maxlen, ' ...')
+
     def _sum_currency_amount_account(self, account):
         self.cr.execute('SELECT sum(l.amount_currency) AS tot_currency \
                 FROM account_move_line l \
diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml
index 917ffa214d8..2a3bfda8e48 100644
--- a/addons/account/report/account_general_ledger.rml
+++ b/addons/account/report/account_general_ledger.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="General Ledger" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="General Ledger.pdf">
+  <template pageSize="(595.0,842.0)" title="General Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
       <pageGraphics>
@@ -177,6 +177,34 @@
   <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+  <blockTable colWidths="66.0,44.0,80.0,60.0,92.5,66.5,64.5,71.5" style="tbl_header">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]]
+        <tr>
+          <td><para style="date">Date</para></td>
+          <td><para style="P3b">Partner</para></td>
+          <td><para style="P3b">Ref</para></td>
+          <td><para style="P3b">Move</para></td>
+          <td><para style="P3b">Entry Label</para></td>
+          <td><para style="P9b">Debit</para></td>
+          <td><para style="P9b">Credit</para></td>
+          <td><para style="P9b">Balance</para></td>
+        </tr>
+     </blockTable>
+     <blockTable colWidths="70.0,40.0,60.0,55.0,89.0,58.0,58.0,58.0,58.0" style="tbl_header">[[ data['form']['amount_currency'] == True or removeParentNode('blockTable') ]]
+        <tr>
+          <td><para style="date">Date</para></td>
+          <td><para style="P3b">Partner</para></td>
+          <td><para style="P3b">Ref</para></td>
+          <td><para style="P3b">Move</para></td>
+          <td><para style="P3b">Entry Label</para></td>
+          <td><para style="P9b">Debit</para></td>
+          <td><para style="P9b">Credit</para></td>
+          <td><para style="P9b">Balance</para></td>
+          <td><para style="P9b">Currency</para></td>
+        </tr>
+     </blockTable>
+  </pto_header>
     <blockTable colWidths="539.0" style="Table_Company_Name">
       <tr>
         <td>
@@ -334,9 +362,10 @@
        <td><para style="P4">[[ formatLang(line['debit']) ]]</para></td>
        <td><para style="P4">[[ formatLang(line['credit']) ]]</para></td>
        <td><para style="P4">[[ formatLang(line['progress']) ]] [[ company.currency_id.symbol ]]</para></td>
-       <td><para style="P4"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[  formatLang(line['amount_currency'])]] [[  line['currency_code'] or '']]</font></para></td>
+	   <td><para style="P4"><font>[[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[  formatLang(line['amount_currency'])]] [[  line['currency_code'] or '']]</font></para></td>
      </tr>
   </blockTable>
   </section>
+  </pto>
   </story>
 </document>
diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml
index 75dc04c507b..430bde219e1 100644
--- a/addons/account/report/account_general_ledger_landscape.rml
+++ b/addons/account/report/account_general_ledger_landscape.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-   <template pageSize="(1120.5,767.8)" title="General Ledger" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20" >
+<document filename="General Ledger.pdf">
+   <template pageSize="(1120.5,767.8)" title="General Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20" >
     <pageTemplate id="first">
       <frame id="first" x1="22.0" y1="31.0" width="1080" height="680"/>
     </pageTemplate>
@@ -140,7 +140,7 @@
     </initialize>
     <paraStyle name="P1" fontName="Helvetica" fontSize="20.0" leading="25" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P2" fontName="Helvetica-Bold" fontSize="9.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="date" fontName="Helvetica-Bold" fontSize="9.0" leading="10" spaceBefore="0.0" spaceAfter="6.0" alignment="CENTER"/>
+    <paraStyle name="date" leftIndent="6.0" fontName="Helvetica-Bold" fontSize="9.0" leading="10" spaceBefore="6.0" spaceAfter="0.0" alignment="LEFT"/>
     <paraStyle name="P2_content" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="P3_center" fontName="Helvetica-Bold" fontSize="9.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -178,6 +178,38 @@
   <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+  <blockTable colWidths="66.0,35.0,120.0,90.0,60.0,200.0,180.0,73.0,73.0,73.0,85.00" style="tbl_header">[[data['form']['amount_currency'] == True or removeParentNode('blockTable')]]
+       <tr>
+          <td><para style="date">Date</para></td>
+          <td><para style="P2">JNRL</para></td>
+          <td><para style="P2">Partner</para></td>
+          <td><para style="P2">Ref</para></td>
+          <td><para style="P2">Move</para></td>
+          <td><para style="P3">Entry Label</para></td>
+          <td><para style="P3_center">Counterpart</para></td>
+          <td><para style="P4">Debit</para></td>
+          <td><para style="P4">Credit</para></td>
+          <td><para style="P4">Balance</para></td>
+          <td><para style="P4">Currency</para></td>
+       </tr>
+    </blockTable>
+    <blockTable colWidths="66.0,35.0,166.0,90.0,60.0,245.0,148.0,80.0,80.0,80.0" style="tbl_header">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+       <tr>
+          <td><para style="date">Date</para></td>
+          <td><para style="P2">JNRL</para></td>
+          <td><para style="P2">Partner</para></td>
+          <td><para style="P2">Ref</para></td>
+          <td><para style="P2">Move</para></td>
+          <td><para style="P3">Entry Label</para></td>
+          <td><para style="P3_center">Counterpart</para></td>
+          <td><para style="P4">Debit</para></td>
+          <td><para style="P4">Credit</para></td>
+          <td><para style="P4">Balance</para></td>
+       </tr>
+	</blockTable>
+  </pto_header>
     <blockTable colWidths="539.0" style="Table_Company_Name">
       <tr>
         <td>
@@ -295,16 +327,16 @@
 			<td><para style="P4_content">[[ formatLang(line['debit'], digits=get_digits(dp='Account')) ]]</para></td>
 			<td><para style="P4_content">[[ formatLang(line['credit'], digits=get_digits(dp='Account')) ]]</para></td>
 			<td><para style="P4_content">[[ formatLang(line['progress'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para></td>
-			<td><para style="P4_content"><font>[[ (line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[  formatLang(line['amount_currency'])]] [[  line['currency_code'] or '']]</font></para></td>
+			<td><para style="P4_content"><font>[[ (line.has_key('currency_id') and line['currency_id']==None or line['amount_currency']==None) and removeParentNode('font') ]] [[  formatLang(line['amount_currency'])]] [[  line['currency_code'] or '']]</font></para></td>
 		</tr>
 	  </blockTable>
 
 	</section>
 
-    <blockTable colWidths="66.0,35.0,166.0,90.0,60.0,280.0,148.0,69.0,72.0,64.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
+    <blockTable colWidths="66.0,35.0,166.0,90.0,60.0,245.0,148.0,80.0,80.0,80.0" style="tbl_header" repeatRows="1">[[ data['form']['amount_currency'] == False or removeParentNode('blockTable') ]]
        <tr>
-          <td><para style="P2">Date</para></td>
-          <td><para style="date">JNRL</para></td>
+          <td><para style="date">Date</para></td>
+          <td><para style="P2">JNRL</para></td>
           <td><para style="P2">Partner</para></td>
           <td><para style="P2">Ref</para></td>
           <td><para style="P2">Move</para></td>
@@ -320,10 +352,10 @@
 
 		<para>[[ repeatIn(get_children_accounts(a), 'o') ]]</para>
 
-		<blockTable colWidths="66.0,35.0,166.0,90.0,60.0,280.0,148.0,69.0,72.0,64.0" style="tbl_content">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]]
+		<blockTable colWidths="66.0,35.0,166.0,90.0,60.0,245.0,148.0,80.0,80.0,80.0" style="tbl_content">[[data['form']['amount_currency'] == False or removeParentNode('blockTable')]]
         	<tr>
          		<td>
-	      			<blockTable colWidths="405.0,435.0,69.0,72.0,63.0" style="Table5">
+	      			<blockTable colWidths="405.0,399.0,80.0,80.0,80.0" style="Table5">
 						<tr>
 			 	 			<td><para style="Standard"><font color="white">[[ '..'*(o.level-1) ]]</font>[[ o.code ]] [[ o.name ]]</para></td>
 			  				<td><para style="Standard"></para></td>
@@ -362,5 +394,6 @@
 	<para style="terp_default_8">
       <font color="white"> </font>
     </para>
+    </pto>
  </story>
 </document>
diff --git a/addons/account/report/account_journal.py b/addons/account/report/account_journal.py
index 2a699b20f84..82af01cdb0b 100644
--- a/addons/account/report/account_journal.py
+++ b/addons/account/report/account_journal.py
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import time
-
 from common_report_header import common_report_header
 from report import report_sxw
 
diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml
index ba343f389b9..cb37b4e83f5 100644
--- a/addons/account/report/account_journal.rml
+++ b/addons/account/report/account_journal.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="print_journal.pdf">
-  <template pageSize="(595.0,842.0)" title="Journal" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Journal.pdf">
+  <template pageSize="(595.0,842.0)" title="Journal" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
diff --git a/addons/account/report/account_partner_balance.rml b/addons/account/report/account_partner_balance.rml
index 19eef489507..6425d6a4db6 100644
--- a/addons/account/report/account_partner_balance.rml
+++ b/addons/account/report/account_partner_balance.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="partner_balance.pdf">
-  <template pageSize="(595.0,842.0)" title="Partner Balance" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Partner Balance.pdf">
+  <template pageSize="(595.0,842.0)" title="Partner Balance" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
     </pageTemplate>
@@ -227,7 +227,7 @@
       <font color="white"> </font>
     </para>
     <para style="P12a"></para>
-	 <blockTable colWidths="80.0,170.0,70.0,70.0,70.0,80.0" repeatRows="1" style="Table2">
+	 <blockTable colWidths="80.0,140.0,80.0,80.0,80.0,80.0" repeatRows="1" style="Table2">
       <tr>
         <td><para style="P12a">Code</para></td>
         <td><para style="P12a">(Account/Partner) Name</para></td>
diff --git a/addons/account/report/account_partner_ledger.py b/addons/account/report/account_partner_ledger.py
index 06475311bf3..e66c3a9d523 100644
--- a/addons/account/report/account_partner_ledger.py
+++ b/addons/account/report/account_partner_ledger.py
@@ -21,12 +21,10 @@
 
 import time
 import re
-
-import rml_parse
 from report import report_sxw
 from common_report_header import common_report_header
 
-class third_party_ledger(rml_parse.rml_parse, common_report_header):
+class third_party_ledger(report_sxw.rml_parse, common_report_header):
 
     def __init__(self, cr, uid, name, context=None):
         super(third_party_ledger, self).__init__(cr, uid, name, context=context)
diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml
index 139d9bb16cd..b3a8e9f7fdc 100644
--- a/addons/account/report/account_partner_ledger.rml
+++ b/addons/account/report/account_partner_ledger.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Partner Ledger" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Partner Ledger.pdf">
+  <template pageSize="(595.0,842.0)" title="Partner Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -175,6 +175,68 @@
   </stylesheet>
   <images/>
   <story>
+  <pto>
+  <pto_header>
+  <blockTable colWidths="55.0,28.0,60.0,81.0,125.0,57.0,58.0,80.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">JNRL</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Ref.</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Account</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Entry Label</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Debit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Credit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Balance</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="50.0,25.0,60.0,81.0,97.0,56.0,58.0,63.0,53.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">JNRL</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Ref.</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Account</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Entry Label</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Debit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Credit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Balance</para>
+        </td>
+         <td>
+          <para style="terp_tblheader_Details_Right">Currency</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
       <para style="terp_default_2">
       <font color="white"> </font>
     </para>
@@ -277,7 +339,7 @@
       <para style="P4">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="55.0,28.0,60.0,81.0,125.0,57.0,58.0,65.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable colWidths="55.0,28.0,60.0,81.0,125.0,57.0,58.0,80.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -311,20 +373,20 @@
     <para style="terp_default_2">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="349.0,57.0,58.0,65.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable colWidths="344.0,60.0,60.0,80.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
 
       <tr>
         <td>
           <para style="P2">[[ p.ref ]] - [[ p.name ]]</para>
         </td>
         <td>
-          <para style="P5">[[ formatLang((sum_debit_partner(p))) ]]</para>
+          <para style="P5"><u>[[ formatLang((sum_debit_partner(p))) ]]</u></para>
         </td>
         <td>
-          <para style="P5">[[ formatLang((sum_credit_partner(p))) ]] </para>
+          <para style="P5"><u>[[ formatLang((sum_credit_partner(p))) ]]</u></para>
         </td>
         <td>
-          <para style="P5">[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</para>
+          <para style="P5"><u>[[ formatLang((sum_debit_partner(p) - sum_credit_partner(p))) ]] [[ company.currency_id.symbol ]]</u></para>
         </td>
       </tr>
        <tr>
@@ -347,7 +409,7 @@
     </para>
     <section>
       <para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
-      <blockTable colWidths="55.0,28.0,60.0,81.0,125.0,57.0,58.0,65.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+      <blockTable colWidths="55.0,28.0,60.0,80.0,121.0,60.0,60.0,80.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
             <para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
@@ -499,5 +561,6 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
+    </pto>
   </story>
 </document>
diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml
index 644077eec84..c3315dde64d 100644
--- a/addons/account/report/account_partner_ledger_other.rml
+++ b/addons/account/report/account_partner_ledger_other.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Partner Ledger" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Partner Ledger.pdf">
+  <template pageSize="(595.0,842.0)" title="Partner Ledger" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -331,6 +331,68 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+  <blockTable colWidths="50.0,28.0,65.0,61.0,145.0,60.0,60.0,80.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">JNRL</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Ref.</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Account</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Entry Label</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Debit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Credit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Balance</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="50.0,28.0,65.0,65.0,112.0,53.0,53.0,60.0,53.0" style="Table4">[[ display_currency(data) == True or removeParentNode('blockTable') ]]
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Date</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">JNRL</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Ref.</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Account</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Entry Label</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Debit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Credit</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Balance</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Currency</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <blockTable colWidths="539.0" style="Table_header">
       <tr>
         <td>
@@ -432,7 +494,7 @@
                    <para style="P5">
             <font color="white"> </font>
           </para>
-    <blockTable colWidths="50.0,28.0,65.0,61.0,145.0,60.0,60.0,60.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable colWidths="50.0,28.0,65.0,61.0,145.0,60.0,60.0,80.0" style="Table_header_1">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
       <tr>
         <td>
           <para style="terp_tblheader_Details">Date</para>
@@ -462,7 +524,7 @@
     </blockTable>
   <section>
   <para style="P3">[[ repeatIn(objects, 'p') ]] [[ setLang(p.lang) ]]</para>
-    <blockTable colWidths="349.0,60.0,60.0,60.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+    <blockTable colWidths="349.0,60.0,60.0,80.0" style="Table2">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
 
       <tr>
         <td>
@@ -495,7 +557,7 @@
     </blockTable>
     <section>
       <para style="P1">[[ repeatIn(lines(p), 'line') ]]</para>
-      <blockTable colWidths="50.0,28.0,65.0,61.0,145.0,60.0,60.0,60.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
+      <blockTable colWidths="50.0,28.0,65.0,61.0,145.0,60.0,60.0,80.0" style="Table3">[[ display_currency(data) == False or removeParentNode('blockTable') ]]
         <tr>
           <td>
             <para style="P3">[[ formatLang(line['date'],date=True) ]]</para>
@@ -636,5 +698,6 @@
         <font color="white"> </font>
       </para>
     </section>
+    </pto>
   </story>
 </document>
diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index 87f3bb770ba..c6057627b32 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -194,7 +194,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="219.0,87.0,62.0,56.0,46.0,62.0" style="Table7">
+    <blockTable colWidths="202.0,87.0,71.0,57.0,42.0,71.0" style="Table7">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -218,7 +218,7 @@
     </blockTable>
     <section>
       <para style="terp_default_2">[[ repeatIn(o.invoice_line,'l') ]]</para>
-      <blockTable colWidths="218.0,88.0,62.0,55.0,46.0,62.0" style="Table8">
+      <blockTable colWidths="202.0,88.0,71.0,57.0,42.0,71.0" style="Table8">
         <tr>
           <td>
             <para style="terp_default_9">[[ l.name ]]</para>
@@ -271,7 +271,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="407.0,54.0,69.0" style="Table10">
+    <blockTable colWidths="391.0,54.0,85.0" style="Table10">
       <tr>
         <td>
           <para style="terp_default_8">
@@ -315,7 +315,7 @@
     <para style="Text body">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="206.0,51.0,49.0,225.0" style="Table9">
+    <blockTable colWidths="205.0,71.0,71.0,183.0" style="Table9">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Tax [[ o.tax_line==[] and removeParentNode('blockTable') ]]</para>
@@ -335,7 +335,7 @@
     </blockTable>
     <section>
       <para style="terp_default_2">[[ repeatIn(o.tax_line,'t') ]]</para>
-      <blockTable colWidths="205.0,52.0,49.0,224.0" style="Table2">
+      <blockTable colWidths="205.0,71.0,71.0,184.0" style="Table2">
         <tr>
           <td>
             <para style="terp_default_8">[[ t.name ]]</para>
diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml
index 81a9f072b51..61533a2966c 100644
--- a/addons/account/report/account_print_overdue.rml
+++ b/addons/account/report/account_print_overdue.rml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
+<document filename="Overdue Payments.pdf">
   <template pageSize="(595.0,842.0)" title="Overdue Payments" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="42.0" y1="28.0" width="511" height="786"/>
diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml
index 89cbc4f8502..c7c4a94bcd7 100644
--- a/addons/account/report/account_profit_horizontal.rml
+++ b/addons/account/report/account_profit_horizontal.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(1120.0,770.0)" title="Profit and Loss" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20" >
+<document filename="Profit and Loss.pdf">
+  <template pageSize="(1120.0,770.0)" title="Profit and Loss" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20" >
     <pageTemplate id="first">
       <frame id="first" x1="22.0" y1="15.0" width="1080" height="680"/>
     </pageTemplate>
diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py
index 0bfaea7a570..117f9e351fb 100644
--- a/addons/account/report/account_profit_loss.py
+++ b/addons/account/report/account_profit_loss.py
@@ -19,14 +19,12 @@
 ##############################################################################
 
 import time
-
 import pooler
-import rml_parse
 from report import report_sxw
 from common_report_header import common_report_header
 from tools.translate import _
 
-class report_pl_account_horizontal(rml_parse.rml_parse, common_report_header):
+class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header):
 
     def __init__(self, cr, uid, name, context=None):
         super(report_pl_account_horizontal, self).__init__(cr, uid, name, context=context)
diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml
index c371ab4c638..33e69d02e96 100644
--- a/addons/account/report/account_profit_loss.rml
+++ b/addons/account/report/account_profit_loss.rml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
+<document filename="Profit and Loss.pdf">
   <template pageSize="(595.0,842.0)" title="Profit and Loss" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
@@ -238,7 +238,7 @@
     <blockTable colWidths="426.0,113.0" style="Table_Net_Profit_Loss">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">Total:([[ get_currency(data) ]])</para>
+          <para style="terp_default_Bold_9">Total:</para>
         </td>
         <td>
           <para style="terp_default_Right_9_Bold"><u>[[ formatLang(abs(sum_dr())) ]] [[ company.currency_id.symbol ]]</u></para>
diff --git a/addons/account/report/account_tax_code.py b/addons/account/report/account_tax_code.py
index 42bbe305381..86d3128cfe7 100644
--- a/addons/account/report/account_tax_code.py
+++ b/addons/account/report/account_tax_code.py
@@ -21,8 +21,6 @@
 ##############################################################################
 
 import time
-
-import rml_parse
 from report import report_sxw
 
 def _get_country(record):
@@ -44,7 +42,7 @@ def _record_to_report_line(record):
             'country': _get_country(record)
             }
 
-class account_tax_code_report(rml_parse.rml_parse):
+class account_tax_code_report(report_sxw.rml_parse):
     def __init__(self, cr, uid, name, context):
         super(account_tax_code_report, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
diff --git a/addons/account/report/account_tax_code.rml b/addons/account/report/account_tax_code.rml
index 82297022fb4..7489ac72a39 100644
--- a/addons/account/report/account_tax_code.rml
+++ b/addons/account/report/account_tax_code.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Accounting Entries" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Accounting Entries.pdf">
+  <template pageSize="(595.0,842.0)" title="Accounting Entries" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="42.0" width="539" height="758"/>
     </pageTemplate>
diff --git a/addons/account/report/account_tax_report.py b/addons/account/report/account_tax_report.py
index 4361448790c..a3bdc1a75f6 100644
--- a/addons/account/report/account_tax_report.py
+++ b/addons/account/report/account_tax_report.py
@@ -21,11 +21,10 @@
 
 import time
 
-import rml_parse
 from common_report_header import common_report_header
 from report import report_sxw
 
-class tax_report(rml_parse.rml_parse, common_report_header):
+class tax_report(report_sxw.rml_parse, common_report_header):
     _name = 'report.account.vat.declaration'
 
     def set_context(self, objects, data, ids, report_type=None):
@@ -61,7 +60,6 @@ class tax_report(rml_parse.rml_parse, common_report_header):
             'get_basedon': self._get_basedon,
         })
 
-
     def _get_basedon(self, form):
         return form['form']['based_on']
 
diff --git a/addons/account/report/account_tax_report.rml b/addons/account/report/account_tax_report.rml
index 41790ea6f07..de4aa415fef 100644
--- a/addons/account/report/account_tax_report.rml
+++ b/addons/account/report/account_tax_report.rml
@@ -1,38 +1,11 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Taxes" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Taxes.pdf">
+   <template pageSize="(595.0,842.0)" title="Taxes" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="42.0" y1="62.0" width="511" height="728"/>
-			<pageGraphics>
-				<!--logo-->
-				<!--<fill color="darkblue"/>-->
-				<!--<stroke color="darkblue"/>-->
-
-				<!--TITLE COMPANY-->
-				<!-- <drawString x="4.6cm" y="28.7cm">[[ company.partner_id.name ]]</drawString> -->
-
-				<setFont name="Helvetica-Bold" size="9"/>
-
-
-				<!--COL 1-->
-				<drawString x="1.0cm" y="28.1cm">[[ company.name ]]</drawString>
-				<drawRightString x="20cm" y="28.1cm">Tax Report</drawRightString>
-
-
-				<setFont name="Helvetica" size="9"/>
-				<drawString x="1.0cm" y="1cm"> [[ formatLang(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()),date_time = True) ]]</drawString>
-				<drawString x="19.0cm" y="1cm">Page <pageNumber/></drawString>
-				<!--<drawRightString x="19.8cm" y="28cm">[[ company.rml_header1 ]]</drawRightString>-->
-
-
-			    <lineMode width="0.7"/>
-				<lines>1cm 27.7cm 20cm 27.7cm</lines>
-				<setFont name="Helvetica" size="8"/>
-			</pageGraphics>
-
     </pageTemplate>
   </template>
-  <stylesheet>
+    <stylesheet>
     <blockTableStyle id="Standard_Outline">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
diff --git a/addons/account/report/account_voucher_print.py b/addons/account/report/account_voucher_print.py
index a174a6ad680..912e0794a9c 100644
--- a/addons/account/report/account_voucher_print.py
+++ b/addons/account/report/account_voucher_print.py
@@ -21,7 +21,6 @@
 ##############################################################################
 
 import time
-
 from report import report_sxw
 from tools import amount_to_text_en
 
diff --git a/addons/account/report/rml_parse.py b/addons/account/report/rml_parse.py
deleted file mode 100644
index cf33d1c6ae0..00000000000
--- a/addons/account/report/rml_parse.py
+++ /dev/null
@@ -1,148 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import time
-
-import re
-import sys
-
-from report import report_sxw
-
-class rml_parse(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context):
-        super(rml_parse, self).__init__(cr, uid, name, context=context)
-        self.localcontext.update({
-            'comma_me': self.comma_me,
-            'format_date': self._get_and_change_date_format_for_swiss,
-            'strip_name': self._strip_name,
-            'explode_name': self._explode_name,
-        })
-
-    def comma_me(self,amount):
-        #print "#" + str(amount) + "#"
-        if not amount:
-            amount = 0.0
-        if  type(amount) is float:
-            amount = str('%.2f'%amount)
-        else:
-            amount = str(amount)
-        if (amount == '0'):
-             return ' '
-        orig = amount
-        new = re.sub("^(-?\d+)(\d{3})", "\g<1>'\g<2>", amount)
-        if orig == new:
-            return new
-        else:
-            return self.comma_me(new)
-    def _ellipsis(self, string, maxlen=100, ellipsis = '...'):
-        ellipsis = ellipsis or ''
-        try:
-            return string[:maxlen - len(ellipsis) ] + (ellipsis, '')[len(string) < maxlen]
-        except:
-            return False
-    def _strip_name(self, name, maxlen=50):
-        return self._ellipsis(name, maxlen, '...')
-
-    def _get_and_change_date_format_for_swiss(self,date_to_format):
-        date_formatted=''
-        if date_to_format:
-            date_formatted = strptime(date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y')
-        return date_formatted
-
-    def _explode_name(self,chaine,length):
-        # We will test if the size is less then account
-        full_string = ''
-        if (len(str(chaine)) <= length):
-            return chaine
-        #
-        else:
-            chaine = unicode(chaine,'utf8').encode('iso-8859-1')
-            rup = 0
-            for carac in chaine:
-                rup = rup + 1
-                if rup == length:
-                    full_string = full_string + '\n'
-                    full_string = full_string + carac
-                    rup = 0
-                else:
-                    full_string = full_string + carac
-
-        return full_string
-
-    def makeAscii(self,str):
-        try:
-            Stringer = str.encode("utf-8")
-        except UnicodeDecodeError:
-            try:
-                Stringer = str.encode("utf-16")
-            except UnicodeDecodeError:
-                print "UTF_16 Error"
-                Stringer = str
-            else:
-                return Stringer
-        else:
-            return Stringer
-        return Stringer
-    def explode_this(self,chaine,length):
-        chaine = chaine.rstrip()
-        ast = list(chaine)
-        i = length
-        while i <= len(ast):
-            ast.insert(i,'\n')
-            i = i + length
-        chaine = str("".join(ast))
-        return chaine
-    def repair_string(self, chaine):
-        ast = list(chaine)
-        UnicodeAst = []
-        i = 0
-        while i < len(ast):
-            elem = ast[i]
-            try:
-                elem.encode("utf-8")
-            except UnicodeDecodeError:
-                to_reencode = elem + ast[i+1]
-                print str(to_reencode)
-                Good_char = to_reencode.decode('utf-8')
-                UnicodeAst.append(Good_char)
-                i += i +2
-            else:
-                UnicodeAst.append(elem)
-                i += i + 1
-
-
-        return "".join(UnicodeAst)
-
-    def ReencodeAscii(self,str):
-        print sys.stdin.encoding
-        try:
-            Stringer = str.decode("ascii")
-        except UnicodeEncodeError:
-            print "REENCODING ERROR"
-            return str.encode("ascii")
-        except UnicodeDecodeError:
-            print "DECODING ERROR"
-            return str.encode("ascii")
-
-        else:
-            return Stringer
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml
index 9fcd976a235..0e0ddfb3e99 100644
--- a/addons/account/test/account_report.yml
+++ b/addons/account/test/account_report.yml
@@ -16,7 +16,7 @@
 -
   !python {model: account.invoice}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('test_invoice_1')], {}, {})
+    (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('account.account_invoice_customer0')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'account-invoice.'+format), 'wb+').write(data)
 
@@ -38,41 +38,6 @@
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'account-voucher-report.'+format), 'wb+').write(data)
 
--
-  Demo data for Account tax code
--
-  !record {model: account.tax.code, id: account_tax_code_0}:
-    name : Tax Code Test
-    sign : 10.00
--
- Print Tax Code entries report
--
-  !python {model: account.tax.code}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.account.tax.code.entries').create(cr, uid, [ref('account_tax_code_0')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'account-tax-code-entries.'+format), 'wb+').write(data)
-
-
--
-  Print Vat Declaration Report
--
-   !python {model: account.tax.code}: |
-    import netsvc, tools, os
-    data_dict = {'model': 'ir.ui.menu', 'form': {'based_on': 'invoices','company_id':ref('base.main_company'),'periods':[]}}
-    (data, format) = netsvc.LocalService('report.account.vat.declaration').create(cr, uid, [ref("account_move_0")], data_dict, {})
-    if tools.config['test_report_directory']:
-       file(os.path.join(tools.config['test_report_directory'], 'account-vat-declaration.'+format), 'wb+').write(data)
-
--
-  In order to test the PDF reports defined on an invoice, we will print an invoice
--
-  !python {model: account.invoice}: |
-    import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.account.invoice').create(cr, uid, [ref('test_invoice_1')], {}, {})
-    if tools.config['test_report_directory']:
-        file(os.path.join(tools.config['test_report_directory'], 'account-invoice.'+format), 'wb+').write(data)
-
 -
   Print the Aged Partner Balance Report
 -
diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py
index 43320836fd4..41dc6c130a8 100644
--- a/addons/account_accountant/__openerp__.py
+++ b/addons/account_accountant/__openerp__.py
@@ -33,7 +33,7 @@ items and the chart of accounts.
     'update_xml': [
         'security/account_security.xml',
     ],
-    'demo_xml': [],
+    'demo_xml': ['account_accountant_demo.xml'],
     'test': [],
     'installable': True,
     'active': False,
diff --git a/addons/account_accountant/account_accountant_demo.xml b/addons/account_accountant/account_accountant_demo.xml
new file mode 100644
index 00000000000..5944209e9b4
--- /dev/null
+++ b/addons/account_accountant/account_accountant_demo.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+		<record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[(4, ref('account.group_account_user'))]"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/account_accountant/i18n/el.po b/addons/account_accountant/i18n/el.po
new file mode 100644
index 00000000000..5c2aede7f77
--- /dev/null
+++ b/addons/account_accountant/i18n/el.po
@@ -0,0 +1,23 @@
+# Greek 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:46+0000\n"
+"PO-Revision-Date: 2010-11-13 12:58+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
+"Language-Team: Greek <el@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr "Λογιστής"
diff --git a/addons/account_accountant/i18n/fr.po b/addons/account_accountant/i18n/fr.po
new file mode 100644
index 00000000000..9d75731e366
--- /dev/null
+++ b/addons/account_accountant/i18n/fr.po
@@ -0,0 +1,23 @@
+# French 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:46+0000\n"
+"PO-Revision-Date: 2010-11-13 08:24+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr "Comptable"
diff --git a/addons/account_accountant/i18n/nl.po b/addons/account_accountant/i18n/nl.po
new file mode 100644
index 00000000000..5328d7d0c15
--- /dev/null
+++ b/addons/account_accountant/i18n/nl.po
@@ -0,0 +1,23 @@
+# Dutch 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:46+0000\n"
+"PO-Revision-Date: 2010-11-13 08:22+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Dutch <nl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr "Accountant"
diff --git a/addons/account_accountant/i18n/sr.po b/addons/account_accountant/i18n/sr.po
new file mode 100644
index 00000000000..013b73656d1
--- /dev/null
+++ b/addons/account_accountant/i18n/sr.po
@@ -0,0 +1,23 @@
+# Serbian 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:46+0000\n"
+"PO-Revision-Date: 2010-11-13 08:31+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_accountant
+#: model:ir.module.module,shortdesc:account_accountant.module_meta_information
+msgid "Accountant"
+msgstr "Knjigovodja"
diff --git a/addons/account_accountant/security/account_security.xml b/addons/account_accountant/security/account_security.xml
index df2291446c8..0d6006fd9b0 100644
--- a/addons/account_accountant/security/account_security.xml
+++ b/addons/account_accountant/security/account_security.xml
@@ -6,8 +6,5 @@
             <field name="groups_id" eval="[(4, ref('account.group_account_manager')),(4, ref('account.group_account_user'))]"/>
         </record>
 
-		<record id="base.user_demo" model="res.users">
-            <field name="groups_id" eval="[(4, ref('account.group_account_user'))]"/>
-        </record>
     </data>
 </openerp>
diff --git a/addons/account_analytic_default/i18n/el.po b/addons/account_analytic_default/i18n/el.po
index b6e790ca376..efbc2be2f0e 100644
--- a/addons/account_analytic_default/i18n/el.po
+++ b/addons/account_analytic_default/i18n/el.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-11-11 14:11+0000\n"
+"PO-Revision-Date: 2010-11-13 13:01+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -33,7 +33,7 @@ msgstr ""
 #. module: account_analytic_default
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Λάθος δεν μπορείς να δημιουργήσεις κενό Μενού."
 
 #. module: account_analytic_default
 #: help:account.analytic.default,partner_id:0
@@ -63,12 +63,12 @@ msgstr "Τρέχον"
 #. module: account_analytic_default
 #: view:account.analytic.default:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ομαδοποίηση Κατά..."
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_stop:0
 msgid "Default end date for this Analytical Account"
-msgstr ""
+msgstr "Προκαθορισμένη Ημερομηνία Λήξης γι' αυτόν τον Λογαριασμό Αναλυτικής"
 
 #. module: account_analytic_default
 #: constraint:ir.actions.act_window:0
@@ -96,12 +96,12 @@ msgstr ""
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_sale_order_line
 msgid "Sale Order Line"
-msgstr ""
+msgstr "Γραμμή Παραγγελίας Πώλησης"
 
 #. module: account_analytic_default
 #: help:account.analytic.default,date_start:0
 msgid "Default start date for this Analytical Account"
-msgstr ""
+msgstr "Προκαθορισμένη ημερομηνία έναρξης γι' αυτόν το Λογαριασμό Αναλυτικής"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
diff --git a/addons/account_analytic_default/i18n/nl.po b/addons/account_analytic_default/i18n/nl.po
index 7fa24198a17..13fca0d5d28 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-28 14:30+0000\n"
-"Last-Translator: Sam_inv <Unknown>\n"
+"PO-Revision-Date: 2010-11-13 08:34+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_default
@@ -40,6 +40,9 @@ msgid ""
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "partner, it will automatically take this as an analytical account)"
 msgstr ""
+"selecteer een relatie die een kostenplaats gebruikt in standaard "
+"kostenplaats (bijv. maak nieuw factuur of verkooporder; als we deze relatie "
+"selecteren, wordt dit als kostenplaats gebruikt)"
 
 #. module: account_analytic_default
 #: model:ir.actions.act_window,name:account_analytic_default.analytic_rule_action_partner
@@ -90,6 +93,9 @@ msgid ""
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "company, it will automatically take this as an analytical account)"
 msgstr ""
+"selecteer een bedrijf die een kostenplaats gebruikt in standaard "
+"kostenplaats (bijv. maak nieuw factuur of verkooporder; als we dit bedrijf "
+"selecteren, wordt dit als kostenplaats gebruikt)"
 
 #. module: account_analytic_default
 #: model:ir.model,name:account_analytic_default.model_sale_order_line
@@ -144,6 +150,7 @@ msgstr "Ongeldige XML, kan overzicht niet weergeven!"
 msgid ""
 "select a user which will use analytical account specified in analytic default"
 msgstr ""
+"selecteer een gebruiker die kostenplaats gebruikt in standaard kostenplaats"
 
 #. module: account_analytic_default
 #: view:account.analytic.default:0
@@ -159,6 +166,9 @@ msgid ""
 "default (eg. create new cutomer invoice or Sale order if we select this "
 "product, it will automatically take this as an analytical account)"
 msgstr ""
+"selecteer een product die een kostenplaats gebruikt in standaard "
+"kostenplaats (bijv. maak nieuw factuur of verkooporder; als we dit product "
+"selecteren, wordt dit als kostenplaats gebruikt)"
 
 #. module: account_analytic_default
 #: field:account.analytic.default,sequence:0
diff --git a/addons/account_analytic_plans/i18n/el.po b/addons/account_analytic_plans/i18n/el.po
index 24680d58046..d246952bff9 100644
--- a/addons/account_analytic_plans/i18n/el.po
+++ b/addons/account_analytic_plans/i18n/el.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-08-02 20:53+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-11-13 13:27+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
@@ -25,7 +25,7 @@ msgstr "Account4 Id"
 #. module: account_analytic_plans
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Λάθος ! Δεν μπορείς να δημιουργήσεις κενό Μενού"
 
 #. module: account_analytic_plans
 #: constraint:ir.model:0
@@ -78,6 +78,8 @@ msgstr "Πλάνο Αναλυτικής"
 msgid ""
 "This distribution model has been saved.You will be able to reuse it later."
 msgstr ""
+"Το μοντέλο διανομής έχει αποθηκευτεί. Μπορείτε να το χρησιμοποιήσεται "
+"αργότερα"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/wizard/analytic_plan_create_model.py:0
@@ -149,7 +151,7 @@ msgstr "Ποσοστό"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_sale_order_line
 msgid "Sale Order Line"
-msgstr ""
+msgstr "Γραμμή Παραγγελίας Πώλησης"
 
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,empty_line:0
@@ -159,7 +161,7 @@ msgstr "Απόκρυψη κενών γραμμών"
 #. module: account_analytic_plans
 #: model:ir.actions.act_window,name:account_analytic_plans.action_analytic_plan_create_model
 msgid "analytic.plan.create.model.action"
-msgstr ""
+msgstr "αναλυτικό.πλάνο.δημιουργία.ενέργεια"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:0
@@ -182,7 +184,7 @@ msgstr "100.00%"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Currency"
-msgstr ""
+msgstr "Νόμισμα"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -239,12 +241,12 @@ msgstr "Σφάλμα Χρήστη"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Στοιχεία Ημερολογίου"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
 msgid "analytic.plan.create.model"
-msgstr ""
+msgstr "αναλυτικό.πλάνο.δημιουργία.μοντέλο"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account1_ids:0
@@ -286,7 +288,7 @@ msgstr "Μοντέλα Διανομής"
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid "Ok"
-msgstr ""
+msgstr "ΟΚ"
 
 #. module: account_analytic_plans
 #: model:ir.module.module,shortdesc:account_analytic_plans.module_meta_information
@@ -317,12 +319,12 @@ msgstr "Account2 Id"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:0
 #, python-format
 msgid "The Total Should be Between %s and %s"
-msgstr ""
+msgstr "Το Σύνολο θα πρέπει να είναι Μεταξύ %s και %s"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Γραμμή Εξτρέ"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -376,11 +378,48 @@ msgid ""
 "of distribution models.\n"
 "        "
 msgstr ""
+"Αυτό το πρόσθετο επιτρέπει τη χρήση πολλών αναλυτικών προγραμμάτων, σύμφωνα "
+"με το γενικό ημερολόγιο,\n"
+"έτσι ώστε να δημιουργηθούν πολλές αναλυτικές γραμμές όταν το τιμολόγιο ή οι "
+"καταχωρήσεις\n"
+"επιβεβαιώνονται.\n"
+"\n"
+"Για παράδειγμα, μπορείτε να ορίσετε την ακόλουθη αναλυτική δομή:\n"
+"  Έργα\n"
+"      Έργο1\n"
+"          Υποέργο 1,1\n"
+"          Υποέργο 1,2\n"
+"      Έργο 2\n"
+"  Πωλητής\n"
+"      Eric\n"
+"      Fabien\n"
+"\n"
+"Εδώ, έχουμε δύο σχέδια: Έργα και Πωλητής. Μια γραμμή τιμολογίου πρέπει\n"
+"να είναι σε θέση να γράψει αναλυτικά τις εγγραφές στο 2 σχέδια: Υποέργο 1,1 "
+"και\n"
+"Fabien. Το ποσό αυτό μπορεί επίσης να διαιρεθεί. Το ακόλουθο παράδειγμα "
+"είναι για\n"
+"ένα τιμολόγιο που αγγίζει τα δύο υποπρογράμματα και να ανατίθενται σε έναν "
+"πωλητή:\n"
+"\n"
+"Πλάνο1:\n"
+"    Υποέργο 1.1: 50%\n"
+"    Υποέργο 1.2: 50%\n"
+"Πλάνο2:\n"
+"    Eric: 100%\n"
+"\n"
+"Έτσι, όταν αυτή η γραμμή του τιμολογίου  επιβεβαιωθεί, δημιουργήσει 3 "
+"αναλυτικές γραμμές,\n"
+"για μία καταχώρηση λογαριασμόυ.\n"
+"Το αναλυτικό πλάνο επικυρώνει το ελάχιστο και το μέγιστο ποσοστό που κατά τη "
+"στιγμή της δημιουργίας\n"
+"των μοντέλων διανομής.\n"
+"        "
 
 #. module: account_analytic_plans
 #: view:analytic.plan.create.model:0
 msgid "Save This Distribution as a Model"
-msgstr ""
+msgstr "Αποθήκευση αυτής της Διανομής ως Μοντέλο"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
@@ -390,7 +429,7 @@ msgstr "Ποσότητα"
 #. module: account_analytic_plans
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
 msgid "Multi Plans"
-msgstr ""
+msgstr "ΠολυΠλάνα"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account_ids:0
@@ -405,19 +444,19 @@ msgstr "Κωδικός"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_journal
 msgid "Journal"
-msgstr ""
+msgstr "Ημερολόγιο"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:0
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr ""
+msgstr "Πρέπει να ορίσετε το αναλυτικό ημερολόγιο για το '%s' ημερολόγιο!"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:0
 #, python-format
 msgid "No Analytic Journal !"
-msgstr ""
+msgstr "Όχι Αναλυτικό Ημερολόγιο"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,sequence:0
@@ -427,12 +466,12 @@ msgstr "Αλληλουχία"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Γραμμή Τιμολογίου"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Εξτρέ"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance.line,analytic_account_id:0
@@ -464,12 +503,12 @@ msgstr "Κύριος λογαριασμός για αυτό το πλάνο."
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,ref:0
 msgid "Analytic Account Reference"
-msgstr ""
+msgstr "Αναφορά Λογαριασμού Αναλυτικής"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Τιμολόγιο"
 
 #. module: account_analytic_plans
 #: view:account.crossovered.analytic:0
@@ -490,7 +529,7 @@ msgstr "σε"
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
 msgid "Company"
-msgstr ""
+msgstr "Εταιρία"
 
 #. module: account_analytic_plans
 #: report:account.analytic.account.crossovered.analytic:0
diff --git a/addons/account_analytic_plans/i18n/nl.po b/addons/account_analytic_plans/i18n/nl.po
index 6be678ddfde..1e06f045dad 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-28 18:34+0000\n"
-"Last-Translator: Sam_inv <Unknown>\n"
+"PO-Revision-Date: 2010-11-13 08:43+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:32+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_analytic_plans
@@ -237,7 +237,7 @@ msgstr "Gebruikersfout"
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Dagboekregels"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_analytic_plan_create_model
@@ -388,7 +388,7 @@ msgstr "Aantal"
 #. module: account_analytic_plans
 #: model:ir.ui.menu,name:account_analytic_plans.menu_account_analytic_multi_plan_action
 msgid "Multi Plans"
-msgstr ""
+msgstr "Meerdere schemas"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.instance,account_ids:0
@@ -409,13 +409,13 @@ msgstr "Dagboek"
 #: code:addons/account_analytic_plans/account_analytic_plans.py:0
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr "U moet een een analytisch dagboek definieren op het '%s' dagboek!"
+msgstr "U moet een een kostenplaatsdagboek definiëren bij het '%s' dagboek!"
 
 #. module: account_analytic_plans
 #: code:addons/account_analytic_plans/account_analytic_plans.py:0
 #, python-format
 msgid "No Analytic Journal !"
-msgstr "Geen analytisch dagboek !"
+msgstr "Geen kostenplaatsdagboek !"
 
 #. module: account_analytic_plans
 #: field:account.analytic.plan.line,sequence:0
@@ -462,7 +462,7 @@ msgstr "Hoofdrekening van dit schema."
 #. module: account_analytic_plans
 #: field:account.crossovered.analytic,ref:0
 msgid "Analytic Account Reference"
-msgstr ""
+msgstr "Kostenplaats referentie"
 
 #. module: account_analytic_plans
 #: model:ir.model,name:account_analytic_plans.model_account_invoice
diff --git a/addons/account_analytic_plans/report/crossovered_analytic.rml b/addons/account_analytic_plans/report/crossovered_analytic.rml
index 1abde7093b8..0292522206d 100644
--- a/addons/account_analytic_plans/report/crossovered_analytic.rml
+++ b/addons/account_analytic_plans/report/crossovered_analytic.rml
@@ -133,6 +133,28 @@
     <images/>
   </stylesheet>
   <story>
+  <pto>
+  <pto_header>
+  <blockTable colWidths="292.0,63.0,57.0,71.0,57.0" repeatRows="1" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Account Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Code</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Quantity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Amount</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Percentage</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
@@ -277,5 +299,6 @@
         <font color="white"> </font>
       </para>
     </section>
+    </pto>
   </story>
 </document>
\ No newline at end of file
diff --git a/addons/account_anglo_saxon/i18n/el.po b/addons/account_anglo_saxon/i18n/el.po
index e2f710075d8..90b19e97586 100644
--- a/addons/account_anglo_saxon/i18n/el.po
+++ b/addons/account_anglo_saxon/i18n/el.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-08-02 20:57+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-11-13 08:21+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_anglo_saxon
@@ -25,28 +25,30 @@ msgstr "Λανθασμένο XML για αρχιτεκτονική όψης!"
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
 msgid "Product Category"
-msgstr ""
+msgstr "Κατηγορία Προϊόντος"
 
 #. module: account_anglo_saxon
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Το όνομα του Αντικειμένου πρέπει να ξεκινά με _x και να μην περιέχει "
+"ειδικούς χαρακτήρες !"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Γραμμή Τιμολογίου"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_purchase_order
 msgid "Purchase Order"
-msgstr ""
+msgstr "Παραγγελία Αγοράς"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Πρότυπο Προϊόντος"
 
 #. module: account_anglo_saxon
 #: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
@@ -62,7 +64,7 @@ msgstr "Λογαριασμός διαφοράς τιμής"
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Τιμολόγιο"
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_stock_picking
diff --git a/addons/account_budget/i18n/el.po b/addons/account_budget/i18n/el.po
index 3b6db9aea97..ec524fa0831 100644
--- a/addons/account_budget/i18n/el.po
+++ b/addons/account_budget/i18n/el.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-08-02 21:02+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-11-13 08:28+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:47+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
@@ -57,7 +57,7 @@ msgstr "Επικυρωμένος Χρήστης"
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.action_account_budget_crossvered_summary_report
 msgid "Print Summary"
-msgstr ""
+msgstr "Περίληψη Εκτύπωσης"
 
 #. module: account_budget
 #: field:crossovered.budget.lines,paid_date:0
@@ -87,7 +87,7 @@ msgstr "στο"
 #. module: account_budget
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Λάθος!Δεν μπορείς να δημιουργήσεις κενό Μενού"
 
 #. module: account_budget
 #: report:account.budget:0
@@ -126,7 +126,7 @@ msgstr "Κατάσταση"
 #. module: account_budget
 #: view:account.budget.crossvered.summary.report:0
 msgid "This wizard is used to print summary of budgets"
-msgstr ""
+msgstr "Αυτός ο οδηγός χρησιμοποιείται για την περίληψη των προϊπολογισμών"
 
 #. module: account_budget
 #: report:crossovered.budget.report:0
@@ -144,7 +144,7 @@ msgstr "Περιγραφή"
 #: field:crossovered.budget,company_id:0
 #: field:crossovered.budget.lines,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Εταιρία"
 
 #. module: account_budget
 #: view:crossovered.budget:0
@@ -216,7 +216,7 @@ msgstr "Όνομα"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_crossovered_budget_lines
 msgid "Budget Line"
-msgstr ""
+msgstr "Γραμμή Προϋπολογισμού"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -250,7 +250,7 @@ msgstr "Κωδικας"
 #: view:account.budget.analytic:0
 #: view:account.budget.crossvered.report:0
 msgid "This wizard is used to print budget"
-msgstr ""
+msgstr "Αυτός ο οδηγός χρησιμοποιείται για την εκτύπωση του προϋπολογισμού"
 
 #. module: account_budget
 #: model:ir.actions.act_window,name:account_budget.act_crossovered_budget_view
@@ -268,7 +268,7 @@ msgstr "Προϋπολογισμοί"
 #: code:addons/account_budget/account_budget.py:0
 #, python-format
 msgid "The General Budget '%s' has no Accounts!"
-msgstr ""
+msgstr "Ο Γενικός Προϋπολογισμός '%s' δεν έχει Λογαριασμούς"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
@@ -278,12 +278,12 @@ msgstr "Ακυρωμένο"
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "Approve"
-msgstr ""
+msgstr "Εγκρίνω"
 
 #. module: account_budget
 #: view:crossovered.budget:0
 msgid "To Approve"
-msgstr ""
+msgstr "Προς Έγκριση"
 
 #. module: account_budget
 #: view:account.budget.post:0
diff --git a/addons/account_budget/i18n/nl.po b/addons/account_budget/i18n/nl.po
index 517e44d48d1..de3d4574432 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-28 18:35+0000\n"
-"Last-Translator: Sam_inv <Unknown>\n"
+"PO-Revision-Date: 2010-11-13 08:33+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:47+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_budget
@@ -172,7 +172,7 @@ msgstr "Verwerkt"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Practical Amt"
-msgstr ""
+msgstr "Werkelijk bedrag"
 
 #. module: account_budget
 #: view:account.budget.post:0
@@ -214,7 +214,7 @@ msgstr "Naam"
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_crossovered_budget_lines
 msgid "Budget Line"
-msgstr ""
+msgstr "Budgetregel"
 
 #. module: account_budget
 #: view:account.analytic.account:0
@@ -314,7 +314,7 @@ msgstr ""
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Theoretical Amt"
-msgstr ""
+msgstr "Theoretisch bedrag"
 
 #. module: account_budget
 #: constraint:ir.rule:0
@@ -382,7 +382,7 @@ msgstr "Budget :"
 #: report:account.budget:0
 #: report:crossovered.budget.report:0
 msgid "Planned Amt"
-msgstr ""
+msgstr "Gepland bedrag"
 
 #. module: account_budget
 #: view:account.budget.post:0
diff --git a/addons/account_budget/report/analytic_account_budget_report.rml b/addons/account_budget/report/analytic_account_budget_report.rml
index 10b54482ae7..a8b957f52a5 100644
--- a/addons/account_budget/report/analytic_account_budget_report.rml
+++ b/addons/account_budget/report/analytic_account_budget_report.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <document filename="Analytic Budget.pdf">
-  <template pageSize="(595.0,842.0)" title="Analytic Budget" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+  <template pageSize="(595.0,842.0)" title="Analytic Budget" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="35.0" y1="25.0" width="528" height="793"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -10,30 +10,41 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
-    </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#cccccc" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table8">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table4">
@@ -69,7 +80,7 @@
     <paraStyle name="Index" fontName="Helvetica"/>
     <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -78,7 +89,7 @@
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -87,86 +98,111 @@
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_right_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <images/>
   </stylesheet>
   <story>
-    <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
-    <blockTable colWidths="482.0" style="Table2">
-      <tr>
-        <td>
-          <para style="terp_header_Centre">Analytic Budget</para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="241.0,241.0" style="Table1">
-      <tr>
-        <td>
-          <para style="terp_default_8"><font face="Helvetica-Bold">Currency:</font> [[ company.currency_id.name ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Right_8"><b>Printed at:</b> [[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]] at [[ time.strftime('%H:%M:%S')]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="terp_default_8"><font face="Helvetica-Bold">Analysis from</font> [[ formatLang(data['form']['date_from'],date=True) ]] to [[ formatLang(data['form']['date_to'],date=True) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Bold_right_9">Analytic Account : <font color="blue">[[ o.name ]]</font></para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="209.0,77.0,78.0,80.0,54.0" style="Table3">
+  <pto>
+  <pto_header>
+  <blockTable colWidths="221.0,82.0,83.0,85.0,57.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Theoretical Amt </para>
+          <para style="terp_tblheader_Details_Centre">Theoretical Amt</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Planned Amt</para>
+          <para style="terp_tblheader_Details_Centre">Planned Amt</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Practical Amt</para>
+          <para style="terp_tblheader_Details_Centre">Practical Amt</para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Right">Perc(%)</para>
+          <para style="terp_tblheader_Details_Centre">Perc(%)</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
+    <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
+    <para style="terp_header_Centre">Analytic Budget</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="206.0,223.0,99.0" style="Table1">
+      <tr>
+        <td>
+          <para style="terp_tblheader_General_Centre">Analysis from</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Analytic Account</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Currency</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="206.0,223.0,99.0" style="Table8">
+      <tr>
+        <td>
+          <para style="terp_default_Centre_8">[[ formatLang(data['form']['date_from'],date=True) ]] to [[ formatLang(data['form']['date_to'],date=True) ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ o.name ]]</para>
+        </td>
+        <td>
+          <para style="terp_default_Centre_8">[[ company.currency_id.name ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="221.0,82.0,83.0,85.0,57.0" style="Table3">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">Description</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Theoretical Amt</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Planned Amt</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Practical Amt</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Perc(%)</para>
         </td>
       </tr>
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(funct(o,data['form']),'a') ]]</para>
-      <blockTable colWidths="201.0,75.0,76.0,77.0,52.0" style="Table4">
+      <blockTable colWidths="221.0,82.0,83.0,85.0,57.0" style="Table4">
         <tr>
           <td>
-            <para style="terp_default_9"><font color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica"> [[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ a['name'] ]]</para>
+            <para style="terp_default_9"><font face="Helvetica" size="9.0" color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica" size="8.0"> [[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ a['name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo']) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo']) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ formatLang(a['pln']) ]]</font> [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['pln']) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ formatLang(a['prac']) ]]</font> [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['prac']) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] [[ formatLang(a['perc']) ]]</font>%</para>
+            <para style="terp_default_Centre_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['perc']) ]]%</para>
           </td>
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="202.0,75.0,75.0,78.0,52.0" style="Table5">
+    <blockTable colWidths="221.0,82.0,83.0,85.0,57.0" style="Table5">
       <tr>
         <td>
-          <para style="terp_default_Bold_9">[[ repeatIn(funct_total(data['form']),'b') ]] Total:</para>
+          <para style="terp_tblheader_Details">[[ repeatIn(funct_total(data['form']),'b') ]] Total:</para>
         </td>
         <td>
           <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_theo']) ]] [[ company.currency_id.symbol ]]</para>
@@ -178,12 +214,13 @@
           <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_prac']) ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_perc']) ]]%</para>
+          <para style="terp_tblheader_Details_Centre">[[ formatLang(b['tot_perc']) ]]%</para>
         </td>
       </tr>
     </blockTable>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
+    </pto>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/account_budget/report/crossovered_budget_report.rml b/addons/account_budget/report/crossovered_budget_report.rml
index 0533042822a..ef45c1bd2a6 100644
--- a/addons/account_budget/report/crossovered_budget_report.rml
+++ b/addons/account_budget/report/crossovered_budget_report.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<document filename="Budgets.pdf">
-  <template pageSize="(595.0,842.0)" title="Budgets" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Budget.pdf">
+  <template pageSize="(595.0,842.0)" title="Budget" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="57.0" y1="57.0" width="481" height="728"/>
+      <frame id="first" x1="28.0" y1="33.0" width="535" height="778"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -10,28 +10,41 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
+    <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
+      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table4">
@@ -67,16 +80,16 @@
     <paraStyle name="Index" fontName="Helvetica"/>
     <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
@@ -90,38 +103,40 @@
   </stylesheet>
   <story>
     <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
-    <blockTable colWidths="482.0" style="Table2">
+    <para style="terp_header_Centre">Budget</para>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="198.0,252.0,85.0" style="Table6">
       <tr>
         <td>
-          <para style="terp_header_Centre">Budget</para>
+          <para style="terp_tblheader_General_Centre">Analysis from</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Budget</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">Currency</para>
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="241.0,241.0" style="Table1">
+    <blockTable colWidths="198.0,252.0,85.0" style="Table7">
       <tr>
         <td>
-          <para style="terp_default_9"><font face="Helvetica-Bold">Currency: </font>[[ company.currency_id.name ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(data['form']['date_from'],date=True) ]] to [[ formatLang(data['form']['date_to'],date=True) ]]</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">Printed at: [[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]] at [[ time.strftime('%H:%M:%S')]]</para>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <para style="terp_default_9"><font face="Helvetica-Bold">Analysis from</font> [[ formatLang(data['form']['date_from'],date=True) ]] to [[ formatLang(data['form']['date_to'],date=True) ]]</para>
+          <para style="terp_default_Centre_8">[[ o.name ]]</para>
         </td>
         <td>
-          <para style="terp_default_Bold_right_9">Budget : <font color="Blue">[[ o.name ]]</font></para>
+          <para style="terp_default_Centre_8">[[ company.currency_id.name ]]</para>
         </td>
       </tr>
     </blockTable>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="191.0,82.0,81.0,83.0,62.0" style="Table3">
+    <blockTable colWidths="205.0,88.0,87.0,89.0,67.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -136,36 +151,36 @@
           <para style="terp_tblheader_Details_Right">Practical Amt</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Right">Perc(%)</para>
+          <para style="terp_tblheader_Details_Centre">Perc(%)</para>
         </td>
       </tr>
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(funct(o,data['form']),'a') ]]</para>
-      <blockTable colWidths="185.0,79.0,78.0,81.0,59.0" style="Table4">
+      <blockTable colWidths="205.0,88.0,87.0,90.0,66.0" style="Table4">
         <tr>
           <td>
-            <para style="terp_default_9"><font color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica">[[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ a['name'] ]]</para>
+            <para style="terp_default_9"><font face="Helvetica" size="10.0" color="white">[['.....' *(a['status']-1) ]]</font><font face="Helvetica" size="8.0">[[ (a['status']==1 and (setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ a['name'] ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['theo'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['pln'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['pln'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['prac'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['prac'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]] </font>[[ formatLang(a['perc'], digits=2) ]]%</para>
+            <para style="terp_default_Centre_9"><font face="Helvetica" size="8.0">[[ (a['status']==1 and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font> [[ formatLang(a['perc'],digits=2) ]]%</para>
           </td>
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="185.0,82.0,80.0,81.0,60.0" style="Table5">
+    <blockTable colWidths="203.0,90.0,88.0,89.0,66.0" style="Table5">
       <tr>
         <td>
-          <para style="terp_default_Bold_9"><font face="Helvetica">[[ repeatIn(funct_total(data['form']),'b') ]]</font>Total:</para>
+          <para style="terp_tblheader_Details">[[ repeatIn(funct_total(data['form']),'b') ]] Total :</para>
         </td>
         <td>
           <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_theo'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
@@ -177,7 +192,7 @@
           <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_prac'], digits=get_digits(dp='Account')) ]] [[ company.currency_id.symbol ]]</para>
         </td>
         <td>
-          <para style="terp_default_Bold_right_9">[[ formatLang(b['tot_perc'], digits=2) ]]%</para>
+          <para style="terp_tblheader_Details_Centre">[[ formatLang(b['tot_perc'],digits=2) ]]%</para>
         </td>
       </tr>
     </blockTable>
@@ -185,4 +200,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/account_cancel/i18n/el.po b/addons/account_cancel/i18n/el.po
index ec6998f9139..96c8edd01c4 100644
--- a/addons/account_cancel/i18n/el.po
+++ b/addons/account_cancel/i18n/el.po
@@ -8,19 +8,19 @@ 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-11-10 08:42+0000\n"
+"PO-Revision-Date: 2010-11-13 16:05+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-11 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_cancel
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Μη έγκυρο  ΧML για Προβολή Αρχιτεκτονικής!"
 
 #. module: account_cancel
 #: model:ir.module.module,shortdesc:account_cancel.module_meta_information
diff --git a/addons/account_coda/i18n/el.po b/addons/account_coda/i18n/el.po
index 6925d43a976..3ca9129945f 100644
--- a/addons/account_coda/i18n/el.po
+++ b/addons/account_coda/i18n/el.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-08-02 21:26+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-11-13 16:25+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
@@ -49,12 +49,12 @@ msgstr "Αρχείο Coda"
 #. module: account_coda
 #: view:account.coda:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ομαδοποίηση Κατά..."
 
 #. module: account_coda
 #: field:account.coda.import,awaiting_account:0
 msgid "Default Account for Unrecognized Movement"
-msgstr ""
+msgstr "Προεπιλεγμένος Λογαριασμός για μη Αναγνωρίσιμη Κίνηση"
 
 #. module: account_coda
 #: help:account.coda,date:0
@@ -64,7 +64,7 @@ msgstr "Εισαγωγή ημερομηνίας"
 #. module: account_coda
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Λάθος ! Δεν μπορείς να δημιουργήσεις κενό Μενού"
 
 #. module: account_coda
 #: field:account.coda,note:0
@@ -74,7 +74,7 @@ msgstr "Εισαγωγή ιστορικού καταγραφής"
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Import"
-msgstr ""
+msgstr "Εισαγωγή"
 
 #. module: account_coda
 #: view:account.coda:0
@@ -98,7 +98,7 @@ msgstr ""
 #: view:account.coda:0
 #: field:account.coda,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Εταιρία"
 
 #. module: account_coda
 #: help:account.coda.import,def_payable:0
@@ -106,6 +106,8 @@ msgid ""
 "Set here the payable account that will be used, by default, if the partner "
 "is not found"
 msgstr ""
+"Σημειώστε εδώ τον προεπιλεγμένο λογαριασμό πληρωμής που θα χρησιμοποιηθεί , "
+"εάν δεν βρεθεί ο συνεργάτης"
 
 #. module: account_coda
 #: view:account.coda:0
@@ -122,7 +124,7 @@ msgstr "Χρήστης"
 #: view:account.coda:0
 #: field:account.coda,date:0
 msgid "Date"
-msgstr ""
+msgstr "Ημερομηνία"
 
 #. module: account_coda
 #: model:ir.ui.menu,name:account_coda.menu_account_coda_statement
@@ -152,7 +154,7 @@ msgstr ""
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Cancel"
-msgstr ""
+msgstr "Άκυρο"
 
 #. module: account_coda
 #: view:account.coda.import:0
@@ -222,12 +224,12 @@ msgstr ""
 #: code:addons/account_coda/wizard/account_coda_import.py:0
 #, python-format
 msgid "Result"
-msgstr ""
+msgstr "Αποτέλεσμα"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Click on 'New' to select your file :"
-msgstr ""
+msgstr "Κάντε κλικ στο 'Νέο' για επιλογή αρχείου:"
 
 #. module: account_coda
 #: field:account.coda.import,def_receivable:0
@@ -237,7 +239,7 @@ msgstr ""
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Close"
-msgstr ""
+msgstr "Κλείσιμο"
 
 #. module: account_coda
 #: field:account.coda,statement_ids:0
@@ -252,7 +254,7 @@ msgstr ""
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Configure Your Journal and Account :"
-msgstr ""
+msgstr "Παραμετροποίησε το Ημερολόγιο και τον Λογαριασμό"
 
 #. module: account_coda
 #: view:account.coda:0
@@ -263,13 +265,13 @@ msgstr ""
 #: code:addons/account_coda/wizard/account_coda_import.py:0
 #, python-format
 msgid "The bank account %s is not defined for the partner %s.\n"
-msgstr ""
+msgstr "Ο λογαριασμός τραπέζης %s δεν έχει οριστεί για τον συνεργάτη %s.\n"
 
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Ημερολόγιο"
 
 #~ msgid "Clic on 'New' to select your file :"
 #~ msgstr "Πατήστε \"Νέο\" για να επιλέξετε το αρχείο σας"
diff --git a/addons/account_coda/i18n/nl.po b/addons/account_coda/i18n/nl.po
index 1a9dd0c54fe..05adee58502 100644
--- a/addons/account_coda/i18n/nl.po
+++ b/addons/account_coda/i18n/nl.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-11-11 08:38+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-11-12 09:04+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
diff --git a/addons/account_coda/i18n/sr.po b/addons/account_coda/i18n/sr.po
index 0bf1414560a..f3e0e45f0b2 100644
--- a/addons/account_coda/i18n/sr.po
+++ b/addons/account_coda/i18n/sr.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-15 08:49+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-11-13 21:47+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:52+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_coda
@@ -38,7 +38,7 @@ msgstr "Pogrešno ime modela u definiciji akcije."
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_coda_import
 msgid "Account Coda Import"
-msgstr ""
+msgstr "Uvezi Nalog Coda"
 
 #. module: account_coda
 #: field:account.coda,name:0
@@ -48,12 +48,12 @@ msgstr "Coda Fajl"
 #. module: account_coda
 #: view:account.coda:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupisano po"
 
 #. module: account_coda
 #: field:account.coda.import,awaiting_account:0
 msgid "Default Account for Unrecognized Movement"
-msgstr ""
+msgstr "Podrazumevani Nalog za neprepoznati pokret"
 
 #. module: account_coda
 #: help:account.coda,date:0
@@ -63,7 +63,7 @@ msgstr "Uvezi Datum"
 #. module: account_coda
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Greska ! Ne mozes kreirati rekursivni meni."
 
 #. module: account_coda
 #: field:account.coda,note:0
@@ -73,7 +73,7 @@ msgstr "Uvezi log"
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Import"
-msgstr ""
+msgstr "Uvezi"
 
 #. module: account_coda
 #: view:account.coda:0
@@ -84,7 +84,7 @@ msgstr "Coda Uvoz"
 #: view:account.coda:0
 #: field:account.coda.import,note:0
 msgid "Log"
-msgstr ""
+msgstr "Log"
 
 #. module: account_coda
 #: help:account.coda.import,awaiting_account:0
@@ -92,12 +92,14 @@ msgid ""
 "Set here the default account that will be used, if the partner is found but "
 "does not have the bank account, or if he is domiciled"
 msgstr ""
+"Postavi ovde podrazumevani nalog koji ce se koristiti, ukoliko je pronadjen "
+"partner ali nema Racum u banci ili je stranac."
 
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Preduzece"
 
 #. module: account_coda
 #: help:account.coda.import,def_payable:0
@@ -105,11 +107,13 @@ msgid ""
 "Set here the payable account that will be used, by default, if the partner "
 "is not found"
 msgstr ""
+"POstavi ovde platni nalog koji ce biti podrazumevano koriscen, ukoliko nie "
+"pronadjen partner"
 
 #. module: account_coda
 #: view:account.coda:0
 msgid "Search Coda"
-msgstr ""
+msgstr "Pretrazi Coda"
 
 #. module: account_coda
 #: view:account.coda:0
@@ -121,12 +125,12 @@ msgstr "Korisnik"
 #: view:account.coda:0
 #: field:account.coda,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: account_coda
 #: model:ir.ui.menu,name:account_coda.menu_account_coda_statement
 msgid "Coda Import Logs"
-msgstr ""
+msgstr "Logovi Uvoza Coda"
 
 #. module: account_coda
 #: constraint:ir.ui.view:0
@@ -146,17 +150,17 @@ msgstr "Osnovni platni konto"
 #. module: account_coda
 #: help:account.coda,name:0
 msgid "Store the detail of bank statements"
-msgstr ""
+msgstr "Sacuvaj detalje Izvoda banke"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Cancel"
-msgstr ""
+msgstr "Otkazi"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Open Statements"
-msgstr ""
+msgstr "Otvori Izvode"
 
 #. module: account_coda
 #: model:ir.ui.menu,name:account_coda.menu_account_coda_import
@@ -172,12 +176,12 @@ msgstr "Uvezi Coda Stavku"
 #. module: account_coda
 #: view:account.coda:0
 msgid "Statements"
-msgstr ""
+msgstr "Izvodi"
 
 #. module: account_coda
 #: constraint:ir.rule:0
 msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
+msgstr "Pravila nisu podrzana od strane osv_memory objekta !"
 
 #. module: account_coda
 #: field:account.bank.statement,coda_id:0
@@ -192,7 +196,7 @@ msgstr "Rezultati :"
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Result of Imported Coda Statements"
-msgstr ""
+msgstr "Rezultat uvezenih Coda izjava"
 
 #. module: account_coda
 #: help:account.coda.import,def_receivable:0
@@ -200,6 +204,8 @@ msgid ""
 "Set here the receivable account that will be used, by default, if the "
 "partner is not found"
 msgstr ""
+"POstavi ovde racun potrazivanja koji ce se podrazumevano koristiti, ukoliko "
+"partner nije pronadjen"
 
 #. module: account_coda
 #: field:account.coda.import,coda:0
@@ -210,65 +216,65 @@ msgstr "Coda Fajl"
 #. module: account_coda
 #: model:ir.model,name:account_coda.model_account_bank_statement
 msgid "Bank Statement"
-msgstr ""
+msgstr "Izvod Iz Banke"
 
 #. module: account_coda
 #: model:ir.actions.act_window,name:account_coda.action_account_coda
 msgid "Coda Logs"
-msgstr ""
+msgstr "Coda Logovi"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:0
 #, python-format
 msgid "Result"
-msgstr ""
+msgstr "Rezultat"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Click on 'New' to select your file :"
-msgstr ""
+msgstr "Klikni na \"Novo\" da selektujes svoj fajl :"
 
 #. module: account_coda
 #: field:account.coda.import,def_receivable:0
 msgid "Default Receivable Account"
-msgstr ""
+msgstr "Podrzumaveni racun potrazivanja"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Close"
-msgstr ""
+msgstr "Zatvori"
 
 #. module: account_coda
 #: field:account.coda,statement_ids:0
 msgid "Generated Bank Statements"
-msgstr ""
+msgstr "Generisani Izvodi Banke"
 
 #. module: account_coda
 #: model:ir.module.module,shortdesc:account_coda.module_meta_information
 msgid "Account CODA - import bank statements from coda file"
-msgstr ""
+msgstr "Nalog CODA- uvezi izvode banke iz CODA fajla"
 
 #. module: account_coda
 #: view:account.coda.import:0
 msgid "Configure Your Journal and Account :"
-msgstr ""
+msgstr "POdesi svoj Dnevnik i Nalog"
 
 #. module: account_coda
 #: view:account.coda:0
 msgid "Coda Import"
-msgstr ""
+msgstr "Coda Uvoz"
 
 #. module: account_coda
 #: code:addons/account_coda/wizard/account_coda_import.py:0
 #, python-format
 msgid "The bank account %s is not defined for the partner %s.\n"
-msgstr ""
+msgstr "Nalog banke %s nije definisan za partnera %s.\n"
 
 #. module: account_coda
 #: view:account.coda:0
 #: field:account.coda,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Dnevnik"
 
 #~ msgid "Clic on 'New' to select your file :"
 #~ msgstr "Klikni na 'Novi' da izaberes svoj fajl"
diff --git a/addons/account_followup/i18n/nl.po b/addons/account_followup/i18n/nl.po
index 3dfd455f202..f7462c03b11 100644
--- a/addons/account_followup/i18n/nl.po
+++ b/addons/account_followup/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-11-11 13:57+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-11-12 09:01+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_followup
diff --git a/addons/account_invoice_layout/i18n/el.po b/addons/account_invoice_layout/i18n/el.po
index 502a60b288a..5fcadd88a04 100644
--- a/addons/account_invoice_layout/i18n/el.po
+++ b/addons/account_invoice_layout/i18n/el.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-08-02 21:41+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\n"
+"PO-Revision-Date: 2010-11-13 16:37+0000\n"
+"Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:34+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
@@ -26,7 +26,7 @@ msgstr "Υποσύνολο"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Note:"
-msgstr ""
+msgstr "Σημείωση:"
 
 #. module: account_invoice_layout
 #: constraint:ir.model:0
@@ -87,12 +87,12 @@ msgstr "Τιμή Μονάδας"
 #. module: account_invoice_layout
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Λάθος! Δεν μπορείς να δημηιουργήσεις κενό Μενού!"
 
 #. module: account_invoice_layout
 #: model:notify.message,msg:account_invoice_layout.demo_message1
 msgid "Be Expert with the Experts..."
-msgstr ""
+msgstr "Γίνε Ειδικός με τους Ειδικούς..."
 
 #. module: account_invoice_layout
 #: constraint:ir.actions.act_window:0
@@ -134,7 +134,7 @@ msgstr "Προϊόν"
 #. module: account_invoice_layout
 #: help:account.invoice.line,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice lines."
-msgstr ""
+msgstr "Εμφανίζει την σειρά που θα εμφανίζονται οι γραμμές τιμολογίου."
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -146,7 +146,7 @@ msgstr "Τιμή"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Ημερομηνία Τιμολογίου"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -184,7 +184,7 @@ msgstr "Ειδικό Μήνυμα"
 #. module: account_invoice_layout
 #: help:account.invoice.special.msg,message:0
 msgid "Message to Print at the bottom of report"
-msgstr ""
+msgstr "Μύνημα που θα τυπώνεται στο υποσέλιδο της αναφοράς"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -196,7 +196,7 @@ msgstr "Ποσότητα"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Partner Ref."
-msgstr ""
+msgstr "Αναφορά Συνεργάτη"
 
 #. module: account_invoice_layout
 #: constraint:ir.ui.view:0
@@ -214,7 +214,7 @@ msgstr "Τιμολόγιο"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Total:"
-msgstr ""
+msgstr "Σύνολο:"
 
 #. module: account_invoice_layout
 #: view:account.invoice.special.msg:0
@@ -247,7 +247,7 @@ msgstr "Ποσό"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Tel. :"
-msgstr ""
+msgstr "Τηλ.:"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -263,7 +263,7 @@ msgstr "Αριθμός Αλληλουχίας"
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_account_invoice_special_msg
 msgid "Account Invoice Special Message"
-msgstr ""
+msgstr "Ειδικό Μύνημα Λογαριασμού Τιμολογίου"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -284,7 +284,7 @@ msgstr "Γραμμή Διαχωρισμού"
 #. module: account_invoice_layout
 #: model:ir.module.module,shortdesc:account_invoice_layout.module_meta_information
 msgid "Invoices Layout Improvement"
-msgstr ""
+msgstr "Βελτίωση Σχεδίασης Τιμολογίου"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -301,7 +301,7 @@ msgstr "Εκτύπωση"
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "VAT :"
-msgstr ""
+msgstr "ΦΠΑ:"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
@@ -312,13 +312,13 @@ msgstr "Φόρος"
 #. module: account_invoice_layout
 #: model:ir.model,name:account_invoice_layout.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Γραμμή Τιμολογίου"
 
 #. module: account_invoice_layout
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Net Total:"
-msgstr ""
+msgstr "Συνολικό Καθαρό:"
 
 #. module: account_invoice_layout
 #: view:notify.message:0
@@ -329,7 +329,7 @@ msgstr "Σημειώστε ένα ευχετήριο μήνυμα."
 #: report:account.invoice.layout:0
 #: report:notify_account.invoice:0
 msgid "Fax :"
-msgstr ""
+msgstr "Φαξ:"
 
 #. module: account_invoice_layout
 #: view:account.invoice.special.msg:0
diff --git a/addons/account_invoice_layout/i18n/nl.po b/addons/account_invoice_layout/i18n/nl.po
index 223b1699fe3..5abfb2fa8b4 100644
--- a/addons/account_invoice_layout/i18n/nl.po
+++ b/addons/account_invoice_layout/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-11-11 16:18+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-11-12 09:28+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/report/report_account_invoice_layout.rml b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
index df7c25f3de8..1eac32853e5 100644
--- a/addons/account_invoice_layout/report/report_account_invoice_layout.rml
+++ b/addons/account_invoice_layout/report/report_account_invoice_layout.rml
@@ -60,7 +60,6 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
@@ -245,7 +244,7 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="284.0,64.0,64.0,52.0,75.0" style="Tableau6">
+    <blockTable colWidths="283.0,71.0,57.0,57.0,71.0" style="Tableau6">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description / Taxes</para>
@@ -266,7 +265,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(invoice_lines(o), 'a') ]]</para>
-      <blockTable colWidths="4.0,280.0,44.0,21.0,66.0,53.0,71.0" style="Table_Invoice_Line_Content">
+      <blockTable colWidths="4.0,280.0,71.0,57.0,57.0,71.0" style="Table_Invoice_Line_Content">
         <tr>
           <td>
             <para style="terp_default_9">[[ a['type']=='text' and removeParentNode('blockTable')]]</para>
@@ -275,10 +274,7 @@
             <para style="terp_default_9"><font face="Helvetica">[[ ((a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['name'] ]] [[ a['type']=='article' and ('/ (' + a['tax_types'] + ')' ) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['quantity'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ a['uos'] ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['quantity'] ]] [[ a['uos'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['price_unit'] ]]</para>
@@ -322,11 +318,6 @@
               <font color="white"> </font>
             </para>
           </td>
-          <td>
-            <para style="terp_default_Note">
-              <font color="white"> </font>
-            </para>
-          </td>
         </tr>
       </blockTable>
       <blockTable colWidths="4.0,278.0,257.0" style="Table1">
@@ -344,8 +335,8 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_1">[[ a['type']!='break' and removeParentNode('pageBreak')]]</para>
-      <blockTable colWidths="284.0,64.0,64.0,52.0,75.0" style="Table2">
+      <pageBreak style="terp_default_1">[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
+      <blockTable colWidths="283.0,71.0,57.0,57.0,71.0" style="Table2">
         <tr>
           <td>
             <para style="terp_tblheader_Details">Description / Taxes [[ a['type']!='break' and removeParentNode('blockTable')]]</para>
@@ -365,7 +356,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="405.0,59.0,74.0" style="Tableau3">
+    <blockTable colWidths="395.0,59.0,85.0" style="Tableau3">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -380,7 +371,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="405.0,59.0,74.0" style="Table4">
+    <blockTable colWidths="395.0,59.0,85.0" style="Table4">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -395,7 +386,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="405.0,59.0,74.0" style="Table6">
+    <blockTable colWidths="395.0,59.0,85.0" style="Table6">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -416,7 +407,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="206.0,50.0,52.0,230.0" style="Table7">
+    <blockTable colWidths="205.0,71.0,71.0,191.0" style="Table7">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Tax [[ o.tax_line==[] and removeParentNode('blockTable') ]]</para>
@@ -436,7 +427,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(o.tax_line,'t') ]]</para>
-      <blockTable colWidths="206.0,49.0,52.0,230.0" style="Table8">
+      <blockTable colWidths="206.0,71.0,71.0,191.0" style="Table8">
         <tr>
           <td>
             <para style="terp_default_8">[[ t.name ]]</para>
diff --git a/addons/account_invoice_layout/report/special_message_invoice.rml b/addons/account_invoice_layout/report/special_message_invoice.rml
index 2925b3526b8..282dce2d988 100644
--- a/addons/account_invoice_layout/report/special_message_invoice.rml
+++ b/addons/account_invoice_layout/report/special_message_invoice.rml
@@ -60,7 +60,6 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
@@ -249,7 +248,7 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="284.0,64.0,64.0,52.0,75.0" style="Tableau6">
+    <blockTable colWidths="283.0,71.0,57.0,57.0,71.0" style="Tableau6">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description / Taxes</para>
@@ -270,7 +269,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[ repeatIn(invoice_lines(o), 'a') ]]</para>
-      <blockTable colWidths="4.0,280.0,44.0,21.0,66.0,53.0,71.0" style="Table_Invoice_Line_Content">
+      <blockTable colWidths="4.0,280.0,71.0,57.0,57.0,71.0" style="Table_Invoice_Line_Content">
         <tr>
           <td>
             <para style="terp_default_9">[[ a['type']=='text' and removeParentNode('blockTable')]]</para>
@@ -279,10 +278,7 @@
             <para style="terp_default_9"><font face="Helvetica">[[ ((a['type']=='title' or a['type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['name'] ]] [[ a['type']=='article' and ('/ (' + a['tax_types'] +' )' ) ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['quantity'] ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ a['uos'] ]]</para>
+            <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['quantity'] ]] [[ a['uos'] ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9"><font face="Helvetica">[[ (a['type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-bold'}))) or removeParentNode('font') ]]</font>[[ a['price_unit'] ]]</para>
@@ -326,11 +322,6 @@
               <font color="white"> </font>
             </para>
           </td>
-          <td>
-            <para style="terp_default_Note">
-              <font color="white"> </font>
-            </para>
-          </td>
         </tr>
       </blockTable>
       <blockTable colWidths="4.0,278.0,257.0" style="Table1">
@@ -348,8 +339,8 @@
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_1">[[ a['type']!='break' and removeParentNode('pageBreak')]]</para>
-      <blockTable colWidths="284.0,64.0,64.0,52.0,75.0" style="Table2">
+      <pageBreak style="terp_default_1">[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
+      <blockTable colWidths="283.0,71.0,57.0,57.0,71.0" style="Table2">
         <tr>
           <td>
             <para style="terp_tblheader_Details">Description / Taxes [[ a['type']!='break' and removeParentNode('blockTable')]]</para>
@@ -369,7 +360,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="405.0,59.0,74.0" style="Tableau3">
+    <blockTable colWidths="395.0,59.0,85.0" style="Tableau3">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -384,7 +375,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="405.0,59.0,74.0" style="Table4">
+    <blockTable colWidths="395.0,59.0,85.0" style="Table4">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -399,7 +390,7 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="405.0,59.0,74.0" style="Table6">
+    <blockTable colWidths="395.0,59.0,85.0" style="Table6">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -420,7 +411,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="209.0,54.0,46.0,229.0" style="Table7">
+    <blockTable colWidths="209.0,71.0,71.0,188.0" style="Table7">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Tax [[ o.tax_line==[] and removeParentNode('blockTable') ]]</para>
@@ -440,7 +431,7 @@
     </blockTable>
     <section>
       <para style="terp_default_1">[[ repeatIn(o.tax_line,'t') ]]</para>
-      <blockTable colWidths="209.0,55.0,46.0,229.0" style="Table8">
+      <blockTable colWidths="209.0,71.0,71.0,188.0" style="Table8">
         <tr>
           <td>
             <para style="terp_default_8">[[ t.name ]]</para>
diff --git a/addons/account_payment/i18n/nl.po b/addons/account_payment/i18n/nl.po
index ad459d3c6d3..737dfe2fe48 100644
--- a/addons/account_payment/i18n/nl.po
+++ b/addons/account_payment/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-11-11 18:05+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-11-13 08:49+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_payment
@@ -123,7 +123,7 @@ msgstr "_Toevoegen aan betaalopdracht"
 #: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement
 #: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm
 msgid "Payment Populate statement"
-msgstr ""
+msgstr "Afschrift met betalingen vullen"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -193,7 +193,7 @@ msgstr "Betalingsregels"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Execution Type"
-msgstr ""
+msgstr "Uitvoeringsoort"
 
 #. module: account_payment
 #: selection:payment.line,state:0
@@ -352,7 +352,7 @@ msgstr "Bedrijf"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_populate_statement
 msgid "Account Payment Populate Statement"
-msgstr ""
+msgstr "Account Payment Populate Statement"
 
 #. module: account_payment
 #: help:payment.mode,name:0
@@ -362,7 +362,7 @@ msgstr "Wijze van betalen"
 #. module: account_payment
 #: report:payment.order:0
 msgid "Value Date"
-msgstr ""
+msgstr "Betaaldatum"
 
 #. module: account_payment
 #: report:payment.order:0
@@ -406,7 +406,7 @@ msgstr "Adres van de klant"
 #. module: account_payment
 #: view:account.payment.populate.statement:0
 msgid "Populate Statement:"
-msgstr ""
+msgstr "Bankafschriften vullen:"
 
 #. module: account_payment
 #: view:account.move.line:0
@@ -433,7 +433,7 @@ msgstr "Betalingsregels"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Boekingen"
 
 #. module: account_payment
 #: help:payment.line,move_line_id:0
@@ -465,7 +465,7 @@ msgstr "Aanmaakdatum"
 #. module: account_payment
 #: view:account.payment.populate.statement:0
 msgid "ADD"
-msgstr ""
+msgstr "Toevoegen"
 
 #. module: account_payment
 #: view:account.bank.statement:0
@@ -490,7 +490,7 @@ msgstr "De bestellende klant"
 #. module: account_payment
 #: model:ir.model,name:account_payment.model_account_payment_make_payment
 msgid "Account make payment"
-msgstr ""
+msgstr "Betaling uitvoeren"
 
 #. module: account_payment
 #: report:payment.order:0
diff --git a/addons/account_voucher/i18n/el.po b/addons/account_voucher/i18n/el.po
index e82e2905aac..3f5f7cc5521 100644
--- a/addons/account_voucher/i18n/el.po
+++ b/addons/account_voucher/i18n/el.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-11-11 14:49+0000\n"
+"PO-Revision-Date: 2010-11-12 09:16+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_voucher
diff --git a/addons/account_voucher/report/rml_parse.py b/addons/account_voucher/report/rml_parse.py
deleted file mode 100644
index 84b4fabc401..00000000000
--- a/addons/account_voucher/report/rml_parse.py
+++ /dev/null
@@ -1,150 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    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 License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from report import report_sxw
-
-from datetime import datetime
-import re
-
-class rml_parse(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context):
-        super(rml_parse, self).__init__(cr, uid, name, context=None)
-        self.localcontext.update({
-            'comma_me': self.comma_me,
-            'format_date': self._get_and_change_date_format_for_swiss,
-            'strip_name': self._strip_name,
-            'explode_name': self._explode_name,
-        })
-
-    def comma_me(self, amount):
-        if not amount:
-            amount = 0.0
-        if  type(amount) is float:
-            amount = str('%.2f'%amount)
-        else:
-            amount = str(amount)
-        if (amount == '0'):
-            return ' '
-        orig = amount
-        new = re.sub("^(-?\d+)(\d{3})", "\g<1>'\g<2>", amount)
-        if orig == new:
-            return new
-        else:
-            return self.comma_me(new)
-
-    def _ellipsis(self, string, maxlen=100, ellipsis = '...'):
-        ellipsis = ellipsis or ''
-        try:
-            return string[:maxlen - len(ellipsis) ] + (ellipsis, '')[len(string) < maxlen]
-        except:
-            return False
-
-    def _strip_name(self, name, maxlen=50):
-        return self._ellipsis(name, maxlen, '...')
-
-    def _get_and_change_date_format_for_swiss (self, date_to_format):
-        date_formatted = ''
-        if date_to_format:
-            date_formatted = datetime.strptime(date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y')
-        return date_formatted
-
-    def _explode_name(self, chaine, length):
-        # We will test if the size is less then account
-        full_string = ''
-        if (len(str(chaine)) <= length):
-            return chaine
-        #
-        else:
-            chaine = unicode(chaine,'utf8').encode('iso-8859-1')
-            rup = 0
-            for carac in chaine:
-                rup = rup + 1
-                if rup == length:
-                    full_string = full_string + '\n'
-                    full_string = full_string + carac
-                    rup = 0
-                else:
-                    full_string = full_string + carac
-
-        return full_string
-
-    def makeAscii(self, str):
-        try:
-            Stringer = str.encode("utf-8")
-        except UnicodeDecodeError:
-            try:
-                Stringer = str.encode("utf-16")
-            except UnicodeDecodeError:
-                Stringer = str
-            else:
-                return Stringer
-        else:
-            return Stringer
-        return Stringer
-
-    def explode_this(self, chaine, length):
-        chaine = chaine.rstrip()
-        ast = list(chaine)
-        i = length
-        while i <= len(ast):
-            ast.insert(i,'\n')
-            i = i + length
-        chaine = str("".join(ast))
-        return chaine
-
-    def repair_string(self, chaine):
-        ast = list(chaine)
-        UnicodeAst = []
-        _previouslyfound = False
-        i = 0
-        while i < len(ast):
-            elem = ast[i]
-            try:
-                Stringer = elem.encode("utf-8")
-            except UnicodeDecodeError:
-                to_reencode = elem + ast[i+1]
-                Good_char = to_reencode.decode('utf-8')
-                UnicodeAst.append(Good_char)
-                i += i +2
-            else:
-                UnicodeAst.append(elem)
-                i += i + 1
-        return "".join(UnicodeAst)
-
-    def ReencodeAscii(self, str):
-        try:
-            Stringer = str.decode("ascii")
-        except UnicodeEncodeError:
-            return str.encode("ascii")
-        except UnicodeDecodeError:
-            return str.encode("ascii")
-        else:
-            return Stringer
-
-    def _add_header(self, node, header=1):
-        if header == 2:
-            rml_head =  self.rml_header2
-        else:
-            rml_head =  self.rml_header
-        rml_head =  rml_head.replace('<pageGraphics>','''<pageGraphics> <image x="10" y="26cm" height="770.0" width="1120.0" >[[company.logo]] </image> ''')
-        return True
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/association/i18n/ar.po b/addons/association/i18n/ar.po
index 01d08e94bcc..f18d1508330 100644
--- a/addons/association/i18n/ar.po
+++ b/addons/association/i18n/ar.po
@@ -6,141 +6,127 @@ 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-02-03 06:24+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:37+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
+msgid "Resources Management"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
-
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/association/i18n/bg.po b/addons/association/i18n/bg.po
index e3420283695..ebcba95775c 100644
--- a/addons/association/i18n/bg.po
+++ b/addons/association/i18n/bg.po
@@ -6,17 +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: 2009-04-10 10:18+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:52+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
@@ -24,125 +44,91 @@ msgstr ""
 "Името на обекта трябва да започва с \"x_\" и да не съдържа никакви специални "
 "символи!"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Невалиден XML за преглед на архитектурата"
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Невалиден XML за преглед на архитектурата"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
+msgid "Resources Management"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
-
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/association/i18n/bs.po b/addons/association/i18n/bs.po
index cc76e0f04f1..8e2b5bcb41a 100644
--- a/addons/association/i18n/bs.po
+++ b/addons/association/i18n/bs.po
@@ -6,142 +6,155 @@ 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-17 10:59+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:52+0000\n"
 "Last-Translator: Miro Glavić <glavicmiro@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr "Wiki"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 "Naziv Objekta mora počinjati sa x_ i ne smije sadržavati specijalne znakove!"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "Upravljanje Odnosima"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neodgovarajući XML za arhitekturu prikaza!"
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
+msgstr "Profil društva"
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Upravljanje Resursima"
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr "Segmentacija"
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr "Profil društva"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Upravljanje Dokumentacijom"
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr "Profil Društva : Instaliraj Dodatne Module"
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr "Profil za Članove"
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr "Odnosi Partnera i Kalendari"
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Instaliraj"
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr "Praćenje Troškova"
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "Instaliraj Dodatne Module"
+msgid "Resources Management"
+msgstr "Upravljanje Resursima"
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr "Upravljanje Projektom"
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr "Wiki"
+#~ msgid "Relationship Management"
+#~ msgstr "Upravljanje Odnosima"
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
+#~ msgid "Segmentation"
+#~ msgstr "Segmentacija"
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
+#~ msgid "Document Management"
+#~ msgstr "Upravljanje Dokumentacijom"
 
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
+#~ msgid "Association Profile : Install Extra Modules"
+#~ msgstr "Profil Društva : Instaliraj Dodatne Module"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Poništi"
+#~ msgid "Profile for Associates"
+#~ msgstr "Profil za Članove"
+
+#~ msgid "Partner Relation & Calendars"
+#~ msgstr "Odnosi Partnera i Kalendari"
+
+#~ msgid "Install"
+#~ msgstr "Instaliraj"
+
+#~ msgid "Install Extra Module"
+#~ msgstr "Instaliraj Dodatne Module"
+
+#~ msgid "Cancel"
+#~ msgstr "Poništi"
diff --git a/addons/association/i18n/ca.po b/addons/association/i18n/ca.po
index 5b8dd284ef0..85b596b62af 100644
--- a/addons/association/i18n/ca.po
+++ b/addons/association/i18n/ca.po
@@ -6,17 +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: 2009-11-17 10:59+0000\n"
-"Last-Translator: Raimon Esteve <resteve@zikzakmedia.com>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:37+0000\n"
+"Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@zikzakmedia.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr "Wiki"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr "Aconsegueix les coses acabades (GTD)"
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
@@ -24,12 +44,39 @@ msgstr ""
 "El nom de l'objecte ha de començar amb x_ i no contenir cap caràcter "
 "especial!"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "Gestió de relacions"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML invàlid per a la definició de la vista!"
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
@@ -39,124 +86,109 @@ msgstr ""
 "les vostres tasques. Aquest mòdul integra completament el principi de GTD "
 "amb la gestió de projectes d'OpenERP."
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"El sistema de gestió de documentació d'OpenERP us permet emmagatzemar, "
-"navegar, classificar automàticament, buscar i visualitzar tot tipus de "
-"documents (documents interns, informes impresos, sistema de calendari). Obre "
-"un accés de FTP per a que els usuaris naveguin fàcilment pels documents "
-"associats."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
+msgstr "Perfil associacions"
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "Nom de model no vàlid en la definició de l'acció."
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Gestió de recursos"
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr "perfil.associacio.config.assistent_instal_moduls"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr "Segmentació"
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr "Perfil associacions"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Gestió documental"
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr "Perfil associació : Instal·la mòduls extra"
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr "Perfil per associacions"
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr "Relacions amb empreses & Calendaris"
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Instal·la"
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr "Seguiment de despeses"
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "Instal·la mòdul extra"
+msgid "Resources Management"
+msgstr "Gestió de recursos"
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr "perfil.associacio.config.assistent_instal_moduls"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr "Gestió de projectes"
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr "Wiki"
+#~ msgid "Relationship Management"
+#~ msgstr "Gestió de relacions"
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr "Aconsegueix les coses acabades (GTD)"
+#~ msgid ""
+#~ "The Document Management System of Open ERP allows you to store, browse, "
+#~ "automatically index, search and preview all kind of documents (internal "
+#~ "documents, printed reports, calendar system). It opens an FTP access for the "
+#~ "users to easily browse association's document."
+#~ msgstr ""
+#~ "El sistema de gestió de documentació d'OpenERP us permet emmagatzemar, "
+#~ "navegar, classificar automàticament, buscar i visualitzar tot tipus de "
+#~ "documents (documents interns, informes impresos, sistema de calendari). Obre "
+#~ "un accés de FTP per a que els usuaris naveguin fàcilment pels documents "
+#~ "associats."
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-"Realitza el seguiment de despeses personals, des de la codificació de la "
-"despesa de l'empleat i el reembossament de l'empleat fins la seva facturació "
-"al client final."
+#~ msgid "Segmentation"
+#~ msgstr "Segmentació"
 
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
-"Instal·leu més mòduls. Es proposen uns quants mòduls relacionats amb el "
-"perfil d'associació que heu seleccionat. Els podreu instal·lar a partir dels "
-"nostres requisits."
+#~ msgid "Document Management"
+#~ msgstr "Gestió documental"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Cancel·la"
+#~ msgid "Association Profile : Install Extra Modules"
+#~ msgstr "Perfil associació : Instal·la mòduls extra"
+
+#~ msgid "Profile for Associates"
+#~ msgstr "Perfil per associacions"
+
+#~ msgid "Partner Relation & Calendars"
+#~ msgstr "Relacions amb empreses & Calendaris"
+
+#~ msgid "Install"
+#~ msgstr "Instal·la"
+
+#~ msgid "Install Extra Module"
+#~ msgstr "Instal·la mòdul extra"
+
+#~ msgid ""
+#~ "Tracks the personal expenses process, from the employee expense encoding, to "
+#~ "the reimbursement of the employee up to the reinvoicing to the final "
+#~ "customer."
+#~ msgstr ""
+#~ "Realitza el seguiment de despeses personals, des de la codificació de la "
+#~ "despesa de l'empleat i el reembossament de l'empleat fins la seva facturació "
+#~ "al client final."
+
+#~ msgid ""
+#~ "Install more modules. A few modules are proposed according to the "
+#~ "association profile you selected. You will be able to install them based on "
+#~ "our requirements."
+#~ msgstr ""
+#~ "Instal·leu més mòduls. Es proposen uns quants mòduls relacionats amb el "
+#~ "perfil d'associació que heu seleccionat. Els podreu instal·lar a partir dels "
+#~ "nostres requisits."
+
+#~ msgid "Cancel"
+#~ msgstr "Cancel·la"
diff --git a/addons/association/i18n/cs.po b/addons/association/i18n/cs.po
index 3a784f0b0a0..dc900975187 100644
--- a/addons/association/i18n/cs.po
+++ b/addons/association/i18n/cs.po
@@ -6,142 +6,134 @@ 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-17 10:59+0000\n"
-"Last-Translator: Kuvaly <kuvaly@seznam.cz>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:51+0000\n"
+"Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr "Wiki"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 "Jméno objektu musí začínat znakem x_ a nesmí obsahovat žádný speciální znak!"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Invalidní XML pro zobrazení architektury!"
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalidní XML pro zobrazení architektury!"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Instalovat"
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
+msgid "Resources Management"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr "Správa projektů"
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr "Wiki"
+#~ msgid "Install"
+#~ msgstr "Instalovat"
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
-
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Ukončení"
+#~ msgid "Cancel"
+#~ msgstr "Ukončení"
diff --git a/addons/association/i18n/de.po b/addons/association/i18n/de.po
index 0fe9047ff73..d779327b226 100644
--- a/addons/association/i18n/de.po
+++ b/addons/association/i18n/de.po
@@ -6,17 +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: 2009-11-22 19:22+0000\n"
-"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:50+0000\n"
+"Last-Translator: Ferdinand-chricar <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr "Wiki"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr "To Do Liste (GTD)"
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
@@ -24,12 +44,39 @@ msgstr ""
 "Der Objekt Name muss mit einem x_ starten und darf keine Sonderzeichen "
 "beinhalten"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "Beziehungsmanagement"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Fehlerhafter xml Code für diese Ansicht!"
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
@@ -38,123 +85,108 @@ msgstr ""
 "GTD ist eine Methode zur effizienten Organisation von Aufgaben. Dieses "
 "Module ist voll integriert mit dem openERP Projektmanagement Modul."
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"Das Dokumentenmanagement erlaubt Ihnen das Speichern, Browsen, Indexieren, "
-"Suchen und die Ansicht aller Arten von Dokumente (interne Dokumente, Bilder, "
-"Reports, Kalender). Es erlaubt einen FTP Zugang für die Benutzer um einfach "
-"im Dokumentenpool zu surfen."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
+msgstr "Profil Verein"
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "Ungültiger Modellname in der Aktionsdefinition."
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Ressourcenmanagement"
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr "profile.association.config.install_modules_wizard"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr "Segmentierung"
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr "Profil Verein"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Dokumenten Management"
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr "Vereins Profile: Installiere Extra Module"
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr "Profile für Vereinigungen"
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr "Partner Verbindungen & Kalender"
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Installiere"
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr "Ausgabenverfolgung"
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "Installiere Extra Module"
+msgid "Resources Management"
+msgstr "Ressourcenmanagement"
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr "profile.association.config.install_modules_wizard"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr "Projektverwaltung"
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr "Wiki"
+#~ msgid "Relationship Management"
+#~ msgstr "Beziehungsmanagement"
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr "To Do Liste (GTD)"
+#~ msgid ""
+#~ "The Document Management System of Open ERP allows you to store, browse, "
+#~ "automatically index, search and preview all kind of documents (internal "
+#~ "documents, printed reports, calendar system). It opens an FTP access for the "
+#~ "users to easily browse association's document."
+#~ msgstr ""
+#~ "Das Dokumentenmanagement erlaubt Ihnen das Speichern, Browsen, Indexieren, "
+#~ "Suchen und die Ansicht aller Arten von Dokumente (interne Dokumente, Bilder, "
+#~ "Reports, Kalender). Es erlaubt einen FTP Zugang für die Benutzer um einfach "
+#~ "im Dokumentenpool zu surfen."
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-"Erlaubt eine Erfassung und Kontrolle der Ausgaben, z.B. von Nebenkosten der "
-"Mitarbeiter (Spesen, Reisekosten), Auszahlungen von Nebenkosten sowie der "
-"Weiterberechnung an Kunden."
+#~ msgid "Segmentation"
+#~ msgstr "Segmentierung"
 
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
-"Weitere Module installieren. Einige Module werden aufgrund des "
-"Mitgliedschafstprofiles zur INstllation vorgeschlagen. Sie können dies je "
-"nach Bedarf installieren"
+#~ msgid "Document Management"
+#~ msgstr "Dokumenten Management"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Abbrechen"
+#~ msgid "Association Profile : Install Extra Modules"
+#~ msgstr "Vereins Profile: Installiere Extra Module"
+
+#~ msgid "Profile for Associates"
+#~ msgstr "Profile für Vereinigungen"
+
+#~ msgid "Partner Relation & Calendars"
+#~ msgstr "Partner Verbindungen & Kalender"
+
+#~ msgid "Install"
+#~ msgstr "Installiere"
+
+#~ msgid "Install Extra Module"
+#~ msgstr "Installiere Extra Module"
+
+#~ msgid ""
+#~ "Tracks the personal expenses process, from the employee expense encoding, to "
+#~ "the reimbursement of the employee up to the reinvoicing to the final "
+#~ "customer."
+#~ msgstr ""
+#~ "Erlaubt eine Erfassung und Kontrolle der Ausgaben, z.B. von Nebenkosten der "
+#~ "Mitarbeiter (Spesen, Reisekosten), Auszahlungen von Nebenkosten sowie der "
+#~ "Weiterberechnung an Kunden."
+
+#~ msgid ""
+#~ "Install more modules. A few modules are proposed according to the "
+#~ "association profile you selected. You will be able to install them based on "
+#~ "our requirements."
+#~ msgstr ""
+#~ "Weitere Module installieren. Einige Module werden aufgrund des "
+#~ "Mitgliedschafstprofiles zur INstllation vorgeschlagen. Sie können dies je "
+#~ "nach Bedarf installieren"
+
+#~ msgid "Cancel"
+#~ msgstr "Abbrechen"
diff --git a/addons/association/i18n/es.po b/addons/association/i18n/es.po
index 2b33da34f6a..95967870259 100644
--- a/addons/association/i18n/es.po
+++ b/addons/association/i18n/es.po
@@ -6,17 +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: 2009-11-17 10:59+0000\n"
-"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:49+0000\n"
+"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr "Wiki"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr "Conseguir Hacer el Trabajo"
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
@@ -24,12 +44,39 @@ msgstr ""
 "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
 "especial!"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "Gestión de relaciones"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML inválido para la definición de la vista!"
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
@@ -39,124 +86,109 @@ msgstr ""
 "eficazmente usted mismo y sus tareas. Este módulo integra completamente el "
 "principio GTD con la gestión de proyectos de OpenERP."
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"El sistema de gestión documental de OpenERP le permite almacenar, navegar, "
-"clasificar automáticamente, buscar y visualizar todo tipo de documentos "
-"(documentos internos, informes impresos, sistema de calendario). Abre un "
-"acceso de FTP para que los usuarios naveguen fácilmente en los documentos "
-"asociados."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
+msgstr "Perfil asociación"
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "Nombre de modelo no válido en la definición de acción."
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Gestión de recursos"
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr "perfil.asociacion.config.asistente_instal_modulos"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr "Segmentación"
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr "Perfil asociación"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Gestión documental"
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr "Perfil asociación : Instalar módulos extra"
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr "Perfil para asociados"
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr "Relaciones de empresa y calendarios"
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Instalar"
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr "Seguimiento de gastos"
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "Instalar módulo extra"
+msgid "Resources Management"
+msgstr "Gestión de recursos"
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr "perfil.asociacion.config.asistente_instal_modulos"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr "Gestión de proyectos"
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr "Wiki"
+#~ msgid "Relationship Management"
+#~ msgstr "Gestión de relaciones"
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr "Conseguir Hacer el Trabajo"
+#~ msgid ""
+#~ "The Document Management System of Open ERP allows you to store, browse, "
+#~ "automatically index, search and preview all kind of documents (internal "
+#~ "documents, printed reports, calendar system). It opens an FTP access for the "
+#~ "users to easily browse association's document."
+#~ msgstr ""
+#~ "El sistema de gestión documental de OpenERP le permite almacenar, navegar, "
+#~ "clasificar automáticamente, buscar y visualizar todo tipo de documentos "
+#~ "(documentos internos, informes impresos, sistema de calendario). Abre un "
+#~ "acceso de FTP para que los usuarios naveguen fácilmente en los documentos "
+#~ "asociados."
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-"Realiza el seguimiento de gastos personales, desde la codificación del gasto "
-"del empleado, pasando por el reembolso del empleado hasta su facturación al "
-"cliente final."
+#~ msgid "Segmentation"
+#~ msgstr "Segmentación"
 
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
-"Instalar más módulos. Se proponen unos cuantos módulos relacionados con el "
-"perfil de asociación que ha seleccionado. Podrá instalarlos en base a "
-"nuestros requisitos."
+#~ msgid "Document Management"
+#~ msgstr "Gestión documental"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Cancelar"
+#~ msgid "Association Profile : Install Extra Modules"
+#~ msgstr "Perfil asociación : Instalar módulos extra"
+
+#~ msgid "Profile for Associates"
+#~ msgstr "Perfil para asociados"
+
+#~ msgid "Partner Relation & Calendars"
+#~ msgstr "Relaciones de empresa y calendarios"
+
+#~ msgid "Install"
+#~ msgstr "Instalar"
+
+#~ msgid "Install Extra Module"
+#~ msgstr "Instalar módulo extra"
+
+#~ msgid ""
+#~ "Tracks the personal expenses process, from the employee expense encoding, to "
+#~ "the reimbursement of the employee up to the reinvoicing to the final "
+#~ "customer."
+#~ msgstr ""
+#~ "Realiza el seguimiento de gastos personales, desde la codificación del gasto "
+#~ "del empleado, pasando por el reembolso del empleado hasta su facturación al "
+#~ "cliente final."
+
+#~ msgid ""
+#~ "Install more modules. A few modules are proposed according to the "
+#~ "association profile you selected. You will be able to install them based on "
+#~ "our requirements."
+#~ msgstr ""
+#~ "Instalar más módulos. Se proponen unos cuantos módulos relacionados con el "
+#~ "perfil de asociación que ha seleccionado. Podrá instalarlos en base a "
+#~ "nuestros requisitos."
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
diff --git a/addons/association/i18n/et.po b/addons/association/i18n/et.po
index 3ead72f3cd4..10812852345 100644
--- a/addons/association/i18n/et.po
+++ b/addons/association/i18n/et.po
@@ -6,29 +6,76 @@ 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 19:14+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:49+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr "Wiki"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr "Saa asjad tehtud"
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 "Objekti nimi peab algama x_'ga ja ei tohi sisaldada ühtegi erisümbolit !"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "Suhete haldus"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Vigane XML vaate arhitektuurile!"
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
@@ -37,122 +84,107 @@ msgstr ""
 "GTD on metoodika enda ja oma tööde efektiivseks organiseerimiseks. See "
 "moodul integreerib täielikult GTD põhimõtted Open ERP'i projektihaldusega."
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"Open ERP dokumendihaldussüsteem võimaldab sul säilitada, sirvida, "
-"automaatselt indekseerida, otsida ja eelvaadata kõiki dokumendiliike "
-"(sisemised dokumendid, prinditud aruandeid, kalendrisüsteemi). See avab "
-"kasutajatele FTP ligipääsu, et lihtsalt sirvida ühingu dokumente."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
+msgstr "Ühingu profiil"
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "Vigane mudeli nimi toimingu definitsioonis."
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Vahendite haldus"
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr "profile.association.config.install_modules_wizard"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr "Segmenteerimine"
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr "Ühingu profiil"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Dokumendihaldus"
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr "Ühingu profiil : Paigalda lisamooduleid"
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr "Profiil ühingutele"
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr "Partneri seos ja kalendrid"
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Paigalda"
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr "Kulude jälgimine"
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "Paigalda lisamoodul"
+msgid "Resources Management"
+msgstr "Vahendite haldus"
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr "profile.association.config.install_modules_wizard"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr "Projektihaldus"
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr "Wiki"
+#~ msgid "Relationship Management"
+#~ msgstr "Suhete haldus"
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr "Saa asjad tehtud"
+#~ msgid ""
+#~ "The Document Management System of Open ERP allows you to store, browse, "
+#~ "automatically index, search and preview all kind of documents (internal "
+#~ "documents, printed reports, calendar system). It opens an FTP access for the "
+#~ "users to easily browse association's document."
+#~ msgstr ""
+#~ "Open ERP dokumendihaldussüsteem võimaldab sul säilitada, sirvida, "
+#~ "automaatselt indekseerida, otsida ja eelvaadata kõiki dokumendiliike "
+#~ "(sisemised dokumendid, prinditud aruandeid, kalendrisüsteemi). See avab "
+#~ "kasutajatele FTP ligipääsu, et lihtsalt sirvida ühingu dokumente."
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-"Jälgib isiklike kulude protsessi alustades töötaja kuludest ja töötaja "
-"kulude hüvitamisest kuni lõppkliendile esitatud arveni."
+#~ msgid "Segmentation"
+#~ msgstr "Segmenteerimine"
 
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
-"Paigalda veel mooduleid. Mõned moodulid soovitatakse vastavalt sinu poolt "
-"valitud assotsiatsiooni profiilile. Sa saad neid paigaldada vastavalt meie "
-"vajadustele."
+#~ msgid "Document Management"
+#~ msgstr "Dokumendihaldus"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Tühista"
+#~ msgid "Association Profile : Install Extra Modules"
+#~ msgstr "Ühingu profiil : Paigalda lisamooduleid"
+
+#~ msgid "Profile for Associates"
+#~ msgstr "Profiil ühingutele"
+
+#~ msgid "Partner Relation & Calendars"
+#~ msgstr "Partneri seos ja kalendrid"
+
+#~ msgid "Install"
+#~ msgstr "Paigalda"
+
+#~ msgid "Install Extra Module"
+#~ msgstr "Paigalda lisamoodul"
+
+#~ msgid ""
+#~ "Tracks the personal expenses process, from the employee expense encoding, to "
+#~ "the reimbursement of the employee up to the reinvoicing to the final "
+#~ "customer."
+#~ msgstr ""
+#~ "Jälgib isiklike kulude protsessi alustades töötaja kuludest ja töötaja "
+#~ "kulude hüvitamisest kuni lõppkliendile esitatud arveni."
+
+#~ msgid ""
+#~ "Install more modules. A few modules are proposed according to the "
+#~ "association profile you selected. You will be able to install them based on "
+#~ "our requirements."
+#~ msgstr ""
+#~ "Paigalda veel mooduleid. Mõned moodulid soovitatakse vastavalt sinu poolt "
+#~ "valitud assotsiatsiooni profiilile. Sa saad neid paigaldada vastavalt meie "
+#~ "vajadustele."
+
+#~ msgid "Cancel"
+#~ msgstr "Tühista"
diff --git a/addons/association/i18n/fr.po b/addons/association/i18n/fr.po
index 4e95df86941..75a66bd5afb 100644
--- a/addons/association/i18n/fr.po
+++ b/addons/association/i18n/fr.po
@@ -6,17 +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: 2009-11-17 10:59+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:37+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr "Wiki"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr "Méthode \"Getting Things Done\""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
@@ -24,17 +44,39 @@ msgstr ""
 "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères "
 "spéciaux !"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr "XML non valide pour l'architecture de la vue"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "Gestion de la relation"
-
-#. module: profile_association
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
@@ -44,120 +86,107 @@ msgstr ""
 "vos tâches efficacement. Ce module intègre complètement les principes GTD "
 "avec la gestion de projets d'OpenERP."
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
-"Le système de gestion documentaire d'OpenERP vous permet de stocker, "
-"parcourir, indexer automatiquement, rechercher et pré-visualiser tout type "
-"de documents : documents internes ; rapports imprimés ; calendrier. Il "
-"permet un accès FTP pour que les utilisateurs puissent facilement parcourir "
-"les documents associés."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
+msgstr "Profil pour les associations"
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "Nom de modèle non valide dans la définition de l'action."
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Gestion des ressources"
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr "profile.association.config.install_modules_wizard"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr "Segmentation"
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr "Profil pour les associations"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Gestion documentaire"
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-"Profil pour les associations : installation de modules supplémentaires"
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr "Profil pour associés"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr "Relations entre Partenaires et Calendriers"
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Installer"
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr "Suivi des frais"
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
+msgid "Resources Management"
+msgstr "Gestion des ressources"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr "profile.association.config.install_modules_wizard"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr "Gestion de projets"
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr "Wiki"
+#~ msgid "Relationship Management"
+#~ msgstr "Gestion de la relation"
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr "Méthode \"Getting Things Done\""
+#~ msgid ""
+#~ "The Document Management System of Open ERP allows you to store, browse, "
+#~ "automatically index, search and preview all kind of documents (internal "
+#~ "documents, printed reports, calendar system). It opens an FTP access for the "
+#~ "users to easily browse association's document."
+#~ msgstr ""
+#~ "Le système de gestion documentaire d'OpenERP vous permet de stocker, "
+#~ "parcourir, indexer automatiquement, rechercher et pré-visualiser tout type "
+#~ "de documents : documents internes ; rapports imprimés ; calendrier. Il "
+#~ "permet un accès FTP pour que les utilisateurs puissent facilement parcourir "
+#~ "les documents associés."
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-"Permet le suivi du processus des dépenses du personnel, de la saisie des "
-"dépenses de l'employé, au remboursement de l'employé, jusqu'à la facturation "
-"au client final."
+#~ msgid "Segmentation"
+#~ msgstr "Segmentation"
 
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
-"Installez d'autres modules. Quelques modules sont proposés pour compléter le "
-"profile pour les associations que vous avez choisi. Vous pourrez les "
-"installer selon vos besoins."
+#~ msgid "Document Management"
+#~ msgstr "Gestion documentaire"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Annuler"
+#~ msgid "Association Profile : Install Extra Modules"
+#~ msgstr ""
+#~ "Profil pour les associations : installation de modules supplémentaires"
+
+#~ msgid "Profile for Associates"
+#~ msgstr "Profil pour associés"
+
+#~ msgid "Partner Relation & Calendars"
+#~ msgstr "Relations entre Partenaires et Calendriers"
+
+#~ msgid "Install"
+#~ msgstr "Installer"
+
+#~ msgid ""
+#~ "Tracks the personal expenses process, from the employee expense encoding, to "
+#~ "the reimbursement of the employee up to the reinvoicing to the final "
+#~ "customer."
+#~ msgstr ""
+#~ "Permet le suivi du processus des dépenses du personnel, de la saisie des "
+#~ "dépenses de l'employé, au remboursement de l'employé, jusqu'à la facturation "
+#~ "au client final."
+
+#~ msgid ""
+#~ "Install more modules. A few modules are proposed according to the "
+#~ "association profile you selected. You will be able to install them based on "
+#~ "our requirements."
+#~ msgstr ""
+#~ "Installez d'autres modules. Quelques modules sont proposés pour compléter le "
+#~ "profile pour les associations que vous avez choisi. Vous pourrez les "
+#~ "installer selon vos besoins."
+
+#~ msgid "Cancel"
+#~ msgstr "Annuler"
diff --git a/addons/association/i18n/hr.po b/addons/association/i18n/hr.po
index 01d08e94bcc..f18d1508330 100644
--- a/addons/association/i18n/hr.po
+++ b/addons/association/i18n/hr.po
@@ -6,141 +6,127 @@ 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-02-03 06:24+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:37+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
+msgid "Resources Management"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
-
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/association/i18n/hu.po b/addons/association/i18n/hu.po
index 01d08e94bcc..f18d1508330 100644
--- a/addons/association/i18n/hu.po
+++ b/addons/association/i18n/hu.po
@@ -6,141 +6,127 @@ 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-02-03 06:24+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:37+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
+msgid "Resources Management"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
-
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/association/i18n/id.po b/addons/association/i18n/id.po
index faac6ca9c41..f18d1508330 100644
--- a/addons/association/i18n/id.po
+++ b/addons/association/i18n/id.po
@@ -6,141 +6,127 @@ 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 13:53+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:37+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
+msgid "Resources Management"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
-
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/association/i18n/it.po b/addons/association/i18n/it.po
index 3f9d24f3f61..bb0100fb9f4 100644
--- a/addons/association/i18n/it.po
+++ b/addons/association/i18n/it.po
@@ -6,17 +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: 2009-11-17 10:58+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:38+0000\n"
 "Last-Translator: Marius Marolla <mariusmarolla@areablu.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr "Wiki"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr "Getting Things Done (GTD)"
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
@@ -24,12 +44,39 @@ msgstr ""
 "Il nome dell'oggetto deve iniziare per x_ e non deve contenere caratteri "
 "speciali!"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "Gestione deile Relazioni"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valido per Visualizzazione Architettura!"
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
@@ -39,121 +86,91 @@ msgstr ""
 "le propie attività. Questo modulo integra pienamente i principi del GTD con "
 "il modulo di Gestione Progetti di OpenERP."
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
 msgstr ""
-"Il Sistema di Gestione Documentale di OpenERP permette di salvare, "
-"sfogliare, di indicizzare automaticamente, ricercare e visualizzare tutti i "
-"tipi di documenti (documenti interni, report stampati, calendari di "
-"sistema). Esso apre un accesso FTP per gli utenti per meglio sfogliare i "
-"documenti associati."
 
-#. module: profile_association
+#. module: association
 #: 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: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Gestione Risorse"
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr "profile.association.config.install_modules_wizard"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr "Segmentazione"
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Gestione documenti"
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Installa"
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr "Monitoraggio spese"
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "Installa modulo aggiuntivo"
+msgid "Resources Management"
+msgstr "Gestione Risorse"
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr "profile.association.config.install_modules_wizard"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr "Gestione progetti"
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr "Wiki"
+#~ msgid "Relationship Management"
+#~ msgstr "Gestione deile Relazioni"
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr "Getting Things Done (GTD)"
+#~ msgid ""
+#~ "The Document Management System of Open ERP allows you to store, browse, "
+#~ "automatically index, search and preview all kind of documents (internal "
+#~ "documents, printed reports, calendar system). It opens an FTP access for the "
+#~ "users to easily browse association's document."
+#~ msgstr ""
+#~ "Il Sistema di Gestione Documentale di OpenERP permette di salvare, "
+#~ "sfogliare, di indicizzare automaticamente, ricercare e visualizzare tutti i "
+#~ "tipi di documenti (documenti interni, report stampati, calendari di "
+#~ "sistema). Esso apre un accesso FTP per gli utenti per meglio sfogliare i "
+#~ "documenti associati."
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-"Traccia il processo di gestione delle spese personali, dalla richiesta di "
-"rimborso del dipendente al liquidazione delle spese, fino alla "
-"rifatturazione sul cliente finale."
+#~ msgid "Segmentation"
+#~ msgstr "Segmentazione"
 
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
+#~ msgid "Document Management"
+#~ msgstr "Gestione documenti"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Annulla"
+#~ msgid "Install"
+#~ msgstr "Installa"
+
+#~ msgid "Install Extra Module"
+#~ msgstr "Installa modulo aggiuntivo"
+
+#~ msgid ""
+#~ "Tracks the personal expenses process, from the employee expense encoding, to "
+#~ "the reimbursement of the employee up to the reinvoicing to the final "
+#~ "customer."
+#~ msgstr ""
+#~ "Traccia il processo di gestione delle spese personali, dalla richiesta di "
+#~ "rimborso del dipendente al liquidazione delle spese, fino alla "
+#~ "rifatturazione sul cliente finale."
+
+#~ msgid "Cancel"
+#~ msgstr "Annulla"
diff --git a/addons/association/i18n/ko.po b/addons/association/i18n/ko.po
index 3d9afa1f35a..1b8c7650a05 100644
--- a/addons/association/i18n/ko.po
+++ b/addons/association/i18n/ko.po
@@ -7,28 +7,75 @@ 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: 2009-09-08 16:43+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:47+0000\n"
 "Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr "위키"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "관계 관리"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
@@ -36,113 +83,88 @@ msgid ""
 msgstr ""
 "GTD는 귀하 자신과 과제를 효율적으로 조직할 방법록입니다. 이 모듈은 GTD 원칙과 이 시스템의 프로젝트 관리를 완전히 통합하였습니다."
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
+msgstr "협회 프로파일"
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "리소스 관리"
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr "세그먼테이션"
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr "협회 프로파일"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "문서 관리"
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr "협회 프로파일: 추가 모듈 설치"
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr "파트너 관계 % 카렌더"
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr "설치"
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr "비용 추적"
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "추가 모듈 설치"
+msgid "Resources Management"
+msgstr "리소스 관리"
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr "프로젝트 관리"
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr "위키"
+#~ msgid "Relationship Management"
+#~ msgstr "관계 관리"
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
+#~ msgid "Segmentation"
+#~ msgstr "세그먼테이션"
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr "직원 비용 인코딩으로부터 직원 환급과 최종 고객에 대한 재 인보이싱에 이르기까지 개인 비용 프로세스를 추적합니다."
+#~ msgid "Document Management"
+#~ msgstr "문서 관리"
 
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr "추가 모듈 설치. 귀하가 선택한 협회 프로파일에 따라 몇몇 모듈이 추가 설치됩니다."
+#~ msgid "Association Profile : Install Extra Modules"
+#~ msgstr "협회 프로파일: 추가 모듈 설치"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "취소"
+#~ msgid "Partner Relation & Calendars"
+#~ msgstr "파트너 관계 % 카렌더"
+
+#~ msgid "Install"
+#~ msgstr "설치"
+
+#~ msgid "Install Extra Module"
+#~ msgstr "추가 모듈 설치"
+
+#~ msgid ""
+#~ "Tracks the personal expenses process, from the employee expense encoding, to "
+#~ "the reimbursement of the employee up to the reinvoicing to the final "
+#~ "customer."
+#~ msgstr "직원 비용 인코딩으로부터 직원 환급과 최종 고객에 대한 재 인보이싱에 이르기까지 개인 비용 프로세스를 추적합니다."
+
+#~ msgid ""
+#~ "Install more modules. A few modules are proposed according to the "
+#~ "association profile you selected. You will be able to install them based on "
+#~ "our requirements."
+#~ msgstr "추가 모듈 설치. 귀하가 선택한 협회 프로파일에 따라 몇몇 모듈이 추가 설치됩니다."
+
+#~ msgid "Cancel"
+#~ msgstr "취소"
diff --git a/addons/association/i18n/lt.po b/addons/association/i18n/lt.po
index 01d08e94bcc..993afba3f75 100644
--- a/addons/association/i18n/lt.po
+++ b/addons/association/i18n/lt.po
@@ -6,141 +6,127 @@ 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-02-03 06:24+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:38+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
+msgid "Resources Management"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
-
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/association/i18n/nl.po b/addons/association/i18n/nl.po
index af39a7b22cd..e7f1ff219e8 100644
--- a/addons/association/i18n/nl.po
+++ b/addons/association/i18n/nl.po
@@ -6,142 +6,131 @@ 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-09-08 14:48+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:46+0000\n"
 "Last-Translator: Freerk Kalsbeek (Mindswitch BV) <f.kalsbeek@mindswitch.nl>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 "De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Ongeldige XML voor overzicht"
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr "Profiel voor verenigingen"
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor overzicht"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
+msgid "Resources Management"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr ""
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
-
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
+#~ msgid "Profile for Associates"
+#~ msgstr "Profiel voor verenigingen"
diff --git a/addons/association/i18n/pl.po b/addons/association/i18n/pl.po
index 94118fd7b31..48a527e766b 100644
--- a/addons/association/i18n/pl.po
+++ b/addons/association/i18n/pl.po
@@ -6,17 +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: 2009-04-10 10:18+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:46+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
@@ -24,125 +44,91 @@ msgstr ""
 "Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
 "specjalnych !"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
+msgid "Resources Management"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
-
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/association/i18n/pt.po b/addons/association/i18n/pt.po
index 0e79e4a09bf..06b93bcdff4 100644
--- a/addons/association/i18n/pt.po
+++ b/addons/association/i18n/pt.po
@@ -6,142 +6,128 @@ 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-09-08 12:29+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:46+0000\n"
 "Last-Translator: Madalena_prime <madalena.barreto@prime.cv>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 "O nome do objecto deve começar com x_ e não pode conter um carácter especial!"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML inválido para a arquitectura de vista"
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura de vista"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
+msgid "Resources Management"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
-
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/association/i18n/pt_BR.po b/addons/association/i18n/pt_BR.po
index 025501d7783..ef8f51127a0 100644
--- a/addons/association/i18n/pt_BR.po
+++ b/addons/association/i18n/pt_BR.po
@@ -6,17 +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: 2009-04-10 10:18+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:46+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
@@ -24,125 +44,91 @@ msgstr ""
 "O nome do objeto precisa iniciar com x_ e não conter nenhum caracter "
 "especial!"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Invalido XML para Arquitetura da View"
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalido XML para Arquitetura da View"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
+msgid "Resources Management"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
-
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/association/i18n/ro.po b/addons/association/i18n/ro.po
index 01d08e94bcc..993afba3f75 100644
--- a/addons/association/i18n/ro.po
+++ b/addons/association/i18n/ro.po
@@ -6,141 +6,127 @@ 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-02-03 06:24+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:38+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
+msgid "Resources Management"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
-
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/association/i18n/ru.po b/addons/association/i18n/ru.po
index eef86eb495a..6cff73442ea 100644
--- a/addons/association/i18n/ru.po
+++ b/addons/association/i18n/ru.po
@@ -6,17 +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: 2009-09-08 15:14+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:44+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
@@ -24,125 +44,91 @@ msgstr ""
 "Название объекта должно начинаться с x_  и не должно содержать специальных "
 "символов !"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Неправильный XML для просмотра архитектуры!"
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
+msgid "Resources Management"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
-
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/association/i18n/sl.po b/addons/association/i18n/sl.po
index 64c81e2a50d..11bbf1f602b 100644
--- a/addons/association/i18n/sl.po
+++ b/addons/association/i18n/sl.po
@@ -6,142 +6,146 @@ 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-12-10 21:50+0000\n"
-"Last-Translator: Simon Vidmar <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:44+0000\n"
+"Last-Translator: mga (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr "Wiki"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 "Naziv objekta se mora začeti z 'x_' in ne sme vsebovati posebnih znakov."
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr "Upravljanje povezav"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neveljaven XML za arhitekturo pogleda."
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "Napačno ime modela v definiciji dejanja."
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "Upravljanje virov"
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr "profile.association.config.install_modules_wizard"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr "Razčlenjenost"
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Upravljanje dokumentov"
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr "Namesti"
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr "Sledenje izdatkov"
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr "Namesti dodatni modul"
+msgid "Resources Management"
+msgstr "Upravljanje virov"
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr "profile.association.config.install_modules_wizard"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr "Upravljanje projektov"
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr "Wiki"
+#~ msgid "Relationship Management"
+#~ msgstr "Upravljanje povezav"
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
+#~ msgid "Segmentation"
+#~ msgstr "Razčlenjenost"
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
+#~ msgid "Document Management"
+#~ msgstr "Upravljanje dokumentov"
 
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
+#~ msgid "Install"
+#~ msgstr "Namesti"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "Prekliči"
+#~ msgid "Install Extra Module"
+#~ msgstr "Namesti dodatni modul"
+
+#~ msgid "Cancel"
+#~ msgstr "Prekliči"
diff --git a/addons/association/i18n/sq.po b/addons/association/i18n/sq.po
index 4a6763afcf6..33ca2c91031 100644
--- a/addons/association/i18n/sq.po
+++ b/addons/association/i18n/sq.po
@@ -1,266 +1,133 @@
-# Translation of OpenERP Server.
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_association
+# Albanian 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: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 15:23:46+0000\n"
-"PO-Revision-Date: 2009-08-28 15:23:46+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"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-11-12 11:38+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Albanian <sq@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr ""
-
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."
-msgstr ""
-
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,hr_expense:0
-msgid "Expenses Tracking"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-#: field:profile.association.config.install_modules_wizard,project:0
-msgid "Project Management"
-msgstr ""
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
 msgid "Wiki"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
 #: field:profile.association.config.install_modules_wizard,project_gtd:0
 msgid "Getting Things Done"
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid "Tracks the personal expenses process, from the employee expense encoding, to the reimbursement of the employee up to the reinvoicing to the final customer."
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid "Install more modules. A few modules are proposed according to the association profile you selected. You will be able to install them based on our requirements."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
-
-# This file contains the translation of the following modules:
-#	* profile_association
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 15:23:46+0000\n"
-"PO-Revision-Date: 2009-08-28 15:23:46+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: profile_association
+#. module: association
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
+msgid "title"
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
 msgstr ""
 
-#. module: profile_association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
+#. module: association
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project_gtd:0
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
+msgid "Resources Management"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
-
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid "Tracks the personal expenses process, from the employee expense encoding, to the reimbursement of the employee up to the reinvoicing to the final customer."
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid "Install more modules. A few modules are proposed according to the association profile you selected. You will be able to install them based on our requirements."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
-
diff --git a/addons/association/i18n/sr.po b/addons/association/i18n/sr.po
new file mode 100644
index 00000000000..b662e21596c
--- /dev/null
+++ b/addons/association/i18n/sr.po
@@ -0,0 +1,142 @@
+# Serbian 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:46+0000\n"
+"PO-Revision-Date: 2010-11-13 22:07+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr "Wiki"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr "Upravljanje Dogadjajima"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr "Da Zavrsimo"
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr "Ovaj modul ima namenu da kreira Profil za Asociacije"
+
+#. module: association
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr "Konfiguracioni Proces"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr "Naslov"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr "POmaze vam da upravljate i organizujete svoje dogadjaje."
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr "Slika"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+"Prati i upravlja troskovima zaposlenih, i moze da automatski re-fakturise "
+"klijente ukoliko su troskovi vezani za projekat."
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neispravan XML za pregled arhitekture!"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project_gtd:0
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
+msgstr ""
+"GTD je metodologija za efikasno organizovanje sebe i svojih zadataka. Ovaj "
+"modul potpuno integrise GTD principe sa OpenERP Projekt Menadzmentom."
+
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
+msgstr "Profil Asociacije"
+
+#. module: association
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Neispravno ime u definiciji akcije."
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,hr_expense:0
+msgid "Expenses Tracking"
+msgstr "Pracenje Troskova"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Resources Management"
+msgstr "Upravljanje Resursima"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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 ""
+"Omogucava ti da kreiras strane i grupe strana sa namerom da odrzis biznis "
+"iskustvo i delis ga sa i medju svojim zaposlenima."
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+"POmaze ti da upravljas svojim projektima i zadacima prateci ih, generisanjem "
+"planova, itd..."
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr "profile.association.config.install_modules_wizard"
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr "Dogadjaji"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+#: field:profile.association.config.install_modules_wizard,project:0
+msgid "Project Management"
+msgstr "Upravljanje Projektima"
diff --git a/addons/association/i18n/sv.po b/addons/association/i18n/sv.po
index e697bda8ef9..a2d5584ff99 100644
--- a/addons/association/i18n/sv.po
+++ b/addons/association/i18n/sv.po
@@ -6,142 +6,128 @@ 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-04-10 10:18+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:43+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 "Objektnamnet måste börja med x_ och får inte innehålla några specialtecken!"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
+msgid "Resources Management"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
-
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/association/i18n/tlh.po b/addons/association/i18n/tlh.po
index 01d08e94bcc..993afba3f75 100644
--- a/addons/association/i18n/tlh.po
+++ b/addons/association/i18n/tlh.po
@@ -6,141 +6,127 @@ 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-02-03 06:24+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:38+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
+msgid "Resources Management"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
-
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/association/i18n/tr.po b/addons/association/i18n/tr.po
index 11e3d77dadd..c61b794515f 100644
--- a/addons/association/i18n/tr.po
+++ b/addons/association/i18n/tr.po
@@ -6,141 +6,136 @@ 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-02-14 21:37+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:43+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-02-17 04:56+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Görüntüleme mimarisi için Geçersiz XML"
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
-msgstr ""
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
+msgstr "Şirket Profili"
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr "Şirket Profili"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "Döküman Yönetimi"
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr "Şirket Profili : Install Extra Modules"
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
+msgid "Resources Management"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr "Proje Yönetimi"
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr ""
+#~ msgid "Document Management"
+#~ msgstr "Döküman Yönetimi"
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
+#~ msgid "Association Profile : Install Extra Modules"
+#~ msgstr "Şirket Profili : Install Extra Modules"
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "İptal"
+#~ msgid "Cancel"
+#~ msgstr "İptal"
diff --git a/addons/association/i18n/uk.po b/addons/association/i18n/uk.po
index 137059e771d..e8c1da169bc 100644
--- a/addons/association/i18n/uk.po
+++ b/addons/association/i18n/uk.po
@@ -6,142 +6,128 @@ 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-09-08 15:50+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:43+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 "Назва об'єкту має починатися з x_ і не містити ніяких спеціальних символів!"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Неправильний XML для Архітектури Вигляду!"
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильний XML для Архітектури Вигляду!"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
+msgid "Resources Management"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
-
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/association/i18n/vi.po b/addons/association/i18n/vi.po
index a66cd8b284e..ed590b89fa5 100644
--- a/addons/association/i18n/vi.po
+++ b/addons/association/i18n/vi.po
@@ -1,266 +1,133 @@
-# Translation of OpenERP Server.
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* profile_association
+# Vietnamese 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: OpenERP Server 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:00:38+0000\n"
-"PO-Revision-Date: 2009-08-28 16:00:38+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
+"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-11-12 11:38+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Vietnamese <vi@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
-#: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
-msgstr ""
-
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."
-msgstr ""
-
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,hr_expense:0
-msgid "Expenses Tracking"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-#: field:profile.association.config.install_modules_wizard,project:0
-msgid "Project Management"
-msgstr ""
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,wiki:0
 msgid "Wiki"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
 #: field:profile.association.config.install_modules_wizard,project_gtd:0
 msgid "Getting Things Done"
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid "Tracks the personal expenses process, from the employee expense encoding, to the reimbursement of the employee up to the reinvoicing to the final customer."
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
 msgstr ""
 
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid "Install more modules. A few modules are proposed according to the association profile you selected. You will be able to install them based on our requirements."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
-
-# This file contains the translation of the following modules:
-#	* profile_association
-#
-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:00:38+0000\n"
-"PO-Revision-Date: 2009-08-28 16:00:38+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: profile_association
+#. module: association
 #: constraint:ir.model:0
-msgid "The Object name must start with x_ and not contain any special character !"
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
+msgid "title"
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "GTD is a methodology to efficiently organise yourself and your tasks. This module fully integrates GTD principle with OpenERP's project management."
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid "The Document Management System of Open ERP allows you to store, browse, automatically index, search and preview all kind of documents (internal documents, printed reports, calendar system). It opens an FTP access for the users to easily browse association's document."
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
 msgstr ""
 
-#. module: profile_association
-#: constraint:ir.actions.act_window:0
-msgid "Invalid model name in the action definition."
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
+#. module: association
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
 msgstr ""
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project_gtd:0
+msgid ""
+"GTD is a methodology to efficiently organise yourself and your tasks. This "
+"module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
+msgid "Resources Management"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
-
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid "Tracks the personal expenses process, from the employee expense encoding, to the reimbursement of the employee up to the reinvoicing to the final customer."
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid "Install more modules. A few modules are proposed according to the association profile you selected. You will be able to install them based on our requirements."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
-
diff --git a/addons/association/i18n/zh_CN.po b/addons/association/i18n/zh_CN.po
index f27aebc15ab..7757044be38 100644
--- a/addons/association/i18n/zh_CN.po
+++ b/addons/association/i18n/zh_CN.po
@@ -6,143 +6,148 @@ 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-12-16 13:39+0000\n"
-"Last-Translator: Silence <Unknown>\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:42+0000\n"
+"Last-Translator: mga (Open ERP) <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-17 04:44+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr "Wiki"
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr "对象名必须以“x_”开始且不能包含任何特殊字符！"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "无效XML视图结构!"
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
 msgstr ""
-"Open ERP的单据管理系统，运行你保存、浏览、自动索引、搜索和预览所有单据（包括内部单据、打印报表、日历系统）。It opens an FTP "
-"access for the users to easily browse association's document."
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr "操作定义中使用了无效的模式名称。"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr "资源管理"
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr "细分"
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr "文档管理"
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效XML视图结构!"
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr "安装"
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
+msgid "Resources Management"
+msgstr "资源管理"
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr "项目管理"
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr "Wiki"
+#~ msgid ""
+#~ "The Document Management System of Open ERP allows you to store, browse, "
+#~ "automatically index, search and preview all kind of documents (internal "
+#~ "documents, printed reports, calendar system). It opens an FTP access for the "
+#~ "users to easily browse association's document."
+#~ msgstr ""
+#~ "Open ERP的单据管理系统，运行你保存、浏览、自动索引、搜索和预览所有单据（包括内部单据、打印报表、日历系统）。It opens an FTP "
+#~ "access for the users to easily browse association's document."
 
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
+#~ msgid "Segmentation"
+#~ msgstr "细分"
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
+#~ msgid "Document Management"
+#~ msgstr "文档管理"
 
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
+#~ msgid "Install"
+#~ msgstr "安装"
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr "取消"
+#~ msgid "Cancel"
+#~ msgstr "取消"
diff --git a/addons/association/i18n/zh_TW.po b/addons/association/i18n/zh_TW.po
index b4d60c36b12..4c179225ffa 100644
--- a/addons/association/i18n/zh_TW.po
+++ b/addons/association/i18n/zh_TW.po
@@ -6,141 +6,127 @@ 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-01-30 13:13+0000\n"
+"POT-Creation-Date: 2010-10-18 17:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:39+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-12-16 05:21+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. module: profile_association
+#. module: association
+#: field:profile.association.config.install_modules_wizard,wiki:0
+msgid "Wiki"
+msgstr ""
+
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "Event Management"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,project_gtd:0
+msgid "Getting Things Done"
+msgstr ""
+
+#. module: association
+#: model:ir.module.module,description:association.module_meta_information
+msgid "This module is to create Profile for Associates"
+msgstr ""
+
+#. module: association
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Relationship Management"
+#. module: association
+#: field:profile.association.config.install_modules_wizard,progress:0
+msgid "Configuration Progress"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: view:profile.association.config.install_modules_wizard:0
+msgid "title"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,event_project:0
+msgid "Helps you to manage and organize your events."
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: association
+#: help:profile.association.config.install_modules_wizard,hr_expense:0
+msgid ""
+"Tracks and manages employee expenses, and can automatically re-invoice "
+"clients if the expenses are project-related."
+msgstr ""
+
+#. module: association
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: association
 #: help:profile.association.config.install_modules_wizard,project_gtd:0
 msgid ""
 "GTD is a methodology to efficiently organise yourself and your tasks. This "
 "module fully integrates GTD principle with OpenERP's project management."
 msgstr ""
 
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,board_document:0
-msgid ""
-"The Document Management System of Open ERP allows you to store, browse, "
-"automatically index, search and preview all kind of documents (internal "
-"documents, printed reports, calendar system). It opens an FTP access for the "
-"users to easily browse association's document."
+#. module: association
+#: model:ir.module.module,shortdesc:association.module_meta_information
+msgid "Association profile"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
 msgstr ""
 
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Resources Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.model,name:profile_association.model_profile_association_config_install_modules_wizard
-msgid "profile.association.config.install_modules_wizard"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,segmentation:0
-msgid "Segmentation"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,shortdesc:profile_association.module_meta_information
-msgid "Association profile"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,board_document:0
-msgid "Document Management"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.act_window,name:profile_association.action_config_install_module
-msgid "Association Profile : Install Extra Modules"
-msgstr ""
-
-#. module: profile_association
-#: model:ir.module.module,description:profile_association.module_meta_information
-msgid "Profile for Associates"
-msgstr ""
-
-#. module: profile_association
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,crm_configuration:0
-msgid "Partner Relation & Calendars"
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Install"
-msgstr ""
-
-#. module: profile_association
+#. module: association
 #: field:profile.association.config.install_modules_wizard,hr_expense:0
 msgid "Expenses Tracking"
 msgstr ""
 
-#. module: profile_association
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
-msgid "Install Extra Module"
+msgid "Resources Management"
 msgstr ""
 
-#. module: profile_association
+#. module: association
+#: help:profile.association.config.install_modules_wizard,wiki:0
+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: association
+#: help:profile.association.config.install_modules_wizard,project:0
+msgid ""
+"Helps you manage your projects and tasks by tracking them, generating "
+"plannings, etc..."
+msgstr ""
+
+#. module: association
+#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard
+msgid "profile.association.config.install_modules_wizard"
+msgstr ""
+
+#. module: association
+#: field:profile.association.config.install_modules_wizard,event_project:0
+msgid "Events"
+msgstr ""
+
+#. module: association
 #: view:profile.association.config.install_modules_wizard:0
 #: field:profile.association.config.install_modules_wizard,project:0
 msgid "Project Management"
 msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,wiki:0
-msgid "Wiki"
-msgstr ""
-
-#. module: profile_association
-#: field:profile.association.config.install_modules_wizard,project_gtd:0
-msgid "Getting Things Done"
-msgstr ""
-
-#. module: profile_association
-#: help:profile.association.config.install_modules_wizard,hr_expense:0
-msgid ""
-"Tracks the personal expenses process, from the employee expense encoding, to "
-"the reimbursement of the employee up to the reinvoicing to the final "
-"customer."
-msgstr ""
-
-#. module: profile_association
-#: model:ir.actions.todo,note:profile_association.config_install_module
-msgid ""
-"Install more modules. A few modules are proposed according to the "
-"association profile you selected. You will be able to install them based on "
-"our requirements."
-msgstr ""
-
-#. module: profile_association
-#: view:profile.association.config.install_modules_wizard:0
-msgid "Cancel"
-msgstr ""
diff --git a/addons/auction/i18n/nl.po b/addons/auction/i18n/nl.po
index f5f4dbcd4c6..d5d9bcf4372 100644
--- a/addons/auction/i18n/nl.po
+++ b/addons/auction/i18n/nl.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-09-09 07:01+0000\n"
+"PO-Revision-Date: 2010-11-13 08:48+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:36+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: auction
 #: model:ir.ui.menu,name:auction.auction_report_menu
 msgid "Reporting"
-msgstr "Rapportering"
+msgstr "Overzichten"
 
 #. module: auction
 #: model:ir.model,name:auction.model_auction_taken
diff --git a/addons/base_calendar/i18n/el.po b/addons/base_calendar/i18n/el.po
index 983609ff112..3122fd17428 100644
--- a/addons/base_calendar/i18n/el.po
+++ b/addons/base_calendar/i18n/el.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-11-11 19:58+0000\n"
+"PO-Revision-Date: 2010-11-12 09:39+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_calendar
diff --git a/addons/base_module_record/i18n/el.po b/addons/base_module_record/i18n/el.po
index 54c820c4a0e..7f0543f02c9 100644
--- a/addons/base_module_record/i18n/el.po
+++ b/addons/base_module_record/i18n/el.po
@@ -6,13 +6,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-11-11 14:31+0000\n"
+"PO-Revision-Date: 2010-11-12 09:18+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/base_report_creator/i18n/it.po b/addons/base_report_creator/i18n/it.po
index 3d838502ec8..79a02fe086b 100644
--- a/addons/base_report_creator/i18n/it.po
+++ b/addons/base_report_creator/i18n/it.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-11-11 12:20+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-11-12 09:26+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_creator/i18n/ru.po b/addons/base_report_creator/i18n/ru.po
index 9a9dc0d331d..1d6051b9ac6 100644
--- a/addons/base_report_creator/i18n/ru.po
+++ b/addons/base_report_creator/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-11-11 20:54+0000\n"
-"Last-Translator: Evgeniy Devyatkin <Unknown>\n"
+"PO-Revision-Date: 2010-11-12 08:57+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_creator
diff --git a/addons/base_report_designer/base_report_designer.py b/addons/base_report_designer/base_report_designer.py
index 283c8ec7e23..9f185837169 100644
--- a/addons/base_report_designer/base_report_designer.py
+++ b/addons/base_report_designer/base_report_designer.py
@@ -56,8 +56,7 @@ class report_xml(osv.osv):
             'report_sxw_content': base64.decodestring(file_sxw), 
             'report_rml_content': str(sxw2rml(sxwval, xsl=fp.read())), 
         })
-        db = pooler.get_db_only(cr.dbname)
-        interface.register_all(db)
+        pool.get('ir.actions.report.xml').register_all(cr)
         return True
 
     def report_get(self, cr, uid, report_id, context={}):
diff --git a/addons/base_report_designer/i18n/it.po b/addons/base_report_designer/i18n/it.po
index 25726de7f30..3e322609f29 100644
--- a/addons/base_report_designer/i18n/it.po
+++ b/addons/base_report_designer/i18n/it.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-11-11 11:52+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-11-12 09: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-11-12 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_report_designer
diff --git a/addons/base_setup/i18n/el.po b/addons/base_setup/i18n/el.po
index a076998ac29..c34b4f6473d 100644
--- a/addons/base_setup/i18n/el.po
+++ b/addons/base_setup/i18n/el.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-11-11 14:07+0000\n"
+"PO-Revision-Date: 2010-11-12 10:32+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: base_setup
diff --git a/addons/base_synchro/i18n/it.po b/addons/base_synchro/i18n/it.po
new file mode 100644
index 00000000000..b058daeeb26
--- /dev/null
+++ b/addons/base_synchro/i18n/it.po
@@ -0,0 +1,307 @@
+# Italian 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:46+0000\n"
+"PO-Revision-Date: 2010-11-13 08:28+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Italian <it@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
+msgid "Base Synchronization"
+msgstr ""
+
+#. module: base_synchro
+#: 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 per “x_” e non contenere alcun carattere "
+"speciale!"
+
+#. module: base_synchro
+#: 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: base_synchro
+#: field:base.synchro,user_id:0
+msgid "Send Result To"
+msgstr "Invia risultato a"
+
+#. module: base_synchro
+#: field:base.synchro.server,server_db:0
+msgid "Server Database"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.server:0
+#: model:ir.model,name:base_synchro.model_base_synchro_server
+msgid "Synchronized server"
+msgstr "Server sincronizzato"
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,name:0
+msgid "Field Name"
+msgstr "Nome campo"
+
+#. module: base_synchro
+#: field:base.synchro.obj,synchronize_date:0
+msgid "Latest Synchronization"
+msgstr "Ultima sincronizzazione"
+
+#. module: base_synchro
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Errore! Non è possibile creare un menù ricorsivo"
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_avoid
+msgid "Fields to not synchronize"
+msgstr "Campi da non sincronizzare"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Close"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Transfer Data To Server"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj
+msgid "Register Class"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: model:ir.actions.act_window,name:base_synchro.action_transfer_tree
+#: model:ir.ui.menu,name:base_synchro.transfer_menu_id
+msgid "Synchronized objects"
+msgstr "Oggetti sincronizzati"
+
+#. module: base_synchro
+#: field:base.synchro.server,obj_ids:0
+msgid "Models"
+msgstr "Modelli"
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,obj_id:0
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,obj_id:0
+msgid "Object"
+msgstr "Oggetto"
+
+#. module: base_synchro
+#: field:base.synchro.server,login:0
+msgid "User Name"
+msgstr "Nome utente"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: view:base.synchro.obj.line:0
+msgid "Group By"
+msgstr "Raggruppa per"
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Upload"
+msgstr "Upload"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Latest synchronization"
+msgstr "Ultima sincronizzazione"
+
+#. module: base_synchro
+#: model:ir.module.module,description:base_synchro.module_meta_information
+msgid "Synchronization with all objects."
+msgstr "Sincronizzazione con tutti gli oggetti"
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,name:0
+msgid "Date"
+msgstr "Data"
+
+#. module: base_synchro
+#: field:base.synchro.server,password:0
+msgid "Password"
+msgstr "Password"
+
+#. module: base_synchro
+#: field:base.synchro.obj,avoid_ids:0
+msgid "Fields Not Sync."
+msgstr "Campi non sincr."
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Both"
+msgstr ""
+
+#. module: base_synchro
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valido per la struttura della vista!"
+
+#. module: base_synchro
+#: field:base.synchro.obj,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Fields"
+msgstr "Campi"
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+msgid "Transfered Ids Details"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,action:0
+msgid "Synchronisation direction"
+msgstr "Direzione sincronizzazione"
+
+#. module: base_synchro
+#: field:base.synchro.obj,server_id:0
+msgid "Server"
+msgstr "Server"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_obj_line_tree
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_line
+#: model:ir.ui.menu,name:base_synchro.menu_action_base_synchro_obj_line_tree
+msgid "Synchronized instances"
+msgstr "Istanze sincronizzate"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: field:base.synchro.obj,model_id:0
+msgid "Object to synchronize"
+msgstr "Oggetti da sincronizzare"
+
+#. module: base_synchro
+#: model:ir.module.module,shortdesc:base_synchro.module_meta_information
+msgid "Base Synchro"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_server_tree
+#: model:ir.ui.menu,name:base_synchro.synchro_server_tree_menu_id
+msgid "Synchronized Servers"
+msgstr "Server Sincronizzati"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Transfer Details"
+msgstr "Dettagli trasferimento"
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,remote_id:0
+msgid "Remote Id"
+msgstr "ID remoto"
+
+#. module: base_synchro
+#: field:base.synchro.obj,line_id:0
+msgid "Ids Affected"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_63
+msgid "History"
+msgstr "Storico"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_62
+msgid "Synchronization"
+msgstr "Sincronizzazione"
+
+#. module: base_synchro
+#: field:base.synchro.obj,domain:0
+msgid "Domain"
+msgstr "Dominio"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Synchronize"
+msgstr "_Sincronizza"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "OK"
+msgstr "OK"
+
+#. module: base_synchro
+#: field:base.synchro.server,name:0
+msgid "Server name"
+msgstr "Nome server"
+
+#. module: base_synchro
+#: field:base.synchro.obj,sequence:0
+msgid "Sequence"
+msgstr "Sequenza"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid ""
+"The synchronisation has been started.You will receive a request when it's "
+"done."
+msgstr ""
+"La sincronizzazione è partita. Riceverete una notifica appena è completata."
+
+#. module: base_synchro
+#: field:base.synchro.server,server_port:0
+msgid "Server Port"
+msgstr "Porta del server"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.menu_action_view_base_synchro
+msgid "Synchronize objects"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Synchronization Complited!"
+msgstr "Sincronizzazione completata!"
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro
+msgid "base.synchro"
+msgstr "base.synchro"
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,local_id:0
+msgid "Local Id"
+msgstr "ID Locale"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.actions_regclass_tree
+#: model:ir.actions.act_window,name:base_synchro.actions_transfer_line_form
+msgid "Filters"
+msgstr "Filtri"
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Download"
+msgstr "Download"
+
+#. module: base_synchro
+#: field:base.synchro,server_url:0
+#: field:base.synchro.server,server_url:0
+msgid "Server URL"
+msgstr "URL server"
diff --git a/addons/base_synchro/i18n/sr.po b/addons/base_synchro/i18n/sr.po
new file mode 100644
index 00000000000..60d9442dfeb
--- /dev/null
+++ b/addons/base_synchro/i18n/sr.po
@@ -0,0 +1,305 @@
+# Serbian 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:46+0000\n"
+"PO-Revision-Date: 2010-11-13 08:31+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
+msgid "Base Synchronization"
+msgstr "Sinhronizacija Baze"
+
+#. module: base_synchro
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere!"
+
+#. module: base_synchro
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Neispravno ime modela u definiciji akcije."
+
+#. module: base_synchro
+#: field:base.synchro,user_id:0
+msgid "Send Result To"
+msgstr "Posalji rezultat"
+
+#. module: base_synchro
+#: field:base.synchro.server,server_db:0
+msgid "Server Database"
+msgstr "Server Databaze"
+
+#. module: base_synchro
+#: view:base.synchro.server:0
+#: model:ir.model,name:base_synchro.model_base_synchro_server
+msgid "Synchronized server"
+msgstr "Sinhronisani Server"
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,name:0
+msgid "Field Name"
+msgstr "Ime polja"
+
+#. module: base_synchro
+#: field:base.synchro.obj,synchronize_date:0
+msgid "Latest Synchronization"
+msgstr "Poslednja Sinhronizacija"
+
+#. module: base_synchro
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Gredka ! Ne mozes kreirati rekursivni meni."
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_avoid
+msgid "Fields to not synchronize"
+msgstr "Polja koja je treba sinhronizirati"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Close"
+msgstr "_Close"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Transfer Data To Server"
+msgstr "Prebaci podatke na Server"
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj
+msgid "Register Class"
+msgstr "Registruj klasu"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: model:ir.actions.act_window,name:base_synchro.action_transfer_tree
+#: model:ir.ui.menu,name:base_synchro.transfer_menu_id
+msgid "Synchronized objects"
+msgstr "Sinhronizovani objekti"
+
+#. module: base_synchro
+#: field:base.synchro.server,obj_ids:0
+msgid "Models"
+msgstr "Modeli"
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,obj_id:0
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,obj_id:0
+msgid "Object"
+msgstr "Objekti"
+
+#. module: base_synchro
+#: field:base.synchro.server,login:0
+msgid "User Name"
+msgstr "Korisnicko IMe"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: view:base.synchro.obj.line:0
+msgid "Group By"
+msgstr "Grupirano po"
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Upload"
+msgstr "Upload"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Latest synchronization"
+msgstr "Poslednja Sinhronizacija"
+
+#. module: base_synchro
+#: model:ir.module.module,description:base_synchro.module_meta_information
+msgid "Synchronization with all objects."
+msgstr "Sinhronizacija sa svim objektima"
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,name:0
+msgid "Date"
+msgstr "datum"
+
+#. module: base_synchro
+#: field:base.synchro.server,password:0
+msgid "Password"
+msgstr "Lozinka"
+
+#. module: base_synchro
+#: field:base.synchro.obj,avoid_ids:0
+msgid "Fields Not Sync."
+msgstr "Ne sinhronizovana polja"
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Both"
+msgstr "Oba"
+
+#. module: base_synchro
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neispravan XML za Pregled arhitekture"
+
+#. module: base_synchro
+#: field:base.synchro.obj,name:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Fields"
+msgstr "Polja"
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+msgid "Transfered Ids Details"
+msgstr "Prebaceni detalji Id-ova"
+
+#. module: base_synchro
+#: field:base.synchro.obj,action:0
+msgid "Synchronisation direction"
+msgstr "Pravac Sinhronizacije"
+
+#. module: base_synchro
+#: field:base.synchro.obj,server_id:0
+msgid "Server"
+msgstr "Server"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_obj_line_tree
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_line
+#: model:ir.ui.menu,name:base_synchro.menu_action_base_synchro_obj_line_tree
+msgid "Synchronized instances"
+msgstr "Sinhronizaovane Instance"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: field:base.synchro.obj,model_id:0
+msgid "Object to synchronize"
+msgstr "Objekat za sinhronizaciju"
+
+#. module: base_synchro
+#: model:ir.module.module,shortdesc:base_synchro.module_meta_information
+msgid "Base Synchro"
+msgstr "Sinhronizacija Baze"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_server_tree
+#: model:ir.ui.menu,name:base_synchro.synchro_server_tree_menu_id
+msgid "Synchronized Servers"
+msgstr "Sinhronizovani Serveri"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Transfer Details"
+msgstr "detalji transfera"
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,remote_id:0
+msgid "Remote Id"
+msgstr "Daljinski ID"
+
+#. module: base_synchro
+#: field:base.synchro.obj,line_id:0
+msgid "Ids Affected"
+msgstr "ID koji su afektovani"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_63
+msgid "History"
+msgstr "Istorija"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_62
+msgid "Synchronization"
+msgstr "Sinhronizacija"
+
+#. module: base_synchro
+#: field:base.synchro.obj,domain:0
+msgid "Domain"
+msgstr "Domacin"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Synchronize"
+msgstr "_Synchronize"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "OK"
+msgstr "OK"
+
+#. module: base_synchro
+#: field:base.synchro.server,name:0
+msgid "Server name"
+msgstr "Ime Servera"
+
+#. module: base_synchro
+#: field:base.synchro.obj,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid ""
+"The synchronisation has been started.You will receive a request when it's "
+"done."
+msgstr "Sinhronizacija je zapoceta. Primicete zahtev po zavrsetku iste."
+
+#. module: base_synchro
+#: field:base.synchro.server,server_port:0
+msgid "Server Port"
+msgstr "Port Servera"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.menu_action_view_base_synchro
+msgid "Synchronize objects"
+msgstr "Sinhronizuj Objekte"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Synchronization Complited!"
+msgstr "Sinhronizacija Kompletirana !"
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro
+msgid "base.synchro"
+msgstr "base.synchro"
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,local_id:0
+msgid "Local Id"
+msgstr "Lokalni ID"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.actions_regclass_tree
+#: model:ir.actions.act_window,name:base_synchro.actions_transfer_line_form
+msgid "Filters"
+msgstr "Filteri"
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Download"
+msgstr "Download"
+
+#. module: base_synchro
+#: field:base.synchro,server_url:0
+#: field:base.synchro.server,server_url:0
+msgid "Server URL"
+msgstr "URL Servera"
diff --git a/addons/base_synchro/i18n/zh_CN.po b/addons/base_synchro/i18n/zh_CN.po
new file mode 100644
index 00000000000..e58e6e9d0d4
--- /dev/null
+++ b/addons/base_synchro/i18n/zh_CN.po
@@ -0,0 +1,304 @@
+# Chinese (Simplified) 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:46+0000\n"
+"PO-Revision-Date: 2010-11-13 09:58+0000\n"
+"Last-Translator: ZhangCheng <skyxxzc@gmail.com>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
+msgid "Base Synchronization"
+msgstr ""
+
+#. module: base_synchro
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr "对象名必须以 x_ 且不包含任何特殊字符！"
+
+#. module: base_synchro
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro,user_id:0
+msgid "Send Result To"
+msgstr "将结果发送到"
+
+#. module: base_synchro
+#: field:base.synchro.server,server_db:0
+msgid "Server Database"
+msgstr "服务器数据库"
+
+#. module: base_synchro
+#: view:base.synchro.server:0
+#: model:ir.model,name:base_synchro.model_base_synchro_server
+msgid "Synchronized server"
+msgstr "已同步的服务器"
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,name:0
+msgid "Field Name"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,synchronize_date:0
+msgid "Latest Synchronization"
+msgstr "最后一次同步"
+
+#. module: base_synchro
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "错误！无法创建递归菜单。"
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_avoid
+msgid "Fields to not synchronize"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Close"
+msgstr "关闭(_C)"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Transfer Data To Server"
+msgstr "将数据上传至服务器"
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro_obj
+msgid "Register Class"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: model:ir.actions.act_window,name:base_synchro.action_transfer_tree
+#: model:ir.ui.menu,name:base_synchro.transfer_menu_id
+msgid "Synchronized objects"
+msgstr "已同步的对象"
+
+#. module: base_synchro
+#: field:base.synchro.server,obj_ids:0
+msgid "Models"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj.avoid,obj_id:0
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,obj_id:0
+msgid "Object"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,login:0
+msgid "User Name"
+msgstr "用户名"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: view:base.synchro.obj.line:0
+msgid "Group By"
+msgstr "分组方式"
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Upload"
+msgstr "上传"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Latest synchronization"
+msgstr "最后一次上传"
+
+#. module: base_synchro
+#: model:ir.module.module,description:base_synchro.module_meta_information
+msgid "Synchronization with all objects."
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+#: field:base.synchro.obj.line,name:0
+msgid "Date"
+msgstr "日期"
+
+#. module: base_synchro
+#: field:base.synchro.server,password:0
+msgid "Password"
+msgstr "密码"
+
+#. module: base_synchro
+#: field:base.synchro.obj,avoid_ids:0
+msgid "Fields Not Sync."
+msgstr ""
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Both"
+msgstr ""
+
+#. module: base_synchro
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,name:0
+msgid "Name"
+msgstr "名称"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Fields"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro.obj.line:0
+msgid "Transfered Ids Details"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,action:0
+msgid "Synchronisation direction"
+msgstr "同步方向"
+
+#. module: base_synchro
+#: field:base.synchro.obj,server_id:0
+msgid "Server"
+msgstr "服务器"
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_obj_line_tree
+#: model:ir.model,name:base_synchro.model_base_synchro_obj_line
+#: model:ir.ui.menu,name:base_synchro.menu_action_base_synchro_obj_line_tree
+msgid "Synchronized instances"
+msgstr "已同步的实例"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+#: field:base.synchro.obj,model_id:0
+msgid "Object to synchronize"
+msgstr "要同步的对象"
+
+#. module: base_synchro
+#: model:ir.module.module,shortdesc:base_synchro.module_meta_information
+msgid "Base Synchro"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_server_tree
+#: model:ir.ui.menu,name:base_synchro.synchro_server_tree_menu_id
+msgid "Synchronized Servers"
+msgstr "已同步的服务器"
+
+#. module: base_synchro
+#: view:base.synchro.obj:0
+msgid "Transfer Details"
+msgstr "传输细节"
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,remote_id:0
+msgid "Remote Id"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj,line_id:0
+msgid "Ids Affected"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_63
+msgid "History"
+msgstr "历史"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.next_id_62
+msgid "Synchronization"
+msgstr "同步"
+
+#. module: base_synchro
+#: field:base.synchro.obj,domain:0
+msgid "Domain"
+msgstr "主机"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "_Synchronize"
+msgstr "同步(_S)"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "OK"
+msgstr "确定"
+
+#. module: base_synchro
+#: field:base.synchro.server,name:0
+msgid "Server name"
+msgstr "服务器名"
+
+#. module: base_synchro
+#: field:base.synchro.obj,sequence:0
+msgid "Sequence"
+msgstr "序列"
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid ""
+"The synchronisation has been started.You will receive a request when it's "
+"done."
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.server,server_port:0
+msgid "Server Port"
+msgstr "服务器端口"
+
+#. module: base_synchro
+#: model:ir.ui.menu,name:base_synchro.menu_action_view_base_synchro
+msgid "Synchronize objects"
+msgstr ""
+
+#. module: base_synchro
+#: view:base.synchro:0
+msgid "Synchronization Complited!"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.model,name:base_synchro.model_base_synchro
+msgid "base.synchro"
+msgstr ""
+
+#. module: base_synchro
+#: field:base.synchro.obj.line,local_id:0
+msgid "Local Id"
+msgstr ""
+
+#. module: base_synchro
+#: model:ir.actions.act_window,name:base_synchro.actions_regclass_tree
+#: model:ir.actions.act_window,name:base_synchro.actions_transfer_line_form
+msgid "Filters"
+msgstr ""
+
+#. module: base_synchro
+#: selection:base.synchro.obj,action:0
+msgid "Download"
+msgstr "下载"
+
+#. module: base_synchro
+#: field:base.synchro,server_url:0
+#: field:base.synchro.server,server_url:0
+msgid "Server URL"
+msgstr "服务器 URL"
diff --git a/addons/board/board.py b/addons/board/board.py
index 230954d942b..9677c8aaa17 100644
--- a/addons/board/board.py
+++ b/addons/board/board.py
@@ -21,6 +21,7 @@
 
 from osv import fields, osv
 import time
+import tools
 
 class board_board(osv.osv):
     """
@@ -223,4 +224,45 @@ class board_note(osv.osv):
 
 board_note()
 
+class res_log_report(osv.osv):
+    """ Log Report """
+    _name = "res.log.report"
+    _auto = False
+    _description = "Log Report"
+    _columns = {
+        'name': fields.char('Year', size=64, required=False, readonly=True),
+        'month':fields.selection([('01', 'January'), ('02', 'February'), \
+                                  ('03', 'March'), ('04', 'April'),\
+                                  ('05', 'May'), ('06', 'June'), \
+                                  ('07', 'July'), ('08', 'August'),\
+                                  ('09', 'September'), ('10', 'October'),\
+                                  ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
+        'day': fields.char('Day', size=128, readonly=True),
+        'creation_date': fields.date('Creation Date', readonly=True),
+        'res_model': fields.char('Object', size=128),
+        'nbr': fields.integer('# of Entries', readonly=True)
+     }
+
+    def init(self, cr):
+        """
+            Log Report
+            @param cr: the current row, from the database cursor
+        """
+        tools.drop_view_if_exists(cr,'res_log_report')
+        cr.execute("""
+            CREATE OR REPLACE VIEW res_log_report AS (
+                SELECT
+                    l.id as id,
+                    1 as nbr,
+                    to_char(l.create_date, 'YYYY') as name,
+                    to_char(l.create_date, 'MM') as month,
+                    to_char(l.create_date, 'YYYY-MM-DD') as day,
+                    to_char(l.create_date, 'YYYY-MM-DD') as creation_date,
+                    l.res_model as res_model,
+                    date_trunc('day',l.create_date) as create_date
+                FROM
+                    res_log l
+            )""")
+res_log_report()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/board/board_administration_view.xml b/addons/board/board_administration_view.xml
index 7c7c0da57cf..337ca63dab8 100644
--- a/addons/board/board_administration_view.xml
+++ b/addons/board/board_administration_view.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
+
         <!-- User Connection -->
         <record model="ir.ui.view" id="view_user_connection_tree">
             <field name="name">user.connection.tree</field>
@@ -14,7 +15,7 @@
             </field>
         </record>
         <record model="ir.actions.act_window" id="action_user_connection_tree">
-            <field name="name">Latest Connections</field>
+            <field name="name">User Connections</field>
             <field name="res_model">res.users</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -28,6 +29,108 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
+
+        <!--     Log report search view  -->
+        <record id="view_res_log_report_filter" model="ir.ui.view">
+            <field name="name">res.log.report.select</field>
+            <field name="model">res.log.report</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Log Analysis">
+                    <group col="20" colspan="8">
+                    <filter icon="terp-go-year" string="  Year  "
+                        domain="[('create_date','&lt;=', time.strftime('%%Y-%%m-%%d')),('create_date','&gt;=',time.strftime('%%Y-01-01'))]"
+                        help="Log created in current year"/>
+                    <filter icon="terp-go-month" string="   Month   "
+                        name="month"
+                        domain="[('create_date','&lt;=',(datetime.date.today()+relativedelta(day=31)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today()-relativedelta(day=1)).strftime('%%Y-%%m-%%d'))]"
+                        help="Log created in current month"/>
+                    <filter icon="terp-go-month"
+                         string="    Month-1    "
+                         separator="1"
+                         domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
+                         help="Log created in last month"/>
+                   </group>
+                   <newline/>
+                   <group  expand="0" string="Extended Filters..." groups="base.group_extended">
+                      <field name="creation_date"/>
+                   </group>
+                   <newline/>
+                   <group  expand="1" string="Group By...">
+                        <filter string="Model" icon="terp-go-home" context="{'group_by':'res_model'}" />
+                            <separator orientation="vertical"/>
+                        <filter string="Day" icon="terp-go-today"
+                            domain="[]" context="{'group_by':'day'}"/>
+                        <filter string="Month" icon="terp-go-month"
+                            domain="[]" context="{'group_by':'month'}" />
+                        <filter string="Year" icon="terp-go-year"
+                            domain="[]" context="{'group_by':'name'}" />
+                  </group>
+               </search>
+            </field>
+        </record>
+
+        <!--     Log report Tree view  -->
+        <record id="view_res_log_report_tree" model="ir.ui.view">
+            <field name="name">res.log.report.tree</field>
+            <field name="model">res.log.report</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+            <tree string="Log Analysis">
+                <field name="name" invisible="1"/>
+                <field name="month" invisible="1"/>
+                <field name="day" invisible="1"/>
+                <field name="res_model" invisible="1"/>
+                <field name="nbr" />
+                <field name="creation_date" invisible="1"/>
+             </tree>
+            </field>
+       </record>
+
+        <!-- Monthly Activity per Document -->
+        <record id="board_res_log_report_graph" model="ir.ui.view">
+            <field name="name">board.res.log.report.graph</field>
+            <field name="model">res.log.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Monthly Activity per Document" type="bar">
+                	<field name="res_model"/>
+                	<field name="nbr" operator="+"/>
+                </graph>
+            </field>
+        </record>
+        <record id="board_monthly_res_log_report_action" model="ir.actions.act_window">
+            <field name="name">Monthly Activity per Document</field>
+            <field name="res_model">res.log.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="domain">[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]</field>
+            <field name="context">{'group_by':['res_model'],'group_by_no_leaf':1}</field>
+            <field name="view_id" ref="board_res_log_report_graph"></field>
+        </record>
+
+        <!-- Weekly Global Activity -->
+        <record id="board_weekly_res_log_report_graph" model="ir.ui.view">
+            <field name="name">board.weekly.res.log.report.graph</field>
+            <field name="model">res.log.report</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Weekly Global Activity" type="bar">
+                	<field name="day"/>
+                	<field name="nbr" operator="+"/>
+                </graph>
+            </field>
+        </record>
+        <record id="board_weekly_res_log_report_action" model="ir.actions.act_window">
+            <field name="name">Weekly Global Activity</field>
+            <field name="res_model">res.log.report</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="domain">[('create_date','&gt;',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%Y-%m-%d'))]</field>
+            <field name="context">{'group_by':['day'],'group_by_no_leaf':1}</field>
+            <field name="view_id" ref="board_weekly_res_log_report_graph"></field>
+        </record>
+
         <record id="board_administration_form" model="ir.ui.view">
             <field name="name">board.administration.form</field>
             <field name="model">board.board</field>
@@ -36,15 +139,18 @@
                 <form string="Administration Dashboard">
                     <hpaned position="100">
                         <child1>
-                            <action name="%(action_latest_activities_tree)d" string="Latest Activities" sequence="1"/>
-                            <action width="510" name="%(action_user_connection_tree)d" string="Latest Connections" />
+                            <action width="510" name="%(action_user_connection_tree)d" string="User Connections" />
+                            <action width="510" name="%(action_latest_activities_tree)d" string="Latest Activities" />
                         </child1>
                         <child2>
+                            <action  name="%(board_monthly_res_log_report_action)d" string="Monthly Activity per Document"/>
+                            <action  name="%(board_weekly_res_log_report_action)d" string="Weekly Global Activity" />
                         </child2>
                     </hpaned>
                 </form>
             </field>
         </record>
+
         <record id="open_board_administration_form" model="ir.actions.act_window">
              <field name="name">Administration Dashboard</field>
             <field name="res_model">board.board</field>
@@ -52,8 +158,12 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_administration_form"/>
         </record>
-       <menuitem id="board.admin_menu_dasboard" name="Dashboard" sequence="0" parent="base.menu_reporting"/>
-       <menuitem id="menu_board_admin" action="open_board_administration_form" icon="terp-graph" parent="board.admin_menu_dasboard" />
+
+        <menuitem id="base.menu_reporting" name="Reporting" parent="base.menu_administration" sequence="11"
+            groups="base.group_extended"/>
+        <menuitem id="board.admin_menu_dasboard" name="Dashboard" sequence="0" parent="base.menu_reporting"/>
+        <menuitem id="menu_board_admin" action="open_board_administration_form" icon="terp-graph" parent="board.admin_menu_dasboard" />
+        <menuitem icon="terp-administration" id="base.menu_administration" name="Administration" sequence="50" action="open_board_administration_form"/>
 
     </data>
 </openerp>
diff --git a/addons/board/i18n/el.po b/addons/board/i18n/el.po
index 9316273d158..1c8f8f3812f 100644
--- a/addons/board/i18n/el.po
+++ b/addons/board/i18n/el.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-11-11 14:35+0000\n"
+"PO-Revision-Date: 2010-11-12 09:46+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/board/security/ir.model.access.csv b/addons/board/security/ir.model.access.csv
index 44b9c3cfb6d..f4f4ccd0d3d 100644
--- a/addons/board/security/ir.model.access.csv
+++ b/addons/board/security/ir.model.access.csv
@@ -4,3 +4,4 @@
 "access_board_note_type","board.note.type","model_board_note_type","base.group_user",1,1,1,1
 "access_board_note","board.note","model_board_note","base.group_user",1,1,1,1
 "access_board_board_sale_salesman","board.board.sale.salesman","model_board_board","base.group_sale_salesman",1,1,1,1
+"access_res_log_report","res.log.report","model_res_log_report","base.group_user",1,1,1,1
\ No newline at end of file
diff --git a/addons/caldav/i18n/pl.po b/addons/caldav/i18n/pl.po
new file mode 100644
index 00000000000..d0e6faffd59
--- /dev/null
+++ b/addons/caldav/i18n/pl.po
@@ -0,0 +1,497 @@
+# Polish 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:46+0000\n"
+"PO-Revision-Date: 2010-11-12 11:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish <pl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Value Mapping"
+msgstr ""
+
+#. module: caldav
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
+"specjalnych !"
+
+#. module: caldav
+#: field:document.directory,calendar_collection:0
+msgid "Calendar Collection"
+msgstr ""
+
+#. module: caldav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Other Info"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_export
+msgid "Event Export"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Message..."
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,name:0
+msgid "Filename"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,has_webcal:0
+msgid "WebCal"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "_Subscribe"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,collection_id:0
+msgid "Collection"
+msgstr ""
+
+#. module: caldav
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attendee
+msgid "basic.calendar.attendee"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,has_webcal:0
+msgid ""
+"Also export a <name>.ics entry next to the calendar folder, with WebCal "
+"content."
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Provide path for Remote Calendar"
+msgstr ""
+
+#. module: caldav
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,type:0
+#: field:basic.calendar.attributes,type:0
+#: field:basic.calendar.fields,type_id:0
+#: field:basic.calendar.lines,name:0
+msgid "Type"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
+msgid "Import .ics File"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,field_id:0
+msgid "OpenObject Field"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,fn:0
+msgid "Function"
+msgstr ""
+
+#. module: caldav
+#: help:calendar.event.export,name:0
+msgid "Save in .ics format"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Attendee"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Description"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
+msgid "Subscribe"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "TODO"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar.alias,cal_line_id:0
+msgid "The calendar/line this mapping applies to"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,object_id:0
+msgid "Object"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:document.directory,calendar_ids:0
+#: model:ir.actions.act_window,name:caldav.action_caldav_form
+#: model:ir.ui.menu,name:caldav.menu_caldav_directories
+msgid "Calendars"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,mapping:0
+msgid "Mapping"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attributes
+msgid "Calendar attributes"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.alias,res_id:0
+msgid "Res. ID"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "_Import"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,write_date:0
+msgid "Modifided Date"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "_Close"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "Export ICS"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_import
+msgid "Event Import"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Expression as constant"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,name:0
+msgid "File name"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Subscribe to Remote Calendar"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Can not create \\nline \"%s\" more than once' % (vals.get('name"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,calendar_color:0
+msgid "For supporting clients, the color of the calendar entries"
+msgstr ""
+
+#. module: caldav
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alarm
+msgid "basic.calendar.alarm"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "Ok"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,name:0
+#: field:basic.calendar.attributes,name:0
+#: field:basic.calendar.fields,name:0
+msgid "Name"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Use the field"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Alarm"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid ""
+"Please provide proper configuration of \"%s\" in Calendar Lines' % (name)))\n"
+"        return True\n"
+"\n"
+"    def create(self, cr, uid, vals, context=None):\n"
+"        \"\"\" Create Calendar's fields\n"
+"            @param self: The object pointer\n"
+"            @param cr: the current row, from the database cursor,\n"
+"            @param uid: the current user’s ID for security checks,\n"
+"            @param vals: Get Values\n"
+"            @param context: A standard dictionary for contextual values\n"
+"        \"\"\"\n"
+"\n"
+"        cr.execute('SELECT name FROM basic_calendar_attributes \\n           "
+"                 WHERE id=%s', (vals.get('name"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Attendee must have an Email Id"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,create_date:0
+msgid "Created Date"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_export
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
+msgid "Export .ics File"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_timezone
+msgid "basic.calendar.timezone"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Attributes Mapping"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_document_directory
+msgid "Directory"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.subscribe,url_path:0
+msgid "Provide path for remote calendar"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.fields,expr:0
+msgid "Expression"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,calendar_order:0
+msgid "Order"
+msgstr ""
+
+#. module: caldav
+#: view:document.directory:0
+#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
+#: model:ir.ui.menu,name:caldav.menu_calendar_collection
+msgid "Calendar Collections"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,description:0
+msgid "description"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
+#, python-format
+msgid "Please provide Proper URL !"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,domain:0
+msgid "Domain"
+msgstr ""
+
+#. module: caldav
+#: model:ir.module.module,shortdesc:caldav.module_meta_information
+msgid "Share Calendar using CalDAV"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,calendar_color:0
+msgid "Color"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Interval in hours"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_fields
+msgid "Calendar fields"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "The same filename cannot apply to two records!"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import Message"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,line_ids:0
+#: model:ir.model,name:caldav.model_basic_calendar_lines
+msgid "Calendar Lines"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_subscribe
+msgid "Event subscribe"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alias
+msgid "basic.calendar.alias"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: field:calendar.event.import,file_path:0
+msgid "Select ICS file"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import ICS"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_event
+msgid "basic.calendar.event"
+msgstr ""
+
+#. module: caldav
+#: field:calendar.event.export,file_path:0
+msgid "Save ICS file"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar.lines,mapping_ids:0
+msgid "Fields Mapping"
+msgstr ""
+
+#. module: caldav
+#: field:basic.calendar,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar.alias,cal_line_id:0
+#: field:basic.calendar.lines,calendar_id:0
+#: model:ir.ui.menu,name:caldav.menu_calendar
+msgid "Calendar"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_todo
+msgid "basic.calendar.todo"
+msgstr ""
+
+#. module: caldav
+#: help:basic.calendar,calendar_order:0
+msgid "For supporting clients, the order of this folder among the calendars"
+msgstr ""
+
+#. module: caldav
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Event"
+msgstr ""
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar
+msgid "basic.calendar"
+msgstr ""
diff --git a/addons/caldav/i18n/sr.po b/addons/caldav/i18n/sr.po
new file mode 100644
index 00000000000..8c450f96350
--- /dev/null
+++ b/addons/caldav/i18n/sr.po
@@ -0,0 +1,499 @@
+# Serbian 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:46+0000\n"
+"PO-Revision-Date: 2010-11-13 08:47+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Value Mapping"
+msgstr "Mapiranje Vrednosti"
+
+#. module: caldav
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
+
+#. module: caldav
+#: field:document.directory,calendar_collection:0
+msgid "Calendar Collection"
+msgstr "Kolekcija Kalendara"
+
+#. module: caldav
+#: constraint:document.directory:0
+msgid "Error! You can not create recursive Directories."
+msgstr "Greska ! Ne mozes kreirati rekursivne direktorijume."
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Other Info"
+msgstr "Ostale informacije"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_export
+msgid "Event Export"
+msgstr "Exportuj Dogadjaj"
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Message..."
+msgstr "Poruka ..."
+
+#. module: caldav
+#: field:basic.calendar.alias,name:0
+msgid "Filename"
+msgstr "IMe Fajla"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Upozorenje !"
+
+#. module: caldav
+#: field:basic.calendar,has_webcal:0
+msgid "WebCal"
+msgstr "WebPoziv"
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "_Subscribe"
+msgstr "_Subscribe"
+
+#. module: caldav
+#: field:basic.calendar,collection_id:0
+msgid "Collection"
+msgstr "Kolekcija"
+
+#. module: caldav
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska ! Ne mozes kreirati rekursivni meni."
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attendee
+msgid "basic.calendar.attendee"
+msgstr "basic.calendar.attendee"
+
+#. module: caldav
+#: help:basic.calendar,has_webcal:0
+msgid ""
+"Also export a <name>.ics entry next to the calendar folder, with WebCal "
+"content."
+msgstr ""
+"Takodje iznesi i sadrzaj <ime>na iz polja odmah do foldera kalendara, "
+"zajedno sa WebCal sadrzajem."
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Provide path for Remote Calendar"
+msgstr "Daje put za udaljeni Kalendar"
+
+#. module: caldav
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Neispravno ime modela u definiciji akcije"
+
+#. module: caldav
+#: field:basic.calendar,type:0
+#: field:basic.calendar.attributes,type:0
+#: field:basic.calendar.fields,type_id:0
+#: field:basic.calendar.lines,name:0
+msgid "Type"
+msgstr "Tip"
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_import_values
+msgid "Import .ics File"
+msgstr "Uvezi .ics Fajl"
+
+#. module: caldav
+#: field:basic.calendar.fields,field_id:0
+msgid "OpenObject Field"
+msgstr "OpenObject polje"
+
+#. module: caldav
+#: field:basic.calendar.fields,fn:0
+msgid "Function"
+msgstr "Funkcija"
+
+#. module: caldav
+#: help:calendar.event.export,name:0
+msgid "Save in .ics format"
+msgstr "sacuvaj u .ics formatu"
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Attendee"
+msgstr "Ucesnik"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Error !"
+msgstr "Greska !"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_subscribe_values
+msgid "Subscribe"
+msgstr "Pretplati se"
+
+#. module: caldav
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "TODO"
+msgstr "ZaUraditi"
+
+#. module: caldav
+#: help:basic.calendar.alias,cal_line_id:0
+msgid "The calendar/line this mapping applies to"
+msgstr "Kalendar/Linija ovo se mapiranje odnosi na"
+
+#. module: caldav
+#: field:basic.calendar.lines,object_id:0
+msgid "Object"
+msgstr "Objekat"
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:document.directory,calendar_ids:0
+#: model:ir.actions.act_window,name:caldav.action_caldav_form
+#: model:ir.ui.menu,name:caldav.menu_caldav_directories
+msgid "Calendars"
+msgstr "Kalendari"
+
+#. module: caldav
+#: field:basic.calendar.fields,mapping:0
+msgid "Mapping"
+msgstr "Mapiranje"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_attributes
+msgid "Calendar attributes"
+msgstr "Atributi Kalendara"
+
+#. module: caldav
+#: field:basic.calendar.alias,res_id:0
+msgid "Res. ID"
+msgstr ""
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "_Import"
+msgstr "_Import"
+
+#. module: caldav
+#: field:basic.calendar,write_date:0
+msgid "Modifided Date"
+msgstr "Datuma modifikovano"
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "_Close"
+msgstr "_Close"
+
+#. module: caldav
+#: view:calendar.event.export:0
+msgid "Export ICS"
+msgstr "Izvezi ICS"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_import
+msgid "Event Import"
+msgstr "Uvezi Dogadjaj"
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Expression as constant"
+msgstr "Ekspresija kao konstanta"
+
+#. module: caldav
+#: field:calendar.event.export,name:0
+msgid "File name"
+msgstr "Ime Fajla"
+
+#. module: caldav
+#: view:calendar.event.subscribe:0
+msgid "Subscribe to Remote Calendar"
+msgstr "Pretplati se na Udaljeni Kalendar"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Can not create \\nline \"%s\" more than once' % (vals.get('name"
+msgstr ""
+"Ne mogu da kreira, \\nliniju \"%s\" vise nego jednom' % (vals.get('name"
+
+#. module: caldav
+#: help:basic.calendar,calendar_color:0
+msgid "For supporting clients, the color of the calendar entries"
+msgstr "Zbog podrske klijentima. boja sadrzaja Kalendara"
+
+#. module: caldav
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neispravan XML za pregled Arhitekture"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alarm
+msgid "basic.calendar.alarm"
+msgstr "basic.calendar.alarm"
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "Ok"
+msgstr "OK"
+
+#. module: caldav
+#: field:basic.calendar,name:0
+#: field:basic.calendar.attributes,name:0
+#: field:basic.calendar.fields,name:0
+msgid "Name"
+msgstr "Ime"
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Use the field"
+msgstr "Koristite polje"
+
+#. module: caldav
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Alarm"
+msgstr "Alarm"
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: view:calendar.event.subscribe:0
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid ""
+"Please provide proper configuration of \"%s\" in Calendar Lines' % (name)))\n"
+"        return True\n"
+"\n"
+"    def create(self, cr, uid, vals, context=None):\n"
+"        \"\"\" Create Calendar's fields\n"
+"            @param self: The object pointer\n"
+"            @param cr: the current row, from the database cursor,\n"
+"            @param uid: the current user’s ID for security checks,\n"
+"            @param vals: Get Values\n"
+"            @param context: A standard dictionary for contextual values\n"
+"        \"\"\"\n"
+"\n"
+"        cr.execute('SELECT name FROM basic_calendar_attributes \\n           "
+"                 WHERE id=%s', (vals.get('name"
+msgstr ""
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "Attendee must have an Email Id"
+msgstr "Ucesnik mora imati Licni Email"
+
+#. module: caldav
+#: field:basic.calendar,create_date:0
+msgid "Created Date"
+msgstr "Kreirano Datuma"
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
+#, python-format
+msgid "Error!"
+msgstr "Greska !"
+
+#. module: caldav
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_export
+#: model:ir.actions.act_window,name:caldav.action_calendar_event_export_values
+msgid "Export .ics File"
+msgstr "Izvezi .ics Fajl"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_timezone
+msgid "basic.calendar.timezone"
+msgstr "basic.calendar.timezone"
+
+#. module: caldav
+#: view:basic.calendar:0
+msgid "Attributes Mapping"
+msgstr "Atributi Mapiranja"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_document_directory
+msgid "Directory"
+msgstr "Direktorijum"
+
+#. module: caldav
+#: field:calendar.event.subscribe,url_path:0
+msgid "Provide path for remote calendar"
+msgstr "daje putanju do udaljenog Kalendara"
+
+#. module: caldav
+#: field:basic.calendar.fields,expr:0
+msgid "Expression"
+msgstr "Ekspresija"
+
+#. module: caldav
+#: field:basic.calendar,calendar_order:0
+msgid "Order"
+msgstr "Redosled"
+
+#. module: caldav
+#: view:document.directory:0
+#: model:ir.actions.act_window,name:caldav.action_calendar_collection_form
+#: model:ir.ui.menu,name:caldav.menu_calendar_collection
+msgid "Calendar Collections"
+msgstr "Kolekcija Kalendara"
+
+#. module: caldav
+#: field:basic.calendar,description:0
+msgid "description"
+msgstr "Opis"
+
+#. module: caldav
+#: code:addons/caldav/wizard/calendar_event_subscribe.py:0
+#, python-format
+msgid "Please provide Proper URL !"
+msgstr "Molim dajte ispravnu URL adresu !"
+
+#. module: caldav
+#: field:basic.calendar.lines,domain:0
+msgid "Domain"
+msgstr "Domain"
+
+#. module: caldav
+#: model:ir.module.module,shortdesc:caldav.module_meta_information
+msgid "Share Calendar using CalDAV"
+msgstr "Deli kalendar koriscenjem CalDAV-a"
+
+#. module: caldav
+#: field:basic.calendar,calendar_color:0
+msgid "Color"
+msgstr "Boja"
+
+#. module: caldav
+#: selection:basic.calendar.fields,fn:0
+msgid "Interval in hours"
+msgstr "Intervali u satima"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_fields
+msgid "Calendar fields"
+msgstr "Polja Kalendara"
+
+#. module: caldav
+#: code:addons/caldav/calendar.py:0
+#, python-format
+msgid "The same filename cannot apply to two records!"
+msgstr "Isto ime fajla ne moze odgovarati za dva zapisa"
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import Message"
+msgstr "Uvezi Poruku"
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar,line_ids:0
+#: model:ir.model,name:caldav.model_basic_calendar_lines
+msgid "Calendar Lines"
+msgstr "Linije Kalendara"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_calendar_event_subscribe
+msgid "Event subscribe"
+msgstr "Prijavi Dogadjaj"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_alias
+msgid "basic.calendar.alias"
+msgstr "basic.calendar.alias"
+
+#. module: caldav
+#: view:calendar.event.import:0
+#: field:calendar.event.import,file_path:0
+msgid "Select ICS file"
+msgstr "Izaberi ICS Fajl"
+
+#. module: caldav
+#: view:calendar.event.import:0
+msgid "Import ICS"
+msgstr "Uvezi ICS"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_event
+msgid "basic.calendar.event"
+msgstr "basic.calendar.event"
+
+#. module: caldav
+#: field:calendar.event.export,file_path:0
+msgid "Save ICS file"
+msgstr "Sacuvaj ICS Fajl"
+
+#. module: caldav
+#: field:basic.calendar.lines,mapping_ids:0
+msgid "Fields Mapping"
+msgstr "Mapiranje polja"
+
+#. module: caldav
+#: field:basic.calendar,user_id:0
+msgid "Owner"
+msgstr "Vlasnik"
+
+#. module: caldav
+#: view:basic.calendar:0
+#: field:basic.calendar.alias,cal_line_id:0
+#: field:basic.calendar.lines,calendar_id:0
+#: model:ir.ui.menu,name:caldav.menu_calendar
+msgid "Calendar"
+msgstr "Kalendar"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar_todo
+msgid "basic.calendar.todo"
+msgstr "basic.calendar.todo"
+
+#. module: caldav
+#: help:basic.calendar,calendar_order:0
+msgid "For supporting clients, the order of this folder among the calendars"
+msgstr "Za podrsku klijentima, redosled foldera izmedju kalendara"
+
+#. module: caldav
+#: selection:basic.calendar,type:0
+#: selection:basic.calendar.attributes,type:0
+#: selection:basic.calendar.lines,name:0
+msgid "Event"
+msgstr "Dogadjaj"
+
+#. module: caldav
+#: model:ir.model,name:caldav.model_basic_calendar
+msgid "basic.calendar"
+msgstr "basic.calendar"
diff --git a/addons/claim_from_delivery/i18n/it.po b/addons/claim_from_delivery/i18n/it.po
new file mode 100644
index 00000000000..dd18651971b
--- /dev/null
+++ b/addons/claim_from_delivery/i18n/it.po
@@ -0,0 +1,46 @@
+# Italian 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:46+0000\n"
+"PO-Revision-Date: 2010-11-13 08:27+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Italian <it@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: claim_from_delivery
+#: model:ir.model,name:claim_from_delivery.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: claim_from_delivery
+#: 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 per “x_” e non contenere alcun carattere "
+"speciale!"
+
+#. module: claim_from_delivery
+#: 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: claim_from_delivery
+#: model:ir.module.module,description:claim_from_delivery.module_meta_information
+msgid "Create Claim from delivery order:\n"
+msgstr ""
+
+#. module: claim_from_delivery
+#: model:ir.module.module,shortdesc:claim_from_delivery.module_meta_information
+msgid "Claim from delivery"
+msgstr ""
diff --git a/addons/crm/board_crm_view.xml b/addons/crm/board_crm_view.xml
index ee9a78109c8..f316ed4e26a 100644
--- a/addons/crm/board_crm_view.xml
+++ b/addons/crm/board_crm_view.xml
@@ -18,6 +18,17 @@
                </field>
           </record>
 
+        <record id="view_report_crm_oppor_tree" model="ir.ui.view">
+            <field name="name">crm.lead.report.tree</field>
+            <field name="model">crm.lead.report</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Opportunity Analysis">
+                   <field name="stage_id"/>
+                   <field name="planned_revenue"/>
+                </tree>
+            </field>
+        </record>
         <record id="view_report_crm_oppor_graph" model="ir.ui.view">
             <field name="name">crm.lead.report.graph</field>
             <field name="model">crm.lead.report</field>
@@ -100,7 +111,20 @@
                <field name="view_mode">graph,tree,form</field>
                <field name="view_id" ref="view_report_crm_oppor_graph"/>
             <field name="domain">['&amp;', '&amp;', ('user_id','=',uid), ('type', '=', 'opportunity'), '!' , '&amp;', ('state', '=', 'done'),  ('date_closed','&gt;',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%Y-%m-%d'))]</field>
+        		<field name="context">{'group_by_no_leaf':1,'group_by':['stage_id']}</field>
           </record>
+          <record id="open_view_report_crm_oppor_graph" model="ir.actions.act_window.view">
+            <field eval="1" name="sequence"/>
+            <field name="view_mode">graph</field>
+            <field name="view_id" ref="view_report_crm_oppor_graph"/>
+            <field name="act_window_id" ref="act_my_oppor_stage"/>
+	    </record>
+	    <record id="open_view_report_crm_oppor_tree" model="ir.actions.act_window.view">
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_report_crm_oppor_tree"/>
+            <field name="act_window_id" ref="act_my_oppor_stage"/>
+   		</record>
 
           <record model="ir.actions.act_window" id="act_sales_pipeline">
                <field name="res_model">crm.lead.report</field>
@@ -159,6 +183,7 @@
             sequence="1"
             id="menu_board_crm" icon="terp-graph"
             groups="base.group_sale_salesman"/>
+
         <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" action="open_board_crm"/>
     </data>
 </openerp>
diff --git a/addons/crm/crm_demo.xml b/addons/crm/crm_demo.xml
index d356810e31c..9ae60b11a70 100644
--- a/addons/crm/crm_demo.xml
+++ b/addons/crm/crm_demo.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+        <record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/> 
+        </record>
 
 
     </data>
diff --git a/addons/crm/i18n/el.po b/addons/crm/i18n/el.po
index 1775000fd34..3ee2301c719 100644
--- a/addons/crm/i18n/el.po
+++ b/addons/crm/i18n/el.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-11-11 18:19+0000\n"
+"PO-Revision-Date: 2010-11-13 12:56+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
@@ -114,7 +114,7 @@ msgstr "Δεν μπορεί να προστεθεί σημείωση"
 #. module: crm
 #: field:crm.case.stage,name:0
 msgid "Stage Name"
-msgstr ""
+msgstr "Όνομα Σταδίου"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -261,7 +261,7 @@ msgstr "Τηλεφώνημα"
 #. module: crm
 #: field:crm.lead,optout:0
 msgid "Opt-Out"
-msgstr ""
+msgstr "Εκτός συμφωνίας"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:0
@@ -314,6 +314,9 @@ msgid ""
 "communication history) will be merged with existing Opportunity of Selected "
 "partner."
 msgstr ""
+"Εάν επιλέξετε Συγχώνευση με υπάρχουσα Ευκαιρία, οι λεπτομέρειες του "
+"υποψήφιου πελάτη(μαζί με το ιστορικό επικοινωνίας) θα συγχωνευτούν με "
+"υπάρχουσα Ευκαιρία του Επιλεγμένου συνεργάτη."
 
 #. module: crm
 #: selection:crm.meeting,class:0
@@ -344,6 +347,8 @@ msgid ""
 "If opt-out is checked, this contact has refused to receive emails or "
 "unsubscribed to a campaign."
 msgstr ""
+"Εάν είναι τσεκαρισμένο το Εκτός Συμφωνίας, αυτή η επαφή αρνήθηκε να λαμβάνει "
+"emails ή ξεγράφτηκε από την εκστρατεία."
 
 #. module: crm
 #: model:process.transition,name:crm.process_transition_leadpartner0
@@ -445,7 +450,7 @@ msgstr "Ενημέρωση Ημερομηνίας"
 #. module: crm
 #: help:crm.meeting,count:0
 msgid "Repeat max that times"
-msgstr ""
+msgstr "Επανάληψη μέγιστο τόσες φορές"
 
 #. module: crm
 #: view:crm.lead2opportunity.action:0
@@ -484,7 +489,7 @@ msgstr "Εκστατεία 2"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Privacy"
-msgstr ""
+msgstr "Ιδιωτική"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -781,13 +786,13 @@ msgstr "Πιθανότητα (%)"
 #. module: crm
 #: view:crm.lead:0
 msgid "Leads Generation"
-msgstr ""
+msgstr "Παραγωγή Υποψήφιων Πελατών"
 
 #. module: crm
 #: view:board.board:0
 #: model:ir.ui.menu,name:crm.menu_board_statistics_dash
 msgid "Statistics Dashboard"
-msgstr ""
+msgstr "Ταμπλό Στατιστικών"
 
 #. module: crm
 #: code:addons/crm/wizard/crm_lead_to_opportunity.py:0
@@ -850,7 +855,7 @@ msgstr ""
 #: view:calendar.attendee:0
 #: field:calendar.attendee,categ_id:0
 msgid "Event Type"
-msgstr ""
+msgstr "Τύπος Συμβάν"
 
 #. module: crm
 #: model:ir.model,name:crm.model_crm_installer
@@ -916,6 +921,37 @@ msgid ""
 "    * My Cases (list)\n"
 "    * Jobs Tracking (graph)\n"
 msgstr ""
+"Το σύστημα OpenERP Διαχείρηση Πελατών\n"
+" επιτρέπει μια ομάδα ανθρώπων  έξυπνα και αποτελεσματικά, να διαχειρίζεστεί\n"
+"να οδηγήσει, ευκαιρίες, συνάντησεις, τηλεφώνηματα κλπ.\n"
+"Διαχειρίζεται τα βασικά καθήκοντα, όπως η επικοινωνία, αναγνώριση, "
+"ιεράρχηση,\n"
+"εκχώρηση, ανάλυση και την κοινοποίηση.\n"
+"\n"
+"OpenERP εξασφαλίζει ότι όλες οι υποθέσεις  παρακολουθούνται  με επιτυχία από "
+"τους χρήστες, τους πελάτες και\n"
+"προμηθευτές. Μπορεί να στείλει αυτόματα υπενθυμίσεις, να κλιμακώσει την "
+"αίτηση, να υποκινείσει\n"
+"ειδικές μεθόδους και πολλές άλλες δράσεις, σχετιζόμενες με τους δικούς της "
+"κανόνες επιχείρησή σας.\n"
+"\n"
+"Το πιο σπουδαίο πράγμα για αυτό το σύστημα είναι ότι οι χρήστες δεν "
+"χρειάζεται να κάνετε τίποτα\n"
+"ειδική. Μπορούν απλά να στείλετε email στον ανιχνευτεί αίτησεων. Το OpenERP "
+"θα λάβει\n"
+"μέριμνα ευχαριστώντας τους για το μήνυμά τους,  δρομολόγώντας το αυτομάτα "
+"στο\n"
+"κατάλληλο προσωπικό, και να βεβαιωθεί ότι κάθε μελλοντική αλληλογραφία "
+"φτάνει στο σωστό μέρος.\n"
+"\n"
+"Το πρόσθετο CRM έχει μια  email gateway για τον συγχρονισμό\n"
+"μεταξύ mails και OpenERP.\n"
+"Δημιουργήστε ταμπλό του CRM που περιλαμβάνει:\n"
+"    *Οι υποψήφιοι Πελάτες μου (λίστα)\n"
+"    *Υποψήφιοι Πελάτες κατά Στάδιο (γράφημα)\n"
+"    *Σωλήνα Πωλήσεων κατά Στάδιο (γράφημα)\n"
+"    *Οι Υποθέσεις μου(λίστα)\n"
+"    *Παρακολούθηση Εργασιών (γράφημα)\n"
 
 #. module: crm
 #: field:crm.lead.report,create_date:0
@@ -945,6 +981,8 @@ msgid ""
 "This property defines the list of date/time exceptions for a recurring "
 "calendar component."
 msgstr ""
+"Αυτή η ιδιότητα ορίζει την λίστα εξαιρέσεων ημερομηνίας/ώρας για ένα "
+"επαναλαμβανόμενο πρόσθετο ημερολογίου."
 
 #. module: crm
 #: view:crm.phonecall2opportunity:0
@@ -1060,7 +1098,7 @@ msgstr "Παραπομπή"
 #. module: crm
 #: field:crm.lead,optin:0
 msgid "Opt-In"
-msgstr ""
+msgstr "Εντός Συμφωνίας"
 
 #. module: crm
 #: code:addons/crm/crm_opportunity.py:0
@@ -1093,7 +1131,7 @@ msgstr "Επανάληψη Μέχρι"
 #. module: crm
 #: view:crm.meeting:0
 msgid "Extended Options..."
-msgstr "Εκτεταμένες Επιλογές"
+msgstr "Εκτεταμένες επιλογές"
 
 #. module: crm
 #: field:crm.meeting,date_deadline:0
@@ -1109,7 +1147,7 @@ msgstr "Προθεσμία"
 #: view:crm.phonecall2phonecall:0
 #: view:crm.send.mail:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Άκυρο"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1129,7 +1167,7 @@ msgstr "Στατιστικά"
 #. module: crm
 #: field:crm.meeting,attendee_ids:0
 msgid "Attendees"
-msgstr ""
+msgstr "Συμμετέχοντες"
 
 #. module: crm
 #: view:crm.lead2opportunity.action:0
@@ -1151,7 +1189,7 @@ msgstr "Επιτυχία"
 #. module: crm
 #: field:crm.lead.report,delay_expected:0
 msgid "Overpassed Deadline"
-msgstr ""
+msgstr "Περασμένη Προθεσμία"
 
 #. module: crm
 #: model:crm.case.section,name:crm.section_sales_department
@@ -1161,7 +1199,7 @@ msgstr "Τμήμα Πωλήσεων"
 #. module: crm
 #: field:crm.send.mail,html:0
 msgid "HTML formatting?"
-msgstr ""
+msgstr "διαμόρφωση HTML;"
 
 #. module: crm
 #: field:crm.lead,type:0
@@ -1215,7 +1253,7 @@ msgstr "Χρειάζεται Σχεδιαδμό Ιστοσελίδας"
 #. module: crm
 #: field:crm.meeting,recurrent_uid:0
 msgid "Recurrent ID"
-msgstr ""
+msgstr "Επαναλαμβανόμενο ID"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1228,7 +1266,7 @@ msgstr "Θέμα"
 #. module: crm
 #: field:crm.meeting,tu:0
 msgid "Tue"
-msgstr ""
+msgstr "Τρί"
 
 #. module: crm
 #: view:crm.case.stage:0
@@ -1268,6 +1306,7 @@ msgstr "Μαρκάρισμα ως"
 #: help:crm.meeting,rrule_type:0
 msgid "Let the event automatically repeat at that interval"
 msgstr ""
+"Επιτρέπει στο γεγονός να επαναληφθεί αυτόματα σε αυτό το χρονικό διάστημα"
 
 #. module: crm
 #: view:base.action.rule:0
@@ -1324,7 +1363,7 @@ msgstr "Διάρκεια σε Λεπτά"
 #. module: crm
 #: help:crm.installer,crm_helpdesk:0
 msgid "Manages a Helpdesk service."
-msgstr ""
+msgstr "Διαχειρίζεται το Helpdesk service"
 
 #. module: crm
 #: field:crm.segmentation,som_interval:0
@@ -1336,6 +1375,8 @@ msgstr "Ημέρες ανά Περίοδο"
 #, python-format
 msgid "Closed/Cancelled \\nLeads Could not convert into Opportunity"
 msgstr ""
+"Έκλεισε/Ακυρώθηκε \\nΥποψήφιοι Πελάτες δεν μπορούνε να μετατραπούν σε "
+"Ευκαιρίες"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1356,7 +1397,7 @@ msgstr "Παρ"
 #. module: crm
 #: field:crm.meeting,write_date:0
 msgid "Write Date"
-msgstr ""
+msgstr "Ημερομηνία Εγγραφής"
 
 #. module: crm
 #: view:crm.meeting:0
@@ -1437,7 +1478,7 @@ msgstr "Εκτεταμένα Φίλτρα..."
 #. module: crm
 #: model:ir.model,name:crm.model_calendar_attendee
 msgid "Attendee information"
-msgstr ""
+msgstr "Πληροφορίες Συμμετέχοντα"
 
 #. module: crm
 #: view:crm.phonecall.report:0
@@ -1447,7 +1488,7 @@ msgstr "Αναζήτηση"
 #. module: crm
 #: field:crm.meeting,interval:0
 msgid "Interval"
-msgstr ""
+msgstr "Διάστημα"
 
 #. module: crm
 #: view:crm.segmentation:0
@@ -1463,7 +1504,7 @@ msgstr "Ιστορικό"
 #. module: crm
 #: field:crm.case.section,code:0
 msgid "Code"
-msgstr ""
+msgstr "Κωδικός"
 
 #. module: crm
 #: field:crm.case.section,child_ids:0
@@ -1538,12 +1579,12 @@ msgstr "Τρέχον"
 #. module: crm
 #: field:crm.meeting,exrule:0
 msgid "Exception Rule"
-msgstr ""
+msgstr "Κανόνας Εξαίρεσης"
 
 #. module: crm
 #: help:base.action.rule,act_mail_to_partner:0
 msgid "Check this if you want the rule to send an email to the partner."
-msgstr ""
+msgstr "Τσέκαρε αυτό εάν θέλεις ο κανόνας να στείλει email στον συνεργάτη."
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_phonecall_categ_action
@@ -1580,6 +1621,8 @@ msgstr "Ποσό Πώλησης"
 #, python-format
 msgid "Unable to send mail. Please check SMTP is configured properly."
 msgstr ""
+"Αδύνατη η αποστολή email. Παρακαλώ νε ελέγξετε ότι ο SMTP παραμετροποιήθηκε "
+"σωστά."
 
 #. module: crm
 #: selection:crm.segmentation.line,expr_operator:0
@@ -1589,7 +1632,7 @@ msgstr "="
 #. module: crm
 #: selection:crm.meeting,state:0
 msgid "Unconfirmed"
-msgstr ""
+msgstr "Όχι βεβαιωμένο"
 
 #. module: crm
 #: field:crm.case.categ,name:0
@@ -1604,12 +1647,12 @@ msgstr "Όνομα"
 #: field:crm.meeting,alarm_id:0
 #: field:crm.meeting,base_calendar_alarm_id:0
 msgid "Alarm"
-msgstr ""
+msgstr "Προειδοποίηση"
 
 #. module: crm
 #: model:process.node,note:crm.process_node_meeting0
 msgid "Schedule a normal or phone meeting"
-msgstr ""
+msgstr "Προγραμμάτισε μια κανονική συνάντηση ή τηλεφωνική"
 
 #. module: crm
 #: view:crm.lead.report:0
@@ -1625,7 +1668,7 @@ msgstr "Γενέθλια"
 #. module: crm
 #: view:crm.meeting:0
 msgid "The"
-msgstr ""
+msgstr "Η"
 
 #. module: crm
 #: field:crm.send.mail.attachment,wizard_id:0
@@ -1686,7 +1729,7 @@ msgstr ""
 #. module: crm
 #: field:crm.lead.report,delay_close:0
 msgid "Delay to Close"
-msgstr ""
+msgstr "Καθυστέρηση για Κλείσιμο"
 
 #. module: crm
 #: field:crm.meeting,we:0
@@ -1696,7 +1739,7 @@ msgstr "Τετ"
 #. module: crm
 #: model:crm.case.categ,name:crm.categ_oppor6
 msgid "Potential Reseller"
-msgstr ""
+msgstr "Ενδεχόμενος Μεταπωλητής"
 
 #. module: crm
 #: field:crm.lead.report,planned_revenue:0
@@ -1716,21 +1759,23 @@ msgstr "Ομαδοποίσηση Κατά..."
 #: help:crm.lead,partner_id:0
 msgid "Optional linked partner, usually after conversion of the lead"
 msgstr ""
+"Προεραιτικά συνδεδεμένος συνεργάτης, συνήθως μετά από μετατροπή υποψηφίου "
+"πελάτη"
 
 #. module: crm
 #: view:crm.meeting:0
 msgid "Invitation details"
-msgstr ""
+msgstr "Λεπτομέρειες πρόσκλησης"
 
 #. module: crm
 #: field:crm.case.section,parent_id:0
 msgid "Parent Team"
-msgstr ""
+msgstr "Πατρική Ομάδα"
 
 #. module: crm
 #: field:crm.lead,date_action:0
 msgid "Next Action Date"
-msgstr ""
+msgstr "Επόμενη Ημερομηνία Ενέργειας"
 
 #. module: crm
 #: selection:crm.segmentation,state:0
@@ -1763,7 +1808,7 @@ msgstr "τίτλος"
 #: model:ir.actions.act_window,name:crm.crm_case_categ_phone_incoming0
 #: model:ir.ui.menu,name:crm.menu_crm_case_phone_inbound
 msgid "Inbound"
-msgstr ""
+msgstr "Εισερχόμενο"
 
 #. module: crm
 #: help:crm.case.stage,probability:0
@@ -1781,7 +1826,7 @@ msgstr "Τηλεφωνήματα"
 #. module: crm
 #: selection:crm.meeting,show_as:0
 msgid "Free"
-msgstr ""
+msgstr "Ελέυθερος/η"
 
 #. module: crm
 #: view:crm.installer:0
@@ -1827,7 +1872,7 @@ msgstr "Αξία"
 #: view:crm.lead:0
 #: view:crm.lead.report:0
 msgid "Opportunity by Categories"
-msgstr ""
+msgstr "Ευκαιρίες κατά Κατηγορία"
 
 #. module: crm
 #: view:crm.lead:0
@@ -1861,6 +1906,7 @@ msgstr "Επιλέξτε στάδια για αυτήν την Ομάδα Πωλ
 msgid ""
 "There are no other 'Open' or 'Pending' Opportunities for the partner '%s'."
 msgstr ""
+"Δεν υπάρχουν άλλες 'Ανοιχτές' η 'Εκρεμμείς' Ευκαιρίες για τον συνεργάτη '%s'"
 
 #. module: crm
 #: model:process.transition,note:crm.process_transition_leadpartner0
@@ -2120,6 +2166,8 @@ msgstr ""
 #: help:crm.lead,optin:0
 msgid "If opt-in is checked, this contact has accepted to receive emails."
 msgstr ""
+"Εάν είναι τσεκαρισμένο το εντός συμφωνίας, αυτή η επαφή έχει αποδεχτεί να "
+"λαμβάνει emails."
 
 #. module: crm
 #: view:crm.meeting:0
@@ -3550,7 +3598,7 @@ msgstr ""
 #. module: crm
 #: field:crm.meeting,select1:0
 msgid "Option"
-msgstr ""
+msgstr "Επιλογή"
 
 #. module: crm
 #: model:crm.case.stage,name:crm.stage_lead4
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index ab0b90f1b71..c6c518499d3 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/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-28 09:17+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2010-11-13 07:48+0000\n"
+"Last-Translator: Эдуард <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:18+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm
@@ -313,7 +313,7 @@ msgstr ""
 #. module: crm
 #: selection:crm.meeting,class:0
 msgid "Public"
-msgstr ""
+msgstr "Публичная"
 
 #. module: crm
 #: model:ir.actions.act_window,name:crm.crm_case_resource_type_act
@@ -603,7 +603,7 @@ msgstr "Эти люди получат эл. письма."
 #: view:crm.meeting:0
 #: field:crm.meeting,name:0
 msgid "Summary"
-msgstr ""
+msgstr "Выводы"
 
 #. module: crm
 #: view:crm.segmentation:0
diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml
index 6f24d89bec2..f099ceede8b 100644
--- a/addons/crm/report/crm_lead_report_view.xml
+++ b/addons/crm/report/crm_lead_report_view.xml
@@ -29,6 +29,7 @@
                 <field name="email" sum="# Mails"/>
                 <field name="delay_open"/>
                 <field name="delay_close"/>
+                <field name="planned_revenue"/>
              </tree>
             </field>
         </record>
@@ -79,7 +80,7 @@
                         <filter icon="terp-go-month" string="    Month-1    " separator="1"
                             domain="[('create_date','&lt;=', (datetime.date.today() - relativedelta(day=31, months=1)).strftime('%%Y-%%m-%%d')),('create_date','&gt;=',(datetime.date.today() - relativedelta(day=1,months=1)).strftime('%%Y-%%m-%%d'))]"
                             help="Leads/Opportunities created in last month"/>
-                            
+
                         <separator orientation="vertical" />
                         <filter icon="terp-check"
                             string="Active"
@@ -93,7 +94,7 @@
                             string="Closed"
                             domain="[('state','=','done')]"
                             help="Leads/Opportunities which are in done state"/>
-                            
+
                         <separator orientation="vertical" />
                         <field name="section_id"
                             default="context.get('section_id', False)"
@@ -127,7 +128,7 @@
                         <filter string="Salesman" name="user" icon="terp-personal"
                             domain="[]" context="{'group_by':'user_id'}" />
                         <filter string="Sales Team" icon="terp-personal+"
-                            domain="[]" 
+                            domain="[]"
                             context="{'group_by':'section_id'}" />
                         <filter string="Partner" icon="terp-partner" context="{'group_by':'partner_id'}" />
                         <filter string="Country" icon="terp-go-home" context="{'group_by':'country_id'}" />
diff --git a/addons/crm/security/crm_security.xml b/addons/crm/security/crm_security.xml
index ab29f28d89b..78018a4031b 100644
--- a/addons/crm/security/crm_security.xml
+++ b/addons/crm/security/crm_security.xml
@@ -35,9 +35,5 @@
         <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
     </record>
     
-    <record id="base.user_demo" model="res.users">
-        <field name="groups_id" eval="[(4,ref('base.group_sale_salesman'))]"/> 
-    </record>
-
     </data>
 </openerp>
diff --git a/addons/crm_caldav/i18n/fr.po b/addons/crm_caldav/i18n/fr.po
new file mode 100644
index 00000000000..c61908825a7
--- /dev/null
+++ b/addons/crm_caldav/i18n/fr.po
@@ -0,0 +1,34 @@
+# French 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:46+0000\n"
+"PO-Revision-Date: 2010-11-13 20:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: crm_caldav
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: crm_caldav
+#: model:ir.module.module,shortdesc:crm_caldav.module_meta_information
+msgid "Extened Module to Add CalDav future on Meeting"
+msgstr ""
+
+#. module: crm_caldav
+#: model:ir.model,name:crm_caldav.model_crm_meeting
+msgid "Meeting"
+msgstr ""
diff --git a/addons/crm_caldav/i18n/it.po b/addons/crm_caldav/i18n/it.po
new file mode 100644
index 00000000000..370ebc319a6
--- /dev/null
+++ b/addons/crm_caldav/i18n/it.po
@@ -0,0 +1,36 @@
+# Italian 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:46+0000\n"
+"PO-Revision-Date: 2010-11-13 08:17+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Italian <it@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: crm_caldav
+#: 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 per “x_” e non contenere alcun carattere "
+"speciale!"
+
+#. module: crm_caldav
+#: model:ir.module.module,shortdesc:crm_caldav.module_meta_information
+msgid "Extened Module to Add CalDav future on Meeting"
+msgstr ""
+
+#. module: crm_caldav
+#: model:ir.model,name:crm_caldav.model_crm_meeting
+msgid "Meeting"
+msgstr ""
diff --git a/addons/crm_caldav/i18n/sr.po b/addons/crm_caldav/i18n/sr.po
new file mode 100644
index 00000000000..6f033d2f0cb
--- /dev/null
+++ b/addons/crm_caldav/i18n/sr.po
@@ -0,0 +1,35 @@
+# Serbian 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:46+0000\n"
+"PO-Revision-Date: 2010-11-13 22:11+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: crm_caldav
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
+
+#. module: crm_caldav
+#: model:ir.module.module,shortdesc:crm_caldav.module_meta_information
+msgid "Extened Module to Add CalDav future on Meeting"
+msgstr "Prosireni Modul za dodavanje CalDav predvidjanje na sastanku"
+
+#. module: crm_caldav
+#: model:ir.model,name:crm_caldav.model_crm_meeting
+msgid "Meeting"
+msgstr "Sastanak"
diff --git a/addons/crm_fundraising/i18n/it.po b/addons/crm_fundraising/i18n/it.po
index 5fe36fbaac4..feabc873316 100644
--- a/addons/crm_fundraising/i18n/it.po
+++ b/addons/crm_fundraising/i18n/it.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-11-08 08:31+0000\n"
+"PO-Revision-Date: 2010-11-13 08:08+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-09 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: crm_fundraising
@@ -25,23 +25,23 @@ msgstr ""
 #. module: crm_fundraising
 #: field:crm.fundraising.report,nbr:0
 msgid "# of Cases"
-msgstr ""
+msgstr "# di Casi"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: view:crm.fundraising.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Ragguppa per..."
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,probability:0
 msgid "Avg. Probability"
-msgstr ""
+msgstr "Probabilità media"
 
 #. module: crm_fundraising
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome del modello non valido nella definizione dell'azione"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -68,12 +68,12 @@ msgstr ""
 #. module: crm_fundraising
 #: field:crm.fundraising,email_cc:0
 msgid "Watchers Emails"
-msgstr ""
+msgstr "Email osservatori"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "Cases"
-msgstr ""
+msgstr "Casi"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,priority:0
@@ -84,17 +84,17 @@ msgstr ""
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Giorno"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Add Internal Note"
-msgstr ""
+msgstr "Aggiungi nota interna"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,partner_mobile:0
 msgid "Mobile"
-msgstr ""
+msgstr "Cellulare"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -104,17 +104,17 @@ msgstr ""
 #. module: crm_fundraising
 #: field:crm.fundraising,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Messaggi"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Amount"
-msgstr ""
+msgstr "Importo"
 
 #. module: crm_fundraising
 #: model:crm.case.categ,name:crm_fundraising.categ_fund4
 msgid "Arts And Culture"
-msgstr ""
+msgstr "Arte e Cultura"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
@@ -130,78 +130,78 @@ msgstr ""
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mese   "
 
 #. module: crm_fundraising
 #: field:crm.fundraising,type_id:0
 msgid "Campaign"
-msgstr ""
+msgstr "Campagna"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,date_action_next:0
 msgid "Next Action"
-msgstr ""
+msgstr "Prossima azione"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Reimposta a Bozza"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Extra Info"
-msgstr ""
+msgstr "Informazioni extra"
 
 #. module: crm_fundraising
 #: model:ir.model,name:crm_fundraising.model_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_config_fundrising
 #: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fund_raise
 msgid "Fund Raising"
-msgstr ""
+msgstr "Raccolta fondi"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: field:crm.fundraising,partner_id:0
 #: field:crm.fundraising.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: crm_fundraising
 #: model:ir.actions.act_window,name:crm_fundraising.action_report_crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_report_crm_fundraising_tree
 msgid "Fundraising Analysis"
-msgstr ""
+msgstr "Analisi raccolta fondi"
 
 #. module: crm_fundraising
 #: model:ir.module.module,shortdesc:crm_fundraising.module_meta_information
 msgid "CRM Fundraising"
-msgstr ""
+msgstr "Raccolta fondi CRM"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Estimates"
-msgstr ""
+msgstr "Stime"
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,section_id:0
 msgid "Section"
-msgstr ""
+msgstr "Sezione"
 
 #. module: crm_fundraising
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valido per la struttura della vista!"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: field:crm.fundraising,priority:0
 msgid "Priority"
-msgstr ""
+msgstr "Priorità"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Send New Email"
-msgstr ""
+msgstr "Invia nuova E-mail"
 
 #. module: crm_fundraising
 #: model:crm.case.categ,name:crm_fundraising.categ_fund1
@@ -212,22 +212,22 @@ msgstr ""
 #: view:crm.fundraising:0
 #: view:crm.fundraising.report:0
 msgid "Payment Mode"
-msgstr ""
+msgstr "Modalità di pagamento"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Reply"
-msgstr ""
+msgstr "Rispondi"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,email_from:0
 msgid "Email"
-msgstr ""
+msgstr "E-mail"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,canal_id:0
 msgid "Channel"
-msgstr ""
+msgstr "Canale"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,priority:0
@@ -237,14 +237,14 @@ msgstr ""
 #. module: crm_fundraising
 #: field:crm.fundraising,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Data creazione"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,date_closed:0
 #: selection:crm.fundraising,state:0
 #: selection:crm.fundraising.report,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Chiuso"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,date_deadline:0
@@ -254,12 +254,12 @@ msgstr ""
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Luglio"
 
 #. module: crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_crm_case_fundraising-act
 msgid "Categories"
-msgstr ""
+msgstr "Categorie"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,stage_id:0
@@ -274,43 +274,43 @@ msgstr ""
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Dates"
-msgstr ""
+msgstr "Date"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,partner_name2:0
 msgid "Employee Email"
-msgstr ""
+msgstr "Email impiegato"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,state:0
 #: selection:crm.fundraising.report,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Annullato"
 
 #. module: crm_fundraising
 #: model:crm.case.categ,name:crm_fundraising.categ_fund2
 msgid "Learning And Education"
-msgstr ""
+msgstr "Insegnameno e educazione"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Contact"
-msgstr ""
+msgstr "Contatto"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Fund Description"
-msgstr ""
+msgstr "Descrizione fondo"
 
 #. module: crm_fundraising
 #: help:crm.fundraising.report,delay_close:0
 msgid "Number of Days to close the case"
-msgstr ""
+msgstr "Numero di giorni per chiudere il caso"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -321,12 +321,12 @@ msgstr ""
 #: view:crm.fundraising.report:0
 #: model:ir.module.module,description:crm_fundraising.module_meta_information
 msgid "Fundraising"
-msgstr ""
+msgstr "Raccolta fondi"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Settembre"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -342,7 +342,7 @@ msgstr ""
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mese"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -352,12 +352,12 @@ msgstr ""
 #. module: crm_fundraising
 #: field:crm.fundraising,write_date:0
 msgid "Update Date"
-msgstr ""
+msgstr "Aggiorna data"
 
 #. module: crm_fundraising
 #: model:crm.case.resource.type,name:crm_fundraising.type_fund3
 msgid "Credit Card"
-msgstr ""
+msgstr "Carta di credito"
 
 #. module: crm_fundraising
 #: model:ir.actions.act_window,name:crm_fundraising.crm_fundraising_stage_act
@@ -367,7 +367,7 @@ msgstr ""
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "Salesman"
-msgstr ""
+msgstr "Commerciale"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,ref:0
@@ -385,19 +385,19 @@ msgstr ""
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,categ_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categoria"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Anno  "
 
 #. module: crm_fundraising
 #: field:crm.fundraising,planned_cost:0
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,planned_cost:0
 msgid "Planned Costs"
-msgstr ""
+msgstr "Costi pianificati"
 
 #. module: crm_fundraising
 #: help:crm.fundraising,email_cc:0
@@ -406,13 +406,16 @@ msgid ""
 "outbound emails for this record before being sent. Separate multiple email "
 "addresses with a comma"
 msgstr ""
+"Questi indirizzi email verranno aggiunti nel campo CC di tutte le email, in "
+"entrate e uscita, prima di essere spedite. E' necessario separare gli "
+"indirizzi con una virgola"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,state:0
 #: view:crm.fundraising.report:0
 #: selection:crm.fundraising.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Bozza"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,priority:0
@@ -422,7 +425,7 @@ msgstr ""
 #. module: crm_fundraising
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Errore! Non è possibile creare un menù ricorsivo."
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -430,7 +433,7 @@ msgstr ""
 #: view:crm.fundraising.report:0
 #: selection:crm.fundraising.report,state:0
 msgid "Pending"
-msgstr ""
+msgstr "In sospeso"
 
 #. module: crm_fundraising
 #: model:ir.ui.menu,name:crm_fundraising.menu_crm_fundraising_stage_act
@@ -440,7 +443,7 @@ msgstr ""
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising,priority:0
@@ -450,43 +453,43 @@ msgstr ""
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Global CC"
-msgstr ""
+msgstr "CC globale"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: model:ir.actions.act_window,name:crm_fundraising.crm_case_category_act_fund_all1
 msgid "Funds"
-msgstr ""
+msgstr "Fondi"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Giugno"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,partner_phone:0
 msgid "Phone"
-msgstr ""
+msgstr "Telefono"
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Utente"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "#Fundraising"
-msgstr ""
+msgstr "# fondi raccolti"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,active:0
 msgid "Active"
-msgstr ""
+msgstr "Attivo"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
@@ -496,32 +499,32 @@ msgstr ""
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "Search"
-msgstr ""
+msgstr "Ricerca"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Ottobre"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Gennaio"
 
 #. module: crm_fundraising
 #: model:crm.case.resource.type,name:crm_fundraising.type_fund2
 msgid "Cheque"
-msgstr ""
+msgstr "Assegno"
 
 #. module: crm_fundraising
 #: help:crm.fundraising,email_from:0
 msgid "These people will receive email."
-msgstr ""
+msgstr "Queste persone riceveranno email."
 
 #. module: crm_fundraising
 #: field:crm.fundraising,date:0
 msgid "Date"
-msgstr ""
+msgstr "Data"
 
 #. module: crm_fundraising
 #: model:crm.case.categ,name:crm_fundraising.categ_fund3
@@ -531,17 +534,17 @@ msgstr ""
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "History"
-msgstr ""
+msgstr "Storico"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Attachments"
-msgstr ""
+msgstr "Allegati"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Misc"
-msgstr ""
+msgstr "Varie"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -549,24 +552,24 @@ msgstr ""
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Stato"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: view:crm.fundraising.report:0
 msgid "Done"
-msgstr ""
+msgstr "Completato"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Dicembre"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: view:crm.fundraising.report:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annulla"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -581,17 +584,19 @@ msgstr ""
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"l nome dell'oggetto deve iniziare per “x_” e non contenere alcun carattere "
+"speciale!"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: field:crm.fundraising,user_id:0
 msgid "Responsible"
-msgstr ""
+msgstr "Responsabile"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Current"
-msgstr ""
+msgstr "Attuale"
 
 #. module: crm_fundraising
 #: help:crm.fundraising,section_id:0
@@ -603,17 +608,17 @@ msgstr ""
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Details"
-msgstr ""
+msgstr "Dettagli"
 
 #. module: crm_fundraising
 #: model:ir.model,name:crm_fundraising.model_crm_fundraising_report
 msgid "CRM Fundraising Report"
-msgstr ""
+msgstr "Report CRM raccolta fondi"
 
 #. module: crm_fundraising
 #: field:crm.fundraising.report,type_id:0
 msgid "Fundraising Type"
-msgstr ""
+msgstr "Tipo di raccolta fondi"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
@@ -624,22 +629,22 @@ msgstr ""
 #. module: crm_fundraising
 #: field:crm.fundraising,description:0
 msgid "Description"
-msgstr ""
+msgstr "Descrizione"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maggio"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,probability:0
 msgid "Probability (%)"
-msgstr ""
+msgstr "Probabilità (%)"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,partner_name:0
 msgid "Employee's Name"
-msgstr ""
+msgstr "Nome dell'impiegato"
 
 #. module: crm_fundraising
 #: help:crm.fundraising,canal_id:0
@@ -647,6 +652,8 @@ msgid ""
 "The channels represent the different communication  modes available with the "
 "customer."
 msgstr ""
+"I canali rappresentano le differenti modalità di comunicazione disponibili "
+"con il cliente."
 
 #. module: crm_fundraising
 #: help:crm.fundraising,state:0
@@ -659,37 +666,45 @@ msgid ""
 "       \n"
 "If the case needs to be reviewed then the state is set to 'Pending'."
 msgstr ""
+"Lo stato è impostato a \"Bozza\", quando il caso è creato.                   "
+"           \n"
+"Se il caso è in corso lo stato è impostato a \"Aperto\".                     "
+"         \n"
+"Quando il caso è finito, lo stato è impostato su \"Completato\".             "
+"                 \n"
+"Se il caso necessita di essere revisionato allora lo stato è impostato su "
+"\"In sospeso\"."
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febbraio"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 #: field:crm.fundraising,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nome"
 
 #. module: crm_fundraising
 #: model:crm.case.resource.type,name:crm_fundraising.type_fund1
 msgid "Cash"
-msgstr ""
+msgstr "Contanti"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
 msgid "Funds by Categories"
-msgstr ""
+msgstr "Fondi per categorie"
 
 #. module: crm_fundraising
 #: selection:crm.fundraising.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Aprile"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 msgid "My Case(s)"
-msgstr ""
+msgstr "I miei casi(o)"
 
 #. module: crm_fundraising
 #: model:crm.case.resource.type,name:crm_fundraising.type_fund4
@@ -699,7 +714,7 @@ msgstr ""
 #. module: crm_fundraising
 #: field:crm.fundraising,id:0
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. module: crm_fundraising
 #: view:crm.fundraising:0
@@ -721,20 +736,20 @@ msgstr ""
 #. module: crm_fundraising
 #: field:crm.fundraising.report,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Data di creazione"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,date_action_last:0
 msgid "Last Action"
-msgstr ""
+msgstr "Ultima azione"
 
 #. module: crm_fundraising
 #: view:crm.fundraising.report:0
 #: field:crm.fundraising.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Anno"
 
 #. module: crm_fundraising
 #: field:crm.fundraising,duration:0
 msgid "Duration"
-msgstr ""
+msgstr "Durata"
diff --git a/addons/crm_partner_assign/i18n/it.po b/addons/crm_partner_assign/i18n/it.po
new file mode 100644
index 00000000000..17563f9210a
--- /dev/null
+++ b/addons/crm_partner_assign/i18n/it.po
@@ -0,0 +1,717 @@
+# Italian 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:46+0000\n"
+"PO-Revision-Date: 2010-11-13 08:32+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Italian <it@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,name:0
+msgid "Send to"
+msgstr "Invia a"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_close:0
+msgid "Delay to Close"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,planned_revenue:0
+msgid "Planned Revenue"
+msgstr "Entrate pianificate"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,nbr:0
+msgid "# of Cases"
+msgstr "# di Casi"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Group By..."
+msgstr "Raggruppa per..."
+
+#. module: crm_partner_assign
+#: 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: crm_partner_assign
+#: view:crm.lead:0
+#: view:crm.lead.forward.to.partner:0
+msgid "Forward"
+msgstr "Inoltra"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,reply_to:0
+msgid "Reply-to of the Sales team defined on this case"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localize"
+msgstr "Geo localizzazione"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "March"
+msgstr "Marzo"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Lead"
+msgstr "Iniziativa"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to close"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Whole Story"
+msgstr "Storia intera"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,company_id:0
+msgid "Company"
+msgstr "Company"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:0
+#, python-format
+msgid ""
+"Could not contact geolocation servers, please make sure you have a working "
+"internet connection (%s)"
+msgstr ""
+"Non è possibile contattare il server per la geolocalizzazione, per favore "
+"assicurarsi che sia funzionante la connessione internet (%s)"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,partner_date:0
+msgid "Partner Date"
+msgstr "Data Partner"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Highest"
+msgstr "Maggiore"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,day:0
+msgid "Day"
+msgstr "Giorno"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Latest email"
+msgstr "Ultima email"
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_latitude:0
+#: field:res.partner,partner_latitude:0
+msgid "Geo Latitude"
+msgstr "Geo Latitudine"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Cancelled"
+msgstr "Annullato"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assignation"
+msgstr "Geo assegnazione"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,date_closed:0
+msgid "Close Date"
+msgstr "Data chiusura"
+
+#. module: crm_partner_assign
+#: help:res.partner,partner_weight:0
+msgid ""
+"Gives the probability to assign a lead to this partner. (0 means no "
+"assignation.)"
+msgstr ""
+"Fornisce la probabilità di assegnare una iniziativa a questo Partner. (0 "
+"significa nessun assegnamento)."
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.res_partner_grade_action
+#: model:ir.ui.menu,name:crm_partner_assign.menu_res_partner_grade_action
+#: field:res.partner,grade_id:0
+#: view:res.partner.grade:0
+msgid "Partner Grade"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Pending"
+msgstr "In sospeso"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,name:0
+#: field:crm.lead.forward.to.partner,partner_id:0
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,partner_assigned_id:0
+#: model:ir.model,name:crm_partner_assign.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability:0
+msgid "Avg Probability"
+msgstr "Probabilità media"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Previous"
+msgstr "Precedente"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/partner_geo_assign.py:0
+#, python-format
+msgid "Network error"
+msgstr "Errore di rete"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,email_cc:0
+msgid ""
+"These addresses will receive a copy of this email. To modify the permanent "
+"CC list, edit the global CC field of this case"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_from:0
+msgid "From"
+msgstr "Da"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: view:crm.lead.report.assign:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Closed"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Section"
+msgstr "Sezione"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Next"
+msgstr "Prossimo"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,priority:0
+msgid "Priority"
+msgstr "Priorità"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,state:0
+msgid "State"
+msgstr "Stato"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_expected:0
+msgid "Overpassed Deadline"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,html:0
+msgid "HTML formatting?"
+msgstr "Formattazione HTML?"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: crm_partner_assign
+#: help:crm.lead,partner_assigned_id:0
+msgid "Partner this case has been forwarded/assigned to."
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Lowest"
+msgstr "Minore"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Leads Analysis"
+msgstr "Analisi iniziative"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,creation_date:0
+msgid "Creation Date"
+msgstr "Data creazione"
+
+#. module: crm_partner_assign
+#: help:crm.lead.forward.to.partner,html:0
+msgid "Select this if you want to send email with HTML formatting."
+msgstr "Seleziona qui se volete inviare email in formato HTML."
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "7 Days"
+msgstr "7 giorni"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Partner Assignation"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,type:0
+msgid "Type is used to separate Leads and Opportunities"
+msgstr "Tipo è utilizzato per separare Iniziative e Opportunità"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "July"
+msgstr "Luglio"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,stage_id:0
+msgid "Stage"
+msgstr ""
+
+#. module: crm_partner_assign
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valido per la struttura della vista!"
+
+#. module: crm_partner_assign
+#: code:addons/crm_partner_assign/wizard/crm_forward_to_partner.py:0
+#, python-format
+msgid "Fwd"
+msgstr "Inoltra"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Geo Localization"
+msgstr "Geo Localizzazione"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Opportunities Assignment Analysis"
+msgstr "Analisi assegnamento opportunità"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Cancel"
+msgstr "Annulla"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,history:0
+msgid "Send history"
+msgstr "Invia storico"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+msgid "Contact"
+msgstr "Contatto"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Close"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.actions.act_window,name:crm_partner_assign.action_report_crm_opportunity_assign
+#: model:ir.ui.menu,name:crm_partner_assign.menu_report_crm_opportunities_assign_tree
+msgid "Opp. Assignment Analysis"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_close:0
+msgid "Number of Days to close the case"
+msgstr "Numero di giorni per chiudere il caso"
+
+#. module: crm_partner_assign
+#: field:res.partner,partner_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Delay to open"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,grade_id:0
+msgid "Grade"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "December"
+msgstr "Dicembre"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,month:0
+msgid "Month"
+msgstr "Mese"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,opening_date:0
+msgid "Opening Date"
+msgstr "Data apertura"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,subject:0
+msgid "Subject"
+msgstr "Oggetto"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Salesman"
+msgstr "Commerciale"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,reply_to:0
+msgid "Reply To"
+msgstr "Rispondi a"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,categ_id:0
+msgid "Category"
+msgstr "Categoria"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "#Opportunities"
+msgstr "# Opportunità"
+
+#. module: crm_partner_assign
+#: model:ir.module.module,shortdesc:crm_partner_assign.module_meta_information
+msgid "Partner Geo-Localisation"
+msgstr "Geo-localizzazione Partner"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+msgid "Draft"
+msgstr "Bozza"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Low"
+msgstr ""
+
+#. module: crm_partner_assign
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Errore! Non è possibile creare un menù ricorsivo."
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+#: field:res.partner,opportunity_assigned_ids:0
+msgid "Assigned Opportunities"
+msgstr "Opportunità assegnate"
+
+#. module: crm_partner_assign
+#: field:crm.lead,date_assign:0
+msgid "Assignation Date"
+msgstr "Data assegnazione"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probability_max:0
+msgid "Max Probability"
+msgstr "Probabilità massima"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "August"
+msgstr "Agosto"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "Normal"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Escalate"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,attachment_ids:0
+msgid "unknown"
+msgstr "sconosciuto"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "June"
+msgstr "Giugno"
+
+#. module: crm_partner_assign
+#: help:crm.lead.report.assign,delay_open:0
+msgid "Number of Days to open the case"
+msgstr "Numero di giorni per aprire il caso"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,delay_open:0
+msgid "Delay to Open"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,name:0
+#: field:crm.lead.forward.to.partner,user_id:0
+#: field:crm.lead.report.assign,user_id:0
+msgid "User"
+msgstr "Utente"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,active:0
+msgid "Active"
+msgstr "Attivo"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "November"
+msgstr "Novembre"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Extended Filters..."
+msgstr "Filtri estesi..."
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_longitude:0
+#: field:res.partner,partner_longitude:0
+msgid "Geo Longitude"
+msgstr "Geo Longitudine"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "October"
+msgstr "Ottobre"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Assignation"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_cc:0
+msgid "CC"
+msgstr "CC"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "January"
+msgstr "Gennaio"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Planned Revenues"
+msgstr ""
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_res_partner_grade
+msgid "res.partner.grade"
+msgstr "res.partner.grade"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+msgid "Unchanged"
+msgstr "Invariato"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "September"
+msgstr "Settembre"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Last 30 Days"
+msgstr "Ultimi 30 giorni"
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,name:0
+msgid "Grade Name"
+msgstr ""
+
+#. module: crm_partner_assign
+#: help:crm.lead,date_assign:0
+msgid "Last date this case was forwarded/assigned to a partner"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,state:0
+#: selection:crm.lead.report.assign,state:0
+#: view:res.partner:0
+msgid "Open"
+msgstr ""
+
+#. module: crm_partner_assign
+#: 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 per “x_” e non contenere alcun carattere "
+"speciale!"
+
+#. module: crm_partner_assign
+#: field:res.partner,date_localization:0
+msgid "Geo Localization Date"
+msgstr "Data geo localizzazione"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+msgid "Current"
+msgstr "Attuale"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,email_to:0
+msgid "To"
+msgstr "A"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_forward_to_partner
+msgid "Send new email"
+msgstr "Invia nuova mail"
+
+#. module: crm_partner_assign
+#: view:crm.lead.forward.to.partner:0
+#: model:ir.actions.act_window,name:crm_partner_assign.crm_lead_forward_to_partner_act
+msgid "Forward to Partner"
+msgstr ""
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "May"
+msgstr "Maggio"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,probable_revenue:0
+msgid "Probable Revenue"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead,partner_assigned_id:0
+msgid "Assigned Partner"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,address_id:0
+msgid "Address"
+msgstr "Indirizzo"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,type:0
+msgid "Opportunity"
+msgstr "Opportunità"
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,partner_id:0
+msgid "Customer"
+msgstr "Cliente"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "February"
+msgstr "Febbraio"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,name:0
+msgid "Email Address"
+msgstr "Indirizzo email"
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,country_id:0
+msgid "Country"
+msgstr "Paese"
+
+#. module: crm_partner_assign
+#: view:res.partner:0
+msgid "Convert to Opportunity"
+msgstr "Converti in Opportunità"
+
+#. module: crm_partner_assign
+#: view:crm.lead:0
+msgid "Geo Assign"
+msgstr "Geo assegnamento"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,month:0
+msgid "April"
+msgstr "Aprile"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead
+msgid "crm.lead"
+msgstr "crm.lead"
+
+#. module: crm_partner_assign
+#: model:ir.model,name:crm_partner_assign.model_crm_lead_report_assign
+msgid "CRM Lead Report"
+msgstr "CRM Report iniziative"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.forward.to.partner,history:0
+msgid "Case Information"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:res.partner.grade,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,body:0
+msgid "Message Body"
+msgstr "Corpo messaggio"
+
+#. module: crm_partner_assign
+#: selection:crm.lead.report.assign,priority:0
+msgid "High"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,section_id:0
+msgid "Sales Team"
+msgstr ""
+
+#. module: crm_partner_assign
+#: field:crm.lead.report.assign,create_date:0
+msgid "Create Date"
+msgstr "Data creazione"
+
+#. module: crm_partner_assign
+#: field:crm.lead.forward.to.partner,state:0
+msgid "Set New State To"
+msgstr ""
+
+#. module: crm_partner_assign
+#: view:crm.lead.report.assign:0
+#: field:crm.lead.report.assign,name:0
+msgid "Year"
+msgstr "Anno"
diff --git a/addons/decimal_precision/i18n/fr.po b/addons/decimal_precision/i18n/fr.po
index cd6cd9c4948..a70fca64311 100644
--- a/addons/decimal_precision/i18n/fr.po
+++ b/addons/decimal_precision/i18n/fr.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-08-30 12:19+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-11-13 08: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-30 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: decimal_precision
 #: field:decimal.precision,digits:0
 msgid "Digits"
-msgstr ""
+msgstr "Chiffres"
 
 #. module: decimal_precision
 #: constraint:ir.ui.view:0
@@ -40,13 +40,13 @@ msgstr ""
 #. module: decimal_precision
 #: model:ir.module.module,shortdesc:decimal_precision.module_meta_information
 msgid "Decimal Precision Configuration"
-msgstr ""
+msgstr "Configuration de la précision décimale"
 
 #. module: decimal_precision
 #: model:ir.actions.act_window,name:decimal_precision.action_decimal_precision_form
 #: model:ir.ui.menu,name:decimal_precision.menu_decimal_precision_form
 msgid "Decimal Accuracy"
-msgstr ""
+msgstr "Précision décimale"
 
 #. module: decimal_precision
 #: constraint:ir.ui.menu:0
@@ -56,12 +56,12 @@ msgstr ""
 #. module: decimal_precision
 #: field:decimal.precision,name:0
 msgid "Usage"
-msgstr ""
+msgstr "Utilisation"
 
 #. module: decimal_precision
 #: view:decimal.precision:0
 msgid "Decimal Precision"
-msgstr ""
+msgstr "Précision décimale"
 
 #. module: decimal_precision
 #: model:ir.model,name:decimal_precision.model_decimal_precision
diff --git a/addons/delivery/i18n/fr.po b/addons/delivery/i18n/fr.po
index 3ad7822a095..f467146086d 100644
--- a/addons/delivery/i18n/fr.po
+++ b/addons/delivery/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-21 11:30+0000\n"
+"PO-Revision-Date: 2010-11-13 08:14+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-30 05:12+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: delivery
@@ -29,7 +29,7 @@ msgstr "Erreur : l'UdV doit appartenir à une autre catégorie que l'UdM"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Order Ref."
-msgstr ""
+msgstr "Réf. commande"
 
 #. module: delivery
 #: model:product.template,name:delivery.delivery_product_product_template
@@ -44,7 +44,7 @@ msgstr "Destination"
 #. module: delivery
 #: field:stock.move,weight_net:0
 msgid "Net weight"
-msgstr ""
+msgstr "Poids net"
 
 #. module: delivery
 #: code:addons/delivery/delivery.py:0
@@ -55,7 +55,7 @@ msgstr "Aucun prix disponible !"
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid_line
 msgid "Delivery Grid Line"
-msgstr ""
+msgstr "Ligne du tarif de livraison"
 
 #. module: delivery
 #: constraint:ir.actions.act_window:0
@@ -82,7 +82,7 @@ msgstr "Ligne de tarif"
 #. module: delivery
 #: model:ir.actions.report.xml,name:delivery.report_shipping
 msgid "Delivery order"
-msgstr ""
+msgstr "Ordre de livraison"
 
 #. module: delivery
 #: view:res.partner:0
@@ -92,12 +92,14 @@ msgstr "Propriétés des livraisons"
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_picking_tree4
 msgid "Picking to be invoiced"
-msgstr ""
+msgstr "Colisages à facturer"
 
 #. module: delivery
 #: help:delivery.grid,sequence:0
 msgid "Gives the sequence order when displaying a list of delivery grid."
 msgstr ""
+"Donne l'ordre de séquence lors de l'affichage d'une liste de tarifs de "
+"livraison."
 
 #. module: delivery
 #: view:delivery.grid:0
@@ -108,12 +110,12 @@ msgstr "Pays"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Delivery Order :"
-msgstr ""
+msgstr "Ordre de livraison :"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_sale_order
 msgid "Sale Order"
-msgstr ""
+msgstr "Commande de vente"
 
 #. module: delivery
 #: field:delivery.grid.line,variable_factor:0
@@ -144,7 +146,7 @@ msgstr ""
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Mouvement de stock"
 
 #. module: delivery
 #: code:addons/delivery/delivery.py:0
@@ -156,12 +158,12 @@ msgstr ""
 #. module: delivery
 #: field:stock.picking,carrier_tracking_ref:0
 msgid "Carrier Tracking Ref"
-msgstr ""
+msgstr "Référence de suivi du transporteur"
 
 #. module: delivery
 #: field:stock.picking,weight_net:0
 msgid "Net Weight"
-msgstr ""
+msgstr "Poids net"
 
 #. module: delivery
 #: view:delivery.grid.line:0
@@ -176,7 +178,7 @@ msgstr "Définition des tarifs"
 #. module: delivery
 #: view:delivery.sale.order:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Annuler"
 
 #. module: delivery
 #: field:delivery.grid.line,operator:0
@@ -186,7 +188,7 @@ msgstr "Opérateur"
 #. module: delivery
 #: model:ir.model,name:delivery.model_res_partner
 msgid "Partner"
-msgstr ""
+msgstr "Partenaire"
 
 #. module: delivery
 #: constraint:ir.ui.menu:0
@@ -196,17 +198,17 @@ msgstr ""
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Invoiced to"
-msgstr ""
+msgstr "Facturé à"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Liste de colisage"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_sale_order
 msgid "Make Delievery"
-msgstr ""
+msgstr "Faire la livraison"
 
 #. module: delivery
 #: model:ir.module.module,description:delivery.module_meta_information
@@ -218,6 +220,14 @@ msgid ""
 "\n"
 "     "
 msgstr ""
+"Vous permet d'ajouter une méthode de livraison dans une commande de vente et "
+"un colisage.\n"
+"     Vous pouvez définir votre propre transporteur et votre propre grille de "
+"tarif pour les livraisons.\n"
+"     Quand OpenERP va créer les factures des colisages, il sera capable "
+"d'ajouter et de calculer la ligne de livraison.\n"
+"\n"
+"     "
 
 #. module: delivery
 #: code:addons/delivery/stock.py:0
@@ -238,7 +248,7 @@ msgstr "Code postal destination"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Order Date"
-msgstr ""
+msgstr "Date de commande"
 
 #. module: delivery
 #: field:delivery.grid,name:0
@@ -248,12 +258,12 @@ msgstr "Nom du tarif"
 #. module: delivery
 #: view:stock.move:0
 msgid "Weights"
-msgstr ""
+msgstr "Poids"
 
 #. module: delivery
 #: field:stock.picking,number_of_packages:0
 msgid "Number of Packages"
-msgstr ""
+msgstr "Nombre de colis"
 
 #. module: delivery
 #: selection:delivery.grid.line,type:0
@@ -273,7 +283,7 @@ msgstr "Méthode de livraison"
 #: code:addons/delivery/wizard/delivery_sale_order.py:0
 #, python-format
 msgid "No grid available !"
-msgstr ""
+msgstr "Pas de grille tarifaire disponible !"
 
 #. module: delivery
 #: selection:delivery.grid.line,operator:0
@@ -303,7 +313,7 @@ msgstr ""
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Lot"
-msgstr ""
+msgstr "Lot"
 
 #. module: delivery
 #: model:ir.model,name:delivery.model_delivery_grid
@@ -319,7 +329,7 @@ msgstr "Actif"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Shipping Date"
-msgstr ""
+msgstr "Date d'expédition"
 
 #. module: delivery
 #: field:delivery.carrier,product_id:0
@@ -346,6 +356,8 @@ msgstr "Variable"
 #: help:res.partner,property_delivery_carrier:0
 msgid "This delivery method will be used when invoicing from picking."
 msgstr ""
+"Cette méthode de livraison sera utilisée lorsqu'on facturera sur base du "
+"colisage."
 
 #. module: delivery
 #: field:delivery.grid.line,max_value:0
@@ -355,7 +367,7 @@ msgstr "Valeur maximum"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Quantity"
-msgstr ""
+msgstr "Quantité"
 
 #. module: delivery
 #: field:delivery.grid,zip_from:0
@@ -367,6 +379,8 @@ msgstr "Code postal départ"
 msgid ""
 "Complete this field if you plan to invoice the shipping based on picking."
 msgstr ""
+"Complétez ce champ si vous envisagez de facturer l'expédition en fonction "
+"des colisages."
 
 #. module: delivery
 #: constraint:ir.model:0
@@ -389,7 +403,7 @@ msgstr "Ventes et achats"
 #. module: delivery
 #: view:delivery.sale.order:0
 msgid "Create Deliveries"
-msgstr ""
+msgstr "Crée les livraisons"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_cost
@@ -400,7 +414,7 @@ msgstr "Frais de port"
 #. module: delivery
 #: report:sale.shipping:0
 msgid "Description"
-msgstr ""
+msgstr "Description"
 
 #. module: delivery
 #: model:ir.actions.act_window,name:delivery.action_delivery_grid_form
@@ -419,7 +433,7 @@ msgstr "Prix"
 #: code:addons/delivery/wizard/delivery_sale_order.py:0
 #, python-format
 msgid "No grid matching for this carrier !"
-msgstr "Aucun tarif correspondant pour ce mode de transport !"
+msgstr "Aucun tarif correspondant pour ce transporteur !"
 
 #. module: delivery
 #: model:ir.ui.menu,name:delivery.menu_delivery
@@ -468,7 +482,7 @@ msgstr "Transporteur"
 #. module: delivery
 #: view:delivery.sale.order:0
 msgid "_Apply"
-msgstr ""
+msgstr "_Appliquer"
 
 #. module: delivery
 #: field:sale.order,id:0
diff --git a/addons/document/i18n/it.po b/addons/document/i18n/it.po
index 2d341099be6..03158a1aea5 100644
--- a/addons/document/i18n/it.po
+++ b/addons/document/i18n/it.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-30 16:21+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-11-13 09:19+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-31 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
@@ -63,7 +63,7 @@ msgstr "Il nome della directory contiene caratteri speciali !"
 #: view:document.directory:0
 #: view:document.storage:0
 msgid "Group By..."
-msgstr ""
+msgstr "Raggruppa per..."
 
 #. module: document
 #: constraint:ir.actions.act_window:0
@@ -95,12 +95,12 @@ msgstr "File per mesi"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: document
 #: field:document.directory,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Company"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content
@@ -128,12 +128,12 @@ msgstr ""
 #. module: document
 #: view:report.document.user:0
 msgid "This Year"
-msgstr ""
+msgstr "Questo anno"
 
 #. module: document
 #: field:document.storage,path:0
 msgid "Path"
-msgstr ""
+msgstr "Percorso"
 
 #. module: document
 #: code:addons/document/document_directory.py:0
@@ -181,7 +181,7 @@ msgstr ""
 #: code:addons/document/document_storage.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Errore!"
 
 #. module: document
 #: help:document.configuration,product:0
@@ -235,7 +235,7 @@ msgstr ""
 #. module: document
 #: model:ir.model,name:document.model_ir_actions_report_xml
 msgid "ir.actions.report.xml"
-msgstr ""
+msgstr "ir.actions.report.xml"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_document_file_form
@@ -243,7 +243,7 @@ msgstr ""
 #: model:ir.ui.menu,name:document.menu_document_doc
 #: model:ir.ui.menu,name:document.menu_document_files
 msgid "Documents"
-msgstr ""
+msgstr "Documenti"
 
 #. module: document
 #: field:ir.actions.report.xml,model_id:0
@@ -305,12 +305,12 @@ msgstr ""
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_files_by_partner
 msgid "Files Per Partner"
-msgstr ""
+msgstr "Files per Partner"
 
 #. module: document
 #: field:document.directory,dctx_ids:0
 msgid "Context fields"
-msgstr ""
+msgstr "Campi contesto"
 
 #. module: document
 #: field:ir.attachment,store_fname:0
@@ -332,7 +332,7 @@ msgstr "Rapporto"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "July"
-msgstr ""
+msgstr "Luglio"
 
 #. module: document
 #: constraint:ir.ui.view:0
@@ -353,7 +353,7 @@ msgstr "Estensione"
 #. module: document
 #: view:ir.attachment:0
 msgid "Created"
-msgstr ""
+msgstr "Creato"
 
 #. module: document
 #: field:document.directory,content_ids:0
@@ -363,7 +363,7 @@ msgstr "File Virtuali"
 #. module: document
 #: view:ir.attachment:0
 msgid "Modified"
-msgstr ""
+msgstr "Modificato"
 
 #. module: document
 #: code:addons/document/document_storage.py:0
@@ -390,7 +390,7 @@ msgstr "Cartella"
 #. module: document
 #: view:board.board:0
 msgid "Files by Partner"
-msgstr ""
+msgstr "Files per Partner"
 
 #. module: document
 #: field:document.directory,write_uid:0
@@ -430,7 +430,7 @@ msgstr "Dettaglio files per Directory"
 #. module: document
 #: view:report.document.user:0
 msgid "All users files"
-msgstr ""
+msgstr "Tutti i files utenti"
 
 #. module: document
 #: view:board.board:0
@@ -443,7 +443,7 @@ msgstr "Dimensione File per Mese"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "December"
-msgstr ""
+msgstr "Dicembre"
 
 #. module: document
 #: field:document.configuration,config_logo:0
@@ -546,7 +546,7 @@ msgstr ""
 #. module: document
 #: field:document.storage,online:0
 msgid "Online"
-msgstr ""
+msgstr "On line"
 
 #. module: document
 #: help:document.directory,ressource_tree:0
@@ -566,13 +566,13 @@ msgstr "Sicurezza"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "June"
-msgstr ""
+msgstr "Giugno"
 
 #. module: document
 #: field:report.document.user,user:0
@@ -589,13 +589,13 @@ msgstr "Gruppi"
 #. module: document
 #: field:document.directory.content.type,active:0
 msgid "Active"
-msgstr ""
+msgstr "Attivo"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: document
 #: view:ir.attachment:0
@@ -612,7 +612,7 @@ msgstr "Definizione"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "October"
-msgstr ""
+msgstr "Ottobre"
 
 #. module: document
 #: view:document.directory:0
@@ -647,7 +647,7 @@ msgstr "Allegato a"
 #. module: document
 #: model:ir.ui.menu,name:document.menu_reports_document
 msgid "Dashboard"
-msgstr ""
+msgstr "Dashboard"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_user_graph
@@ -657,7 +657,7 @@ msgstr "File per utenti"
 #. module: document
 #: field:document.storage,readonly:0
 msgid "Read Only"
-msgstr ""
+msgstr "Sola lettura"
 
 #. module: document
 #: field:document.directory.dctx,expr:0
@@ -691,12 +691,12 @@ msgstr "Files per mese"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "September"
-msgstr ""
+msgstr "Settembre"
 
 #. module: document
 #: field:document.directory.content,prefix:0
 msgid "Prefix"
-msgstr ""
+msgstr "Prefisso"
 
 #. module: document
 #: field:report.document.wall,last:0
@@ -746,7 +746,7 @@ msgstr "Dettagli file per Partner"
 #. module: document
 #: field:document.directory.dctx,field:0
 msgid "Field"
-msgstr ""
+msgstr "Campo"
 
 #. module: document
 #: model:ir.model,name:document.model_document_directory_dctx
@@ -791,7 +791,7 @@ msgstr "Struttura ad Albero"
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "May"
-msgstr ""
+msgstr "Maggio"
 
 #. module: document
 #: model:ir.actions.act_window,name:document.action_view_all_document_tree1
@@ -811,18 +811,18 @@ msgstr ""
 #. module: document
 #: model:ir.model,name:document.model_ir_attachment
 msgid "ir.attachment"
-msgstr ""
+msgstr "r.attachment"
 
 #. module: document
 #: view:board.board:0
 msgid "New Files"
-msgstr ""
+msgstr "Nuovi files"
 
 #. module: document
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "January"
-msgstr ""
+msgstr "Gennaio"
 
 #. module: document
 #: view:document.directory:0
@@ -871,13 +871,13 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "February"
-msgstr ""
+msgstr "Febbraio"
 
 #. module: document
 #: 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 ""
+msgstr "Statistiche per utente"
 
 #. module: document
 #: field:document.directory,name:0
@@ -888,7 +888,7 @@ msgstr "Nome"
 #. module: document
 #: view:document.directory:0
 msgid "Fields"
-msgstr ""
+msgstr "Campi"
 
 #. module: document
 #: help:document.storage,readonly:0
@@ -899,7 +899,7 @@ msgstr ""
 #: selection:report.document.user,month:0
 #: selection:report.files.partner,month:0
 msgid "April"
-msgstr ""
+msgstr "Aprile"
 
 #. module: document
 #: field:report.document.user,nbr:0
@@ -913,6 +913,8 @@ msgid ""
 "Only members of these groups will have access to this directory and its "
 "files."
 msgstr ""
+"Solo gli appartenenti a questi gruppi avranno accesso a questa directory e "
+"ai suoi files."
 
 #. module: document
 #: view:document.directory:0
@@ -924,7 +926,7 @@ msgstr ""
 #. module: document
 #: field:document.directory.content.type,mimetype:0
 msgid "Mime Type"
-msgstr ""
+msgstr "Tipo MIME"
 
 #. module: document
 #: field:document.directory.content,sequence:0
@@ -940,7 +942,7 @@ msgstr "Nome del Contenuto"
 #: code:addons/document/document.py:0
 #, python-format
 msgid "File name must be unique!"
-msgstr ""
+msgstr "Il nome file deve essere unico!"
 
 #. module: document
 #: selection:document.storage,type:0
@@ -964,7 +966,7 @@ msgstr "File per tipo di risorsa"
 #: field:report.document.user,name:0
 #: field:report.files.partner,name:0
 msgid "Year"
-msgstr ""
+msgstr "Anno"
 
 #. module: document
 #: view:document.storage:0
diff --git a/addons/document_ftp/i18n/it.po b/addons/document_ftp/i18n/it.po
new file mode 100644
index 00000000000..6255c28aede
--- /dev/null
+++ b/addons/document_ftp/i18n/it.po
@@ -0,0 +1,141 @@
+# Italian 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:46+0000\n"
+"PO-Revision-Date: 2010-11-13 09:57+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"Language-Team: Italian <it@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Cancel"
+msgstr "_Annulla"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_configuration
+msgid "Auto Directory Configuration"
+msgstr ""
+
+#. module: document_ftp
+#: help:document.ftp.configuration,host:0
+msgid ""
+"Server address or IP and port to which users should connect to for DMS access"
+msgstr ""
+"Indirizzo Server o IP e porta a cui gli utenti dovrebbero connettersi per "
+"l'accesso al DMS"
+
+#. module: document_ftp
+#: 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 per “x_” e non contenere alcun carattere "
+"speciale!"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: document_ftp
+#: model:ir.actions.url,name:document_ftp.action_document_browse
+msgid "Browse Files"
+msgstr "Sfoglia files"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,config_logo:0
+msgid "Image"
+msgstr "Immagine"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "title"
+msgstr "titolo"
+
+#. module: document_ftp
+#: field:document.ftp.browse,url:0
+msgid "FTP Server"
+msgstr "Server FTP"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
+msgid "FTP Server Configuration"
+msgstr "Configurazione server FTP"
+
+#. module: document_ftp
+#: model:ir.module.module,description:document_ftp.module_meta_information
+msgid ""
+"This is a support FTP Interface with document management system.\n"
+"    With this module you would not only be able to access documents through "
+"OpenERP\n"
+"    but you would also be able to connect with them through the file system "
+"using the\n"
+"    FTP client.\n"
+msgstr ""
+"Questo è un supporto all'interfaccia FTP con il Sistema di Gestione "
+"Documentale.\n"
+"    Con questo modulo non solo è possibile accedere ai documenti da OpenERP\n"
+"    ma è altresì possibile connettersi ad esso tramite l'accesso ai files "
+"direttamente\n"
+"    via client FTP.\n"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Browse"
+msgstr "_Sfoglia"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
+#. module: document_ftp
+#: model:ir.ui.menu,name:document_ftp.menu_document_browse
+msgid "Shared Repository (FTP)"
+msgstr "Deposito condiviso (FTP)"
+
+#. module: document_ftp
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Errore! Non è possibile creare un menù ricorsivo."
+
+#. module: document_ftp
+#: 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_ftp
+#: model:ir.module.module,shortdesc:document_ftp.module_meta_information
+msgid "Integrated FTP Server with Document Management System"
+msgstr "FTP server integrato con il Sistema di Gestione Documentale"
+
+#. module: document_ftp
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valido per la struttura della vista!"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_browse
+msgid "Document FTP Browse"
+msgstr ""
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
+msgid "Document Browse"
+msgstr ""
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "Browse Document"
+msgstr ""
diff --git a/addons/document_ftp/i18n/sr.po b/addons/document_ftp/i18n/sr.po
new file mode 100644
index 00000000000..b5f3ecbc4a1
--- /dev/null
+++ b/addons/document_ftp/i18n/sr.po
@@ -0,0 +1,140 @@
+# Serbian 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:46+0000\n"
+"PO-Revision-Date: 2010-11-13 21:57+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Cancel"
+msgstr "_Cancel"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_configuration
+msgid "Auto Directory Configuration"
+msgstr "Auto Podesavanje dIrektorijuma"
+
+#. module: document_ftp
+#: help:document.ftp.configuration,host:0
+msgid ""
+"Server address or IP and port to which users should connect to for DMS access"
+msgstr ""
+"Adresa Servera ili IP i Port na koji bi korisnik trebalo da se konektuje za "
+"DMS pristup"
+
+#. module: document_ftp
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora zaoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,progress:0
+msgid "Configuration Progress"
+msgstr "Konfiguracioni Proces"
+
+#. module: document_ftp
+#: model:ir.actions.url,name:document_ftp.action_document_browse
+msgid "Browse Files"
+msgstr "Pretrazi fajlove"
+
+#. module: document_ftp
+#: field:document.ftp.configuration,config_logo:0
+msgid "Image"
+msgstr "Slika"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "title"
+msgstr "Naslov"
+
+#. module: document_ftp
+#: field:document.ftp.browse,url:0
+msgid "FTP Server"
+msgstr "FTP Server"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_config_auto_directory
+msgid "FTP Server Configuration"
+msgstr "KOnfiguracija FTP Servera"
+
+#. module: document_ftp
+#: model:ir.module.module,description:document_ftp.module_meta_information
+msgid ""
+"This is a support FTP Interface with document management system.\n"
+"    With this module you would not only be able to access documents through "
+"OpenERP\n"
+"    but you would also be able to connect with them through the file system "
+"using the\n"
+"    FTP client.\n"
+msgstr ""
+"Ovo podrzava FTP Interfejs sa dokument menadzment sistemom.\n"
+"    Sa ovim modulom necete biti u mogucnosti da samo pristupite dokumentima "
+"kroz OpenERP\n"
+"    nego ce te takodje moci da se konektujete uz pomoc modula kroz fajl "
+"sistem koristeci\n"
+"    FTP klijenta.\n"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "_Browse"
+msgstr "_Browse"
+
+#. module: document_ftp
+#: view:document.ftp.configuration:0
+msgid "res_config_contents"
+msgstr "res_config_contents"
+
+#. module: document_ftp
+#: model:ir.ui.menu,name:document_ftp.menu_document_browse
+msgid "Shared Repository (FTP)"
+msgstr "Deljeno skladiste (FTP)"
+
+#. module: document_ftp
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska ! Ne mozes kreirati rekursivni meni."
+
+#. module: document_ftp
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Neispravno ime modela u definiciji akcije."
+
+#. module: document_ftp
+#: model:ir.module.module,shortdesc:document_ftp.module_meta_information
+msgid "Integrated FTP Server with Document Management System"
+msgstr "Integrisani FTP Server sa Dokument Menadzment Sistemom"
+
+#. module: document_ftp
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neispravan XML za pregled arhitekture!"
+
+#. module: document_ftp
+#: model:ir.model,name:document_ftp.model_document_ftp_browse
+msgid "Document FTP Browse"
+msgstr "FTP pretrazi Dokumente"
+
+#. module: document_ftp
+#: model:ir.actions.act_window,name:document_ftp.action_ftp_browse
+msgid "Document Browse"
+msgstr "Pretrazi Dokumente"
+
+#. module: document_ftp
+#: view:document.ftp.browse:0
+msgid "Browse Document"
+msgstr "Pretrazi Dokument"
diff --git a/addons/document_webdav/i18n/it.po b/addons/document_webdav/i18n/it.po
index f384ee12f77..2e94ac9ebd7 100644
--- a/addons/document_webdav/i18n/it.po
+++ b/addons/document_webdav/i18n/it.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-11-11 11:57+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"PO-Revision-Date: 2010-11-12 09:43+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document_webdav
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 5cbfecde4eb..8e8764ca1a7 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
 	<data>
-
+    <record id="base.user_demo" model="res.users">
+             <field name="groups_id" eval="[(4, ref('marketing.group_marketing_user')),(4, ref('base.group_sale_salesman'))]"/>
+     </record>
 <!-- Demo Data for Product -->
 	<record id="event_product_0" model="product.product">
 		<field name="list_price">68.00</field>
diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml
index d98202c2aea..8aba5863e22 100644
--- a/addons/event/security/event_security.xml
+++ b/addons/event/security/event_security.xml
@@ -17,9 +17,6 @@
     <record id="base.group_sale_salesman" model="res.groups">
         <field name="name">Sales / User</field>
     </record>
-	<record id="base.user_demo" model="res.users">
-             <field name="groups_id" eval="[(4, ref('marketing.group_marketing_user')),(4, ref('base.group_sale_salesman'))]"/>
-     </record>
   </data>
 </openerp>
 
diff --git a/addons/google_map/i18n/el.po b/addons/google_map/i18n/el.po
index ed83753ca5b..e7836384cbb 100644
--- a/addons/google_map/i18n/el.po
+++ b/addons/google_map/i18n/el.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-11-11 14:10+0000\n"
+"PO-Revision-Date: 2010-11-12 08:48+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:45+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: google_map
diff --git a/addons/hr/hr_demo.xml b/addons/hr/hr_demo.xml
index 0d41ff1a4c9..43bd88312f1 100644
--- a/addons/hr/hr_demo.xml
+++ b/addons/hr/hr_demo.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
+        <record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[(4, ref('base.group_hr_user'))]"/>
+        </record>
 
         <!-- Employee Category -->
 
diff --git a/addons/hr/i18n/sr.po b/addons/hr/i18n/sr.po
index e9972e768a3..901c2072789 100644
--- a/addons/hr/i18n/sr.po
+++ b/addons/hr/i18n/sr.po
@@ -8,40 +8,40 @@ 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: 2009-12-28 10:27+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-11-13 23:15+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
 "Language-Team: Serbian <sr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:42+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_openerpuser0
 msgid "Openerp user"
-msgstr ""
+msgstr "Openerp korisnik"
 
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,requirements:0
 msgid "Requirements"
-msgstr ""
+msgstr "Zahtevi"
 
 #. module: hr
 #: constraint:hr.department:0
 msgid "Error! You can not create recursive departments."
-msgstr ""
+msgstr "Greska ! Ne mozes kreirati rekursivna odelenja."
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_contactofemployee0
 msgid "Link the employee to information"
-msgstr ""
+msgstr "Veza od zaposljenog do informacija"
 
 #. module: hr
 #: field:hr.employee,sinid:0
 msgid "SIN No"
-msgstr ""
+msgstr "SIN Br"
 
 #. module: hr
 #: model:ir.module.module,shortdesc:hr.module_meta_information
@@ -50,24 +50,24 @@ msgstr ""
 #: model:ir.ui.menu,name:hr.menu_hr_management
 #: model:ir.ui.menu,name:hr.menu_hr_root
 msgid "Human Resources"
-msgstr ""
+msgstr "Ljudski Resursi"
 
 #. module: hr
 #: view:hr.department:0
 #: view:hr.employee:0
 #: view:hr.job:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupisano Po..."
 
 #. module: hr
 #: field:hr.employee,work_email:0
 msgid "Work E-mail"
-msgstr ""
+msgstr "Poslovni Email"
 
 #. module: hr
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Neispravno ime u definiciji akcije."
 
 #. module: hr
 #: view:hr.employee:0
@@ -76,32 +76,32 @@ msgstr ""
 #: field:hr.job,department_id:0
 #: view:res.users:0
 msgid "Department"
-msgstr ""
+msgstr "Odeljenje"
 
 #. module: hr
 #: help:hr.installer,hr_attendance:0
 msgid "Simplifies the management of employee's attendances."
-msgstr ""
+msgstr "Uproscava menadzment nad prisutnoscu zaposlenih"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Mark as Old"
-msgstr ""
+msgstr "Obelezi kao Staro"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Jobs"
-msgstr ""
+msgstr "Poslovi"
 
 #. module: hr
 #: view:hr.job:0
 msgid "In Recruitment"
-msgstr ""
+msgstr "U zaposljavanju"
 
 #. module: hr
 #: view:hr.installer:0
 msgid "title"
-msgstr ""
+msgstr "Naslov"
 
 #. module: hr
 #: field:hr.department,company_id:0
@@ -109,27 +109,27 @@ msgstr ""
 #: view:hr.job:0
 #: field:hr.job,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Preduzece"
 
 #. module: hr
 #: field:hr.job,no_of_recruitment:0
 msgid "Expected in Recruitment"
-msgstr ""
+msgstr "Ocekivano pri Zaposljavanju"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_config
 msgid "Holidays"
-msgstr ""
+msgstr "Praznici"
 
 #. module: hr
 #: help:hr.installer,hr_holidays:0
 msgid "Tracks employee leaves, allocation requests and planning."
-msgstr ""
+msgstr "Prati odlaske zaposljenih, zahteve za raspodelu i planiranje."
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_employee_marital_status
 msgid "Employee Marital Status"
-msgstr ""
+msgstr "Bracno stanje Zaposljenih"
 
 #. module: hr
 #: help:hr.employee,partner_id:0
@@ -137,47 +137,50 @@ msgid ""
 "Partner that is related to the current employee. Accounting transaction will "
 "be written on this partner belongs to employee."
 msgstr ""
+"Partner koji je odnosi na datog zaposljenog. TRansakcije naloga ce biti "
+"upisane na onim partnerima koji pripadaju zaposljenom."
 
 #. module: hr
 #: model:process.transition,name:hr.process_transition_employeeuser0
 msgid "Link a user to an employee"
-msgstr ""
+msgstr "Veza od korisnika do zaposljenog"
 
 #. module: hr
 #: field:hr.installer,hr_contract:0
 msgid "Employee's Contracts"
-msgstr ""
+msgstr "Ugovori Zaposljenih"
 
 #. module: hr
 #: help:hr.installer,hr_payroll:0
 msgid "Generic Payroll system."
-msgstr ""
+msgstr "Genericki Platni Sistem."
 
 #. module: hr
 #: view:hr.employee:0
 msgid "My Departments Employee"
-msgstr ""
+msgstr "Zaposljeni Mog Odelenja"
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid ""
 "Error ! You cannot select a department for which the employee is the manager."
 msgstr ""
+"Greska ! Ne mozes selektovati odeljenje ciji je zaposljeni i menadzer."
 
 #. module: hr
 #: help:hr.employee,passport_id:0
 msgid "Employee Passport Information"
-msgstr ""
+msgstr "Informacije o Pasošu zaposljenog"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Position"
-msgstr ""
+msgstr "Pozicija"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action2
 msgid "Employee Hierarchy"
-msgstr ""
+msgstr "Hierarhija Zapošljenih"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_employeeuser0
@@ -185,85 +188,89 @@ msgid ""
 "The Related user field on the Employee form allows to link the OpenERP user "
 "(and her rights) to the employee."
 msgstr ""
+"Dato korisničko polje u formi Zapošljenih omogućava da povežeš OpenERP "
+"korisnika( i njegova prava) sa zapošljenim."
 
 #. module: hr
 #: view:hr.job:0
 #: selection:hr.job,state:0
 msgid "In Recruitement"
-msgstr ""
+msgstr "U Zapošljavanju"
 
 #. module: hr
 #: field:hr.employee,identification_id:0
 msgid "Identification No"
-msgstr ""
+msgstr "Identifikacioni Br"
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
 msgid "No of Employee"
-msgstr ""
+msgstr "Br zapošljenog"
 
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Female"
-msgstr ""
+msgstr "Žensko"
 
 #. module: hr
 #: help:hr.installer,hr_timesheet_sheet:0
 msgid ""
 "Tracks and helps employees encode and validate timesheets and attendances."
 msgstr ""
+"Prati i pomaže pri sumiranju i validiranju radnih vremena i prisutnosti na "
+"poslu"
 
 #. module: hr
 #: field:hr.installer,hr_evaluation:0
 msgid "Periodic Evaluations"
-msgstr ""
+msgstr "Periodične Procene"
 
 #. module: hr
 #: field:hr.installer,hr_timesheet_sheet:0
 msgid "Timesheets"
-msgstr ""
+msgstr "Karneti ( vremena rada)"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_employee_tree
 msgid "Employees Structure"
-msgstr ""
+msgstr "Struktura zapošljenih"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Social IDs"
-msgstr ""
+msgstr "Br Socijalnog"
 
 #. module: hr
 #: help:hr.job,no_of_employee:0
 msgid "Number of employee with that job."
-msgstr ""
+msgstr "Broj zapošljenih na tom poslu"
 
 #. module: hr
 #: field:hr.employee,work_phone:0
 msgid "Work Phone"
-msgstr ""
+msgstr "Posl Telefon"
 
 #. module: hr
 #: field:hr.employee.category,child_ids:0
 msgid "Child Categories"
-msgstr ""
+msgstr "Pod Kategorija"
 
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,description:0
 #: model:ir.model,name:hr.model_hr_job
 msgid "Job Description"
-msgstr ""
+msgstr "Opis Posla"
 
 #. module: hr
 #: field:hr.employee,work_location:0
 msgid "Office Location"
-msgstr ""
+msgstr "Lokacija Kancelarije"
 
 #. module: hr
 #: field:hr.employee,passport_id:0
 msgid "Passport"
-msgstr ""
+msgstr "Pasoš"
 
 #. module: hr
 #: view:hr.employee:0
@@ -271,90 +278,90 @@ msgstr ""
 #: model:ir.model,name:hr.model_hr_employee
 #: model:process.node,name:hr.process_node_employee0
 msgid "Employee"
-msgstr ""
+msgstr "Zaposleni"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employeecontact0
 msgid "Other information"
-msgstr ""
+msgstr "Ostale Informacije"
 
 #. module: hr
 #: field:hr.employee,address_id:0
 msgid "Working Address"
-msgstr ""
+msgstr "Adresa Posla"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.action_hr_installer
 msgid "Human Resources Application Configuration"
-msgstr ""
+msgstr "Konfiguracija Aplikacije Ljudskih Resursa"
 
 #. module: hr
 #: field:hr.employee,birthday:0
 msgid "Date of Birth"
-msgstr ""
+msgstr "Datum Rođenja"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_reporting
 msgid "Reporting"
-msgstr ""
+msgstr "Izveštavanje"
 
 #. module: hr
 #: model:ir.model,name:hr.model_ir_actions_act_window
 msgid "ir.actions.act_window"
-msgstr ""
+msgstr "ir.actions.act_window"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr
 msgid "Human Resources Dashboard"
-msgstr ""
+msgstr "Glavna Tabla Ljudskih Resursa"
 
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,job_id:0
 #: view:hr.job:0
 msgid "Job"
-msgstr ""
+msgstr "Posao"
 
 #. module: hr
 #: view:hr.department:0
 #: field:hr.department,member_ids:0
 msgid "Members"
-msgstr ""
+msgstr "Članovi"
 
 #. module: hr
 #: model:ir.ui.menu,name:hr.menu_hr_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguracija"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Categories"
-msgstr ""
+msgstr "Kategorije"
 
 #. module: hr
 #: field:hr.job,expected_employees:0
 msgid "Expected Employees"
-msgstr ""
+msgstr "Očekivani zapopljeni"
 
 #. module: hr
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Neispravan XML za pregled arhitekture"
 
 #. module: hr
 #: help:hr.employee,sinid:0
 msgid "Social Insurance Number"
-msgstr ""
+msgstr "Broj Socijalnog Osiguranja"
 
 #. module: hr
 #: field:hr.employee.category,parent_id:0
 msgid "Parent Category"
-msgstr ""
+msgstr "Roditeljska kategorija"
 
 #. module: hr
 #: constraint:hr.employee.category:0
 msgid "Error ! You cannot create recursive Categories."
-msgstr ""
+msgstr "Greska ! Ne možeš kreirati rekursivne Kategorije."
 
 #. module: hr
 #: view:hr.department:0
@@ -363,44 +370,44 @@ msgstr ""
 #: view:res.users:0
 #: field:res.users,context_department_id:0
 msgid "Departments"
-msgstr ""
+msgstr "Odeljenja"
 
 #. module: hr
 #: model:process.node,name:hr.process_node_employeecontact0
 msgid "Employee Contact"
-msgstr ""
+msgstr "Kontakt Zapošljenog"
 
 #. module: hr
 #: view:board.board:0
 msgid "My Board"
-msgstr ""
+msgstr "Moja Tabla"
 
 #. module: hr
 #: selection:hr.employee,gender:0
 msgid "Male"
-msgstr ""
+msgstr "Muškarac"
 
 #. 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 ""
+msgstr "Kategorije Zapošljenih"
 
 #. module: hr
 #: view:hr.employee.category:0
 #: model:ir.model,name:hr.model_hr_employee_category
 msgid "Employee Category"
-msgstr ""
+msgstr "Kategorija Zapošljenog"
 
 #. module: hr
 #: field:hr.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Slika"
 
 #. module: hr
 #: model:process.process,name:hr.process_process_employeecontractprocess0
 msgid "Employee Contract"
-msgstr ""
+msgstr "Ugovor Zapošljenog"
 
 #. module: hr
 #: help:hr.installer,hr_evaluation:0
@@ -408,98 +415,100 @@ msgid ""
 "Lets you create and manage the periodic evaluation and performance review of "
 "employees."
 msgstr ""
+"Omogućava ti da kreiraš i upravljaš sa periodičnom procenama i performansama "
+"pregleda zapošljenih."
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_department
 msgid "hr.department"
-msgstr ""
+msgstr "hr.department"
 
 #. module: hr
 #: help:hr.employee,parent_id:0
 msgid "It is linked with manager of Department"
-msgstr ""
+msgstr "Povezano je sa Menadžerom Odeljenja"
 
 #. module: hr
 #: field:hr.installer,hr_recruitment:0
 msgid "Recruitment Process"
-msgstr ""
+msgstr "Proces Zapošljavanja"
 
 #. module: hr
 #: field:hr.employee,category_ids:0
 #: field:hr.employee.category,name:0
 msgid "Category"
-msgstr ""
+msgstr "Kategorija"
 
 #. module: hr
 #: help:hr.employee,bank_account_id:0
 msgid "Employee bank salary account"
-msgstr ""
+msgstr "Račun Banke Zapošljenog"
 
 #. module: hr
 #: field:hr.department,note:0
 msgid "Note"
-msgstr ""
+msgstr "Napomena"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Contact Information"
-msgstr ""
+msgstr "Kontakt Info"
 
 #. module: hr
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Greska ! Ne možeš kreirati rekursivni Meni."
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_board_hr_manager
 msgid "HR Manager Dashboard"
-msgstr ""
+msgstr "Glavna tabla Menadžmenta Ljudskim Resursima"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: hr
 #: field:hr.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Konfiguracioni Proces"
 
 #. module: hr
 #: model:ir.actions.act_window,name:hr.open_view_categ_tree
 #: model:ir.ui.menu,name:hr.menu_view_employee_category_tree
 msgid "Categories structure"
-msgstr ""
+msgstr "Struktura Kategorije"
 
 #. module: hr
 #: field:hr.employee,partner_id:0
 msgid "unknown"
-msgstr ""
+msgstr "nepoynat"
 
 #. module: hr
 #: field:hr.installer,hr_holidays:0
 msgid "Holidays / Leaves Management"
-msgstr ""
+msgstr "Upravljanje sa Praynicima / Izostancima"
 
 #. module: hr
 #: field:hr.employee,ssnid:0
 msgid "SSN No"
-msgstr ""
+msgstr "SSN Br"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Active"
-msgstr ""
+msgstr "Aktivan"
 
 #. module: hr
 #: constraint:hr.employee:0
 msgid "Error ! You cannot create recursive Hierarchy of Employees."
-msgstr ""
+msgstr "Greska ! Ne moyes kreirati rekursivnu hijerarhiju zapošljenih."
 
 #. module: hr
 #: view:hr.department:0
 msgid "Companies"
-msgstr ""
+msgstr "Preduzeća"
 
 #. module: hr
 #: model:process.transition,note:hr.process_transition_contactofemployee0
@@ -507,27 +516,29 @@ msgid ""
 "In the Employee form, there are different kind of information like Contact "
 "information."
 msgstr ""
+"U formi Zapošljenih , ima različitih vrsta informacija sličnih Kontakt "
+"informacijama."
 
 #. module: hr
 #: help:hr.job,expected_employees:0
 msgid "Required number of Employees in total for that job."
-msgstr ""
+msgstr "Ukupni broj zapošljenih za dati posao."
 
 #. module: hr
 #: selection:hr.job,state:0
 msgid "Old"
-msgstr ""
+msgstr "Staro"
 
 #. module: hr
 #: field:hr.employee.marital.status,description:0
 msgid "Status Description"
-msgstr ""
+msgstr "Opis Statusa"
 
 #. module: hr
 #: view:hr.job:0
 #: field:hr.job,state:0
 msgid "State"
-msgstr ""
+msgstr "Stanje"
 
 #. module: hr
 #: field:hr.employee,marital:0
@@ -536,48 +547,49 @@ msgstr ""
 #: 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 ""
+msgstr "Bračno Stanje"
 
 #. module: hr
 #: help:hr.installer,hr_recruitment:0
 msgid "Helps you manage and streamline your recruitment process."
-msgstr ""
+msgstr "POmaže pri upravljanju i poboljšava proces zapošljavanja."
 
 #. module: hr
 #: model:process.node,note:hr.process_node_employee0
 msgid "Employee form and structure"
-msgstr ""
+msgstr "Forma Zapošljenih i struktura"
 
 #. module: hr
 #: field:hr.employee,photo:0
 msgid "Photo"
-msgstr ""
+msgstr "Fotografija"
 
 #. module: hr
 #: model:ir.model,name:hr.model_res_users
 msgid "res.users"
-msgstr ""
+msgstr "res.users"
 
 #. module: hr
 #: field:hr.installer,hr_payroll_account:0
 msgid "Payroll Accounting"
-msgstr ""
+msgstr "Platno Računovodstvo"
 
 #. module: hr
 #: view:hr.employee:0
 msgid "Personal Information"
-msgstr ""
+msgstr "Lične informacije"
 
 #. module: hr
 #: constraint:ir.model:0
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"Ime objekta mora započeti sa x_ i ne sme sadržavati specijalne karaktere."
 
 #. module: hr
 #: view:res.users:0
 msgid "Current Activity"
-msgstr ""
+msgstr "Trenutna Aktivnost"
 
 #. module: hr
 #: help:hr.installer,hr_expense:0
@@ -585,102 +597,105 @@ msgid ""
 "Tracks and manages employee expenses, and can automatically re-invoice "
 "clients if the expenses are project-related."
 msgstr ""
+"Prati i upravlja troškovima zapošljenih, i može da automatski re-fakturiše "
+"kllijente ukoliko su troškovi veyani za projekat.Tr"
 
 #. module: hr
 #: view:hr.job:0
 msgid "Current"
-msgstr ""
+msgstr "Trenutni"
 
 #. module: hr
 #: field:hr.department,parent_id:0
 msgid "Parent Department"
-msgstr ""
+msgstr "Roditeljsko Odeljenje"
 
 #. module: hr
 #: view:hr.employee.category:0
 msgid "Employees Categories"
-msgstr ""
+msgstr "Kategorije zapošljenih"
 
 #. module: hr
 #: field:hr.employee,address_home_id:0
 msgid "Home Address"
-msgstr ""
+msgstr "Kućna Adresa"
 
 #. module: hr
 #: field:hr.installer,hr_attendance:0
 #: model:ir.ui.menu,name:hr.menu_open_view_attendance_reason_new_config
 msgid "Attendances"
-msgstr ""
+msgstr "Prisutnost"
 
 #. module: hr
 #: view:hr.employee.marital.status:0
 #: view:hr.job:0
 msgid "Description"
-msgstr ""
+msgstr "Opis"
 
 #. module: hr
 #: help:hr.installer,hr_contract:0
 msgid "Extends employee profiles to help manage their contracts."
 msgstr ""
+"Širi Profile Zapošljenih da pomogne upravljanje sa njihovim ugovorima."
 
 #. module: hr
 #: field:hr.installer,hr_payroll:0
 msgid "Payroll"
-msgstr ""
+msgstr "Platni Spisak"
 
 #. module: hr
 #: field:hr.job,name:0
 msgid "Job Name"
-msgstr ""
+msgstr "Naziv Posla"
 
 #. module: hr
 #: view:hr.job:0
 #: selection:hr.job,state:0
 msgid "In Position"
-msgstr ""
+msgstr "Na Poziciji"
 
 #. module: hr
 #: view:hr.department:0
 msgid "department"
-msgstr ""
+msgstr "Odeljenje"
 
 #. module: hr
 #: field:hr.employee,country_id:0
 msgid "Nationality"
-msgstr ""
+msgstr "Nacionalnost"
 
 #. module: hr
 #: view:hr.department:0
 #: view:hr.employee:0
 #: field:hr.employee,notes:0
 msgid "Notes"
-msgstr ""
+msgstr "Napomene"
 
 #. module: hr
 #: model:ir.model,name:hr.model_hr_installer
 msgid "hr.installer"
-msgstr ""
+msgstr "hr.installer"
 
 #. module: hr
 #: view:board.board:0
 msgid "HR Manager Board"
-msgstr ""
+msgstr "Tabla Upravljanja Ljudskim Resursima"
 
 #. module: hr
 #: field:hr.employee,resource_id:0
 msgid "Resource"
-msgstr ""
+msgstr "Resurs"
 
 #. module: hr
 #: field:hr.department,complete_name:0
 #: field:hr.employee.category,complete_name:0
 msgid "Name"
-msgstr ""
+msgstr "Ime"
 
 #. module: hr
 #: field:hr.employee,gender:0
 msgid "Gender"
-msgstr ""
+msgstr "Pol"
 
 #. module: hr
 #: view:hr.employee:0
@@ -691,49 +706,49 @@ msgstr ""
 #: 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 ""
+msgstr "Zapošljeni"
 
 #. module: hr
 #: field:hr.employee,bank_account_id:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Račun Banke"
 
 #. module: hr
 #: field:hr.department,name:0
 msgid "Department Name"
-msgstr ""
+msgstr "Ime Odeljenja"
 
 #. module: hr
 #: help:hr.employee,ssnid:0
 msgid "Social Security Number"
-msgstr ""
+msgstr "Broj Socijalnog Osiguranja"
 
 #. module: hr
 #: model:process.node,note:hr.process_node_openerpuser0
 msgid "Creation of a OpenERP user"
-msgstr ""
+msgstr "Kreiranje OpenERP korisnika"
 
 #. module: hr
 #: field:hr.department,child_ids:0
 msgid "Child Departments"
-msgstr ""
+msgstr "Pod Odeljenja"
 
 #. 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 ""
+msgstr "Pozicije Posla"
 
 #. module: hr
 #: view:hr.employee:0
 #: field:hr.employee,coach_id:0
 msgid "Coach"
-msgstr ""
+msgstr "Trener"
 
 #. module: hr
 #: field:hr.installer,hr_expense:0
 msgid "Expenses"
-msgstr ""
+msgstr "Troškovi"
 
 #. module: hr
 #: view:hr.department:0
@@ -741,14 +756,14 @@ msgstr ""
 #: view:hr.employee:0
 #: field:hr.employee,parent_id:0
 msgid "Manager"
-msgstr ""
+msgstr "Menadžer"
 
 #. module: hr
 #: help:hr.installer,hr_payroll_account:0
 msgid "Generic Payroll system Integrated with Accountings."
-msgstr ""
+msgstr "Generički sistem Platnih spiskova integrisanih sa Računovodstvom."
 
 #. module: hr
 #: field:hr.employee,child_ids:0
 msgid "Subordinates"
-msgstr ""
+msgstr "Podređeni"
diff --git a/addons/hr/security/hr_security.xml b/addons/hr/security/hr_security.xml
index b9df79abdd9..61aa5a93b12 100644
--- a/addons/hr/security/hr_security.xml
+++ b/addons/hr/security/hr_security.xml
@@ -9,8 +9,5 @@
     <record id="base.group_hr_user" model="res.groups">
         <field name="name">Human Resources / User</field>
     </record>
-	<record id="base.user_demo" model="res.users">
-            <field name="groups_id" eval="[(4, ref('base.group_hr_user'))]"/>
-     </record>
 </data>
 </openerp>
diff --git a/addons/hr_attendance/report/attendance_errors.py b/addons/hr_attendance/report/attendance_errors.py
index b0113aa88d4..29586ba5524 100644
--- a/addons/hr_attendance/report/attendance_errors.py
+++ b/addons/hr_attendance/report/attendance_errors.py
@@ -75,7 +75,7 @@ class attendance_print(report_sxw.rml_parse):
                 }
         return [result_dict]
 
-report_sxw.report_sxw('report.hr.attendance.error', 'hr.employee', 'addons/hr_attendance/report/attendance_errors.rml', parser=attendance_print, header=2)
+report_sxw.report_sxw('report.hr.attendance.error', 'hr.employee', 'addons/hr_attendance/report/attendance_errors.rml', parser=attendance_print, header='internal')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml
index aa654f1aa4c..f90607f3cc7 100644
--- a/addons/hr_holidays/board_hr_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_holidays_view.xml
@@ -54,7 +54,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
             <field name="domain">[('user_id','=',uid)]</field>
-            <field name="context">{'group_by_no_leaf':1}</field>
+            <field name="context">{'group_by':['holiday_status_id'],'group_by_no_leaf':1}</field>
             <field name="view_id" ref="hr_holidays.view_hr_available_holidays_report_graph"/>
         </record>
         <record id="board_hr_holidays_leave_by_month_form" model="ir.ui.view">
@@ -64,7 +64,7 @@
             <field name="inherit_id" ref="hr.board_hr_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/hpaned/child2" position="inside">
-                 <action colspan="4" height="220" name="%(action_hr_holidays_leaves_by_month)d" string="My Leaves by Type" />
+                 <action colspan="4" height="220" name="%(action_hr_holidays_leaves_by_month)d" string="Leaves By Month" />
                 </xpath>
             </field>
         </record>
diff --git a/addons/hr_holidays/i18n/it.po b/addons/hr_holidays/i18n/it.po
index 0fecdedb1df..87316ea990b 100644
--- a/addons/hr_holidays/i18n/it.po
+++ b/addons/hr_holidays/i18n/it.po
@@ -7,19 +7,19 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-30 10:51+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-11-13 14:14+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-31 05:03+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
 msgid "Blue"
-msgstr ""
+msgstr "Blu"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -53,7 +53,7 @@ msgstr ""
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Group By..."
-msgstr ""
+msgstr "Raggruppa per..."
 
 #. module: hr_holidays
 #: constraint:ir.actions.act_window:0
@@ -71,7 +71,7 @@ msgstr ""
 #: view:hr.holidays:0
 #: field:hr.holidays,department_id:0
 msgid "Department"
-msgstr ""
+msgstr "Dipartimento"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,state:0
@@ -99,17 +99,17 @@ msgstr "Marrone"
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Remaining Days"
-msgstr ""
+msgstr "Giorni Rimanenti"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: hr_holidays
 #: selection:hr.holidays,holiday_type:0
 msgid "By Employee"
-msgstr ""
+msgstr "Per impiegato"
 
 #. module: hr_holidays
 #: help:hr.holidays,employee_id:0
@@ -121,7 +121,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid "Leave Days"
-msgstr ""
+msgstr "Giorni Rimanenti"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
@@ -138,7 +138,7 @@ msgstr "Ferie"
 #. module: hr_holidays
 #: field:available.holidays.report,category_id:0
 msgid "Category's Name"
-msgstr ""
+msgstr "Nome categoria"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -191,7 +191,7 @@ msgstr ""
 #: selection:available.holidays.report,state:0
 #: selection:hr.holidays,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancellato"
 
 #. module: hr_holidays
 #: help:hr.holidays,type:0
@@ -210,12 +210,12 @@ msgstr "Attenzione !"
 #. module: hr_holidays
 #: field:hr.holidays.status,color_name:0
 msgid "Color in Report"
-msgstr ""
+msgstr "Colore nel report"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_summary_employee
 msgid "HR Holidays Summary Report By Employee"
-msgstr ""
+msgstr "HR: Report di riepilogo ferie per impiegato"
 
 #. module: hr_holidays
 #: field:available.holidays.report,holiday_status_id:0
@@ -232,19 +232,19 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid "Validation User"
-msgstr ""
+msgstr "Convalida utente"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Attenzione!"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,state:0
 #: selection:hr.holidays,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Bozza"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -259,12 +259,16 @@ msgid ""
 "'Waiting Approval'.            If the admin accepts it, the state is "
 "'Approved'. If it is refused, the state is 'Refused'."
 msgstr ""
+"Quando una richiesta di ferie è create lo stato è \"Bozza\".\n"
+" E' confermata dall'utente e la richiesta è inviata all'admin, lo stato è "
+"\"In attesa di approvazione\". Se l'admin l'acceta lo stato è \"Approvata\". "
+"Se è rifiutata, lo stato è \"Rifiutata\"."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:0
 #, python-format
 msgid "You have to select at least 1 Department. And try again"
-msgstr ""
+msgstr "E' necessario selezionare almeno un Dipartimento. Riprova ancora"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary.dept,holiday_type:0
@@ -293,7 +297,7 @@ msgstr "Conferma"
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_available_holidays_report
 msgid "available.holidays.report"
-msgstr ""
+msgstr "available.holidays.report"
 
 #. module: hr_holidays
 #: model:ir.module.module,description:hr_holidays.module_meta_information
@@ -345,12 +349,12 @@ msgstr "Permessi rimanenti"
 #: view:hr.holidays:0
 #: field:hr.holidays,state:0
 msgid "State"
-msgstr ""
+msgstr "Stato"
 
 #. module: hr_holidays
 #: model:ir.model,name:hr_holidays.model_hr_holidays_remaining_leaves_user
 msgid "Total holidays by type"
-msgstr ""
+msgstr "Totale ferie per tipo"
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
@@ -374,7 +378,7 @@ msgstr "Generale"
 #: view:available.holidays.report:0
 #: view:hr.holidays:0
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -406,7 +410,7 @@ msgstr "Numero Giorni"
 #. module: hr_holidays
 #: help:hr.holidays,category_id:0
 msgid "Category Of employee"
-msgstr ""
+msgstr "Categoria di impiegato"
 
 #. module: hr_holidays
 #: view:board.board:0
@@ -416,7 +420,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Luglio"
 
 #. module: hr_holidays
 #: constraint:ir.ui.view:0
@@ -433,7 +437,7 @@ msgstr ""
 #. module: hr_holidays
 #: selection:hr.holidays,state:0
 msgid "Waiting Approval"
-msgstr ""
+msgstr "In attesa di approvazione"
 
 #. module: hr_holidays
 #: field:hr.holidays.summary.employee,emp:0
@@ -443,7 +447,7 @@ msgstr "Dipendente/i"
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Month "
-msgstr ""
+msgstr " Mese "
 
 #. module: hr_holidays
 #: help:hr.holidays.status,categ_id:0
@@ -456,7 +460,7 @@ msgstr ""
 #. module: hr_holidays
 #: field:hr.holidays,parent_id:0
 msgid "Parent"
-msgstr ""
+msgstr "Padre"
 
 #. module: hr_holidays
 #: help:hr.holidays,manager_id2:0
@@ -468,12 +472,12 @@ msgstr ""
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Settembre"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Dicembre"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_remaining_leaves_empoloyee_all
@@ -489,7 +493,7 @@ msgstr "Lavanda"
 #: view:available.holidays.report:0
 #: field:available.holidays.report,month:0
 msgid "Month"
-msgstr ""
+msgstr "Mese"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.open_ask_holidays
@@ -506,13 +510,13 @@ msgstr ""
 #: view:hr.holidays.summary.employee:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_employee
 msgid "Employee's Holidays"
-msgstr ""
+msgstr "Ferie dell'impiegato"
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
 #: field:hr.holidays,category_id:0
 msgid "Category"
-msgstr ""
+msgstr "Categoria"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,max_leaves:0
@@ -524,7 +528,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid "Available Holidays"
-msgstr ""
+msgstr "Ferie disponibili"
 
 #. module: hr_holidays
 #: view:board.board:0
@@ -536,7 +540,7 @@ msgstr ""
 #: code:addons/hr_holidays/hr_holidays.py:0
 #, python-format
 msgid "No user related to the selected employee."
-msgstr ""
+msgstr "Nessun utente abbinato all'impiegato selezionato."
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -547,7 +551,7 @@ msgstr "Corallo chiaro"
 #: view:hr.holidays.summary.dept:0
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_holidays_summary_dept
 msgid "Holidays by Department"
-msgstr ""
+msgstr "Ferie per dipartimento"
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -557,12 +561,12 @@ msgstr "Nero"
 #. module: hr_holidays
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Errore! Non è possibile creare un menù ricorsivo."
 
 #. module: hr_holidays
 #: field:resource.calendar.leaves,holiday_id:0
 msgid "Holiday"
-msgstr ""
+msgstr "Ferie"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,max_leaves:0
@@ -595,7 +599,7 @@ msgstr ""
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid " Year "
-msgstr ""
+msgstr " Anno "
 
 #. module: hr_holidays
 #: selection:hr.holidays.status,color_name:0
@@ -605,12 +609,12 @@ msgstr "Avorio"
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Giugno"
 
 #. module: hr_holidays
 #: selection:hr.holidays.summary.dept,holiday_type:0
@@ -638,32 +642,32 @@ msgstr "Attivo"
 #. module: hr_holidays
 #: field:hr.holidays,date_from:0
 msgid "Start Date"
-msgstr ""
+msgstr "Data inizio"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: hr_holidays
 #: view:available.holidays.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtri estesi..."
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Ottobre"
 
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Gennaio"
 
 #. module: hr_holidays
 #: selection:hr.holidays,allocation_type:0
 msgid "Employee Request"
-msgstr ""
+msgstr "Richiesta impiegato"
 
 #. module: hr_holidays
 #: field:hr.holidays,manager_id:0
@@ -683,13 +687,13 @@ msgstr "Data"
 #. module: hr_holidays
 #: view:hr.holidays:0
 msgid "Extended options..."
-msgstr ""
+msgstr "Opzioni estese..."
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/wizard/hr_holidays_summary_department.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Errore"
 
 #. module: hr_holidays
 #: code:addons/hr_holidays/hr_holidays.py:0
@@ -716,11 +720,13 @@ msgid ""
 "Start date should not be larger than end date!\n"
 "Number of Days should be greater than 1!"
 msgstr ""
+"La data d'inizio non deve essere maggiore della data di fine!\n"
+"Il numero di giorni deve essere maggiore di 1!"
 
 #. module: hr_holidays
 #: field:hr.holidays,type:0
 msgid "Request Type"
-msgstr ""
+msgstr "Tipo di richiesta"
 
 #. module: hr_holidays
 #: help:hr.holidays.status,active:0
@@ -733,13 +739,13 @@ msgstr ""
 #: view:available.holidays.report:0
 #: field:available.holidays.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Giorno"
 
 #. module: hr_holidays
 #: view:hr.holidays:0
 #: field:hr.holidays,notes:0
 msgid "Reasons"
-msgstr ""
+msgstr "Motivazioni"
 
 #. module: hr_holidays
 #: model:ir.actions.act_window,name:hr_holidays.action_hr_available_holidays_report
@@ -835,12 +841,12 @@ msgstr "Descrizione"
 #. module: hr_holidays
 #: selection:available.holidays.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Maggio"
 
 #. module: hr_holidays
 #: field:hr.holidays.status,categ_id:0
 msgid "Meeting Category"
-msgstr ""
+msgstr "Categoria Riunione"
 
 #. module: hr_holidays
 #: help:hr.holidays,holiday_type:0
diff --git a/addons/hr_payroll/report/report_employees_detail.py b/addons/hr_payroll/report/report_employees_detail.py
index 0ee57545daf..0e1451e469c 100644
--- a/addons/hr_payroll/report/report_employees_detail.py
+++ b/addons/hr_payroll/report/report_employees_detail.py
@@ -28,9 +28,8 @@ import datetime
 from report import report_sxw
 import time
 import pooler
-import rml_parse
 
-class employees_salary_report(rml_parse.rml_parse):
+class employees_salary_report(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
         super(employees_salary_report, self).__init__(cr, uid, name, context)
diff --git a/addons/hr_payroll/report/report_payroll_advice.py b/addons/hr_payroll/report/report_payroll_advice.py
index d5019a82c50..5ac20d91d71 100644
--- a/addons/hr_payroll/report/report_payroll_advice.py
+++ b/addons/hr_payroll/report/report_payroll_advice.py
@@ -24,7 +24,6 @@
 
 import time
 from datetime import datetime
-
 from report import report_sxw
 from tools import amount_to_text_en
 
diff --git a/addons/hr_payroll/report/report_payslip.py b/addons/hr_payroll/report/report_payslip.py
index 9eb5204624b..d5cd6532251 100755
--- a/addons/hr_payroll/report/report_payslip.py
+++ b/addons/hr_payroll/report/report_payslip.py
@@ -23,7 +23,6 @@
 ##############################################################################
 
 from datetime import datetime
-
 from report import report_sxw
 from tools import amount_to_text_en
 
diff --git a/addons/hr_payroll/report/report_year_salary.py b/addons/hr_payroll/report/report_year_salary.py
index a11e1aa44ad..bc7ac8fc93a 100755
--- a/addons/hr_payroll/report/report_year_salary.py
+++ b/addons/hr_payroll/report/report_year_salary.py
@@ -26,9 +26,8 @@ import datetime
 from report import report_sxw
 import time
 import pooler
-import rml_parse
 
-class year_salary_report(rml_parse.rml_parse):
+class year_salary_report(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
         super(year_salary_report, self).__init__(cr, uid, name, context)
diff --git a/addons/hr_payroll/report/rml_parse.py b/addons/hr_payroll/report/rml_parse.py
deleted file mode 100755
index b8a1791768e..00000000000
--- a/addons/hr_payroll/report/rml_parse.py
+++ /dev/null
@@ -1,154 +0,0 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    $Id$
-#
-#    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 License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from time import strptime
-
-from report import report_sxw
-import re
-from lxml import etree
-
-
-class rml_parse(report_sxw.rml_parse):
-    def __init__(self, cr, uid, name, context):
-        super(rml_parse, self).__init__(cr, uid, name, context=None)
-        self.localcontext.update({
-            'comma_me': self.comma_me,
-            'format_date': self._get_and_change_date_format_for_swiss,
-            'strip_name': self._strip_name,
-            'explode_name': self._explode_name,
-        })
-
-    def comma_me(self,amount):
-        if not amount:
-            amount = 0.0
-        if  type(amount) is float:
-            amount = str('%.2f'%amount)
-        else:
-            amount = str(amount)
-        if (amount == '0'):
-             return ' '
-        orig = amount
-        new = re.sub("^(-?\d+)(\d{3})", "\g<1>'\g<2>", amount)
-        if orig == new:
-            return new
-        else:
-            return self.comma_me(new)
-
-    def _ellipsis(self, string, maxlen=100, ellipsis = '...'):
-        ellipsis = ellipsis or ''
-        try:
-            return string[:maxlen - len(ellipsis) ] + (ellipsis, '')[len(string) < maxlen]
-        except Exception:
-            return False
-
-    def _strip_name(self, name, maxlen=50):
-        return self._ellipsis(name, maxlen, '...')
-
-    def _get_and_change_date_format_for_swiss (self,date_to_format):
-        date_formatted=''
-        if date_to_format:
-            date_formatted = strptime(date_to_format,'%Y-%m-%d').strftime('%d.%m.%Y')
-        return date_formatted
-
-    def _explode_name(self,chaine,length):
-        # We will test if the size is less then account
-        full_string = ''
-        if (len(str(chaine)) <= length):
-            return chaine
-        #
-        else:
-            chaine = unicode(chaine,'utf8').encode('iso-8859-1')
-            rup = 0
-            for carac in chaine:
-                rup = rup + 1
-                if rup == length:
-                    full_string = full_string + '\n'
-                    full_string = full_string + carac
-                    rup = 0
-                else:
-                    full_string = full_string + carac
-
-        return full_string
-
-    def makeAscii(self,str):
-        try:
-            Stringer = str.encode("utf-8")
-        except UnicodeDecodeError:
-            try:
-                Stringer = str.encode("utf-16")
-            except UnicodeDecodeError:
-                print "UTF_16 Error"
-                Stringer = str
-            else:
-                return Stringer
-        else:
-            return Stringer
-        return Stringer
-
-    def explode_this(self,chaine,length):
-        chaine = chaine.rstrip()
-        ast = list(chaine)
-        i = length
-        while i <= len(ast):
-            ast.insert(i,'\n')
-            i = i + length
-        chaine = str("".join(ast))
-        return chaine
-
-    def repair_string(self,chaine):
-        ast = list(chaine)
-        UnicodeAst = []
-        i = 0
-        while i < len(ast):
-            elem = ast[i]
-            try:
-                Stringer = elem.encode("utf-8")
-            except UnicodeDecodeError:
-                to_reencode = elem + ast[i+1]
-                print str(to_reencode)
-                Good_char = to_reencode.decode('utf-8')
-                UnicodeAst.append(Good_char)
-                i += i +2
-            else:
-                UnicodeAst.append(elem)
-                i += i + 1
-        return "".join(UnicodeAst)
-
-    def _add_header(self, node, header='external'):
-        if header=='internal':
-            rml_head =  self.rml_header2
-        elif header=='internal landscape':
-            rml_head =  self.rml_header3
-        else:
-            rml_head =  self.rml_header
-        rml_head =  rml_head.replace('<pageGraphics>','''<pageGraphics> <image x="10" y="26cm" height="770.0" width="1120.0" >[[company.logo]] </image> ''')
-        rml_dom = node
-        head_dom = etree.XML(rml_head)
-        for tag in head_dom:
-            found = rml_dom.find('.//'+tag.tag)
-            if found is not None and found:
-                if tag.get('position'):
-                    found.append(tag)
-                else:
-                    found.getparent().replace(found,tag)
-        return True
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/hr_timesheet_invoice/i18n/nl.po b/addons/hr_timesheet_invoice/i18n/nl.po
index 0f2f64518fb..3cc714a82f9 100644
--- a/addons/hr_timesheet_invoice/i18n/nl.po
+++ b/addons/hr_timesheet_invoice/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-11-11 08:24+0000\n"
-"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n"
+"PO-Revision-Date: 2010-11-12 09:13+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: hr_timesheet_invoice
diff --git a/addons/html_view/i18n/it.po b/addons/html_view/i18n/it.po
new file mode 100644
index 00000000000..35d7cc18e39
--- /dev/null
+++ b/addons/html_view/i18n/it.po
@@ -0,0 +1,77 @@
+# Italian 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:46+0000\n"
+"PO-Revision-Date: 2010-11-13 14:17+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"Language-Team: Italian <it@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: html_view
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valido per la struttura della vista!"
+
+#. module: html_view
+#: 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 per “x_” e non contenere alcun carattere "
+"speciale!"
+
+#. module: html_view
+#: 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: html_view
+#: field:html.view,comp_id:0
+msgid "Company"
+msgstr "Company"
+
+#. module: html_view
+#: model:ir.actions.act_window,name:html_view.action_html_view_form
+#: model:ir.ui.menu,name:html_view.html_form
+msgid "Html Test"
+msgstr "Test HTML"
+
+#. module: html_view
+#: view:html.view:0
+msgid "Html Example"
+msgstr "Esempio HTML"
+
+#. module: html_view
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Errore! Non è possibile creare un menù ricorsivo."
+
+#. module: html_view
+#: model:ir.module.module,shortdesc:html_view.module_meta_information
+msgid "Html View"
+msgstr ""
+
+#. module: html_view
+#: field:html.view,bank_ids:0
+msgid "Banks"
+msgstr ""
+
+#. module: html_view
+#: model:ir.model,name:html_view.model_html_view
+msgid "html.view"
+msgstr "html.view"
+
+#. module: html_view
+#: field:html.view,name:0
+msgid "Name"
+msgstr "Nome"
diff --git a/addons/html_view/i18n/sr.po b/addons/html_view/i18n/sr.po
new file mode 100644
index 00000000000..41d515a7ff8
--- /dev/null
+++ b/addons/html_view/i18n/sr.po
@@ -0,0 +1,76 @@
+# Serbian 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:46+0000\n"
+"PO-Revision-Date: 2010-11-13 22:30+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: html_view
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neispravan XML za pregled arhitekture!"
+
+#. module: html_view
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
+
+#. module: html_view
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Neispravno ime modela u definiciji akcije."
+
+#. module: html_view
+#: field:html.view,comp_id:0
+msgid "Company"
+msgstr "Preduzece"
+
+#. module: html_view
+#: model:ir.actions.act_window,name:html_view.action_html_view_form
+#: model:ir.ui.menu,name:html_view.html_form
+msgid "Html Test"
+msgstr "Html Test"
+
+#. module: html_view
+#: view:html.view:0
+msgid "Html Example"
+msgstr "Html Primer"
+
+#. module: html_view
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska ! Ne mozes kreirati rekursivni meni."
+
+#. module: html_view
+#: model:ir.module.module,shortdesc:html_view.module_meta_information
+msgid "Html View"
+msgstr "Html Pregled"
+
+#. module: html_view
+#: field:html.view,bank_ids:0
+msgid "Banks"
+msgstr "Banke"
+
+#. module: html_view
+#: model:ir.model,name:html_view.model_html_view
+msgid "html.view"
+msgstr "html.view"
+
+#. module: html_view
+#: field:html.view,name:0
+msgid "Name"
+msgstr "Ime"
diff --git a/addons/idea/i18n/nl.po b/addons/idea/i18n/nl.po
index fe873955ed1..7373123b445 100644
--- a/addons/idea/i18n/nl.po
+++ b/addons/idea/i18n/nl.po
@@ -7,30 +7,30 @@ 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-08-03 06:33+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2010-11-13 08:34+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:29+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
 #: help:idea.category,visibility:0
 msgid "If True creator of the idea will be visible to others"
-msgstr ""
+msgstr "Indien aangezet is het idee zichtbaar voor anderen"
 
 #. module: idea
 #: code:addons/idea/wizard/idea_post_vote.py:0
 #, python-format
 msgid "Idea must be in \\n'Open' state before vote for that idea."
-msgstr ""
+msgstr "Idee moet op status \\n'Open' staan voordat gestemd kan worden."
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_select
 msgid "Idea select"
-msgstr ""
+msgstr "Idee selecteren"
 
 #. module: idea
 #: view:idea.idea:0
@@ -48,13 +48,13 @@ msgstr "Reacties"
 #. module: idea
 #: view:idea.idea:0
 msgid "Submit Vote"
-msgstr ""
+msgstr "Stem indienen"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_report_vote_all
 #: model:ir.ui.menu,name:idea.menu_report_vote_all
 msgid "Ideas Analysis"
-msgstr ""
+msgstr "Ideeën analyse"
 
 #. module: idea
 #: view:idea.category:0
@@ -62,43 +62,43 @@ msgstr ""
 #: view:idea.vote:0
 #: view:report.vote:0
 msgid "Group By..."
-msgstr ""
+msgstr "Groepeer op..."
 
 #. module: idea
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Ongeldige modelnaam in de actie-definitie."
 
 #. module: idea
 #: model:ir.module.module,shortdesc:idea.module_meta_information
 msgid "Idea Manager"
-msgstr ""
+msgstr "Idee beheerder"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "March"
-msgstr ""
+msgstr "Maart"
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dag"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Refuse"
-msgstr ""
+msgstr "Weigeren"
 
 #. module: idea
 #: field:idea.idea,count_votes:0
 msgid "Count of votes"
-msgstr "Stemmentelling"
+msgstr "Aantal stemmen"
 
 #. module: idea
 #: model:ir.model,name:idea.model_report_vote
 msgid "Idea Vote Statistics"
-msgstr ""
+msgstr "Idee stemmen statistieken"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -106,44 +106,44 @@ msgstr ""
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Bad"
-msgstr "Slecht"
+msgstr ""
 
 #. module: idea
 #: selection:report.vote,idea_state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Geannuleerd"
 
 #. module: idea
 #: view:idea.category:0
 msgid "Category of ideas"
-msgstr "Ideeën Categorie"
+msgstr "Ideeën categorie"
 
 #. module: idea
 #: code:addons/idea/idea.py:0
 #: code:addons/idea/wizard/idea_post_vote.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Waarschuwing !"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Your comment"
-msgstr "Uw Toelichting"
+msgstr "Uw reactie"
 
 #. module: idea
 #: view:report.vote:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Maand   "
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote
 msgid "Idea Vote"
-msgstr ""
+msgstr "Idee stemmen"
 
 #. module: idea
 #: field:idea.category,parent_id:0
 msgid "Parent Categories"
-msgstr "Bovenliggende Categorieën"
+msgstr "Bovenliggende categorieën"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -151,39 +151,39 @@ msgstr "Bovenliggende Categorieën"
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Very Bad"
-msgstr "Zeer Slecht"
+msgstr "Zeer slecht"
 
 #. module: idea
 #: view:idea.vote:0
 msgid "Ideas vote"
-msgstr ""
+msgstr "Ideeën stem"
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# Regels"
 
 #. module: idea
 #: code:addons/idea/wizard/idea_post_vote.py:0
 #, python-format
 msgid "You can not give Vote for this idea more than %s times"
-msgstr ""
+msgstr "U kunt uw stem op dit idee niet meer dan %s keer geven"
 
 #. module: idea
 #: view:idea.category:0
 msgid "Ideas Categories"
-msgstr ""
+msgstr "Ideeën categorieën"
 
 #. module: idea
 #: help:idea.idea,description:0
 msgid "Content of the idea"
-msgstr "Inhoud van het Idee"
+msgstr "Inhoud van het idee"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_category
 msgid "Idea Category"
-msgstr ""
+msgstr "Idee categorie"
 
 #. module: idea
 #: view:idea.idea:0
@@ -202,7 +202,7 @@ msgstr "Niet gestemd"
 #. module: idea
 #: model:ir.model,name:idea.model_idea_select
 msgid "select idea"
-msgstr ""
+msgstr "selecteer idee"
 
 #. module: idea
 #: view:idea.stat:0
@@ -212,12 +212,12 @@ msgstr "stat"
 #. module: idea
 #: field:idea.category,child_ids:0
 msgid "Child Categories"
-msgstr "Onderliggende Categorieën"
+msgstr "Onderliggende categorieën"
 
 #. module: idea
 #: view:idea.select:0
 msgid "Next"
-msgstr ""
+msgstr "Volgende"
 
 #. module: idea
 #: view:idea.idea:0
@@ -225,7 +225,7 @@ msgstr ""
 #: view:report.vote:0
 #: field:report.vote,idea_state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -238,12 +238,12 @@ msgstr "Goed"
 #. module: idea
 #: help:idea.idea,open_date:0
 msgid "Date when an idea opened"
-msgstr ""
+msgstr "Datum idee geopend"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Idea Detail"
-msgstr ""
+msgstr "Idee detail"
 
 #. module: idea
 #: help:idea.idea,state:0
@@ -252,17 +252,21 @@ msgid ""
 " It is             opened by the user, the state is 'Opened'.            \n"
 "If the idea is accepted, the state is 'Accepted'."
 msgstr ""
+"Nadat het idee is gemaakt is de status Çoncept'.\n"
+" Als het is geopend door de gebruiker, wordt de status 'Geopend'.\n"
+" Als het idee is geaccepteerd, wordt de status 'Geaccepteerd'.\n"
+" Als het idee is afgekeurd, wordt de status 'Geweigerd'."
 
 #. module: idea
 #: field:idea.category,visibility:0
 #: field:idea.idea,visibility:0
 msgid "Open Idea?"
-msgstr ""
+msgstr "Idee openen?"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
 #. module: idea
 #: view:idea.idea:0
@@ -270,7 +274,7 @@ msgstr ""
 #: view:report.vote:0
 #: selection:report.vote,idea_state:0
 msgid "Accepted"
-msgstr ""
+msgstr "Geaccepteerd"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_category
@@ -281,17 +285,17 @@ msgstr "Categorieën"
 #. module: idea
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor overzicht"
+msgstr "Ongeldige XML voor weergave opbouw!"
 
 #. module: idea
 #: view:report.vote:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Maand-1    "
 
 #. module: idea
 #: field:idea.idea,open_date:0
 msgid "Open date"
-msgstr ""
+msgstr "Datum geopend"
 
 #. module: idea
 #: field:idea.idea,vote_ids:0
@@ -303,17 +307,17 @@ msgstr "Stem"
 #: model:ir.actions.act_window,name:idea.action_idea_vote_stat
 #: model:ir.ui.menu,name:idea.menu_idea_vote_stat
 msgid "Vote Statistics"
-msgstr "Statistieken Stemmingen"
+msgstr "Stemming statistieken"
 
 #. module: idea
 #: field:idea.idea,vote_limit:0
 msgid "Maximum Vote per User"
-msgstr ""
+msgstr "Maximum stemmen per gebruiker"
 
 #. module: idea
 #: view:idea.category:0
 msgid "Parent Category"
-msgstr ""
+msgstr "Bovenliggende categorie"
 
 #. module: idea
 #: field:idea.comment,content:0
@@ -322,29 +326,29 @@ msgstr ""
 #: field:idea.vote,comment:0
 #: model:ir.model,name:idea.model_idea_comment
 msgid "Comment"
-msgstr "Opmerking"
+msgstr "Reactie"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,month:0
 msgid "Month"
-msgstr ""
+msgstr "Maand"
 
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_idea_categ_open
 #: model:ir.actions.act_window,name:idea.action_idea_idea_open
 msgid "Open Ideas"
-msgstr "Openstaande Ideeën"
+msgstr "Openstaande ideeën"
 
 #. module: idea
 #: view:idea.category:0
@@ -362,12 +366,12 @@ msgstr "Categorie"
 #: selection:idea.vote,score:0
 #: selection:idea.vote.stat,score:0
 msgid "Very Good"
-msgstr "Zeer Goed"
+msgstr "Zeer goed"
 
 #. module: idea
 #: view:report.vote:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Jaar  "
 
 #. module: idea
 #: selection:idea.idea,state:0
@@ -378,12 +382,12 @@ msgstr "Geopend"
 #. module: idea
 #: model:ir.actions.act_window,name:idea.action_idea_vote
 msgid "Idea's Votes"
-msgstr ""
+msgstr "Ideeën stemmen"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "New Idea"
-msgstr "Nieuw Idee"
+msgstr "Nieuw idee"
 
 #. module: idea
 #: view:idea.vote.stat:0
@@ -394,7 +398,7 @@ msgstr "vote_stat van ideeën"
 #: model:ir.actions.act_window,name:idea.action_idea_category_tree
 #: model:ir.ui.menu,name:idea.menu_idea_category_tree
 msgid "Ideas by Categories"
-msgstr "Ideeën door Categorie"
+msgstr "Ideeën per categorie"
 
 #. module: idea
 #: selection:idea.idea,state:0
@@ -405,12 +409,12 @@ msgstr "Concept"
 #. module: idea
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Fout ! U kunt geen recursief menu maken."
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "August"
-msgstr ""
+msgstr "Augustus"
 
 #. module: idea
 #: selection:idea.idea,my_vote:0
@@ -423,18 +427,18 @@ msgstr "Normaal"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #. module: idea
 #: field:report.vote,creater_id:0
 #: field:report.vote,user_id:0
 msgid "User Name"
-msgstr ""
+msgstr "Gebruikersnaam"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_vote_stat
 msgid "Idea Votes Statistics"
-msgstr "Statistieken Ideeën Stemmen"
+msgstr "Statistieken ideeënstemmen"
 
 #. module: idea
 #: field:idea.comment,user_id:0
@@ -447,33 +451,33 @@ msgstr "Gebruiker"
 #. module: idea
 #: field:idea.vote,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: idea
 #: view:idea.post.vote:0
 msgid "Post"
-msgstr ""
+msgstr "Indienen"
 
 #. module: idea
 #: field:idea.idea,my_vote:0
 msgid "My Vote"
-msgstr "Mijn Stem"
+msgstr "Mijn stem"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
 #. module: idea
 #: field:idea.comment,create_date:0
 #: field:idea.idea,created_date:0
 msgid "Creation date"
-msgstr "Aanmaakdatum"
+msgstr "Datum gemaakt"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
 #. module: idea
 #: model:ir.model,name:idea.model_idea_idea
@@ -488,27 +492,27 @@ msgstr "Samenvatting"
 #. module: idea
 #: field:idea.idea,name:0
 msgid "Idea Summary"
-msgstr "Samenvatting Idee"
+msgstr "Samenvatting idee"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "History"
-msgstr ""
+msgstr "Historie"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Vots Statistics"
-msgstr ""
+msgstr "Stemmen statistieken"
 
 #. module: idea
 #: field:report.vote,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Stemdatum"
 
 #. module: idea
 #: view:idea.idea:0
@@ -521,12 +525,12 @@ msgstr "Aangemaakt door"
 #: view:idea.post.vote:0
 #: model:ir.ui.menu,name:idea.menu_give_vote
 msgid "Give Vote"
-msgstr ""
+msgstr "Stem uitbrengen"
 
 #. module: idea
 #: help:idea.idea,vote_limit:0
 msgid "Set to one if  you require only one Vote per user"
-msgstr ""
+msgstr "Op één zetten als u maar één stem per gebruiker wilt"
 
 #. module: idea
 #: view:idea.post.vote:0
@@ -549,12 +553,12 @@ msgstr "Openen"
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten !"
 
 #. module: idea
 #: view:report.vote:0
 msgid "Idea Vote Analysis"
-msgstr ""
+msgstr "Idee stem analyse"
 
 #. module: idea
 #: view:idea.idea:0
@@ -568,12 +572,12 @@ msgstr "Ideeën"
 #. module: idea
 #: model:ir.model,name:idea.model_idea_post_vote
 msgid "Post vote"
-msgstr ""
+msgstr "Stem uitbrengen"
 
 #. module: idea
 #: view:idea.idea:0
 msgid "Current"
-msgstr ""
+msgstr "Actueel"
 
 #. module: idea
 #: field:idea.vote.stat,score:0
@@ -584,7 +588,7 @@ msgstr "Punten"
 #. module: idea
 #: view:idea.vote:0
 msgid "Comments:"
-msgstr ""
+msgstr "Reacties:"
 
 #. module: idea
 #: view:idea.category:0
@@ -596,54 +600,55 @@ msgstr "Omschrijving"
 #. module: idea
 #: selection:report.vote,month:0
 msgid "May"
-msgstr ""
+msgstr "Mei"
 
 #. module: idea
 #: selection:idea.idea,state:0
 #: view:report.vote:0
 msgid "Refused"
-msgstr ""
+msgstr "Geweigerd"
 
 #. module: idea
 #: code:addons/idea/idea.py:0
 #, python-format
 msgid "Draft/Accepted/Cancelled ideas Could not be voted"
 msgstr ""
+"Op ideeën met status Concept/Geaccepteerd/Geannuleerd kan niet worden gestemd"
 
 #. module: idea
 #: view:idea.vote:0
 msgid "Vote date"
-msgstr ""
+msgstr "Stemdatum"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
 #. module: idea
 #: view:report.vote:0
 msgid "    Today    "
-msgstr ""
+msgstr "    Vandaag    "
 
 #. module: idea
 #: field:idea.vote.stat,nbr:0
 msgid "Number of Votes"
-msgstr "Aantal Stemmen"
+msgstr "Aantal stemmen"
 
 #. module: idea
 #: selection:report.vote,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: idea
 #: field:idea.idea,count_comments:0
 msgid "Count of comments"
-msgstr "Aantal Opmerkingen"
+msgstr "Aantal reacties"
 
 #. module: idea
 #: field:idea.vote,score:0
 msgid "Vote Status"
-msgstr ""
+msgstr "Stem status"
 
 #. module: idea
 #: field:idea.idea,vote_avg:0
@@ -665,23 +670,23 @@ msgstr "Idee"
 #. module: idea
 #: view:idea.idea:0
 msgid "Accept"
-msgstr ""
+msgstr "Accepteren"
 
 #. module: idea
 #: field:idea.post.vote,vote:0
 msgid "Post Vote"
-msgstr ""
+msgstr "Stem uitbrengen"
 
 #. module: idea
 #: view:report.vote:0
 #: field:report.vote,year:0
 msgid "Year"
-msgstr ""
+msgstr "Jaar"
 
 #. module: idea
 #: view:idea.select:0
 msgid "Select Idea for Vote"
-msgstr ""
+msgstr "Idee voor stem selecteren"
 
 #~ msgid "My Ideas"
 #~ msgstr "Mijn Ideeën"
diff --git a/addons/idea/idea_data.xml b/addons/idea/idea_data.xml
index 6d5bda20de4..713ba4493f2 100644
--- a/addons/idea/idea_data.xml
+++ b/addons/idea/idea_data.xml
@@ -14,6 +14,10 @@
             <field name="category_id" ref="idea_category_general"/>
             <field name="visibility">True</field>
         </record>
+
+        <record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[(4,ref('base.group_tool_user'))]"/> 
+        </record>
     </data>
 </openerp>
 
diff --git a/addons/idea/security/idea_security.xml b/addons/idea/security/idea_security.xml
index 40e16cc2b17..4b060c51e6c 100644
--- a/addons/idea/security/idea_security.xml
+++ b/addons/idea/security/idea_security.xml
@@ -8,10 +8,6 @@
    	<record model="res.groups" id="base.group_tool_user">
         	<field name="name">Tools / User</field>
    	</record>
-   	
-    <record id="base.user_demo" model="res.users">
-        <field name="groups_id" eval="[(4,ref('base.group_tool_user'))]"/> 
-    </record>
 
 	</data>
 </openerp>
diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py
index e56c35fdd66..58ccecfa375 100644
--- a/addons/knowledge/__openerp__.py
+++ b/addons/knowledge/__openerp__.py
@@ -35,7 +35,7 @@
         'knowledge_installer.xml',
         'knowledge_view.xml',
     ],
-    'demo_xml': [],
+    'demo_xml': ['knowledge_demo.xml'],
     'installable': True,
     'active': False,
 }
diff --git a/addons/knowledge/i18n/sr.po b/addons/knowledge/i18n/sr.po
new file mode 100644
index 00000000000..42a35aa8239
--- /dev/null
+++ b/addons/knowledge/i18n/sr.po
@@ -0,0 +1,163 @@
+# Serbian 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:46+0000\n"
+"PO-Revision-Date: 2010-11-13 22:27+0000\n"
+"Last-Translator: zmmaj <Unknown>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: knowledge
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Ime Objekta mora zapoceti sa x_ i ne sme sadrzavati specijalne karaktere !"
+
+#. module: knowledge
+#: field:knowledge.installer,wiki:0
+msgid "Collaborative Content (Wiki)"
+msgstr "Kolaborativni sadrzaj ( Wiki)"
+
+#. module: knowledge
+#: help:knowledge.installer,wiki_quality_manual:0
+msgid "Creates an example skeleton for a standard quality manual."
+msgstr "Kreira primer skeleta za uputstvo standarda kvaliteta."
+
+#. module: knowledge
+#: field:knowledge.installer,document_ftp:0
+msgid "Shared Repositories (FTP)"
+msgstr "Deljena Skladista (FTP)"
+
+#. module: knowledge
+#: model:ir.module.module,shortdesc:knowledge.module_meta_information
+msgid "Knowledge Management System"
+msgstr "Menadzment Sistema Znanja"
+
+#. module: knowledge
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "Greska ! Ne mozes kreirati rekursivni meni"
+
+#. module: knowledge
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Neispravno ime modela u definiciji akcije."
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document
+msgid "Knowledge"
+msgstr "Znanje"
+
+#. module: knowledge
+#: help:knowledge.installer,document_ftp:0
+msgid ""
+"Provides an FTP access to your OpenERP's Document Management System. It lets "
+"you access attachments and virtual documents through a standard FTP client."
+msgstr ""
+"Prosledjuje FTP pristup vasim OpenERP dokument Sistem menadzmentu. "
+"Dozvoljava da pristupis dodacima i virtualnim dokumentima kroz standardni "
+"FTP klijent."
+
+#. module: knowledge
+#: help:knowledge.installer,document_webdav:0
+msgid ""
+"Provides a WebDAV access to your OpenERP's Document Management System. Lets "
+"you access attachments and virtual documents through your standard file "
+"browser."
+msgstr ""
+"Omogucava WebDav pristup tvojim  OpenERP dokument Sistem menadzmentu. "
+"Dozvoljava da pristupis dodacima i virtualnim dokumentima kroz standardni "
+"fajl pretrazivac"
+
+#. module: knowledge
+#: field:knowledge.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Konfiguracioni Proces"
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "title"
+msgstr "Naslov"
+
+#. module: knowledge
+#: model:ir.module.module,description:knowledge.module_meta_information
+msgid ""
+"Installer for knowledge-based tools\n"
+"    "
+msgstr ""
+"Instaler za alate bazirane na znanju\n"
+"    "
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_configuration
+msgid "Configuration"
+msgstr "Konfiguracija"
+
+#. module: knowledge
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Neispravan XML za pregled arhitekture"
+
+#. module: knowledge
+#: field:knowledge.installer,wiki_quality_manual:0
+msgid "Quality Manual"
+msgstr "Prirucnik Kvaliteta"
+
+#. module: knowledge
+#: field:knowledge.installer,document_webdav:0
+msgid "Shared Repositories (WebDAV)"
+msgstr "Deljena Skladista (WebDAV)"
+
+#. module: knowledge
+#: help:knowledge.installer,wiki_faq:0
+msgid ""
+"Creates a skeleton internal FAQ pre-filled with documentation about "
+"OpenERP's Document Management System."
+msgstr ""
+"Kreira skelet internog FAQ-a vec-napunjenog sa dokumentacijom o OPenERP-ovom "
+"Sistemu Menadzmenta Dokumenata."
+
+#. module: knowledge
+#: field:knowledge.installer,wiki_faq:0
+msgid "Internal FAQ"
+msgstr "Interni FAQ"
+
+#. module: knowledge
+#: field:knowledge.installer,config_logo:0
+msgid "Image"
+msgstr "Slika"
+
+#. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_installer
+msgid "Knowledge Application Configuration"
+msgstr "Konfiguracija Aplikacije Znanja"
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_knowledge_installer
+msgid "knowledge.installer"
+msgstr "knowledge.installer"
+
+#. module: knowledge
+#: help:knowledge.installer,wiki:0
+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 ""
+"omogucava ti da kreiras wiki strane i grupe strana kada zelis da sacuvas "
+"biznis iskustvo i delis ga sa i izmedju tvojih zaposlenih."
+
+#. module: knowledge
+#: view:knowledge.installer:0
+msgid "Content templates"
+msgstr "Obrasci Sadrzaja"
diff --git a/addons/knowledge/knowledge_demo.xml b/addons/knowledge/knowledge_demo.xml
new file mode 100644
index 00000000000..93b2413bbd2
--- /dev/null
+++ b/addons/knowledge/knowledge_demo.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data noupdate="0">
+        <record id="base.user_demo" model="res.users">
+                <field name="groups_id" eval="[(4,ref('base.group_document_user'))]"/> 
+        </record>
+</data>
+</openerp>
diff --git a/addons/knowledge/security/knowledge_security.xml b/addons/knowledge/security/knowledge_security.xml
index d0afba371a9..b4c7bb99c1b 100644
--- a/addons/knowledge/security/knowledge_security.xml
+++ b/addons/knowledge/security/knowledge_security.xml
@@ -8,10 +8,6 @@
             <record id="base.group_document_user" model="res.groups">
                 <field name="name">Knowledge / User</field>
             </record>
-            
-            <record id="base.user_demo" model="res.users">
-                <field name="groups_id" eval="[(4,ref('base.group_document_user'))]"/> 
-            </record>
 
 </data>
 </openerp>
diff --git a/addons/lunch/lunch_demo.xml b/addons/lunch/lunch_demo.xml
index 30172b9e0a2..543086d6620 100644
--- a/addons/lunch/lunch_demo.xml
+++ b/addons/lunch/lunch_demo.xml
@@ -16,5 +16,10 @@
             <field name="name">Cashbox</field>
             <field name="manager" ref="base.user_root"/>
         </record>
+
+        <record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[(4,ref('base.group_tool_user'))]"/> 
+        </record>
+
     </data>
 </openerp>
diff --git a/addons/lunch/report/order.py b/addons/lunch/report/order.py
index 29c9d381745..11ca7f79dbc 100644
--- a/addons/lunch/report/order.py
+++ b/addons/lunch/report/order.py
@@ -41,8 +41,12 @@ class order(report_sxw.rml_parse):
         total=0.0
         for line in lines:
             total+=line.price
+        self.net_total+=total
         return total
 
+    def get_nettotal(self):
+        return self.net_total
+
     def get_users(self, objects):
         users=[]
         for obj in objects:
@@ -52,12 +56,13 @@ class order(report_sxw.rml_parse):
 
     def __init__(self, cr, uid, name, context):
         super(order, self).__init__(cr, uid, name, context)
-
+        self.net_total=0.0
         self.localcontext.update({
             'time': time,
             'get_lines': self.get_lines,
             'get_users': self.get_users,
             'get_total': self.get_total,
+            'get_nettotal': self.get_nettotal,
         })
 
 report_sxw.report_sxw('report.lunch.order', 'lunch.order',
diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml
index d47816abd9c..ba66dcddb03 100644
--- a/addons/lunch/report/order.rml
+++ b/addons/lunch/report/order.rml
@@ -14,25 +14,28 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table2">
+    <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table3">
+    <blockTableStyle id="Table6">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#b3b3b3" start="0,-1" stop="0,-1"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table4">
+    <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
@@ -63,9 +66,14 @@
     <paraStyle name="terp_default_9_right_bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_header_center" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_9_center" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_default_9_left9" rightIndent="0.0" leftIndent="9.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <images/>
   </stylesheet>
   <story>
+    <para style="terp_default_8">
+      <font color="white"> </font>
+    </para>
     <blockTable colWidths="293.0,235.0" style="Table1">
       <tr>
         <td>
@@ -84,16 +92,10 @@
       </tr>
     </blockTable>
     <para style="terp_header">Lunch Order</para>
-
-	<section>
-    <para style="terp_default_8">[[repeatIn(get_users(objects),'o')]]</para>
-    <blockTable colWidths="80.0,70.0,141.0,172.0,65.0" style="Table2">
+    <blockTable colWidths="149.0,114.0,201.0,63.0" style="Table5">
       <tr>
         <td>
-          <para style="terp_tbl_detail_header">Name</para>
-        </td>
-        <td>
-          <para style="terp_tbl_detail_header_center">Date</para>
+          <para style="terp_tbl_detail_header">Name/Date</para>
         </td>
         <td>
           <para style="terp_tbl_detail_header">Order</para>
@@ -107,28 +109,43 @@
       </tr>
     </blockTable>
     <section>
-      <para style="terp_default_8">[[ repeatIn(get_lines(o,objects),'lines') ]]</para>
-      <blockTable colWidths="80.0,70.0,141.0,172.0,64.0" style="Table3">
+      <para style="terp_default_2">[[repeatIn(get_users(objects),'o')]]</para>
+      <blockTable colWidths="263.0,201.0,63.0" style="Table6">
         <tr>
           <td>
-            <para style="terp_default_9">[[ (lines.user_id and lines.user_id.name) or '']]</para>
+            <para style="terp_tbl_detail_header">[[ o.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_9_center">[[ formatLang(lines.date,date='True') ]]</para>
+            <para style="terp_default_8">
+              <font color="white"> </font>
+            </para>
           </td>
           <td>
-            <para style="terp_default_9">[[ (lines.product and lines.product.name) or '' ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ lines.descript]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9_right">[[ lines.price ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para>
+            <para style="terp_default_9_right_bold"><u>[[ formatLang(get_total(o,objects)) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</u></para>
           </td>
         </tr>
       </blockTable>
+      <section>
+        <para style="terp_default_2">[[ repeatIn(get_lines(o,objects),'lines') ]]</para>
+        <blockTable colWidths="151.0,113.0,216.0,49.0" style="Table7">
+          <tr>
+            <td>
+              <para style="terp_default_9_left9">[[ formatLang(lines.date,date='True') ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[ (lines.product and lines.product.name) or '' ]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9">[[ lines.descript]]</para>
+            </td>
+            <td>
+              <para style="terp_default_9_right">[[ lines.price ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para>
+            </td>
+          </tr>
+        </blockTable>
+      </section>
     </section>
-    <blockTable colWidths="409.0,55.0,64.0" style="Table4">
+    <blockTable colWidths="421.0,44.0,63.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_8">
@@ -136,16 +153,15 @@
           </para>
         </td>
         <td>
-          <para style="terp_tbl_detail_header">Total:</para>
+          <para style="terp_tbl_detail_header">Total :</para>
         </td>
         <td>
-          <para style="terp_default_9_right_bold">[[ formatLang(get_total(o,objects)) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para>
+          <para style="terp_default_9_right_bold">[[ formatLang(get_nettotal()) ]] [[ (o.company_id and o.company_id.currency_id and o.company_id.currency_id.symbol) or '' ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_8">
+    <para style="terp_default_2">
       <font color="white"> </font>
     </para>
-	</section>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index b4c184b3482..e042ac0c594 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -8,10 +8,6 @@
    	<record model="res.groups" id="base.group_tool_user">
         	<field name="name">Tools / User</field>
    	</record>
-   	
-    <record id="base.user_demo" model="res.users">
-        <field name="groups_id" eval="[(4,ref('base.group_tool_user'))]"/> 
-    </record>
-
+    
 </data>
 </openerp>
diff --git a/addons/marketing_campaign/i18n/es.po b/addons/marketing_campaign/i18n/es.po
index bd2237b6e67..62adcbca402 100644
--- a/addons/marketing_campaign/i18n/es.po
+++ b/addons/marketing_campaign/i18n/es.po
@@ -8,13 +8,14 @@ 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-11-10 08:11+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\n"
+"PO-Revision-Date: 2010-11-13 12:57+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-11 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: marketing_campaign
@@ -32,7 +33,8 @@ msgstr "Actividad previa"
 #, python-format
 msgid "The current step for this item has no email or report to preview."
 msgstr ""
-"El paso actual para este elemento no tiene email o informe para previsualizar"
+"La etapa actual para este elemento no tiene email o informe para "
+"previsualizar"
 
 #. module: marketing_campaign
 #: code:addons/marketing_campaign/marketing_campaign.py:0
@@ -92,7 +94,7 @@ msgstr ""
 #. module: marketing_campaign
 #: field:marketing.campaign.transition,trigger:0
 msgid "Trigger"
-msgstr ""
+msgstr "Disparador"
 
 #. module: marketing_campaign
 #: constraint:ir.actions.act_window:0
@@ -126,6 +128,8 @@ msgid ""
 "Determines an additional criterion to add to the filter when selecting new "
 "records to inject in the campaign."
 msgstr ""
+"Determina un criterio adicional para añadir al filtro al seleccionar nuevos "
+"registros para inyectar en la campaña."
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,object_id:0
@@ -149,7 +153,7 @@ msgstr ""
 #: view:marketing.campaign:0
 #: view:marketing.campaign.segment:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Canviar a borrador"
 
 #. module: marketing_campaign
 #: field:marketing.campaign.activity,to_ids:0
@@ -210,6 +214,8 @@ msgid ""
 "Date on which this segment was synchronized last time (automatically or "
 "manually)"
 msgstr ""
+"Fecha en la que este segmento se sincronizó por última vez (de forma "
+"automática o manualmente)."
 
 #. module: marketing_campaign
 #: selection:campaign.analysis,state:0
@@ -296,6 +302,8 @@ msgstr ""
 #: help:marketing.campaign.segment,date_next_sync:0
 msgid "Next time the synchronization job is scheduled to run automatically"
 msgstr ""
+"Próxima vez que el trabajo de sincronización está programado para ejecutarse "
+"automáticamente."
 
 #. module: marketing_campaign
 #: selection:marketing.campaign.transition,interval_type:0
@@ -546,7 +554,7 @@ msgstr ""
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_ir_actions_report_xml
 msgid "ir.actions.report.xml"
-msgstr ""
+msgstr "ir.acciones.informe.xml"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_stat
@@ -652,7 +660,7 @@ msgstr "Todos los registros (si duplicados)"
 #. module: marketing_campaign
 #: view:marketing.campaign.segment:0
 msgid "Newly Created"
-msgstr ""
+msgstr "Creado nuevamente"
 
 #. module: marketing_campaign
 #: field:campaign.analysis,date:0
@@ -762,7 +770,7 @@ msgstr "Seleccione el modelo sobre el cual quiere realizar la campaña"
 #. module: marketing_campaign
 #: model:ir.module.module,shortdesc:marketing_campaign.module_meta_information
 msgid "marketing_campaign"
-msgstr ""
+msgstr "Campaña marketing"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
@@ -817,6 +825,8 @@ msgstr "Sincronizar manualmente"
 #, python-format
 msgid "The campaign cannot be marked as done before all segments are done"
 msgstr ""
+"La campaña no puede ser finalizada antes de que todos sus segmentos estén "
+"realizados"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
@@ -835,12 +845,12 @@ msgstr "Transición campaña"
 #: view:marketing.campaign.workitem:0
 #: selection:marketing.campaign.workitem,state:0
 msgid "To Do"
-msgstr ""
+msgstr "Para hacer"
 
 #. module: marketing_campaign
 #: view:marketing.campaign.workitem:0
 msgid "Campaign Step"
-msgstr ""
+msgstr "Etapa campaña"
 
 #. module: marketing_campaign
 #: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_segment_form
@@ -892,7 +902,7 @@ msgstr "En curso"
 #: code:addons/marketing_campaign/marketing_campaign.py:0
 #, python-format
 msgid "After %(interval_nbr)d %(interval_type)s"
-msgstr ""
+msgstr "Después %(interval_nbr)d %(interval_type)s"
 
 #. module: marketing_campaign
 #: model:ir.model,name:marketing_campaign.model_marketing_campaign
diff --git a/addons/membership/i18n/it.po b/addons/membership/i18n/it.po
index 2641571ddb9..e9686a01392 100644
--- a/addons/membership/i18n/it.po
+++ b/addons/membership/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-11-11 16:35+0000\n"
-"Last-Translator: Leonardo Pistone <Unknown>\n"
+"PO-Revision-Date: 2010-11-12 10:31+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: membership
diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
index f118eda7158..75b2379d414 100644
--- a/addons/mrp/board_manufacturing_view.xml
+++ b/addons/mrp/board_manufacturing_view.xml
@@ -14,10 +14,10 @@
                     <hpaned position="100">
                         <child1>
                             <action colspan="4" height="200" name="%(mrp.mrp_production_action2)d" string="Next Production Orders" width="510"/>
-                            <action colspan="4" name="%(procurement.procurement_exceptions)d" string="Procurements in Exception"/>
+                            <action colspan="4" name="%(procurement.procurement_exceptions)d" string="Procurements in Exception" domain="[('state','=','exception')]"/>
                         </child1>
                         <child2>
-                            <action colspan="4" name="%(mrp.action_report_workcenter_load_tree)d" string="Work Center Future load"/>
+                            <action colspan="4" name="%(mrp.action_report_workcenter_load_tree)d" string="Work Center Future Load" groups="base.group_extended"/>
 
                             <action colspan="4" name="%(mrp.action_report_in_out_picking_tree)d" string="Stock Value Variation"/>
                         </child2>
diff --git a/addons/mrp/i18n/es.po b/addons/mrp/i18n/es.po
index 0eb7afbab2f..8386ad932ab 100644
--- a/addons/mrp/i18n/es.po
+++ b/addons/mrp/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-11-04 08:56+0000\n"
-"Last-Translator: Carlos-smile <Unknown>\n"
+"PO-Revision-Date: 2010-11-13 19:14+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-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-11-06 04:51+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -82,12 +83,14 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the bills of "
 "material without removing it."
 msgstr ""
+"Si el campo activo se desmarca, permite ocultar las listas de materiales sin "
+"eliminarlas."
 
 #. module: mrp
 #: field:mrp.production,picking_id:0
 #: field:mrp.production.order,picking_id:0
 msgid "Picking list"
-msgstr ""
+msgstr "Albarán"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
@@ -104,7 +107,7 @@ msgstr "Precio de coste pour Udm"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Scrap Products"
-msgstr ""
+msgstr "Productos de desecho"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -126,12 +129,12 @@ msgstr "Buscar lista de materiales"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct1
 msgid "For stockable products and consumables"
-msgstr ""
+msgstr "Para productos almacenables y consumibles"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_stockproduction0
 msgid "To Produce"
-msgstr ""
+msgstr "A producir"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -168,16 +171,20 @@ msgid ""
 "Enhances production orders with readiness states as well as the start date "
 "and end date of execution of the order."
 msgstr ""
+"Mejora las órdenes de producción con los estados de preparación, así como la "
+"fecha de inicio y final de la ejecución de la orden."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_purchaseprocure0
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
+"El sistema crea automáticamente una petición de presupuesto al proveedor "
+"preferido."
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Products to Finish"
-msgstr ""
+msgstr "Productos a terminar"
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -213,6 +220,8 @@ msgid ""
 "In case the Supply method of the product is Produce, the system creates a "
 "production order."
 msgstr ""
+"En caso de que el método de suministro del producto es Producir, el sistema "
+"crea una orden de producción."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -258,12 +267,12 @@ msgstr "Coste del trabajo"
 #. module: mrp
 #: report:bom.structure:0
 msgid "["
-msgstr ""
+msgstr "["
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procureserviceproduct0
 msgid "Procurement of services"
-msgstr ""
+msgstr "Abastecimiento de servicios"
 
 #. module: mrp
 #: view:mrp.workcenter:0
@@ -283,7 +292,7 @@ msgstr "título"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom
 msgid "Master Data"
-msgstr ""
+msgstr "Datos principales"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -338,7 +347,7 @@ msgstr "Agosto"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_order
 msgid "Production Order Report"
-msgstr ""
+msgstr "Informe de órden de producción"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -348,7 +357,7 @@ msgstr "Junio"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_product_produce
 msgid "Product Produce"
-msgstr ""
+msgstr "Producir producto"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -358,7 +367,7 @@ msgstr "Octubre"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
 msgid "Procurement of stockable Product"
-msgstr ""
+msgstr "Abastecimiento de producto almacenable"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -391,6 +400,8 @@ msgid ""
 "The system creates an order (production or purchased) depending on the sold "
 "quantity and the products parameters."
 msgstr ""
+"El sistema crea una orden (de producción o de compra) en función de la "
+"cantidad vendida y los parámetros de los productos."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
@@ -398,6 +409,8 @@ msgid ""
 "This is used in case of a service without any impact in the system, a "
 "training session for instance."
 msgstr ""
+"Esto se utiliza en caso de un servicio sin ningún tipo de impacto en el "
+"sistema, una sesión de formación, por ejemplo."
 
 #. module: mrp
 #: field:mrp.installer,mrp_repair:0
@@ -471,7 +484,7 @@ msgstr "de "
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_bom0
 msgid "Manufacturing decomposition"
-msgstr ""
+msgstr "Descomposición fabricación"
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_serviceproduct1
@@ -502,13 +515,13 @@ msgstr "Nº de ciclos"
 #: model:process.node,note:mrp.process_node_orderrfq0
 #: model:process.node,note:mrp.process_node_rfq0
 msgid "Request for Quotation."
-msgstr ""
+msgstr "Solicitud de presupuesto."
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Component suppliers"
-msgstr ""
+msgstr "Proveedores componentes"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
@@ -516,11 +529,13 @@ msgid ""
 "The Bill of Material is linked to a routing, i.e. the succession of work "
 "centers."
 msgstr ""
+"La lista de materiales está vinculada a una ruta, es decir, la sucesión de "
+"centros de trabajo."
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
-msgstr ""
+msgstr "Indica coste del centro de trabajo por hora."
 
 #. module: mrp
 #: view:mrp.routing:0
@@ -556,7 +571,7 @@ msgstr "Estructura LdM del producto"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Search Production"
-msgstr ""
+msgstr "Buscar producción"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
@@ -582,7 +597,7 @@ msgstr "Especifique el coste por centro de prodcción"
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
 msgid "BoM Hierarchy"
-msgstr ""
+msgstr "Estructura LdM"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
@@ -597,6 +612,8 @@ msgid ""
 "This is the internal picking list that brings the finished product to the "
 "production plan"
 msgstr ""
+"Este es el albarán interno que trae el producto terminado hacia el plan de "
+"producción."
 
 #. module: mrp
 #: help:mrp.product_price,number:0
@@ -604,13 +621,15 @@ msgid ""
 "Specify quantity of products to produce or buy. Report of Cost structure "
 "will be displayed base on this qunatity."
 msgstr ""
+"Indica la cantidad de productos para producir o comprar. El informe de la "
+"jerarquía de costes se muestra en esta base a esta cantidad."
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
 #: selection:mrp.production.order,state:0
 msgid "Picking Exception"
-msgstr ""
+msgstr "Excepción albarán"
 
 #. module: mrp
 #: field:mrp.bom,bom_lines:0
@@ -625,7 +644,7 @@ msgstr "Tiempo antes producción"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_billofmaterialrouting0
 msgid "Material Routing"
-msgstr ""
+msgstr "Ruta del material"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -644,7 +663,7 @@ msgstr "¡Error! No puede crear Listas de Material recursivas"
 #: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
 #: model:ir.model,name:mrp.model_report_workcenter_load
 msgid "Work Center Load"
-msgstr ""
+msgstr "Carga centro de producción"
 
 #. module: mrp
 #: code:addons/mrp/procurement.py:0
@@ -656,12 +675,12 @@ msgstr "¡No se ha definido LdM para este producto!"
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Material Components"
-msgstr ""
+msgstr "Componentes de lista de materiales"
 
 #. module: mrp
 #: field:mrp.production.order,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "Nº de líneas"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_planning
@@ -702,6 +721,8 @@ msgid ""
 "Product UOS (Unit of Sale) is the unit of measurement for the invoicing and "
 "promotion of stock."
 msgstr ""
+"UdV del producto (Unidad de Venta) es la unidad de medida para la "
+"facturación y la promoción de existencias."
 
 #. module: mrp
 #: view:mrp.product_price:0
@@ -718,7 +739,7 @@ msgstr "Tipo"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
-msgstr ""
+msgstr "Vinculado al método de abastecimiento 'Regla de stock mínimo'."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -747,6 +768,7 @@ msgstr "¡Acción no válida!"
 #: help:mrp.bom,product_efficiency:0
 msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
+"Un factor de 0.9 indica una pérdida del 10% en el proceso de producción."
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -767,12 +789,12 @@ msgstr "Regla de abastecimiento"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Partial"
-msgstr ""
+msgstr "Parcial"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "September"
-msgstr ""
+msgstr "Setiembre"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -786,6 +808,10 @@ msgid ""
 "order creates a RFQ for a subcontracting purchase order or waits until the "
 "service is done (= the delivery of the products)."
 msgstr ""
+"Dependiendo del método elegido para \"suministrar\" del servicio, la orden "
+"de abastecimiento crea una solicitud de presupuesto para un pedido de compra "
+"(subcontratación) o espera hasta que el servicio se realice (= la entrega de "
+"los productos)."
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -796,7 +822,7 @@ msgstr "Urgente"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
 msgid "Workcenter Usage"
-msgstr ""
+msgstr "Uso centro de trabajo"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
@@ -841,7 +867,7 @@ msgstr "Tipo de lista de materiales"
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros extendidos..."
 
 #. module: mrp
 #: code:addons/mrp/procurement.py:0
@@ -865,7 +891,7 @@ msgstr "Núm. de ciclo"
 #. module: mrp
 #: model:ir.model,name:mrp.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Compañías"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_minimumstockrule0
@@ -904,7 +930,7 @@ msgstr "Núm. de horas"
 #. module: mrp
 #: field:mrp.installer,mrp_jit:0
 msgid "Just In Time Scheduling"
-msgstr ""
+msgstr "Planificación 'Just in Time'"
 
 #. module: mrp
 #: view:mrp.property:0
@@ -934,6 +960,8 @@ msgid ""
 "Enables multiple product output from a single production order: without "
 "this, a production order can have only one output product."
 msgstr ""
+"Habilita la salida de múltiples productos de una sola orden de producción: "
+"sin ello, una orden de producción sólo puede tener un producto de salida."
 
 #. module: mrp
 #: view:change.production.qty:0
@@ -955,6 +983,8 @@ msgid ""
 "If the service has a 'Buy' supply method, this creates a RFQ, a "
 "subcontracting demand for instance."
 msgstr ""
+"Si el servicio tiene un método de suministro 'Comprar', se crea una "
+"solicitud de presupuesto, por ejemplo, una petición de subcontratación."
 
 #. module: mrp
 #: field:mrp.production,move_prod_id:0
@@ -964,7 +994,7 @@ msgstr "Movimiento producto"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Late"
-msgstr ""
+msgstr "Retrasado"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_servicemts0
@@ -974,7 +1004,7 @@ msgstr "Obtener para stock"
 #. module: mrp
 #: view:board.board:0
 msgid "Work Center Future load"
-msgstr ""
+msgstr "Carga futura centro de trabajo"
 
 #. module: mrp
 #: report:bom.structure:0
@@ -1001,7 +1031,7 @@ msgstr "Componente"
 #. module: mrp
 #: view:mrp.production:0
 msgid "Source Loc."
-msgstr ""
+msgstr "Ubic. orígen"
 
 #. module: mrp
 #: field:mrp.bom,position:0
@@ -1014,6 +1044,8 @@ msgid ""
 "Manages product routes and paths within and between locations (e.g. "
 "warehouses)."
 msgstr ""
+"Gestiona las rutas y caminos de los productos dentro y entre las ubicaciones "
+"(por ejemplo, almacenes)."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_billofmaterial0
@@ -1038,6 +1070,13 @@ msgid ""
 "avoids having to wait for the procurement scheduler to run or having to run "
 "the procurement scheduler manually."
 msgstr ""
+"Permite el cálculo de las órdenes de abastecimiento justo a tiempo (Just In "
+"Time).\n"
+"\n"
+"Si bien consume más recursos que la configuración predeterminada, el cálculo "
+"JIT evita tener que esperar a que se ejecute el planificador de "
+"abastecimientos o tener que ejecutar el planificador de abastecimientos de "
+"forma manual."
 
 #. module: mrp
 #: field:mrp.product.produce,mode:0
@@ -1047,13 +1086,15 @@ msgstr "Modo"
 #. module: mrp
 #: report:bom.structure:0
 msgid "]"
-msgstr ""
+msgstr "]"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of routing workcenters."
 msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de rutas de centros "
+"de trabajo."
 
 #. module: mrp
 #: constraint:ir.rule:0
@@ -1063,12 +1104,12 @@ msgstr "¡Las reglas no están soportadas en los objetos osv_memory!"
 #. module: mrp
 #: constraint:mrp.production:0
 msgid "Order quantity cannot be negative or zero !"
-msgstr ""
+msgstr "¡Cantidad ordenada no puede ser negativa o cero!"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action3
 msgid "Manufacturing Orders in Progress"
-msgstr ""
+msgstr "Órdenes de producción en progreso"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action4
@@ -1083,7 +1124,7 @@ msgstr "Órdenes de producción en espera de productos"
 #: view:mrp.routing:0
 #: view:mrp.workcenter:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
@@ -1132,6 +1173,9 @@ msgid ""
 "The system waits for the products to be available in the stock. These "
 "products are typically procured manually or through a minimum stock rule."
 msgstr ""
+"El sistema espera a que los productos estén disponibles en el stock. Estos "
+"productos suelen ser adquiridos de forma manual o a través de una regla de "
+"stock mínimo."
 
 #. module: mrp
 #: field:report.workcenter.load,hour:0
@@ -1165,7 +1209,7 @@ msgstr "Seleccionar unidad de tiempo"
 #. module: mrp
 #: view:report.workcenter.load:0
 msgid "Work Center load"
-msgstr ""
+msgstr "Carga centro de producción"
 
 #. module: mrp
 #: help:mrp.production,location_dest_id:0
@@ -1178,11 +1222,12 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the routing "
 "without removing it."
 msgstr ""
+"Si el campo activo se desmarca, permite ocultar la ruta sin eliminarla."
 
 #. module: mrp
 #: field:stock.change.standard.price,change_parent_price:0
 msgid "Change Parent Price"
-msgstr ""
+msgstr "Cambiar precio padre"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move
@@ -1196,6 +1241,9 @@ msgid ""
 "maxi quantity. It's available in the Inventory management menu and "
 "configured by product."
 msgstr ""
+"La regla de stock mínimo es una regla de abastecimiento automático basado en "
+"una cantidad mínima y máxima. Está disponible en el menú de gestión de "
+"inventario y configurable por producto."
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -1216,7 +1264,7 @@ msgstr "Prioridad"
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Albarán"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1227,7 +1275,7 @@ msgstr "Mes -1"
 #: code:addons/mrp/mrp.py:0
 #, python-format
 msgid "Manufacturing order '%s' is scheduled for the %s."
-msgstr ""
+msgstr "Órden de producción '%s' planificada para el '%s'"
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -1238,12 +1286,12 @@ msgstr "Núm. orden producción :"
 #: code:addons/mrp/mrp.py:0
 #, python-format
 msgid "Manufacturing order '%s' is ready to produce."
-msgstr ""
+msgstr "Orden fabricación '%s' está preparada para producir."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production_product_line
 msgid "Production Scheduled Product"
-msgstr ""
+msgstr "Fabricación planificada producto"
 
 #. module: mrp
 #: help:res.company,manufacturing_lead:0
@@ -1268,6 +1316,8 @@ msgid ""
 "In case the Supply method of the product is Buy, the system creates a "
 "purchase order."
 msgstr ""
+"En caso de que el método de suministro del producto se Compra, el sistema "
+"crea un pedido de compra."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_procurement_order
@@ -1283,12 +1333,12 @@ msgstr "Estructura de los costes del producto"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_installer
 msgid "mrp.installer"
-msgstr ""
+msgstr "mrp.instalador"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Production Work Centers"
-msgstr ""
+msgstr "Centros de trabajo de producción"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1300,12 +1350,12 @@ msgstr "Mes"
 #: code:addons/mrp/wizard/change_production_qty.py:0
 #, python-format
 msgid "Active Id is not found"
-msgstr ""
+msgstr "ID activo no se encuentra"
 
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Search for mrp workcenter"
-msgstr ""
+msgstr "Buscar por centro de trabajo mrp"
 
 #. module: mrp
 #: view:mrp.bom:0
@@ -1332,7 +1382,7 @@ msgstr "Cuenta horas"
 #. module: mrp
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "¡Error! No puede crear menús recursivos."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1348,7 +1398,7 @@ msgstr "Producto consumido"
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Work Cost "
-msgstr ""
+msgstr "Coste del trabajo "
 
 #. module: mrp
 #: field:mrp.bom,active:0
@@ -1364,7 +1414,7 @@ msgstr "Abastecer productos"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_report_workcenter_load_tree
 msgid "Work Center Loads"
-msgstr ""
+msgstr "Cargas centro de trabajo"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_property_action
@@ -1385,7 +1435,7 @@ msgstr "Fecha planificada"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_minimumstockprocure0
 msgid "'Minimum stock rule' material"
-msgstr ""
+msgstr "material 'regla stock mínimo'"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1400,13 +1450,13 @@ msgstr "Cambiar cantidad de productos"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productionorder0
 msgid "Drives the procurement orders for raw material."
-msgstr ""
+msgstr "Guía las órdenes de abastecimiento para materias primas."
 
 #. module: mrp
 #: view:mrp.production:0
 #: view:mrp.production.order:0
 msgid "Current"
-msgstr ""
+msgstr "Actual"
 
 #. module: mrp
 #: field:mrp.workcenter,costs_general_account_id:0
@@ -1435,7 +1485,7 @@ msgstr "Cambio de precio estándar"
 #: report:mrp.production.order:0
 #: field:mrp.production.order,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Documento origen"
 
 #. module: mrp
 #: constraint:ir.model:0
@@ -1451,11 +1501,13 @@ msgid ""
 "This will change the price of parent products also according to the BoM "
 "structure specified for the product."
 msgstr ""
+"Esto cambiará el precio de los productos padre de acuerdo a la estructura de "
+"la lista de materiales del producto."
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.mrp_production_action2
 msgid "Manufacturing Orders To Start"
-msgstr ""
+msgstr "Órdenes de producción a iniciar"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter
@@ -1534,7 +1586,7 @@ msgstr "UdM del producto"
 #: model:process.transition,name:mrp.process_transition_servicemto0
 #: model:process.transition,name:mrp.process_transition_stockproduct0
 msgid "Make to Order"
-msgstr ""
+msgstr "Obtener para pedido"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_report_mrp_production_orders_tree
@@ -1572,7 +1624,7 @@ msgstr "UdV del producto"
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "#Line Orders"
-msgstr ""
+msgstr "Nº línea órdenes"
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -1583,7 +1635,7 @@ msgstr "Muy urgente"
 #. module: mrp
 #: view:change.production.qty:0
 msgid "Approve"
-msgstr ""
+msgstr "Aprobar"
 
 #. module: mrp
 #: view:mrp.property.group:0
@@ -1594,6 +1646,8 @@ msgstr "Categorías de propiedades"
 #: help:mrp.production.workcenter.line,sequence:0
 msgid "Gives the sequence order when displaying a list of work orders."
 msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de órdenes de "
+"trabajo."
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -1635,6 +1689,11 @@ msgid ""
 "the quantity selected and it will finish the production order when total "
 "ordered quantities are produced."
 msgstr ""
+"El modo 'Sólo consumir' sólo se consumen los productos con la cantidad "
+"seleccionada.\n"
+"El modo 'Consumo y Producción' se consumen y también se producen los "
+"productos con la cantidad seleccionada y finalizará la orden de producción "
+"cuando el total de las cantidades solicitadas se han producido."
 
 #. module: mrp
 #: view:mrp.production:0
@@ -1657,7 +1716,7 @@ msgstr "Servicio"
 #: selection:mrp.production,state:0
 #: selection:mrp.production.order,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancelado"
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -1678,6 +1737,9 @@ msgid ""
 "are products themselves) can also have their own Bill of Material (multi-"
 "level)."
 msgstr ""
+"La lista de materiales es la composición del producto. Los componentes (que "
+"son también productos) pueden tener sus propias listas de materiales (multi-"
+"nivel)."
 
 #. module: mrp
 #: field:mrp.bom,company_id:0
@@ -1688,7 +1750,7 @@ msgstr ""
 #: field:mrp.routing.workcenter,company_id:0
 #: view:mrp.workcenter:0
 msgid "Company"
-msgstr ""
+msgstr "Compañía"
 
 #. module: mrp
 #: field:mrp.workcenter,time_cycle:0
@@ -1713,6 +1775,11 @@ msgid ""
 "operations and to plan future loads on workcenters based on production "
 "plannification."
 msgstr ""
+"La lista de las operaciones (lista de los centros de trabajo) para producir "
+"el producto terminado. La ruta se utiliza principalmente para calcular los "
+"costes del centro de trabajo durante las operaciones y para planificar las "
+"futuras cargas en centros de trabajo basado en planificación de la "
+"producción."
 
 #. module: mrp
 #: model:process.node,note:mrp.process_node_productminimumstockrule0
@@ -1746,6 +1813,9 @@ msgid ""
 "Number of operations this workcenter can do in parallel. If this workcenter "
 "represents a team of 5 workers, the capacity per cycle is 5."
 msgstr ""
+"Número de operaciones que este centro de producción puede realizar en "
+"paralelo. Si este centro de producción representa un equipo de 5 "
+"trabajadores, la capacidad por ciclo es de 5."
 
 #. module: mrp
 #: field:mrp.bom,date_start:0
@@ -1760,7 +1830,7 @@ msgstr "LdM normal"
 #. module: mrp
 #: field:res.company,manufacturing_lead:0
 msgid "Manufacturing Lead Time"
-msgstr ""
+msgstr "Tiempo entrega de fabricación"
 
 #. module: mrp
 #: field:mrp.bom,product_uos_qty:0
@@ -1781,7 +1851,7 @@ msgstr "Confirmar"
 #. module: mrp
 #: field:mrp.bom,product_efficiency:0
 msgid "Manufacturing Efficiency"
-msgstr ""
+msgstr "Eficiencia de la producción"
 
 #. module: mrp
 #: field:mrp.bom,product_rounding:0
@@ -1813,6 +1883,11 @@ msgid ""
 "product, it will be sold and shipped as a set of components, instead of "
 "being produced."
 msgstr ""
+"Si un sub-producto se utiliza en varios productos, puede ser útil crear su "
+"propia lista de materiales. Aunque si no quiere órdenes de producción "
+"separadas para este sub-producto, seleccione Conjunto/Fantasma como tipo de "
+"LdM. Si una LdM fantasma se utiliza para un producto raíz, será vendida y "
+"enviada como un conjunto de componentes, en vez de ser producida."
 
 #. module: mrp
 #: field:mrp.bom,method:0
@@ -1870,7 +1945,7 @@ msgstr "Órdenes de abastecimiento"
 #. module: mrp
 #: help:mrp.bom,product_rounding:0
 msgid "Rounding applied on the product quantity."
-msgstr ""
+msgstr "Redondeo aplicado sobre la cantidad de producto"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_search_mrp
@@ -1880,7 +1955,7 @@ msgstr "Horario de trabajo"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stock0
 msgid "Assignment from Production or Purchase Order."
-msgstr ""
+msgstr "Asignación desde producción o pedido de compra."
 
 #. module: mrp
 #: field:mrp.routing.workcenter,routing_id:0
@@ -1918,7 +1993,7 @@ msgstr "Variación del valor del stock"
 #: model:process.node,note:mrp.process_node_mts0
 #: model:process.node,note:mrp.process_node_servicemts0
 msgid "Assignment from stock."
-msgstr ""
+msgstr "Asignación desde stock."
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -1965,18 +2040,18 @@ msgstr "Normal"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_routing0
 msgid "Manufacturing Steps."
-msgstr ""
+msgstr "Etapas de producción."
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Cost Structure"
-msgstr ""
+msgstr "Estructura de costes"
 
 #. module: mrp
 #: selection:mrp.product.produce,mode:0
 msgid "Consume & Produce"
-msgstr ""
+msgstr "Consumir y Producir"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
@@ -2001,7 +2076,7 @@ msgstr "Enero"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_stockproduct0
 msgid "Product type is Stockable or Consumable."
-msgstr ""
+msgstr "Tipo de producto es almacenable o consumible."
 
 #. module: mrp
 #: code:addons/mrp/mrp.py:0
@@ -2025,6 +2100,9 @@ msgid ""
 "Routing is indicated then,the third tab of a production order (workcenters) "
 "will be automatically pre-completed."
 msgstr ""
+"La ruta indica todos los centros de trabajo utilizados, por cuánto tiempo "
+"y/o ciclos. Si se indica la ruta, entonces la tercera pestaña de una orden "
+"de producción (Centros de trabajo) será automáticamente pre-completada."
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_bom_revision
@@ -2064,6 +2142,7 @@ msgstr "Operaciones de producción"
 msgid ""
 "Reference of the document that generated this production order request."
 msgstr ""
+"Referencia al documento que generó esta solicitud de orden de producción."
 
 #. module: mrp
 #: view:mrp.production.order:0
@@ -2084,7 +2163,7 @@ msgstr "Precio del producto"
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_mrp_installer
 msgid "MRP Applications Configuration"
-msgstr ""
+msgstr "Configuración de las aplicaciónes MRP"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_stock_move_split
@@ -2123,11 +2202,16 @@ msgid ""
 "operations and to plan future loads on workcenters based on production "
 "planning."
 msgstr ""
+"La lista de las operaciones (lista de los centros de trabajo) para producir "
+"el producto terminado. La ruta se utiliza principalmente para calcular los "
+"costes del centro de trabajo durante las operaciones y para planificar las "
+"futuras cargas en los centros de trabajo basado en la planificación de la "
+"producción."
 
 #. module: mrp
 #: view:board.board:0
 msgid "Manufacturing board"
-msgstr ""
+msgstr "Tablero fabricación"
 
 #. module: mrp
 #: field:mrp.production,date_planned_end:0
@@ -2137,7 +2221,7 @@ msgstr "Fecha de fin planificada"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_procureproducts0
 msgid "The way to procurement depends on the product type."
-msgstr ""
+msgstr "La forma de abastecer depende del tipo de producto."
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_manufacturing
@@ -2171,6 +2255,9 @@ msgid ""
 "Depending on the chosen method to supply the stockable products, the "
 "procurement order creates a RFQ, a production order, ... "
 msgstr ""
+"Dependiendo del método elegido para suministrar los productos almacenables, "
+"la orden de abastecimiento crea una petición de presupuesto, una orden de "
+"producción, ... "
 
 #. module: mrp
 #: help:mrp.workcenter,time_stop:0
@@ -2180,7 +2267,7 @@ msgstr "Tiempo en horas para la limpieza."
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_purchaseprocure0
 msgid "Automatic RFQ"
-msgstr ""
+msgstr "Petición de presupuesto automática"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemto0
@@ -2188,6 +2275,8 @@ msgid ""
 "If the service has a 'Produce' supply method, this creates a task in the "
 "project management module of OpenERP."
 msgstr ""
+"Si el servicio tiene un método de suministro 'Producir', se crea una tarea "
+"en el módulo de gestión de proyectos de OpenERP."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_productionprocureproducts0
@@ -2196,6 +2285,10 @@ msgid ""
 "production order creates as much procurement orders as components listed in "
 "the BOM, through a run of the schedulers (MRP)."
 msgstr ""
+"Para poder suministrar materias primas (que deben ser compradas o "
+"producidas), la orden de producción genera tantas órdenes de abastecimiento "
+"como componentes figuren en la lista de materiales, a través de una "
+"ejecución de las planificaciones (MRP)."
 
 #. module: mrp
 #: selection:mrp.bom,method:0
@@ -2213,12 +2306,14 @@ msgstr "Secuencia"
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_view_resource_calendar_leaves_search_mrp
 msgid "Resource Leaves"
-msgstr ""
+msgstr "Hojas de recursos"
 
 #. module: mrp
 #: help:mrp.bom,sequence:0
 msgid "Gives the sequence order when displaying a list of bills of material."
 msgstr ""
+"Indica el orden de secuencia cuando se muestra una lista de listas de "
+"materiales."
 
 #. module: mrp
 #: view:mrp.production:0
diff --git a/addons/mrp/i18n/fr.po b/addons/mrp/i18n/fr.po
index 3f3ea220132..cd5925e40e8 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-29 09:18+0000\n"
-"Last-Translator: TeMPO <openerp@tempo-consulting.fr>\n"
+"PO-Revision-Date: 2010-11-13 08:44+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:10+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp
@@ -176,7 +176,7 @@ msgstr ""
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "Raw Material Location"
-msgstr ""
+msgstr "Emplacement des matières premières"
 
 #. module: mrp
 #: help:mrp.installer,mrp_operations:0
@@ -189,6 +189,8 @@ msgstr ""
 #: model:process.transition,note:mrp.process_transition_purchaseprocure0
 msgid "The system launches automatically a RFQ to the preferred supplier."
 msgstr ""
+"Le système lance automatiquement un appel d'offre auprès du fournisseur "
+"principal"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -208,7 +210,7 @@ msgstr "XML non valide pour l'architecture de la vue"
 #. module: mrp
 #: field:mrp.installer,mrp_subproduct:0
 msgid "MRP Subproducts"
-msgstr ""
+msgstr "Sous-produits MRP"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -229,6 +231,8 @@ msgid ""
 "In case the Supply method of the product is Produce, the system creates a "
 "production order."
 msgstr ""
+"Dans le cas où la méthode d'approvisionnement de ce produit est Produire, le "
+"système crée un ordre de fabrication"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -374,12 +378,12 @@ msgstr "Octobre"
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_procurestockableproduct0
 msgid "Procurement of stockable Product"
-msgstr ""
+msgstr "Approvisionnement d'un produit stocké"
 
 #. module: mrp
 #: view:mrp.bom:0
 msgid "Default UOM"
-msgstr ""
+msgstr "UdM par défaut"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
@@ -394,7 +398,7 @@ msgstr "Quantité"
 #. module: mrp
 #: field:mrp.production.workcenter.line,hour:0
 msgid "Nbr of hours"
-msgstr ""
+msgstr "Nb d'heures"
 
 #. module: mrp
 #: view:mrp.production:0
@@ -407,6 +411,8 @@ msgid ""
 "The system creates an order (production or purchased) depending on the sold "
 "quantity and the products parameters."
 msgstr ""
+"Le système crée un ordre (de fabrication ou d'achat), en fonction de la "
+"quantité vendue et des paramètres des produits."
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_servicemts0
@@ -414,6 +420,8 @@ msgid ""
 "This is used in case of a service without any impact in the system, a "
 "training session for instance."
 msgstr ""
+"Ceci est utilisé dans le cas d'un service n'ayant aucun impact sur le "
+"système, comme par exemple une session de formation"
 
 #. module: mrp
 #: field:mrp.installer,mrp_repair:0
@@ -436,6 +444,8 @@ msgid ""
 "Enables warranty and repair management (and their impact on stocks and "
 "invoicing)."
 msgstr ""
+"Permet la gestion des garanties et des réparations (ainsi que leur impact "
+"sur le stock et la facturation)"
 
 #. module: mrp
 #: field:mrp.production,date_planned_date:0
@@ -464,7 +474,7 @@ msgstr ""
 #. module: mrp
 #: view:board.board:0
 msgid "Stock Value Variation"
-msgstr ""
+msgstr "Variation de la valeur de stock"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action2
@@ -516,13 +526,13 @@ msgstr "Nombre de cycles"
 #: model:process.node,note:mrp.process_node_orderrfq0
 #: model:process.node,note:mrp.process_node_rfq0
 msgid "Request for Quotation."
-msgstr ""
+msgstr "Appel d'offres"
 
 #. module: mrp
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Component suppliers"
-msgstr ""
+msgstr "Fournisseurs de composant"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_billofmaterialrouting0
@@ -530,22 +540,24 @@ msgid ""
 "The Bill of Material is linked to a routing, i.e. the succession of work "
 "centers."
 msgstr ""
+"La nomenclature est reliée à une gamme (c'est-à-dire la succession des "
+"centres de charge)"
 
 #. module: mrp
 #: help:mrp.workcenter,costs_hour:0
 msgid "Specify Cost of Workcenter per hour."
-msgstr ""
+msgstr "Précisez le coût horaire du centre de charge"
 
 #. module: mrp
 #: view:mrp.routing:0
 #: field:mrp.routing,location_id:0
 msgid "Production Location"
-msgstr "Emplacement Production"
+msgstr "Emplacement de production"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Change Qty"
-msgstr "Changer la Qté"
+msgstr ""
 
 #. module: mrp
 #: view:mrp.production:0
@@ -560,7 +572,7 @@ msgstr "Auteur"
 #. module: mrp
 #: field:report.mrp.inout,value:0
 msgid "Stock value"
-msgstr "Valeur de stoque"
+msgstr "Valeur du stock"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.action_product_bom_structure
@@ -576,34 +588,34 @@ msgstr ""
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Supplier Price per Uom"
-msgstr ""
+msgstr "Prix du fournisseur par UdM"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "March"
-msgstr ""
+msgstr "Mars"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_workcenter_load
 msgid "Workcenter Load"
-msgstr "Charge par poste"
+msgstr ""
 
 #. module: mrp
 #: help:mrp.workcenter,costs_cycle:0
 msgid "Specify Cost of Workcenter per cycle."
-msgstr ""
+msgstr "Précisez le coût par cycle du poste de charge"
 
 #. module: mrp
 #: field:mrp.bom,child_complete_ids:0
 msgid "BoM Hierarchy"
-msgstr ""
+msgstr "Hièrarchie de la nomenclature"
 
 #. module: mrp
 #: model:ir.actions.act_window,name:mrp.act_mrp_product_produce
 #: view:mrp.product.produce:0
 #: view:mrp.production:0
 msgid "Produce"
-msgstr ""
+msgstr "Fabriquer"
 
 #. module: mrp
 #: help:mrp.production,picking_id:0
@@ -611,6 +623,8 @@ msgid ""
 "This is the internal picking list that brings the finished product to the "
 "production plan"
 msgstr ""
+"Ceci est la liste de colisage qui fournit les produits finis au plan de "
+"fabrication"
 
 #. module: mrp
 #: help:mrp.product_price,number:0
@@ -618,13 +632,15 @@ msgid ""
 "Specify quantity of products to produce or buy. Report of Cost structure "
 "will be displayed base on this qunatity."
 msgstr ""
+"Précisez la quantité de produits à fabriquer ou acheter. Le rapport de la "
+"structure de coût sera affiché en fonction de cette quantité"
 
 #. module: mrp
 #: selection:mrp.production,state:0
 #: view:mrp.production.order:0
 #: selection:mrp.production.order,state:0
 msgid "Picking Exception"
-msgstr ""
+msgstr "Excerption du colisage"
 
 #. module: mrp
 #: field:mrp.bom,bom_lines:0
@@ -647,7 +663,7 @@ msgstr ""
 #: report:mrp.production.order:0
 #: field:mrp.production.order,consumed_products:0
 msgid "Consumed Products"
-msgstr "Produits Concommés"
+msgstr "Produits consommés"
 
 #. module: mrp
 #: constraint:mrp.bom:0
@@ -658,7 +674,7 @@ msgstr "Erreur! Vous ne pouvez pas créer de nomenclatures récursives"
 #: model:ir.actions.act_window,name:mrp.action_mrp_workcenter_load_wizard
 #: model:ir.model,name:mrp.model_report_workcenter_load
 msgid "Work Center Load"
-msgstr ""
+msgstr "Charge du poste de charge"
 
 #. module: mrp
 #: code:addons/mrp/procurement.py:0
@@ -670,22 +686,22 @@ msgstr "Pas de nomenclature définie pour ce produit !"
 #: model:ir.actions.act_window,name:mrp.mrp_bom_form_action2
 #: model:ir.ui.menu,name:mrp.menu_mrp_bom_form_action2
 msgid "Bill of Material Components"
-msgstr ""
+msgstr "Composants de nomenclature"
 
 #. module: mrp
 #: field:mrp.production.order,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "Nb de lignes"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menu_mrp_planning
 msgid "Planning"
-msgstr ""
+msgstr "Planification"
 
 #. module: mrp
 #: view:mrp.workcenter:0
 msgid "Costing Information"
-msgstr ""
+msgstr "Information de coût"
 
 #. module: mrp
 #: help:mrp.routing.workcenter,hour_nbr:0
@@ -696,7 +712,7 @@ msgstr "Temps nécessaire à la réalisation d'un cycle"
 #. module: mrp
 #: report:bom.structure:0
 msgid "BOM Ref"
-msgstr ""
+msgstr "Référence nomenclature"
 
 #. module: mrp
 #: selection:mrp.production,state:0
@@ -732,7 +748,7 @@ msgstr "Type"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_minimumstockrule0
 msgid "Linked to the 'Minimum stock rule' supplying method."
-msgstr ""
+msgstr "Lié à la méthode d'approvisionnement \"Règle de stock minimum\""
 
 #. module: mrp
 #: selection:mrp.workcenter.load,time_unit:0
@@ -761,6 +777,7 @@ msgstr "Action non valide !"
 #: help:mrp.bom,product_efficiency:0
 msgid "A factor of 0.9 means a loss of 10% within the production process."
 msgstr ""
+"Un facteur de 0.9 signifie une perte de 10% au cours de la fabrication."
 
 #. module: mrp
 #: report:mrp.production.order:0
@@ -771,27 +788,27 @@ msgstr "Date d'impression"
 #: model:process.node,name:mrp.process_node_orderrfq0
 #: model:process.node,name:mrp.process_node_rfq0
 msgid "RFQ"
-msgstr "Demande de Devis"
+msgstr "Appel d'offre"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_producttostockrules0
 msgid "Procurement rule"
-msgstr ""
+msgstr "Règle d'approvisionnement"
 
 #. module: mrp
 #: view:mrp.production:0
 msgid "Partial"
-msgstr ""
+msgstr "Partiel"
 
 #. module: mrp
 #: selection:mrp.production.order,month:0
 msgid "September"
-msgstr ""
+msgstr "Septembre"
 
 #. module: mrp
 #: report:mrp.production.order:0
 msgid "WorkCenter"
-msgstr "Cenre de Travail"
+msgstr "Poste de charge"
 
 #. module: mrp
 #: model:process.transition,note:mrp.process_transition_procureserviceproduct0
@@ -800,6 +817,10 @@ msgid ""
 "order creates a RFQ for a subcontracting purchase order or waits until the "
 "service is done (= the delivery of the products)."
 msgstr ""
+"En fonction de la méthode choisie pour pour \"approvisionner\" le service, "
+"l'ordre d'approvisionnement va créer un appel d'offre pour une commande de "
+"sous-traitance, ou va attendre jusqu'à ce que le service soit effectué (= la "
+"livraison des produits)."
 
 #. module: mrp
 #: selection:mrp.production,priority:0
@@ -810,12 +831,12 @@ msgstr "Urgent"
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_routing_workcenter
 msgid "Workcenter Usage"
-msgstr ""
+msgstr "Utilisation du poste de charge"
 
 #. module: mrp
 #: model:ir.model,name:mrp.model_mrp_production
 msgid "Manufacturing Order"
-msgstr ""
+msgstr "Ordre de fabrication"
 
 #. module: mrp
 #: model:process.transition,name:mrp.process_transition_productionprocureproducts0
@@ -845,7 +866,7 @@ msgstr "Nom de la Modification"
 #: view:mrp.production:0
 #: field:mrp.production.order,date:0
 msgid "Date"
-msgstr ""
+msgstr "Date"
 
 #. module: mrp
 #: field:mrp.bom,type:0
@@ -855,7 +876,7 @@ msgstr "Type de Nomenclature"
 #. module: mrp
 #: view:mrp.production.order:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtre étendus"
 
 #. module: mrp
 #: code:addons/mrp/procurement.py:0
@@ -878,18 +899,18 @@ msgstr "Nbre de cycles"
 #. module: mrp
 #: model:ir.model,name:mrp.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Sociétés"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_minimumstockrule0
 #: model:process.node,name:mrp.process_node_productminimumstockrule0
 msgid "Minimum Stock"
-msgstr ""
+msgstr "Stock minimum"
 
 #. module: mrp
 #: model:ir.ui.menu,name:mrp.menus_dash_mrp
 msgid "Dashboard"
-msgstr ""
+msgstr "Tableau de bord"
 
 #. module: mrp
 #: model:process.node,name:mrp.process_node_stockproduct0
@@ -902,7 +923,7 @@ msgstr "Produit Stockable"
 #: code:addons/mrp/report/price.py:0
 #, python-format
 msgid "Work Center name"
-msgstr ""
+msgstr "Nom du poste de charge"
 
 #. module: mrp
 #: field:mrp.routing,code:0
@@ -917,7 +938,7 @@ msgstr "Nombre d'Heures"
 #. module: mrp
 #: field:mrp.installer,mrp_jit:0
 msgid "Just In Time Scheduling"
-msgstr ""
+msgstr "Ordonnancement en Juste-à-Temps"
 
 #. module: mrp
 #: view:mrp.property:0
@@ -933,13 +954,13 @@ msgstr "Qté"
 #. module: mrp
 #: model:process.node,note:mrp.process_node_production0
 msgid "Manufacturing Plan."
-msgstr ""
+msgstr "Plan de fabrication"
 
 #. module: mrp
 #: view:mrp.routing:0
 #: view:mrp.workcenter:0
 msgid "Inactive"
-msgstr ""
+msgstr "Inactif"
 
 #. module: mrp
 #: help:mrp.installer,mrp_subproduct:0
diff --git a/addons/mrp/mrp_report.xml b/addons/mrp/mrp_report.xml
index ee552abad59..2d7ca5d0102 100644
--- a/addons/mrp/mrp_report.xml
+++ b/addons/mrp/mrp_report.xml
@@ -13,5 +13,11 @@
 			auto="False"
 			/>
 
+		<report id="report_cost_structure"
+			model="product.product"
+			menu="False"
+			name="product.price"
+			string="Cost Structure"
+			xsl="mrp/report/price.xsl"/>
     </data>
 </openerp>
diff --git a/addons/mrp/report/bom_structure.rml b/addons/mrp/report/bom_structure.rml
index 533d7454943..b3930f9d51a 100644
--- a/addons/mrp/report/bom_structure.rml
+++ b/addons/mrp/report/bom_structure.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="BOM Structure" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="BOM Structure.pdf">
+  <template pageSize="(595.0,842.0)" title="BOM Structure" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="34.0" y1="42.0" width="527" height="758"/>
+      <frame id="first" x1="31.0" y1="30.0" width="532" height="781"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -10,7 +10,7 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table3">
+    <blockTableStyle id="Table2">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -18,15 +18,15 @@
       <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table4">
+    <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#999999" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#999999" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#999999" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#999999" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table1">
+    <blockTableStyle id="Table3">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -37,16 +37,14 @@
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Standard" fontName="Times-Roman"/>
+    <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Times-Roman"/>
-    <paraStyle name="Table Contents" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="LEFT"/>
-    <paraStyle name="Table Heading" fontName="Times-Roman" fontSize="6.0" leading="8" alignment="CENTER"/>
+    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
+    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="Index" fontName="Helvetica"/>
+    <paraStyle name="Table Contents" fontName="Helvetica" fontSize="6.0" leading="8" alignment="LEFT"/>
+    <paraStyle name="Table Heading" fontName="Helvetica" fontSize="6.0" leading="8" alignment="CENTER"/>
     <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
@@ -56,8 +54,8 @@
     <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Footer" fontName="Times-Roman"/>
-    <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
+    <paraStyle name="Footer" fontName="Helvetica"/>
+    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
     <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
     <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
@@ -67,74 +65,90 @@
     <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
     <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_Centre_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_Right_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Heading 2" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_remove_space" fontName="Times-Roman" fontSize="2.0" leading="3" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="terp_remove_space" fontName="Helvetica" fontSize="2.0" leading="3" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
+  <pto>
+  <pto_header>
+  <blockTable colWidths="192.0,198.0,71.0,71.0" style="Table2">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">BOM Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Product Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Quantity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">BOM Ref</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
+
     <para style="terp_header_Centre">BOM Structure</para>
+    <blockTable colWidths="192.0,198.0,71.0,71.0" style="Table2">
+      <tr>
+        <td>
+          <para style="terp_tblheader_Details">BOM Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details">Product Name</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">Quantity</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_General_Centre">BOM Ref</para>
+        </td>
+      </tr>
+    </blockTable>
     <section>
-      <para style="terp_default_9">[[ repeatIn(objects, 'o') ]]</para>
-      <blockTable colWidths="166.0,208.0,79.0,55.0" style="Table3">
-        <tr>
-          <td>
-            <para style="terp_tblheader_General">BOM Name</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General">Product Name</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General_Right">Quantity</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General_Centre">BOM Ref</para>
-          </td>
-        </tr>
-      </blockTable>
-      <blockTable colWidths="166.0,208.0,79.0,55.0" style="Table4">
+      <para style="terp_default_8">[[ repeatIn(objects, 'o') ]]</para>
+      <blockTable colWidths="192.0,198.0,71.0,71.0" style="Table1">
         <tr>
           <td>
             <para style="terp_default_Bold_9">[[ o.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_9"><font> [ [[ (o.product_id.default_code) or removeParentNode('font') ]] ]  </font> <font> [[ o.product_id.name ]] </font> </para>
+            <para style="terp_default_Bold_9">[ [[ (o.product_id.default_code) or removeParentNode('font') ]] ] [[ o.product_id.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_Right_9">[[ o.product_qty ]] [[ o.product_uom.name ]]</para>
+            <para style="terp_default_Right_9_Bold">[[ o.product_qty ]] [[ o.product_uom.name ]]</para>
           </td>
           <td>
-            <para style="terp_default_Bold_Centre_9">[[ o.code ]]</para>
+            <para style="terp_tblheader_Details_Centre">[[ o.code ]]</para>
           </td>
         </tr>
       </blockTable>
       <section>
-        <para style="terp_default_9">[[ repeatIn(get_children(o.bom_lines), 'l') ]]</para>
-        <blockTable colWidths="166.0,208.0,79.0,55.0" style="Table1">
+        <para style="terp_default_8">[[ repeatIn(get_children(o.bom_lines), 'l') ]]</para>
+        <blockTable colWidths="192.0,198.0,71.0,71.0" style="Table3">
           <tr>
             <td>
-              <para style="P1"><font color="white">[[  '... '*2*(l['level']) ]]</font>-[[ l['name'] ]]</para>
+              <para style="terp_default_9"><font face="Helvetica" size="8.0" color="white">[[ '... '*(l['level']) ]]</font> - [[ l['name'] ]]</para>
             </td>
             <td>
-              <para style="P1"><font> [ [[ (l['pcode']) or removeParentNode('font') ]] ] </font> <font> [[ l['pname'] ]] </font> </para>
+              <para style="terp_default_9">[ [[ (l['pcode']) or removeParentNode('font') ]] ] [[ l['pname'] ]]</para>
             </td>
             <td>
-              <para style="P2">[[ l['pqty'] ]] [[ l['uname'] ]]</para>
+              <para style="terp_default_Right_9">[[ l['pqty'] ]] [[ l['uname'] ]]</para>
             </td>
             <td>
               <para style="terp_default_Centre_9">[[ l['code'] ]]</para>
             </td>
           </tr>
         </blockTable>
-        <para style="terp_remove_space">
-          <font color="white"> </font>
-        </para>
       </section>
     </section>
+    </pto>
   </story>
 </document>
\ No newline at end of file
diff --git a/addons/mrp/report/mrp_report.py b/addons/mrp/report/mrp_report.py
index d677184586e..68487527966 100644
--- a/addons/mrp/report/mrp_report.py
+++ b/addons/mrp/report/mrp_report.py
@@ -39,7 +39,7 @@ class report_workcenter_load(osv.osv):
             create or replace view report_workcenter_load as (
                 SELECT
                     min(wl.id) as id,
-                    to_char(p.date_planned,'YYYY:IW') as name,
+                    to_char(p.date_planned,'YYYY:mm:dd') as name,
                     SUM(wl.hour) AS hour,
                     SUM(wl.cycle) AS cycle,
                     wl.workcenter_id as workcenter_id
@@ -49,7 +49,7 @@ class report_workcenter_load(osv.osv):
                         ON p.id = wl.production_id
                 GROUP BY
                     wl.workcenter_id,
-                    to_char(p.date_planned,'YYYY:IW')
+                    to_char(p.date_planned,'YYYY:mm:dd')
             )""")
 
 report_workcenter_load()
diff --git a/addons/mrp/report/mrp_report_view.xml b/addons/mrp/report/mrp_report_view.xml
index 71389233391..a1e3f7174bd 100644
--- a/addons/mrp/report/mrp_report_view.xml
+++ b/addons/mrp/report/mrp_report_view.xml
@@ -22,7 +22,7 @@
             <field name="type">graph</field>
             <field name="arch" type="xml">
                 <graph string="Work Center load" type="bar">
-                    <field group="True" name="name"/>
+                    <field name="name"/>
                     <field name="cycle" operator="+"/>
                     <field name="hour" operator="+"/>
                     <field group="True" name="workcenter_id"/>
diff --git a/addons/mrp/report/order.py b/addons/mrp/report/order.py
index 4481c2c121b..1c631806dde 100644
--- a/addons/mrp/report/order.py
+++ b/addons/mrp/report/order.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -29,6 +29,6 @@ class order(report_sxw.rml_parse):
             'time': time,
         })
 
-report_sxw.report_sxw('report.mrp.production.order','mrp.production','addons/mrp/report/order.rml',parser=order,header=1)
+report_sxw.report_sxw('report.mrp.production.order','mrp.production','addons/mrp/report/order.rml',parser=order,header='internal')
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index d41ee26bba9..9a7bb532acc 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -149,7 +149,7 @@ class report_custom(report_rml):
                     <col para='yes'>-</col>
                     </row></lines>"""
                 xml += """<lines style='total'> <row>
-                    <col> """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name + """: </col>
+                    <col> """ + _('Total Cost of ') + str(number) +' '+ product.uom_id.name + """: </col>
                     <col/>
                     <col f='yes'/>
                     <col t='yes'>"""+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
@@ -176,11 +176,11 @@ class report_custom(report_rml):
 
                 xml += "<lines style='lines'>" + xml_tmp + '</lines>'
                 xml += """<lines style='sub_total'> <row>
-                    <col> """ + _('Cost ') + _('of ') + str(number) +' '+ product.uom_id.name + """: </col>
+                    <col> """ + _('Component Cost of ')  + str(number) +' '+ product.uom_id.name + """: </col>
                     <col/>
                     <col t='yes'/>
                     <col t='yes'>"""+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
-                    <col t='yes'>"""+ rml_obj.formatLang(total, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
+                    <col t='yes'></col>
                     </row></lines>'"""
 
                 total2 = 0
@@ -193,18 +193,18 @@ class report_custom(report_rml):
                     xml += workcenter_header
                     xml += "<lines style='lines'>" + xml_tmp + '</lines>'
                     xml += """<lines style='sub_total'> <row>
-                    <col> """ + _('Work Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +""": </col>
+                    <col> """ + _('Work Cost of ') + str(number) +' '+ product.uom_id.name +""": </col>
                     <col/>
                     <col/>
                     <col/>
                     <col t='yes'>"""+ rml_obj.formatLang(total2, digits=purchase_price_digits) +' '+ company_currency.symbol +"""</col>
                     </row></lines>'"""
                 xml += """<lines style='total'> <row>
-                    <col> """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name + """: </col>
+                    <col> """ + _('Total Cost of ') + str(number) +' '+ product.uom_id.name + """: </col>
                     <col/>
                     <col t='yes'/>
                     <col t='yes'>"""+ rml_obj.formatLang(total_strd+total2, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
-                    <col t='yes'>"""+ rml_obj.formatLang(total+total2, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
+                    <col t='yes'></col>
                     </row></lines>'"""
 
         xml = '<?xml version="1.0" ?><report>' + config_start + config_stop + xml + '</report>'
diff --git a/addons/mrp/report/price.xsl b/addons/mrp/report/price.xsl
index 8e7d244d590..edf98a08e9a 100644
--- a/addons/mrp/report/price.xsl
+++ b/addons/mrp/report/price.xsl
@@ -11,7 +11,7 @@
 	<!-- stylesheet -->
 
 	<xsl:template name="stylesheet">
-		<paraStyle name="title" fontName="Helvetica-Bold" fontSize="22.0" leftIndent="-8.0cm" alignment="center"/>
+		<paraStyle name="title" fontName="Helvetica-Bold" fontSize="15.0" leftIndent="-8.0cm" alignment="center"/>
 		<paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT"/>
 		<paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
 		<paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT"/>
diff --git a/addons/mrp/report/workcenter_load.py b/addons/mrp/report/workcenter_load.py
index 922e460ab6d..9be42edd860 100644
--- a/addons/mrp/report/workcenter_load.py
+++ b/addons/mrp/report/workcenter_load.py
@@ -79,7 +79,7 @@ class report_custom(report_int):
                 year = i/52
                 week = i%52
                 d = date(year, 1, 1)
-                
+
                 dates[i] = {
                     'name' :"Week #%d" % week,
                     'start':(d + timedelta(days=-d.weekday(), weeks=week)).strftime('%Y-%m-%d'),
@@ -124,11 +124,16 @@ class report_custom(report_int):
             x_index.append((dates[date]['name'], date))
         pdf_string = StringIO.StringIO()
         can = canvas.init(fname=pdf_string, format='pdf')
+        can.set_title("Work Centers Load")
         chart_object.set_defaults(line_plot.T, line_style=None)
         if datas['form']['measure_unit'] == 'cycles':
             y_label = "Load (Cycles)"
         else:
             y_label = "Load (Hours)"
+
+        # For add the report header on the top of the report.
+        tb = text_box.T(loc=(300, 500), text="/hL/15/bWork Centers Load", line_style=None)
+        tb.draw()
         ar = area.T(legend = legend.T(),
                     x_grid_style = line_style.gray70_dash1,
                     x_axis = axis.X(label="Periods", format="/a90/hC%s"),
@@ -137,7 +142,6 @@ class report_custom(report_int):
                     y_range = (0, None),
                     size = (640,480))
         bar_plot.fill_styles.reset();
-
         # select workcenters
         cr.execute(
             "SELECT mw.id, rs.name FROM mrp_workcenter mw, resource_resource rs " \
diff --git a/addons/mrp_repair/i18n/es.po b/addons/mrp_repair/i18n/es.po
index 99817fcdceb..05b9faca428 100644
--- a/addons/mrp_repair/i18n/es.po
+++ b/addons/mrp_repair/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-30 10:55+0000\n"
-"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
+"PO-Revision-Date: 2010-11-13 17:52+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-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-31 05:05+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: mrp_repair
@@ -44,7 +45,7 @@ msgstr "Movimiento de inventario"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: mrp_repair
 #: constraint:ir.actions.act_window:0
@@ -59,12 +60,16 @@ msgid ""
 "that you can select the locations in the Info tab, if you have the extended "
 "view."
 msgstr ""
+"Marque esta opción si desea gestionar la entrega una vez que el producto es "
+"reparado. Si esta marcada, se creará un albarán con el producto "
+"seleccionado. Tenga en cuenta que puede seleccionar las ubicaciones en la "
+"pestaña Información, si tiene la vista extendida."
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_cancel_repair
 #: view:mrp.repair.cancel:0
 msgid "Cancel Repair Order"
-msgstr ""
+msgstr "Cancelar orden reparación"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,to_invoice:0
@@ -86,7 +91,7 @@ msgstr "Agrupar por dirección de facturación"
 #: code:addons/mrp_repair/mrp_repair.py:0
 #, python-format
 msgid "No product defined on Fees!"
-msgstr ""
+msgstr "¡No se ha definido ningún producto en honorarios!"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -129,7 +134,7 @@ msgstr "Límite de garantía"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Notes"
-msgstr ""
+msgstr "Notas"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_tax:0
@@ -147,7 +152,7 @@ msgstr "Total neto :"
 #: code:addons/mrp_repair/mrp_repair.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "¡Aviso!"
 
 #. module: mrp_repair
 #: report:repair.order:0
@@ -169,6 +174,8 @@ msgstr "Movimiento"
 #, python-format
 msgid "You have to select a Partner Invoice Address in the repair form !"
 msgstr ""
+"¡Debe seleccionar una dirección de factura de empresa en el formulario de "
+"reparación!"
 
 #. module: mrp_repair
 #: model:ir.actions.act_window,name:mrp_repair.action_repair_order_tree
@@ -190,7 +197,7 @@ msgstr "Información adicional"
 #: field:mrp.repair.fee,repair_id:0
 #: field:mrp.repair.line,repair_id:0
 msgid "Repair Order Reference"
-msgstr ""
+msgstr "Referencia orden reparación"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,state:0
@@ -201,7 +208,7 @@ msgstr "Borrador"
 #: code:addons/mrp_repair/mrp_repair.py:0
 #, python-format
 msgid "No account defined for partner \"%s\"."
-msgstr ""
+msgstr "No se ha definido una cuenta para la empresa \"%s\"."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -265,7 +272,7 @@ msgstr "Dirección de envío :"
 #: code:addons/mrp_repair/mrp_repair.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "¡Error!"
 
 #. module: mrp_repair
 #: field:mrp.repair.line,product_uom_qty:0
@@ -292,7 +299,7 @@ msgstr "Total :"
 #. module: mrp_repair
 #: field:mrp.repair,name:0
 msgid "Repair Reference"
-msgstr ""
+msgstr "Referencia reparación"
 
 #. module: mrp_repair
 #: view:mrp.repair.cancel:0
@@ -300,6 +307,8 @@ msgid ""
 "This operation will cancel the Repair process, but will not cancel it's "
 "Invoice. Do you want to continue?"
 msgstr ""
+"Esta operación cancelará el proceso de reparación, pero no cancelará la "
+"factura. ¿Desea continuar?"
 
 #. module: mrp_repair
 #: field:mrp.repair,pricelist_id:0
@@ -316,7 +325,7 @@ msgstr "Notas del presupuesto"
 #: code:addons/mrp_repair/wizard/cancel_repair.py:0
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "¡Aviso!"
 
 #. module: mrp_repair
 #: constraint:ir.ui.view:0
@@ -326,12 +335,12 @@ msgstr "¡XML inválido para la definición de la vista!"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Search Reair Orders"
-msgstr ""
+msgstr "Buscar órdenes reparación"
 
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Add)"
-msgstr ""
+msgstr "(Añadir)"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_line
@@ -359,6 +368,7 @@ msgstr "Reparado"
 #: model:ir.module.module,shortdesc:mrp_repair.module_meta_information
 msgid "Products Repairs Module - Manage All products Repairs"
 msgstr ""
+"Módulo reparación de productos - Gestiona todas las reparaciones de productos"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,invoice_line_id:0
@@ -406,7 +416,7 @@ msgstr "Crear facturas"
 #. module: mrp_repair
 #: report:repair.order:0
 msgid "(Remove)"
-msgstr ""
+msgstr "(Eliminar)"
 
 #. module: mrp_repair
 #: selection:mrp.repair.line,type:0
@@ -416,17 +426,17 @@ msgstr "Añadir"
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "¿Desea crear la(s) factura(s)?"
 
 #. module: mrp_repair
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "¡Error! No puede crear menús recursivos."
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair
 msgid "Repair Order"
-msgstr ""
+msgstr "Orden reparación"
 
 #. module: mrp_repair
 #: constraint:ir.model:0
@@ -439,7 +449,7 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Ready To Repair"
-msgstr ""
+msgstr "Preparado para reparar"
 
 #. module: mrp_repair
 #: field:mrp.repair,amount_untaxed:0
@@ -454,7 +464,7 @@ msgstr "Límite de garantía"
 #. module: mrp_repair
 #: field:mrp.repair,default_address_id:0
 msgid "unknown"
-msgstr ""
+msgstr "desconocido"
 
 #. module: mrp_repair
 #: field:mrp.repair,product_id:0
@@ -475,12 +485,12 @@ msgstr "Por defecto se utilizará la tarifa del cliente seleccionado."
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Date"
-msgstr ""
+msgstr "Fecha"
 
 #. module: mrp_repair
 #: model:ir.model,name:mrp_repair.model_mrp_repair_fee
 msgid "Repair Fees Line"
-msgstr ""
+msgstr "Líneas honorarios reparación"
 
 #. module: mrp_repair
 #: selection:mrp.repair,state:0
@@ -511,12 +521,12 @@ msgstr "Fin reparación"
 #: code:addons/mrp_repair/mrp_repair.py:0
 #, python-format
 msgid "No account defined for product \"%s\"."
-msgstr ""
+msgstr "No se ha definido una cuenta para el producto \"%s\"."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "Quotations"
-msgstr ""
+msgstr "Presupuestos"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,product_uom_qty:0
@@ -534,7 +544,7 @@ msgstr "Iniciar reparación"
 #: field:mrp.repair,state:0
 #: field:mrp.repair.line,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -562,6 +572,11 @@ msgid ""
 "operation and fee you will add will be set as 'not to invoiced' by default. "
 "Note that you can change manually afterwards."
 msgstr ""
+"El plazo de garantía se calcula como: Fecha del último movimiento + Garantía "
+"definida en el producto seleccionado. Si la fecha actual está por debajo del "
+"límite de garantía, cada operación y honorario que se añadan se marcarán "
+"como \"No a facturar\" por defecto. Tenga en cuenta que después puede "
+"cambiarlo manualmente."
 
 #. module: mrp_repair
 #: field:mrp.repair,invoice_id:0
@@ -613,7 +628,7 @@ msgstr ""
 #. module: mrp_repair
 #: view:mrp.repair.make_invoice:0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Crear factura"
 
 #. module: mrp_repair
 #: field:mrp.repair.fee,name:0
@@ -630,7 +645,7 @@ msgstr "Líneas de operaciones"
 #. module: mrp_repair
 #: view:mrp.repair:0
 msgid "invoiced"
-msgstr ""
+msgstr "facturado"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -668,7 +683,7 @@ msgstr "Impuestos:"
 #. module: mrp_repair
 #: field:mrp.repair,picking_id:0
 msgid "Picking"
-msgstr ""
+msgstr "Albarán"
 
 #. module: mrp_repair
 #: view:mrp.repair:0
@@ -679,13 +694,13 @@ msgstr "Base imponible"
 #: code:addons/mrp_repair/wizard/cancel_repair.py:0
 #, python-format
 msgid "Active ID is not Found"
-msgstr ""
+msgstr "ID activo no se encuentra"
 
 #. module: mrp_repair
 #: code:addons/mrp_repair/wizard/cancel_repair.py:0
 #, python-format
 msgid "Repair order is not invoiced."
-msgstr ""
+msgstr "Orden de reparación no está facturada."
 
 #. module: mrp_repair
 #: view:mrp.repair:0
diff --git a/addons/outlook/i18n/es.po b/addons/outlook/i18n/es.po
new file mode 100644
index 00000000000..9a36071b854
--- /dev/null
+++ b/addons/outlook/i18n/es.po
@@ -0,0 +1,146 @@
+# Spanish 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:46+0000\n"
+"PO-Revision-Date: 2010-11-13 17:00+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: outlook
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
+
+#. module: outlook
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nombre de modelo no válido en la definición de acción."
+
+#. module: outlook
+#: field:outlook.installer,plugin_file:0
+msgid "Outlook Plug-in"
+msgstr "Conector Outlook"
+
+#. module: outlook
+#: help:outlook.installer,doc_file:0
+msgid "The documentation file :- how to install Outlook Plug-in."
+msgstr "El fichero de documentación: Como instalar el conector Outlook."
+
+#. module: outlook
+#: help:outlook.installer,outlook:0
+msgid ""
+"Allows you to select an object that you’d like to add to your email and its "
+"attachments."
+msgstr ""
+"Le permite seleccionar un objeto al que quiera añadir su correo y sus "
+"adjuntos."
+
+#. module: outlook
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr "¡Error! No puede crear menús recursivos."
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "_Close"
+msgstr "_Cerrar"
+
+#. module: outlook
+#: field:outlook.installer,doc_file:0
+msgid "Installation Manual"
+msgstr "Manual instalación"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: outlook
+#: model:ir.ui.menu,name:outlook.menu_base_config_plugins_outlook
+msgid "Outlook Plug-In"
+msgstr "Conector Outlook"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: outlook
+#: model:ir.module.module,shortdesc:outlook.module_meta_information
+msgid "Outlook Interface"
+msgstr "Interfaz Outlook"
+
+#. module: outlook
+#: help:outlook.installer,plugin_file:0
+msgid ""
+"outlook plug-in file. Save as this file and install this plug-in in outlook."
+msgstr ""
+"Fichero del conector Outlook. Guarde este fichero e instale este conector en "
+"la aplicación Outlook."
+
+#. module: outlook
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML no válido para la estructura de la vista!"
+
+#. module: outlook
+#: model:ir.model,name:outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr "outlook.instalador"
+
+#. module: outlook
+#: field:outlook.installer,doc_name:0
+#: field:outlook.installer,name:0
+msgid "File name"
+msgstr "Nombre fichero"
+
+#. module: outlook
+#: field:outlook.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "Pasos de instalación y configuración"
+
+#. module: outlook
+#: field:outlook.installer,description:0
+msgid "Description"
+msgstr "Descripción"
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Skip"
+msgstr "Saltar"
+
+#. module: outlook
+#: field:outlook.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: outlook
+#: field:outlook.installer,outlook:0
+msgid "Outlook Plug-in "
+msgstr "Conector Outlook "
+
+#. module: outlook
+#: model:ir.actions.act_window,name:outlook.action_outlook_installer
+#: model:ir.actions.act_window,name:outlook.action_outlook_wizard
+msgid "Outlook Plug-In Configuration"
+msgstr "Configuración conector Outlook"
diff --git a/addons/outlook/i18n/fr.po b/addons/outlook/i18n/fr.po
new file mode 100644
index 00000000000..5dc29f10076
--- /dev/null
+++ b/addons/outlook/i18n/fr.po
@@ -0,0 +1,139 @@
+# French 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:46+0000\n"
+"PO-Revision-Date: 2010-11-13 20:51+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French <fr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: outlook
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: outlook
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: outlook
+#: field:outlook.installer,plugin_file:0
+msgid "Outlook Plug-in"
+msgstr ""
+
+#. module: outlook
+#: help:outlook.installer,doc_file:0
+msgid "The documentation file :- how to install Outlook Plug-in."
+msgstr ""
+
+#. module: outlook
+#: help:outlook.installer,outlook:0
+msgid ""
+"Allows you to select an object that you’d like to add to your email and its "
+"attachments."
+msgstr ""
+
+#. module: outlook
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "_Close"
+msgstr ""
+
+#. module: outlook
+#: field:outlook.installer,doc_file:0
+msgid "Installation Manual"
+msgstr ""
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: outlook
+#: model:ir.ui.menu,name:outlook.menu_base_config_plugins_outlook
+msgid "Outlook Plug-In"
+msgstr ""
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "title"
+msgstr ""
+
+#. module: outlook
+#: model:ir.module.module,shortdesc:outlook.module_meta_information
+msgid "Outlook Interface"
+msgstr ""
+
+#. module: outlook
+#: help:outlook.installer,plugin_file:0
+msgid ""
+"outlook plug-in file. Save as this file and install this plug-in in outlook."
+msgstr ""
+
+#. module: outlook
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: outlook
+#: model:ir.model,name:outlook.model_outlook_installer
+msgid "outlook.installer"
+msgstr ""
+
+#. module: outlook
+#: field:outlook.installer,doc_name:0
+#: field:outlook.installer,name:0
+msgid "File name"
+msgstr ""
+
+#. module: outlook
+#: field:outlook.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Installation and Configuration Steps"
+msgstr ""
+
+#. module: outlook
+#: field:outlook.installer,description:0
+msgid "Description"
+msgstr ""
+
+#. module: outlook
+#: view:outlook.installer:0
+msgid "Skip"
+msgstr ""
+
+#. module: outlook
+#: field:outlook.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: outlook
+#: field:outlook.installer,outlook:0
+msgid "Outlook Plug-in "
+msgstr ""
+
+#. module: outlook
+#: model:ir.actions.act_window,name:outlook.action_outlook_installer
+#: model:ir.actions.act_window,name:outlook.action_outlook_wizard
+msgid "Outlook Plug-In Configuration"
+msgstr ""
diff --git a/addons/pad/i18n/es.po b/addons/pad/i18n/es.po
new file mode 100644
index 00000000000..bd5b50f0b9e
--- /dev/null
+++ b/addons/pad/i18n/es.po
@@ -0,0 +1,104 @@
+# Spanish 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-27 12:46+0000\n"
+"PO-Revision-Date: 2010-11-13 16:32+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: pad
+#: sql_constraint:ir.module.module:0
+msgid "The certificate ID of the module must be unique !"
+msgstr "¡El ID del certificado del módulo debe ser único!"
+
+#. module: pad
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML no válido para la estructura de la vista!"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:0
+#, python-format
+msgid "Ok"
+msgstr "Acceptar"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:0
+#, python-format
+msgid "Name"
+msgstr "Nombre"
+
+#. module: pad
+#: sql_constraint:ir.module.module:0
+msgid "The name of the module must be unique !"
+msgstr "¡El nombre del módulo debe ser único!"
+
+#. module: pad
+#: help:res.company,pad_index:0
+msgid "The root URL of the company's pad instance"
+msgstr "La URL raíz de la instancia pad de la compañía"
+
+#. module: pad
+#: model:ir.model,name:pad.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: pad
+#: model:ir.module.module,description:pad.module_meta_information
+msgid ""
+"\n"
+"Adds enhanced support for (Ether)Pad attachments in the web client, lets "
+"the\n"
+"company customize which Pad installation should be used to link to new pads\n"
+"(by default, pad.openerp.com)\n"
+"    "
+msgstr ""
+"\n"
+"Añade soporte mejorado para adjuntos (Ether)Pad en el cliente web, permite "
+"que la\n"
+"compañía personalice que instalación Pad debe ser utilizada para conectar a "
+"los nuevos pads\n"
+"(por defecto, pad.openerp.com)\n"
+"    "
+
+#. module: pad
+#: field:res.company,pad_index:0
+msgid "Pad root URL"
+msgstr "URL raíz pad"
+
+#. module: pad
+#: code:addons/pad/web/editors.py:0
+#: view:res.company:0
+#, python-format
+msgid "Pad"
+msgstr "Pad"
+
+#. module: pad
+#: model:ir.module.module,shortdesc:pad.module_meta_information
+msgid "Enhanced support for (Ether)Pad attachments"
+msgstr "Soporte mejorado para adjuntos (Ether)Pad"
+
+#. module: pad
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
+
+#. module: pad
+#: sql_constraint:ir.model.fields:0
+msgid "Size of the field can never be less than 1 !"
+msgstr "¡El tamaño del campo nunca puede ser menor que 1!"
diff --git a/addons/point_of_sale/point_of_sale_demo.xml b/addons/point_of_sale/point_of_sale_demo.xml
index aa76e3e9976..03d04d83f70 100644
--- a/addons/point_of_sale/point_of_sale_demo.xml
+++ b/addons/point_of_sale/point_of_sale_demo.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-
+        <record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[(4,ref('group_pos_user'))]"/>
+        </record>
     	<record id="account.cash_journal" model="account.journal">
             <field eval="[(6, 0, [ref('base.user_root')])]" name="journal_users"/>
         </record>
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index 95f02bb5c1c..b0a2e606897 100644
--- a/addons/point_of_sale/report/pos_lines.rml
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Sales lines" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Sale Lines.pdf">
+  <template pageSize="(595.0,842.0)" title="Sale Lines" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
     </pageTemplate>
@@ -62,13 +62,10 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,2" stop="4,2"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,2" stop="5,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -147,7 +144,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="196.0,78.0,62.0,58.0,56.0,63.0" style="Tableau6">
+    <blockTable colWidths="186.0,71.0,71.0,57.0,57.0,71.0" style="Tableau6">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -171,7 +168,7 @@
     </blockTable>
     <section>
       <para style="terp_default_1">[[repeatIn(o.lines,'l')]]</para>
-      <blockTable colWidths="195.0,78.0,62.0,58.0,56.0,63.0" style="Tableau7">
+      <blockTable colWidths="186.0,71.0,71.0,57.0,57.0,71.0" style="Tableau7">
         <tr>
           <td>
             <para style="terp_default_9">[ [[l.product_id.code]] ] [[l.product_id.name]]</para>
@@ -194,23 +191,8 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="84.0,85.0,86.0,114.0,68.0,74.0" style="Table1">
+    <blockTable colWidths="356.0,71.0,85.0" style="Table1">
       <tr>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
         <td>
           <para style="terp_default_9">
             <font color="white"> </font>
@@ -224,21 +206,6 @@
         </td>
       </tr>
       <tr>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
         <td>
           <para style="terp_default_9">
             <font color="white"> </font>
@@ -252,21 +219,6 @@
         </td>
       </tr>
       <tr>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
         <td>
           <para style="terp_default_9">
             <font color="white"> </font>
@@ -284,4 +236,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/point_of_sale/report/pos_payment_report.rml b/addons/point_of_sale/report/pos_payment_report.rml
index 5201de274ca..56e9982c080 100644
--- a/addons/point_of_sale/report/pos_payment_report.rml
+++ b/addons/point_of_sale/report/pos_payment_report.rml
@@ -64,11 +64,7 @@
       <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
       <lineStyle kind="LINEABOVE" colorName="#ffffff" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEABOVE" colorName="#ffffff" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,2" stop="4,2"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,2" stop="5,2"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="-1,-1"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -149,7 +145,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="301.0,58.0,34.0,57.0,61.0" style="Tableau6">
+    <blockTable colWidths="257.0,71.0,57.0,57.0,71.0" style="Tableau6">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Product</para>
@@ -172,7 +168,7 @@
 	<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
 	<section>
       <para style="terp_default_8">[[ repeatIn(pos_payment(o), 'line_ids') ]]</para>
-      <blockTable colWidths="301.0,58.0,34.0,57.0,61.0" style="Tableau7">
+      <blockTable colWidths="257.0,71.0,57.0,57.0,71.0" style="Tableau7">
         <tr>
           <td>
             <para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
@@ -194,18 +190,8 @@
       </blockTable>
        </section>
        </section>
-      <blockTable colWidths="302.0,57.0,34.0,57.0,61.0" style="Table1">
+      <blockTable colWidths="356.0,71.0,85.0" style="Table1">
       <tr>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_default_9">
-            <font color="white"> </font>
-          </para>
-        </td>
         <td>
           <para style="terp_default_9">
             <font color="white"> </font>
diff --git a/addons/point_of_sale/report/pos_payment_report_date.rml b/addons/point_of_sale/report/pos_payment_report_date.rml
index 5abda34f54e..b8f86233319 100644
--- a/addons/point_of_sale/report/pos_payment_report_date.rml
+++ b/addons/point_of_sale/report/pos_payment_report_date.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Payments" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Payments.pdf">
+  <template pageSize="(595.0,842.0)" title="Payments" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="27.0" y1="57.0" width="512" height="728"/>
     </pageTemplate>
@@ -53,8 +53,8 @@
     <blockTableStyle id="Table5">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -95,9 +95,6 @@
   </stylesheet>
   <story>
     <para style="terp_default_8">[[ repeatIn(objects,'order') ]]</para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
     <para style="terp_header_Centre">Sales Lines</para>
     <para style="Standard">
       <font color="white"> </font>
@@ -128,7 +125,7 @@
     <para style="Standard">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="301.0,57.0,35.0,57.0,61.0" style="Table3">
+    <blockTable colWidths="256.0,71.0,57.0,57.0,71.0" style="Table3">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Product</para>
@@ -149,7 +146,7 @@
     </blockTable>
     <section>
       <para style="terp_default_1">[[ repeatIn(pos_payment_date(data['form']), 'line_ids') ]]</para>
-      <blockTable colWidths="301.0,58.0,34.0,57.0,61.0" style="Table6">
+      <blockTable colWidths="256.0,71.0,57.0,57.0,71.0" style="Table6">
         <tr>
           <td>
             <para style="terp_default_9">[ [[ line_ids['code'] ]] ] [[ line_ids['name'] ]]</para>
@@ -169,18 +166,8 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="302.0,57.0,34.0,57.0,61.0" style="Table5">
+    <blockTable colWidths="355.0,71.0,85.0" style="Table5">
       <tr>
-        <td>
-          <para style="Table Contents">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="Table Contents">
-            <font color="white"> </font>
-          </para>
-        </td>
         <td>
           <para style="Table Contents">
             <font color="white"> </font>
@@ -198,4 +185,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/point_of_sale/security/point_of_sale_security.xml b/addons/point_of_sale/security/point_of_sale_security.xml
index 56e92a468e7..9a90b4d4b6f 100644
--- a/addons/point_of_sale/security/point_of_sale_security.xml
+++ b/addons/point_of_sale/security/point_of_sale_security.xml
@@ -8,8 +8,5 @@
     <record id="group_pos_user" model="res.groups">
         <field name="name">Point of Sale / User</field>
     </record>
-	<record id="base.user_demo" model="res.users">
-            <field name="groups_id" eval="[(4,ref('group_pos_user'))]"/>
-     </record>
 </data>
 </openerp>
diff --git a/addons/procurement/board_mrp_procurement_view.xml b/addons/procurement/board_mrp_procurement_view.xml
index 3b18a876f4f..bf11fe79166 100644
--- a/addons/procurement/board_mrp_procurement_view.xml
+++ b/addons/procurement/board_mrp_procurement_view.xml
@@ -8,16 +8,16 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','exception')]</field>
-			<field name="view_id" ref="procurement.procurement_tree_view_board"/>            
+			<field name="view_id" ref="procurement.procurement_tree_view_board"/>
         </record>
         <record id="board_mrp_procurement_form" model="ir.ui.view">
             <field name="name">board.mrp.procurement.form</field>
             <field name="model">board.board</field>
-			<field name="inherit_id" ref="stock.board_warehouse_form"/>              
+			<field name="inherit_id" ref="stock.board_warehouse_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
-      		<xpath expr="/form/hpaned/child1" position="inside"> 
-				<action colspan="4" name="%(procurement_action_board)d" string="Procurement Exceptions" width="510" />
+      		<xpath expr="/form/hpaned/child1/action[@string='Incoming Product']" position="before">
+				<action colspan="4" name="%(procurement_action_board)d" string="Procurements in Exception" width="510" />
 			</xpath>
             </field>
         </record>
diff --git a/addons/product/i18n/el.po b/addons/product/i18n/el.po
index c74db098c6d..369002b5ba5 100644
--- a/addons/product/i18n/el.po
+++ b/addons/product/i18n/el.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-11-11 15:34+0000\n"
+"PO-Revision-Date: 2010-11-12 08:42+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
diff --git a/addons/product/i18n/es.po b/addons/product/i18n/es.po
index 8b8a250369c..b44c552361e 100644
--- a/addons/product/i18n/es.po
+++ b/addons/product/i18n/es.po
@@ -7,14 +7,14 @@ 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-11-08 08:31+0000\n"
+"PO-Revision-Date: 2010-11-13 12:41+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-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-11-09 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product
@@ -107,6 +107,8 @@ msgid ""
 "Error: The default UOM and the Supplier Product UOM must be in the same "
 "category."
 msgstr ""
+"Error: La UdM por defecto y la UdM del proveedor del producto deben estar en "
+"la misma categoría."
 
 #. module: product
 #: field:product.template,seller_qty:0
@@ -232,6 +234,8 @@ msgid ""
 "Determines if the product can be visible in the list of product within a "
 "selection from a sale order line."
 msgstr ""
+"Indica si el producto será visible en la lista de productos que aparece al "
+"seleccionar un producto en una línea de pedido de venta."
 
 #. module: product
 #: model:product.pricelist.version,name:product.ver0
@@ -258,7 +262,7 @@ msgstr "Tipo de producto"
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (this unit) = ratio * (reference unit)"
-msgstr ""
+msgstr "  por ej.: 1 * (esta unidad) = ratio * (unidad referencia)"
 
 #. module: product
 #: code:addons/product/product.py:0
@@ -367,6 +371,9 @@ msgid ""
 "'you have defined cyclic categories ' \\n                                    "
 "'of products!"
 msgstr ""
+"¡No se puede resolver la categoría de producto, ' \\n                        "
+"            'ha definido categorías cíclicas' \\n                            "
+"        'de productos!"
 
 #. module: product
 #: view:product.product:0
@@ -545,6 +552,8 @@ msgid ""
 "1 or several supplier(s) can be linked to a product. All information stands "
 "in the product form."
 msgstr ""
+"1 o varios proveedor(es) pueden ser relacionados con un producto. Toda la "
+"información se encuentra en el formulario del producto."
 
 #. module: product
 #: help:product.uom,category_id:0
@@ -552,6 +561,9 @@ msgid ""
 "Quantity conversions may happen automatically between Units of Measure in "
 "the same category, according to their respective ratios."
 msgstr ""
+"Conversiones de cantidad pueden realizarse de forma automática entre "
+"unidades de medida en la misma categoría, de acuerdo con sus coeficientes de "
+"conversión respectivos."
 
 #. module: product
 #: help:product.packaging,width:0
@@ -716,6 +728,10 @@ msgid ""
 "management. For example, in food industries, you will manage a stock of ham "
 "but invoice in Kg. Keep empty to use the default UOM."
 msgstr ""
+"Utilizado por las compañías que gestionan dos unidades de medida: "
+"facturación y gestión de inventario. Por ejemplo, en industrias "
+"alimentarias, puede gestionar un stock de unidades de jamón, pero facturar "
+"en Kg. Déjelo vacío para usar la UdM por defecto."
 
 #. module: product
 #: view:product.pricelist.item:0
@@ -851,7 +867,7 @@ msgstr "Categorías de producto"
 #. module: product
 #: view:product.uom:0
 msgid "  e.g: 1 * (reference unit) = ratio * (this unit)"
-msgstr ""
+msgstr "  por ej.: 1 * (unidad referencia) = ratio * (esta unidad)"
 
 #. module: product
 #: view:product.product:0
@@ -875,6 +891,8 @@ msgid ""
 "Product's cost for accounting stock valuation. It is the base price for the "
 "supplier price."
 msgstr ""
+"Coste del producto para la valoración contable de las existencias. Es el "
+"precio base para el precio del proveedor."
 
 #. module: product
 #: view:product.price.type:0
@@ -920,6 +938,9 @@ msgid ""
 "reception of the products in your warehouse. Used by the scheduler for "
 "automatic computation of the purchase order planning."
 msgstr ""
+"Plazo de entrega en días entre la confirmación del pedido de compra y la "
+"recepción de los productos en su almacén. Utilizado por el planificador para "
+"el cálculo automático de la planificación del pedido de compra."
 
 #. module: product
 #: selection:product.template,type:0
@@ -1038,6 +1059,8 @@ msgid ""
 "No active version for the selected pricelist !\n"
 "' \\n                                'Please create or activate one."
 msgstr ""
+"¡No existe versión activa para la tarifa seleccionada!\n"
+"' \\n                                'Debe crear o activar una."
 
 #. module: product
 #: view:product.product:0
@@ -1211,6 +1234,9 @@ msgid ""
 "order and the delivery of the finished products. It's the time you promise "
 "to your customers."
 msgstr ""
+"Esta es la demora media en días entre la confirmación del pedido del cliente "
+"y la entrega de los productos acabados. Es el tiempo que prometen a sus "
+"clientes."
 
 #. module: product
 #: view:product.product:0
@@ -1247,6 +1273,8 @@ msgid ""
 "This supplier's product code will be used when printing a request for "
 "quotation. Keep empty to use the internal one."
 msgstr ""
+"Este código de producto del proveedor se utiliza para imprimir una solicitud "
+"de presupuesto. Déjelo vacío para usar el código interno."
 
 #. module: product
 #: selection:product.template,procure_method:0
@@ -1322,6 +1350,10 @@ msgid ""
 "the level of this product. Different lead times will be summed for all "
 "levels and purchase orders."
 msgstr ""
+"Demora media en días para producir este producto. Esto es sólo para la orden "
+"de fabricación y, si se trata de un lista de material multi-nivel, es sólo "
+"para el nivel de este producto. Diferentes tiempos de demora se suman para "
+"todos los niveles y pedidos de compra."
 
 #. module: product
 #: help:product.product,qty_available:0
@@ -1435,6 +1467,9 @@ msgid ""
 "How many times this UoM is smaller than the reference UoM in this category:\n"
 "1 * (reference unit) = ratio * (this unit)"
 msgstr ""
+"Cuantas veces esta UdM es más pequeña que la UdM de referencia en esta "
+"categoría:\n"
+"1 * (unidad de referencia) = ratio * (esta unidad)"
 
 #. module: product
 #: help:product.template,uom_id:0
@@ -1651,6 +1686,8 @@ msgid ""
 "Default Unit of Measure used for purchase orders. It must be in the same "
 "category than the default unit of measure."
 msgstr ""
+"Unidad de medida por defecto utilizada para los pedidos de compra. Debe "
+"estar en la misma categoría que la unidad de medida por defecto."
 
 #. module: product
 #: model:product.template,description:product.product_product_cpu1_product_template
@@ -1722,6 +1759,9 @@ msgid ""
 "internal if none have been selected. Computed as: Real Stock - Outgoing + "
 "Incoming."
 msgstr ""
+"Stock futuro de este producto conforme a las ubicaciones seleccionadas o "
+"todas las internas, si ninguna de ellas ha sido seleccionada. Calculo como: "
+"Stock real - Saliente + Entrante."
 
 #. module: product
 #: field:product.pricelist,name:0
@@ -1883,6 +1923,8 @@ msgid ""
 "The computed quantity will be a multiple of this value. Use 1.0 for a UoM "
 "that cannot be further split, such as a piece."
 msgstr ""
+"La cantidad calculada será un múltiplo de este valor. Utilice 1.0 para una "
+"Unidad de Medida que no pueda dividirse aún más, como una pieza."
 
 #. module: product
 #: view:product.product:0
@@ -1898,7 +1940,7 @@ msgstr "Fila"
 #. module: product
 #: model:product.template,name:product.product_product_rearpanelarm0_product_template
 msgid "Rear Panel SHE100"
-msgstr ""
+msgstr "Panel posterior SHE100"
 
 #. module: product
 #: model:product.template,name:product.product_product_23_product_template
@@ -1922,6 +1964,9 @@ msgid ""
 "How many times this UoM is bigger than the reference UoM in this category:\n"
 "1 * (this unit) = ratio * (reference unit)"
 msgstr ""
+"Cuantas veces esta UdM es más grande que la UdM de referencia en esta "
+"categoría:\n"
+"1 * (esta unidad) = ratio * (unidad de referencia)"
 
 #. module: product
 #: model:product.template,name:product.product_product_shelf0_product_template
@@ -1950,6 +1995,8 @@ msgid ""
 "This supplier's product name will be used when printing a request for "
 "quotation. Keep empty to use the internal one."
 msgstr ""
+"Este nombre de producto del proveedor se utiliza para imprimir una solicitud "
+"de presupuesto. Déjelo vacío para usar el nombre interno."
 
 #. module: product
 #: help:product.supplierinfo,min_qty:0
@@ -2150,6 +2197,9 @@ msgid ""
 "Gives the different ways to package the same product. This has no impact on "
 "the picking order and is mainly used if you use the EDI module."
 msgstr ""
+"Indica las diferentes formas de empaquetar el mismo producto. Esto no tiene "
+"ningún impacto en la preparación de albaranes y se utiliza principalmente si "
+"utiliza el módulo EDI."
 
 #. module: product
 #: model:ir.actions.act_window,name:product.product_pricelist_action
@@ -2187,6 +2237,8 @@ msgid ""
 "Coefficient to convert UOM to UOS\n"
 " uos = uom * coeff"
 msgstr ""
+"Coeficiente para convertir UdM a UdV\n"
+" UdV = UdM * coef"
 
 #. module: product
 #: field:product.pricelist.item,price_discount:0
diff --git a/addons/product_expiry/i18n/el.po b/addons/product_expiry/i18n/el.po
index 089c7c89827..b961e325b48 100644
--- a/addons/product_expiry/i18n/el.po
+++ b/addons/product_expiry/i18n/el.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-11-11 15:54+0000\n"
+"PO-Revision-Date: 2010-11-12 08:45+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_expiry
diff --git a/addons/product_margin/i18n/el.po b/addons/product_margin/i18n/el.po
index 6cd71fee11e..7fd988aaadd 100644
--- a/addons/product_margin/i18n/el.po
+++ b/addons/product_margin/i18n/el.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-11-11 16:04+0000\n"
+"PO-Revision-Date: 2010-11-12 09:21+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/product_visible_discount/i18n/el.po b/addons/product_visible_discount/i18n/el.po
index eb3651839a7..d64f7991e09 100644
--- a/addons/product_visible_discount/i18n/el.po
+++ b/addons/product_visible_discount/i18n/el.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-11-11 16:08+0000\n"
+"PO-Revision-Date: 2010-11-12 09:32+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:49+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: product_visible_discount
diff --git a/addons/profile_tools/i18n/es.po b/addons/profile_tools/i18n/es.po
new file mode 100644
index 00000000000..cee1287fd80
--- /dev/null
+++ b/addons/profile_tools/i18n/es.po
@@ -0,0 +1,133 @@
+# Spanish 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:46+0000\n"
+"PO-Revision-Date: 2010-11-14 01:00+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: profile_tools
+#: field:misc_tools.installer,idea:0
+msgid "Ideas Box"
+msgstr "Caja de ideas"
+
+#. module: profile_tools
+#: help:misc_tools.installer,idea:0
+msgid "Promote ideas of the employees, votes and discussion on best ideas."
+msgstr ""
+"Promueve las ideas de los empleados, y la votación y el debate de las "
+"mejores ideas."
+
+#. module: profile_tools
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
+
+#. module: profile_tools
+#: field:misc_tools.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#. module: profile_tools
+#: help:misc_tools.installer,subscription:0
+msgid "Helps to generate automatically recurring documents."
+msgstr "Ayuda a generar documentos recurrentes automáticamente."
+
+#. module: profile_tools
+#: field:misc_tools.installer,lunch:0
+msgid "Lunch"
+msgstr "Comida"
+
+#. module: profile_tools
+#: model:ir.actions.act_window,name:profile_tools.action_misc_tools_installer
+msgid "Tools Configuration"
+msgstr "Configuración de herramientas"
+
+#. module: profile_tools
+#: field:misc_tools.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: profile_tools
+#: view:misc_tools.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: profile_tools
+#: field:misc_tools.installer,subscription:0
+msgid "Recurring Documents"
+msgstr "Documentos recurrentes"
+
+#. module: profile_tools
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML no válido para la estructura de la vista!"
+
+#. module: profile_tools
+#: model:ir.model,name:profile_tools.model_misc_tools_installer
+msgid "misc_tools.installer"
+msgstr "herramientas_varias.instalador"
+
+#. module: profile_tools
+#: field:misc_tools.installer,share:0
+msgid "Share Data / Portals"
+msgstr "Compartir datos / Portales"
+
+#. module: profile_tools
+#: help:misc_tools.installer,survey:0
+msgid "Allows you to organize surveys."
+msgstr "Le permite organizar encuestas"
+
+#. module: profile_tools
+#: field:misc_tools.installer,survey:0
+msgid "Survey"
+msgstr "Encuesta"
+
+#. module: profile_tools
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nombre de modelo no válido en la definición de acción."
+
+#. module: profile_tools
+#: help:misc_tools.installer,share:0
+msgid ""
+"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."
+msgstr ""
+"Este módulo permite de forma fácil dar acceso restringido de cualquier lista "
+"filtrada de objetos a cualquier cliente o proveedor. Haga clic en el icono "
+"compartir para dar acceso a sus clientes en sus tareas de proyecto, "
+"solicitudes de soporte, facturas, etc."
+
+#. module: profile_tools
+#: model:ir.module.module,shortdesc:profile_tools.module_meta_information
+msgid "Miscellaneous Tools"
+msgstr "Herramientas varias"
+
+#. module: profile_tools
+#: model:ir.module.module,description:profile_tools.module_meta_information
+msgid ""
+"Installs tools for lunch,survey,subscription and audittrail\n"
+"    module\n"
+"    "
+msgstr ""
+"Instala herramientas para comida, encuesta, suscripción y auditoría\n"
+"    módulo\n"
+"    "
diff --git a/addons/profile_tools/installer.py b/addons/profile_tools/installer.py
index fac23e8299d..6c0d03e2ddb 100644
--- a/addons/profile_tools/installer.py
+++ b/addons/profile_tools/installer.py
@@ -29,15 +29,13 @@ class misc_tools_installer(osv.osv_memory):
         'subscription':fields.boolean('Recurring Documents',help='Helps to generate automatically recurring documents.'),
         'survey':fields.boolean('Survey',help='Allows you to organize surveys.'),
         '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.'),
+        'share':fields.boolean('Web Share',help='Allows you to give restricted access to your OpenERP documents to external users, ' \
+            'such as customers, suppliers, or accountants. You can share any OpenERP Menu such as your project 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 = {
-    }
 misc_tools_installer()
 
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 3f2d9bad868..b0cfc8c716b 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -3,6 +3,9 @@
     <data noupdate="1">
 
          <!-- Users -->
+        <record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[(4,ref('group_project_user'))]"/> 
+        </record>
 
         <record id="res_users_analyst" model="res.users">
             <field name="name">Phuong</field>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index aec1296b3c4..86f79857104 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -270,14 +270,15 @@
         <field name="res_model">project.vs.hours</field>
         <field name="view_type">form</field>
         <field name="view_mode">graph,tree</field>
+        <field name="context">{'group_by':['project'],'group_by_no_leaf':1}</field>
         <field name="domain">[('uid','=',uid),('state','=','open')]</field>
         <field name="view_id" ref="view_project_vs_planned_total_hours_graph"/>
     </record>
 
 	<record id="open_view_project_vs_planned_total_hours_tree" model="ir.actions.act_window.view">
-            <field eval="1" name="sequence"/>
-            <field name="view_mode">graph</field>
-            <field name="view_id" ref="view_project_vs_planned_total_hours_graph"/>
+            <field eval="2" name="sequence"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_project_vs_planned_total_hours_tree"/>
             <field name="act_window_id" ref="action_project_vs_planned_total_hours_graph"/>
     </record>
     <record id="open_view_project_vs_planned_total_hours_graph" model="ir.actions.act_window.view">
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 8acdc210090..b51a5a9c89a 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -46,10 +46,5 @@
         <field name="domain_force">[(1,'=',1)]</field>
         <field name="groups" eval="[(4,ref('project.group_project_manager'))]"/>
     </record>
-    
-    <record id="base.user_demo" model="res.users">
-        <field name="groups_id" eval="[(4,ref('group_project_user'))]"/> 
-    </record>
-
 </data>
 </openerp>
diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml
index b236d0458ec..3b6a6bcd0a3 100644
--- a/addons/project_issue/board_project_issue_view.xml
+++ b/addons/project_issue/board_project_issue_view.xml
@@ -90,13 +90,41 @@
             action="open_board_project_issue"/>
 
     <!-- For Project Dashboard -->
+            <record model="ir.ui.view" id="project_issue_board_tree_view">
+            <field name="name">Project Issue Board Tree</field>
+            <field name="model">project.issue</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Issue Tracker Tree" colors="black:state=='open';blue:state=='pending';grey:state in ('cancel', 'done')">
+                    <field name="id"/>
+                    <field name="create_date"/>
+                    <field name="name"/>
+                    <field name="partner_id" groups="base.group_extended"/>
+                    <field name="project_id" />
+                    <field name="priority" string="Priority"/>
+                    <field name="type_id" widget="selection" readonly="1"/>
+                    <button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
+                    <button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
+                    <field name="version_id" widget="selection"/>
+                    <field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
+                    <field name="state"/>
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                    <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="gtk-jump-to"/>
+                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" help="To Do"/>
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
+                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert"/>
+                    <field name="categ_id" invisible="1"/>
+                </tree>
+            </field>
+        </record>
         <record id="action_view_my_project_issue_tree" model="ir.actions.act_window">
             <field name="name">My Project Issues</field>
             <field name="res_model">project.issue</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">['|',('assigned_to','=',uid),('user_id','=',uid)]</field>
-           <field name="view_id" ref="project_issue.project_issue_tree_view"/>
+            <field name="domain">[('state','not in',('cancel','done')),'|',('assigned_to','=',uid),('user_id','=',uid)]</field>
+           <field name="view_id" ref="project_issue_board_tree_view"/>
         </record>
          <record id="view_my_open_project_issue_graph" model="ir.ui.view">
             <field name="name">my.open.project.issue.graph</field>
diff --git a/addons/project_scrum/board_project_scrum_view.xml b/addons/project_scrum/board_project_scrum_view.xml
index 08acece9bbb..5620950fa5a 100644
--- a/addons/project_scrum/board_project_scrum_view.xml
+++ b/addons/project_scrum/board_project_scrum_view.xml
@@ -110,6 +110,7 @@
             <field name="arch" type="xml">
             	 <tree string="Scrum Sprint">
                     <field name="name"/>
+                    <field name="date_start"/>
                     <field name="progress" widget="progressbar"/>
                     <field name="effective_hours"  widget="float_time"/>
                     <field name="expected_hours"  widget="float_time"/>
diff --git a/addons/project_scrum/report/sprint_burndown.py b/addons/project_scrum/report/sprint_burndown.py
index c7388b0e790..64a6087d440 100644
--- a/addons/project_scrum/report/sprint_burndown.py
+++ b/addons/project_scrum/report/sprint_burndown.py
@@ -40,9 +40,13 @@ class report_tasks(report_int):
 
         canv = canvas.init(fname=io, format='pdf')
         canv.set_author("OpenERP")
+        canv.set_title("Burndown Chart")
         pool = pooler.get_pool(cr.dbname)
         sprint_pool = pool.get('project.scrum.sprint')
         task_pool = pool.get('project.task')
+        # For add the report header on the top of the report.
+        tb = text_box.T(loc=(320, 500), text="/hL/15/bBurndown Chart", line_style=None)
+        tb.draw()
         int_to_date = lambda x: '/a60{}' + datetime(time.localtime(x).tm_year, time.localtime(x).tm_mon, time.localtime(x).tm_mday).strftime('%d %m %Y')
         for sprint in sprint_pool.browse(cr, uid, ids, context=context):
             task_ids = task_pool.search(cr, uid, [('sprint_id','=',sprint.id)], context=context)
diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
index 475873a138e..c4f8d447a21 100644
--- a/addons/purchase/board_purchase_view.xml
+++ b/addons/purchase/board_purchase_view.xml
@@ -33,8 +33,8 @@
             <field name="arch" type="xml">
                 <tree string="Monthly Purchase by Category">
                     <field name="month"/>
-                    <field name="price_total"/>
                     <field name="category_id"/>
+                    <field name="price_total"/>
                 </tree>
             </field>
         </record>
@@ -55,6 +55,7 @@
 	        <field name="res_model">purchase.report</field>
 	        <field name="view_type">form</field>
 	        <field name="view_mode">graph,tree</field>
+		<field name="context">{'group_by':['month','category_id'],'group_by_no_leaf':1}</field>
 	        <field name="view_id" ref="view_purchase_order_monthly_categ_graph"></field>
 	    </record>
 	    <record id="open_view_purchase_order_monthly_categ_tree" model="ir.actions.act_window.view">
@@ -97,6 +98,7 @@
 	        <field name="res_model">purchase.report</field>
 	        <field name="view_type">form</field>
 	        <field name="view_mode">graph,tree</field>
+		<field name="context">{'group_by':['partner_id'],'group_by_no_leaf':1}</field>
 	        <field name="view_id" ref="view_negotiation_by_supplier_graph"/>
 	    </record>
 	    <record id="open_view_negotiation_by_supplier_tree" model="ir.actions.act_window.view">
diff --git a/addons/purchase/i18n/el.po b/addons/purchase/i18n/el.po
index ab9f2198c20..0c9d141140b 100644
--- a/addons/purchase/i18n/el.po
+++ b/addons/purchase/i18n/el.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-11-11 16:10+0000\n"
+"PO-Revision-Date: 2010-11-12 09:37+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index 60ee35b92bb..0ca1a8d6878 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -226,7 +226,7 @@
     <para style="terp_default_9">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="179.0,82.0,73.0,64.0,56.0,79.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
+    <blockTable colWidths="180.0,85.0,71.0,71.0,57.0,71.0" repeatRows="1" style="Table_Header_Pur_ord_Line">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -250,7 +250,7 @@
     </blockTable>
     <section>
       <para style="terp_default_8">[[repeatIn(o.order_line,'line')]]</para>
-      <blockTable colWidths="179.0,82.0,73.0,64.0,57.0,79.0" style="Table_Order_Pur_line_Content">
+      <blockTable colWidths="179.0,85.0,71.0,71.0,57.0,71.0" style="Table_Order_Pur_line_Content">
         <tr>
           <td>
             <para style="terp_default_9">[[ line.name ]]</para>
@@ -265,7 +265,7 @@
             <para style="terp_default_Right_9">[[ formatLang(line.product_qty ) ]] [[ line.product_uom.name ]] </para>
           </td>
           <td>
-            <para style="Standard">[[ formatLang(line.price_unit, digits=get_digits(dp='Purchase Price') ) ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(line.price_unit, digits=get_digits(dp='Purchase Price') ) ]]</para>
           </td>
           <td>
             <para style="terp_default_Right_9">[[ formatLang(line.price_subtotal, digits=get_digits(dp='Purchase Price') ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
@@ -303,7 +303,7 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="391.0,55.0,88.0" style="Table_All_Total_Detail">
+    <blockTable colWidths="394.0,55.0,85.0" style="Table_All_Total_Detail">
       <tr>
         <td>
           <para style="terp_default_9">
diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml
index f570f898f7c..8bf381b4d41 100644
--- a/addons/purchase/report/purchase_report_view.xml
+++ b/addons/purchase/report/purchase_report_view.xml
@@ -25,6 +25,7 @@
                     <field name="user_id" invisible="1"/>
                     <field name="partner_id" invisible="1"/>
                     <field name="product_id" invisible="1"/>
+                    <field name="category_id" invisible="1"/>
                     <field name="product_uom" invisible="1"/>
                     <field name="day" invisible="1"/>
                     <field name="name" invisible="1"/>
@@ -99,6 +100,7 @@
                     <filter string="Validated by" icon="terp-personal" context="{'group_by':'validator'}"/>
  					<separator orientation="vertical"/>
                     <filter string="Product" name="group_product_id" icon="terp-accessories-archiver" context="{'group_by':'product_id'}"/>
+                    <filter string="Category" name="group_category_id" icon="terp-accessories-archiver" context="{'group_by':'category_id'}"/>
                     <filter string="Product UOM" name="group_product_uom" icon="terp-accessories-archiver" context="{'group_by':'product_uom'}"/>
                     <filter string="Warehouse" icon="terp-go-home" context="{'group_by':'warehouse_id'}" groups="base.group_extended"/>
                     <filter string="Destination" icon="terp-gtk-jump-to-ltr" context="{'group_by':'location_id'}"/>
diff --git a/addons/report_designer/i18n/es.po b/addons/report_designer/i18n/es.po
new file mode 100644
index 00000000000..05b12ca2838
--- /dev/null
+++ b/addons/report_designer/i18n/es.po
@@ -0,0 +1,95 @@
+# Spanish 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:46+0000\n"
+"PO-Revision-Date: 2010-11-13 16:27+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: report_designer
+#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
+msgid "Reporting Tools Configuration"
+msgstr "Configuración herramientas de informes"
+
+#. module: report_designer
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML no válido para la estructura de la vista!"
+
+#. module: report_designer
+#: field:report_designer.installer,base_report_creator:0
+msgid "Query Builder"
+msgstr "Constructor de consultas"
+
+#. module: report_designer
+#: field:report_designer.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso configuración"
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "title"
+msgstr "título"
+
+#. module: report_designer
+#: model:ir.model,name:report_designer.model_report_designer_installer
+msgid "report_designer.installer"
+msgstr "diseñador_informes.instalador"
+
+#. module: report_designer
+#: field:report_designer.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: report_designer
+#: field:report_designer.installer,base_report_designer:0
+msgid "OpenOffice Report Designer"
+msgstr "Diseñador informes OpenOffice"
+
+#. module: report_designer
+#: model:ir.module.module,shortdesc:report_designer.module_meta_information
+msgid "Reporting Tools"
+msgstr "Herramientas de informes"
+
+#. module: report_designer
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nombre de modelo no válido en la definición de acción."
+
+#. module: report_designer
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
+
+#. module: report_designer
+#: model:ir.module.module,description:report_designer.module_meta_information
+msgid ""
+"Installer for reporting tools selection\n"
+"    "
+msgstr ""
+"Instalador de varias herramientas de informes\n"
+"    "
+
+#. module: report_designer
+#: help:report_designer.installer,base_report_creator:0
+msgid ""
+"Allows you to create any statistic reports  on several objects. It's a SQL "
+"query builder and browser for end users."
+msgstr ""
+"Permite crear cualquier informe estadístico sobre varios objetos. Es un "
+"generador de consultas SQL y un visualizador para los usuarios finales."
diff --git a/addons/report_designer/i18n/it.po b/addons/report_designer/i18n/it.po
new file mode 100644
index 00000000000..717e88edb16
--- /dev/null
+++ b/addons/report_designer/i18n/it.po
@@ -0,0 +1,92 @@
+# Italian 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:46+0000\n"
+"PO-Revision-Date: 2010-11-13 10:40+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"Language-Team: Italian <it@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: report_designer
+#: model:ir.actions.act_window,name:report_designer.action_report_designer_installer
+msgid "Reporting Tools Configuration"
+msgstr ""
+
+#. module: report_designer
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valido per la struttura della vista!"
+
+#. module: report_designer
+#: field:report_designer.installer,base_report_creator:0
+msgid "Query Builder"
+msgstr "Costruttore di Query"
+
+#. module: report_designer
+#: field:report_designer.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: report_designer
+#: view:report_designer.installer:0
+msgid "title"
+msgstr "titolo"
+
+#. module: report_designer
+#: model:ir.model,name:report_designer.model_report_designer_installer
+msgid "report_designer.installer"
+msgstr "report_designer.installer"
+
+#. module: report_designer
+#: field:report_designer.installer,config_logo:0
+msgid "Image"
+msgstr "Immagine"
+
+#. module: report_designer
+#: field:report_designer.installer,base_report_designer:0
+msgid "OpenOffice Report Designer"
+msgstr "Report Designer di OpenOffice"
+
+#. module: report_designer
+#: model:ir.module.module,shortdesc:report_designer.module_meta_information
+msgid "Reporting Tools"
+msgstr ""
+
+#. module: report_designer
+#: 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: report_designer
+#: 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 per “x_” e non contenere alcun carattere "
+"speciale!"
+
+#. module: report_designer
+#: model:ir.module.module,description:report_designer.module_meta_information
+msgid ""
+"Installer for reporting tools selection\n"
+"    "
+msgstr ""
+
+#. module: report_designer
+#: help:report_designer.installer,base_report_creator:0
+msgid ""
+"Allows you to create any statistic reports  on several objects. It's a SQL "
+"query builder and browser for end users."
+msgstr ""
+"Permette di creare qualsiasi statistica su parecchi oggetti. E' un "
+"costruttore di Query ed un browser per utenti filnali."
diff --git a/addons/report_intrastat/i18n/es.po b/addons/report_intrastat/i18n/es.po
index 954c7ffef51..0230ad46df5 100644
--- a/addons/report_intrastat/i18n/es.po
+++ b/addons/report_intrastat/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-10-30 09:35+0000\n"
-"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
+"PO-Revision-Date: 2010-11-14 00:51+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-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-31 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: report_intrastat
@@ -57,7 +58,7 @@ msgstr "Precio unidad"
 #. module: report_intrastat
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "¡Error! No puede crear menús recursivos."
 
 #. module: report_intrastat
 #: selection:report.intrastat,type:0
@@ -87,17 +88,17 @@ msgstr "Impuestos:"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: report_intrastat
 #: field:report.intrastat,type:0
@@ -137,12 +138,12 @@ msgstr "Base"
 #. module: report_intrastat
 #: view:report.intrastat:0
 msgid "This Year"
-msgstr ""
+msgstr "Este año"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -152,7 +153,7 @@ msgstr "Impuesto"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat_code
@@ -180,12 +181,12 @@ msgstr "Total (con impuestos):"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_report_intrastat
@@ -200,12 +201,12 @@ msgstr "Factura"
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_res_country
 msgid "Country"
-msgstr ""
+msgstr "País"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "September"
-msgstr ""
+msgstr "Septiembre"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -215,7 +216,7 @@ msgstr "Impuestos"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -252,7 +253,7 @@ msgstr "Unidades suministradas"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -268,7 +269,7 @@ msgstr "Factura de abono"
 #. module: report_intrastat
 #: field:report.intrastat,ref:0
 msgid "Source document"
-msgstr ""
+msgstr "Documento origen"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
@@ -279,7 +280,7 @@ msgstr "Peso"
 #. module: report_intrastat
 #: model:ir.model,name:report_intrastat.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Plantilla producto"
 
 #. module: report_intrastat
 #: field:res.country,intrastat:0
@@ -289,12 +290,12 @@ msgstr "Miembro Intrastat"
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: report_intrastat
 #: selection:report.intrastat,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: report_intrastat
 #: field:report.intrastat,code:0
@@ -324,7 +325,7 @@ msgstr "Fax :"
 #. module: report_intrastat
 #: field:report.intrastat,name:0
 msgid "Year"
-msgstr ""
+msgstr "Año"
 
 #. module: report_intrastat
 #: report:account.invoice.intrastat:0
diff --git a/addons/report_webkit_sample/i18n/fr.po b/addons/report_webkit_sample/i18n/fr.po
new file mode 100644
index 00000000000..114bf046a55
--- /dev/null
+++ b/addons/report_webkit_sample/i18n/fr.po
@@ -0,0 +1,259 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#   * report_webkit_sample
+#
+msgid ""
+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-11-12 12:55+0000\n"
+"Last-Translator: Nicolas Bessi - Camptocamp <Unknown>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:57+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: report_webkit_sample
+#: model:ir.actions.report.xml,name:report_webkit_sample.report_webkit_html
+msgid "WebKit invoice"
+msgstr "facture WebKit"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+msgid "Supplier Invoice"
+msgstr ""
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+msgid "Unit Price"
+msgstr "Prix unitaire"
+
+#. module: report_webkit_sample
+#: model:ir.module.module,description:report_webkit_sample.module_meta_information
+msgid ""
+"Samples for Webkit Report Engine (report_webkit module).\n"
+"\n"
+"    A sample invoice report is included in this module, as well as a wizard "
+"to\n"
+"    add Webkit Report entries on any Document in the system.\n"
+"      \n"
+"    You have to create the print buttons by calling the wizard. For more "
+"details see:\n"
+"        http://files.me.com/nbessi/06n92k.mov \n"
+"                    "
+msgstr ""
+
+#. module: report_webkit_sample
+#: model:ir.module.module,shortdesc:report_webkit_sample.module_meta_information
+msgid "Webkit Report Samples"
+msgstr ""
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+msgid "Disc.(%)"
+msgstr "Disc.(%)"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+msgid "Fax"
+msgstr ""
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+msgid "Document"
+msgstr "Ref. document"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+msgid "Description"
+msgstr "Description"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+msgid "Price"
+msgstr "Prix"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+msgid "Invoice Date"
+msgstr "Date de la facture"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+msgid "QTY"
+msgstr "QTÉ"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+msgid "Base"
+msgstr ""
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+msgid "Partner Ref."
+msgstr "Réf. partenaire"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+msgid "Taxes"
+msgstr "Impôts"
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+msgid "VAT"
+msgstr ""
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+msgid "Refund"
+msgstr ""
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+msgid "Tel"
+msgstr ""
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+msgid "E-mail"
+msgstr ""
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+msgid "Invoice"
+msgstr ""
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+msgid "Supplier Refund"
+msgstr ""
+
+#. module: report_webkit_sample
+#: report:addons/report_webkit_sample/report/report_webkit_html.mako:0
+msgid "Total"
+msgstr "Total"
+
+#~ msgid "Report Action already exist for this report."
+#~ msgstr "Report Action already exist for this report."
+
+#~ msgid "Add print button"
+#~ msgstr "Add print button"
+
+#~ msgid "Add Print Buttons"
+#~ msgstr "Ajouter des boutons d'impression"
+
+#~ msgid "Client Actions Connections"
+#~ msgstr "Actions Client Connections"
+
+#~ msgid ""
+#~ "Report system base on WebKit engine (wkhtmltopd lib) that allows to do "
+#~ "HTML2PDF reporting.\n"
+#~ "The module structure and some is inspired of the report_openoffice module\n"
+#~ "The module allows:\n"
+#~ "    -HTML report definition\n"
+#~ "    -Multi header support \n"
+#~ "    -Multi logo\n"
+#~ "    -Multi company support\n"
+#~ "    -HTML and CSS-3 support (In the limit of the actual WebKIT version)\n"
+#~ "    -JavaScript support \n"
+#~ "    -Raw HTML debugger\n"
+#~ "    -Book printing capabilities\n"
+#~ "    -Margins definition \n"
+#~ "    -Paper size definition\n"
+#~ "and munch more\n"
+#~ "\n"
+#~ "Many header are defined per company\n"
+#~ "Many logo are defined per company\n"
+#~ "CSS style, header and footer body are defined in the company\n"
+#~ "\n"
+#~ "The mapper library can be found here\n"
+#~ "http://code.google.com/p/wkhtmltopdf/\n"
+#~ "The libraries are included for Linux, Mac OS X i386 and Windows 32.\n"
+#~ "\n"
+#~ "A sample invoice report is defined in the report. \n"
+#~ "You have to create the print button by calling a wizard. For more details :\n"
+#~ "    http://files.me.com/nbessi/06n92k.mov \n"
+#~ "\n"
+#~ "TODO :\n"
+#~ "JavaScript support activation deactivation\n"
+#~ "Collated and book format support\n"
+#~ "Zip return for separated PDF\n"
+#~ "Web client WYSIWYG\n"
+#~ "                    "
+#~ msgstr ""
+#~ "Report system base on WebKit engine (wkhtmltopd lib) that allows to do "
+#~ "HTML2PDF reporting.\n"
+#~ "The module structure and some is inspired of the report_openoffice module\n"
+#~ "The module allows:\n"
+#~ "    -HTML report definition\n"
+#~ "    -Multi header support \n"
+#~ "    -Multi logo\n"
+#~ "    -Multi company support\n"
+#~ "    -HTML and CSS-3 support (In the limit of the actual WebKIT version)\n"
+#~ "    -JavaScript support \n"
+#~ "    -Raw HTML debugger\n"
+#~ "    -Book printing capabilities\n"
+#~ "    -Margins definition \n"
+#~ "    -Paper size definition\n"
+#~ "and munch more\n"
+#~ "\n"
+#~ "Many header are defined per company\n"
+#~ "Many logo are defined per company\n"
+#~ "CSS style, header and footer body are defined in the company\n"
+#~ "\n"
+#~ "The mapper library can be found here\n"
+#~ "http://code.google.com/p/wkhtmltopdf/\n"
+#~ "The libraries are included for Linux, Mac OS X i386 and Windows 32.\n"
+#~ "\n"
+#~ "A sample invoice report is defined in the report. \n"
+#~ "You have to create the print button by calling a wizard. For more details :\n"
+#~ "    http://files.me.com/nbessi/06n92k.mov \n"
+#~ "\n"
+#~ "TODO :\n"
+#~ "JavaScript support activation deactivation\n"
+#~ "Collated and book format support\n"
+#~ "Zip return for separated PDF\n"
+#~ "Web client WYSIWYG\n"
+#~ "                    "
+
+#~ msgid "Add action to menu context in print button."
+#~ msgstr "Ajouter à l'action du menu contextuel dans le bouton d'impression."
+
+#~ msgid "_Cancel"
+#~ msgstr "_Cancel"
+
+#~ msgid "webkit report"
+#~ msgstr "rapport webkit"
+
+#~ msgid "Open added action"
+#~ msgstr "Ouvrir ajouté action"
+
+#~ msgid "_Ok"
+#~ msgstr "_Ok"
+
+#~ msgid "_Close"
+#~ msgstr "_Close"
+
+#~ msgid "Unit of Measure"
+#~ msgstr "Unité de mesure"
+
+#~ msgid "Tax Lines"
+#~ msgstr "Lignes de taxe"
+
+#~ msgid "Amount"
+#~ msgstr "Montant"
+
+#~ msgid "Invoice Ref"
+#~ msgstr "Réf. Facture"
+
+#~ msgid "Invoice Line"
+#~ msgstr "Ligne de facture"
+
+#~ msgid "Product"
+#~ msgstr "Produit"
+
+#~ msgid "Tax"
+#~ msgstr "Taxe"
diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
index e521fde2008..1473bf42f31 100644
--- a/addons/sale/board_sale_view.xml
+++ b/addons/sale/board_sale_view.xml
@@ -33,10 +33,9 @@
             <field name="view_mode">form</field>
             <field name="view_id" ref="board_sales_manager_form"/>
         </record>
+
         <menuitem id="board.menu_dasboard" name="Dashboard" sequence="0" parent="base.next_id_64"/>
         <menuitem action="open_board_sales_manager" icon="terp-graph" id="menu_board_sales_manager" parent="board.menu_dasboard" sequence="0" groups="base.group_sale_manager"/>
-
         <menuitem icon="terp-partner" id="base.menu_base_partner" name="Sales" sequence="0" action="open_board_sales_manager"/>
-
     </data>
 </openerp>
diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po
index 88ae200a5da..71976fb3def 100644
--- a/addons/sale/i18n/es.po
+++ b/addons/sale/i18n/es.po
@@ -7,14 +7,14 @@ 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-30 10:03+0000\n"
+"PO-Revision-Date: 2010-11-14 00:40+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-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-31 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -25,7 +25,7 @@ msgstr "Nombre de modelo no válido en la definición de acción."
 #. module: sale
 #: help:sale.installer,delivery:0
 msgid "Allows you to compute delivery costs on your quotations."
-msgstr ""
+msgstr "Le permite calcular los costos de envío en sus presupuestos."
 
 #. module: sale
 #: help:sale.order,picking_policy:0
@@ -44,12 +44,15 @@ msgid ""
 "But it's not compatible with the selected packaging.\n"
 "Here is a proposition of quantities according to the packaging: "
 msgstr ""
+"Ha seleccionado una cantidad de %d unidades.\n"
+"Pero no es compatible con el envase seleccionado.\n"
+"Aquí hay una propuesta de las cantidades de acuerdo con el envase: "
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Día"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
@@ -61,7 +64,7 @@ msgstr "Cancelar pedido"
 #: model:ir.actions.act_window,name:sale.action_sales_by_partner
 #: view:sale.report:0
 msgid "Sales By Partner"
-msgstr ""
+msgstr "Ventas por empresa"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -72,12 +75,13 @@ msgstr "Pago antes del envío"
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sale order request."
 msgstr ""
+"Referencia del documento que generó esta petición de pedido de venta."
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "¡Aviso!"
 
 #. module: sale
 #: report:sale.order:0
@@ -89,6 +93,8 @@ msgstr "IVA"
 #, python-format
 msgid "You must first cancel stock moves attached to this sale order line."
 msgstr ""
+"Debe primero cancelar los movimientos de stock adjuntos a esta línea de "
+"pedido de venta."
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
@@ -106,13 +112,13 @@ msgstr "Cuenta analítica"
 #. module: sale
 #: model:process.node,name:sale.process_node_saleprocurement0
 msgid "Procurement Order"
-msgstr ""
+msgstr "Orden de abastecimiento"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Empresa"
 
 #. module: sale
 #: view:sale.order:0
@@ -123,7 +129,7 @@ msgstr "Línea del pedido"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Cannot delete a sale order line which is %s !"
-msgstr ""
+msgstr "¡No se puede eliminar una línea de pedido de venta que está %s!"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -134,6 +140,11 @@ msgid ""
 "the product is a service, shipped quantities means hours spent on the "
 "associated tasks."
 msgstr ""
+"El pedido de venta creará automáticamente la proposición de la factura "
+"(factura borrador). Las cantidades pedidas y entregadas pueden no ser las "
+"mismas. Debe elegir si desea que su factura se base en las cantidades "
+"pedidas o entregadas. Si el producto es un servicio, las cantidades enviadas "
+"son las horas dedicadas a las tareas asociadas."
 
 #. module: sale
 #: view:sale.report:0
@@ -149,7 +160,7 @@ msgstr "Plazo de pago por defecto"
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
 msgid "Configure Picking Policy for Sales Order"
-msgstr ""
+msgstr "Configurar la política envío para pedidos de venta"
 
 #. module: sale
 #: view:sale.order:0
@@ -157,7 +168,7 @@ msgstr ""
 #: field:sale.order.line,state:0
 #: view:sale.report:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: sale
 #: report:sale.order:0
@@ -173,7 +184,7 @@ msgstr "Precio total"
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
-msgstr ""
+msgstr "Marque esta opción para agrupar las facturas de los mismos clientes."
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -194,17 +205,17 @@ msgstr "Referencia del pedido"
 #. module: sale
 #: view:sale.order:0
 msgid "Other Information"
-msgstr ""
+msgstr "Otra Información"
 
 #. module: sale
 #: help:sale.order,create_date:0
 msgid "Date on which sale order is created"
-msgstr ""
+msgstr "Fecha en que el pedido de venta es creado."
 
 #. module: sale
 #: view:sale.order:0
 msgid "Dates"
-msgstr ""
+msgstr "Fechas"
 
 #. module: sale
 #: constraint:product.template:0
@@ -217,11 +228,13 @@ msgid ""
 "The invoice is created automatically if the shipping policy is 'Invoice from "
 "pick' or 'Invoice on order after delivery'."
 msgstr ""
+"La factura se crea de forma automática si la política de facturación es "
+"\"Facturar desde el albarán\" o \"Facturar pedido después del envío\"."
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
 msgid "From a sale order"
-msgstr ""
+msgstr "Desde un pedido de venta"
 
 #. module: sale
 #: field:sale.order.line,discount:0
@@ -233,7 +246,7 @@ msgstr "Descuento (%)"
 #: model:ir.actions.act_window,name:sale.open_board_sales_manager
 #: model:ir.ui.menu,name:sale.menu_board_sales_manager
 msgid "Sales Manager Dashboard"
-msgstr ""
+msgstr "Tablero responsable ventas"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -275,7 +288,7 @@ msgstr "Abastecimiento corregido"
 #. module: sale
 #: view:sale.order:0
 msgid "Conditions"
-msgstr ""
+msgstr "Condiciones"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -284,17 +297,20 @@ msgid ""
 "There is no income category account defined in default Properties for "
 "Product Category or Fiscal Position is not defined !"
 msgstr ""
+"¡No hay ninguna cuenta de categoría de ingresos definida en las propiedades "
+"por defecto de la categoría del producto o la posición fiscal no está "
+"definida!"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "EAN: "
-msgstr ""
+msgstr "EAN: "
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree5
@@ -309,17 +325,17 @@ msgstr "Nuestro comercial"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
 msgid "Sales Orders Statistics"
-msgstr ""
+msgstr "Estadísticas pedidos de venta"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: sale
 #: view:board.board:0
@@ -327,7 +343,7 @@ msgstr ""
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Quotations"
-msgstr ""
+msgstr "Presupuestos"
 
 #. module: sale
 #: field:sale.advance.payment.inv,qtty:0
@@ -348,12 +364,12 @@ msgstr "IVA :"
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation Date"
-msgstr ""
+msgstr "Fecha presupuesto"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_open_invoice
 msgid "Sale Open Invoice"
-msgstr ""
+msgstr "Venta abrir factura"
 
 #. module: sale
 #: field:sale.order,fiscal_position:0
@@ -405,6 +421,9 @@ msgid ""
 "Select a product of type service which is called 'Advance Product'. You may "
 "have to create it and set it as a default value on this field."
 msgstr ""
+"Seleccione un producto del tipo de servicio que se llama 'Producto "
+"avanzado'. Puede que tenga que crearlo y configurarlo como un valor por "
+"defecto para este campo."
 
 #. module: sale
 #: report:sale.order:0
@@ -429,7 +448,7 @@ msgstr "Notas"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The quotation '%s' has been converted to a sale order."
-msgstr ""
+msgstr "El presupuesto '%s' ha sido convertido a un pedido de venta."
 
 #. module: sale
 #: field:product.product,pricelist_purchase:0
@@ -442,6 +461,8 @@ msgid ""
 "Number of days between the order confirmation the the shipping of the "
 "products to the customer"
 msgstr ""
+"Número de días entre la confirmación del pedido y el envío de los de los "
+"productos al cliente."
 
 #. module: sale
 #: view:sale.order:0
@@ -451,7 +472,7 @@ msgstr "Factura corregida"
 #. module: sale
 #: help:sale.order,amount_total:0
 msgid "The total amount"
-msgstr ""
+msgstr "El importe total."
 
 #. module: sale
 #: constraint:product.product:0
@@ -461,7 +482,7 @@ msgstr "Error: Código EAN erróneo"
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
 msgid "Invoice address for current sale order"
-msgstr ""
+msgstr "Dirección de factura para el pedido de venta actual."
 
 #. module: sale
 #: field:sale.order,amount_untaxed:0
@@ -471,12 +492,12 @@ msgstr "Base imponible"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_advance_payment_inv
 msgid "Sale Advance Payment Invoice"
-msgstr ""
+msgstr "Venta pago anticipado factura"
 
 #. module: sale
 #: help:sale.order,project_id:0
 msgid "The analytic account related to a sale order"
-msgstr ""
+msgstr "La cuenta analítica relacionada con un pedido de venta."
 
 #. module: sale
 #: model:process.node,name:sale.process_node_deliveryorder0
@@ -486,7 +507,7 @@ msgstr "Orden de entrega"
 #. module: sale
 #: field:sale.order,date_confirm:0
 msgid "Confirmation Date"
-msgstr ""
+msgstr "Fecha confirmación"
 
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
@@ -496,7 +517,7 @@ msgstr "Ubicación empresa"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -505,6 +526,8 @@ msgid ""
 "There is no income account defined ' \\n                                     "
 "   'for this product: \"%s\" (id:%d)"
 msgstr ""
+"No se ha definido una cuenta de ingresos ' \\n                               "
+"         'para este producto: \"%s\" (id:%d)"
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
@@ -531,7 +554,7 @@ msgstr "Dirección factura"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Search Uninvoiced Lines"
-msgstr ""
+msgstr "Buscar líneas no facturadas"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleprocurement0
@@ -539,6 +562,8 @@ msgid ""
 "One Procurement order for each sale order line and for each of the "
 "components."
 msgstr ""
+"Una orden de abastecimiento por cada línea del pedido de venta y por cada "
+"uno de los componentes."
 
 #. module: sale
 #: model:ir.actions.report.xml,name:sale.report_sale_order
@@ -554,7 +579,7 @@ msgstr "# de líneas"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_make_invoice
 msgid "Sale Make Invoice"
-msgstr ""
+msgstr "Venta realizar factura"
 
 #. module: sale
 #: field:sale.shop,warehouse_id:0
@@ -580,7 +605,7 @@ msgstr "Base imponible"
 #: model:ir.actions.act_window,name:sale.action_order_line_tree2
 #: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
 msgid "Lines to Invoice"
-msgstr ""
+msgstr "Líneas a facturar"
 
 #. module: sale
 #: field:sale.order.line,product_uom_qty:0
@@ -592,6 +617,8 @@ msgstr "Cantidad (UdM)"
 msgid ""
 "Provides some features to improve the layout of the Sales Order reports."
 msgstr ""
+"Proporciona algunas funcionalidades para mejorar la plantilla de los "
+"informes de pedidos de ventas."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_tree3
@@ -606,7 +633,7 @@ msgstr "Total :"
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
-msgstr ""
+msgstr "Mis ventas"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -628,6 +655,18 @@ msgid ""
 "  - The 'Invoice from the picking' choice is used to create an invoice "
 "during the picking process."
 msgstr ""
+"La política de envío se utiliza para sincronizar la factura y las "
+"operaciones de envío.\n"
+"  - La opción 'Pago antes del envío' primero genera la factura y luego "
+"genera el albarán después del pago de esta factura.\n"
+"  - La opción 'Envío '& Factura manual' creará el albarán directamente y "
+"esperará a que el usuario haga clic manualmente en el botón 'Factura' para "
+"generar la factura borrador.\n"
+"  - La opción 'Factura según pedido después envío' generará la factura "
+"borrador basada en el pedido de venta después de que todos los albaranes se "
+"hayan procesado.\n"
+"  - La opción 'Factura desde albarán' se utiliza para crear una factura "
+"durante el proceso de los albaranes."
 
 #. module: sale
 #: field:sale.order,pricelist_id:0
@@ -640,12 +679,12 @@ msgstr "Tarifa"
 #: view:sale.report:0
 #: field:sale.report,product_uom_qty:0
 msgid "# of Qty"
-msgstr ""
+msgstr "Nº de ctdad"
 
 #. module: sale
 #: help:sale.order,invoiced:0
 msgid "It indicates that an invoice has been paid"
-msgstr ""
+msgstr "Indica que una factura ha sido pagada."
 
 #. module: sale
 #: constraint:ir.ui.view:0
@@ -655,13 +694,13 @@ msgstr "¡XML inválido para la definición de la vista!"
 #. module: sale
 #: view:sale.order:0
 msgid "Order Date"
-msgstr ""
+msgstr "Fecha pedido"
 
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.report,shipped:0
 msgid "Shipped"
-msgstr ""
+msgstr "Enviado"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -672,18 +711,18 @@ msgstr "Modo no válido para test_state"
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount"
-msgstr ""
+msgstr "El importe de los impuestos."
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Septiembre"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,categ_id:0
 msgid "Category of Product"
-msgstr ""
+msgstr "Categoría de producto"
 
 #. module: sale
 #: report:sale.order:0
@@ -698,7 +737,7 @@ msgstr "Movimientos de stock"
 #. module: sale
 #: view:sale.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Año  "
 
 #. module: sale
 #: field:sale.order,state:0
@@ -710,24 +749,24 @@ msgstr "Estado del pedido"
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "Do you really want to create the invoice(s) ?"
-msgstr ""
+msgstr "¿Desea crear la(s) factura(s)?"
 
 #. module: sale
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_view_sales_by_month
 #: view:sale.report:0
 msgid "Sales By Month"
-msgstr ""
+msgstr "Ventas por mes"
 
 #. module: sale
 #: field:res.company,security_lead:0
 msgid "Security Days"
-msgstr ""
+msgstr "Días seguridad"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleorderprocurement0
 msgid "Procurement of sold material"
-msgstr ""
+msgstr "Abastecimiento de material vendido"
 
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
@@ -737,7 +776,7 @@ msgstr "Dirección de envío"
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtros extendidos..."
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -747,17 +786,17 @@ msgstr "Excepción"
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Fecha creación"
 
 #. module: sale
 #: model:ir.model,name:sale.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Compañías"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Noviembre"
 
 #. module: sale
 #: view:sale.order:0
@@ -772,6 +811,10 @@ msgid ""
 "the sale order. There is 1 pick list by sale order line which evolves with "
 "the availability of parts."
 msgstr ""
+"El albarán se crea tan pronto como el pedido de venta se confirma, en el "
+"mismo momento que la orden de abastecimiento. Representa la asignación de "
+"los artículos al pedido de venta. Hay un albarán por línea de pedido de "
+"venta, que evoluciona con la disponibilidad de los artículos."
 
 #. module: sale
 #: report:sale.order:0
@@ -783,12 +826,16 @@ msgstr "Su referencia"
 msgid ""
 "The name and address of the contact who requested the order or quotation."
 msgstr ""
+"El nombre y la dirección del contacto que ha solicitado el pedido o "
+"presupuesto."
 
 #. module: sale
 #: help:res.company,security_lead:0
 msgid ""
 "This is the days added to what you promise to customers for security purpose"
 msgstr ""
+"Estos días por razones de seguridad se añaden a los que promete a los "
+"clientes."
 
 #. module: sale
 #: view:sale.order:0
@@ -799,7 +846,7 @@ msgstr "Ctdad"
 #. module: sale
 #: view:sale.order:0
 msgid "References"
-msgstr ""
+msgstr "Referencias"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -815,12 +862,12 @@ msgstr "Cancelar"
 #. module: sale
 #: help:sale.order,pricelist_id:0
 msgid "Pricelist version for current sale order"
-msgstr ""
+msgstr "Versión de la tarifa para el pedido de venta actual."
 
 #. module: sale
 #: field:sale.installer,sale_order_dates:0
 msgid "Sales Order Dates"
-msgstr ""
+msgstr "Fechas en pedidos de venta"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
@@ -841,12 +888,12 @@ msgstr "Crear factura"
 #. module: sale
 #: field:sale.installer,sale_margin:0
 msgid "Margins in Sales Orders"
-msgstr ""
+msgstr "Márgenes en pedidos de venta"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Excluded"
-msgstr ""
+msgstr "Total sin impuestos"
 
 #. module: sale
 #: view:sale.order:0
@@ -859,6 +906,8 @@ msgid ""
 "Incoterm which stands for 'International Commercial terms' implies its a "
 "series of sales terms which are used in the commercial transaction"
 msgstr ""
+"Incoterm que significa 'Términos de Comercio Internacional \"implica una "
+"serie de términos de venta que se utilizan en la transacción comercial."
 
 #. module: sale
 #: field:sale.order,partner_order_id:0
@@ -869,7 +918,7 @@ msgstr "Contacto que realiza el pedido"
 #: model:ir.actions.act_window,name:sale.action_view_sale_open_invoice
 #: view:sale.open.invoice:0
 msgid "Open Invoice"
-msgstr ""
+msgstr "Abrir factura"
 
 #. module: sale
 #: report:sale.order:0
@@ -880,7 +929,7 @@ msgstr "Precio"
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_installer
 msgid "Sales Application Configuration"
-msgstr ""
+msgstr "Configuración aplicaciones de ventas"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_forceassignation0
@@ -895,12 +944,12 @@ msgstr "bajo pedido"
 #. module: sale
 #: model:process.node,note:sale.process_node_invoiceafterdelivery0
 msgid "Based on the shipped or on the ordered quantities."
-msgstr ""
+msgstr "Basado en las cantidades enviadas o ordenadas."
 
 #. module: sale
 #: field:sale.order,picking_ids:0
 msgid "Related Picking"
-msgstr ""
+msgstr "Albarán relacionado"
 
 #. module: sale
 #: field:sale.config.picking_policy,name:0
@@ -915,12 +964,12 @@ msgstr "Dirección de envío :"
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorder0
 msgid "Drives procurement and invoicing"
-msgstr ""
+msgstr "Genera abastecimiento y facturación"
 
 #. module: sale
 #: field:sale.order.line,sequence:0
 msgid "Sequence Number"
-msgstr ""
+msgstr "Número secuencia"
 
 #. module: sale
 #: field:product.product,pricelist_sale:0
@@ -930,7 +979,7 @@ msgstr "Tarifas de venta"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_deliver0
 msgid "Create Delivery Order"
-msgstr ""
+msgstr "Crear orden de entrega"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -939,33 +988,35 @@ msgid ""
 "You plan to sell %.2f %s but you only have %.2f %s available !\n"
 "The real stock is %.2f %s. (without reservations)"
 msgstr ""
+"¡Prevé vender %.2f %s pero sólo %.2f %s están disponibles!\n"
+"El stock real es %.2f %s. (sin reservas)"
 
 #. module: sale
 #: field:sale.installer,delivery:0
 msgid "Delivery Costs"
-msgstr ""
+msgstr "Costes de envío"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The sale order '%s' has been set in draft state."
-msgstr ""
+msgstr "El pedido de venta '%s' ha sido cambiado a estado borrador."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The sale order '%s' has been cancelled."
-msgstr ""
+msgstr "El pedido de venta '%s' ha sido cacelado."
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_packing0
 msgid "Create Pick List"
-msgstr ""
+msgstr "Crear albarán"
 
 #. module: sale
 #: view:sale.report:0
 msgid "Sales by Product Category"
-msgstr ""
+msgstr "Ventas por categoría de producto"
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
@@ -987,7 +1038,7 @@ msgstr "Confirmar presupuesto"
 #: view:sale.order.line:0
 #: view:sale.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: sale
 #: view:sale.order:0
@@ -998,7 +1049,7 @@ msgstr "Volver a Crear factura"
 #: model:ir.actions.act_window,name:sale.outgoing_picking_list_to_invoice
 #: model:ir.ui.menu,name:sale.menu_action_picking_list_to_invoice
 msgid "Deliveries to Invoice"
-msgstr ""
+msgstr "Albaranes a facturar"
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1009,28 +1060,28 @@ msgstr "Esperando fecha planificada"
 #. module: sale
 #: field:sale.order.line,type:0
 msgid "Procurement Method"
-msgstr ""
+msgstr "Método abastecimiento"
 
 #. module: sale
 #: view:sale.config.picking_policy:0
 #: view:sale.installer:0
 msgid "title"
-msgstr ""
+msgstr "título"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_packinglist0
 msgid "Pick List"
-msgstr ""
+msgstr "Albarán"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
 msgid "Invoice from Delivery"
-msgstr ""
+msgstr "Facturar desde albarán"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Order date"
-msgstr ""
+msgstr "Fecha pedido"
 
 #. module: sale
 #: help:sale.order,picking_ids:0
@@ -1041,7 +1092,7 @@ msgstr "Ésta es la lista de albaranes que se han generado para esta factura"
 #. module: sale
 #: model:process.node,note:sale.process_node_packinglist0
 msgid "Document of the move to the output or to the customer."
-msgstr ""
+msgstr "Documento del movimiento a la salida o al cliente."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_validate0
@@ -1056,7 +1107,7 @@ msgstr "Confirmar pedido"
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleprocurement0
 msgid "Create Procurement Order"
-msgstr ""
+msgstr "Crear orden abastecimiento"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order
@@ -1081,6 +1132,9 @@ msgid ""
 "salesman. Depending on the Invoicing control of the sale order, the invoice "
 "is based on delivered or on ordered quantities."
 msgstr ""
+"Un pedido de venta genera una factura, tan pronto como se confirma por el "
+"comercial. En función del control de facturación del pedido de venta, la "
+"factura se basa en las cantidades enviadas o en las ordenadas."
 
 #. module: sale
 #: field:sale.order,order_policy:0
@@ -1090,13 +1144,13 @@ msgstr "Política de facturación"
 #. module: sale
 #: model:ir.model,name:sale.model_stock_move
 msgid "Stock Move"
-msgstr ""
+msgstr "Movimiento stock"
 
 #. module: sale
 #: view:sale.make.invoice:0
 #: view:sale.order.line.make.invoice:0
 msgid "Create Invoices"
-msgstr ""
+msgstr "Crear facturas"
 
 #. module: sale
 #: help:sale.order,state:0
@@ -1108,6 +1162,13 @@ msgid ""
 "The 'Waiting Schedule' state is set when the invoice is confirmed but "
 "waiting for the scheduler to run on the date 'Ordered Date'."
 msgstr ""
+"Indica el estado del presupuesto o pedido de venta. \n"
+"El estado de excepción se establece automáticamente cuando se produce una "
+"cancelación en la validación de la factura (Excepción de factura) o en el "
+"procesado del albarán (Excepción de envío). \n"
+"El estado 'Esperando planificación' se establece cuando se confirma la "
+"factura pero se espera a que el planificador procese el pedido en la fecha "
+"'Fecha del pedido'."
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -1122,6 +1183,16 @@ msgid ""
 "           \n"
 "* The 'Cancelled' state is set when a user cancel the sale order related."
 msgstr ""
+"* El estado 'Borrador' se establece cuando el pedido de venta asociado está "
+"en el estado borrador.\n"
+"* El estado 'Confirmado' se establece cuando el pedido de venta asociado se "
+"confirma.\n"
+"* El estado 'Excepción' se establece cuando el pedido de venta asociado "
+"cambia a excepción.\n"
+"* El estado 'Realizado' se establece cuando la línea del pedido de venta ha "
+"sido recogida.\n"
+"* El estado 'Cancelado' se establece cuando un usuario cancela el pedido de "
+"venta asociado."
 
 #. module: sale
 #: view:sale.order:0
@@ -1136,13 +1207,13 @@ msgstr "Fax :"
 #. module: sale
 #: field:sale.advance.payment.inv,amount:0
 msgid "Advance Amount"
-msgstr ""
+msgstr "Importe avanzado"
 
 #. module: sale
 #: view:board.board:0
 #: model:ir.actions.act_window,name:sale.action_sales_product_total_price
 msgid "Sales by Product's Category"
-msgstr ""
+msgstr "Ventas por categoría de producto"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -1157,7 +1228,7 @@ msgstr "Factura basada en pedidos de venta"
 #. module: sale
 #: model:ir.model,name:sale.model_stock_picking
 msgid "Picking List"
-msgstr ""
+msgstr "Albarán"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_confirmquotation0
@@ -1165,6 +1236,8 @@ msgid ""
 "The salesman confirms the quotation. The state of the sale order becomes 'In "
 "progress' or 'Manual in progress'."
 msgstr ""
+"El comercial confirma el presupuesto. El estado del pedido de venta se "
+"convierte en 'En progreso' o 'Manual en progreso'."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -1175,7 +1248,7 @@ msgstr "¡Error!"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "July"
-msgstr ""
+msgstr "Julio"
 
 #. module: sale
 #: field:sale.order.line,procurement_id:0
@@ -1202,7 +1275,7 @@ msgstr "Enviar & Factura manual"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Picking Information !"
-msgstr ""
+msgstr "¡Información albarán!"
 
 #. module: sale
 #: view:sale.report:0
@@ -1219,17 +1292,17 @@ msgstr "Ventas"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid " Quantity: "
-msgstr ""
+msgstr " Cantidad: "
 
 #. module: sale
 #: model:process.node,note:sale.process_node_invoice0
 msgid "To be reviewed by the accountant."
-msgstr ""
+msgstr "Para ser revisado por el contable."
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleorderprocurement0
 msgid "Drives procurement orders for every sale order line."
-msgstr ""
+msgstr "Genera órdenes de abastecimiento para cada línea del pedido de venta"
 
 #. module: sale
 #: view:sale.make.invoice:0
@@ -1248,12 +1321,12 @@ msgstr ""
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line_make_invoice
 msgid "Sale OrderLine Make_invoice"
-msgstr ""
+msgstr "Venta Línea_pedido Realizar_factura"
 
 #. module: sale
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "¡Error! No puede crear menús recursivos."
 
 #. module: sale
 #: help:sale.config.picking_policy,step:0
@@ -1263,11 +1336,15 @@ msgid ""
 "and simple methods to deliver products to the customer in one or two "
 "operations by the worker."
 msgstr ""
+"Por defecto, OpenERP es capaz de gestionar complejas rutas y caminos de los "
+"productos en su almacén y en las ubicaciones de otras empresas. Esto "
+"configurará los métodos más comunes y sencillos para entregar los productos "
+"al cliente en una o dos operaciones realizadas por el trabajador."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree
 msgid "Old Quotations"
-msgstr ""
+msgstr "Presupuestos antiguos"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1279,12 +1356,12 @@ msgstr "Pagado"
 #: model:ir.ui.menu,name:sale.menu_report_product_all
 #: view:sale.report:0
 msgid "Sales Analysis"
-msgstr ""
+msgstr "Análisis ventas"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_quotation0
 msgid "Draft state of sale order"
-msgstr ""
+msgstr "Estado borrador del pedido de venta"
 
 #. module: sale
 #: field:sale.order.line,property_ids:0
@@ -1305,22 +1382,26 @@ msgid ""
 "is 'Shipping and Manual in Progress'. The invoice is created automatically "
 "if the shipping policy is 'Payment before Delivery'."
 msgstr ""
+"El comercial crea una factura manualmente si la política de facturación del "
+"pedido de venta es \"Envío y Factura manual\". La factura se crea de forma "
+"automática si la política de facturación es 'Pago antes del envío'."
 
 #. module: sale
 #: help:sale.config.picking_policy,order_policy:0
 msgid ""
 "You can generate invoices based on sales orders or based on shippings."
 msgstr ""
+"Puede generar facturas basadas en pedidos de venta o basadas en envíos."
 
 #. module: sale
 #: view:sale.order:0
 msgid "Related Invoices"
-msgstr ""
+msgstr "Facturas relacionadas"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_order0
 msgid "Confirmed sale order to invoice."
-msgstr ""
+msgstr "Pedido de venta confirmado para facturar."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order
@@ -1348,7 +1429,7 @@ msgstr "Realizado"
 #. module: sale
 #: model:ir.model,name:sale.model_sale_installer
 msgid "sale.installer"
-msgstr ""
+msgstr "venta.instalador"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_invoice0
@@ -1360,12 +1441,12 @@ msgstr "Factura"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Could not cancel sale order line!"
-msgstr ""
+msgstr "¡Podría no cancelar la línea de pedido de venta!"
 
 #. module: sale
 #: selection:sale.config.picking_policy,step:0
 msgid "Picking List & Delivery Order"
-msgstr ""
+msgstr "Albarán y Orden de entrega"
 
 #. module: sale
 #: constraint:ir.model:0
@@ -1378,17 +1459,17 @@ msgstr ""
 #. module: sale
 #: view:sale.order.line:0
 msgid "To Do"
-msgstr ""
+msgstr "Para hacer"
 
 #. module: sale
 #: field:sale.order,picking_policy:0
 msgid "Picking Policy"
-msgstr ""
+msgstr "Política de envío"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_deliveryorder0
 msgid "Document of the move to the customer."
-msgstr ""
+msgstr "Documento del movimiento al cliente."
 
 #. module: sale
 #: field:sale.config.picking_policy,order_policy:0
@@ -1412,12 +1493,12 @@ msgstr "Producto"
 #. module: sale
 #: model:ir.ui.menu,name:sale.menu_invoiced
 msgid "Invoicing"
-msgstr ""
+msgstr "Facturación"
 
 #. module: sale
 #: help:sale.order,date_confirm:0
 msgid "Date on which sale order is confirmed"
-msgstr ""
+msgstr "Fecha en la que se ha confirmado el pedido de venta."
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelassignation0
@@ -1460,12 +1541,12 @@ msgstr "UdM del producto"
 #: model:ir.actions.act_window,name:sale.action_sales_by_salesman
 #: view:sale.report:0
 msgid "Sales By Salesman"
-msgstr ""
+msgstr "Ventas por comercial"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Logistic"
-msgstr ""
+msgstr "Logística"
 
 #. module: sale
 #: view:sale.order.line:0
@@ -1475,7 +1556,7 @@ msgstr "Pedido"
 #. module: sale
 #: help:sale.order,partner_shipping_id:0
 msgid "Shipping address for current sale order"
-msgstr ""
+msgstr "Dirección de envío para el pedido de venta actual."
 
 #. module: sale
 #: view:sale.order:0
@@ -1485,12 +1566,12 @@ msgstr "Estados"
 #. module: sale
 #: view:sale.config.picking_policy:0
 msgid "res_config_contents"
-msgstr ""
+msgstr "res_config_contenidos"
 
 #. module: sale
 #: field:sale.order,client_order_ref:0
 msgid "Customer Reference"
-msgstr ""
+msgstr "Referencia cliente"
 
 #. module: sale
 #: field:sale.order,amount_total:0
@@ -1505,6 +1586,9 @@ msgid ""
 "output area and the customer is done through the Delivery Order manually or "
 "automatically."
 msgstr ""
+"Dependiendo de la configuración de la ubicación de salida, el movimiento "
+"entre la zona de salida y el cliente se realiza a través de la orden de "
+"entrega de forma manual o automática."
 
 #. module: sale
 #: help:sale.order,shipped:0
@@ -1512,19 +1596,21 @@ msgid ""
 "It indicates that the sale order has been delivered. This field is updated "
 "only after the scheduler have been launched !"
 msgstr ""
+"Indica que el pedido de venta ha sido entregado. ¡Este campo sólo se "
+"actualiza después de que el planificador ha sido ejecutado!"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_order_make_invoice
 #: model:ir.actions.act_window,name:sale.action_view_sale_order_line_make_invoice
 #: view:sale.order:0
 msgid "Make Invoices"
-msgstr ""
+msgstr "Realizar facturas"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "To Invoice"
-msgstr ""
+msgstr "Para facturar"
 
 #. module: sale
 #: field:sale.config.picking_policy,step:0
@@ -1538,17 +1624,17 @@ msgstr "Pasos para entregar un pedido de venta"
 #: field:sale.report,company_id:0
 #: field:sale.shop,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Compañía"
 
 #. module: sale
 #: field:sale.make.invoice,invoice_date:0
 msgid "Invoice Date"
-msgstr ""
+msgstr "Fecha factura"
 
 #. module: sale
 #: help:sale.advance.payment.inv,amount:0
 msgid "The amount to be invoiced in advance."
-msgstr ""
+msgstr "El importe a facturar por adelantado."
 
 #. module: sale
 #: selection:sale.order,state:0
@@ -1562,6 +1648,8 @@ msgid ""
 "Gives the margin of profitability by calculating the difference between Unit "
 "Price and Cost Price."
 msgstr ""
+"Indica el margen de rentabilidad mediante el cálculo de la diferencia entre "
+"el precio unitario y el precio de coste."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -1594,29 +1682,29 @@ msgstr "Tienda"
 #. module: sale
 #: view:sale.report:0
 msgid "   Month   "
-msgstr ""
+msgstr "   Mes   "
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,uom_name:0
 msgid "Default UoM"
-msgstr ""
+msgstr "UdM por defecto"
 
 #. module: sale
 #: field:sale.report,date_confirm:0
 msgid "Date Confirm"
-msgstr ""
+msgstr "Fecha confirmación"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:0
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Aviso"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Sales Order"
-msgstr ""
+msgstr "Pedido de venta"
 
 #. module: sale
 #: field:sale.order.line,product_uos_qty:0
@@ -1627,7 +1715,7 @@ msgstr "Cantidad (UdV)"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid " Type of ul: "
-msgstr ""
+msgstr " Tipo de ul: "
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1644,6 +1732,8 @@ msgstr "Confirmar"
 #, python-format
 msgid "You must first cancel all picking attached to this sale order."
 msgstr ""
+"Primero debe cancelar todos los albaranes relacionados con este pedido de "
+"venta."
 
 #. module: sale
 #: view:sale.order:0
@@ -1660,7 +1750,7 @@ msgstr "Líneas pedido de ventas"
 #. module: sale
 #: field:sale.order.line,delay:0
 msgid "Delivery Lead Time"
-msgstr ""
+msgstr "Tiempo inicial entrega"
 
 #. module: sale
 #: view:res.company:0
@@ -1672,6 +1762,7 @@ msgstr "Configuración"
 #, python-format
 msgid "There is no sale journal defined for this company: \"%s\" (id:%d)"
 msgstr ""
+"No hay un diario de ventas definido para esta compañía: \"%s\" (id:%d)"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -1684,6 +1775,8 @@ msgid ""
 "For every sale order line, a procurement order is created to supply the sold "
 "product."
 msgstr ""
+"Por cada línea del pedido de venta, una orden de abastecimiento se ha creado "
+"para suministrar el producto vendido."
 
 #. module: sale
 #: selection:sale.order,picking_policy:0
@@ -1693,7 +1786,7 @@ msgstr "Envío completo"
 #. module: sale
 #: view:sale.report:0
 msgid "    Month-1    "
-msgstr ""
+msgstr "    Mes-1    "
 
 #. module: sale
 #: help:sale.config.picking_policy,picking_policy:0
@@ -1702,11 +1795,14 @@ msgid ""
 "soon as possible when one product is available or you wait that all products "
 "are available.."
 msgstr ""
+"La política de envío se utiliza para configurar el pedido si debe entregarse "
+"tan pronto como sea posible cuando un producto está disponible o debe "
+"esperar a que todos los productos están disponibles."
 
 #. module: sale
 #: field:sale.order,origin:0
 msgid "Source document"
-msgstr ""
+msgstr "Documento origen"
 
 #. module: sale
 #: field:sale.order.line,th_weight:0
@@ -1722,23 +1818,23 @@ msgstr "Facturas"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "December"
-msgstr ""
+msgstr "Diciembre"
 
 #. module: sale
 #: field:sale.config.picking_policy,config_logo:0
 #: field:sale.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Imagen"
 
 #. module: sale
 #: help:sale.order,amount_untaxed:0
 msgid "The amount without tax"
-msgstr ""
+msgstr "El importe sin impuestos."
 
 #. module: sale
 #: view:sale.order.line:0
 msgid "Uninvoiced"
-msgstr ""
+msgstr "No facturada"
 
 #. module: sale
 #: view:sale.order:0
@@ -1779,7 +1875,7 @@ msgstr "Avanzar factura"
 #. module: sale
 #: model:process.node,name:sale.process_node_saleorderprocurement0
 msgid "Sale Order Requisition"
-msgstr ""
+msgstr "Solicitud pedido de venta"
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -1790,7 +1886,7 @@ msgstr "Borrador"
 #: field:sale.config.picking_policy,progress:0
 #: field:sale.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progreso configuración"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_line_product_tree
@@ -1800,7 +1896,7 @@ msgstr "Ventas de producto"
 #. module: sale
 #: field:sale.order,date_order:0
 msgid "Ordered Date"
-msgstr ""
+msgstr "Fecha ordenada"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_form
@@ -1822,7 +1918,7 @@ msgstr "Envío directo"
 #. module: sale
 #: field:sale.installer,sale_journal:0
 msgid "Invoicing journals"
-msgstr ""
+msgstr "Diarios de facturación"
 
 #. module: sale
 #: model:product.template,name:sale.advance_product_0_product_template
@@ -1834,17 +1930,17 @@ msgstr "Producto avanzado"
 #: view:sale.report:0
 #: field:sale.report,shipped_qty_1:0
 msgid "Shipped Qty"
-msgstr ""
+msgstr "Ctdad enviada"
 
 #. module: sale
 #: view:sale.open.invoice:0
 msgid "You invoice has been successfully created!"
-msgstr ""
+msgstr "¡La factura ha sido creada correctamente!"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "January"
-msgstr ""
+msgstr "Enero"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_line_invoice.py:0
@@ -1855,6 +1951,11 @@ msgid ""
 "1.The state of this sale order line is either \"draft\" or \"cancel\"!\n"
 "2.The Sale Order Line is Invoiced!"
 msgstr ""
+"No se puede crear la factura para esta línea del pedido de venta debido a "
+"una de las siguientes razones:\n"
+"1. El estado de esta línea del pedido de venta es \"borrador\" o "
+"\"cancelado\".\n"
+"2. La línea del pedido de venta está facturada."
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree4
@@ -1864,7 +1965,7 @@ msgstr "Pedidos de ventas en proceso"
 #. module: sale
 #: field:sale.installer,sale_layout:0
 msgid "Sales Order Layout Improvement"
-msgstr ""
+msgstr "Mejora plantilla pedido de venta"
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice_advance.py:0
@@ -1876,7 +1977,7 @@ msgstr "Error"
 #: view:sale.report:0
 #: field:sale.report,delay:0
 msgid "Commitment Delay"
-msgstr ""
+msgstr "Retraso realización"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_assign0
@@ -1886,12 +1987,12 @@ msgstr "Asignar"
 #. module: sale
 #: constraint:ir.rule:0
 msgid "Rules are not supported for osv_memory objects !"
-msgstr ""
+msgstr "¡Las reglas no son soportadas en objetos osv_memory!"
 
 #. module: sale
 #: field:sale.report,date:0
 msgid "Date Order"
-msgstr ""
+msgstr "Fecha pedido"
 
 #. module: sale
 #: selection:sale.order.line,type:0
@@ -1907,7 +2008,7 @@ msgstr "Tienda de ventas"
 #. module: sale
 #: view:board.board:0
 msgid "Sales By Customer"
-msgstr ""
+msgstr "Ventas por cliente"
 
 #. module: sale
 #: view:sale.open.invoice:0
@@ -1917,13 +2018,13 @@ msgstr "Cerrar"
 #. module: sale
 #: field:sale.order,shipped:0
 msgid "Delivered"
-msgstr ""
+msgstr "Entregado"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Not enough stock !"
-msgstr ""
+msgstr "¡No hay stock suficiente!"
 
 #. module: sale
 #: view:sale.order:0
@@ -1943,16 +2044,19 @@ msgid ""
 "You cannot make an advance on a sale order \\n                             "
 "that is defined as 'Automatic Invoice after delivery'."
 msgstr ""
+"No se puede hacer un anticipo de un pedido de venta \\n que esté defino como "
+"'Facturar pedido después del envío'."
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "May"
-msgstr ""
+msgstr "Mayo"
 
 #. module: sale
 #: help:sale.installer,sale_order_dates:0
 msgid "Adds commitment, requested and effective dates on Sales Orders."
 msgstr ""
+"Añade fechas de realización, solicitud y efectivo en pedidos de venta."
 
 #. module: sale
 #: view:sale.order:0
@@ -1964,7 +2068,7 @@ msgstr "Cliente"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "February"
-msgstr ""
+msgstr "Febrero"
 
 #. module: sale
 #: help:sale.installer,sale_journal:0
@@ -1972,22 +2076,24 @@ msgid ""
 "Allows you to group and invoice your delivery orders according to different "
 "invoicing types: daily, weekly, etc."
 msgstr ""
+"Permite agrupar y facturar sus albaranes de acuerdo a diferentes tipos de "
+"facturación: diaria, semanal, etc."
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "April"
-msgstr ""
+msgstr "Abril"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Included"
-msgstr ""
+msgstr "Total impuestos incluidos"
 
 #. module: sale
 #: view:sale.order:0
 #: view:sale.order.line:0
 msgid "Search Sales Order"
-msgstr ""
+msgstr "Buscar pedido de venta"
 
 #. module: sale
 #: field:sale.order,payment_term:0
@@ -2002,11 +2108,15 @@ msgid ""
 "production of products regarding to the rules and to the sale order's "
 "parameters. "
 msgstr ""
+"Se crea automáticamente una orden de abastecimiento tan pronto como se "
+"confirma un pedido de venta o se paga la factura. Conduce a la compra y a la "
+"producción de productos según las normas y los parámetros del pedido de "
+"venta. "
 
 #. module: sale
 #: field:sale.config.picking_policy,picking_policy:0
 msgid "Picking Default Policy"
-msgstr ""
+msgstr "Política de empaquetado por defecto"
 
 #. module: sale
 #: report:sale.order:0
@@ -2023,7 +2133,7 @@ msgstr "Enviada"
 #: view:sale.report:0
 #: field:sale.report,year:0
 msgid "Year"
-msgstr ""
+msgstr "Año"
 
 #. module: sale
 #: selection:sale.config.picking_policy,order_policy:0
diff --git a/addons/sale/i18n/fr.po b/addons/sale/i18n/fr.po
index 4b92ec317e9..9dc2ab136dc 100644
--- a/addons/sale/i18n/fr.po
+++ b/addons/sale/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-30 09:58+0000\n"
+"PO-Revision-Date: 2010-11-13 08:25+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-31 05:01+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -73,7 +73,7 @@ msgstr "Nom du Modèle non valide dans la définition de l'action."
 #. module: sale
 #: help:sale.installer,delivery:0
 msgid "Allows you to compute delivery costs on your quotations."
-msgstr ""
+msgstr "Vous permet de calculer les frais de livraison sur vos devis."
 
 #. module: sale
 #: help:sale.order,picking_policy:0
@@ -97,7 +97,7 @@ msgstr ""
 #: view:sale.report:0
 #: field:sale.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Jour"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancelorder0
@@ -109,7 +109,7 @@ msgstr "Annuler la commande"
 #: model:ir.actions.act_window,name:sale.action_sales_by_partner
 #: view:sale.report:0
 msgid "Sales By Partner"
-msgstr ""
+msgstr "Ventes par partenaire"
 
 #. module: sale
 #: selection:sale.order,order_policy:0
@@ -119,13 +119,13 @@ msgstr "Règlement avant livraison"
 #. module: sale
 #: help:sale.order,origin:0
 msgid "Reference of the document that generated this sale order request."
-msgstr ""
+msgstr "Référence du document qui a généré cette demande d'ordre de ventes."
 
 #. module: sale
 #: code:addons/sale/wizard/sale_make_invoice.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Attention !"
 
 #. module: sale
 #: report:sale.order:0
@@ -137,6 +137,8 @@ msgstr "TVA"
 #, python-format
 msgid "You must first cancel stock moves attached to this sale order line."
 msgstr ""
+"Vous devez d'abord annuler les mouvements de stock attaché à cette ligne de "
+"commande."
 
 #. module: sale
 #: selection:sale.config.picking_policy,picking_policy:0
@@ -154,13 +156,13 @@ msgstr "Compte analytique"
 #. module: sale
 #: model:process.node,name:sale.process_node_saleprocurement0
 msgid "Procurement Order"
-msgstr ""
+msgstr "Approvisionnement"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partenaire"
 
 #. module: sale
 #: view:sale.order:0
@@ -171,7 +173,7 @@ msgstr "Commande client"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "Cannot delete a sale order line which is %s !"
-msgstr ""
+msgstr "Impossible de supprimer une ligne de commande qui est %s !"
 
 #. module: sale
 #: help:sale.order,invoice_quantity:0
@@ -197,7 +199,7 @@ msgstr "Condition de règlement par défaut"
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_config_picking_policy
 msgid "Configure Picking Policy for Sales Order"
-msgstr ""
+msgstr "Configurer la politique de colisage pour les commandes de ventes"
 
 #. module: sale
 #: view:sale.order:0
@@ -205,7 +207,7 @@ msgstr ""
 #: field:sale.order.line,state:0
 #: view:sale.report:0
 msgid "State"
-msgstr ""
+msgstr "État"
 
 #. module: sale
 #: report:sale.order:0
@@ -221,7 +223,7 @@ msgstr "Prix total"
 #. module: sale
 #: help:sale.make.invoice,grouped:0
 msgid "Check the box to group the invoices for the same customers"
-msgstr ""
+msgstr "Cochez cette case pour grouper les factures d'un même client"
 
 #. module: sale
 #: selection:sale.order,invoice_quantity:0
@@ -242,17 +244,17 @@ msgstr "Référence commande"
 #. module: sale
 #: view:sale.order:0
 msgid "Other Information"
-msgstr ""
+msgstr "Autre information"
 
 #. module: sale
 #: help:sale.order,create_date:0
 msgid "Date on which sale order is created"
-msgstr ""
+msgstr "Date à laquelle la commande de vente a été créé"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Dates"
-msgstr ""
+msgstr "Dates"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoiceafterdelivery0
@@ -264,7 +266,7 @@ msgstr ""
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleinvoice0
 msgid "From a sale order"
-msgstr ""
+msgstr "D'une commande de vente"
 
 #. module: sale
 #: field:sale.order.line,discount:0
@@ -276,7 +278,7 @@ msgstr "Escompte (%)"
 #: model:ir.actions.act_window,name:sale.open_board_sales_manager
 #: model:ir.ui.menu,name:sale.menu_board_sales_manager
 msgid "Sales Manager Dashboard"
-msgstr ""
+msgstr "Tableau de bord du responsable des ventes"
 
 #. module: sale
 #: field:sale.order.line,product_packaging:0
@@ -312,7 +314,7 @@ msgstr "Approvisionnement corrigé"
 #. module: sale
 #: view:sale.order:0
 msgid "Conditions"
-msgstr ""
+msgstr "Conditions"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -325,7 +327,7 @@ msgstr ""
 #. module: sale
 #: selection:sale.report,month:0
 msgid "August"
-msgstr ""
+msgstr "Août"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -336,7 +338,7 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree5
 msgid "All Quotations"
-msgstr "Toutes les propositions"
+msgstr "Tous les devis"
 
 #. module: sale
 #: report:sale.order:0
@@ -346,17 +348,17 @@ msgstr "Notre Vendeur"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "June"
-msgstr ""
+msgstr "Juin"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_report
 msgid "Sales Orders Statistics"
-msgstr ""
+msgstr "Statistiques sur les commandes de ventes"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "October"
-msgstr ""
+msgstr "Octobre"
 
 #. module: sale
 #: view:board.board:0
@@ -364,7 +366,7 @@ msgstr ""
 #: view:sale.order:0
 #: view:sale.report:0
 msgid "Quotations"
-msgstr ""
+msgstr "Devis"
 
 #. module: sale
 #: field:sale.advance.payment.inv,qtty:0
@@ -385,12 +387,12 @@ msgstr "TVA :"
 #. module: sale
 #: report:sale.order:0
 msgid "Quotation Date"
-msgstr ""
+msgstr "Date du devis"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_open_invoice
 msgid "Sale Open Invoice"
-msgstr ""
+msgstr "Facture de vente ouverte"
 
 #. module: sale
 #: field:sale.order,fiscal_position:0
@@ -461,7 +463,7 @@ msgstr "Notes"
 #: code:addons/sale/sale.py:0
 #, python-format
 msgid "The quotation '%s' has been converted to a sale order."
-msgstr ""
+msgstr "Le devis '%s' a été converti en commande de vente."
 
 #. module: sale
 #: field:product.product,pricelist_purchase:0
@@ -474,6 +476,8 @@ msgid ""
 "Number of days between the order confirmation the the shipping of the "
 "products to the customer"
 msgstr ""
+"Nombre de jour entre la confirmation de l'ordre et l'expédition des produits "
+"au client"
 
 #. module: sale
 #: view:sale.order:0
@@ -483,7 +487,7 @@ msgstr "Facture corrigée"
 #. module: sale
 #: help:sale.order,amount_total:0
 msgid "The total amount"
-msgstr ""
+msgstr "Le montant total"
 
 #. module: sale
 #: constraint:product.product:0
@@ -493,7 +497,7 @@ msgstr "Erreur: code EAN invalide"
 #. module: sale
 #: help:sale.order,partner_invoice_id:0
 msgid "Invoice address for current sale order"
-msgstr ""
+msgstr "Adresse de facturation de la commande actuelle"
 
 #. module: sale
 #: field:sale.order,amount_untaxed:0
@@ -508,7 +512,7 @@ msgstr ""
 #. module: sale
 #: help:sale.order,project_id:0
 msgid "The analytic account related to a sale order"
-msgstr ""
+msgstr "Le compte analytique lié à une commande"
 
 #. module: sale
 #: model:process.node,name:sale.process_node_deliveryorder0
@@ -518,7 +522,7 @@ msgstr "Ordre de livraison"
 #. module: sale
 #: field:sale.order,date_confirm:0
 msgid "Confirmation Date"
-msgstr ""
+msgstr "Date de confirmation"
 
 #. module: sale
 #: field:sale.order.line,address_allotment_id:0
@@ -528,7 +532,7 @@ msgstr "Partenaire alloti"
 #. module: sale
 #: selection:sale.report,month:0
 msgid "March"
-msgstr ""
+msgstr "Mars"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -537,6 +541,7 @@ msgid ""
 "There is no income account defined ' \\n                                     "
 "   'for this product: \"%s\" (id:%d)"
 msgstr ""
+"Il n'y a aucun compte de revenu défini ' \\n 'pour ce produit: \"%s\" (id:%d)"
 
 #. module: sale
 #: field:sale.order.line,price_subtotal:0
@@ -556,7 +561,7 @@ msgstr "Adresse de facturation"
 #. module: sale
 #: view:sale.order.line:0
 msgid "Search Uninvoiced Lines"
-msgstr ""
+msgstr "Recherche des lignes non-facturées"
 
 #. module: sale
 #: model:process.node,note:sale.process_node_saleprocurement0
@@ -564,6 +569,8 @@ msgid ""
 "One Procurement order for each sale order line and for each of the "
 "components."
 msgstr ""
+"Un ordre d'approvisionnement pour chaque ligne de commande de vente et pour "
+"chaque composant."
 
 #. module: sale
 #: model:ir.actions.report.xml,name:sale.report_sale_order
@@ -605,7 +612,7 @@ msgstr "Montant hors-taxe"
 #: model:ir.actions.act_window,name:sale.action_order_line_tree2
 #: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines
 msgid "Lines to Invoice"
-msgstr ""
+msgstr "Lignes à facturer"
 
 #. module: sale
 #: field:sale.order.line,product_uom_qty:0
@@ -631,7 +638,7 @@ msgstr "Total :"
 #. module: sale
 #: view:sale.report:0
 msgid "My Sales"
-msgstr ""
+msgstr "Mes ventes"
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -670,7 +677,7 @@ msgstr ""
 #. module: sale
 #: help:sale.order,invoiced:0
 msgid "It indicates that an invoice has been paid"
-msgstr ""
+msgstr "Ceci indique qu'une facture a été payée"
 
 #. module: sale
 #: constraint:ir.ui.view:0
@@ -680,29 +687,29 @@ msgstr "XML non valide pour l'architecture de la vue"
 #. module: sale
 #: view:sale.order:0
 msgid "Order Date"
-msgstr ""
+msgstr "Date de commande"
 
 #. module: sale
 #: view:sale.order.line:0
 #: field:sale.report,shipped:0
 msgid "Shipped"
-msgstr ""
+msgstr "Expédié"
 
 #. module: sale
 #: help:sale.order,amount_tax:0
 msgid "The tax amount"
-msgstr ""
+msgstr "Le montant des taxes"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "September"
-msgstr ""
+msgstr "Septembre"
 
 #. module: sale
 #: view:sale.report:0
 #: field:sale.report,categ_id:0
 msgid "Category of Product"
-msgstr ""
+msgstr "Catégorie de produit"
 
 #. module: sale
 #: report:sale.order:0
@@ -717,7 +724,7 @@ msgstr "Mouvements de stock"
 #. module: sale
 #: view:sale.report:0
 msgid "  Year  "
-msgstr ""
+msgstr "  Année  "
 
 #. module: sale
 #: field:sale.order,state:0
@@ -736,17 +743,17 @@ msgstr ""
 #: model:ir.actions.act_window,name:sale.action_view_sales_by_month
 #: view:sale.report:0
 msgid "Sales By Month"
-msgstr ""
+msgstr "Ventes par mois"
 
 #. module: sale
 #: field:res.company,security_lead:0
 msgid "Security Days"
-msgstr ""
+msgstr "Jours de sécurité"
 
 #. module: sale
 #: model:process.transition,name:sale.process_transition_saleorderprocurement0
 msgid "Procurement of sold material"
-msgstr ""
+msgstr "Approvisionnement des matériaux vendus"
 
 #. module: sale
 #: field:sale.order,partner_shipping_id:0
@@ -756,7 +763,7 @@ msgstr "Adresse d'expédition"
 #. module: sale
 #: view:sale.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres étendus..."
 
 #. module: sale
 #: selection:sale.order.line,state:0
@@ -766,17 +773,17 @@ msgstr "Exception"
 #. module: sale
 #: field:sale.order,create_date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Date de création"
 
 #. module: sale
 #: model:ir.model,name:sale.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Sociétés"
 
 #. module: sale
 #: selection:sale.report,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembre"
 
 #. module: sale
 #: view:sale.order:0
@@ -802,12 +809,15 @@ msgstr "Votre Référence"
 msgid ""
 "The name and address of the contact who requested the order or quotation."
 msgstr ""
+"Le nom et l'adresse du contact qui a passé la commande ou demandé le devis."
 
 #. module: sale
 #: help:res.company,security_lead:0
 msgid ""
 "This is the days added to what you promise to customers for security purpose"
 msgstr ""
+"C'est le nombre de jours ajoutés à ce que vous avez promis au client par "
+"sécurité"
 
 #. module: sale
 #: view:sale.order:0
@@ -818,7 +828,7 @@ msgstr "Qté"
 #. module: sale
 #: view:sale.order:0
 msgid "References"
-msgstr ""
+msgstr "Références"
 
 #. module: sale
 #: model:process.transition.action,name:sale.process_transition_action_cancel0
@@ -834,12 +844,12 @@ msgstr "Annuler"
 #. module: sale
 #: help:sale.order,pricelist_id:0
 msgid "Pricelist version for current sale order"
-msgstr ""
+msgstr "Version de la liste de prix pour la commande de vente actuelle"
 
 #. module: sale
 #: field:sale.installer,sale_order_dates:0
 msgid "Sales Order Dates"
-msgstr ""
+msgstr "Dates de commande de ventes"
 
 #. module: sale
 #: model:ir.model,name:sale.model_sale_order_line
@@ -860,12 +870,12 @@ msgstr "Créer facture"
 #. module: sale
 #: field:sale.installer,sale_margin:0
 msgid "Margins in Sales Orders"
-msgstr ""
+msgstr "Marges dans les commandes de ventes"
 
 #. module: sale
 #: view:sale.order:0
 msgid "Total Tax Excluded"
-msgstr ""
+msgstr "Total hors-taxes"
 
 #. module: sale
 #: view:sale.order:0
@@ -1128,6 +1138,12 @@ msgid ""
 "The 'Waiting Schedule' state is set when the invoice is confirmed but "
 "waiting for the scheduler to run on the date 'Ordered Date'."
 msgstr ""
+"Donne l'état du devis ou de la commande. \n"
+"L'état \"exception\" est mis automatiquement quand une annulation a lieu "
+"pendant la validation d'une facture (Exception de facturation) ou d'une "
+"expédition (Exception d'expédition) \n"
+"L'état \"attente de planification\" est mis quand une facture est confirmée "
+"mais attend que le planificateur s'éxécute à la date \"date de commande\"."
 
 #. module: sale
 #: help:sale.order.line,state:0
@@ -1185,6 +1201,8 @@ msgid ""
 "The salesman confirms the quotation. The state of the sale order becomes 'In "
 "progress' or 'Manual in progress'."
 msgstr ""
+"Le vendeur confirme le devis. L'état de la commande de vente devient 'En "
+"cours' ou 'Manuelle en cours'."
 
 #. module: sale
 #: code:addons/sale/sale.py:0
@@ -1279,7 +1297,7 @@ msgstr ""
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_order_tree
 msgid "Old Quotations"
-msgstr ""
+msgstr "Anciens devis"
 
 #. module: sale
 #: field:sale.order,invoiced:0
@@ -1308,7 +1326,7 @@ msgstr "Propriétés"
 #: selection:sale.order,state:0
 #: selection:sale.report,state:0
 msgid "Quotation"
-msgstr "Proposition"
+msgstr "Devis"
 
 #. module: sale
 #: model:process.transition,note:sale.process_transition_invoice0
diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml
index e69d841053b..4f81fb4cb5d 100644
--- a/addons/sale/report/sale_report_view.xml
+++ b/addons/sale/report/sale_report_view.xml
@@ -3,6 +3,7 @@
 <data>
 
     <record id="view_order_product_tree" model="ir.ui.view">
+        <field eval="1" name="priority"/>
         <field name="name">sale.report.tree</field>
         <field name="model">sale.report</field>
         <field name="type">tree</field>
@@ -163,6 +164,7 @@
         <field name="view_mode">graph,tree</field>
         <field name="domain">[('state','in',('manual','progress')),('date','&lt;=', time.strftime('%Y-%m-%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
         <field name="view_id" ref="view_sales_by_partner_graph"/>
+        <field name="context">{'group_by_no_leaf':1,'group_by':['partner_id']}</field>
     </record>
     <record id="open_view_sales_by_partner_graph" model="ir.actions.act_window.view">
             <field eval="1" name="sequence"/>
@@ -208,6 +210,7 @@
         <field name="view_mode">graph,tree</field>
         <field name="domain">[('state','in',('manual','progress','done')),('date','&lt;=', time.strftime('%Y-%m-%d')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
         <field name="view_id" ref="view_sales_by_salesman_graph"/>
+        <field name="context">{'group_by_no_leaf':1,'group_by':['user_id']}</field>
     </record>
    <record id="open_view_sales_by_salesman_graph" model="ir.actions.act_window.view">
             <field eval="7" name="sequence"/>
@@ -227,7 +230,7 @@
         <field name="type">tree</field>
         <field name="arch" type="xml">
             <tree string="Sales by Product Category">
-                <field name="product_id"/>
+                <field name="categ_id"/>
                 <field name="price_total"/>
             </tree>
         </field>
@@ -252,6 +255,7 @@
         <field name="view_mode">graph,tree</field>
         <field name="domain">[('state','in',('manual','progress','done')),('date','&gt;',(datetime.date.today()-datetime.timedelta(days=90)).strftime('%Y-%m-%d'))]</field>
         <field name="view_id" ref="view_sales_product_total_price_graph"/>
+        <field name="context">{'group_by_no_leaf':1,'group_by':['categ_id']}</field>
     </record>
     <record id="open_view_sales_product_total_price_graph" model="ir.actions.act_window.view">
             <field eval="3" name="sequence"/>
diff --git a/addons/sale/sale_demo.xml b/addons/sale/sale_demo.xml
index a6cfc961600..e0ac09c7421 100644
--- a/addons/sale/sale_demo.xml
+++ b/addons/sale/sale_demo.xml
@@ -235,6 +235,8 @@ Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
 One-shot customers (0.00) : 1.00
 Returning customers (0.00) : 0.99'" name="pricelist_sale"/>
     </record>
-    
+    <record id="base.user_demo" model="res.users">
+        <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
+    </record>
     </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 5d422a3b879..e4a8a880e9c 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -17,10 +17,6 @@
         <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
     </record>
 
-	<record id="base.user_demo" model="res.users">
-            <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
-        </record>
-
     <record model="ir.rule" id="sale_order_comp_rule">
         <field name="name">Sale Order multi-company</field>
         <field name="model_id" ref="model_sale_order"/>
@@ -57,4 +53,4 @@
     </record>
 
 </data>
-</openerp>
\ No newline at end of file
+</openerp>
diff --git a/addons/sale_crm/i18n/el.po b/addons/sale_crm/i18n/el.po
index 5d6f820012e..2b21da8678e 100644
--- a/addons/sale_crm/i18n/el.po
+++ b/addons/sale_crm/i18n/el.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-11-11 13:52+0000\n"
+"PO-Revision-Date: 2010-11-12 09:10+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/sale_crm/i18n/es.po b/addons/sale_crm/i18n/es.po
index 35cddf509b5..ade64b71127 100644
--- a/addons/sale_crm/i18n/es.po
+++ b/addons/sale_crm/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:46+0000\n"
-"PO-Revision-Date: 2010-08-03 06:21+0000\n"
-"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
+"PO-Revision-Date: 2010-11-13 16:39+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-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-30 05:20+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:07+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_crm
@@ -26,23 +27,25 @@ msgstr "Cliente"
 msgid ""
 "The Object name must start with x_ and not contain any special character !"
 msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
 
 #. module: sale_crm
 #: view:account.invoice.report:0
 #: view:board.board:0
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "Volumen mensual"
 
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "Convert to Quotation"
-msgstr ""
+msgstr "Convertir a presupuesto"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
 msgid "is converted to Quotation."
-msgstr ""
+msgstr "se ha convertido a presupuesto."
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
@@ -59,18 +62,20 @@ msgstr "¡El cliente no tiene definidas direcciones!"
 #. module: sale_crm
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nombre de modelo no válido en la definición de acción."
 
 #. module: sale_crm
 #: view:crm.make.sale:0
 msgid "_Create"
-msgstr ""
+msgstr "_Crear"
 
 #. module: sale_crm
 #: help:crm.make.sale,close:0
 msgid ""
 "Check this to close the opportunity after having created the sale order."
 msgstr ""
+"Marque esta opción para cerrar la oportunidad después de haber creado el "
+"pedido de venta."
 
 #. module: sale_crm
 #: view:crm.lead:0
@@ -86,39 +91,39 @@ msgstr "¡XML inválido para la definición de la vista!"
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
 msgid "Converted to Sales Quotation(id: %s)."
-msgstr ""
+msgstr "Convertido a presupuesto de venta (id: %s)."
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_crm_make_sale
 msgid "Make sale"
-msgstr ""
+msgstr "Realizar venta"
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
 msgid "Opportunity "
-msgstr ""
+msgstr "Oportunidad "
 
 #. module: sale_crm
 #: code:addons/sale_crm/wizard/crm_make_sale.py:0
 #, python-format
 msgid "Opportunity: %s"
-msgstr ""
+msgstr "Oportunidad: %s"
 
 #. module: sale_crm
 #: model:ir.model,name:sale_crm.model_sale_order
 msgid "Sale Order"
-msgstr ""
+msgstr "Pedido venta"
 
 #. module: sale_crm
 #: model:ir.module.module,shortdesc:sale_crm.module_meta_information
 msgid "Creates Sales order from Opportunity"
-msgstr ""
+msgstr "Crea pedido de venta desde oportunidad"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_quotation_for_sale_crm
 msgid "Quotations"
-msgstr ""
+msgstr "Presupuestos"
 
 #. module: sale_crm
 #: field:crm.make.sale,shop_id:0
@@ -128,18 +133,18 @@ msgstr "Tienda"
 #. module: sale_crm
 #: view:board.board:0
 msgid "My Quotations"
-msgstr ""
+msgstr "Mis presupuestos"
 
 #. module: sale_crm
 #: field:crm.make.sale,close:0
 msgid "Close Opportunity"
-msgstr ""
+msgstr "Cerrar oportunidad"
 
 #. module: sale_crm
 #: view:sale.order:0
 #: field:sale.order,section_id:0
 msgid "Sales Team"
-msgstr ""
+msgstr "Equipo ventas"
 
 #. module: sale_crm
 #: model:ir.actions.act_window,name:sale_crm.action_crm_make_sale
diff --git a/addons/sale_layout/i18n/ru.po b/addons/sale_layout/i18n/ru.po
index 6e825dee1a7..66ea80cd018 100644
--- a/addons/sale_layout/i18n/ru.po
+++ b/addons/sale_layout/i18n/ru.po
@@ -8,19 +8,19 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2010-10-27 08:06+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
+"PO-Revision-Date: 2010-11-13 07:40+0000\n"
+"Last-Translator: Эдуард <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:53+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
 msgid "Sub Total"
-msgstr "Подитог"
+msgstr ""
 
 #. module: sale_layout
 #: constraint:ir.model:0
@@ -43,7 +43,7 @@ msgstr ""
 #. module: sale_layout
 #: selection:sale.order.line,layout_type:0
 msgid "Note"
-msgstr "Примечания"
+msgstr "Заметка"
 
 #. module: sale_layout
 #: report:sale.order.layout:0
diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml
index 990c4c5c7b1..e203ae5dd2b 100755
--- a/addons/sale_layout/report/report_sale_layout.rml
+++ b/addons/sale_layout/report/report_sale_layout.rml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Sale Layout" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Sale Order.pdf">
+  <template pageSize="(595.0,842.0)" title="Sale Order" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
-      <frame id="first" x1="34.0" y1="28.0" width="527" height="786"/>
+      <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
   </template>
   <stylesheet>
@@ -31,27 +31,6 @@
       <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table_final">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,2" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,2" stop="3,2"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_note">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-
-
     <blockTableStyle id="Table6">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
@@ -81,18 +60,22 @@
     </blockTableStyle>
     <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,0" stop="-1,-1"/>
       <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Table2">
+    <blockTableStyle id="Table11">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
     </blockTableStyle>
-    <blockTableStyle id="Table3">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table4">
+    <blockTableStyle id="Table13">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
@@ -108,52 +91,20 @@
       <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
       <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBEFORE" colorName="#ffffff" start="0,2" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#ffffff" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,2" stop="3,2"/>
+    </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
-    <paraStyle name="P1" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" rightIndent="0.0" leftIndent="-2.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" rightIndent="0.0" leftIndent="11.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P5" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P7" fontName="Helvetica"/>
-    <paraStyle name="P8" fontName="Helvetica" fontSize="9.0" leading="13" alignment="LEFT"/>
-    <paraStyle name="P9" fontName="Helvetica-Bold" fontSize="20.0" leading="25" alignment="LEFT"/>
-    <paraStyle name="P10" fontName="Helvetica-BoldOblique" fontSize="20.0" leading="25" alignment="LEFT"/>
-    <paraStyle name="P11" fontName="Helvetica" fontSize="11.0" leading="14"/>
-    <paraStyle name="P12" fontName="Helvetica" fontSize="11.0" leading="14"/>
-    <paraStyle name="P13" fontName="Helvetica" fontSize="11.0" leading="14" alignment="LEFT"/>
-    <paraStyle name="P14" fontName="Helvetica-BoldOblique" fontSize="6.0" leading="8" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P15" fontName="Helvetica-BoldOblique" fontSize="14.0" leading="17" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P16" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P17" fontName="Helvetica" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P18" fontName="Helvetica-BoldOblique" fontSize="11.0" leading="14" alignment="LEFT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P19" fontName="Helvetica-BoldOblique" fontSize="11.0" leading="14" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P20" fontName="Helvetica" alignment="CENTER" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P21" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P22" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P23" fontName="Helvetica" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P24" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P25" fontName="Helvetica-Bold" alignment="RIGHT" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="P26" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P27" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P28" rightIndent="0.0" leftIndent="-2.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P29" rightIndent="0.0" leftIndent="11.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P30" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P31" fontName="Helvetica-Bold" fontSize="9.0" leading="13" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="P32" fontName="Helvetica-Bold" fontSize="5.0" leading="7" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P33" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P34" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="Standard" fontName="Helvetica"/>
     <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
     <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
@@ -179,18 +130,15 @@
     <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
     <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
+    <images/>
   </stylesheet>
-  <images/>
   <story>
     <para style="terp_default_8">[[repeatIn(objects,'o')]]</para>
-    <para style="P14">[[ setLang(o.partner_id.lang) ]]</para>
-    <para style="P8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="254.0,62.0,211.0" style="Tableau2">
+    <para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
+    <blockTable colWidths="260.0,64.0,215.0" style="Tableau2">
       <tr>
         <td>
-         <para style="terp_default_Bold_9">Shipping address :</para>
+          <para style="terp_default_Bold_9">Shipping address :</para>
           <para style="terp_default_9">[[ (o.partner_id and o.partner_id.title and o.partner_id.title.name) or '' ]] [[ (o.partner_id and o.partner_id.name) or '' ]]</para>
           <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.street) or '' ]]</para>
           <para style="terp_default_9">[[ (o.partner_shipping_id and o.partner_shipping_id.street2) or removeParentNode('para') ]]</para>
@@ -209,7 +157,7 @@
           <para style="terp_default_9">[[ (o.partner_invoice_id and o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name) or '' ]]</para>
         </td>
         <td>
-          <para style="P17">
+          <para style="terp_default_8">
             <font color="white"> </font>
           </para>
         </td>
@@ -231,21 +179,22 @@
         </td>
       </tr>
     </blockTable>
-    <para style="P8">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
     <para style="terp_header">[[ o.state&lt;&gt;'draft' and removeParentNode('para') ]] Quotation N° [[ o.name ]]</para>
     <para style="terp_header">[[ o.state=='draft' and removeParentNode('para') ]] Order N° [[ o.name ]]</para>
-    <para style="P15">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="132.0,134.0,135.0,135.0" style="Table5">
+    <blockTable colWidths="135.0,135.0,135.0,135.0" style="Table5">
       <tr>
         <td>
           <para style="terp_tblheader_General_Centre">Your Reference </para>
         </td>
         <td>
-          <para style="terp_tblheader_General_Centre">Date Ordered </para>
+          <para style="terp_tblheader_General_Centre">[[ o.state=='draft' and removeParentNode('para') ]] Date Ordered</para>
+          <para style="terp_tblheader_General_Centre">[[ o.state &lt;&gt; 'draft' and removeParentNode('para') ]] Quotation Date</para>
         </td>
         <td>
           <para style="terp_tblheader_General_Centre">Our Salesman </para>
@@ -255,26 +204,26 @@
         </td>
       </tr>
     </blockTable>
-    <blockTable colWidths="132.0,134.0,135.0,135.0" style="Table6">
+    <blockTable colWidths="135.0,135.0,135.0,135.0" style="Table6">
       <tr>
         <td>
           <para style="terp_default_Centre_8">[[ o.client_order_ref ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ formatLang(o.date_order,date=True) ]]</para>
+          <para style="terp_default_Centre_8">[[ formatLang(o.date_order,date = True) ]]</para>
         </td>
         <td>
           <para style="terp_default_Centre_8">[[ (o.user_id and o.user_id.name) or '' ]]</para>
         </td>
         <td>
-          <para style="terp_default_Centre_8">[[ o.payment_term.name ]]</para>
+          <para style="terp_default_Centre_8">[[ (o.payment_term and o.payment_term.name) or '' ]]</para>
         </td>
       </tr>
     </blockTable>
-    <para style="P7">
+    <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <blockTable colWidths="216.0,62.0,62.0,62.0,51.0,74.0" style="Table7">
+    <blockTable colWidths="198.0,85.0,71.0,57.0,57.0,71.0" style="Table7">
       <tr>
         <td>
           <para style="terp_tblheader_Details">Description</para>
@@ -296,83 +245,77 @@
         </td>
       </tr>
     </blockTable>
-
-	<section>
-      <para style="P32">[[ repeatIn(sale_order_lines(o),'a') ]]</para>
-		<blockTable colWidths="0.0,216.0,62.0,40.0,22.0,62.0,51.0,74.0" style="Table1">
-			<tr>
-			<td>
-			<para style="P8">[[ a['layout_type']=='text' and removeParentNode('blockTable')]]</para>
-			</td>
-			<td>
-			<para style="terp_default_9"><font>[[ (a['layout_type']=='title' or a['layout_type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) or removeParentNode('font') ]]</font>[[ a['name'] ]]</para>
-			</td>
-			<td>
-			<para style="terp_default_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font')  ]]</font><font>[[ a['tax_id'] ]]</font></para>
-			</td>
-			<td>
-			<para style="terp_default_Right_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['product_uom_qty'] ]]</font></para>
-			</td>
-			<td>
-			<para style="terp_default_Right_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ a['product_uom'] ]]</font></para>
-			</td>
-			<td>
-			<para style="terp_default_Right_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]] </font><font>[[ formatLang(a['price_unit'], digits=get_digits(dp='Sale Price')) ]]</font></para>
-			</td>
-			<td>
-			<para style="terp_default_Centre_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font><font>[[ formatLang(a['discount'], digits=get_digits(dp='Sale Price')) ]]</font></para>
-			</td>
-			<td>
-			<para style="terp_default_Right_9"><font>[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font')  ]]</font><font>[[ formatLang(a['price_subtotal'], digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id.symbol ]]</font></para>
-			</td>
-			</tr>
-			</blockTable>
-    <blockTable colWidths="453.0,74.0" style="Table2">
-      <tr>
-        <td>
-          <para style="P7">[[ a['layout_type']=='text' and a['name'] or removeParentNode('blockTable') ]]</para>
-        </td>
-        <td>
-          <para style="P7"></para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="66.0,461.0" style="Table3">
-      <tr>
-        <td>
-
-          <para style="P7"><font>[[ a['note']=='' and removeParentNode('blockTable') ]]</font><font>[[ repeatIn(( a['note'] and a['note'].splitlines()) or [], 'note') ]]</font></para>
-        </td>
-        <td>
-          <para style="P7">[[ a['note'] and  note or removeParentNode('blockTable') ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-			<pageBreak>[[ a['layout_type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
-    	<blockTable colWidths="216.0,62.0,62.0,62.0,51.0,74.0" style="Table4">
-      <tr>
-        <td>
-          <para style="P31">Description [[ a['layout_type']!='break' and removeParentNode('blockTable')]]</para>
-        </td>
-        <td>
-          <para style="P31">Taxes</para>
-        </td>
-        <td>
-          <para style="P31">Quantity</para>
-        </td>
-        <td>
-          <para style="P31">Unit Price</para>
-        </td>
-        <td>
-          <para style="P31">Disc. (%)</para>
-        </td>
-        <td>
-          <para style="P31">Price</para>
-        </td>
-      </tr>
-    </blockTable>
+    <section>
+      <para style="terp_default_8">[[repeatIn(sale_order_lines(o),'a')]]</para>
+      <blockTable colWidths="6.0,193.0,85.0,71.0,57.0,57.0,71.0" style="Table1">
+        <tr>
+          <td>
+            <para style="terp_default_8">
+              <font face="Helvetica" size="9.0">[[ a['layout_type']=='text' and removeParentNode('blockTable')]]</font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_9"><font face="Helvetica" size="8.0">[[ (a['layout_type']=='title' or a['layout_type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) or removeParentNode('font') ]] </font>[[ a['name'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9"><font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ a['tax_id'] ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ a['product_uom_qty'] ]] [[ a['product_uom'] ]] </para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9"><font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ formatLang(a['price_unit'], digits=get_digits(dp='Sale Price')) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Centre_9"><font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ formatLang(a['discount'], digits=get_digits(dp='Sale Price')) ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_Right_9">[[ a['layout_type']=='break' and removeParentNode('blockTable')]]<font face="Helvetica" size="8.0">[[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]]</font> [[ formatLang(a['price_subtotal'], digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
+          </td>
+        </tr>
+        <tr>
+          <td>
+            <para style="terp_default_9">
+              <font face="Helvetica" size="8.0">[[ a['note']=='' and removeParentNode('tr') ]]</font>
+            </para>
+          </td>
+          <td>
+            <para style="terp_default_9">[[ a['note'] and format(a['note']) or removeParentNode('tr') ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <blockTable colWidths="539.0" style="Table11">
+        <tr>
+          <td>
+            <para style="terp_default_9">[[ a['layout_type']=='text' and a['name'] or removeParentNode('blockTable') ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+      <pageBreak>[[ a['layout_type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
+      <blockTable colWidths="198.0,85.0,71.0,57.0,57.0,71.0" style="Table13">
+        <tr>
+          <td>
+            <para style="terp_tblheader_Details">Description<font face="Helvetica" size="8.0"> [[ a['layout_type']!='break' and removeParentNode('blockTable')]]</font></para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Taxes</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Quantity</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Unit Price</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Centre">Disc. (%)</para>
+          </td>
+          <td>
+            <para style="terp_tblheader_Details_Right">Price</para>
+          </td>
+        </tr>
+      </blockTable>
     </section>
-   <blockTable colWidths="382.0,56.0,90.0" style="Table_final">
+    <blockTable colWidths="386.0,67.0,86.0" style="Table8">
       <tr>
         <td>
           <para style="terp_default_9">
@@ -383,7 +326,7 @@
           <para style="terp_default_9">Net Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed, digits=get_digits(dp='Sale Price') ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_untaxed , digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -396,7 +339,7 @@
           <para style="terp_default_9">Taxes :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax, digits=get_digits(dp='Sale Price') ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9">[[ formatLang(o.amount_tax , digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]]</para>
         </td>
       </tr>
       <tr>
@@ -409,14 +352,11 @@
           <para style="terp_default_Bold_9">Total :</para>
         </td>
         <td>
-          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total, digits=get_digits(dp='Sale Price') ) ]] [[ o.pricelist_id.currency_id.symbol ]]</para>
+          <para style="terp_default_Right_9_Bold">[[ formatLang(o.amount_total , digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id. symbol ]] </para>
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="533.0" style="Table_note">
+    <blockTable colWidths="539.0" style="Table2">
       <tr>
         <td>
           <para style="terp_default_9">[[ format(o.note or '') ]]</para>
@@ -428,5 +368,8 @@
         </td>
       </tr>
     </blockTable>
+    <para style="Standard">
+      <font color="white"> </font>
+    </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/sale_order_dates/i18n/es.po b/addons/sale_order_dates/i18n/es.po
new file mode 100644
index 00000000000..e1f7fda9210
--- /dev/null
+++ b/addons/sale_order_dates/i18n/es.po
@@ -0,0 +1,72 @@
+# Spanish 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-11-13 16:13+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+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 no válido para la estructura de la vista!"
+
+#. module: sale_order_dates
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
+
+#. module: sale_order_dates
+#: model:ir.module.module,shortdesc:sale_order_dates.module_meta_information
+msgid "Sale Order Dates"
+msgstr "Fechas en pedidos de venta"
+
+#. module: sale_order_dates
+#: field:sale.order,commitment_date:0
+msgid "Commitment Date"
+msgstr "Fecha compromiso"
+
+#. module: sale_order_dates
+#: model:ir.model,name:sale_order_dates.model_sale_order
+msgid "Sale Order"
+msgstr "Pedido venta"
+
+#. module: sale_order_dates
+#: help:sale.order,effective_date:0
+msgid "Date on which picking is created"
+msgstr "Fecha en que se ha creado el albarán."
+
+#. module: sale_order_dates
+#: field:sale.order,effective_date:0
+msgid "Effective Date"
+msgstr "Fecha efectiva"
+
+#. module: sale_order_dates
+#: help:sale.order,commitment_date:0
+msgid "Date on which delivery of products is to be made"
+msgstr "Fecha en que la entrega de los productos se debe realizar."
+
+#. module: sale_order_dates
+#: help:sale.order,requested_date:0
+msgid "Date on which customer has requested for sales"
+msgstr "Fecha en que el cliente ha solicitado la venta."
+
+#. module: sale_order_dates
+#: field:sale.order,requested_date:0
+msgid "Requested Date"
+msgstr "Fecha solicitud"
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index 9349980933f..a95fa5b48db 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -65,8 +65,7 @@ class share_create(osv.osv_memory):
     _defaults = {
         'user_type' : lambda self, cr, uid, *a: 'existing' if self.pool.get('res.users').search(cr, uid, [('share', '=', True)]) else 'new',
         'domain': lambda self, cr, uid, context, *a: context.get('domain', '[]'),
-        'share_root_url': lambda self, cr, uid, context, *a: context.get('share_root_url', 
-                                _('Please specify "share_root_url" in server configuration or in context')),
+        'share_root_url': lambda self, cr, uid, context, *a: context.get('share_root_url') or _('Please specify "share_root_url" in context'),
         'action_id': lambda self, cr, uid, context, *a: context.get('action_id'),
         'access_mode': 'readonly'
     }
diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
index fd68f0a2eb5..b073be73575 100644
--- a/addons/stock/board_warehouse_view.xml
+++ b/addons/stock/board_warehouse_view.xml
@@ -12,7 +12,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">['|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>
+            <field name="domain">[('state','in',('confirmed','assigned')),'|','&amp;',('picking_id','=',False),('location_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','in')]</field>
             <field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
         </record>
 
@@ -22,7 +22,7 @@
             <field name="type">ir.actions.act_window</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="domain">['|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>
+            <field name="domain">[('state','in',('confirmed','assigned')),'|','&amp;',('picking_id','=',False),('location_dest_id.usage', 'in', ['customer','supplier']),'&amp;',('picking_id','!=',False),('picking_id.type','=','out')]</field>
             <field name="view_id" ref="stock.view_move_tree_reception_picking_board"/>
         </record>
 
@@ -30,7 +30,7 @@
             <field name="res_model">report.stock.move</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
-            <field name="domain">[('type','=','in')]</field>
+            <field name="domain">[('type','=','in'),('day','&lt;=', time.strftime('%Y-%m-%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))]</field>
             <field name="view_id" ref="stock.view_stock_graph_board"></field>
             <field name="context">{'search_default_month-1':1,'search_default_in':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
          </record>
@@ -38,7 +38,7 @@
             <field name="res_model">report.stock.move</field>
             <field name="view_type">form</field>
             <field name="view_mode">graph,tree</field>
-            <field name="domain">[('type','=','out')]</field>
+            <field name="domain">[('type','=','out'),('day','&lt;=', time.strftime('%Y-%m-%d')),('day','&gt;',(datetime.date.today()-datetime.timedelta(days=15)).strftime('%Y-%m-%d'))]</field>
             <field name="view_id" ref="stock.view_stock_graph_board"></field>
             <field name="context">{'search_default_month-1':1,'search_default_out':1,'group_by':['day'], 'group_by_no_leaf':1}</field>
          </record>
@@ -50,13 +50,13 @@
                 <form string="Warehouse board">
                     <hpaned position="200">
                         <child1>
-                            <action colspan="4" name="%(action_incoming_product_board)d" string="Incoming Product" />
-                            <action colspan="4" name="%(action_outgoing_product_board)d" string="Outgoing Product" />
+                            <action colspan="4" name="%(action_incoming_product_board)d" string="Incoming Product"  width="510"/>
+                            <action colspan="4" name="%(action_outgoing_product_board)d" string="Outgoing Product" width="510"/>
                         </child1>
 
                         <child2>
-                            <action colspan="4" name="%(action_stock_incoming_product_delay)d" string="Incoming Products Delay" width="510"/>
-                            <action colspan="4" name="%(action_stock_outgoing_product_delay)d" string="Outgoing Products delay" width="510"/>
+                            <action colspan="4" name="%(action_stock_incoming_product_delay)d" string="Incoming Products Delay" />
+                            <action colspan="4" name="%(action_stock_outgoing_product_delay)d" string="Outgoing Products Delay" />
                         </child2>
                     </hpaned>
                 </form>
diff --git a/addons/stock/i18n/el.po b/addons/stock/i18n/el.po
index 1451f242c1f..2f32b4a6b18 100644
--- a/addons/stock/i18n/el.po
+++ b/addons/stock/i18n/el.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-11-11 16:47+0000\n"
+"PO-Revision-Date: 2010-11-12 09:34+0000\n"
 "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n"
 "Language-Team: nls@hellug.gr <nls@hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-12 04:46+0000\n"
+"X-Launchpad-Export-Date: 2010-11-13 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index 96c850651dd..e2e69be30ab 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/i18n/es.po
@@ -7,20 +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:47+0000\n"
-"PO-Revision-Date: 2010-10-30 13:54+0000\n"
+"PO-Revision-Date: 2010-11-14 00:43+0000\n"
 "Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
 "<jesteve@zikzakmedia.com>\n"
 "Language-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-31 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:06+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
@@ -30,7 +30,7 @@ msgstr "Lotes de seguimiento de salida"
 #. module: stock
 #: model:ir.model,name:stock.model_stock_ups_upload
 msgid "Stock ups upload"
-msgstr ""
+msgstr "Stock ups carga"
 
 #. module: stock
 #: field:stock.location,chained_location_id:0
@@ -41,7 +41,7 @@ msgstr "Ubicación encadenada si fija"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Put in a new pack"
-msgstr ""
+msgstr "Poner en un paquete nuevo"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -51,7 +51,7 @@ msgstr "STOCK_SAVE"
 #. module: stock
 #: field:stock.move.split.lines,action:0
 msgid "Action"
-msgstr ""
+msgstr "Acción"
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -60,6 +60,8 @@ msgid ""
 "There is no journal defined '\\n                                'on the "
 "product category: \"%s\" (id: %d)"
 msgstr ""
+"No se ha definido un diario '\\n                                'en la "
+"categoría de producto: \"%s\" (id: %d)"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -75,7 +77,7 @@ msgstr "Nombre de modelo no válido en la definición de la acción."
 #: model:ir.actions.act_window,name:stock.action_stock_line_date
 #: model:ir.ui.menu,name:stock.menu_report_stock_line_date
 msgid "Last Product Inventories"
-msgstr ""
+msgstr "Último inventario de productos"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -85,7 +87,7 @@ msgstr "STOCK_SORT_ASCENDING"
 #. module: stock
 #: field:stock.production.lot.revision,indice:0
 msgid "Revision Number"
-msgstr ""
+msgstr "Número revisión"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -108,7 +110,7 @@ msgstr ""
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_inventory_control
 msgid "Inventory Control"
-msgstr ""
+msgstr "Control inventario"
 
 #. module: stock
 #: help:stock.production.lot,ref:0
@@ -116,6 +118,8 @@ msgid ""
 "Internal reference number in case it differs from the manufacturer's serial "
 "number"
 msgstr ""
+"Número interno de referencia en caso de que sea diferente del número de "
+"serie del fabricante."
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -126,12 +130,12 @@ msgstr "STOCK_ZOOM_100"
 #: model:ir.actions.report.xml,name:stock.report_picking_list
 #: view:stock.picking:0
 msgid "Picking list"
-msgstr ""
+msgstr "Albarán"
 
 #. module: stock
 #: view:board.board:0
 msgid "Outgoing Products delay"
-msgstr ""
+msgstr "Retraso albaranes de salida"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:0
@@ -161,7 +165,7 @@ msgstr "Cantidad"
 #: view:report.stock.move:0
 #: field:report.stock.move,day:0
 msgid "Day"
-msgstr ""
+msgstr "Día"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -183,7 +187,7 @@ msgstr "Diario de inventario"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Incoming"
-msgstr ""
+msgstr "Entrada"
 
 #. module: stock
 #: help:product.category,property_stock_account_output_categ:0
@@ -193,6 +197,10 @@ msgid ""
 "value for all products in this category, it can also directly be set on each "
 "product."
 msgstr ""
+"Al hacer la valoración de inventario en tiempo real, la contrapartida de los "
+"asientos del diario para todos los movimientos de stock de salida será "
+"creada en esta cuenta. Este es el valor por defecto para todos los productos "
+"de esta categoría, también puede indicarse directamente en cada producto."
 
 #. module: stock
 #: help:stock.move,address_id:0
@@ -200,6 +208,8 @@ msgid ""
 "Optional address where goods are to be delivered, specifically used for "
 "allotment"
 msgstr ""
+"Dirección opcional cuando las mercancías deben ser entregadas, utilizado "
+"específicamente para lotes."
 
 #. module: stock
 #: code:addons/stock/report/report_stock.py:0
@@ -215,14 +225,14 @@ msgstr "Ubicación de inventario"
 #. module: stock
 #: help:stock.tracking,serial:0
 msgid "Other reference or serial number"
-msgstr ""
+msgstr "Otra referencia o número de serie."
 
 #. module: stock
 #: field:stock.move,origin:0
 #: view:stock.picking:0
 #: field:stock.picking,origin:0
 msgid "Origin"
-msgstr ""
+msgstr "Origen"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_configuration
@@ -232,7 +242,7 @@ msgstr "Configuración"
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Identification"
-msgstr ""
+msgstr "Identificación paquete"
 
 #. module: stock
 #: view:stock.move:0
@@ -247,28 +257,32 @@ msgid ""
 "If checked, all product quantities will be set to zero to help ensure a real "
 "physical inventory is done"
 msgstr ""
+"Si se marca, todas las cantidades de producto se ponen a cero para ayudar a "
+"realizar un inventario físico real."
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines
 msgid "Split lines"
-msgstr ""
+msgstr "Dividir líneas"
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Upstream Traceability"
-msgstr ""
+msgstr "Trazabilidad hacia arriba"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "You cannot cancel picking because stock move is in done state !"
 msgstr ""
+"¡No puede cancelar el albarán porqué el movimiento de stock está en estado "
+"realizado!"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "¡Aviso!"
 
 #. module: stock
 #: field:stock.invoice.onshipping,group:0
@@ -285,6 +299,11 @@ msgid ""
 "   \n"
 "The state is 'Waiting' if the move is waiting for another one."
 msgstr ""
+"Cuando se crea el movimiento de stock está en el estado 'Borrador'.\n"
+" Después se cambia a estado 'Confirmado'.\n"
+" Si el stock está disponible, el estado se cambia a 'Disponible'.\n"
+" Cuando el albarán se ha enviado el estado es 'Realizado'.\n"
+"El estado es 'En espera' si el movimiento está a la espera de otro."
 
 #. module: stock
 #: model:ir.model,name:stock.model_res_partner
@@ -303,7 +322,7 @@ msgstr "Empresa"
 #: code:addons/stock/wizard/stock_return_picking.py:0
 #, python-format
 msgid "No invoicing"
-msgstr ""
+msgstr "No facturación"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_production_lot
@@ -315,12 +334,12 @@ msgstr "Lote de producción"
 #. module: stock
 #: help:stock.incoterms,code:0
 msgid "Code for Incoterms"
-msgstr ""
+msgstr "Código para Incoterms"
 
 #. module: stock
 #: field:stock.tracking,move_ids:0
 msgid "Moves for this pack"
-msgstr ""
+msgstr "Movimientos para este paquete"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -352,7 +371,7 @@ msgstr "Estado"
 #. 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
@@ -362,12 +381,12 @@ msgstr "Valor stock real"
 #. module: stock
 #: field:report.stock.move,day_diff2:0
 msgid "Lag (Days)"
-msgstr ""
+msgstr "Retraso (días)"
 
 #. module: stock
 #: model:ir.model,name:stock.model_action_traceability
 msgid "Action traceability "
-msgstr ""
+msgstr "Acción trazabilidad "
 
 #. module: stock
 #: field:stock.location,posy:0
@@ -394,13 +413,13 @@ msgstr "Disponible"
 #: view:stock.picking:0
 #: field:stock.picking,min_date:0
 msgid "Expected Date"
-msgstr ""
+msgstr "Fecha prevista"
 
 #. module: stock
 #: view:board.board:0
 #: model:ir.actions.act_window,name:stock.action_outgoing_product_board
 msgid "Outgoing Product"
-msgstr ""
+msgstr "Albarán salida"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -410,7 +429,7 @@ msgstr "STOCK_QUIT"
 #. module: stock
 #: field:report.stock.move,product_qty_in:0
 msgid "In Qty"
-msgstr ""
+msgstr "En cantidad"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_fill_inventory.py:0
@@ -427,17 +446,17 @@ msgstr "Ubicación de salida"
 #: model:ir.actions.act_window,name:stock.split_into
 #: model:ir.model,name:stock.model_stock_split_into
 msgid "Split into"
-msgstr ""
+msgstr "Dividir en"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Today"
-msgstr ""
+msgstr "Hoy"
 
 #. module: stock
 #: field:stock.move,price_currency_id:0
 msgid "Currency for average price"
-msgstr ""
+msgstr "Moneda para precio promedio"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -464,12 +483,12 @@ msgstr "Tipo de ubicación"
 #: help:report.stock.move,type:0
 #: help:stock.picking,type:0
 msgid "Shipping type specify, goods coming in or going out."
-msgstr ""
+msgstr "Indica tipo de envío, mercancías de entrada o de salida."
 
 #. 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
@@ -479,17 +498,17 @@ msgstr "STOCK_DELETE"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_move_labels
 msgid "Item Labels"
-msgstr ""
+msgstr "Etiquetas artículos"
 
 #. module: stock
 #: model:ir.model,name:stock.model_report_stock_move
 msgid "Moves Statistics"
-msgstr ""
+msgstr "Estadísticas de movimientos"
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Product Lots Filter"
-msgstr ""
+msgstr "Filtro lotes de producto"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -505,11 +524,13 @@ msgid ""
 "Current quantity of products with this Production Lot Number available in "
 "company warehouses"
 msgstr ""
+"Cantidad actual de productos con este número de lote de producción "
+"disponible en almacenes de la compañía."
 
 #. module: stock
 #: field:stock.move,move_history_ids:0
 msgid "Move History (child moves)"
-msgstr ""
+msgstr "Historial movimientos (movimientos hijos)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_picking_tree6
@@ -521,13 +542,13 @@ msgstr "Albaranes internos"
 #. module: stock
 #: field:stock.move,location_dest_id:0
 msgid "Destination Location"
-msgstr ""
+msgstr "Ubicación destino"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "You can not process picking without stock moves"
-msgstr ""
+msgstr "No puede procesar un albarán sin movimientos de stock"
 
 #. module: stock
 #: field:stock.move,product_packaging:0
@@ -550,7 +571,7 @@ msgstr "Total:"
 #: model:ir.ui.menu,name:stock.menu_action_stock_move_report
 #: view:report.stock.move:0
 msgid "Moves Analysis"
-msgstr ""
+msgstr "Análisis movimientos"
 
 #. module: stock
 #: view:stock.location:0
@@ -562,13 +583,13 @@ msgstr "Información adicional"
 #: report:lot.stock.overview:0
 #: report:lot.stock.overview_all:0
 msgid "Location / Product"
-msgstr ""
+msgstr "Ubicación / Producto"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Reception"
-msgstr ""
+msgstr "Recepción"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -578,7 +599,7 @@ msgstr "STOCK_FLOPPY"
 #. module: stock
 #: field:stock.tracking,serial:0
 msgid "Additional Reference"
-msgstr ""
+msgstr "Referencia adicional"
 
 #. module: stock
 #: view:stock.production.lot.revision:0
@@ -591,6 +612,8 @@ msgid ""
 "Forces to specify a Production Lot for all moves containing this product and "
 "going to a Customer Location"
 msgstr ""
+"Fuerza a indicar un lote de producción para todos los movimientos que "
+"contienen este producto y van a una ubicación del cliente."
 
 #. module: stock
 #: field:stock.location,complete_name:0
@@ -612,12 +635,12 @@ msgstr "Información de movimiento"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Outgoing"
-msgstr ""
+msgstr "De salida"
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "August"
-msgstr ""
+msgstr "Agosto"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_tracking_form
@@ -625,7 +648,7 @@ msgstr ""
 #: model:ir.ui.menu,name:stock.menu_action_tracking_form
 #: view:stock.tracking:0
 msgid "Packs"
-msgstr ""
+msgstr "Paquetes"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -640,12 +663,12 @@ msgstr "Ventas y Compras"
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "June"
-msgstr ""
+msgstr "Junio"
 
 #. 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
@@ -676,17 +699,17 @@ msgstr "Destinatario"
 #: 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 "Estructura ubicaciones"
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "October"
-msgstr ""
+msgstr "Octubre"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_line
 msgid "Inventory Line"
-msgstr ""
+msgstr "Línea inventario"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -696,7 +719,7 @@ 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
@@ -704,11 +727,14 @@ msgid ""
 "When doing real-time inventory valuation, this is the Accounting Journal in "
 "which entries will be automatically posted when stock moves are processed."
 msgstr ""
+"Al hacer la valoración de inventario en tiempo real, este es el diario "
+"contable donde los asientos se crearán automáticamente cuando los "
+"movimientos de stock se procesen."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_partial_picking
 msgid "Process Picking"
-msgstr ""
+msgstr "Procesar albarán"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -733,16 +759,18 @@ msgid ""
 "Check this option to select existing lots in the list below, otherwise you "
 "should enter new ones line by line."
 msgstr ""
+"Marque esta opción para seleccionar lotes existentes en la lista inferior, "
+"de lo contrario debe introducir otros de nuevos línea por la línea."
 
 #. 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
 msgid "Destination Move"
-msgstr ""
+msgstr "Movimiento destino"
 
 #. module: stock
 #: view:stock.move:0
@@ -759,7 +787,7 @@ msgstr "Dirección ubicación"
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "is consumed with"
-msgstr ""
+msgstr "es consumido con"
 
 #. module: stock
 #: help:stock.move,prodlot_id:0
@@ -780,7 +808,7 @@ msgstr "Ubicación de entrada"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-personal-"
-msgstr ""
+msgstr "terp-personal-"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -790,12 +818,12 @@ msgstr "STOCK_CUT"
 #. module: stock
 #: help:stock.picking,date:0
 msgid "Date of Order"
-msgstr ""
+msgstr "Fecha de orden"
 
 #. module: stock
 #: selection:product.product,valuation:0
 msgid "Periodical (manual)"
-msgstr ""
+msgstr "Periódico (manual)"
 
 #. module: stock
 #: model:stock.location,name:stock.location_procurement
@@ -810,13 +838,13 @@ msgstr "Proveedores TI"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_inventory_form_draft
 msgid "Draft Physical Inventories"
-msgstr ""
+msgstr "Inventarios físicos borrador"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
 #: selection:stock.location,usage:0
 msgid "Transit Location for Inter-Companies Transfers"
-msgstr ""
+msgstr "Ubicación de tránsito para transferencias inter-compañías"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -830,6 +858,8 @@ msgid ""
 "Total quantity after split exceeds the quantity to split ' \\n               "
 "                     'for this product: \"%s\" (id: %d)"
 msgstr ""
+"Cantidad total después de dividir exceda la cantidad a dividir ' \\n         "
+"                           'para este producto: \"%s\" (id: %d)"
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -849,7 +879,7 @@ msgstr ""
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Scrap"
-msgstr ""
+msgstr "Desecho"
 
 #. module: stock
 #: field:stock.location,child_ids:0
@@ -859,12 +889,12 @@ msgstr "Contiene"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-dolar"
-msgstr ""
+msgstr "terp-dolar"
 
 #. module: stock
 #: view:board.board:0
 msgid "Incoming Products Delay"
-msgstr ""
+msgstr "Retraso albaranes entrada"
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -875,7 +905,7 @@ msgstr "Ctdad futura"
 #. module: stock
 #: view:stock.location:0
 msgid "Stock Locations"
-msgstr ""
+msgstr "Ubicaciones stock"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -887,7 +917,7 @@ msgstr "Precio un."
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move_split_lines_exist
 msgid "Exist Split lines"
-msgstr ""
+msgstr "Dividir líneas existentes"
 
 #. module: stock
 #: field:stock.move,date_expected:0
@@ -897,12 +927,12 @@ msgstr "Fecha prevista"
 #. module: stock
 #: view:stock.tracking:0
 msgid "Pack Search"
-msgstr ""
+msgstr "Buscar paquete"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-gtk-jump-to-ltr"
-msgstr ""
+msgstr "terp-gtk-jump-to-ltr"
 
 #. module: stock
 #: selection:stock.move,priority:0
@@ -912,18 +942,18 @@ msgstr "Urgente"
 #. module: stock
 #: view:stock.picking:0
 msgid "Journal"
-msgstr ""
+msgstr "Diario"
 
 #. module: stock
 #: field:product.category,property_stock_variation:0
 msgid "Stock Variation Account"
-msgstr ""
+msgstr "Cuenta variación stock"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Bad Lot Assignation !"
-msgstr ""
+msgstr "¡Asignación de lote errónea!"
 
 #. module: stock
 #: help:stock.picking,location_id:0
@@ -932,16 +962,19 @@ msgid ""
 "needed.Set a location if you produce at a fixed location. This can be a "
 "partner location if you subcontract the manufacturing operations."
 msgstr ""
+"Déjelo vacío si produce en la ubicación donde los productos terminados son "
+"necesarios. Indique un lugar si produce en una ubicación fija. Esto puede "
+"ser una ubicación de empresa si subcontrata las operaciones de fabricación."
 
 #. module: stock
 #: view:res.partner:0
 msgid "Inventory Properties"
-msgstr ""
+msgstr "Propiedades inventario"
 
 #. module: stock
 #: field:report.stock.move,day_diff:0
 msgid "Execution Lead Time (Days)"
-msgstr ""
+msgstr "Tiempo inicial de ejecución (días)"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_stock_product_location_open
@@ -956,25 +989,26 @@ msgstr "STOCK_SAVE_AS"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Month-1"
-msgstr ""
+msgstr "Mes-1"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-stock_symbol-selection"
-msgstr ""
+msgstr "terp-stock_symbol-selection"
 
 #. module: stock
 #: help:stock.location,active:0
 msgid ""
 "By unchecking the active field, you may hide a location without deleting it."
 msgstr ""
+"Si el campo activo se desmarca, permite ocultar la ubicación sin eliminarla."
 
 #. module: stock
 #: help:stock.location,posx:0
 #: help:stock.location,posy:0
 #: help:stock.location,posz:0
 msgid "Optional localization details, for information purpose only"
-msgstr ""
+msgstr "Detalles de ubicación opcionales, sólo para fines de información."
 
 #. module: stock
 #: field:stock.location,stock_virtual:0
@@ -1005,7 +1039,7 @@ msgstr "STOCK_INDEX"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-stage"
-msgstr ""
+msgstr "terp-stage"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1037,7 +1071,7 @@ msgstr "Ubicación de producción"
 #. module: stock
 #: help:stock.picking,address_id:0
 msgid "Address of partner"
-msgstr ""
+msgstr "Dirección de empresa"
 
 #. module: stock
 #: model:res.company,overdue_msg:stock.res_company_tinyshop0
@@ -1058,6 +1092,21 @@ msgid ""
 "%(company_name)s\n"
 "        "
 msgstr ""
+"\n"
+"Fecha: %(date)s\n"
+"\n"
+"Estimado %(partner_name)s,\n"
+"\n"
+"En el adjunto encontrará un recordatorio de todas las facturas no pagadas, "
+"por un importe total de:\n"
+"\n"
+"%(followup_amount).2f %(company_currency)s\n"
+"\n"
+"Gracias,\n"
+"--\n"
+"%(user_signature)s\n"
+"%(company_name)s\n"
+"        "
 
 #. module: stock
 #: help:stock.location,usage:0
@@ -1086,6 +1135,31 @@ msgid ""
 "location consumes the raw material and produces finished products\n"
 "                      "
 msgstr ""
+"* Ubicación proveedor: Ubicación virtual que representa la ubicación de "
+"origen para los productos procedentes de sus proveedores.\n"
+"\n"
+"* Vista: Ubicación virtual para crear una estructura jerárquica de su "
+"almacén, agregando sus ubicaciones hijas. No puede contener los productos "
+"directamente.\n"
+"\n"
+"* Ubicación interna: Ubicación física dentro de su propios almacenes.\n"
+"\n"
+"* Ubicación cliente: Ubicación virtual que representa la ubicación de "
+"destino para los productos enviados a sus clientes.\n"
+"\n"
+"* Inventario: Ubicación virtual que actúa como contrapartida de las "
+"operaciones de inventario utilizadas para corregir los niveles de "
+"existencias (inventarios físicos).\n"
+"\n"
+"* Abastecimiento: Ubicación virtual que actúa como contrapartida temporal de "
+"las operaciones de abastecimiento cuando el origen (proveedor o producción) "
+"no se conoce todavía. Esta ubicación debe estar vacía cuando el planificador "
+"de abastecimientos haya terminado de ejecutarse.\n"
+"\n"
+"* Producción: Ubicación virtual de contrapartida para operaciones de "
+"producción: esta ubicación consume la materia prima y produce los productos "
+"terminados.\n"
+"                      "
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1106,7 +1180,7 @@ msgstr "STOCK_UNDELETE"
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Delivery Order"
-msgstr ""
+msgstr "Orden de entrega"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1117,7 +1191,7 @@ msgstr "STOCK_EXECUTE"
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:0
 #, python-format
 msgid "No invoice were created"
-msgstr ""
+msgstr "No se han creado facturas"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1133,7 +1207,7 @@ msgstr "Operación manual"
 #: view:stock.location:0
 #: view:stock.move:0
 msgid "Supplier"
-msgstr ""
+msgstr "Proveedor"
 
 #. module: stock
 #: field:stock.picking,date_done:0
@@ -1148,12 +1222,12 @@ msgstr "Fecha de envío prevista"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-accessories-archiver-minus"
-msgstr ""
+msgstr "terp-accessories-archiver-minus"
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "March"
-msgstr ""
+msgstr "Marzo"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_inventory_line_split
@@ -1161,12 +1235,12 @@ msgstr ""
 #: view:stock.inventory:0
 #: view:stock.inventory.line:0
 msgid "Split inventory lines"
-msgstr ""
+msgstr "Dividir líneas de inventario"
 
 #. module: stock
 #: view:stock.inventory:0
 msgid "Physical Inventory"
-msgstr ""
+msgstr "Inventario físico"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1179,6 +1253,9 @@ msgid ""
 "The company the Picking List containing the chained move will belong to "
 "(leave empty to use the default company determination rules"
 msgstr ""
+"La compañía a la que pertenece el albarán que contiene el movimiento "
+"encadenado (dejarlo vacío para utilizar las reglas por defecto para "
+"determinar la compañía)."
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1188,7 +1265,7 @@ msgstr "STOCK_PASTE"
 #. module: stock
 #: view:stock.move.split:0
 msgid "Lot number"
-msgstr ""
+msgstr "Número de lote"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_locations_partner
@@ -1213,7 +1290,7 @@ msgstr ""
 #: view:report.stock.inventory:0
 #: view:report.stock.move:0
 msgid "Total quantity"
-msgstr ""
+msgstr "Cantidad total"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1224,7 +1301,7 @@ msgstr "STOCK_ZOOM_FIT"
 #: model:ir.actions.act_window,name:stock.move_consume
 #: view:stock.move.consume:0
 msgid "Consume Move"
-msgstr ""
+msgstr "Movimiento consumo"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_7
@@ -1234,7 +1311,7 @@ msgstr "Clientes europeos"
 #. module: stock
 #: help:stock.location,chained_delay:0
 msgid "Delay between original move and chained move in days"
-msgstr ""
+msgstr "Retraso entre movimiento original y movimiento encadenado en días."
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1244,7 +1321,7 @@ msgstr "terp-calendar"
 #. module: stock
 #: view:stock.fill.inventory:0
 msgid "Import current product inventory from the following location"
-msgstr ""
+msgstr "Importar inventario de producto actual para la siguiente ubicación"
 
 #. module: stock
 #: help:stock.location,chained_auto_packing:0
@@ -1255,11 +1332,17 @@ msgid ""
 "move has to be validated by a worker. With 'Automatic No Step Added', the "
 "location is replaced in the original move."
 msgstr ""
+"Se utiliza sólo si selecciona un tipo de ubicación encadenada.\n"
+"La opción 'Movimiento automático' creará un movimiento de stock después del "
+"actual que se validará automáticamente. Con 'Operación manual', el "
+"movimiento de stock debe ser validado por un trabajador. Con 'Mov. "
+"automático, paso no añadido', la ubicación se reemplaza en el movimiento "
+"original."
 
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Downstream Traceability"
-msgstr ""
+msgstr "Trazabilidad hacia abajo"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -1273,6 +1356,9 @@ msgid ""
 "default one, as the source location for stock moves generated by production "
 "orders"
 msgstr ""
+"Para los productos actuales, esta ubicación de stock se utilizará, en lugar "
+"de la de por defecto, como la ubicación de origen para los movimientos de "
+"stock generados por las órdenes de producción."
 
 #. module: stock
 #: help:stock.move,price_unit:0
@@ -1280,12 +1366,15 @@ msgid ""
 "Technical field used to record the product cost set by the user during a "
 "picking confirmation (when average price costing method is used)"
 msgstr ""
+"Campo técnico utilizado para registrar el coste del producto indicado por el "
+"usuario durante una confirmación de albarán (cuando se utiliza el método del "
+"precio medio de coste)."
 
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "is in draft state."
-msgstr ""
+msgstr "está en estado borrador."
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -1294,6 +1383,8 @@ msgid ""
 "There is no stock output account defined ' \\n                               "
 "             'for this product: \"%s\" (id: %d)"
 msgstr ""
+"No se ha definido una cuenta de salida de stock ' \\n                        "
+"                    'para este producto: \"%s\" (id: %d)"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1303,24 +1394,24 @@ msgstr "STOCK_MEDIA_RECORD"
 #. module: stock
 #: field:stock.location,chained_auto_packing:0
 msgid "Chaining Type"
-msgstr ""
+msgstr "Tipo encadenado"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:0
 #, python-format
 msgid "To be refunded/invoiced"
-msgstr ""
+msgstr "Para ser abonado/facturado"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop0
 msgid "Shop 1"
-msgstr ""
+msgstr "Tienda 1"
 
 #. module: stock
 #: field:report.stock.inventory,value:0
 #: field:report.stock.move,value:0
 msgid "Total Value"
-msgstr ""
+msgstr "Valor total"
 
 #. module: stock
 #: view:stock.change.standard.price:0
@@ -1333,12 +1424,12 @@ msgstr ""
 #: view:stock.picking:0
 #: view:stock.split.into:0
 msgid "_Cancel"
-msgstr ""
+msgstr "_Cancelar"
 
 #. module: stock
 #: view:stock.move:0
 msgid "Ready"
-msgstr ""
+msgstr "Preparado"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1348,12 +1439,12 @@ msgstr "Vista calendario"
 #. module: stock
 #: view:stock.picking:0
 msgid "Additional Info"
-msgstr ""
+msgstr "Información adicional"
 
 #. module: stock
 #: report:stock.inventory.move:0
 msgid "Stock Inventory"
-msgstr ""
+msgstr "Inventario stock"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1370,6 +1461,8 @@ msgstr "Desde"
 #, python-format
 msgid "You may only return pickings that are Confirmed, Available or Done!"
 msgstr ""
+"¡Sólo puede devolver albaranes que estén confirmados, disponibles o "
+"realizados!"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1385,7 +1478,7 @@ msgstr "Revisiones de lote de producción"
 #. module: stock
 #: view:stock.picking:0
 msgid "Internal Picking List"
-msgstr ""
+msgstr "Albarán interno"
 
 #. module: stock
 #: selection:report.stock.inventory,state:0
@@ -1405,13 +1498,13 @@ msgstr "Dividir"
 #. module: stock
 #: view:stock.picking:0
 msgid "Search Stock Picking"
-msgstr ""
+msgstr "Buscar albarán stock"
 
 #. module: stock
 #: code:addons/stock/product.py:0
 #, python-format
 msgid "Company is not specified in Location"
-msgstr ""
+msgstr "No se ha especificado una compañía en la ubicación"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1440,7 +1533,7 @@ msgstr "STOCK_FILE"
 #: field:stock.production.lot,date:0
 #: field:stock.tracking,date:0
 msgid "Creation Date"
-msgstr ""
+msgstr "Fecha creación"
 
 #. module: stock
 #: field:report.stock.lines.date,id:0
@@ -1450,12 +1543,12 @@ msgstr "Id línea de inventario"
 #. module: stock
 #: help:stock.location,address_id:0
 msgid "Address of  customer or supplier."
-msgstr ""
+msgstr "Dirección del cliente o proveedor."
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-gdu-smart-failing"
-msgstr ""
+msgstr "terp-gdu-smart-failing"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -1494,7 +1587,7 @@ msgstr "STOCK_OK"
 #: code:addons/stock/wizard/stock_partial_move.py:0
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "¡Acción no válida!"
 
 #. module: stock
 #: selection:stock.location,icon:0
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index 51f7d25900a..48dbc8c5684 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/i18n/ru.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2010-11-02 07:24+0000\n"
+"PO-Revision-Date: 2010-11-13 08:38+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-11-03 04:59+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock
@@ -3321,12 +3321,12 @@ msgstr "Поставщики"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUMP_TO"
-msgstr ""
+msgstr "STOCK_JUMP_TO"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_INDENT"
-msgstr ""
+msgstr "STOCK_INDENT"
 
 #. module: stock
 #: selection:stock.location,icon:0
@@ -3347,7 +3347,7 @@ msgstr "ТМЦ по местам хранения"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_INFO"
-msgstr ""
+msgstr "STOCK_DIALOG_INFO"
 
 #. module: stock
 #: field:stock.fill.inventory,recursive:0
@@ -3372,7 +3372,7 @@ msgstr "Заказ"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ADD"
-msgstr ""
+msgstr "STOCK_ADD"
 
 #. module: stock
 #: field:stock.tracking,name:0
@@ -3405,7 +3405,7 @@ msgstr "Единицы измерения"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PAUSE"
-msgstr ""
+msgstr "STOCK_MEDIA_PAUSE"
 
 #. module: stock
 #: model:stock.location,name:stock.stock_location_intermediatelocation0
@@ -3471,7 +3471,7 @@ msgstr ""
 #: model:ir.model,name:stock.model_report_stock_lines_date
 #: view:report.stock.lines.date:0
 msgid "Dates of Inventories"
-msgstr ""
+msgstr "Даты инвентаризаций"
 
 #. module: stock
 #: view:report.stock.move:0
@@ -3486,7 +3486,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_PRINT_PREVIEW"
-msgstr ""
+msgstr "STOCK_PRINT_PREVIEW"
 
 #. module: stock
 #: field:stock.production.lot,move_ids:0
@@ -3497,7 +3497,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_fill_inventory.py:0
 #, python-format
 msgid "Message !"
-msgstr ""
+msgstr "Сообщение !"
 
 #. module: stock
 #: view:stock.move:0
@@ -3513,7 +3513,7 @@ msgstr "Инвентаризация партии"
 #. module: stock
 #: view:stock.move:0
 msgid "Reason"
-msgstr ""
+msgstr "Причина"
 
 #. module: stock
 #: field:stock.location,icon:0
@@ -3529,12 +3529,12 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_ZOOM_IN"
-msgstr ""
+msgstr "STOCK_ZOOM_IN"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-go-week"
-msgstr ""
+msgstr "terp-go-week"
 
 #. module: stock
 #: view:stock.inventory.line.split:0
@@ -3557,7 +3557,7 @@ msgstr "Неевропейские заказчики"
 #: code:addons/stock/wizard/stock_splitinto.py:0
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Ошибка !"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -3579,7 +3579,7 @@ msgstr ""
 #: selection:stock.move,state:0
 #: selection:stock.picking,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Отменено"
 
 #. module: stock
 #: field:stock.location,chained_location_type:0
@@ -3622,24 +3622,24 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PLAY"
-msgstr ""
+msgstr "STOCK_MEDIA_PLAY"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_inventory_merge.py:0
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Внимание"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "is done."
-msgstr ""
+msgstr "делается."
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_OPEN"
-msgstr ""
+msgstr "STOCK_OPEN"
 
 #. module: stock
 #: help:res.partner,property_stock_customer:0
@@ -3667,7 +3667,7 @@ msgstr ""
 #. module: stock
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Ошибка ! Нельзя создать зацикленные меню."
 
 #. module: stock
 #: view:stock.picking:0
@@ -3682,7 +3682,7 @@ msgstr ""
 #. module: stock
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Ошибка ! Нельзя создать зацикленные компании."
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_view_stock_merge_inventories
@@ -3693,7 +3693,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-go-home"
-msgstr ""
+msgstr "terp-go-home"
 
 #. module: stock
 #: field:product.product,location_id:0
@@ -3717,7 +3717,7 @@ msgstr "Связанное комплектование"
 #. module: stock
 #: view:report.stock.move:0
 msgid "Total outgoing quantity"
-msgstr ""
+msgstr "Общее исходящее количество"
 
 #. module: stock
 #: field:stock.picking,backorder_id:0
@@ -3729,7 +3729,7 @@ msgstr ""
 #: code:addons/stock/wizard/stock_partial_picking.py:0
 #, python-format
 msgid "Unit Cost for this product line"
-msgstr ""
+msgstr "Стоимость единицы для этой позиции ТМЦ"
 
 #. module: stock
 #: model:ir.model,name:stock.model_product_category
@@ -3749,7 +3749,7 @@ msgstr "Отчетность"
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid " for the "
-msgstr ""
+msgstr " для "
 
 #. module: stock
 #: view:stock.split.into:0
@@ -3765,7 +3765,7 @@ msgstr "Создать счет"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_NETWORK"
-msgstr ""
+msgstr "STOCK_NETWORK"
 
 #. module: stock
 #: view:report.stock.lines.date:0
@@ -3802,12 +3802,12 @@ msgstr "Клиенты"
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "is cancelled."
-msgstr ""
+msgstr "отменяется."
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-document-new"
-msgstr ""
+msgstr "terp-document-new"
 
 #. module: stock
 #: view:stock.inventory.line:0
@@ -3818,7 +3818,7 @@ msgstr "Позиции инвентаризации склада"
 #: code:addons/stock/wizard/stock_partial_picking.py:0
 #, python-format
 msgid "Process Document"
-msgstr ""
+msgstr "Обработка документа"
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -3840,7 +3840,7 @@ msgstr ""
 #. module: stock
 #: view:stock.picking:0
 msgid "Additional info"
-msgstr ""
+msgstr "Доп. информация"
 
 #. module: stock
 #: view:stock.move:0
@@ -3880,17 +3880,17 @@ msgstr "Автопроверка"
 #. module: stock
 #: model:ir.model,name:stock.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Шаблон ТМЦ"
 
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "December"
-msgstr ""
+msgstr "Декабрь"
 
 #. module: stock
 #: selection:stock.location,chained_auto_packing:0
 msgid "Automatic Move"
-msgstr ""
+msgstr "Автоматическое перемещение"
 
 #. module: stock
 #: field:stock.location,stock_virtual_value:0
@@ -3900,7 +3900,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-mail_delete"
-msgstr ""
+msgstr "terp-mail_delete"
 
 #. module: stock
 #: help:stock.move,price_currency_id:0
@@ -3912,17 +3912,17 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-go-month"
-msgstr ""
+msgstr "terp-go-month"
 
 #. module: stock
 #: model:ir.ui.menu,name:stock.menu_stock_products_moves
 msgid "Products Moves"
-msgstr ""
+msgstr "Перемещения ТМЦ"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_GOTO_LAST"
-msgstr ""
+msgstr "STOCK_GOTO_LAST"
 
 #. module: stock
 #: selection:stock.picking,invoice_state:0
@@ -3937,7 +3937,7 @@ msgstr "Адрес назначения"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIRECTORY"
-msgstr ""
+msgstr "STOCK_DIRECTORY"
 
 #. module: stock
 #: field:stock.picking,max_date:0
@@ -3952,7 +3952,7 @@ msgstr "Авто-комплектование"
 #. module: stock
 #: model:stock.location,name:stock.stock_location_shop1
 msgid "Shop 2"
-msgstr ""
+msgstr "Магазин 2"
 
 #. module: stock
 #: constraint:res.partner:0
@@ -3981,7 +3981,7 @@ msgstr "Черновик"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_CENTER"
-msgstr ""
+msgstr "STOCK_JUSTIFY_CENTER"
 
 #. module: stock
 #: help:report.stock.inventory,state:0
@@ -3996,18 +3996,18 @@ msgstr ""
 #. module: stock
 #: field:stock.move.split.lines,use_exist:0
 msgid "Existing Lot"
-msgstr ""
+msgstr "Существующая партия"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_PREVIOUS"
-msgstr ""
+msgstr "STOCK_MEDIA_PREVIOUS"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_return_picking.py:0
 #, python-format
 msgid "Please specify at least one non-zero quantity!"
-msgstr ""
+msgstr "Пожалуйста, укажите хотя бы одно ненулевое количество !"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -4028,7 +4028,7 @@ msgstr ""
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "is ready to process."
-msgstr ""
+msgstr "готово к обработке."
 
 #. module: stock
 #: help:stock.picking,origin:0
@@ -4038,7 +4038,7 @@ msgstr "Ссылка на документ создавший это компл
 #. module: stock
 #: field:stock.fill.inventory,set_stock_zero:0
 msgid "Set to zero"
-msgstr ""
+msgstr "Обнулить"
 
 #. module: stock
 #: selection:stock.picking,move_type:0
@@ -4048,7 +4048,7 @@ msgstr "Прямая доставка"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_REVERT_TO_SAVED"
-msgstr ""
+msgstr "STOCK_REVERT_TO_SAVED"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:0
@@ -4059,7 +4059,7 @@ msgstr "Нет комплектовочных листов требующих в
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "November"
-msgstr ""
+msgstr "Ноябрь"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -4071,7 +4071,7 @@ msgstr "Не определен журнал для категории ТМЦ: \
 #: code:addons/stock/product.py:0
 #, python-format
 msgid "Unplanned Qty"
-msgstr ""
+msgstr "Незапланированное кол-во"
 
 #. module: stock
 #: code:addons/stock/stock.py:0
@@ -4093,7 +4093,7 @@ msgstr "Проверить доступность"
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "Not Available. Moves are not confirmed."
-msgstr ""
+msgstr "Недоступно. Перемещения не подтверждены."
 
 #. module: stock
 #: help:product.product,track_incoming:0
@@ -4107,12 +4107,12 @@ msgstr ""
 #. module: stock
 #: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
 msgid "Future Stock Moves"
-msgstr ""
+msgstr "Будущие перемещения ТМЦ"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-gtk-select-all"
-msgstr ""
+msgstr "terp-gtk-select-all"
 
 #. module: stock
 #: field:stock.move,move_history_ids2:0
@@ -4122,7 +4122,7 @@ msgstr ""
 #. module: stock
 #: view:stock.move:0
 msgid "Extended options..."
-msgstr ""
+msgstr "Расширенные опции..."
 
 #. module: stock
 #: code:addons/stock/product.py:0
@@ -4135,12 +4135,12 @@ msgstr ""
 #: code:addons/stock/wizard/stock_invoice_onshipping.py:0
 #, python-format
 msgid "Error"
-msgstr ""
+msgstr "Ошибка"
 
 #. module: stock
 #: field:stock.ups.final,xmlfile:0
 msgid "XML File"
-msgstr ""
+msgstr "Файл XML"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_partial_move.py:0
@@ -4172,7 +4172,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-mail-message-new"
-msgstr ""
+msgstr "terp-mail-message-new"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_location_form
@@ -4189,17 +4189,17 @@ msgstr "Общая информация"
 #. module: stock
 #: field:stock.production.lot,prefix:0
 msgid "Prefix"
-msgstr ""
+msgstr "Префикс"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DISCONNECT"
-msgstr ""
+msgstr "STOCK_DISCONNECT"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-product"
-msgstr ""
+msgstr "terp-product"
 
 #. module: stock
 #: view:stock.move:0
@@ -4223,12 +4223,12 @@ msgstr ""
 #: code:addons/stock/stock.py:0
 #, python-format
 msgid "quantity."
-msgstr ""
+msgstr "количество."
 
 #. module: stock
 #: view:stock.move:0
 msgid "Expected"
-msgstr ""
+msgstr "Ожидается"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -4270,12 +4270,12 @@ msgstr "Описание"
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "May"
-msgstr ""
+msgstr "Май"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_DIALOG_AUTHENTICATION"
-msgstr ""
+msgstr "STOCK_DIALOG_AUTHENTICATION"
 
 #. module: stock
 #: help:product.template,property_stock_account_output:0
@@ -4302,7 +4302,7 @@ msgstr "Содержимое места хранения"
 #: code:addons/stock/product.py:0
 #, python-format
 msgid "Produced Qty"
-msgstr ""
+msgstr "Произведенное кол-во"
 
 #. module: stock
 #: field:product.category,property_stock_account_input_categ:0
@@ -4331,7 +4331,7 @@ msgstr "Клиент"
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "February"
-msgstr ""
+msgstr "Февраль"
 
 #. module: stock
 #: view:stock.production.lot:0
@@ -4347,13 +4347,13 @@ msgstr "Место хранения брака"
 #. module: stock
 #: selection:report.stock.move,month:0
 msgid "April"
-msgstr ""
+msgstr "Апрель"
 
 #. module: stock
 #: view:report.stock.inventory:0
 #: view:stock.move:0
 msgid "Future"
-msgstr ""
+msgstr "Будущее"
 
 #. module: stock
 #: field:stock.invoice.onshipping,invoice_date:0
@@ -4373,7 +4373,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
@@ -4383,12 +4383,12 @@ msgstr "Выход"
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_JUSTIFY_RIGHT"
-msgstr ""
+msgstr "STOCK_JUSTIFY_RIGHT"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "terp-mrp"
-msgstr ""
+msgstr "terp-mrp"
 
 #. module: stock
 #: help:stock.location,chained_picking_type:0
@@ -4416,12 +4416,12 @@ msgstr "Опционально: следующее перемещение ТМЦ
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_MEDIA_NEXT"
-msgstr ""
+msgstr "STOCK_MEDIA_NEXT"
 
 #. module: stock
 #: selection:stock.location,icon:0
 msgid "STOCK_REDO"
-msgstr ""
+msgstr "STOCK_REDO"
 
 #. module: stock
 #: view:report.stock.move:0
diff --git a/addons/stock/report/lot_overview.py b/addons/stock/report/lot_overview.py
index 66230e2822c..89974fa122b 100644
--- a/addons/stock/report/lot_overview.py
+++ b/addons/stock/report/lot_overview.py
@@ -37,7 +37,7 @@ class lot_overview(report_sxw.rml_parse):
     def process(self,location_id):
         location_obj = pooler.get_pool(self.cr.dbname).get('stock.location')
         data = location_obj._product_get_report(self.cr,self.uid, [location_id])
-         
+
         data['location_name'] = location_obj.read(self.cr, self.uid, [location_id],['complete_name'])[0]['complete_name']
         self.price_total = 0.0
         self.price_total += data['total_price']
@@ -50,7 +50,7 @@ class lot_overview(report_sxw.rml_parse):
     def _grand_total(self):
         return self.grand_total
 
-report_sxw.report_sxw('report.lot.stock.overview', 'stock.location', 'addons/stock/report/lot_overview.rml', parser=lot_overview)
+report_sxw.report_sxw('report.lot.stock.overview', 'stock.location', 'addons/stock/report/lot_overview.rml', parser=lot_overview,header='internal')
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/lot_overview.rml b/addons/stock/report/lot_overview.rml
index 4283bd2e960..aae5abacf0a 100644
--- a/addons/stock/report/lot_overview.rml
+++ b/addons/stock/report/lot_overview.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="Location Overview.pdf">
-  <template pageSize="(595.0,842.0)" title="Location Overview" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
+<document filename="Location Inventory Overview.pdf">
+  <template pageSize="(595.0,842.0)" title="Location Inventory Overview" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="33.0" y1="57.0" width="526" height="728"/>
     </pageTemplate>
@@ -24,6 +24,8 @@
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#999999" start="0,-1" stop="0,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#999999" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#999999" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#999999" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table8">
       <blockAlignment value="LEFT"/>
@@ -89,7 +91,7 @@
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
-    <para style="terp_header_Centre">Location Overview</para>
+    <para style="terp_header_Centre">Location Inventory Overview</para>
     <para style="terp_default_8">
       <font color="white"> </font>
     </para>
diff --git a/addons/stock/report/lot_overview_all.rml b/addons/stock/report/lot_overview_all.rml
index 5104671fa11..e5aca0e3035 100644
--- a/addons/stock/report/lot_overview_all.rml
+++ b/addons/stock/report/lot_overview_all.rml
@@ -23,6 +23,9 @@
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#999999" start="0,-1" stop="0,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#999999" start="1,-1" stop="1,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#999999" start="2,-1" stop="2,-1"/>
+      <lineStyle kind="LINEBELOW" colorName="#999999" start="3,-1" stop="3,-1"/>
     </blockTableStyle>
     <blockTableStyle id="Table8">
       <blockAlignment value="LEFT"/>
@@ -194,5 +197,8 @@
         </td>
       </tr>
     </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
   </story>
 </document>
\ No newline at end of file
diff --git a/addons/stock/report/picking.py b/addons/stock/report/picking.py
index 29a53fba7a2..27141c917a9 100644
--- a/addons/stock/report/picking.py
+++ b/addons/stock/report/picking.py
@@ -29,7 +29,14 @@ class picking(report_sxw.rml_parse):
         super(picking, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
             'time': time,
+            'get_qtytotal':self._get_qtytotal
         })
+    def _get_qtytotal(self,move_lines):
+        total = 0.0
+        uom = move_lines[0].product_uom.name
+        for move in move_lines:
+            total+=move.product_qty
+        return {'quantity':total,'uom':uom}
 
 report_sxw.report_sxw('report.stock.picking.list','stock.picking','addons/stock/report/picking.rml',parser=picking)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml
index 6c6027093a0..cc6923ac545 100644
--- a/addons/stock/report/picking.rml
+++ b/addons/stock/report/picking.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Picking List" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Packing List.pdf">
+  <template pageSize="(595.0,842.0)" title="Packing List" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="0.0" y1="57.0" width="538" height="728"/>
     </pageTemplate>
@@ -70,7 +70,7 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
-    <blockTableStyle id="Move_Line_Content_Other_State">
+    <blockTableStyle id="Table1">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
@@ -79,6 +79,12 @@
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
       <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
     </blockTableStyle>
+    <blockTableStyle id="Table2">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
+    </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
     </initialize>
@@ -203,13 +209,13 @@
           <para style="terp_tblheader_Details_Centre">Lot</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details">State</para>
+          <para style="terp_tblheader_Details_Centre">State</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Quantity</para>
+          <para style="terp_tblheader_Details_Right">Location</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">Location</para>
+          <para style="terp_tblheader_Details_Right">Quantity</para>
         </td>
       </tr>
     </blockTable>
@@ -228,19 +234,20 @@
             <para style="terp_default_9">[[ move_lines.state ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ move_lines.product_qty ]] [[ move_lines.product_uom.name ]] </para>
+            <para style="terp_default_Right_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]] </para>
           </td>
           <td>
-            <para style="terp_default_Centre_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(move_lines.product_qty) ]] [[ move_lines.product_uom.name ]]</para>
           </td>
         </tr>
       </blockTable>
     </section>
     <para style="terp_default_Bold_9">[[ ([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting' )]) and 'Non Assigned Products:' or removeParentNode('para') ]]</para>
+    <para style="terp_default_2"/>
     <section>
-      <para style="terp_default_2">[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]] </para>
+      <para style="terp_default_2">[[ repeatIn([line for line in picking.move_lines if (line.state == 'draft' or line.state=='waiting')],'move_lines') ]]</para>
       <para style="terp_default_2">[[ (picking.move_lines!=[] and removeParentNode('para')) or removeParentNode('section')]]</para>
-      <blockTable colWidths="256.0,74.0,57.0,61.0,72.0" style="Move_Line_Content_Other_State">
+      <blockTable colWidths="256.0,74.0,57.0,61.0,72.0" style="Table1">
         <tr>
           <td>
             <para style="terp_default_9"><font face="Helvetica" size="9.0">[ [[ (move_lines.product_id.default_code) or removeParentNode('font') ]] ]</font> [[ move_lines.product_id.name ]] [[ move_lines.product_id.variants or '']]</para>
@@ -252,16 +259,31 @@
             <para style="terp_default_9">[[ move_lines.state ]]</para>
           </td>
           <td>
-            <para style="terp_default_Right_9">[[ move_lines.product_qty ]] [[ move_lines.product_uom.name ]] </para>
+            <para style="terp_default_Right_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]] </para>
           </td>
           <td>
-            <para style="terp_default_Centre_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para>
+            <para style="terp_default_Right_9">[[ formatLang(move_lines.product_qty) ]] [[ move_lines.product_uom.name ]]</para>
           </td>
         </tr>
       </blockTable>
-      <para style="terp_default_2">
-        <font color="white"> </font>
-      </para>
     </section>
+    <blockTable colWidths="388.0,56.0,77.0" style="Table2">
+      <tr>
+        <td>
+          <para style="terp_default_9">
+            <font color="white"> </font>
+          </para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Centre">Total</para>
+        </td>
+        <td>
+          <para style="terp_tblheader_Details_Right">[[ formatLang(get_qtytotal(picking.move_lines)['quantity']) ]] [[ get_qtytotal(picking.move_lines)['uom'] ]]</para>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="terp_default_2">
+      <font color="white"> </font>
+    </para>
   </story>
 </document>
\ No newline at end of file
diff --git a/addons/stock/report/report_stock_move_view.xml b/addons/stock/report/report_stock_move_view.xml
index 91ded919ced..094b6d43e57 100644
--- a/addons/stock/report/report_stock_move_view.xml
+++ b/addons/stock/report/report_stock_move_view.xml
@@ -33,7 +33,7 @@
                 <field name="value"  sum="Total value"/>
                 <field name="day_diff1"/>
                 <field name="day_diff"/>
-                <field name="day_diff2"/>
+                <field name="day_diff2" string="Delay(Days)"/>
            </tree>
         </field>
     </record>
@@ -56,7 +56,7 @@
          <field name="arch" type="xml">
              <graph string="Moves Analysis" type="bar">
                  <field name="day"/>
-                 <field name="day_diff2" operator="+"/>
+                 <field name="day_diff2" operator="+" string="Delay(Days)"/>
              </graph>
          </field>
     </record>
diff --git a/addons/stock/report/stock_graph.py b/addons/stock/report/stock_graph.py
index 4d4c03fb80c..5ee58bb9d2c 100644
--- a/addons/stock/report/stock_graph.py
+++ b/addons/stock/report/stock_graph.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 from pychart import *
@@ -31,6 +31,7 @@ class stock_graph(object):
         self._datas = {}
         self._canvas = canvas.init(fname=io, format='pdf')
         self._canvas.set_author("OpenERP")
+        self._canvas.set_title("Stock Level Forecast")
         self._names = {}
         self.val_min = ''
         self.val_max = ''
@@ -91,6 +92,9 @@ class stock_graph(object):
 
         interval = max((val_max-val_min)/15, 86400)
         x_axis = axis.X(format=lambda x:'/a60{}'+time.strftime('%Y-%m-%d',time.gmtime(x)), tic_interval=interval, label=None)
+        # For add the report header on the top of the report.
+        tb = text_box.T(loc=(300, 500), text="/hL/15/bStock Level Forecast", line_style=None)
+        tb.draw()
         ar = area.T(size = (620,435), x_range=(val_min,val_max+1), y_axis = axis.Y(format="%d", label="Virtual Stock (Unit)"), x_axis=x_axis)
         for plot in plots:
             ar.add_plot(plot)
diff --git a/addons/stock/report/stock_inventory_move.rml b/addons/stock/report/stock_inventory_move.rml
index 9531c534dec..a6f8971ac6d 100755
--- a/addons/stock/report/stock_inventory_move.rml
+++ b/addons/stock/report/stock_inventory_move.rml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<document filename="test.pdf">
-  <template pageSize="(595.0,842.0)" title="Stock Inventory" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
+<document filename="Stock Inventory.pdf">
+  <template pageSize="(595.0,842.0)" title="Stock Inventory" author="OpenERP S.A.(sales@openerp.com)" allowSplitting="20">
     <pageTemplate id="first">
       <frame id="first" x1="28.0" y1="28.0" width="539" height="786"/>
     </pageTemplate>
@@ -59,8 +59,8 @@
     <blockTableStyle id="Table7">
       <blockAlignment value="LEFT"/>
       <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
       <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
+      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
     </blockTableStyle>
     <initialize>
       <paraStyle name="all" alignment="justify"/>
@@ -111,13 +111,6 @@
           <para style="terp_header_Centre">Stock Inventory</para>
         </td>
       </tr>
-      <tr>
-        <td>
-          <para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
-        </td>
-      </tr>
     </blockTable>
     <blockTable colWidths="539.0" style="Table5">
       <tr>
@@ -167,11 +160,8 @@
         </td>
       </tr>
     </blockTable>
-    <para style="terp_default_2">
-      <font color="white"> </font>
-    </para>
     <section>
-      <para style="terp_default_9">[[ repeatIn(o.inventory_line_id, 'p') ]]</para>
+      <para style="terp_default_2">[[ repeatIn(o.inventory_line_id, 'p') ]]</para>
       <blockTable colWidths="70.0,105.0,255.0,109.0" style="Table8">
         <tr>
           <td>
@@ -189,13 +179,18 @@
         </tr>
       </blockTable>
     </section>
-    <blockTable colWidths="430.0,109.0" style="Table7">
+    <blockTable colWidths="383.0,47.0,109.0" style="Table7">
       <tr>
+        <td>
+          <para style="terp_default_Bold_9">
+            <font color="white"> </font>
+          </para>
+        </td>
         <td>
           <para style="terp_default_Bold_9">Total:</para>
         </td>
         <td>
-          <para style="terp_default_Bold_Right_9">[[ format(qty_total(o.inventory_line_id)['quantity']) ]] [[ format(qty_total(o.inventory_line_id)['uom']) ]]</para>
+          <para style="terp_default_Bold_Right_9">[[ formatLang(qty_total(o.inventory_line_id)['quantity']) ]] [[ qty_total(o.inventory_line_id)['uom'] ]]</para>
         </td>
       </tr>
     </blockTable>
@@ -203,4 +198,4 @@
       <font color="white"> </font>
     </para>
   </story>
-</document>
+</document>
\ No newline at end of file
diff --git a/addons/stock/report/stock_inventory_move_report.py b/addons/stock/report/stock_inventory_move_report.py
index b89b6b9fa9b..e8c0d44bcc1 100755
--- a/addons/stock/report/stock_inventory_move_report.py
+++ b/addons/stock/report/stock_inventory_move_report.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -29,18 +29,19 @@ class stock_inventory_move(report_sxw.rml_parse):
              'time': time,
              'qty_total':self._qty_total
         })
-        
+
     def _qty_total(self,objects):
         total = 0.0
         uom = objects[0].product_uom.name
         for obj in objects:
             total += obj.product_qty
-        return {'quantity':str(total),'uom':uom}
+        return {'quantity':total,'uom':uom}
 
 report_sxw.report_sxw(
     'report.stock.inventory.move',
     'stock.inventory',
     'addons/stock/report/stock_inventory_move.rml',
-    parser=stock_inventory_move
+    parser=stock_inventory_move,
+    header='internal'
 )
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml
index e634d27153e..0f7411a1430 100644
--- a/addons/stock/stock_report.xml
+++ b/addons/stock/stock_report.xml
@@ -2,10 +2,10 @@
 <openerp>
     <data>
         <report auto="False" id="report_product_history" model="product.product" name="stock.product.history" string="Stock Level Forecast"/>
-        <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Picking list" rml="stock/report/picking.rml"/>
+        <report id="report_picking_list" model="stock.picking" name="stock.picking.list" string="Packing list" rml="stock/report/picking.rml"/>
         <report id="report_move_labels" model="stock.move" name="stock.move.label" string="Item Labels" xml="stock/report/lot_move_label.xml" xsl="stock/report/lot_move_label.xsl"/>
-        <report auto="False"  id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Inventory" rml="stock/report/lot_overview.rml" groups="base.group_extended"/>
-        <report id="report_location_overview_all" model="stock.location" name="lot.stock.overview_all" string="Inventory (with child locations)" rml="stock/report/lot_overview_all.rml"/>
-        <report id="report_stock_inventory_move" model="stock.inventory" name="stock.inventory.move" string="Inventory" rml="stock/report/stock_inventory_move.rml"/>
+        <report auto="False"  id="report_location_overview" model="stock.location" name="lot.stock.overview" string="Location Inventory Overview" rml="stock/report/lot_overview.rml" groups="base.group_extended"/>
+        <report id="report_location_overview_all" model="stock.location" name="lot.stock.overview_all" string="Location Content" rml="stock/report/lot_overview_all.rml"/>
+        <report id="report_stock_inventory_move" model="stock.inventory" name="stock.inventory.move" string="Stock Inventory" rml="stock/report/stock_inventory_move.rml"/>
     </data>
 </openerp>
diff --git a/addons/stock_planning/i18n/ru.po b/addons/stock_planning/i18n/ru.po
index 3507d664508..b916fd0a9e9 100644
--- a/addons/stock_planning/i18n/ru.po
+++ b/addons/stock_planning/i18n/ru.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2010-09-29 10:06+0000\n"
+"PO-Revision-Date: 2010-11-13 11:31+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-30 05:54+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: stock_planning
@@ -46,7 +46,7 @@ msgstr ""
 #: view:stock.planning:0
 #: view:stock.sale.forecast:0
 msgid "Group By..."
-msgstr ""
+msgstr "Объединять по..."
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -207,7 +207,7 @@ msgstr ""
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_period_createlines
 msgid "stock.period.createlines"
-msgstr ""
+msgstr "tock.period.createlines"
 
 #. module: stock_planning
 #: field:stock.planning,outgoing_before:0
@@ -222,7 +222,7 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Periods :"
-msgstr ""
+msgstr "Периоды :"
 
 #. module: stock_planning
 #: help:stock.planning,already_in:0
@@ -244,12 +244,12 @@ msgstr ""
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_sale_forecast
 msgid "stock.sale.forecast"
-msgstr ""
+msgstr "stock.sale.forecast"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_dept_id:0
 msgid "This Department"
-msgstr ""
+msgstr "Этот отдел"
 
 #. module: stock_planning
 #: field:stock.planning,to_procure:0
@@ -264,7 +264,7 @@ msgstr ""
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_planning_createlines
 msgid "stock.planning.createlines"
-msgstr ""
+msgstr "stock.planning.createlines"
 
 #. module: stock_planning
 #: help:stock.planning,incoming_before:0
@@ -364,7 +364,7 @@ msgstr ""
 #: field:stock.sale.forecast,period_id:0
 #: field:stock.sale.forecast.createlines,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Период"
 
 #. module: stock_planning
 #: view:stock.period:0
@@ -372,7 +372,7 @@ msgstr ""
 #: field:stock.planning,state:0
 #: field:stock.sale.forecast,state:0
 msgid "State"
-msgstr ""
+msgstr "Состояние"
 
 #. module: stock_planning
 #: help:stock.sale.forecast.createlines,product_categ_id:0
@@ -387,7 +387,7 @@ msgstr ""
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_sale_forecast_createlines
 msgid "stock.sale.forecast.createlines"
-msgstr ""
+msgstr "stock.sale.forecast.createlines"
 
 #. module: stock_planning
 #: field:stock.planning,warehouse_id:0
@@ -395,7 +395,7 @@ msgstr ""
 #: field:stock.sale.forecast,warehouse_id:0
 #: field:stock.sale.forecast.createlines,warehouse_id:0
 msgid "Warehouse"
-msgstr ""
+msgstr "Склад"
 
 #. module: stock_planning
 #: help:stock.planning,stock_simulation:0
@@ -432,7 +432,7 @@ msgstr ""
 #: field:stock.planning.createlines,product_categ_id:0
 #: field:stock.sale.forecast.createlines,product_categ_id:0
 msgid "Product Category"
-msgstr ""
+msgstr "Категория ТМЦ"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -440,18 +440,18 @@ msgstr ""
 #: code:addons/stock_planning/wizard/stock_planning_forecast.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Ошибка !"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
 msgid "Manual planning for "
-msgstr ""
+msgstr "Планирование вручную для "
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_user_id:0
 msgid "This User"
-msgstr ""
+msgstr "Этот пользователь"
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -466,7 +466,7 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "Calculate Planning"
-msgstr ""
+msgstr "Вычислить планирование"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -478,7 +478,7 @@ msgstr ""
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
 msgid "Invalid action !"
-msgstr ""
+msgstr "Неверное действие !"
 
 #. module: stock_planning
 #: help:stock.planning,stock_start:0
@@ -552,18 +552,18 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Per User :"
-msgstr ""
+msgstr "На пользователя:"
 
 #. module: stock_planning
 #: field:stock.period,name:0
 #: field:stock.period.createlines,name:0
 msgid "Period Name"
-msgstr ""
+msgstr "Название периода"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,user_id:0
 msgid "Created/Validated by"
-msgstr ""
+msgstr "Создано/Утверждено"
 
 #. module: stock_planning
 #: field:stock.planning,warehouse_forecast:0
@@ -602,7 +602,7 @@ msgstr ""
 #: field:stock.period,date_start:0
 #: field:stock.period.createlines,date_start:0
 msgid "Start Date"
-msgstr ""
+msgstr "Дата начала"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_per_user:0
@@ -636,18 +636,18 @@ msgstr ""
 #: selection:stock.planning,state:0
 #: selection:stock.sale.forecast,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Черновик"
 
 #. module: stock_planning
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Ошибка ! Нельзя создать зацикленные меню."
 
 #. module: stock_planning
 #: view:stock.planning:0
 #: view:stock.sale.forecast:0
 msgid "Warehouse "
-msgstr ""
+msgstr "Склад "
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period5_per_dept:0
@@ -714,7 +714,7 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_id:0
 msgid "Period4"
-msgstr ""
+msgstr "Период4"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -725,17 +725,17 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period2_id:0
 msgid "Period2"
-msgstr ""
+msgstr "Период2"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period3_id:0
 msgid "Period3"
-msgstr ""
+msgstr "Период3"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period1_id:0
 msgid "Period1"
-msgstr ""
+msgstr "Период1"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -755,7 +755,7 @@ msgstr ""
 #: field:stock.planning,active_uom:0
 #: field:stock.sale.forecast,active_uom:0
 msgid "Active UoM"
-msgstr ""
+msgstr "Активная ед. изм."
 
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_stock_planning_createlines_form
@@ -767,7 +767,7 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.planning:0
 msgid "General Info"
-msgstr ""
+msgstr "Общая информация"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_view_stock_sale_forecast_form
@@ -793,7 +793,7 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Sales history"
-msgstr ""
+msgstr "История продаж"
 
 #. module: stock_planning
 #: field:stock.planning,supply_warehouse_id:0
@@ -853,7 +853,7 @@ msgstr ""
 #: field:stock.planning,product_uos_categ:0
 #: field:stock.sale.forecast,product_uom_categ:0
 msgid "Product UoM Category"
-msgstr ""
+msgstr "Категория ед. изм. ТМЦ"
 
 #. module: stock_planning
 #: field:stock.planning,incoming:0
@@ -873,7 +873,7 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.sale.forecast,product_qty:0
 msgid "Product Quantity"
-msgstr ""
+msgstr "Количество ТМЦ"
 
 #. module: stock_planning
 #: field:stock.sale.forecast.createlines,copy_forecast:0
@@ -888,23 +888,23 @@ msgstr ""
 #. module: stock_planning
 #: selection:stock.planning,state:0
 msgid "Done"
-msgstr ""
+msgstr "Сделано"
 
 #. module: stock_planning
 #: field:stock.period.createlines,period_ids:0
 msgid "Periods"
-msgstr ""
+msgstr "Периоды"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
 #, python-format
 msgid " according to state:"
-msgstr ""
+msgstr " в соответствии с состоянием:"
 
 #. module: stock_planning
 #: view:stock.period.createlines:0
 msgid "Cancel"
-msgstr ""
+msgstr "Отмена"
 
 #. module: stock_planning
 #: view:stock.period:0
@@ -918,7 +918,7 @@ msgstr ""
 #: view:stock.sale.forecast:0
 #: selection:stock.sale.forecast,state:0
 msgid "Validated"
-msgstr ""
+msgstr "Утверждено"
 
 #. module: stock_planning
 #: view:stock.period:0
@@ -975,12 +975,12 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.sale.forecast,create_uid:0
 msgid "Responsible"
-msgstr ""
+msgstr "Ответственный"
 
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Default UOM"
-msgstr ""
+msgstr "Ед. изм. по умолчанию"
 
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period4_per_warehouse:0
@@ -1000,7 +1000,7 @@ msgstr ""
 #. module: stock_planning
 #: model:ir.model,name:stock_planning.model_stock_planning
 msgid "stock.planning"
-msgstr ""
+msgstr "stock.planning"
 
 #. module: stock_planning
 #: help:stock.sale.forecast,warehouse_id:0
@@ -1017,7 +1017,7 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.sale.forecast,analyze_company:0
 msgid "Per Company"
-msgstr ""
+msgstr "По компании"
 
 #. module: stock_planning
 #: help:stock.planning,to_procure:0
@@ -1045,7 +1045,7 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Per Warehouse :"
-msgstr ""
+msgstr "По складу :"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -1054,16 +1054,18 @@ msgid ""
 "\n"
 "For period: "
 msgstr ""
+"\n"
+"Для периода: "
 
 #. module: stock_planning
 #: field:stock.planning,history:0
 msgid "Procurement History"
-msgstr ""
+msgstr "История снабжения"
 
 #. module: stock_planning
 #: help:stock.period.createlines,date_start:0
 msgid "Starting date for planning period."
-msgstr ""
+msgstr "Дата начала планируемого периода."
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -1074,7 +1076,7 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Per Department :"
-msgstr ""
+msgstr "По отделу :"
 
 #. module: stock_planning
 #: help:stock.planning,incoming:0
@@ -1085,7 +1087,7 @@ msgstr ""
 #: field:stock.period,date_stop:0
 #: field:stock.period.createlines,date_stop:0
 msgid "End Date"
-msgstr ""
+msgstr "Дата окончания"
 
 #. module: stock_planning
 #: help:stock.planning,stock_supply_location:0
@@ -1113,7 +1115,7 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.planning,product_uom:0
 msgid "UoM"
-msgstr ""
+msgstr "Ед. изм."
 
 #. module: stock_planning
 #: view:stock.planning:0
@@ -1126,7 +1128,7 @@ msgstr ""
 #: view:stock.sale.forecast:0
 #: field:stock.sale.forecast,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "ТМЦ"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -1146,7 +1148,7 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.sale.forecast,product_uom:0
 msgid "Product UoM"
-msgstr ""
+msgstr "Ед. изм. ТМЦ"
 
 #. module: stock_planning
 #: code:addons/stock_planning/stock_planning.py:0
@@ -1168,7 +1170,7 @@ msgstr ""
 #. module: stock_planning
 #: view:stock.sale.forecast:0
 msgid "Approve"
-msgstr ""
+msgstr "Утвердить"
 
 #. module: stock_planning
 #: help:stock.planning,period_id:0
@@ -1185,7 +1187,7 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.sale.forecast,product_amt:0
 msgid "Product Amount"
-msgstr ""
+msgstr "Сумма ТМЦ"
 
 #. module: stock_planning
 #: help:stock.planning,confirmed_forecasts_only:0
@@ -1197,7 +1199,7 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_period5_id:0
 msgid "Period5"
-msgstr ""
+msgstr "Период5"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_stock_period_createlines_form
@@ -1207,7 +1209,7 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.sale.forecast,analyzed_warehouse_id:0
 msgid "This Warehouse"
-msgstr ""
+msgstr "Этот склад"
 
 #. module: stock_planning
 #: model:ir.actions.act_window,name:stock_planning.action_stock_period_form
@@ -1234,4 +1236,4 @@ msgstr ""
 #. module: stock_planning
 #: field:stock.planning,stock_start:0
 msgid "Initial Stock"
-msgstr ""
+msgstr "Начальный остаток"
diff --git a/addons/subscription/i18n/es.po b/addons/subscription/i18n/es.po
index 091aa400770..dbd6cdb8fc0 100644
--- a/addons/subscription/i18n/es.po
+++ b/addons/subscription/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2010-10-30 10:49+0000\n"
-"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
+"PO-Revision-Date: 2010-11-13 16:16+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-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-31 04:58+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: subscription
@@ -28,6 +29,8 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the "
 "subscription document without removing it."
 msgstr ""
+"Si el campo activo se desmarca, permite ocultar el documento de suscripción "
+"sin eliminarlo."
 
 #. module: subscription
 #: field:subscription.document,model:0
@@ -52,12 +55,12 @@ msgstr "Nombre de modelo no válido en la definición de acción."
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "This Week"
-msgstr ""
+msgstr "Esta semana"
 
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Search Subscription"
-msgstr ""
+msgstr "Buscar suscripción"
 
 #. module: subscription
 #: code:addons/subscription/subscription.py:0
@@ -66,6 +69,8 @@ msgid ""
 "You cannot modify the Object linked to the Document Type!\n"
 "Create another Document instead !"
 msgstr ""
+"¡No puede modificar el objeto vinculado al tipo de documento!\n"
+"¡Cree otro documento en su lugar!"
 
 #. module: subscription
 #: field:subscription.subscription,date_init:0
@@ -81,7 +86,7 @@ msgstr "Campo"
 #: view:subscription.subscription:0
 #: field:subscription.subscription,state:0
 msgid "State"
-msgstr ""
+msgstr "Estado"
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_subscription_history
@@ -101,7 +106,7 @@ msgstr "Fecha actual"
 #. module: subscription
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "¡Error! No puede crear menús recursivos."
 
 #. module: subscription
 #: constraint:ir.model:0
@@ -119,13 +124,13 @@ msgstr "Semanas"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Today"
-msgstr ""
+msgstr "Hoy"
 
 #. module: subscription
 #: code:addons/subscription/subscription.py:0
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "¡Error!"
 
 #. module: subscription
 #: model:ir.actions.act_window,name:subscription.action_subscription_form
@@ -238,6 +243,8 @@ msgid ""
 "If the active field is set to true, it will allow you to hide the "
 "subscription without removing it."
 msgstr ""
+"Si el campo activo se desmarca, permite ocultar la suscripción sin "
+"eliminarla."
 
 #. module: subscription
 #: field:subscription.subscription,cron_id:0
@@ -259,13 +266,13 @@ msgstr "Empresa"
 #. module: subscription
 #: help:subscription.subscription,cron_id:0
 msgid "Scheduler which runs on subscription"
-msgstr ""
+msgstr "Planificador que se ejecuta en la suscripción"
 
 #. module: subscription
 #: model:ir.ui.menu,name:subscription.config_recuuring_event
 #: model:ir.ui.menu,name:subscription.next_id_45
 msgid "Recurring Events"
-msgstr ""
+msgstr "Eventos recurrentes"
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -275,7 +282,7 @@ msgstr "Datos de la suscripción"
 #. module: subscription
 #: help:subscription.subscription,note:0
 msgid "Description or Summary of Subscription"
-msgstr ""
+msgstr "Descripción o resumen de la suscripción."
 
 #. module: subscription
 #: model:ir.model,name:subscription.model_subscription_document
@@ -288,6 +295,8 @@ msgstr "Documento de suscripción"
 #: help:subscription.document.fields,value:0
 msgid "Default value is considered for field when new document is generated."
 msgstr ""
+"Se tiene en cuenta el valor por defecto del campo cuando se genera un nuevo "
+"documento."
 
 #. module: subscription
 #: selection:subscription.document.fields,value:0
@@ -297,7 +306,7 @@ msgstr "Falso"
 #. module: subscription
 #: view:subscription.subscription:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: subscription
 #: view:subscription.subscription:0
@@ -314,6 +323,8 @@ msgstr "Suscripciones y operaciones recurrentes"
 msgid ""
 "User can choose the source document on which he wants to create documents"
 msgstr ""
+"El usuario puede seleccionar el documento original sobre el cual quiere "
+"crear los documentos."
 
 #. module: subscription
 #: model:ir.actions.act_window,name:subscription.action_document_form
diff --git a/addons/survey/i18n/sr.po b/addons/survey/i18n/sr.po
new file mode 100644
index 00000000000..14ac8ed8416
--- /dev/null
+++ b/addons/survey/i18n/sr.po
@@ -0,0 +1,1915 @@
+# Serbian 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-11-13 18:46+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Serbian <sr@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Single Textboxes"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_form1
+#: model:ir.ui.menu,name:survey.menu_print_survey_form
+#: model:ir.ui.menu,name:survey.menu_reporting
+#: model:ir.ui.menu,name:survey.menu_survey_form
+#: model:ir.ui.menu,name:survey.menu_surveys
+msgid "Surveys"
+msgstr "Ankete"
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"You must enter one or more menu choices\\n                                 "
+"in column heading"
+msgstr ""
+
+#. module: survey
+#: view:survey.question.wiz:0
+msgid "Your Messages"
+msgstr "Vaše poruke"
+
+#. module: survey
+#: field:survey.question,comment_valid_type:0
+#: field:survey.question,validation_type:0
+msgid "Text Validation"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_question_form
+msgid "Survey Questions"
+msgstr "Pitanja Ankete"
+
+#. module: survey
+#: view:survey:0
+#: field:survey,invited_user_ids:0
+msgid "Invited User"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Character"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"'  \n"
+"\" + tools.ustr(que_rec['validation_valid_err_msg'])))\n"
+"                            if key.split('_"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Set to draft"
+msgstr "Vrati na Nacrt"
+
+#. module: survey
+#: field:survey.question,in_visible_answer_type:0
+msgid "Is Answer Type Invisible?"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: view:survey.request:0
+msgid "Group By..."
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation.log:0
+msgid "Results :"
+msgstr "Rezultati :"
+
+#. module: survey
+#: view:survey.request:0
+msgid "Survey Request"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "A Range"
+msgstr ""
+
+#. module: survey
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nepravilno ime modela u definiciji akcije."
+
+#. module: survey
+#: field:survey.history,date:0
+msgid "Date started"
+msgstr "Datum početka"
+
+#. module: survey
+#: field:survey,history:0
+msgid "History Lines"
+msgstr "Istorijski niz"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+#: field:survey.question,descriptive_text:0
+#: selection:survey.question,type:0
+msgid "Descriptive Text"
+msgstr ""
+
+#. module: survey
+#: field:survey.send.invitation,mail:0
+msgid "Body"
+msgstr "Telo"
+
+#. module: survey
+#: field:survey.question,allow_comment:0
+msgid "Allow Comment Field"
+msgstr "Dopustite polje upisa Komentara"
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "A4 (210mm x 297mm)"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_maximum_date:0
+#: field:survey.question,validation_maximum_date:0
+msgid "Maximum date"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,in_visible_menu_choice:0
+msgid "Is Menu Choice Invisible?"
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "Letter (8.5\" x 11\")"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Completed"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "Exactly"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_act_view_survey_send_invitation
+msgid "Send Invitations"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"Maximum Required Answer you\\n                                     entered "
+"for your maximum is greater than the number of answer.\\n                    "
+"                  Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Set to Draft"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,is_comment_require:0
+msgid "Add Comment Field"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"'  \n"
+"\" + tools.ustr(que_rec['comment_valid_err_msg'])))\n"
+"\n"
+"                                resp_obj.write(cr, uid, resp_id, "
+"{'comment':val1})\n"
+"                                "
+"sur_name_read['store_ans'][resp_id].update({key1:val1})\n"
+"\n"
+"                        elif val1 and key1.split('_"
+msgstr ""
+
+#. module: survey
+#: selection:survey.request,state:0
+msgid "Wating Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,tot_resp:0
+msgid "Total Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.tbl.column.heading,name:0
+msgid "Row Number"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_name_wiz
+msgid "survey.name.wiz"
+msgstr "survey.name.wiz"
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Table Answer"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "History"
+msgstr "Istorija"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Choices (Only One Answers Per Row)"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"Maximum Required Answer you entered for your maximum is greater than the "
+"number of answer. Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_question_message
+#: model:ir.model,name:survey.model_survey_question
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Survey Question"
+msgstr "Pitanja Ankete"
+
+#. module: survey
+#: view:survey.question.column.heading:0
+msgid "Use if question type is rating_scale"
+msgstr ""
+
+#. module: survey
+#: field:survey.print,page_number:0
+#: field:survey.print.answer,page_number:0
+msgid "Include Page Number"
+msgstr ""
+
+#. module: survey
+#: view:survey.page:0
+#: view:survey.question:0
+#: view:survey.send.invitation.log:0
+msgid "Ok"
+msgstr ""
+
+#. module: survey
+#: field:survey.page,title:0
+msgid "Page Title"
+msgstr "Naslov stranice"
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_define_survey
+msgid "Define Surveys"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_history
+msgid "Survey History"
+msgstr "Istorija Ankete"
+
+#. module: survey
+#: field:survey.response.answer,comment:0
+#: field:survey.response.line,comment:0
+msgid "Notes"
+msgstr "Napomene"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+msgid "Search Survey"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,answer:0
+#: field:survey.tbl.column.heading,value:0
+msgid "Value"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,column_heading_ids:0
+msgid " Column heading"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_run_survey_form
+msgid "Answer a Survey"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,type:0
+msgid "Type of Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey,tot_comp_survey:0
+msgid "Total Completed Survey"
+msgstr "Ukupno ispunjeno Anketa"
+
+#. module: survey
+#: view:survey.response.answer:0
+msgid "(Use Only Question Type is matrix_of_drop_down_menus)"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.column.heading,in_visible_rating_weight:0
+msgid "Is Rating Scale Invisible ??"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey_analysis
+msgid "Survey Statistics"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Cancelled"
+msgstr "Otkazano"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Rating Scale"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid "You can not give answer because of survey is not open for answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_field_type:0
+msgid "Comment Field Type"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#: code:addons/survey/wizard/survey_answer.py:0
+#: code:addons/survey/wizard/survey_selection.py:0
+#: code:addons/survey/wizard/survey_send_invitation.py:0
+#, python-format
+msgid "Warning !"
+msgstr "Upozorenje!"
+
+#. module: survey
+#: selection:survey.question,comment_field_type:0
+msgid "Single Line Of Text"
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation:0
+#: field:survey.send.invitation,send_mail_existing:0
+msgid "Send reminder for existing user"
+msgstr "Pošalji podsetnik postojećem korisniku"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Choice (Multiple Answer)"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Edit Survey"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"Maximum Required Answer you \\n                                    entered "
+"for your maximum is greater than the number of answer.\\n                    "
+"                 Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: field:survey.question.column.heading,menu_choice:0
+msgid "Menu Choice"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
+"\n"
+"                        elif (que_rec['required_type'] == 'all' and "
+"select_count < len(que_rec['answer_choice_ids'])) or \\n                     "
+"       (que_rec['required_type'] == 'at least' and select_count < "
+"que_rec['req_ans']) or \\n                            "
+"(que_rec['required_type'] == 'at most' and select_count > "
+"que_rec['req_ans']) or \\n                            "
+"(que_rec['required_type'] == 'exactly' and select_count != "
+"que_rec['req_ans']) or \\n                            "
+"(que_rec['required_type'] == 'a range' and (select_count < "
+"que_rec['minimum_req_ans'] or select_count > que_rec['maximum_req_ans'])):\n"
+"                            for res in resp_id_list:\n"
+"                                sur_name_read['store_ans'].pop(res)\n"
+"                            raise osv.except_osv(_('Warning !"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "At Most"
+msgstr ""
+
+#. module: survey
+#: view:survey.response.line:0
+msgid "Survey Answer Line"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "When the question is not answered, display this error message:"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.line,single_text:0
+msgid "Text"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"'  \n"
+"\" + tools.ustr(que_rec['comment_valid_err_msg'])))\n"
+"                                resp_obj.write(cr, uid, update, "
+"{'comment':val,'state': 'done'})\n"
+"                                "
+"sur_name_read['store_ans'][update].update({key:val})\n"
+"\n"
+"                        elif val and key.split('_"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,responsible_id:0
+msgid "Responsible"
+msgstr "Odgovoran"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_request
+msgid "survey.request"
+msgstr ""
+
+#. module: survey
+#: field:survey.send.invitation,mail_subject:0
+#: field:survey.send.invitation,mail_subject_existing:0
+msgid "Subject"
+msgstr "Predmet"
+
+#. module: survey
+#: field:survey.question,comment_maximum_float:0
+#: field:survey.question,validation_maximum_float:0
+msgid "Maximum decimal number"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_tbl_column_heading
+msgid "survey.tbl.column.heading"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Late"
+msgstr ""
+
+#. module: survey
+#: field:survey.send.invitation,mail_from:0
+msgid "From"
+msgstr "Od"
+
+#. module: survey
+#: selection:survey,state:0
+msgid "Closed"
+msgstr "Zatvoren"
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Don't Validate Comment Text."
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Whole Number"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,question_id:0
+#: field:survey.page,question_ids:0
+#: field:survey.question,question:0
+#: field:survey.question.column.heading,question_id:0
+#: field:survey.response.line,question_id:0
+msgid "Question"
+msgstr "Pitanje"
+
+#. module: survey
+#: view:survey.page:0
+msgid "Search Survey Page"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"'  \n"
+"\" + tools.ustr(que_rec['validation_valid_err_msg'])))\n"
+"\n"
+"                            if key1.split('_"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.wiz,name:0
+msgid "Number"
+msgstr "Broj"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+#: field:survey.request,state:0
+msgid "State"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Evaluation Plan Phase"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Between"
+msgstr ""
+
+#. module: survey
+#: view:survey.print:0
+#: view:survey.print.answer:0
+#: view:survey.print.statistics:0
+msgid "Print"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,make_comment_field:0
+msgid "Make Comment Field an Answer Choice"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey,type:0
+msgid "Type"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Email"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_answer_surveys
+msgid "Answer Surveys"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Not Finished"
+msgstr ""
+
+#. module: survey
+#: view:survey.print:0
+msgid "Survey Print"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_selection.py:0
+#, python-format
+msgid "You can not give response for this survey more than %s times"
+msgstr "Na ovo pitanje ne možete odgovoriti više od %s puta"
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Select Partner"
+msgstr "Odaberi Partnera"
+
+#. module: survey
+#: field:survey.question,type:0
+msgid "Question Type"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_answer
+msgid "Answers"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Link"
+msgstr "Veza"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_type_form
+#: model:ir.model,name:survey.model_survey_type
+#: view:survey.type:0
+msgid "Survey Type"
+msgstr ""
+
+#. module: survey
+#: field:survey.page,sequence:0
+msgid "Page Nr"
+msgstr ""
+
+#. module: survey
+#: field:survey.question.column.heading,in_visible_menu_choice:0
+msgid "Is Menu Choice Invisible??"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,minimum_req_ans:0
+msgid "Minimum Required Answer"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"You must enter one or more menu choices in column heading (white spaces not "
+"allowed)"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,req_error_msg:0
+msgid "Error Message"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "You must enter one or more menu choices in column heading"
+msgstr ""
+
+#. module: survey
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Nepravilan XML format za pregled Architecture!"
+
+#. module: survey
+#: field:survey.request,date_deadline:0
+msgid "Deadline date"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Date"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print
+msgid "survey.print"
+msgstr ""
+
+#. module: survey
+#: view:survey.question.column.heading:0
+#: field:survey.question.column.heading,title:0
+msgid "Column Heading"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,is_require_answer:0
+msgid "Require Answer to Question"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_request_tree
+#: model:ir.ui.menu,name:survey.menu_survey_type_form1
+msgid "Survey Requests"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "You must enter one or more column heading."
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Send"
+msgstr "Pošalji"
+
+#. module: survey
+#: selection:survey.question,comment_field_type:0
+msgid "Paragraph of Text"
+msgstr ""
+
+#. module: survey
+#: view:survey.request:0
+msgid "Watting Answer"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Options"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_browse_survey_response
+msgid "Browse Answers"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,comment_field:0
+#: view:survey.response.line:0
+msgid "Comment"
+msgstr "Komentar"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_answer
+#: model:ir.model,name:survey.model_survey_response_answer
+#: view:survey.answer:0
+#: view:survey.response:0
+#: view:survey.response.answer:0
+#: view:survey.response.line:0
+msgid "Survey Answer"
+msgstr "Odgovor Ankete"
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"#Required Answer you entered \\n                                    is "
+"greater than the number of answer. \\n                                    "
+"Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_browse_survey_response
+#: view:survey:0
+msgid "Answer Survey"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Comment Field"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,response_type:0
+msgid "Manually"
+msgstr "Ručno"
+
+#. module: survey
+#: help:survey,responsible_id:0
+msgid "User responsible for survey"
+msgstr ""
+
+#. module: survey
+#: field:survey,page_ids:0
+#: view:survey.question:0
+#: field:survey.response.line,page_id:0
+msgid "Page"
+msgstr "Stranica"
+
+#. module: survey
+#: field:survey.question,comment_column:0
+msgid "Add comment column in matrix"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,response:0
+msgid "#Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.print,without_pagebreak:0
+#: field:survey.print.answer,without_pagebreak:0
+msgid "Print Without Page Breaks"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "When the comment is an invalid format, display this error message"
+msgstr ""
+
+#. module: survey
+#: field:survey.history,user_id:0
+#: view:survey.request:0
+#: field:survey.request,user_id:0
+#: field:survey.response,user_id:0
+msgid "User"
+msgstr "Korisnik"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_page_question
+#: model:ir.actions.act_window,name:survey.act_survey_question
+msgid "Questions"
+msgstr ""
+
+#. module: survey
+#: help:survey,response_user:0
+msgid "Set to one if  you require only one Answer per user"
+msgstr ""
+
+#. module: survey
+#: field:survey,users:0
+msgid "Users"
+msgstr "Korisnici"
+
+#. module: survey
+#: view:survey.send.invitation:0
+msgid "Message"
+msgstr "Poruka"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.request:0
+msgid "MY"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,maximum_req_ans:0
+msgid "Maximum Required Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,page_no:0
+msgid "Page Number"
+msgstr ""
+
+#. module: survey
+#: view:survey.print:0
+#: view:survey.print.answer:0
+msgid "Print Option"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "and"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print_statistics
+#: view:survey.print.statistics:0
+msgid "Survey Print Statistics"
+msgstr ""
+
+#. module: survey
+#: field:survey.send.invitation.log,note:0
+msgid "Log"
+msgstr "Log"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "When the choices do not add up correctly, display this error message"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid "You can not give answer for this survey more than %s times"
+msgstr ""
+
+#. module: survey
+#: field:survey,date_close:0
+msgid "Survey Close Date"
+msgstr "Datum zatvaranja Ankete"
+
+#. module: survey
+#: field:survey,date_open:0
+msgid "Survey Open Date"
+msgstr "Datum otvaranja Ankete"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
+"\n"
+"        return True\n"
+"\n"
+"    def action_new_question(self,cr, uid, ids, context):\n"
+"        \"\"\"\n"
+"        New survey.Question form.\n"
+"\n"
+"        @param self: The object pointer\n"
+"        @param cr: the current row, from the database cursor,\n"
+"        @param uid: the current user’s ID for security checks,\n"
+"        @param ids: List of survey.question.wiz IDs\n"
+"        @param context: A standard dictionary for contextual values\n"
+"        @return : Dictionary value for Open new survey.Qestion form.\n"
+"        \"\"\"\n"
+"        for key,val in context.items():\n"
+"            if type(key) == type(True):\n"
+"                context.pop(key)\n"
+"        view_id = self.pool.get('ir.ui.view"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Open Date"
+msgstr ""
+
+#. module: survey
+#: view:survey.browse.answer:0
+#: view:survey.name.wiz:0
+msgid "Start"
+msgstr "Početak"
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "Maximum Required Answer is greater than Minimum Required Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_maximum_no:0
+#: field:survey.question,validation_maximum_no:0
+msgid "Maximum number"
+msgstr ""
+
+#. module: survey
+#: selection:survey,state:0
+#: selection:survey.request,state:0
+#: selection:survey.response.line,state:0
+msgid "Draft"
+msgstr "Nacrt"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print_statistics
+msgid "survey.print.statistics"
+msgstr ""
+
+#. module: survey
+#: constraint:ir.ui.menu:0
+msgid "Error ! You can not create recursive Menu."
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Drop-down Menus"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: field:survey.answer,answer:0
+#: field:survey.name.wiz,response:0
+#: view:survey.page:0
+#: view:survey.print.answer:0
+#: field:survey.print.answer,response_ids:0
+#: view:survey.question:0
+#: field:survey.question,answer_choice_ids:0
+#: field:survey.request,response:0
+#: field:survey.response,question_ids:0
+#: field:survey.response.answer,answer_id:0
+#: field:survey.response.answer,response_id:0
+#: view:survey.response.line:0
+#: field:survey.response.line,response_answer_ids:0
+#: field:survey.response.line,response_id:0
+#: field:survey.response.line,response_table_ids:0
+#: field:survey.send.invitation,partner_ids:0
+#: field:survey.tbl.column.heading,response_table_id:0
+msgid "Answer"
+msgstr "Odgovor"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
+"\n"
+"                    if que_rec['type'] in "
+"['multiple_choice_only_one_ans','single_textbox','comment'] and  "
+"que_rec['is_require_answer'] and select_count <= 0:\n"
+"                        for res in resp_id_list:\n"
+"                            sur_name_read['store_ans'].pop(res)\n"
+"                        raise osv.except_osv(_('Warning !"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"#Required Answer you entered is \\n                                    "
+"greater than the number of answer.\\n                                    "
+"Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"' \n"
+" Please enter an integer value "
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question']  + \"' \" + "
+"tools.ustr(que_rec['make_comment_field_err_msg'])))\n"
+"\n"
+"                    if que_rec['type'] == \"rating_scale\" and "
+"que_rec['rating_allow_one_column_require'] and len(selected_value) > "
+"len(list(set(selected_value))):\n"
+"                        for res in resp_id_list:\n"
+"                            sur_name_read['store_ans'].pop(res)\n"
+"                        raise osv.except_osv(_('Warning !"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Date and Time"
+msgstr ""
+
+#. module: survey
+#: field:survey,state:0
+#: field:survey.response,state:0
+#: field:survey.response.line,state:0
+msgid "Status"
+msgstr "Status"
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print
+msgid "Print Survey"
+msgstr ""
+
+#. module: survey
+#: field:survey,send_response:0
+msgid "E-mail Notification on Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,value_choice:0
+msgid "Value Choice"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Started"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_print_answer
+#: view:survey:0
+#: view:survey.print.answer:0
+msgid "Print Answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Textboxes"
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,orientation:0
+#: selection:survey.print.answer,orientation:0
+msgid "Landscape(Horizontal)"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,no_of_rows:0
+msgid "No of Rows"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.name.wiz:0
+msgid "Survey Details"
+msgstr "Detalji Ankete"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Textboxes With Different Type"
+msgstr ""
+
+#. module: survey
+#: view:survey.question.column.heading:0
+msgid "Menu Choices (each choice on separate lines)"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,response_type:0
+msgid "Answer Type"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,store_ans:0
+msgid "Store Answer"
+msgstr "Sačuvaj odgovor"
+
+#. module: survey
+#: view:survey.request:0
+msgid "Waiting Answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be A Decimal Number"
+msgstr ""
+
+#. module: survey
+#: field:res.users,survey_id:0
+msgid "Groups"
+msgstr "Grupe"
+
+#. module: survey
+#: selection:survey.answer,type:0
+#: selection:survey.question,type:0
+msgid "Date"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Integer"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question']  + \"' \" + "
+"tools.ustr(que_rec['make_comment_field_err_msg'])))\n"
+"\n"
+"                if que_rec['type'] == \"rating_scale\" and "
+"que_rec['rating_allow_one_column_require'] and len(selected_value) > "
+"len(list(set(selected_value))):\n"
+"                    raise osv.except_osv(_('Warning !"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_send_invitation
+msgid "survey.send.invitation"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
+"\n"
+"                    elif (que_rec['required_type'] == 'all' and select_count "
+"< len(que_rec['answer_choice_ids'])) or \\n                        "
+"(que_rec['required_type'] == 'at least' and select_count < "
+"que_rec['req_ans']) or \\n                        (que_rec['required_type'] "
+"== 'at most' and select_count > que_rec['req_ans']) or \\n                   "
+"     (que_rec['required_type'] == 'exactly' and select_count != "
+"que_rec['req_ans']) or \\n                        (que_rec['required_type'] "
+"== 'a range' and (select_count < que_rec['minimum_req_ans'] or select_count "
+"> que_rec['maximum_req_ans'])):\n"
+"                            raise osv.except_osv(_('Warning !"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"' \" + "
+"tools.ustr(que_rec['numeric_required_sum_err_msg'])))\n"
+"\n"
+"                    if que_rec['type'] in ['multiple_textboxes_diff_type', "
+"'multiple_choice_multiple_ans','matrix_of_choices_only_one_ans','matrix_of_ch"
+"oices_only_multi_ans','matrix_of_drop_down_menus','rating_scale','multiple_te"
+"xtboxes','numerical_textboxes','date','date_and_time'] and "
+"que_rec['is_require_answer']:\n"
+"                        if matrix_list:\n"
+"                            if (que_rec['required_type'] == 'all' and "
+"len(list(set(matrix_list))) < len(que_rec['answer_choice_ids'])) or \\n      "
+"                      (que_rec['required_type'] == 'at least' and "
+"len(list(set(matrix_list))) < que_rec['req_ans']) or \\n                     "
+"       (que_rec['required_type'] == 'at most' and "
+"len(list(set(matrix_list))) > que_rec['req_ans']) or \\n                     "
+"       (que_rec['required_type'] == 'exactly' and "
+"len(list(set(matrix_list))) != que_rec['req_ans']) or \\n                    "
+"        (que_rec['required_type'] == 'a range' and "
+"(len(list(set(matrix_list))) < que_rec['minimum_req_ans'] or "
+"len(list(set(matrix_list))) > que_rec['maximum_req_ans'])):\n"
+"                                for res in resp_id_list:\n"
+"                                    sur_name_read['store_ans'].pop(res)\n"
+"                                raise osv.except_osv(_('Warning !"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,transfer:0
+msgid "Page Transfer"
+msgstr "Prenos stranice"
+
+#. module: survey
+#: selection:survey.response.line,state:0
+msgid "Skiped"
+msgstr "Preskočen"
+
+#. module: survey
+#: field:survey.print,paper_size:0
+#: field:survey.print.answer,paper_size:0
+msgid "Paper Size"
+msgstr ""
+
+#. module: survey
+#: field:survey.response.answer,column_id:0
+#: field:survey.tbl.column.heading,column_id:0
+msgid "Column"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"Maximum Required Answer is greater \\n                                    "
+"than Minimum Required Answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_name
+msgid "Give Survey Answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_browse_answer
+msgid "survey.browse.answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response_line
+msgid "Survey Response Line"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Selection"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.report_survey_form
+#: model:ir.model,name:survey.model_survey
+#: view:survey:0
+#: view:survey.browse.answer:0
+#: field:survey.browse.answer,survey_id:0
+#: field:survey.history,survey_id:0
+#: view:survey.name.wiz:0
+#: field:survey.name.wiz,survey_id:0
+#: view:survey.page:0
+#: field:survey.page,survey_id:0
+#: view:survey.print:0
+#: field:survey.print,survey_ids:0
+#: field:survey.print.statistics,survey_ids:0
+#: field:survey.question,survey:0
+#: view:survey.request:0
+#: field:survey.request,survey_id:0
+#: field:survey.response,survey_id:0
+msgid "Survey"
+msgstr "Anketa"
+
+#. module: survey
+#: field:survey.question,in_visible_rating_weight:0
+msgid "Is Rating Scale Invisible?"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Numerical Textboxes"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"Minimum Required Answer\\n                                     you entered "
+"is greater than the number of answer.\\n                                    "
+"Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_wiz
+msgid "survey.question.wiz"
+msgstr "survey.question.wiz"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"\n"
+" you cannot select same answer more than one times'"
+msgstr ""
+
+#. module: survey
+#: help:survey.browse.answer,response_id:0
+msgid ""
+"If this field is empty, all answers of the selected survey will be print."
+msgstr ""
+
+#. module: survey
+#: field:survey.type,code:0
+msgid "Code"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_print_survey_statistics
+msgid "Surveys Statistics"
+msgstr ""
+
+#. module: survey
+#: field:survey.print,orientation:0
+#: field:survey.print.answer,orientation:0
+msgid "Orientation"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.answer:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Seq"
+msgstr "Sekvenca"
+
+#. module: survey
+#: field:survey.request,email:0
+msgid "E-mail"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_minimum_no:0
+#: field:survey.question,validation_minimum_no:0
+msgid "Minimum number"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,req_ans:0
+msgid "#Required Answer"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,sequence:0
+#: field:survey.question,sequence:0
+msgid "Sequence"
+msgstr "Sekvenca"
+
+#. module: survey
+#: field:survey.question,comment_label:0
+msgid "Field Label"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Validation"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Other"
+msgstr "Drugi"
+
+#. module: survey
+#: view:survey.request:0
+#: selection:survey.request,state:0
+msgid "Done"
+msgstr "Gotovo"
+
+#. module: survey
+#: view:survey:0
+msgid "Test Survey"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,rating_allow_one_column_require:0
+msgid "Allow Only One Answer per Column (Forced Ranking)"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.browse.answer:0
+#: view:survey.name.wiz:0
+#: view:survey.print:0
+#: view:survey.print.answer:0
+#: view:survey.print.statistics:0
+#: view:survey.send.invitation:0
+msgid "Cancel"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Close"
+msgstr "Zatvori"
+
+#. module: survey
+#: field:survey.question,comment_minimum_float:0
+#: field:survey.question,validation_minimum_float:0
+msgid "Minimum decimal number"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: selection:survey,state:0
+msgid "Open"
+msgstr "Otvori"
+
+#. module: survey
+#: field:survey,tot_start_survey:0
+msgid "Total Started Survey"
+msgstr "Ukupno pokrenuto Anketa"
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"#Required Answer you entered is greater than the number of answer. Please "
+"use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Naziv Objekta mora početi s x_ i ne sme sadržavati specijalne karaktere !"
+
+#. module: survey
+#: help:survey,max_response_limit:0
+msgid "Set to one if survey is answerable only once"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response,state:0
+msgid "Finished "
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_question_column_heading
+msgid "Survey Question Column Heading"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,average:0
+msgid "#Avg"
+msgstr "#Avg"
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Matrix of Choices (Multiple Answers Per Row)"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
+"\n"
+"        else:\n"
+"            resp_id_list = []\n"
+"            for update in click_update:\n"
+"                que_rec = que_obj.read(cr, uid , "
+"[int(sur_name_read['store_ans'][update]['question_id'])], [])[0]\n"
+"                res_ans_obj.unlink(cr, uid,res_ans_obj.search(cr, uid, "
+"[('response_id', '=', update)]))\n"
+"                surv_tbl_column_obj.unlink(cr, "
+"uid,surv_tbl_column_obj.search(cr, uid, [('response_table_id', '=', "
+"update)]))\n"
+"                resp_id_list.append(update)\n"
+"                "
+"sur_name_read['store_ans'].update({update:{'question_id':sur_name_read['store"
+"_ans'][update]['question_id']}})\n"
+"                surv_name_wiz.write(cr, uid, "
+"[context.get('sur_name_id',False)], "
+"{'store_ans':sur_name_read['store_ans']})\n"
+"                select_count = 0\n"
+"                numeric_sum = 0\n"
+"                selected_value = []\n"
+"                matrix_list = []\n"
+"                comment_field = False\n"
+"                comment_value = False\n"
+"                response_list = []\n"
+"\n"
+"                for key, val in vals.items():\n"
+"                    ans_id_len = key.split('_"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+msgid "Current"
+msgstr ""
+
+#. module: survey
+#: selection:survey.response.line,state:0
+msgid "Answered"
+msgstr "Odgovoreno"
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"' \n"
+"Please enter an integer value "
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid "Complete Survey Answer"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Comment/Essay Box"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,required_type:0
+msgid "Respondent must answer"
+msgstr ""
+
+#. module: survey
+#: field:survey,max_response_limit:0
+msgid "Maximum Answer Limit"
+msgstr ""
+
+#. module: survey
+#: view:survey.question:0
+msgid "Search Question"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"' \" + "
+"tools.ustr(que_rec['numeric_required_sum_err_msg'])))\n"
+"\n"
+"                if not select_count:\n"
+"                    resp_obj.write(cr, uid, update, {'state': 'skip'})\n"
+"\n"
+"                if que_rec['type'] in "
+"['multiple_textboxes_diff_type','multiple_choice_multiple_ans','matrix_of_cho"
+"ices_only_one_ans','matrix_of_choices_only_multi_ans','matrix_of_drop_down_me"
+"nus','rating_scale','multiple_textboxes','numerical_textboxes','date','date_a"
+"nd_time'] and que_rec['is_require_answer']:\n"
+"                    if matrix_list:\n"
+"                        if (que_rec['required_type'] == 'all' and "
+"len(list(set(matrix_list))) < len(que_rec['answer_choice_ids'])) or \\n      "
+"                  (que_rec['required_type'] == 'at least' and "
+"len(list(set(matrix_list))) < que_rec['req_ans']) or \\n                     "
+"   (que_rec['required_type'] == 'at most' and len(list(set(matrix_list))) > "
+"que_rec['req_ans']) or \\n                        (que_rec['required_type'] "
+"== 'exactly' and len(list(set(matrix_list))) != que_rec['req_ans']) or \\n   "
+"                     (que_rec['required_type'] == 'a range' and "
+"(len(list(set(matrix_list))) < que_rec['minimum_req_ans'] or "
+"len(list(set(matrix_list))) > que_rec['maximum_req_ans'])):\n"
+"                            raise osv.except_osv(_('Warning !"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Single Textbox"
+msgstr ""
+
+#. module: survey
+#: field:survey,note:0
+#: field:survey.name.wiz,note:0
+#: view:survey.page:0
+#: field:survey.page,note:0
+#: view:survey.response.line:0
+msgid "Description"
+msgstr "Opis"
+
+#. module: survey
+#: view:survey.name.wiz:0
+msgid "Select Survey"
+msgstr "Odaberi Anketu"
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "At Least"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation
+#: view:survey.send.invitation:0
+msgid "Send Invitation"
+msgstr "Pošalji poziv"
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"You must enter one or more menu \\n                                choices "
+"in column heading (white spaces not allowed)"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation_log
+#: model:ir.model,name:survey.model_survey_send_invitation_log
+msgid "survey.send.invitation.log"
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,orientation:0
+#: selection:survey.print.answer,orientation:0
+msgid "Portrait(Vertical)"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_answer.py:0
+#, python-format
+msgid ""
+"'\" + que_rec['question'] + \"' \" + tools.ustr(que_rec['req_error_msg'])))\n"
+"\n"
+"                if que_rec['type'] in "
+"['multiple_choice_only_one_ans','single_textbox','comment'] and  "
+"que_rec['is_require_answer'] and select_count <= 0:\n"
+"                    raise osv.except_osv(_('Warning !"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be Specific Length"
+msgstr ""
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: field:survey.question,page_id:0
+msgid "Survey Page"
+msgstr "Stranica Upitnika"
+
+#. module: survey
+#: view:survey:0
+#: view:survey.page:0
+#: view:survey.question:0
+msgid "Required Answer"
+msgstr "Zahtevani odgovor"
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"Minimum Required Answer you entered is greater than the number of answer. "
+"Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "You must enter one or more answer."
+msgstr ""
+
+#. module: survey
+#: field:survey,title:0
+msgid "Survey Title"
+msgstr "Naziv Ankete"
+
+#. module: survey
+#: model:ir.actions.report.xml,name:survey.survey_browse_response
+#: field:survey.browse.answer,response_id:0
+msgid "Survey Answers"
+msgstr "Odgovori Ankete"
+
+#. module: survey
+#: view:survey.browse.answer:0
+msgid "Select Survey and related answer"
+msgstr ""
+
+#. module: survey
+#: model:ir.ui.menu,name:survey.menu_print_survey_answer
+msgid "Surveys Answers"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.act_survey_pages
+msgid "Pages"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,is_validation_require:0
+msgid "Validate Text"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_selection.py:0
+#, python-format
+msgid ""
+"You can not give more response. Please contact the author of this survey for "
+"further assistance."
+msgstr ""
+
+#. module: survey
+#: selection:survey.print,paper_size:0
+#: selection:survey.print.answer,paper_size:0
+msgid "Legal (8.5\" x 14\")"
+msgstr ""
+
+#. module: survey
+#: field:survey.type,name:0
+msgid "Name"
+msgstr ""
+
+#. module: survey
+#: view:survey.page:0
+msgid "#Questions"
+msgstr "#Pitanja"
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_response
+msgid "survey.response"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_valid_err_msg:0
+#: field:survey.question,make_comment_field_err_msg:0
+#: field:survey.question,numeric_required_sum_err_msg:0
+#: field:survey.question,validation_valid_err_msg:0
+msgid "Error message"
+msgstr ""
+
+#. module: survey
+#: model:ir.module.module,shortdesc:survey.module_meta_information
+msgid "Survey Module"
+msgstr "Modul Ankete"
+
+#. module: survey
+#: view:survey.send.invitation:0
+#: field:survey.send.invitation,send_mail:0
+msgid "Send mail for new user"
+msgstr "Pošalji mail novom korisniku"
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "You must enter one or more Answer."
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,menu_choice:0
+msgid "Menu Choices"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid ""
+"Minimum Required Answer you\\n                                     entered "
+"is greater than the number of answer. \\n                                    "
+" Please use a number that is smaller than %d."
+msgstr ""
+
+#. module: survey
+#: view:survey.send.invitation.log:0
+msgid "User creation"
+msgstr "Kreacija Korisnika"
+
+#. module: survey
+#: selection:survey.question,required_type:0
+msgid "All"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,comment_valid_type:0
+#: selection:survey.question,validation_type:0
+msgid "Must Be An Email Address"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+msgid "Multiple Choice (Only One Answer)"
+msgstr ""
+
+#. module: survey
+#: field:survey.answer,in_visible_answer_type:0
+msgid "Is Answer Type Invisible??"
+msgstr ""
+
+#. module: survey
+#: model:ir.model,name:survey.model_survey_print_answer
+msgid "survey.print.answer"
+msgstr ""
+
+#. module: survey
+#: view:survey.answer:0
+msgid "Menu Choices (each choice on separate by lines)"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Float"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/wizard/survey_send_invitation.py:0
+#, python-format
+msgid "%sSurvey is not in open state"
+msgstr "%sAnketa nije otvorena"
+
+#. module: survey
+#: field:survey.question.column.heading,rating_weight:0
+msgid "Weight"
+msgstr ""
+
+#. module: survey
+#: selection:survey.answer,type:0
+msgid "Date & Time"
+msgstr ""
+
+#. module: survey
+#: field:survey.response,date_create:0
+#: field:survey.response.line,date_create:0
+msgid "Create Date"
+msgstr "Kreiraj datum"
+
+#. module: survey
+#: field:survey.question,column_name:0
+msgid "Column Name"
+msgstr ""
+
+#. module: survey
+#: model:ir.actions.act_window,name:survey.action_survey_page_form
+#: model:ir.model,name:survey.model_survey_page
+#: model:ir.ui.menu,name:survey.menu_survey_page_form1
+#: view:survey.page:0
+msgid "Survey Pages"
+msgstr "Stranice Upitnika"
+
+#. module: survey
+#: field:survey.question,numeric_required_sum:0
+msgid "Sum of all choices"
+msgstr ""
+
+#. module: survey
+#: selection:survey.question,type:0
+#: view:survey.response.line:0
+msgid "Table"
+msgstr ""
+
+#. module: survey
+#: code:addons/survey/survey.py:0
+#, python-format
+msgid "You cannot duplicate the resource!"
+msgstr ""
+
+#. module: survey
+#: field:survey.question,comment_minimum_date:0
+#: field:survey.question,validation_minimum_date:0
+msgid "Minimum date"
+msgstr ""
+
+#. module: survey
+#: field:survey,response_user:0
+msgid "Maximum Answer per User"
+msgstr ""
+
+#. module: survey
+#: field:survey.name.wiz,page:0
+msgid "Page Position"
+msgstr "Pozicija stranice"
diff --git a/addons/survey/security/survey_security.xml b/addons/survey/security/survey_security.xml
index 598e3930f7f..1506fdaec1b 100644
--- a/addons/survey/security/survey_security.xml
+++ b/addons/survey/security/survey_security.xml
@@ -14,10 +14,6 @@
    	<record model="res.groups" id="group_survey_user">
         	<field name="name">Survey / User</field>
    	</record>
-   	
-    <record id="base.user_demo" model="res.users">
-        <field name="groups_id" eval="[(4,ref('group_survey_user'))]"/> 
-    </record>
 
 </data>
 </openerp>
diff --git a/addons/survey/survey_demo.xml b/addons/survey/survey_demo.xml
index a4ae0d44be3..56e20746ac2 100644
--- a/addons/survey/survey_demo.xml
+++ b/addons/survey/survey_demo.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-
+        <record id="base.user_demo" model="res.users">
+            <field name="groups_id" eval="[(4,ref('group_survey_user'))]"/> 
+        </record>
         <record model="survey.type" id="survey_type1">
             <field name="name">Human Resources</field>
             <field name="code">Human Resources</field>
diff --git a/addons/thunderbird/i18n/es.po b/addons/thunderbird/i18n/es.po
index 4d6690c089e..90193582e1a 100644
--- a/addons/thunderbird/i18n/es.po
+++ b/addons/thunderbird/i18n/es.po
@@ -8,13 +8,14 @@ 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-04-28 19:31+0000\n"
-"Last-Translator: Luis Miguel D.P. <Unknown>\n"
+"PO-Revision-Date: 2010-11-13 17:00+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
@@ -27,13 +28,13 @@ msgstr ""
 #. module: thunderbird
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "¡Error! No puede crear menús recursivos."
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
 #: field:thunderbird.installer,thunderbird:0
 msgid "Thunderbird Plug-in"
-msgstr ""
+msgstr "Conector Thunderbird"
 
 #. module: thunderbird
 #: help:thunderbird.installer,thunderbird:0
@@ -41,6 +42,8 @@ msgid ""
 "Allows you to select an object that you’d like to add to your email and its "
 "attachments."
 msgstr ""
+"Le permite seleccionar un objeto al que quiera añadir su correo y sus "
+"adjuntos."
 
 #. module: thunderbird
 #: help:thunderbird.installer,plugin_file:0
@@ -48,41 +51,43 @@ msgid ""
 "Thunderbird plug-in file. Save as this file and install this plug-in in "
 "thunderbird."
 msgstr ""
+"Fichero del conector Thunderbird. Guarde este fichero e instale este "
+"conector en la aplicación Thunderbird."
 
 #. module: thunderbird
 #: help:thunderbird.installer,pdf_file:0
 msgid "The documentation file :- how to install Thunderbird Plug-in."
-msgstr ""
+msgstr "El fichero de documentación: Como instalar el conector Thunderbird."
 
 #. module: thunderbird
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nombre de modelo no válido en la definición de acción."
 
 #. module: thunderbird
 #: model:ir.model,name:thunderbird.model_email_server_tools
 msgid "Email Server Tools"
-msgstr ""
+msgstr "Herramientas servidor correo"
 
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "_Close"
-msgstr ""
+msgstr "_Cerrar"
 
 #. module: thunderbird
 #: field:thunderbird.installer,pdf_file:0
 msgid "Installation Manual"
-msgstr ""
+msgstr "Manual instalación"
 
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configurar"
 
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "title"
-msgstr ""
+msgstr "título"
 
 #. module: thunderbird
 #: model:ir.model,name:thunderbird.model_thunderbird_partner
@@ -92,7 +97,7 @@ msgstr "Correo Thunderbid"
 #. module: thunderbird
 #: model:ir.ui.menu,name:thunderbird.menu_base_config_plugins_thunderbird
 msgid "Thunderbird Plug-In"
-msgstr ""
+msgstr "Conector Thunderbird"
 
 #. module: thunderbird
 #: model:ir.module.module,shortdesc:thunderbird.module_meta_information
@@ -102,28 +107,28 @@ msgstr "Interfaz Thunderbird"
 #. module: thunderbird
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "¡XML no válido para la estructura de la vista!"
 
 #. module: thunderbird
 #: model:ir.model,name:thunderbird.model_thunderbird_installer
 msgid "thunderbird.installer"
-msgstr ""
+msgstr "thunderbird.instalador"
 
 #. module: thunderbird
 #: field:thunderbird.installer,name:0
 #: field:thunderbird.installer,pdf_name:0
 msgid "File name"
-msgstr ""
+msgstr "Nombre fichero"
 
 #. module: thunderbird
 #: field:thunderbird.installer,progress:0
 msgid "Configuration Progress"
-msgstr ""
+msgstr "Progreso configuración"
 
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "Installation and Configuration Steps"
-msgstr ""
+msgstr "Pasos de instalación y configuración"
 
 #. module: thunderbird
 #: field:thunderbird.installer,description:0
@@ -134,17 +139,17 @@ msgstr "Descripción"
 #: model:ir.actions.act_window,name:thunderbird.action_thunderbird_installer
 #: model:ir.actions.act_window,name:thunderbird.action_thunderbird_wizard
 msgid "Thunderbird Plug-In Configuration"
-msgstr ""
+msgstr "Configuración conector Thunderbird"
 
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "Skip"
-msgstr ""
+msgstr "Saltar"
 
 #. module: thunderbird
 #: field:thunderbird.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Imagen"
 
 #~ msgid "Copy To"
 #~ msgstr "Copiar a"
diff --git a/addons/thunderbird/i18n/it.po b/addons/thunderbird/i18n/it.po
index 33001e88997..aac4d4cf750 100644
--- a/addons/thunderbird/i18n/it.po
+++ b/addons/thunderbird/i18n/it.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-02-02 09:39+0000\n"
-"Last-Translator: Carlo - didotech.com <Unknown>\n"
+"PO-Revision-Date: 2010-11-13 13:42+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-10-30 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
@@ -28,13 +28,13 @@ msgstr ""
 #. module: thunderbird
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "Errore! Non è possibile creare un menù ricorsivo."
 
 #. module: thunderbird
 #: field:thunderbird.installer,plugin_file:0
 #: field:thunderbird.installer,thunderbird:0
 msgid "Thunderbird Plug-in"
-msgstr ""
+msgstr "Plig-in Thunderbird"
 
 #. module: thunderbird
 #: help:thunderbird.installer,thunderbird:0
@@ -42,6 +42,8 @@ msgid ""
 "Allows you to select an object that you’d like to add to your email and its "
 "attachments."
 msgstr ""
+"Permettedi selezionare un oggetto che vorrete aggiungere alla email e il "
+"suoi allegati."
 
 #. module: thunderbird
 #: help:thunderbird.installer,plugin_file:0
@@ -49,41 +51,43 @@ msgid ""
 "Thunderbird plug-in file. Save as this file and install this plug-in in "
 "thunderbird."
 msgstr ""
+"File plug-in di Thunderbird. Salva il file e installa questo plug-in in "
+"Thunderbird."
 
 #. module: thunderbird
 #: help:thunderbird.installer,pdf_file:0
 msgid "The documentation file :- how to install Thunderbird Plug-in."
-msgstr ""
+msgstr "File documentazione: come installare il plug-in in Thunderbird."
 
 #. module: thunderbird
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome del modello non valido nella definizione dell'azione."
 
 #. module: thunderbird
 #: model:ir.model,name:thunderbird.model_email_server_tools
 msgid "Email Server Tools"
-msgstr ""
+msgstr "Strumenti server email"
 
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "_Close"
-msgstr ""
+msgstr "_Close"
 
 #. module: thunderbird
 #: field:thunderbird.installer,pdf_file:0
 msgid "Installation Manual"
-msgstr ""
+msgstr "Manuale installazione"
 
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "Configure"
-msgstr ""
+msgstr "Configura"
 
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "title"
-msgstr ""
+msgstr "titolo"
 
 #. module: thunderbird
 #: model:ir.model,name:thunderbird.model_thunderbird_partner
@@ -93,7 +97,7 @@ msgstr "Posta Thunderbid"
 #. module: thunderbird
 #: model:ir.ui.menu,name:thunderbird.menu_base_config_plugins_thunderbird
 msgid "Thunderbird Plug-In"
-msgstr ""
+msgstr "Plug-In Thunderbird"
 
 #. module: thunderbird
 #: model:ir.module.module,shortdesc:thunderbird.module_meta_information
@@ -103,18 +107,18 @@ msgstr "Interfaccia Thunderbird"
 #. module: thunderbird
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valido per la struttura della vista!"
 
 #. module: thunderbird
 #: model:ir.model,name:thunderbird.model_thunderbird_installer
 msgid "thunderbird.installer"
-msgstr ""
+msgstr "thunderbird.installer"
 
 #. module: thunderbird
 #: field:thunderbird.installer,name:0
 #: field:thunderbird.installer,pdf_name:0
 msgid "File name"
-msgstr ""
+msgstr "Nome file"
 
 #. module: thunderbird
 #: field:thunderbird.installer,progress:0
@@ -124,7 +128,7 @@ msgstr ""
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "Installation and Configuration Steps"
-msgstr ""
+msgstr "Passi di installazione e configurazione"
 
 #. module: thunderbird
 #: field:thunderbird.installer,description:0
@@ -135,17 +139,17 @@ msgstr "Descrizione"
 #: model:ir.actions.act_window,name:thunderbird.action_thunderbird_installer
 #: model:ir.actions.act_window,name:thunderbird.action_thunderbird_wizard
 msgid "Thunderbird Plug-In Configuration"
-msgstr ""
+msgstr "Configurazione del Plug-in di Thunderbird"
 
 #. module: thunderbird
 #: view:thunderbird.installer:0
 msgid "Skip"
-msgstr ""
+msgstr "Salta"
 
 #. module: thunderbird
 #: field:thunderbird.installer,config_logo:0
 msgid "Image"
-msgstr ""
+msgstr "Imagine"
 
 #~ msgid "Copy To"
 #~ msgstr "Copia a"
diff --git a/addons/users_ldap/i18n/es.po b/addons/users_ldap/i18n/es.po
new file mode 100644
index 00000000000..c0280963d70
--- /dev/null
+++ b/addons/users_ldap/i18n/es.po
@@ -0,0 +1,122 @@
+# Spanish 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-11-13 17:06+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: users_ldap
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML no válido para la estructura de la vista!"
+
+#. module: users_ldap
+#: view:res.company:0
+msgid "LDAP Configuration"
+msgstr "Configuración LDAP"
+
+#. module: users_ldap
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
+"especial!"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr "binddn LDAP"
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Crea el usuario si no está en la base de datos."
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Modelo utilizado para la creación de usuarios."
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Compañía"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "Dirección servidor LDAP"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr "Compañías"
+
+#. module: users_ldap
+#: model:ir.module.module,shortdesc:users_ldap.module_meta_information
+msgid "Authenticate users with ldap server"
+msgstr "Autentifica los usuarios con un servidor LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "Puerto servidor LDAP"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.compañía.ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "Contraseña LDAP"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "Parámetros LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Modelo usuario"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Secuencia"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.usuarios"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr "Base LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "Filtro LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Crear usuario"
diff --git a/addons/users_ldap/i18n/it.po b/addons/users_ldap/i18n/it.po
new file mode 100644
index 00000000000..dab712770a3
--- /dev/null
+++ b/addons/users_ldap/i18n/it.po
@@ -0,0 +1,121 @@
+# Italian 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-11-13 13:36+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+"Language-Team: Italian <it@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: users_ldap
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML non valido per la struttura della vista!"
+
+#. module: users_ldap
+#: view:res.company:0
+msgid "LDAP Configuration"
+msgstr "Configurazione LDAP"
+
+#. module: users_ldap
+#: 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 per “x_” e non contenere alcun carattere "
+"speciale!"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_binddn:0
+msgid "LDAP binddn"
+msgstr ""
+
+#. module: users_ldap
+#: help:res.company.ldap,create_user:0
+msgid "Create the user if not in database"
+msgstr "Crea l'utente se non è nel database"
+
+#. module: users_ldap
+#: help:res.company.ldap,user:0
+msgid "Model used for user creation"
+msgstr "Modello usato per la creazione utente"
+
+#. module: users_ldap
+#: field:res.company.ldap,company:0
+msgid "Company"
+msgstr "Company"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server:0
+msgid "LDAP Server address"
+msgstr "Indirizzo server LDAP"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: users_ldap
+#: model:ir.module.module,shortdesc:users_ldap.module_meta_information
+msgid "Authenticate users with ldap server"
+msgstr "Autentica utenti con server LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_server_port:0
+msgid "LDAP Server port"
+msgstr "Porta server LDAP"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_company_ldap
+msgid "res.company.ldap"
+msgstr "res.company.ldap"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_password:0
+msgid "LDAP password"
+msgstr "Password LDAP"
+
+#. module: users_ldap
+#: field:res.company,ldaps:0
+msgid "LDAP Parameters"
+msgstr "Parametri LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,user:0
+msgid "Model User"
+msgstr "Utente modello"
+
+#. module: users_ldap
+#: field:res.company.ldap,sequence:0
+msgid "Sequence"
+msgstr "Sequenza"
+
+#. module: users_ldap
+#: model:ir.model,name:users_ldap.model_res_users
+msgid "res.users"
+msgstr "res.users"
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_base:0
+msgid "LDAP base"
+msgstr ""
+
+#. module: users_ldap
+#: field:res.company.ldap,ldap_filter:0
+msgid "LDAP filter"
+msgstr "Filtro LDAP"
+
+#. module: users_ldap
+#: field:res.company.ldap,create_user:0
+msgid "Create user"
+msgstr "Crea utente"
diff --git a/addons/wiki/i18n/es.po b/addons/wiki/i18n/es.po
index 3fe9564901d..e5e65adbd3e 100644
--- a/addons/wiki/i18n/es.po
+++ b/addons/wiki/i18n/es.po
@@ -7,13 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2010-10-18 17:47+0000\n"
-"PO-Revision-Date: 2010-10-30 10:38+0000\n"
-"Last-Translator: Borja López Soilán <borjalopezsoilan@gmail.com>\n"
+"PO-Revision-Date: 2010-11-13 16:45+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-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-31 05:04+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki
@@ -30,7 +31,7 @@ msgstr "Páginas Wiki"
 #. module: wiki
 #: field:wiki.groups,method:0
 msgid "Display Method"
-msgstr ""
+msgstr "Método de visualización"
 
 #. module: wiki
 #: constraint:ir.model:0
@@ -70,7 +71,7 @@ msgstr "Sección"
 #. module: wiki
 #: help:wiki.wiki,toc:0
 msgid "Indicates that this pages have a table of contents or not"
-msgstr ""
+msgstr "Indica si estas páginas tienen una tabla de contenidos o no"
 
 #. module: wiki
 #: field:wiki.groups,section:0
@@ -97,18 +98,18 @@ msgstr "Contenido"
 #. module: wiki
 #: field:wiki.wiki,child_ids:0
 msgid "Child Pages"
-msgstr ""
+msgstr "Páginas hijas"
 
 #. module: wiki
 #: field:wiki.wiki,parent_id:0
 msgid "Parent Page"
-msgstr ""
+msgstr "Página padre"
 
 #. module: wiki
 #: view:wiki.wiki:0
 #: field:wiki.wiki,write_uid:0
 msgid "Last Contributor"
-msgstr ""
+msgstr "Último colaborador"
 
 #. module: wiki
 #: field:wiki.create.menu,menu_parent_id:0
@@ -118,7 +119,7 @@ msgstr "Menú padre"
 #. module: wiki
 #: constraint:ir.ui.menu:0
 msgid "Error ! You can not create recursive Menu."
-msgstr ""
+msgstr "¡Error! No puede crear menús recursivos."
 
 #. module: wiki
 #: field:wiki.groups,name:0
@@ -135,7 +136,7 @@ msgstr "Título"
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_create_menu
 msgid "Wizard Create Menu"
-msgstr ""
+msgstr "Asistente crear menú"
 
 #. module: wiki
 #: field:wiki.wiki,history_id:0
@@ -145,19 +146,19 @@ msgstr "Líneas historial"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Page Content"
-msgstr ""
+msgstr "Contenido página"
 
 #. module: wiki
 #: code:addons/wiki/wiki.py:0
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "¡Aviso!"
 
 #. module: wiki
 #: code:addons/wiki/wiki.py:0
 #, python-format
 msgid "There are no changes in revisions"
-msgstr ""
+msgstr "No hay cambios en revisiones"
 
 #. module: wiki
 #: model:ir.module.module,shortdesc:wiki.module_meta_information
@@ -177,7 +178,7 @@ msgstr "Descripción"
 #. module: wiki
 #: field:wiki.wiki,review:0
 msgid "Needs Review"
-msgstr ""
+msgstr "Necesita revisión"
 
 #. module: wiki
 #: help:wiki.wiki,review:0
@@ -185,6 +186,8 @@ msgid ""
 "Indicates that this page should be reviewed, raising the attention of other "
 "contributors"
 msgstr ""
+"Indica que esta página debería ser revisada, captando la atención de otros "
+"colaboradores."
 
 #. module: wiki
 #: view:wiki.create.menu:0
@@ -195,12 +198,12 @@ msgstr "Información del menú"
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
 msgid "Page History"
-msgstr ""
+msgstr "Historial página"
 
 #. module: wiki
 #: selection:wiki.groups,method:0
 msgid "Tree"
-msgstr ""
+msgstr "Árbol"
 
 #. module: wiki
 #: view:wiki.groups:0
@@ -210,7 +213,7 @@ msgstr "Plantilla de página"
 #. module: wiki
 #: field:wiki.wiki,tags:0
 msgid "Keywords"
-msgstr ""
+msgstr "Palabras clave"
 
 #. module: wiki
 #: code:addons/wiki/wizard/wiki_show_diff.py:0
@@ -222,6 +225,8 @@ msgstr "Advertencia"
 #: help:wiki.groups,home:0
 msgid "Required to select home page if display method is Home Page"
 msgstr ""
+"Es obligado seleccionar la página de inicio si el método de visualización es "
+"Página de inicio"
 
 #. module: wiki
 #: field:wiki.wiki.history,create_date:0
@@ -238,7 +243,7 @@ msgstr "¿Desea crear un índice sobre las páginas seleccionadas? "
 #: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff_values
 #: view:wizard.wiki.history.show_diff:0
 msgid "Difference"
-msgstr ""
+msgstr "Diferencia"
 
 #. module: wiki
 #: field:wiki.groups,page_ids:0
@@ -248,7 +253,7 @@ msgstr "Páginas"
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Group Description"
-msgstr ""
+msgstr "Descripción grupo"
 
 #. module: wiki
 #: help:wiki.wiki,section:0
@@ -258,7 +263,7 @@ msgstr "Utilice código de sección de la página, por ejemplo 1.2.1"
 #. module: wiki
 #: view:wiki.wiki.page.open:0
 msgid "Want to open a wiki page? "
-msgstr ""
+msgstr "¿Desea abrir una página wiki? "
 
 #. module: wiki
 #: constraint:ir.ui.view:0
@@ -273,7 +278,7 @@ msgstr "Área de texto"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Meta Information"
-msgstr ""
+msgstr "Meta información"
 
 #. module: wiki
 #: field:wiki.wiki,create_date:0
@@ -289,7 +294,7 @@ msgstr "Notas"
 #. module: wiki
 #: selection:wiki.groups,method:0
 msgid "List"
-msgstr ""
+msgstr "Lista"
 
 #. module: wiki
 #: field:wiki.wiki,summary:0
@@ -315,12 +320,12 @@ msgstr "wiki.wiki"
 #. module: wiki
 #: help:wiki.groups,method:0
 msgid "Define the default behaviour of the menu created on this group"
-msgstr ""
+msgstr "Define el comportamiento por defecto del menú creado en este grupo."
 
 #. module: wiki
 #: view:wizard.wiki.history.show_diff:0
 msgid "Close"
-msgstr ""
+msgstr "Cerrar"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wizard_wiki_history_show_diff
@@ -336,22 +341,22 @@ msgstr "ID Wiki"
 #: field:wiki.groups,home:0
 #: selection:wiki.groups,method:0
 msgid "Home Page"
-msgstr ""
+msgstr "Página inicio"
 
 #. module: wiki
 #: help:wiki.wiki,parent_id:0
 msgid "Allows you to link with the other page with in the current topic"
-msgstr ""
+msgstr "Le permite enlazar con la otra página dentro del tema actual."
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Modification Information"
-msgstr ""
+msgstr "Información modificación"
 
 #. module: wiki
 #: help:wiki.wiki,group_id:0
 msgid "Topic, also called Wiki Group"
-msgstr ""
+msgstr "Tema, también denominado Grupo wiki."
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_wiki_configuration
@@ -387,7 +392,7 @@ msgstr ""
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Group By..."
-msgstr ""
+msgstr "Agrupar por..."
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_create_menu
@@ -414,7 +419,7 @@ msgstr "Grupos Wiki"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Topic"
-msgstr ""
+msgstr "Tema"
 
 #. module: wiki
 #: field:wiki.wiki.history,write_uid:0
@@ -432,12 +437,12 @@ msgstr "Tabla de contenido"
 #: view:wiki.groups:0
 #: view:wiki.wiki.page.open:0
 msgid "Open Wiki Page"
-msgstr ""
+msgstr "Abrir página wiki"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_page_open
 msgid "wiz open page"
-msgstr ""
+msgstr "asistente abrir página"
 
 #. module: wiki
 #: view:wiki.create.menu:0
@@ -459,12 +464,12 @@ msgstr "Necesita revisión"
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_review
 msgid "Pages Waiting Review"
-msgstr ""
+msgstr "Páginas esperando revisión"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_group_open
 msgid "Search Page"
-msgstr ""
+msgstr "Buscar página"
 
 #~ msgid "Wiki Groups Links"
 #~ msgstr "Enlaces grupos wiki"
diff --git a/addons/wiki_sale_faq/i18n/it.po b/addons/wiki_sale_faq/i18n/it.po
index 6f4e8324690..22d452804a9 100644
--- a/addons/wiki_sale_faq/i18n/it.po
+++ b/addons/wiki_sale_faq/i18n/it.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-11-02 07:23+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2010-11-13 14:27+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-11-03 05:00+0000\n"
+"X-Launchpad-Export-Date: 2010-11-14 05:08+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: wiki_sale_faq
@@ -55,7 +55,7 @@ msgstr ""
 #. module: wiki_sale_faq
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Nome del modello non valido nella definizione dell'azione."
 
 #. module: wiki_sale_faq
 #: model:ir.module.module,shortdesc:wiki_sale_faq.module_meta_information