[MERGE]

bzr revid: mra@tinyerp.com-20100510130252-7f9sje5lhuq1nvf5

6 files changed, 101 insertions, 37 deletions

diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po
index 459e602eb9c..69a3ef62f7a 100644
--- a/addons/account/i18n/et.po
+++ b/addons/account/i18n/et.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-07 17:19+0000\n"
+"PO-Revision-Date: 2010-05-09 18:34+0000\n"
 "Last-Translator: lyyser <logard.1961@gmail.com>\n"
 "Language-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-05-08 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-05-10 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account
@@ -1704,7 +1704,7 @@ msgstr "Annab järjekorra kui näidatakse konto nimelirja tüüpe."
 #. module: account
 #: view:account.invoice:0
 msgid "Re-Open"
-msgstr ""
+msgstr "Ava uuesti"
 
 #. module: account
 #: wizard_view:account.fiscalyear.close,init:0
@@ -1741,7 +1741,7 @@ msgstr "Kulupäevik perioodiks"
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree2
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree2
 msgid "New Statement"
-msgstr ""
+msgstr "Uus teatis"
 
 #. module: account
 #: wizard_field:account.analytic.account.chart,init,from_date:0
@@ -1984,7 +1984,7 @@ msgstr "          Alguskuupäev"
 #. module: account
 #: wizard_view:account.analytic.account.journal.report,init:0
 msgid "Analytic Journal Report"
-msgstr ""
+msgstr "Analüütilise päeviku raport"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
@@ -2000,7 +2000,7 @@ msgstr "Maksu summa"
 #. module: account
 #: rml:account.analytic.account.quantity_cost_ledger:0
 msgid "J.C./Move name"
-msgstr ""
+msgstr "J.C./liiguta nime"
 
 #. module: account
 #: field:account.journal.period,name:0
@@ -2058,7 +2058,7 @@ msgstr ""
 #. module: account
 #: wizard_view:account.automatic.reconcile,init:0
 msgid "Options"
-msgstr ""
+msgstr "Seaded"
 
 #. module: account
 #: model:process.process,name:account.process_process_invoiceprocess0
@@ -2085,12 +2085,12 @@ msgstr "Kinnita kontoliikumised"
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "days"
-msgstr ""
+msgstr "päevad"
 
 #. module: account
 #: selection:account.aged.trial.balance,init,direction_selection:0
 msgid "Past"
-msgstr ""
+msgstr "Endine"
 
 #. module: account
 #: field:account.analytic.account,company_currency_id:0
@@ -2126,7 +2126,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
 #: model:ir.ui.menu,name:account.menu_action_subscription_form_new
 msgid "New Subscription"
-msgstr ""
+msgstr "Uus tellimus"
 
 #. module: account
 #: view:account.payment.term:0
@@ -2136,7 +2136,7 @@ msgstr ""
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Entry"
-msgstr ""
+msgstr "Analüütiline kirje"
 
 #. module: account
 #: view:res.company:0 field:res.company,overdue_msg:0
@@ -2162,7 +2162,7 @@ msgstr ""
 #. module: account
 #: field:account.invoice,address_contact_id:0
 msgid "Contact Address"
-msgstr ""
+msgstr "Kontaktaadress"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -2172,7 +2172,7 @@ msgstr "Loo 3 kuupikkused perioodid"
 #. module: account
 #: view:account.invoice:0
 msgid "(keep empty to use the current period)"
-msgstr ""
+msgstr "(jätke tühjaks, et kasutada praegusel perioodil)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree8
@@ -2188,7 +2188,7 @@ msgstr ""
 #. module: account
 #: selection:account.account.type,close_method:0
 msgid "Detail"
-msgstr ""
+msgstr "Detail"
 
 #. module: account
 #: selection:account.account,type:0
@@ -2226,13 +2226,13 @@ msgstr "Kontoplaan"
 #. module: account
 #: model:account.journal,name:account.check_journal
 msgid "x Checks Journal"
-msgstr ""
+msgstr "x Tšekkide päevik"
 
 #. module: account
 #: model:ir.actions.wizard,name:account.wizard_generate_subscription
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Create subscription entries"
-msgstr ""
+msgstr "Koosta tellimus sissekanded"
 
 #. module: account
 #: wizard_field:account.fiscalyear.close,init,journal_id:0
@@ -2271,7 +2271,7 @@ msgstr "Kohustus"
 #. module: account
 #: selection:account.automatic.reconcile,init,power:0
 msgid "2"
-msgstr ""
+msgstr "2"
 
 #. module: account
 #: wizard_view:account.chart,init:0
@@ -2306,7 +2306,7 @@ msgstr "Kuupäev"
 #. module: account
 #: field:account.invoice,reference_type:0
 msgid "Reference Type"
-msgstr ""
+msgstr "Viite tüüp"
 
 #. module: account
 #: wizard_button:account.move.line.unreconcile,init,unrec:0
diff --git a/addons/account_tax_include/i18n/en_AU.po b/addons/account_tax_include/i18n/en_AU.po
index ae6cc0da559..892197cf816 100644
--- a/addons/account_tax_include/i18n/en_AU.po
+++ b/addons/account_tax_include/i18n/en_AU.po
@@ -8,46 +8,46 @@ 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-02-26 06:55+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2010-05-09 21:19+0000\n"
+"Last-Translator: MoLE <Unknown>\n"
 "Language-Team: English (Australia) <en_AU@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-05-10 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: account_tax_include
 #: constraint:ir.ui.view:0
 msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "Invalid XML for View Architecture!"
 
 #. module: account_tax_include
 #: field:account.invoice,price_type:0
 msgid "Price method"
-msgstr ""
+msgstr "Price method"
 
 #. module: account_tax_include
 #: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
 msgid "Invoices and prices with taxes included"
-msgstr ""
+msgstr "Invoices and prices with taxes included"
 
 #. module: account_tax_include
 #: selection:account.invoice,price_type:0
 msgid "Tax included"
-msgstr ""
+msgstr "Tax included"
 
 #. module: account_tax_include
 #: selection:account.invoice,price_type:0
 msgid "Tax excluded"
-msgstr ""
+msgstr "Tax excluded"
 
 #. module: account_tax_include
 #: view:account.tax:0
 msgid "Compute Code for Taxes included prices"
-msgstr ""
+msgstr "Compute Code for Taxes included prices"
 
 #. module: account_tax_include
 #: field:account.invoice.line,price_subtotal_incl:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/en_GB.po b/addons/account_tax_include/i18n/en_GB.po
new file mode 100644
index 00000000000..0341993acca
--- /dev/null
+++ b/addons/account_tax_include/i18n/en_GB.po
@@ -0,0 +1,53 @@
+# English (United Kingdom) 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: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-05-09 21:20+0000\n"
+"Last-Translator: MoLE <Unknown>\n"
+"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-05-10 04:17+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Invalid XML for View Architecture!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr "Price method"
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr "Invoices and prices with taxes included"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr "Tax included"
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr "Tax excluded"
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr "Compute Code for Taxes included prices"
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Subtotal"
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/hr_contract.py
index b8a310cc7bd..ddc29bd26a1 100644
--- a/addons/hr_contract/hr_contract.py
+++ b/addons/hr_contract/hr_contract.py
@@ -86,7 +86,7 @@ class hr_contract(osv.osv):
         'job_id': fields.many2one('hr.job', 'Job Title'),
         'date_start': fields.date('Start Date', required=True),
         'date_end': fields.date('End Date'),
-        'working_hours': fields.many2one('resource.calendar','Working hours'),
+        'working_hours': fields.many2one('resource.calendar','Working Schedule'),
         'wage_type_id': fields.many2one('hr.contract.wage.type', 'Wage Type', required=True),
         'wage': fields.float('Wage', digits=(16,2), required=True),
         'advantages': fields.text('Advantages'),
@@ -99,4 +99,4 @@ class hr_contract(osv.osv):
     }
 hr_contract()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/idea/i18n/it.po b/addons/idea/i18n/it.po
index c61b98bedeb..55c17dba585 100644
--- a/addons/idea/i18n/it.po
+++ b/addons/idea/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2008-10-13 00:48+0000\n"
-"Last-Translator: Marius Marolla <mariusmarolla@areablu.net>\n"
+"PO-Revision-Date: 2010-05-08 11:08+0000\n"
+"Last-Translator: eLBati - albatos.com <lorenzo.battistini@albatos.com>\n"
 "Language-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-04-17 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-05-10 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: idea
@@ -44,7 +44,7 @@ msgstr "Le Mie Idee"
 #. module: idea
 #: 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: idea
 #: selection:idea.idea,my_vote:0
diff --git a/addons/sale/i18n/it.po b/addons/sale/i18n/it.po
index 846764f2ee5..0b2dd5cc4bb 100644
--- a/addons/sale/i18n/it.po
+++ b/addons/sale/i18n/it.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-18 10:45+0000\n"
-"Last-Translator: Carlo Vettore <Unknown>\n"
+"PO-Revision-Date: 2010-05-09 16:30+0000\n"
+"Last-Translator: eLBati - albatos.com <lorenzo.battistini@albatos.com>\n"
 "Language-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-04-17 04:09+0000\n"
+"X-Launchpad-Export-Date: 2010-05-10 04:17+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: sale
@@ -861,6 +861,17 @@ msgid ""
 "  - The 'Invoice from the packing' choice is used to create an invoice "
 "during the packing process."
 msgstr ""
+"La politica di spedizione è utilizzata per sincronizzare le operazioni di "
+"fatturazione e consegna\n"
+"  - La scelta 'Pagamento prima della consegna' dapprima genererà la fattura "
+"e poi, dopo il pagamento di questa fattura, genererà il DDT.\n"
+"  - 'Spedizione e fatturazione manuale' genererà direttamente il DDT e "
+"attenderà che l'utente clicchi manualmente sul bottone \"Crea fattura\" per "
+"generare la bozza di fattura.\n"
+"  - 'Fattura su ordine a consegna effettuata' genererà la bozza di fattura "
+"basata sull'ordine di vendita dopo che la merce sia uscita.\n"
+"  - 'Fattura da DDT' è utilizzato per creare una fattura durante il processo "
+"di spedizione."
 
 #. module: sale
 #: rml:sale.order:0