Merge lp:~vrt-openerp/openobject-addons/6.1-trunk-bug-923440 into lp:openobject-addons

[Stuart Longland]

This branch contains the fixes presented in bug #923440 and bug #940264.

I'd like to thank Etienne Hirt for providing many of the patches which were used to construct this branch. All I did was tidy things up a bit, he did all the work. :-)

[lp:~vrt-openerp/openobject-addons/6.1-trunk-bug-923440]

6649. By Launchpad Translations on behalf of openerp on 2012-03-08

Launchpad automatic translations update.

6650. By Olivier Dony (Odoo) on 2012-03-08

[FIX] mail*: properly handle b64-encoding for attachments

When reading the datas property of an attachment,
a base64-encoded stream is expected.
The mail.message.schedule_with_attach() method OTOH
expects a binary file for attachments, so it should
be decoded if extracted from a binary field.

6651. By Olivier Dony (Odoo) on 2012-03-08

[FIX] crm: typo + duplicate line due to bad merge + bad hardcoded models

6652. By Olivier Dony (Odoo) on 2012-03-09

[FIX] crm_partner_assign: partial revert of recent commit, care for missing city/zip

6653. By Olivier Dony (Odoo) on 2012-03-09

[FIX] email_template: care for missing context

6654. By Olivier Dony (Odoo) on 2012-03-09

[FIX] marketing_campaign: correct search view, today should not be OR'ed with states

In 6.1 a group of filters in a search view are
OR'ed together if toggled when they are contained
within the same 'separator' group.

6655. By Olivier Dony (Odoo) on 2012-03-09

[FIX] crm_partner_assign: google map is confused by certain country names

6656. By Olivier Dony (Odoo) on 2012-03-09

[FIX] crm_partner_assign: geolocalization was bad for large countries e.g. US or Russia

Add one more step considering a slightly larger
range around the lead within the same country,
before considering the whole country at once.
Courtesy of Dhara Shah

6657. By Launchpad Translations on behalf of openerp on 2012-03-09

Launchpad automatic translations update.

6658. By Olivier Dony (Odoo) on 2012-03-09

[FIX] res.partner.bank: respect company restrictions when assign parent account for new bank GL account

6659. By Olivier Dony (Odoo) on 2012-03-09

[FIX] lunch: missing product description in list view

6660. By Olivier Dony (Odoo) on 2012-03-09

[FIX] portal: mark portal users as `share` to exclude from lists by default

6661. By Olivier Dony (Odoo) on 2012-03-09

[FIX] email.template: body_html should be translatable

6662. By Launchpad Translations on behalf of openerp on 2012-03-10

Launchpad automatic translations update.

6663. By Launchpad Translations on behalf of openerp on 2012-03-11

Launchpad automatic translations update.

6664. By Launchpad Translations on behalf of openerp on 2012-03-12

Launchpad automatic translations update.

6665. By Olivier Dony (Odoo) on 2012-03-12

[FIX] hr_holidays: Leaves calendar view should be filtered by users, not description

6666. By Olivier Dony (Odoo) on 2012-03-12

[FIX] project: project preference field must be editable

The user preferences screen is kind of a hack
because it lets the user modify fields on a
model that is normally read-only for her (res.users).
This is accomplished by a custom write() method
on res.users combined with a view on which some
fields are forced to be read-write using a
trick: @readonly=0.

6667. By Stephane Wirtel (OpenERP) on 2012-03-12

[FIX] In the case where the user has no signature, we set up a default value to avoid to have a body with 'False'.

6668. By Launchpad Translations on behalf of openerp on 2012-03-13

Launchpad automatic translations update.

6669. By Quentin (OpenERP) <email address hidden> on 2012-03-13

[FIX] account: qucik and dirty fix on the common wizard of reports to set the company_id by default in order to avoid having the name_search of fiscalyear processed before it is correctly set by the onchange of default value of chart account id. This bug is due to asynchronous calls of web client and will be solved asap, but in the meanwhile this little hack will localy solve the problem.

6670. By Launchpad Translations on behalf of openerp on 2012-03-14

Launchpad automatic translations update.

6671. By Olivier Dony (Odoo) on 2012-03-12

[FIX] project_issue: global CC fields contains email(s), not a URL

6672. By Launchpad Translations on behalf of openerp on 2012-03-15

Launchpad automatic translations update.

6673. By Olivier Dony (Odoo) on 2012-03-15

[FIX] email_template: attachments were not being sent due to programming error

6674. By Olivier Dony (Odoo) on 2012-03-15

[FIX] sale,sale_layout: avoid RML loop when printing SO with very long notes

Forward port of revision 5001 from the
6.0 branch. Apparently very long SO
notes (above 2200 characters) will cause
an endless loop while trying to render
inside a blockTable

6675. By Launchpad Translations on behalf of openerp on 2012-03-16

Launchpad automatic translations update.

6676. By Christophe Simonis (OpenERP) on 2012-03-16

[FIX] email_template: report_name must be rendered

6677. By Quentin (OpenERP) <email address hidden> on 2012-03-16

[MERGE] opw-381937. Stock: don't set an arbitrary value of 1 when valuating a stock move of a product with 0 as unit amount

6678. By Olivier Dony (Odoo) on 2012-03-16

[FIX] mail.message: when auto-deleting a message, only delete attachments it owns

There's a peculiar way to manage attachments on
mail messages, as there is an explicit many2many
on top of regular attachments like for any
record, so it is possible to link a mail
to attachments that are owned by other records.
Such attachments must not be deleted along with
the message when the auto-delete flag is set.

6679. By Olivier Dony (Odoo) on 2012-03-16

[MERGE] base.action.rule: better handle non-ASCII data

Also fixes the `regex_history` expression
that should search on the `subject` field
now (it was renamed in 6.1).

6680. By Launchpad Translations on behalf of openerp on 2012-03-17

Launchpad automatic translations update.

6681. By Launchpad Translations on behalf of openerp on 2012-03-18

Launchpad automatic translations update.

6682. By Launchpad Translations on behalf of openerp on 2012-03-19

Launchpad automatic translations update.

6683. By Quentin (OpenERP) <email address hidden> on 2012-03-19

[FIX] account: build_ctx_period must always return a list of ids

6684. By Olivier Dony (Odoo) on 2012-03-19

[FIX] mail.message: allow reading msg even if author belongs to another company

6685. By Launchpad Translations on behalf of openerp on 2012-03-20

Launchpad automatic translations update.

6686. By Raphael Collet (OpenERP) on 2012-03-20

[FIX] backport of branch trunk-bug-937194-nco (mail: remove character &#13; from message)

6687. By Olivier Dony (Odoo) on 2012-03-20

[FIX] edi: company logo appears truncated on EDI preview in Firefox

6688. By Olivier Dony (Odoo) on 2012-03-20

[FIX] edi: avoid disprupting EDI preview layout with wide notes

6689. By Olivier Dony (Odoo) on 2012-03-20

[FIX] edi: care for missing invoice fields in EDI preview (instead of displaying `false`)

6690. By Olivier Dony (Odoo) on 2012-03-20

[MERGE] procurement: Fix typo (bug 956234), courtesy of Guewen Baconnier @ Camptocamp

6691. By Olivier Dony (Odoo) on 2012-03-20

[MERGE] Update l10n_it account types, courtesy of Lorenzo Battistini (Agile BG - Domsense)

6692. By Launchpad Translations on behalf of openerp on 2012-03-21

Launchpad automatic translations update.

6693. By Xavier ALT on 2012-03-21

[MERGE] OPW 573035: fetchmail: UnboundLocalError: local variable imap_server referenced before assignment

6694. By Launchpad Translations on behalf of openerp on 2012-03-22

Launchpad automatic translations update.

6695. By Olivier Dony (Odoo) on 2012-03-22

[FIX] mail: default permissions should allow write for everyone

Mail messages are created in multiple steps that
usually involve calling write() at some point, so
giving all users write access is necessary.

6696. By Olivier Dony (Odoo) on 2012-03-22

[MERGE] Properly pass context when incrementing sequences, courtesy of Stefan Rijnhart (Therp)

6697. By Rucha Patel <email address hidden> on 2012-03-22

[FIX] email_template: don't re-encode attachments copied from template'

6698. By Rucha Patel <email address hidden> on 2012-03-22

[FIX] email_template: ensure non-empty context when rendering template'

6699. By Launchpad Translations on behalf of openerp on 2012-03-23

Launchpad automatic translations update.

6700. By Xavier ALT on 2012-03-23

[MERGE] OPW 573037: audittrail: force admin for subscribe/unsubscribe op - fix 'admin/access rights' members access

6701. By Olivier Dony (Odoo) on 2012-03-23

[FIX] email.template: properly propagate res_id over context reloads in composition wizard

6702. By Launchpad Translations on behalf of openerp on 2012-03-24

Launchpad automatic translations update.

6703. By Launchpad Translations on behalf of openerp on 2012-03-25

Launchpad automatic translations update.

6704. By Launchpad Translations on behalf of openerp on 2012-03-27

Launchpad automatic translations update.

6705. By Xavier ALT on 2012-03-27

[MERGE] OPW 381582: stock: on inventory, product qty should be computed up to 'inventory date', not after

6706. By Launchpad Translations on behalf of openerp on 2012-03-28

Launchpad automatic translations update.

6707. By Xavier ALT on 2012-03-28

[MERGE] OPW 573041: crm: for crm.lead, force orm 'default_get' to avoid misbehaviour when 'base_contact' is installed

6708. By Launchpad Translations on behalf of openerp on 2012-03-29

Launchpad automatic translations update.

6709. By Xavier ALT on 2012-03-29

[MERGE] OPW 381524: stock: on picking invoicing, do not invoice scrapped products

6710. By Xavier ALT on 2012-03-29

[MERGE] OPW 573244: account: manually unreconcilling move line doesn't switch invoice back to 'open' state

6711. By Xavier ALT on 2012-03-29

[MERGE] OPW 51189: account: on invoice 'refund', keep original salesman and fiscal position

6712. By Xavier ALT on 2012-03-29

[MERGE] OPW 16328: account.move.line: do not create writeoff entries when called from fy closing wizard

6713. By Xavier ALT on 2012-03-29

[MERGE] OPW 50804: stock: fix search_default_available on 'internal move' search view

6714. By Xavier ALT on 2012-03-29

[MERGE] OPW 381927: project: when copying the project, analytic lines of the related analytic account should not be copied

6715. By Xavier ALT on 2012-03-29

[MERGE] OPW 381848: purchase_requisition: fix action context as create_uid is not present in the search view

6716. By Launchpad Translations on behalf of openerp on 2012-03-30

Launchpad automatic translations update.

6717. By Xavier ALT on 2012-03-30

[MERGE] OWP 572921: account_voucher: fix computation of paid_amount_in_company_currency field

6718. By Olivier Dony (Odoo) on 2012-03-31

[FIX] Trunk backport: properly record UTC login date, courtesy of Ian Beardslee

6719. By Launchpad Translations on behalf of openerp on 2012-03-31

Launchpad automatic translations update.

6720. By Launchpad Translations on behalf of openerp on 2012-04-01

Launchpad automatic translations update.

6721. By Launchpad Translations on behalf of openerp on 2012-04-02

Launchpad automatic translations update.

6722. By Launchpad Translations on behalf of openerp on 2012-04-03

Launchpad automatic translations update.

6723. By Xavier ALT on 2012-04-03

[MERGE] project_issue: by default, convert issue to bug only if there is no provided category

6724. By Christophe Simonis (OpenERP) on 2012-04-03

[FIX] auth_openid: allow login from direct http request

6725. By Christophe Simonis (OpenERP) on 2012-04-03

[FIX] auth_openid: use correct api for login users

6726. By Antony Lesuisse (OpenERP) on 2012-04-03

[MERGE] point_of_sale barcode scanning (manual merge)

6727. By Launchpad Translations on behalf of openerp on 2012-04-04

Launchpad automatic translations update.

6728. By Launchpad Translations on behalf of openerp on 2012-04-05

Launchpad automatic translations update.

6729. By Xavier ALT on 2012-04-05

[MERGE] project_issue: issue analysis have to use 'AVG' group operator for AVG Working Hours fields

6730. By Launchpad Translations on behalf of openerp on 2012-04-06

Launchpad automatic translations update.

6731. By Launchpad Translations on behalf of openerp on 2012-04-07

Launchpad automatic translations update.

6732. By Launchpad Translations on behalf of openerp on 2012-04-08

Launchpad automatic translations update.

6733. By Launchpad Translations on behalf of openerp on 2012-04-09

Launchpad automatic translations update.

6734. By Launchpad Translations on behalf of openerp on 2012-04-10

Launchpad automatic translations update.

6735. By Launchpad Translations on behalf of openerp on 2012-04-11

Launchpad automatic translations update.

6736. By Xavier ALT on 2012-04-11

[MERGE] report_webkit: remove deprecated 'lib_path' field on company

6737. By Launchpad Translations on behalf of openerp on 2012-04-12

Launchpad automatic translations update.

6738. By Launchpad Translations on behalf of openerp on 2012-04-13

Launchpad automatic translations update.

6739. By Launchpad Translations on behalf of openerp on 2012-04-14

Launchpad automatic translations update.

6740. By Launchpad Translations on behalf of openerp on 2012-04-15

Launchpad automatic translations update.

6741. By Launchpad Translations on behalf of openerp on 2012-04-16

Launchpad automatic translations update.

6742. By Launchpad Translations on behalf of openerp on 2012-04-17

Launchpad automatic translations update.

6743. By Xavier ALT on 2012-04-17

[MERGE] report_webkit: handle more gracefull remove of 'lib_path' + fix test in l10n_ch

6748. By Stuart Longland on 2012-03-07

Rebase and merge with upstream

6749. By Stuart Longland on 2012-03-16

base_contact: Add support for private addresses

This patch adds support for private contact addresses and allows for the UI to
pick out addresses of a given type by default based on the context.

Credit: Etienne Hirt

6750. By Stuart Longland on 2012-04-18

Rebase off upstream tree

Unmerged revisions

6750. By Stuart Longland on 2012-04-18

Rebase off upstream tree

6749. By Stuart Longland on 2012-03-16

base_contact: Add support for private addresses

This patch adds support for private contact addresses and allows for the UI to
pick out addresses of a given type by default based on the context.

Credit: Etienne Hirt

6748. By Stuart Longland on 2012-03-07

Rebase and merge with upstream

6747. By Stuart Longland on 2012-03-06

base_contact: Make contact_id OR partner_id required

Source and credit: Etienne Hirt
https://bugs.launchpad.net/openobject-addons/+bug/940264/comments/4

This patch mandates that at least one of contact_id OR partner_id (or both)
must be filled in for the object to be valid.

6746. By Stuart Longland on 2012-03-06

base_contact: Tweak order of address "names"

Tweak name_get so that it returns a string of the form:
 FirstName LastName, Partner, City, Country
rather than the default:
 Partner, FirstName, LastName, City, Country

IMO this should be locale dependent.

6745. By Stuart Longland on 2012-03-05

base_contact: Remove erronious security/base_contact_security.xml

Seems this is one of many rabbit droppings from the 6.0-branch of OpenERP.

6744. By Stuart Longland on 2012-03-05

Rebase and merge with upstream 6.1 branch

Credit goes to Etienne Hirt for putting the contributions together. Please see
https://code.launchpad.net/~openerp-community/openobject-addons/trunk-bug-923440-base_contact_finalise6.1

for the original commit log.

I tried to add these changes individually, but ran into numerous snags due to
the way the original branch was constructed (bzr merge won't work as the
branches do not share a common ancestor).

So all changes have been folded into one commit here, with the updates to .po
files filtered out as these seemed to be mostly noise.

=== modified file 'account/i18n/el.po'
--- account/i18n/el.po	2012-02-29 09:45:02 +0000
+++ account/i18n/el.po	2012-03-08 00:03:21 +0000
@@ -8,20 +8,30 @@
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2011-01-24 20:02+0000\n"
 "Last-Translator: Dimitris Andavoglou <[e-mail]>\n"
+=======
+"PO-Revision-Date: 2012-03-06 09:57+0000\n"
+"Last-Translator: Tryfon Farmakakis <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Greek <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-02-09 06:19+0000\n"
 "X-Generator: Launchpad (build 14763)\n"
+=======
+"X-Launchpad-Export-Date: 2012-03-07 06:03+0000\n"
+"X-Generator: Launchpad (build 14907)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "last month"
-msgstr ""
+msgstr "τελευταίος μήνας"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -117,6 +127,8 @@
 "Configuration error! The currency chosen should be shared by the default "
 "accounts too."
 msgstr ""
+"Σφάλμα διαμόρφωσης! Το επιλεγμένο νόμισμα θα πρέπει να συμφωνεί με το "
+"νόμισμα των προεπιλεγμένων λογαριασμών."
 
 #. module: account
 #: report:account.invoice:0
@@ -188,7 +200,7 @@
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
-msgstr ""
+msgstr "Ετικέτα Στήλης"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:95

=== modified file 'account/i18n/fr.po'
--- account/i18n/fr.po	2012-02-29 09:45:02 +0000
+++ account/i18n/fr.po	2012-03-08 00:03:21 +0000
@@ -7,12 +7,18 @@
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2012-02-22 13:44+0000\n"
 "Last-Translator: Pierre Burnier <Unknown>\n"
+=======
+"PO-Revision-Date: 2012-03-01 19:29+0000\n"
+"Last-Translator: t.o <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-02-23 04:39+0000\n"
 "X-Generator: Launchpad (build 14855)\n"
 
@@ -83,6 +89,10 @@
 #, python-format
 #~ msgid "You can not delete posted movement: \"%s\"!"
 #~ msgstr "Vous ne pouvez pas supprimer l'écriture comptabilisée : \"%s\" !"
+=======
+"X-Launchpad-Export-Date: 2012-03-02 05:23+0000\n"
+"X-Generator: Launchpad (build 14886)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.invoice.report:0
@@ -5522,7 +5532,7 @@
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr "Avoir client"
+msgstr "Avoirs clients"
 
 #. module: account
 #: constraint:account.move:0
@@ -5601,7 +5611,7 @@
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Unposted"
-msgstr "Non comptabilisée"
+msgstr "Non comptabilisé"
 
 #. module: account
 #: view:account.change.currency:0
@@ -5679,7 +5689,7 @@
 #. module: account
 #: view:account.move.line:0
 msgid "Number (Move)"
-msgstr "Numéro (écriture)"
+msgstr "N° d'écriture"
 
 #. module: account
 #: view:analytic.entries.report:0
@@ -6337,7 +6347,7 @@
 #. module: account
 #: view:account.invoice.report:0
 msgid "Open and Paid Invoices"
-msgstr "Factures ouvertes et payées"
+msgstr "Factures ouvertes et réglées"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
@@ -6563,10 +6573,9 @@
 "year. Note that you can run this wizard many times for the same fiscal year: "
 "it will simply replace the old opening entries with the new ones."
 msgstr ""
-"L'assistant génère le jour des écritures de fin d'exercice de l'année "
-"fiscale sélectionnée. Cet assistant peut être utilisé plusieurs fois pour le "
-"même exercice : il va simplement remplacer les écritures précédentes par les "
-"nouvelles."
+"Cet assistant génère les écritures de fin d'exercice pour l'année fiscale "
+"sélectionnée. Il peut être utilisé plusieurs fois pour le même exercice : il "
+" remplacera alors les anciennes écritures par les nouvelles."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
@@ -9517,7 +9526,7 @@
 "partially. You can easily generate refunds and reconcile them directly from "
 "the invoice form."
 msgstr ""
-"Avec les avoirs fournisseurs, vous pouvez gérer les avoirs envoyés par vos "
+"Avec les avoirs fournisseurs, vous pouvez gérer les avoirs reçus de vos "
 "fournisseurs. Un avoir est un document qui \"annule\" une facture "
 "complètement ou partiellement. Vous pouvez facilement générer des avoirs et "
 "les associer directement depuis le formulaire de facture."
@@ -9900,7 +9909,7 @@
 #: view:account.entries.report:0
 #: view:account.move.line:0
 msgid "Unreconciled"
-msgstr "Non-rapprochée"
+msgstr "Non lettré"
 
 #. module: account
 #: code:addons/account/account_invoice.py:828

=== modified file 'account/i18n/id.po'
--- account/i18n/id.po	2012-02-29 09:45:02 +0000
+++ account/i18n/id.po	2012-03-08 00:03:21 +0000
@@ -8,14 +8,24 @@
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2012-02-19 15:51+0000\n"
 "Last-Translator: Serpent Consulting Services <Unknown>\n"
+=======
+"PO-Revision-Date: 2012-03-06 15:23+0000\n"
+"Last-Translator: Budi Iskandar <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Indonesian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-02-20 05:40+0000\n"
 "X-Generator: Launchpad (build 14833)\n"
+=======
+"X-Launchpad-Export-Date: 2012-03-07 06:03+0000\n"
+"X-Generator: Launchpad (build 14907)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.invoice.report:0
@@ -268,6 +278,9 @@
 "legal reports, and set the rules to close a fiscal year and generate opening "
 "entries."
 msgstr ""
+"Tipe Akun berguna sebagai penyedia informasi, membuat report akunting yang "
+"spesifik tiap negara, dan menyusun aturan untuk tutup buku tahunan dan "
+"membuat saldo awal"
 
 #. module: account
 #: report:account.overdue:0
@@ -279,7 +292,7 @@
 #: model:ir.actions.act_window,name:account.action_view_account_use_model
 #: model:ir.ui.menu,name:account.menu_action_manual_recurring
 msgid "Manual Recurring"
-msgstr "Manual Operasional"
+msgstr "Manual Jurnal Berulang"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -345,7 +358,7 @@
 #: view:product.product:0
 #: view:product.template:0
 msgid "Purchase Properties"
-msgstr "Pembelian Barang Milik"
+msgstr "Aturan Pembelian"
 
 #. module: account
 #: help:account.financial.report,style_overwrite:0
@@ -354,6 +367,9 @@
 "leave the automatic formatting, it will be computed based on the financial "
 "reports hierarchy (auto-computed field 'level')."
 msgstr ""
+"Anda dapat mengatur format yang ingin anda tampilkan. Jika anda menyerahkan "
+"pada format otomatis, Hal tersebut akan dihitung berdasarkan hirarki laporan "
+"keuangan"
 
 #. module: account
 #: view:account.installer:0
@@ -383,17 +399,17 @@
 #. module: account
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr ""
+msgstr "Anda tidak dapat membuat item jurnal pada akun dengan tipe View"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
 msgid "account.tax.template"
-msgstr "akun.pajak.lembar contoh"
+msgstr "salinan.akun.pajak"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_accounts_wizard
 msgid "account.bank.accounts.wizard"
-msgstr "akun.bank.akun.tuntunan"
+msgstr "tuntunan.akun.bank"
 
 #. module: account
 #: field:account.move.line,date_created:0
@@ -414,12 +430,12 @@
 #. module: account
 #: help:account.journal,currency:0
 msgid "The currency used to enter statement"
-msgstr "Mata uang yang digunakan untuk masukkan pernyataan"
+msgstr ""
 
 #. module: account
 #: field:account.open.closed.fiscalyear,fyear_id:0
 msgid "Fiscal Year to Open"
-msgstr "Tahun buku yang dibuka"
+msgstr "Tahun Buku yang akan dibuka"
 
 #. module: account
 #: help:account.journal,sequence_id:0
@@ -451,7 +467,7 @@
 #: field:account.tax.template,chart_template_id:0
 #: field:wizard.multi.charts.accounts,chart_template_id:0
 msgid "Chart Template"
-msgstr "Lembar Contoh Bagan"
+msgstr "Salinan Bagan Akun"
 
 #. module: account
 #: help:account.model.line,amount_currency:0
@@ -461,7 +477,7 @@
 #. module: account
 #: field:accounting.report,enable_filter:0
 msgid "Enable Comparison"
-msgstr ""
+msgstr "Perbandingan diperbolehkan"
 
 #. module: account
 #: help:account.journal.period,state:0
@@ -554,7 +570,7 @@
 #. module: account
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Perusahaan harus mempunyai nama yang unik"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
@@ -575,7 +591,7 @@
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 msgid "Counterpart"
-msgstr ""
+msgstr "Lawan"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -638,7 +654,7 @@
 #: field:account.financial.report,account_report_id:0
 #: selection:account.financial.report,type:0
 msgid "Report Value"
-msgstr ""
+msgstr "Nilai Laporan"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -660,6 +676,8 @@
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
+"Tidak ditemukan period atau lebih dari 1 period ditemukan pada tanggal "
+"tersebut"
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -749,12 +767,12 @@
 #. module: account
 #: view:report.hr.timesheet.invoice.journal:0
 msgid "Sale journal in this year"
-msgstr ""
+msgstr "Jurnal Penjualan pada tahun ini"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "Display children with hierarchy"
-msgstr ""
+msgstr "Tampilkan anak dengan terstruktur"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -772,12 +790,12 @@
 #: model:ir.model,name:account.model_project_account_analytic_line
 #, python-format
 msgid "Analytic Entries by line"
-msgstr "Catatan Analitik per baris"
+msgstr ""
 
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Method"
-msgstr ""
+msgstr "Metode Pengembalian Uang"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:38
@@ -788,7 +806,7 @@
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
-msgstr ""
+msgstr "Laporan Keuangan"
 
 #. module: account
 #: view:account.analytic.journal:0
@@ -812,6 +830,8 @@
 "Taxes are missing!\n"
 "Click on compute button."
 msgstr ""
+"Pajak menghilang\n"
+"Klik pada tombol hitung"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
@@ -911,7 +931,7 @@
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: refund invoice and reconcile"
-msgstr ""
+msgstr "Batal : Tagihan Uang kembali dan rekonsiliasi"
 
 #. module: account
 #: field:account.cashbox.line,pieces:0
@@ -948,6 +968,8 @@
 "You cannot validate this journal entry because account \"%s\" does not "
 "belong to chart of accounts \"%s\"!"
 msgstr ""
+"Anda tidak dapat menvalidasi entri jurnal ini karena akun \"%s\" tidak "
+"terdapat pada bagan akun \"%s\"!"
 
 #. module: account
 #: code:addons/account/account_move_line.py:835
@@ -956,6 +978,8 @@
 "This account does not allow reconciliation! You should update the account "
 "definition to change this."
 msgstr ""
+"Akun ini tidak diperbolehkan untuk rekonsiliasi. Anda harus merevisi "
+"definisi akun untuk mengubahnya"
 
 #. module: account
 #: view:account.invoice:0
@@ -984,7 +1008,7 @@
 #: model:account.financial.report,name:account.account_financial_report_liability0
 #: model:account.financial.report,name:account.account_financial_report_liabilitysum0
 msgid "Liability"
-msgstr ""
+msgstr "Hutang"
 
 #. module: account
 #: view:account.entries.report:0
@@ -1026,7 +1050,7 @@
 #: code:addons/account/account.py:2596
 #, python-format
 msgid "I can not locate a parent code for the template account!"
-msgstr ""
+msgstr "Saya tidak dapat menempatkan kode induk untuk salinan akun ini"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -1102,11 +1126,13 @@
 "You cannot change the type of account from '%s' to '%s' type as it contains "
 "journal items!"
 msgstr ""
+"Anda tidak dapat mengubah tipe akun dari '%s' menjadi tipe '%s' karena telah "
+"berisi item jurnal"
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
 msgid "Sort by"
-msgstr ""
+msgstr "Susun sebagai"
 
 #. module: account
 #: help:account.fiscalyear.close,fy_id:0
@@ -1127,7 +1153,7 @@
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry !"
-msgstr ""
+msgstr "Anda harus mengisi akun untuk write-off/Perbedaan mata uang"
 
 #. module: account
 #: view:account.tax:0

=== modified file 'account/i18n/mk.po'
--- account/i18n/mk.po	2012-02-29 09:45:02 +0000
+++ account/i18n/mk.po	2012-03-08 00:03:21 +0000
@@ -8,25 +8,35 @@
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2011-05-07 08:11+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+=======
+"PO-Revision-Date: 2012-03-06 20:09+0000\n"
+"Last-Translator: Proleter <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Macedonian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-02-09 06:21+0000\n"
 "X-Generator: Launchpad (build 14763)\n"
+=======
+"X-Launchpad-Export-Date: 2012-03-07 06:03+0000\n"
+"X-Generator: Launchpad (build 14907)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "last month"
-msgstr ""
+msgstr "минатиот месец"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "System payment"
-msgstr "Сисмтеско плаќање"
+msgstr "Системско плаќање"
 
 #. module: account
 #: view:account.journal:0
@@ -56,7 +66,7 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma/Open/Paid Invoices"
-msgstr ""
+msgstr "Профактура/Отворени/Платени фактури"
 
 #. module: account
 #: field:report.invoice.created,residual:0
@@ -66,12 +76,12 @@
 #. module: account
 #: constraint:account.period:0
 msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr ""
+msgstr "Грешка! Траењето на периодот е невалиден. "
 
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account currency"
-msgstr ""
+msgstr "Валута на налогот"
 
 #. module: account
 #: view:account.tax:0
@@ -141,12 +151,12 @@
 #: field:account.move.line,ref:0
 #: field:account.subscription,ref:0
 msgid "Reference"
-msgstr ""
+msgstr "Референца"
 
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Choose Fiscal Year "
-msgstr ""
+msgstr "Избери фискална година "
 
 #. module: account
 #: help:account.payment.term,active:0
@@ -159,7 +169,7 @@
 #: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "Предупредување!"
 
 #. module: account
 #: code:addons/account/account.py:3112
@@ -181,12 +191,12 @@
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
-msgstr ""
+msgstr "Фактури направени во последните 15 дена"
 
 #. module: account
 #: field:accounting.report,label_filter:0
 msgid "Column Label"
-msgstr ""
+msgstr "Назив на колона"
 
 #. module: account
 #: code:addons/account/wizard/account_move_journal.py:95
@@ -206,7 +216,7 @@
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_template_form
 msgid "Tax Templates"
-msgstr ""
+msgstr "Урнеци за данок"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax
@@ -230,7 +240,7 @@
 #: code:addons/account/account_invoice.py:1241
 #, python-format
 msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
-msgstr ""
+msgstr "Фактурата '%s' е платена делумно: %s%s of %s%s (%s%s остануваат)"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
@@ -266,12 +276,12 @@
 #: model:ir.actions.act_window,name:account.action_view_account_use_model
 #: model:ir.ui.menu,name:account.menu_action_manual_recurring
 msgid "Manual Recurring"
-msgstr ""
+msgstr "Рачно повторување"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close Fiscalyear"
-msgstr ""
+msgstr "Затвори фискална година"
 
 #. module: account
 #: field:account.automatic.reconcile,allow_write_off:0
@@ -281,7 +291,7 @@
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Select the Period for Analysis"
-msgstr ""
+msgstr "Избери период за анализа"
 
 #. module: account
 #: view:account.move.line:0

=== modified file 'account/i18n/nl.po'
--- account/i18n/nl.po	2012-02-29 11:07:30 +0000
+++ account/i18n/nl.po	2012-03-08 00:03:21 +0000
@@ -7,12 +7,17 @@
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2012-02-21 15:56+0000\n"
+=======
+"PO-Revision-Date: 2012-03-06 15:54+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: Erwin <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-02-22 04:57+0000\n"
 "X-Generator: Launchpad (build 14838)\n"
 
@@ -21,6 +26,10 @@
 #, python-format
 msgid "Integrity Error !"
 msgstr "Integriteitsfout !"
+=======
+"X-Launchpad-Export-Date: 2012-03-07 06:03+0000\n"
+"X-Generator: Launchpad (build 14907)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.invoice.report:0
@@ -50,7 +59,7 @@
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr "Journaalpost afpunten"
+msgstr "Journaalpost afletteren"
 
 #. module: account
 #: view:account.account:0
@@ -353,7 +362,7 @@
 #: view:product.product:0
 #: view:product.template:0
 msgid "Purchase Properties"
-msgstr "Inkoopeigenschappen"
+msgstr "Inkoop instellingen"
 
 #. module: account
 #: help:account.financial.report,style_overwrite:0
@@ -362,6 +371,9 @@
 "leave the automatic formatting, it will be computed based on the financial "
 "reports hierarchy (auto-computed field 'level')."
 msgstr ""
+"Hier kunt u opgeven in welk formaat u de regel wilt weergeven. Indien u het "
+"op automatische formattering laat staan, dan wordt het berekend aan de hand "
+"van de hiërarchie van de financiële rapporten (Auto-bereken veld 'Niveau')."
 
 #. module: account
 #: view:account.installer:0
@@ -681,7 +693,7 @@
 #: code:addons/account/account.py:3116
 #, python-format
 msgid "SAJ"
-msgstr "SAJ"
+msgstr "VKB"
 
 #. module: account
 #: view:account.period:0
@@ -1511,7 +1523,7 @@
 #. module: account
 #: view:account.model:0
 msgid "Create entries"
-msgstr "Creëer boekingen"
+msgstr "Maak boekingen"
 
 #. module: account
 #: field:account.entries.report,nbr:0
@@ -1682,7 +1694,7 @@
 "gedurende een bepaalde periode op een bankrekening, een kredietkaart of "
 "andere financiële rekening. De openingsbalans wordt automatisch voorgesteld, "
 "terwijl het saldo terug te vinden is op het afschrift. Wanneer u zich in de "
-"kolom Betaling bevindt, kan u via F1 het afpuntscherm openen"
+"kolom Betaling bevindt, kan u via F1 het afletter openen"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -1911,7 +1923,7 @@
 #: field:account.invoice,move_id:0
 #: field:account.invoice,move_name:0
 msgid "Journal Entry"
-msgstr "Dagboek invoer"
+msgstr "Journaalpost"
 
 #. module: account
 #: view:account.tax:0
@@ -2272,7 +2284,7 @@
 #: code:addons/account/account.py:3119
 #, python-format
 msgid "ECNJ"
-msgstr "ECNJ"
+msgstr "CIKB"
 
 #. module: account
 #: view:account.subscription:0
@@ -2593,7 +2605,7 @@
 #: code:addons/account/account.py:3117
 #, python-format
 msgid "EXJ"
-msgstr "EXJ"
+msgstr "IKB"
 
 #. module: account
 #: field:product.template,supplier_taxes_id:0
@@ -2981,7 +2993,7 @@
 msgid ""
 "used in statement reconciliation domain, but shouldn't be used elswhere."
 msgstr ""
-"Gebruikt in het domein 'afpunten', maar mag nergens anders gebruikt worden."
+"Gebruikt in het domein 'afletteren', maar mag nergens anders gebruikt worden."
 
 #. module: account
 #: field:account.invoice.tax,base_amount:0
@@ -3282,7 +3294,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
 msgid "Account Unreconcile Reconcile"
-msgstr "Maak afpunten ongedaan voor deze rekening"
+msgstr "Maak afletteren ongedaan voor deze rekening"
 
 #. module: account
 #: sql_constraint:account.tax:0
@@ -3642,7 +3654,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
 msgid "Reconcilation Process partner by partner"
-msgstr "Afpunten per partner"
+msgstr "Afletteren per partner"
 
 #. module: account
 #: selection:account.automatic.reconcile,power:0
@@ -3698,7 +3710,7 @@
 #. module: account
 #: view:account.move:0
 msgid "Post"
-msgstr "Bericht"
+msgstr "Boek"
 
 #. module: account
 #: view:account.unreconcile:0
@@ -3852,7 +3864,7 @@
 #: code:addons/account/account_move_line.py:1153
 #, python-format
 msgid "Unable to change tax !"
-msgstr "Kon belasting niet wijzigen!"
+msgstr "Kan belasting niet wijzigen!"
 
 #. module: account
 #: field:analytic.entries.report,nbr:0
@@ -4356,7 +4368,7 @@
 #: code:addons/account/account_bank_statement.py:367
 #, python-format
 msgid "Statement %s is confirmed, journal items are created."
-msgstr "Afschrift %s is bevestigd, boekingen zijn gecreëerd."
+msgstr "Afschrift %s is bevestigd, boekingen zijn aangemaakt."
 
 #. module: account
 #: field:report.aged.receivable,name:0
@@ -4402,6 +4414,8 @@
 "When new move line is created the state will be 'Draft'.\n"
 "* When all the payments are done it will be in 'Valid' state."
 msgstr ""
+"Wanneer een nieuwe mutatieregels is aangemaakt, wordt de status 'Concept'.\n"
+"* Wanneer alle betalingen zijn  gedaan, wordt de status 'Bevestigd'"
 
 #. module: account
 #: field:account.journal,view_id:0
@@ -4550,7 +4564,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
 msgid "Account Analytic Cost Ledger For Journal Report"
-msgstr ""
+msgstr "Kostenplaats grootboek"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_model_form
@@ -4641,7 +4655,7 @@
 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Generate Entries"
-msgstr "Genereer lijnen"
+msgstr "Genereer boekingen"
 
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
@@ -4682,6 +4696,9 @@
 "the account \"%s - %s\". Clear the secondary currency field of the account "
 "definition if you want to accept all currencies."
 msgstr ""
+"Het is niet mogelijk een mutatie uit te voeren met een valuta, anders dan de "
+"secondaire valuta van de rekening \"%s - %s\". Maak het secundaire valuta "
+"veld leeg, indien u alle valuta's wilt toestaan."
 
 #. module: account
 #: selection:account.bank.statement,state:0
@@ -4985,6 +5002,8 @@
 "From this view, have an analysis of your treasury. It sums the balance of "
 "every accounting entries made on liquidity accounts per period."
 msgstr ""
+"Vanuit deze weergave, kunt u uw liquiditeit analyseren. Het telt de balansen "
+"op van alle boekingen op een liquiditeitrekening per periode."
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
@@ -5128,7 +5147,7 @@
 #. module: account
 #: view:account.tax:0
 msgid "Reverse Compute Code"
-msgstr ""
+msgstr "Code voor omgekeerde berekening"
 
 #. module: account
 #: field:account.subscription.line,move_id:0
@@ -5154,6 +5173,10 @@
 "encode the sale and purchase rates or choose from list of taxes. This last "
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
+"Deze keuze (boolean) helpt u te kiezen of u aan de gebruiker wilt "
+"voorstellen om de koop en verkoop tarieven in te geven of van een lijst van "
+"belastingen te kiezen. Bij de laatste keuze wordt ervan uitgegaan dat de set "
+"van de belasting gedefinieerd op dit sjabloon is voltooid"
 
 #. module: account
 #: view:account.financial.report:0
@@ -5455,6 +5478,8 @@
 msgid ""
 "You can not create more than one move per period on centralized journal"
 msgstr ""
+"Het is niet mogelijk meer dan één mutatie per periode te maken op een "
+"algemeen dagboek"
 
 #. module: account
 #: field:account.tax,ref_tax_sign:0
@@ -5623,6 +5648,9 @@
 "Number of partial amounts that can be combined to find a balance point can "
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
+"Het aantal deelbedragen dat kan worden gecombineerd om een overeenkomstig "
+"bedrag te vinden, kan worden gekozen als kracht van het automatische "
+"afletter proces."
 
 #. module: account
 #: help:account.payment.term.line,sequence:0
@@ -5654,6 +5682,10 @@
 "impossible any new entry record. Close a fiscal year when you need to "
 "finalize your end of year results definitive "
 msgstr ""
+"Indien er geen aanvullende gegevens moeten worden vermeld op een fiscaal "
+"jaar, kunt u het vanaf hier sluiten. Het sluit alle geopende periodes in dit "
+"jaar en maakt het onmogelijk een nieuwe boekingen te maken. Sluit een "
+"fiscaal jaar wanneer u, uw eindejaar resultaten definitief wilt maken "
 
 #. module: account
 #: field:account.central.journal,amount_currency:0
@@ -5837,7 +5869,7 @@
 #: code:addons/account/report/account_partner_balance.py:301
 #, python-format
 msgid "Receivable and Payable Accounts"
-msgstr "\"Te ontvangen\" en \"Te betalen\" rekeningen"
+msgstr "Debiteuren en crediteuren rekeningen"
 
 #. module: account
 #: field:account.fiscal.position.account.template,position_id:0
@@ -5848,7 +5880,7 @@
 #: model:ir.actions.act_window,name:account.action_account_state_open
 #: model:ir.model,name:account.model_account_state_open
 msgid "Account State Open"
-msgstr ""
+msgstr "Rekeningstatus geopend"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -5872,6 +5904,9 @@
 "document shows your debit and credit taking in consideration some criteria "
 "you can choose by using the search tool."
 msgstr ""
+"Vanuit deze weergave kunt u een analyse maken van u verschillende financiële "
+"rekeningen. Het document toont uw debet en credit en neemt in overweging een "
+"aantal criteria die u kunt kiezen met behulp van de zoekfunctie."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_tax_code_list
@@ -5880,6 +5915,10 @@
 "OpenERP allows you to define the tax structure and manage it from this menu. "
 "You can define both numeric and alphanumeric tax codes."
 msgstr ""
+"De balastingcode definitie hangt af van de belastingopgave van uw land. "
+"OpenERP geeft u de mogelijkheid om, vanuit dit menu, een belastingstructuur "
+"te beheren. Het is mogelijk om numerieke en alfanumerieke belastingcodes te "
+"gebruiken."
 
 #. module: account
 #: help:account.partner.reconcile.process,progress:0
@@ -5898,6 +5937,8 @@
 "that you should have your last line with the type 'Balance' to ensure that "
 "the whole amount will be threated."
 msgstr ""
+"Selecteer de berekening van deze regel van uw betalingstermijn. U moet op "
+"zijn minst een laatste regel met de berekening 'Balans' hebben gedefinieerd."
 
 #. module: account
 #: field:account.invoice,period_id:0
@@ -5972,13 +6013,13 @@
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
 msgid "Invoice Tax Account"
-msgstr "Collected Tax Account"
+msgstr "Rekening ontvangen belastig"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_general_journal
 #: model:ir.model,name:account.model_account_general_journal
 msgid "Account General Journal"
-msgstr ""
+msgstr "Algemeen grootboek"
 
 #. module: account
 #: field:account.payment.term.line,days:0
@@ -6036,7 +6077,7 @@
 #. module: account
 #: field:account.account,foreign_balance:0
 msgid "Foreign Balance"
-msgstr ""
+msgstr "Buitenlandse balans"
 
 #. module: account
 #: field:account.journal.period,name:0
@@ -6072,7 +6113,7 @@
 #. module: account
 #: view:account.subscription:0
 msgid "Running Subscription"
-msgstr ""
+msgstr "Lopende abonnementen"
 
 #. module: account
 #: report:account.invoice:0
@@ -6226,7 +6267,7 @@
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Tax Statement"
-msgstr ""
+msgstr "Belastingaangifte"
 
 #. module: account
 #: model:ir.model,name:account.model_res_company
@@ -6388,7 +6429,7 @@
 #: code:addons/account/account.py:3368
 #, python-format
 msgid "Cannot generate an unused journal code."
-msgstr ""
+msgstr "Het is niet mogelijk een ongebruikte rekeningcode te genereren"
 
 #. module: account
 #: view:project.account.analytic.line:0
@@ -6407,6 +6448,8 @@
 "Indicates if the amount of tax must be included in the base amount for the "
 "computation of the next taxes"
 msgstr ""
+"Geeft aan of het belastingbedrag moet worden toegevoegd aan de grondslag "
+"voor het berekenen van de volgende belastingen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_partner_reconcile
@@ -6478,6 +6521,9 @@
 "the tool search to analyse information about analytic entries generated in "
 "the system."
 msgstr ""
+"Vanuit dit scherm kunt u een analyse maken van uw verschillende kosten, "
+"volgens uw gedefinieerde kostenplaatsen. Gebruik de zoekfunctie om naar "
+"informatie over de analytische gegevens gegenereerd in het systeem te zoeken."
 
 #. module: account
 #: sql_constraint:account.journal:0
@@ -6672,12 +6718,12 @@
 #. module: account
 #: view:account.use.model:0
 msgid "Create manual recurring entries in a chosen journal."
-msgstr ""
+msgstr "Maak handmatig terugkerende boekingen in een gekozen dagboek."
 
 #. module: account
 #: help:res.partner.bank,currency_id:0
 msgid "Currency of the related account journal."
-msgstr ""
+msgstr "Valuta van het gerelateerde dagboek."
 
 #. module: account
 #: code:addons/account/account.py:1563
@@ -6718,6 +6764,8 @@
 "corresponds with the entries (or records) of that account in your accounting "
 "system."
 msgstr ""
+"Bank afletteren bestaat uit het vergelijken van uw bankafschrift met de "
+"boekingen van in uw rekening in uw boekhoudsysteem."
 
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
@@ -6881,6 +6929,11 @@
 "reconcile in a series of accounts. It finds entries for each partner where "
 "the amounts correspond."
 msgstr ""
+"Om een factuur als betaald te beschouwen, moet de factuur zijn afgeletterd "
+"met tegenboekingen, meestal betalingen. Met de automatische afletter "
+"functionaliteit maakt OpenERP zijn eigen zoektocht naar boekingen welke "
+"tegen elkaar kunnen worden afgestreept. Het vindt boekingen voor elke "
+"relatie waar de bedragen overeen komen."
 
 #. module: account
 #: view:account.move:0
@@ -6896,6 +6949,9 @@
 "row to display the amount of debit/credit/balance that precedes the filter "
 "you've set."
 msgstr ""
+"Indien u heeft geselecteerd om te filteren op datum of periode, dan geeft "
+"dit veld u de mogelijkheid een regel toe te voegen om het debet/credit "
+"bedrag weer te geven."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -6919,6 +6975,9 @@
 "some non legal fields or you must unreconcile first!\n"
 "%s"
 msgstr ""
+"Het is niet mogelijk om deze aanpassing te doen op een niet afgeletterde "
+"boeking! Het is alleen mogelijk om enkele, niet wettige velden, te wijzigen "
+"of maak het afletteren eerst ongedaan! %s"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -6944,6 +7003,8 @@
 msgid ""
 "Selected Entry Lines does not have any account move enties in draft state"
 msgstr ""
+"Geselecteerde boekingsregels hebben geen enkele rekeningmutaties in de "
+"concept status"
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -7049,7 +7110,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_tax_chart
 msgid "Account tax chart"
-msgstr ""
+msgstr "Belastingschema"
 
 #. module: account
 #: constraint:res.partner.bank:0
@@ -7162,11 +7223,15 @@
 "accounting application of OpenERP, journals and accounts will be created "
 "automatically based on these data."
 msgstr ""
+"Stel uw bedrijf bankrekening in en selecteer die moet worden vermeld als "
+"rapport voettekst. U kunt de volgorde banken in de lijstweergave aanpassen. "
+"Als u de boekhoudmodule van OpenERP gebruikt, dan zullen dagboeken en "
+"rekeningen automatisch worden aangemaakt op basis van deze gegevens."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "A statement with manual entries becomes a draft statement."
-msgstr ""
+msgstr "Een afschrift met handmatige boekingen wordt een concept afschrift."
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -7210,7 +7275,7 @@
 #. module: account
 #: model:ir.ui.menu,name:account.menu_menu_Bank_process
 msgid "Statements Reconciliation"
-msgstr ""
+msgstr "Afschriften afletteren"
 
 #. module: account
 #: model:ir.model,name:account.model_accounting_report
@@ -7236,6 +7301,11 @@
 "an agreement with a customer or a supplier. With Define Recurring Entries, "
 "you can create such entries to automate the postings in the system."
 msgstr ""
+"Een terugkerende boeking is een diversen boeking dat op een terugkerende "
+"basis van een bepaalde datum plaatsvindt. Dat wil zeggen, overeenkomend met "
+"de ondertekening van een contract of een overeenkomst met een klant of een "
+"leverancier. Met herhalende boekingen, kunt u deze boekingen automatisch "
+"laten genereren."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
@@ -7311,6 +7381,8 @@
 "Can not find a chart of account, you should create one from the "
 "configuration of the accounting menu."
 msgstr ""
+"Kan geen rekeningschema  vinden. U dient een rekeningschema te maken bij de "
+"instellingen van het financiële menu."
 
 #. module: account
 #: field:account.chart.template,property_account_expense_opening:0
@@ -7344,7 +7416,7 @@
 #. module: account
 #: help:account.journal,default_debit_account_id:0
 msgid "It acts as a default account for debit amount"
-msgstr ""
+msgstr "Het fungeert als een standaard rekening voor het debet bedrag"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_period_tree
@@ -7352,6 +7424,8 @@
 "You can search for individual account entries through useful information. To "
 "search for account entries, open a journal, then select a record line."
 msgstr ""
+"U kunt naar individuele financiële boekingen zoeken. Om te zoeken voor "
+"financiële boekingen opent u een dagboek en selecteert u een regel."
 
 #. module: account
 #: view:account.entries.report:0
@@ -7431,7 +7505,7 @@
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax:0
 msgid "Default Purchase Tax"
-msgstr "Standaard inkoop belastigen"
+msgstr "Standaard belastingen op inkopen"
 
 #. module: account
 #: field:account.chart.template,property_account_income_opening:0
@@ -7526,6 +7600,9 @@
 "the system to go through the reconciliation process, based on the latest day "
 "it have been reconciled."
 msgstr ""
+"Dit veld geeft de volgende relatie weer welke automatisch wordt gekozen door "
+"het systeem, bij het afletterproces. Deze is gebaseerd op de laatste dag dat "
+"deze is afgeletterd."
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,comment:0
@@ -7547,7 +7624,7 @@
 #: code:addons/account/account.py:429
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)!"
-msgstr ""
+msgstr "Onmogelijk om de initiële balans over te nemen (negatieve waarde)!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_purchase
@@ -7557,6 +7634,11 @@
 "line of the expense account, OpenERP will propose to you automatically the "
 "Tax related to this account and the counter-part \"Account Payable\"."
 msgstr ""
+"Dit formulier wordt gebruikt door boekhouders voor het invoeren van grote "
+"hoeveelheden boekingen in OpenERP. Indien u een leveranciersfactuur wilt "
+"boeken, begin dan met het vastleggen van de regel voor de kostenrekening, "
+"OpenERP zal u automatisch de een voorstel doen voor de belastingen, "
+"gerelateerd aan deze rekening en de tegenrekening \"Crediteuren\"."
 
 #. module: account
 #: view:account.invoice.line:0
@@ -7579,7 +7661,7 @@
 #: code:addons/account/wizard/account_fiscalyear_close.py:73
 #, python-format
 msgid "The periods to generate opening entries were not found"
-msgstr ""
+msgstr "De periodes om een opening te maken zijn niet gevonden."
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_view
@@ -7590,7 +7672,7 @@
 #: code:addons/account/account.py:3121
 #, python-format
 msgid "OPEJ"
-msgstr "OPEJ"
+msgstr "OPEN"
 
 #. module: account
 #: report:account.invoice:0
@@ -7643,6 +7725,8 @@
 "This field is used for payable and receivable journal entries. You can put "
 "the limit date for the payment of this line."
 msgstr ""
+"Dit veld wordt gebruikt voor crediteur- en debiteur journaalposten. U kunt "
+"de limietdatum voor de betaling van deze regel invoeren."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_multi_currency
@@ -7687,7 +7771,7 @@
 #: view:account.financial.report:0
 #: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
 msgid "Account Reports Hierarchy"
-msgstr ""
+msgstr "Rapportage grootboekrekeningen hiërarchie"
 
 #. module: account
 #: help:account.account.template,chart_template_id:0
@@ -7708,7 +7792,7 @@
 #: view:product.product:0
 #: view:product.template:0
 msgid "Sales Properties"
-msgstr "Verkoopinstellingen"
+msgstr "Verkoop instellingen"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_manual_reconcile
@@ -7761,6 +7845,10 @@
 "terms for each letter. Each customer or supplier can be assigned to one of "
 "these payment terms."
 msgstr ""
+"Betalingsvoorwaarden definiëren de voorwaarden om een ​​klant of leverancier "
+"factuur te voldoen in een of meerdere betalingen. Betalingsherinneringen "
+"maken gebruik van de betalingsvoorwaarden. Elke klant of leverancier kan "
+"worden toegewezen aan een van deze betalingsvoorwaarden."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -7788,6 +7876,8 @@
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
 msgstr ""
+"Algemene belastingen gedefinieerd, maar deze zijn niet in de facuurregels te "
+"vinden!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
@@ -7799,7 +7889,7 @@
 msgid ""
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones."
-msgstr ""
+msgstr "Het volgorde veld wordt gebruikt om te sorteren van laag naar hoog."
 
 #. module: account
 #: field:account.tax.code,code:0
@@ -7884,7 +7974,7 @@
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries."
-msgstr ""
+msgstr "De optionele hoeveelheid bij boekingen."
 
 #. module: account
 #: view:account.financial.report:0
@@ -7904,7 +7994,7 @@
 #. module: account
 #: help:account.invoice,move_id:0
 msgid "Link to the automatically generated Journal Items."
-msgstr ""
+msgstr "Koppeling naar de automatisch gegenereerde journaalpost"
 
 #. module: account
 #: selection:account.installer,period:0
@@ -8115,6 +8205,8 @@
 "Select Fiscal Year which you want to remove entries for its End of year "
 "entries journal"
 msgstr ""
+"Selecteer het fiscale jaar waarvoor u, voor de eindejaar journaalpost,  "
+"boekingen wilt verwijderen"
 
 #. module: account
 #: field:account.tax.template,type_tax_use:0
@@ -8128,6 +8220,8 @@
 "The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
+"De afschrift balans is incorrect!\n"
+"De verwachte balans (%.2f) is verschillend dan de berekende. (%.2f)"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:353
@@ -8145,6 +8239,13 @@
 "Most of the OpenERP operations (invoices, timesheets, expenses, etc) "
 "generate analytic entries on the related account."
 msgstr ""
+"Het normale rekeningschema heeft een structuur bepaald door de wettelijke "
+"verplichting van het land. Het kostenplaats rekeningschema moet een "
+"weerspiegeling zijn van uw eigen zakelijke behoeften in termen van kosten en "
+"opbrengsten rapportages. Ze zijn meestal gestructureerd door contracten, "
+"projecten, producten of afdelingen. Het merendeel van de OpenERP "
+"activiteiten (facturen, urenstaten, kosten, enz.) genereren "
+"kostenplaatsboekingen voor de betreffende rekening."
 
 #. module: account
 #: field:account.account.type,close_method:0
@@ -8190,6 +8291,8 @@
 "When monthly periods are created. The state is 'Draft'. At the end of "
 "monthly period it is in 'Done' state."
 msgstr ""
+"Wanneer maandelijkse periodes zijn gemaakt is de status 'Concept'. Aan het "
+"einde van een maandelijkse periode is de status 'Gereed'."
 
 #. module: account
 #: report:account.analytic.account.inverted.balance:0
@@ -8242,6 +8345,18 @@
 "related journal entries may or may not be reconciled.             \n"
 "* The 'Cancelled' state is used when user cancel invoice."
 msgstr ""
+" * De 'Concept' status wordt gebruikt wanneer een gebruiker een nieuwe en "
+"niet bevestigde factuur ingeeft.\n"
+"* De 'Pro-forma' status wordt gebruikt bij factuur in de Pro-forma staat. De "
+"factuur heeft geen factuurnummer.\n"
+"* De 'Open' staat wordt gebruikt als gebruiker een factuur maakt en een "
+"factuurnummer is toegekend. De factuur blijkt in deze staat zolang de "
+"factuur niet is betaald.\n"
+"* De 'betaald' status, wordt automatisch ingesteld wanneer de factuur is "
+"betaald. De bijbehorende journaalposten kunnen wel of niet zijn "
+"afgeletterd.\n"
+"* De 'Geannuleerd' status wordt gebruikt wanneer de gebruiker de factuur "
+"annuleert."
 
 #. module: account
 #: view:account.invoice.report:0
@@ -8262,6 +8377,9 @@
 "will see the taxes with codes related to your legal statement according to "
 "your country."
 msgstr ""
+"De belastingen weergave wordt gebruikt om uw periodieke belastingaangifte te "
+"doen. U ziet de belastingen met de codes gerelateerd aan het "
+"belastingaangifteformulier."
 
 #. module: account
 #: code:addons/account/account_invoice.py:428
@@ -8269,6 +8387,7 @@
 msgid ""
 "Can not find a chart of accounts for this company, you should create one."
 msgstr ""
+"Kan geen rekeningschema vinden voor dit bedrijf. U dient er een aan te maken."
 
 #. module: account
 #: view:account.invoice:0
@@ -8278,7 +8397,7 @@
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "J.C. /Move name"
-msgstr ""
+msgstr "J.C. /Mutatienaam"
 
 #. module: account
 #: model:ir.model,name:account.model_account_open_closed_fiscalyear
@@ -8289,7 +8408,7 @@
 #: code:addons/account/account.py:3111
 #, python-format
 msgid "Purchase Refund Journal"
-msgstr "Credit inkoopfacturen dagboek"
+msgstr "Credit inkoopdagboek"
 
 #. module: account
 #: help:account.tax.template,amount:0
@@ -8443,6 +8562,13 @@
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"Dit menu drukt een een BTW-aangifte af op basis van facturen of betalingen. "
+"U kunt een of meerdere perioden van het boekjaar selecteren. Informatie die "
+"vereist is voor een aangifte wordt automatisch door OpenERP gegenereerd, van "
+"facturen (of betalingen, in sommige landen). Deze gegevens worden in real "
+"time bijgewerkt. Dat is erg handig omdat het u in staat stelt om  ten allen "
+"tijde de belasting te bekijken die u verschuldigd bent aan het begin en het "
+"einde van de maand of het kwartaal."
 
 #. module: account
 #: report:account.invoice:0
@@ -8490,6 +8616,8 @@
 "You can check this box to mark this journal item as a litigation with the "
 "associated partner"
 msgstr ""
+"U kunt deze optie aanvinken om deze boeking te markeren als een geschil met "
+"de geassocieerde partner"
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
@@ -8505,7 +8633,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_common_report
 msgid "Account Common Report"
-msgstr ""
+msgstr "Algemeen rekening rapport"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -8532,12 +8660,12 @@
 #: model:ir.actions.act_window,name:account.action_account_journal_view
 #: model:ir.ui.menu,name:account.menu_action_account_journal_view
 msgid "Journal Views"
-msgstr "Dagboekweergave"
+msgstr "Dagboekweergaven"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
 msgid "Move bank reconcile"
-msgstr ""
+msgstr "Bankmutatie afletteren"
 
 #. module: account
 #: field:account.financial.report,account_type_ids:0
@@ -8683,7 +8811,7 @@
 #. module: account
 #: view:account.model.line:0
 msgid "Journal Entry Model Line"
-msgstr ""
+msgstr "Journaalpost model regel"
 
 #. module: account
 #: view:account.invoice:0
@@ -8716,6 +8844,8 @@
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in the company currency."
 msgstr ""
+"Het resterende bedrag op een vordering of schuld van een dagboek, uitgedrukt "
+"in het bedrijfsvaluta."
 
 #. module: account
 #: view:account.tax.code:0
@@ -8760,7 +8890,7 @@
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_treasory_graph
 msgid "Treasury"
-msgstr ""
+msgstr "Liquiditeit"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -8786,7 +8916,7 @@
 #. module: account
 #: view:board.board:0
 msgid "Draft Customer Invoices"
-msgstr "Concept verkoopfactuur"
+msgstr "Concept verkoopfacturen"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_configuration_misc
@@ -8802,7 +8932,7 @@
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
 msgid "Analytic Costs"
-msgstr ""
+msgstr "Kostenplaats"
 
 #. module: account
 #: field:account.analytic.journal,name:0
@@ -8859,7 +8989,7 @@
 #: code:addons/account/account_move_line.py:1105
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed!"
-msgstr ""
+msgstr "De rekeningmutatie (%s) voor centralisatie is bevestigd!"
 
 #. module: account
 #: help:account.move.line,amount_currency:0
@@ -8878,6 +9008,9 @@
 "Make sure you have configured payment terms properly !\n"
 "The latest payment term line should be of the type \"Balance\" !"
 msgstr ""
+"Het is niet mogelijk een boeking welke in onbelans is te valideren!\n"
+"Zorg ervoor dat u de betalingscondities correct heeft ingesteld!\n"
+"De laatste betalingsconditieregel moet van het type \"Balans\" zijn!"
 
 #. module: account
 #: view:account.account:0
@@ -8949,7 +9082,7 @@
 #. module: account
 #: field:account.invoice,address_contact_id:0
 msgid "Contact Address"
-msgstr "Adres"
+msgstr "Adres contactpersoon"
 
 #. module: account
 #: code:addons/account/account.py:2256
@@ -9070,6 +9203,9 @@
 "the amount of this case into its parent. For example, set 1/-1 if you want "
 "to add/substract it."
 msgstr ""
+"U kunt hier aangeven van de coëfficiënt die wordt gebruikt bij de "
+"consolidatie van het bedrag van dit geval naar de bovenliggende. Stel "
+"bijvoorbeeld 1/-1 in als u wilt toevoegen/aftrekken."
 
 #. module: account
 #: view:account.invoice:0
@@ -9111,7 +9247,7 @@
 #: code:addons/account/account.py:3110
 #, python-format
 msgid "Sales Refund Journal"
-msgstr "Credit verkoopfacturen dagboek"
+msgstr "Credit verkoopdagboek"
 
 #. module: account
 #: view:account.move:0
@@ -9128,7 +9264,7 @@
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close states of Fiscal year and periods"
-msgstr ""
+msgstr "Gesloten statussen van fiscale jaren en periodes"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -9174,7 +9310,7 @@
 #: code:addons/account/account.py:3118
 #, python-format
 msgid "SCNJ"
-msgstr "SCNJ"
+msgstr "CVKB"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_analyticinvoice0
@@ -9193,6 +9329,10 @@
 "in which order. You can create your own view for a faster encoding in each "
 "journal."
 msgstr ""
+"Geeft de weergave weer, welke wordt gebruikt bij het schrijven of zoeken "
+"naar boekingen in dit dagboek. De weergave vertelt OpenERP welke velden "
+"zichtbaar, verplicht of alleen lezen moet zijn en in welke volgorde. U kunt "
+"uw eigen weergave voor een snellere codering in elk dagboek aanmaken."
 
 #. module: account
 #: field:account.period,date_stop:0
@@ -9256,7 +9396,7 @@
 #: field:account.journal.view,name:0
 #: model:ir.model,name:account.model_account_journal_view
 msgid "Journal View"
-msgstr "Journal View"
+msgstr "Dagboekweergave"
 
 #. module: account
 #: view:account.move.line:0
@@ -9350,7 +9490,7 @@
 #. module: account
 #: model:process.node,note:account.process_node_supplierbankstatement0
 msgid "Manually or automatically entered in the system"
-msgstr ""
+msgstr "Handmatig of automatisch ingevoerd in het systeem"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9403,6 +9543,12 @@
 "the income account. OpenERP will propose to you automatically the Tax "
 "related to this account and the counter-part \"Account receivable\"."
 msgstr ""
+"Dit formulier wordt gebruikt door boekhouders voor het invoeren van grote "
+"hoeveelheden boekingen in OpenERP. Indien u een klantfactuur wilt boeken, "
+"selecteert u het dagboek en de periode in de zoekbalk. Beging vervolgens met "
+"het vastleggen van de regel voor de inkomstenrekening, OpenERP zal u "
+"automatisch de een voorstel doen voor de belastingen, gerelateerd aan deze "
+"rekening en de tegenrekening \"Debiteuren\""
 
 #. module: account
 #: code:addons/account/wizard/account_automatic_reconcile.py:152
@@ -9413,7 +9559,7 @@
 #. module: account
 #: model:process.transition,note:account.process_transition_entriesreconcile0
 msgid "Accounting entries are the first input of the reconciliation."
-msgstr ""
+msgstr "Financiële boekingen zijn de eerste regels voor afletteren."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period_form
@@ -9521,6 +9667,8 @@
 "The journal must have centralised counterpart without the Skipping draft "
 "state option checked!"
 msgstr ""
+"Het dagboek moet algemene tegenrekening hebben indien de optie \"Sla "
+"'Concept' status over voor handmatige boekingen\" is aangevinkt."
 
 #. module: account
 #: view:account.invoice.report:0
@@ -9556,7 +9704,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_balance
 msgid "Account Analytic Balance"
-msgstr ""
+msgstr "Kostenplaats balans"
 
 #. module: account
 #: code:addons/account/account.py:412
@@ -9671,6 +9819,9 @@
 "It indicates that the invoice has been paid and the journal entry of the "
 "invoice has been reconciled with one or several journal entries of payment."
 msgstr ""
+"Dit geeft aan dat de factuur is betaald en dat de journaalposten van de "
+"factuur zijn afgeletterd tegen een of meerdere journaalposten van de "
+"betalingen."
 
 #. module: account
 #: view:account.invoice:0
@@ -9708,6 +9859,13 @@
 "open period. Close a period when you do not want to record new entries and "
 "want to lock this period for tax related calculation."
 msgstr ""
+"Een periode is een fiscale periode gedurende welke de boekingen moeten "
+"worden geregistreerd voor de boekhoudkundige activiteiten. Een maandelijkse "
+"periode is de norm, maar ook kwartalen zijn mogelijk. Het sluiten van een "
+"periode zal het onmogelijk maken om nieuwe boekingen op te nemen. Alle "
+"nieuwe boekingen moeten dan op de volgende open periode worden geboekt. "
+"Sluit een periode waarin u geen nieuwe boekingen wenst op te nemen en om "
+"deze periode te blokkeren voor de belastingen berekening."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -9718,7 +9876,7 @@
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts"
-msgstr ""
+msgstr "Van kostenplaats"
 
 #. module: account
 #: field:account.period,name:0
@@ -9775,7 +9933,7 @@
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move
 msgid "Validate Account Move"
-msgstr ""
+msgstr "Bevestig rekeningmutatie"
 
 #. module: account
 #: field:account.account,credit:0
@@ -9808,6 +9966,9 @@
 "created. If you leave that field empty, it will use the same journal as the "
 "current invoice."
 msgstr ""
+"U kunt hier het dagboek kiezen welke u wilt gebruiken voor de credit factuur "
+"die zal worden aangemaakt. Als u het veld leeg laat, zal het hetzelfde "
+"dagboek gebruiken als de huidige factuur."
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -9841,6 +10002,9 @@
 "payment term!\n"
 "Please define partner on it!"
 msgstr ""
+"Vervaldag van boeking gegenereerd door '% s' is gebaseerd op relatie "
+"betalingstermijn!\n"
+"Geef een relatie in!"
 
 #. module: account
 #: field:account.cashbox.line,number:0
@@ -9860,7 +10024,7 @@
 #. module: account
 #: view:analytic.entries.report:0
 msgid "Analytic Entries of last 30 days"
-msgstr ""
+msgstr "Kostenplaatsboekingen van de laatste 30 dagen"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -9935,6 +10099,8 @@
 "Refund invoice base on this type. You can not Modify and Cancel if the "
 "invoice is already reconciled"
 msgstr ""
+"Credit factuur gebaseerd op dit type. Het is niet mogelijk om de factuur te "
+"bewerken of te annuleren als deze al is afgeletterd."
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -9980,6 +10146,9 @@
 "When new statement is created the state will be 'Draft'.\n"
 "And after getting confirmation from the bank it will be in 'Confirmed' state."
 msgstr ""
+"Wanneer een nieuw afschrift is aangemaakt zal deze de 'Concept' status "
+"krijgen.\n"
+"Na de bevestiging van de bank, wordt de status aangepast naar 'Bevestigd'."
 
 #. module: account
 #: model:ir.model,name:account.model_account_period
@@ -9997,13 +10166,15 @@
 "This report allows you to print or generate a pdf of your general ledger "
 "with details of all your account journals"
 msgstr ""
+"Met dit rapport kunt u een PDF maken van uw grootboek, met details van al uw "
+"journaalposten."
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "Regular"
-msgstr "Gewoon"
+msgstr "Normaal"
 
 #. module: account
 #: view:account.account:0
@@ -10042,7 +10213,7 @@
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Posted"
-msgstr "Verstuurd"
+msgstr "Geboekt"
 
 #. module: account
 #: report:account.account.balance:0
@@ -10088,7 +10259,7 @@
 #: field:account.fiscal.position.tax,tax_src_id:0
 #: field:account.fiscal.position.tax.template,tax_src_id:0
 msgid "Tax Source"
-msgstr "BTW code"
+msgstr "Belastingcode"
 
 #. module: account
 #: view:ir.sequence:0
@@ -10224,6 +10395,8 @@
 "reconciliation process today. The current partner is counted as already "
 "processed."
 msgstr ""
+"Dit getal vertegenwoordigd het totaal aantal relaties welke bij het "
+"afletteren zijn verwerkt. de huidige relatie is geteld als al verwerkt."
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -10250,6 +10423,7 @@
 msgid ""
 "Manual or automatic creation of payment entries according to the statements"
 msgstr ""
+"Handmatig of automatisch aanmaken van betalingen op basis van de afschriften"
 
 #. module: account
 #: field:account.analytic.balance,empty_acc:0
@@ -10283,6 +10457,8 @@
 "This account will be used to value outgoing stock for the current product "
 "category using cost price"
 msgstr ""
+"Deze rekening wordt gebruikt om uitgaande voorraad te waarderen voor de "
+"huidige productcategorie, gebruik maken van de kostprijs."
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -10387,6 +10563,8 @@
 "You cannot change the type of account from 'Closed' to any other type which "
 "contains journal items!"
 msgstr ""
+"Het is niet mogelijk om het rekeningsoort van 'Gesloten' naar een ander "
+"soort welke al journaalposten bevat."
 
 #. module: account
 #: code:addons/account/account_move_line.py:832
@@ -10412,7 +10590,7 @@
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a purchase journal."
-msgstr ""
+msgstr "Kostenplaats boekingen gerelateerd aan een inkoopdagboek"
 
 #. module: account
 #: help:account.account,type:0
@@ -10423,6 +10601,12 @@
 "payable/receivable are for partners accounts (for debit/credit "
 "computations), closed for depreciated accounts."
 msgstr ""
+"Het 'Interne Type' wordt gebruikt voor functies die beschikbaar zijn op "
+"verschillende soorten rekeningen: 'Weergave' kan geen boekingen hebben, "
+"consolidatie zijn rekeningen die onderliggende rekeningen kunnen hebben voor "
+"multi-company consolidaties, te crediteuren/debiteuren zijn voor de "
+"relatierekeningen  (voor debet/credit berekeningen), gesloten wodrt gebruikt "
+"voor afgeschreven rekeningen."
 
 #. module: account
 #: selection:account.balance.report,display_account:0
@@ -10497,7 +10681,7 @@
 #: model:process.transition,note:account.process_transition_invoiceimport0
 msgid ""
 "Import of the statement in the system from a supplier or customer invoice"
-msgstr ""
+msgstr "Importeren van het afschrift  van een leverancier of een klant"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
@@ -10536,7 +10720,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
 msgid "Account Analytic Chart"
-msgstr ""
+msgstr "Kostenplaatsschema"
 
 #. module: account
 #: help:account.invoice,residual:0
@@ -10569,6 +10753,11 @@
 "created by the system on document validation (invoices, bank statements...) "
 "and will be created in 'Posted' state."
 msgstr ""
+"Alle handmatig gemaakte nieuwe journaalposten zijn meestal in de staat 'Niet "
+"geboekt', maar u kunt met de optie instellen om deze status over te slaan op "
+"het betreffende dagboek. In dat geval worden ze behandeld als journaalposten "
+"automatisch aangemaakt door het systeem bij document validatie (facturen, "
+"bankafschriften, ...). Tevens worden ze aangemaakt in de 'Geboekt' staat."
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -10579,7 +10768,7 @@
 #: code:addons/account/account_invoice.py:364
 #, python-format
 msgid "Invoice '%s' is waiting for validation."
-msgstr "Factuur '%s'is in afwachting van validatie"
+msgstr "Factuur '%s' is in afwachting van validatie."
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -10889,7 +11078,7 @@
 "have the same references than the statement itself"
 msgstr ""
 "Wanneer u een andere waarde voor Naam opgeeft dan /, dan krijgen de "
-"gecreëerde boekingen dezelfde waarde voor naam. Hierdoor zullen referenties "
+"aangemaakte boekingen dezelfde waarde voor naam. Hierdoor zullen referenties "
 "makkelijker terug te vinden zijn."
 
 #. module: account
@@ -10905,7 +11094,7 @@
 #: model:ir.actions.act_window,name:account.action_account_central_journal
 #: model:ir.model,name:account.model_account_central_journal
 msgid "Account Central Journal"
-msgstr ""
+msgstr "Centraal dagboek"
 
 #. module: account
 #: report:account.overdue:0

=== modified file 'account/i18n/pl.po'
--- account/i18n/pl.po	2012-02-29 09:45:02 +0000
+++ account/i18n/pl.po	2012-03-08 00:03:21 +0000
@@ -7,14 +7,23 @@
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2011-11-07 12:53+0000\n"
+=======
+"PO-Revision-Date: 2012-02-29 12:36+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <[e-mail]>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-02-09 06:21+0000\n"
 "X-Generator: Launchpad (build 14763)\n"
+=======
+"X-Launchpad-Export-Date: 2012-03-01 05:18+0000\n"
+"X-Generator: Launchpad (build 14874)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.invoice.report:0
@@ -8474,7 +8483,7 @@
 #: field:account.invoice.report,date_due:0
 #: field:report.invoice.created,date_due:0
 msgid "Due Date"
-msgstr "Data zapłaty"
+msgstr "Termin płatności"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_supplier
@@ -9348,7 +9357,7 @@
 #. module: account
 #: field:account.move.line,date_maturity:0
 msgid "Due date"
-msgstr "Data zapłaty"
+msgstr "Termin płatności"
 
 #. module: account
 #: view:account.move.journal:0
@@ -9373,7 +9382,7 @@
 #. module: account
 #: report:account.overdue:0
 msgid "Maturity date"
-msgstr "Data zapłaty"
+msgstr "Termin płatności"
 
 #. module: account
 #: view:account.subscription:0

=== modified file 'account/i18n/ta.po'
--- account/i18n/ta.po	2012-02-29 09:45:02 +0000
+++ account/i18n/ta.po	2012-03-08 00:03:21 +0000
@@ -8,20 +8,30 @@
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2010-09-01 06:55+0000\n"
 "Last-Translator: ஆமாச்சு <[e-mail]>\n"
+=======
+"PO-Revision-Date: 2012-03-05 09:05+0000\n"
+"Last-Translator: Sarrvesh <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Tamil <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-02-09 06:23+0000\n"
 "X-Generator: Launchpad (build 14763)\n"
+=======
+"X-Launchpad-Export-Date: 2012-03-06 05:27+0000\n"
+"X-Generator: Launchpad (build 14900)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.invoice.report:0
 #: view:analytic.entries.report:0
 msgid "last month"
-msgstr ""
+msgstr "போன மாதம்"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -159,7 +169,7 @@
 #: code:addons/account/account_invoice.py:1428
 #, python-format
 msgid "Warning!"
-msgstr ""
+msgstr "எச்சரிக்கை!"
 
 #. module: account
 #: code:addons/account/account.py:3112

=== modified file 'account_analytic_analysis/i18n/nl.po'
--- account_analytic_analysis/i18n/nl.po	2012-02-29 09:45:02 +0000
+++ account_analytic_analysis/i18n/nl.po	2012-03-08 00:03:21 +0000
@@ -7,14 +7,23 @@
 "Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2012-02-08 09:34+0000\n"
+=======
+"PO-Revision-Date: 2012-03-06 11:27+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: Erwin <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-02-09 06:32+0000\n"
 "X-Generator: Launchpad (build 14763)\n"
+=======
+"X-Launchpad-Export-Date: 2012-03-07 06:03+0000\n"
+"X-Generator: Launchpad (build 14907)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,revenue_per_hour:0

=== modified file 'account_anglo_saxon/i18n/fr.po'
--- account_anglo_saxon/i18n/fr.po	2012-02-29 09:45:02 +0000
+++ account_anglo_saxon/i18n/fr.po	2012-03-08 00:03:21 +0000
@@ -8,20 +8,30 @@
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2011-01-13 19:32+0000\n"
 "Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
 "<[e-mail]>\n"
+=======
+"PO-Revision-Date: 2012-03-01 19:30+0000\n"
+"Last-Translator: t.o <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: French <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-02-09 06:53+0000\n"
 "X-Generator: Launchpad (build 14763)\n"
+=======
+"X-Launchpad-Export-Date: 2012-03-02 05:23+0000\n"
+"X-Generator: Launchpad (build 14886)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_anglo_saxon
 #: sql_constraint:purchase.order:0
 msgid "Order Reference must be unique per Company!"
-msgstr ""
+msgstr "La référence de commande doit être unique par société !"
 
 #. module: account_anglo_saxon
 #: view:product.category:0
@@ -36,7 +46,7 @@
 #. module: account_anglo_saxon
 #: sql_constraint:stock.picking:0
 msgid "Reference must be unique per Company!"
-msgstr ""
+msgstr "La référence doit être unique par société !"
 
 #. module: account_anglo_saxon
 #: constraint:product.category:0
@@ -46,7 +56,7 @@
 #. module: account_anglo_saxon
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Structure de communication BBA incorrecte !"
 
 #. module: account_anglo_saxon
 #: constraint:product.template:0
@@ -90,7 +100,7 @@
 #. module: account_anglo_saxon
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Le numéro de facture doit être unique par société !"
 
 #. module: account_anglo_saxon
 #: help:product.category,property_account_creditor_price_difference_categ:0

=== added file 'account_anglo_saxon/i18n/nl_BE.po'
--- account_anglo_saxon/i18n/nl_BE.po	1970-01-01 00:00:00 +0000
+++ account_anglo_saxon/i18n/nl_BE.po	2012-03-08 00:03:21 +0000
@@ -0,0 +1,100 @@
+# Dutch (Belgium) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-03-01 17:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Dutch (Belgium) <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-03-02 05:23+0000\n"
+"X-Generator: Launchpad (build 14886)\n"
+
+#. module: account_anglo_saxon
+#: sql_constraint:purchase.order:0
+msgid "Order Reference must be unique per Company!"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr " Boekhoudeigenschap"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_category
+msgid "Product Category"
+msgstr "Productcategorie"
+
+#. module: account_anglo_saxon
+#: sql_constraint:stock.picking:0
+msgid "Reference must be unique per Company!"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:product.category:0
+msgid "Error ! You cannot create recursive categories."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:product.template:0
+msgid ""
+"Error: The default UOM and the purchase UOM must be in the same category."
+msgstr ""
+"Fout: de standaardmeeteenheid en de aankoopmeeteenheid moeten in dezelfde "
+"categorie zitten."
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
+msgid "Invoice Line"
+msgstr "Factuurlijn"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_purchase_order
+msgid "Purchase Order"
+msgstr "Aankooporder"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_product_template
+msgid "Product Template"
+msgstr "Productsjabloon"
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr "Prijsverschillenrekening"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_account_invoice
+msgid "Invoice"
+msgstr "Factuur"
+
+#. module: account_anglo_saxon
+#: model:ir.model,name:account_anglo_saxon.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""

=== renamed file 'account_anglo_saxon/i18n/nl_BE.po' => 'account_anglo_saxon/i18n/nl_BE.po.moved'
=== modified file 'account_asset/i18n/fr.po'
--- account_asset/i18n/fr.po	2012-02-29 09:45:02 +0000
+++ account_asset/i18n/fr.po	2012-03-08 00:03:21 +0000
@@ -8,14 +8,24 @@
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2012-02-18 23:26+0000\n"
 "Last-Translator: t.o <Unknown>\n"
+=======
+"PO-Revision-Date: 2012-03-01 19:39+0000\n"
+"Last-Translator: t.o <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: French <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-02-19 05:44+0000\n"
 "X-Generator: Launchpad (build 14814)\n"
+=======
+"X-Launchpad-Export-Date: 2012-03-02 05:23+0000\n"
+"X-Generator: Launchpad (build 14886)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -46,7 +56,7 @@
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Regrouper par..."
 
 #. module: account_asset
 #: field:asset.asset.report,gross_value:0
@@ -81,12 +91,12 @@
 #: field:account.asset.category,company_id:0 view:asset.asset.report:0
 #: field:asset.asset.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Société"
 
 #. module: account_asset
 #: view:asset.modify:0
 msgid "Modify"
-msgstr ""
+msgstr "Modifier"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0 view:asset.asset.report:0
@@ -195,7 +205,7 @@
 #. module: account_asset
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Valeur erronée au crédit ou au débit de la pièce comptable !"
 
 #. module: account_asset
 #: view:asset.asset.report:0 field:asset.asset.report,nbr:0
@@ -213,17 +223,17 @@
 #: selection:account.asset.category,method_time:0
 #: selection:account.asset.history,method_time:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Date de fin"
 
 #. module: account_asset
 #: field:account.asset.asset,code:0
 msgid "Reference"
-msgstr ""
+msgstr "Référence"
 
 #. module: account_asset
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Structure de communication BBA incorrecte !"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -320,7 +330,7 @@
 #. module: account_asset
 #: view:asset.asset.report:0 field:asset.asset.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Année"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -332,7 +342,7 @@
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Other Information"
-msgstr ""
+msgstr "Autre information"
 
 #. module: account_asset
 #: field:account.asset.asset,salvage_value:0
@@ -388,7 +398,7 @@
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Lignes de facture"
 
 #. module: account_asset
 #: constraint:account.move.line:0
@@ -397,11 +407,14 @@
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
+"Le compte sélectionné dans votre ligne d'écriture requiert une deuxième "
+"devise. Vous devez soit supprimer la deuxième devise sur le compte, soit "
+"sélectionner une vue multi-devise sur le journal."
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Month"
-msgstr ""
+msgstr "Mois"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -411,7 +424,7 @@
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Écritures comptables"
 
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
@@ -441,6 +454,8 @@
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
+"La date de votre écriture ne correspond pas à la période définie ! Vous "
+"devez modifier la date ou supprimer la contrainte de date du journal."
 
 #. module: account_asset
 #: field:account.asset.asset,note:0 field:account.asset.category,note:0
@@ -472,6 +487,12 @@
 "  * Ending Date: Choose the time between 2 depreciations and the date the "
 "depreciations won't go beyond."
 msgstr ""
+"Choisissez la méthode à utiliser pour calculer les dates et le nombre de "
+"lignes d'amortissement.\n"
+"    * Nombre d'amortissements : fixer le nombre d'amortissements et le temps "
+"entre 2 amortissements.\n"
+"    * Date de fin : choisissez le temps entre 2 amortissements et la date de "
+"fin d'amortissement."
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -481,7 +502,7 @@
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Closed"
-msgstr ""
+msgstr "Fermé"
 
 #. module: account_asset
 #: field:account.asset.asset,partner_id:0
@@ -502,7 +523,7 @@
 #. module: account_asset
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "La société doit être la même pour son compte et la période liée."
 
 #. module: account_asset
 #: field:account.asset.asset,child_ids:0
@@ -532,17 +553,17 @@
 #. module: account_asset
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
-msgstr ""
+msgstr "Vous ne pouvez pas passer d'écriture sur un compte de type 'vue'"
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Filtres étendus..."
 
 #. module: account_asset
 #: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0
 msgid "Compute"
-msgstr ""
+msgstr "Calculer"
 
 #. module: account_asset
 #: view:account.asset.category:0
@@ -582,17 +603,17 @@
 #. module: account_asset
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Le numéro de facture doit être unique par société !"
 
 #. module: account_asset
 #: field:asset.depreciation.confirmation.wizard,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Période"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "General"
-msgstr ""
+msgstr "Général"
 
 #. module: account_asset
 #: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0
@@ -607,7 +628,7 @@
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Facture"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
@@ -651,7 +672,7 @@
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Current"
-msgstr ""
+msgstr "En cours"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,remaining_value:0
@@ -672,7 +693,7 @@
 #. module: account_asset
 #: field:account.asset.asset,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Devise"
 
 #. module: account_asset
 #: field:account.asset.category,journal_id:0
@@ -703,7 +724,7 @@
 #. module: account_asset
 #: field:account.asset.category,name:0
 msgid "Name"
-msgstr ""
+msgstr "Nom"
 
 #. module: account_asset
 #: help:account.asset.category,open_asset:0
@@ -715,7 +736,7 @@
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Mettre à l'état \"Brouillon\""
 
 #. module: account_asset
 #: selection:account.asset.asset,method:0
@@ -726,7 +747,7 @@
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Mois -1"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -754,7 +775,7 @@
 #. module: account_asset
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
-msgstr ""
+msgstr "Vous ne pouvez pas passer d'écritures sur un compte clôturé."
 
 #. module: account_asset
 #: model:ir.actions.act_window,help:account_asset.action_asset_asset_report

=== modified file 'account_asset/i18n/nl.po'
--- account_asset/i18n/nl.po	2012-02-29 09:45:02 +0000
+++ account_asset/i18n/nl.po	2012-03-08 00:03:21 +0000
@@ -8,14 +8,24 @@
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2012-01-15 12:39+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+=======
+"PO-Revision-Date: 2012-03-06 16:11+0000\n"
+"Last-Translator: Erwin <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Dutch <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-02-09 07:10+0000\n"
 "X-Generator: Launchpad (build 14763)\n"
+=======
+"X-Launchpad-Export-Date: 2012-03-07 06:03+0000\n"
+"X-Generator: Launchpad (build 14907)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -26,7 +36,7 @@
 #: field:account.asset.category,method_end:0
 #: field:account.asset.history,method_end:0 field:asset.modify,method_end:0
 msgid "Ending date"
-msgstr ""
+msgstr "Einddatum"
 
 #. module: account_asset
 #: field:account.asset.asset,value_residual:0
@@ -46,12 +56,12 @@
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Groepeer op..."
 
 #. module: account_asset
 #: field:asset.asset.report,gross_value:0
 msgid "Gross Amount"
-msgstr ""
+msgstr "Bruto bedrag"
 
 #. module: account_asset
 #: view:account.asset.asset:0 field:account.asset.asset,name:0
@@ -60,7 +70,7 @@
 #: view:asset.asset.report:0 field:asset.asset.report,asset_id:0
 #: model:ir.model,name:account_asset.model_account_asset_asset
 msgid "Asset"
-msgstr ""
+msgstr "Activa"
 
 #. module: account_asset
 #: help:account.asset.asset,prorata:0 help:account.asset.category,prorata:0
@@ -79,18 +89,18 @@
 #: field:account.asset.category,company_id:0 view:asset.asset.report:0
 #: field:asset.asset.report,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Bedrijf"
 
 #. module: account_asset
 #: view:asset.modify:0
 msgid "Modify"
-msgstr ""
+msgstr "Wijzig"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0 view:asset.asset.report:0
 #: selection:asset.asset.report,state:0
 msgid "Running"
-msgstr ""
+msgstr "Actief"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,amount:0
@@ -108,7 +118,7 @@
 #. module: account_asset
 #: field:asset.modify,name:0
 msgid "Reason"
-msgstr ""
+msgstr "Oorzaak"
 
 #. module: account_asset
 #: field:account.asset.asset,method_progress_factor:0
@@ -134,7 +144,7 @@
 #: field:account.move.line,entry_ids:0
 #: model:ir.actions.act_window,name:account_asset.act_entries_open
 msgid "Entries"
-msgstr ""
+msgstr "Boekingen"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -161,7 +171,7 @@
 #. module: account_asset
 #: field:asset.asset.report,posted_value:0
 msgid "Posted Amount"
-msgstr ""
+msgstr "Geboekte bedrag"
 
 #. module: account_asset
 #: view:account.asset.asset:0 view:asset.asset.report:0
@@ -170,7 +180,7 @@
 #: model:ir.ui.menu,name:account_asset.menu_finance_assets
 #: model:ir.ui.menu,name:account_asset.menu_finance_config_assets
 msgid "Assets"
-msgstr ""
+msgstr "Activa"
 
 #. module: account_asset
 #: field:account.asset.category,account_depreciation_id:0
@@ -181,7 +191,7 @@
 #: view:account.asset.asset:0 view:account.asset.category:0
 #: view:account.asset.history:0 view:asset.modify:0 field:asset.modify,note:0
 msgid "Notes"
-msgstr ""
+msgstr "Notities"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,move_id:0
@@ -191,7 +201,7 @@
 #. module: account_asset
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Verkeerde debet of credit waarde in boekingsregel!"
 
 #. module: account_asset
 #: view:asset.asset.report:0 field:asset.asset.report,nbr:0
@@ -209,17 +219,17 @@
 #: selection:account.asset.category,method_time:0
 #: selection:account.asset.history,method_time:0
 msgid "Ending Date"
-msgstr ""
+msgstr "Einddatum"
 
 #. module: account_asset
 #: field:account.asset.asset,code:0
 msgid "Reference"
-msgstr ""
+msgstr "Referentie"
 
 #. module: account_asset
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Ongeldige BBA gestructureerde communicatie!"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -243,13 +253,13 @@
 #: field:account.asset.history,method_period:0
 #: field:asset.modify,method_period:0
 msgid "Period Length"
-msgstr ""
+msgstr "Periodelengte"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0 view:asset.asset.report:0
 #: selection:asset.asset.report,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Concept"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -269,12 +279,12 @@
 #. module: account_asset
 #: field:account.asset.category,account_analytic_id:0
 msgid "Analytic account"
-msgstr ""
+msgstr "Kostenplaats"
 
 #. module: account_asset
 #: field:account.asset.asset,method:0 field:account.asset.category,method:0
 msgid "Computation Method"
-msgstr ""
+msgstr "Berekeningsmethode"
 
 #. module: account_asset
 #: help:account.asset.asset,method_period:0
@@ -301,7 +311,7 @@
 #. module: account_asset
 #: field:account.asset.asset,purchase_value:0
 msgid "Gross value "
-msgstr ""
+msgstr "Bruto waarde "
 
 #. module: account_asset
 #: constraint:account.asset.asset:0
@@ -316,7 +326,7 @@
 #. module: account_asset
 #: view:asset.asset.report:0 field:asset.asset.report,name:0
 msgid "Year"
-msgstr ""
+msgstr "Jaar"
 
 #. module: account_asset
 #: view:asset.modify:0
@@ -328,7 +338,7 @@
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Other Information"
-msgstr ""
+msgstr "Overige informatie"
 
 #. module: account_asset
 #: field:account.asset.asset,salvage_value:0
@@ -379,12 +389,12 @@
 #. module: account_asset
 #: field:account.asset.asset,state:0 field:asset.asset.report,state:0
 msgid "State"
-msgstr ""
+msgstr "Status"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Factuurregel"
 
 #. module: account_asset
 #: constraint:account.move.line:0
@@ -393,11 +403,14 @@
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
+"De geselecteerde rekening van uw journalboeking vraagt om een tweede valuta. "
+"U moet de tweede valuta op de rekening verwijderen of selecteer een multi-"
+"valuta overzicht van de boeking."
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Month"
-msgstr ""
+msgstr "Maand"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -407,19 +420,19 @@
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_move_line
 msgid "Journal Items"
-msgstr ""
+msgstr "Dagboekregels"
 
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
-msgstr ""
+msgstr "Ongeboekte bedrag"
 
 #. module: account_asset
 #: field:account.asset.asset,method_time:0
 #: field:account.asset.category,method_time:0
 #: field:account.asset.history,method_time:0
 msgid "Time Method"
-msgstr ""
+msgstr "Tijdmethode"
 
 #. module: account_asset
 #: view:account.asset.category:0
@@ -437,12 +450,14 @@
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
+"De datum van uw dagboek boeking is niet in de gedefinieerde periode! U moet "
+"de datum aanpassen of deze beperking van het dagboek verwijderen."
 
 #. module: account_asset
 #: field:account.asset.asset,note:0 field:account.asset.category,note:0
 #: field:account.asset.history,note:0
 msgid "Note"
-msgstr ""
+msgstr "Opmerking"
 
 #. module: account_asset
 #: help:account.asset.asset,method:0 help:account.asset.category,method:0
@@ -472,13 +487,13 @@
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Closed"
-msgstr ""
+msgstr "Gesloten"
 
 #. module: account_asset
 #: field:account.asset.asset,partner_id:0
 #: field:asset.asset.report,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Relatie"
 
 #. module: account_asset
 #: view:asset.asset.report:0 field:asset.asset.report,depreciation_value:0
@@ -493,7 +508,7 @@
 #. module: account_asset
 #: constraint:account.move.line:0
 msgid "Company must be the same for its related account and period."
-msgstr ""
+msgstr "Bedrijf moet gelijk zijn voor de gerelateerde rekening en periode."
 
 #. module: account_asset
 #: field:account.asset.asset,child_ids:0
@@ -508,12 +523,12 @@
 #. module: account_asset
 #: field:account.asset.history,user_id:0
 msgid "User"
-msgstr ""
+msgstr "Gebruiker"
 
 #. module: account_asset
 #: field:account.asset.history,date:0
 msgid "Date"
-msgstr ""
+msgstr "Datum"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -524,16 +539,18 @@
 #: constraint:account.move.line:0
 msgid "You can not create journal items on an account of type view."
 msgstr ""
+"Het is niet mogelijk om journaal boekingen te doen op een rekening van het "
+"type 'aanzicht'"
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Uitgebreide filters..."
 
 #. module: account_asset
 #: view:account.asset.asset:0 view:asset.depreciation.confirmation.wizard:0
 msgid "Compute"
-msgstr ""
+msgstr "Bereken"
 
 #. module: account_asset
 #: view:account.asset.category:0
@@ -543,12 +560,12 @@
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_asset_depreciation_confirmation_wizard
 msgid "asset.depreciation.confirmation.wizard"
-msgstr ""
+msgstr "asset.depreciation.confirmation.wizard"
 
 #. module: account_asset
 #: field:account.asset.asset,active:0
 msgid "Active"
-msgstr ""
+msgstr "Actief"
 
 #. module: account_asset
 #: model:ir.actions.wizard,name:account_asset.wizard_asset_close
@@ -568,7 +585,7 @@
 #. module: account_asset
 #: view:account.asset.asset:0 field:account.asset.asset,history_ids:0
 msgid "History"
-msgstr ""
+msgstr "Historie"
 
 #. module: account_asset
 #: sql_constraint:account.invoice:0
@@ -578,12 +595,12 @@
 #. module: account_asset
 #: field:asset.depreciation.confirmation.wizard,period_id:0
 msgid "Period"
-msgstr ""
+msgstr "Periode"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "General"
-msgstr ""
+msgstr "Algemeen"
 
 #. module: account_asset
 #: field:account.asset.asset,prorata:0 field:account.asset.category,prorata:0
@@ -598,7 +615,7 @@
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_invoice
 msgid "Invoice"
-msgstr ""
+msgstr "Factuur"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_form_normal
@@ -608,12 +625,12 @@
 #. module: account_asset
 #: view:asset.depreciation.confirmation.wizard:0 view:asset.modify:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annuleren"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0 selection:asset.asset.report,state:0
 msgid "Close"
-msgstr ""
+msgstr "Afsluiten"
 
 #. module: account_asset
 #: view:account.asset.asset:0 view:account.asset.category:0
@@ -624,7 +641,7 @@
 #: field:account.asset.asset,purchase_date:0 view:asset.asset.report:0
 #: field:asset.asset.report,purchase_date:0
 msgid "Purchase Date"
-msgstr ""
+msgstr "Aankoopdatum"
 
 #. module: account_asset
 #: selection:account.asset.asset,method:0
@@ -642,7 +659,7 @@
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Current"
-msgstr ""
+msgstr "Huidig"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,remaining_value:0
@@ -663,12 +680,12 @@
 #. module: account_asset
 #: field:account.asset.asset,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: account_asset
 #: field:account.asset.category,journal_id:0
 msgid "Journal"
-msgstr ""
+msgstr "Dagboek"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciated_value:0
@@ -679,7 +696,7 @@
 #: field:account.asset.depreciation.line,move_check:0
 #: view:asset.asset.report:0 field:asset.asset.report,move_check:0
 msgid "Posted"
-msgstr ""
+msgstr "Geboekt"
 
 #. module: account_asset
 #: help:account.asset.asset,state:0
@@ -694,7 +711,7 @@
 #. module: account_asset
 #: field:account.asset.category,name:0
 msgid "Name"
-msgstr ""
+msgstr "Naam"
 
 #. module: account_asset
 #: help:account.asset.category,open_asset:0
@@ -706,18 +723,18 @@
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Zet op concept"
 
 #. module: account_asset
 #: selection:account.asset.asset,method:0
 #: selection:account.asset.category,method:0
 msgid "Linear"
-msgstr ""
+msgstr "Lineair"
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Maand-1"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_asset_depreciation_line
@@ -746,6 +763,7 @@
 #: constraint:account.move.line:0
 msgid "You can not create journal items on closed account."
 msgstr ""
+"Het is niet mogelijk een journaal boeking te doen op een afgesloten rekening."
 
 #. module: account_asset
 #: model:ir.actions.act_window,help:account_asset.action_asset_asset_report

=== modified file 'account_asset/i18n/pt_BR.po'
--- account_asset/i18n/pt_BR.po	2012-02-29 11:07:30 +0000
+++ account_asset/i18n/pt_BR.po	2012-03-08 00:03:21 +0000
@@ -8,19 +8,28 @@
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2012-01-18 02:46+0000\n"
+=======
+"PO-Revision-Date: 2012-03-04 03:08+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: Rafael Sales - http://www.tompast.com.br <Unknown>\n"
 "Language-Team: Brazilian Portuguese <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-02-09 07:10+0000\n"
 "X-Generator: Launchpad (build 14763)\n"
+=======
+"X-Launchpad-Export-Date: 2012-03-05 05:11+0000\n"
+"X-Generator: Launchpad (build 14900)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Assets in draft and open states"
-msgstr ""
+msgstr "Ativos em projeto e estados abertos"
 
 #. module: account_asset
 #: field:account.asset.category,method_end:0
@@ -31,17 +40,17 @@
 #. module: account_asset
 #: field:account.asset.asset,value_residual:0
 msgid "Residual Value"
-msgstr ""
+msgstr "Valor Residual"
 
 #. module: account_asset
 #: field:account.asset.category,account_expense_depreciation_id:0
 msgid "Depr. Expense Account"
-msgstr ""
+msgstr "Depr.Contas de despesas"
 
 #. module: account_asset
 #: view:asset.depreciation.confirmation.wizard:0
 msgid "Compute Asset"
-msgstr ""
+msgstr "Calcule os Ativos"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -72,7 +81,7 @@
 #. module: account_asset
 #: field:account.asset.history,name:0
 msgid "History name"
-msgstr ""
+msgstr "Nome do Histórico"
 
 #. module: account_asset
 #: field:account.asset.asset,company_id:0
@@ -95,7 +104,7 @@
 #. module: account_asset
 #: field:account.asset.depreciation.line,amount:0
 msgid "Depreciation Amount"
-msgstr ""
+msgstr "Montante de Depreciação"
 
 #. module: account_asset
 #: view:asset.asset.report:0
@@ -103,7 +112,7 @@
 #: model:ir.model,name:account_asset.model_asset_asset_report
 #: model:ir.ui.menu,name:account_asset.menu_action_asset_asset_report
 msgid "Assets Analysis"
-msgstr ""
+msgstr "Análise de Ativos"
 
 #. module: account_asset
 #: field:asset.modify,name:0
@@ -114,13 +123,13 @@
 #: field:account.asset.asset,method_progress_factor:0
 #: field:account.asset.category,method_progress_factor:0
 msgid "Degressive Factor"
-msgstr ""
+msgstr "Fator Degressiva"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal
 #: model:ir.ui.menu,name:account_asset.menu_action_account_asset_asset_list_normal
 msgid "Asset Categories"
-msgstr ""
+msgstr "Categorias de Ativos"
 
 #. module: account_asset
 #: view:asset.depreciation.confirmation.wizard:0
@@ -128,6 +137,8 @@
 "This wizard will post the depreciation lines of running assets that belong "
 "to the selected period."
 msgstr ""
+"Este assistente irá postar as linhas de depreciação de ativos em execução "
+"que pertencem ao período selecionado."
 
 #. module: account_asset
 #: field:account.asset.asset,account_move_line_ids:0
@@ -140,28 +151,28 @@
 #: view:account.asset.asset:0
 #: field:account.asset.asset,depreciation_line_ids:0
 msgid "Depreciation Lines"
-msgstr ""
+msgstr "Linhas de Depreciação"
 
 #. module: account_asset
 #: help:account.asset.asset,salvage_value:0
 msgid "It is the amount you plan to have that you cannot depreciate."
-msgstr ""
+msgstr "É o valor que você pretende ter de que você não pode depreciar."
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,depreciation_date:0
 #: view:asset.asset.report:0 field:asset.asset.report,depreciation_date:0
 msgid "Depreciation Date"
-msgstr ""
+msgstr "Data de Depreciação"
 
 #. module: account_asset
 #: field:account.asset.category,account_asset_id:0
 msgid "Asset Account"
-msgstr ""
+msgstr "Conta de Ativo"
 
 #. module: account_asset
 #: field:asset.asset.report,posted_value:0
 msgid "Posted Amount"
-msgstr ""
+msgstr "Valor Postado"
 
 #. module: account_asset
 #: view:account.asset.asset:0 view:asset.asset.report:0
@@ -175,7 +186,7 @@
 #. module: account_asset
 #: field:account.asset.category,account_depreciation_id:0
 msgid "Depreciation Account"
-msgstr ""
+msgstr "Conta de Depreciação"
 
 #. module: account_asset
 #: view:account.asset.asset:0 view:account.asset.category:0
@@ -196,12 +207,12 @@
 #. module: account_asset
 #: view:asset.asset.report:0 field:asset.asset.report,nbr:0
 msgid "# of Depreciation Lines"
-msgstr ""
+msgstr "# Linhas de Depreciação"
 
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets in draft state"
-msgstr ""
+msgstr "Ativos em estados de rascunho"
 
 #. module: account_asset
 #: field:account.asset.asset,method_end:0
@@ -224,18 +235,18 @@
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Account Asset"
-msgstr ""
+msgstr "Ativo de Contas"
 
 #. module: account_asset
 #: model:ir.actions.act_window,name:account_asset.action_asset_depreciation_confirmation_wizard
 #: model:ir.ui.menu,name:account_asset.menu_asset_depreciation_confirmation_wizard
 msgid "Compute Assets"
-msgstr ""
+msgstr "Calcule os Ativos"
 
 #. module: account_asset
 #: field:account.asset.depreciation.line,sequence:0
 msgid "Sequence of the depreciation"
-msgstr ""
+msgstr "Sequência da Depreciação"
 
 #. module: account_asset
 #: field:account.asset.asset,method_period:0
@@ -243,7 +254,7 @@
 #: field:account.asset.history,method_period:0
 #: field:asset.modify,method_period:0
 msgid "Period Length"
-msgstr ""
+msgstr "Duração do Período"
 
 #. module: account_asset
 #: selection:account.asset.asset,state:0 view:asset.asset.report:0
@@ -254,17 +265,17 @@
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Date of asset purchase"
-msgstr ""
+msgstr "Data de compras de ativos"
 
 #. module: account_asset
 #: help:account.asset.asset,method_number:0
 msgid "Calculates Depreciation within specified interval"
-msgstr ""
+msgstr "Calcula a depreciação dentro do intervalo especificado"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Change Duration"
-msgstr ""
+msgstr "Altera a Duração"
 
 #. module: account_asset
 #: field:account.asset.category,account_analytic_id:0
@@ -274,7 +285,7 @@
 #. module: account_asset
 #: field:account.asset.asset,method:0 field:account.asset.category,method:0
 msgid "Computation Method"
-msgstr ""
+msgstr "Método de Cálculo"
 
 #. module: account_asset
 #: help:account.asset.asset,method_period:0
@@ -301,17 +312,17 @@
 #. module: account_asset
 #: field:account.asset.asset,purchase_value:0
 msgid "Gross value "
-msgstr ""
+msgstr "Valor bruto "
 
 #. module: account_asset
 #: constraint:account.asset.asset:0
 msgid "Error ! You can not create recursive assets."
-msgstr ""
+msgstr "Erro! Você não pode criar ativos recursivas."
 
 #. module: account_asset
 #: help:account.asset.history,method_period:0
 msgid "Time in month between two depreciations"
-msgstr ""
+msgstr "Tempo em meses entre duas depreciações."
 
 #. module: account_asset
 #: view:asset.asset.report:0 field:asset.asset.report,name:0
@@ -323,7 +334,7 @@
 #: model:ir.actions.act_window,name:account_asset.action_asset_modify
 #: model:ir.model,name:account_asset.model_asset_modify
 msgid "Modify Asset"
-msgstr ""
+msgstr "Modificar Ativos"
 
 #. module: account_asset
 #: view:account.asset.asset:0
@@ -338,12 +349,12 @@
 #. module: account_asset
 #: field:account.invoice.line,asset_category_id:0 view:asset.asset.report:0
 msgid "Asset Category"
-msgstr ""
+msgstr "Categoria de Ativos"
 
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Set to Close"
-msgstr ""
+msgstr "Definir para Fechar"
 
 #. module: account_asset
 #: model:ir.actions.wizard,name:account_asset.wizard_asset_compute
@@ -358,7 +369,7 @@
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Assets in closed state"
-msgstr ""
+msgstr "Ativos em estados fechados"
 
 #. module: account_asset
 #: field:account.asset.asset,parent_id:0
@@ -374,7 +385,7 @@
 #. module: account_asset
 #: view:asset.asset.report:0
 msgid "Assets purchased in current year"
-msgstr ""
+msgstr "Ativos adquiridos no ano em curso"
 
 #. module: account_asset
 #: field:account.asset.asset,state:0 field:asset.asset.report,state:0
@@ -402,7 +413,7 @@
 #. module: account_asset
 #: view:account.asset.asset:0
 msgid "Depreciation Board"
-msgstr ""
+msgstr "Conselho de depreciação"
 
 #. module: account_asset
 #: model:ir.model,name:account_asset.model_account_move_line
@@ -412,24 +423,24 @@
 #. module: account_asset
 #: field:asset.asset.report,unposted_value:0
 msgid "Unposted Amount"
-msgstr ""
+msgstr "Valor Não Postada"
 
 #. module: account_asset
 #: field:account.asset.asset,method_time:0
 #: field:account.asset.category,method_time:0
 #: field:account.asset.history,method_time:0
 msgid "Time Method"
-msgstr ""
+msgstr "Método tempo"
 
 #. module: account_asset
 #: view:account.asset.category:0
 msgid "Analytic information"
-msgstr ""
+msgstr "Informação Analítica"
 
 #. module: account_asset
 #: view:asset.modify:0
 msgid "Asset durations to modify"
-msgstr ""
+msgstr "Ativos para modificar durações"
 
 #. module: account_asset
 #: constraint:account.move.line:0

=== modified file 'account_budget/i18n/nl.po'
--- account_budget/i18n/nl.po	2012-02-29 09:45:02 +0000
+++ account_budget/i18n/nl.po	2012-03-08 00:03:21 +0000
@@ -7,14 +7,23 @@
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2012-02-08 09:47+0000\n"
+=======
+"PO-Revision-Date: 2012-03-06 16:00+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: Erwin <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-02-09 06:48+0000\n"
 "X-Generator: Launchpad (build 14763)\n"
+=======
+"X-Launchpad-Export-Date: 2012-03-07 06:03+0000\n"
+"X-Generator: Launchpad (build 14907)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -91,7 +100,7 @@
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_report
 msgid "Account Budget crossvered report"
-msgstr ""
+msgstr "Budget kruisanalyse"
 
 #. module: account_budget
 #: selection:crossovered.budget,state:0
@@ -332,7 +341,7 @@
 #. module: account_budget
 #: model:ir.model,name:account_budget.model_account_budget_crossvered_summary_report
 msgid "Account Budget  crossvered summary report"
-msgstr ""
+msgstr "Budget kruisanalyse"
 
 #. module: account_budget
 #: report:account.budget:0

=== modified file 'account_budget/i18n/pt_BR.po'
--- account_budget/i18n/pt_BR.po	2012-02-29 09:45:02 +0000
+++ account_budget/i18n/pt_BR.po	2012-03-08 00:03:21 +0000
@@ -7,14 +7,24 @@
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2012-02-13 11:25+0000\n"
 "Last-Translator: Rafael Sales - http://www.tompast.com.br <Unknown>\n"
+=======
+"PO-Revision-Date: 2012-03-01 18:17+0000\n"
+"Last-Translator: Cintia Sayuri Sato - http://www.tompast.com.br <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-02-14 05:45+0000\n"
 "X-Generator: Launchpad (build 14781)\n"
+=======
+"X-Launchpad-Export-Date: 2012-03-02 05:23+0000\n"
+"X-Generator: Launchpad (build 14886)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_budget
 #: field:crossovered.budget,creating_user_id:0
@@ -138,7 +148,7 @@
 #: code:addons/account_budget/account_budget.py:119
 #, python-format
 msgid "The Budget '%s' has no accounts!"
-msgstr ""
+msgstr "O Orçamento de '%s' não tem contas!"
 
 #. module: account_budget
 #: report:account.budget:0

=== modified file 'account_cancel/i18n/fa.po'
--- account_cancel/i18n/fa.po	2012-02-29 09:45:02 +0000
+++ account_cancel/i18n/fa.po	2012-03-08 00:03:21 +0000
@@ -8,16 +8,26 @@
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2011-12-18 16:53+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+=======
+"PO-Revision-Date: 2012-03-06 18:32+0000\n"
+"Last-Translator: Serpent Consulting Services <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Persian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-02-09 06:59+0000\n"
 "X-Generator: Launchpad (build 14763)\n"
+=======
+"X-Launchpad-Export-Date: 2012-03-07 06:03+0000\n"
+"X-Generator: Launchpad (build 14907)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_cancel
 #: view:account.invoice:0
 msgid "Cancel"
-msgstr ""
+msgstr "باطل‌ كردن‌"

=== added file 'account_cancel/i18n/gu.po'
--- account_cancel/i18n/gu.po	1970-01-01 00:00:00 +0000
+++ account_cancel/i18n/gu.po	2012-03-08 00:03:21 +0000
@@ -0,0 +1,23 @@
+# Gujarati translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-03-06 18:31+0000\n"
+"Last-Translator: Serpent Consulting Services <Unknown>\n"
+"Language-Team: Gujarati <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-03-07 06:03+0000\n"
+"X-Generator: Launchpad (build 14907)\n"
+
+#. module: account_cancel
+#: view:account.invoice:0
+msgid "Cancel"
+msgstr "રદ કરો"

=== renamed file 'account_cancel/i18n/gu.po' => 'account_cancel/i18n/gu.po.moved'
=== modified file 'account_cancel/i18n/id.po'
--- account_cancel/i18n/id.po	2012-02-29 09:45:02 +0000
+++ account_cancel/i18n/id.po	2012-03-08 00:03:21 +0000
@@ -8,18 +8,29 @@
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2011-02-07 18:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+=======
+"PO-Revision-Date: 2012-03-06 15:26+0000\n"
+"Last-Translator: Budi Iskandar <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Indonesian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-02-09 06:59+0000\n"
 "X-Generator: Launchpad (build 14763)\n"
+=======
+"X-Launchpad-Export-Date: 2012-03-07 06:03+0000\n"
+"X-Generator: Launchpad (build 14907)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_cancel
 #: view:account.invoice:0
 msgid "Cancel"
+<<<<<<< TREE
 msgstr ""
 
 #~ msgid "Account Cancel"
@@ -36,3 +47,6 @@
 #~ "formulir jurnal akun. Jika di pasang pada nilai 'true' akan mengizinkan "
 #~ "pemakai untuk membatalkan catatan dan faktur.\n"
 #~ "    "
+=======
+msgstr "Batal"
+>>>>>>> MERGE-SOURCE

=== added file 'account_check_writing/i18n/nl.po'
--- account_check_writing/i18n/nl.po	1970-01-01 00:00:00 +0000
+++ account_check_writing/i18n/nl.po	2012-03-08 00:03:21 +0000
@@ -0,0 +1,203 @@
+# Dutch translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-03-06 16:02+0000\n"
+"Last-Translator: Erwin <Unknown>\n"
+"Language-Team: Dutch <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-03-07 06:03+0000\n"
+"X-Generator: Launchpad (build 14907)\n"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on Top"
+msgstr "Cheque boven"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"The check payment form allows you to track the payment you do to your "
+"suppliers specially by check. When you select a supplier, the payment method "
+"and an amount for the payment, OpenERP will propose to reconcile your "
+"payment with the open supplier invoices or bills.You can print the check"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.voucher:0
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check"
+msgstr "Cheque afdrukken"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr "Cheque miodden"
+
+#. module: account_check_writing
+#: help:res.company,check_layout:0
+msgid ""
+"Check on top is compatible with Quicken, QuickBooks and Microsoft Money. "
+"Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
+"bottom is compatible with Peachtree, ACCPAC and DacEasy only"
+msgstr ""
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr "Cheque beneden"
+
+#. module: account_check_writing
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Fout! U kunt geen recursieve bedrijven aanmaken."
+
+#. module: account_check_writing
+#: help:account.journal,allow_check_writing:0
+msgid "Check this if the journal is to be used for writing checks."
+msgstr ""
+"Vink dit aan indien het dagboek moet worden gebruikt voor het schrijven van "
+"cheques."
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr "Sta cheque uitschrijven toe"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Description"
+msgstr "Omschrijving"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr "Dagboek"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_write_check
+#: model:ir.ui.menu,name:account_check_writing.menu_action_write_check
+msgid "Write Checks"
+msgstr "Schrijf cheque uit"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Discount"
+msgstr "Korting"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Original Amount"
+msgstr "Oorspronkelijk bedrag"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Configuratie"
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr "Sta uitschrijven cheque  toe"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr "Betaling"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr "Gebruik voorafgedrukte cheque"
+
+#. module: account_check_writing
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr "De naam van het bedrijf moet uniek zijn!"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Due Date"
+msgstr "Einddatum"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr "Bedrijven"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Default Check layout"
+msgstr "Standaard cheque opmaak"
+
+#. module: account_check_writing
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+"Configuratiefout! De gekozen valuta moet hetzelfde zijn als dat van de "
+"standaard grootboekrekeningen."
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr "Saldo"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Check Amount"
+msgstr "Cheque bedrag"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr "Betalingsintentie"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "De naam van het dagboek moet uniek zijn per bedrijf !"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "De code van het dagboek moet uniek zijn per bedrijf !"
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr "Bedrag in woord"
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr "Open balans"
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Choose Check layout"
+msgstr "Kies cheque opmaak"

=== renamed file 'account_check_writing/i18n/nl.po' => 'account_check_writing/i18n/nl.po.moved'
=== modified file 'account_followup/i18n/fr.po'
--- account_followup/i18n/fr.po	2012-02-29 09:45:02 +0000
+++ account_followup/i18n/fr.po	2012-03-08 00:03:21 +0000
@@ -7,14 +7,23 @@
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2012-02-13 21:37+0000\n"
+=======
+"PO-Revision-Date: 2012-03-01 19:41+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: t.o <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-02-14 05:43+0000\n"
 "X-Generator: Launchpad (build 14781)\n"
+=======
+"X-Launchpad-Export-Date: 2012-03-02 05:23+0000\n"
+"X-Generator: Launchpad (build 14886)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -529,7 +538,7 @@
 #. module: account_followup
 #: view:account_followup.followup.line:0
 msgid "Follow-Up Steps"
-msgstr ""
+msgstr "Niveaux de relance"
 
 #. module: account_followup
 #: field:account_followup.stat,period_id:0
@@ -561,7 +570,7 @@
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.action_view_account_followup_followup_form
 msgid "Review Invoicing Follow-Ups"
-msgstr ""
+msgstr "Définir les relances"
 
 #. module: account_followup
 #: constraint:account.move.line:0
@@ -576,6 +585,11 @@
 "code to adapt the email content to the good context (good name, good date) "
 "and you can manage the multi language of messages."
 msgstr ""
+"Définissez les niveaux de relance, leur message et leur déclenchement. Pour "
+"chaque étape, spécifiez le message et le nombre de jours avant la relance. "
+"Utilisez la légende pour connaître le code à utiliser pour adapter "
+"dynamiquement le contenu du courriel  (nom, date). Vous pouvez aussi gérer "
+"la langue des messages en fonction des destinataires."
 
 #. module: account_followup
 #: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -590,6 +604,10 @@
 "\n"
 "%s"
 msgstr ""
+"Aucun courriel n'a été envoyé aux partenaires suivants. Leur adresse de "
+"courriel n'est pas renseignée !\n"
+"\n"
+"%s"
 
 #. module: account_followup
 #: view:account.followup.print.all:0
@@ -744,7 +762,7 @@
 #. module: account_followup
 #: field:account.followup.print.all,test_print:0
 msgid "Test Print"
-msgstr ""
+msgstr "Tester l'impression"
 
 #. module: account_followup
 #: view:account.followup.print.all:0

=== modified file 'account_followup/i18n/nl.po'
--- account_followup/i18n/nl.po	2012-02-29 09:45:02 +0000
+++ account_followup/i18n/nl.po	2012-03-08 00:03:21 +0000
@@ -7,14 +7,23 @@
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2012-02-18 15:14+0000\n"
+=======
+"PO-Revision-Date: 2012-03-06 12:19+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: Erwin <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-02-19 05:42+0000\n"
 "X-Generator: Launchpad (build 14814)\n"
+=======
+"X-Launchpad-Export-Date: 2012-03-07 06:03+0000\n"
+"X-Generator: Launchpad (build 14907)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_followup
 #: view:account_followup.followup:0
@@ -282,7 +291,7 @@
 #. module: account_followup
 #: field:account.followup.print.all,partner_lang:0
 msgid "Send Email in Partner Language"
-msgstr "Stuur email-bericht in taal relatie"
+msgstr "Stuur e-mail in de taal van de relatie"
 
 #. module: account_followup
 #: view:account.followup.print.all:0

=== modified file 'account_invoice_layout/i18n/nl.po'
--- account_invoice_layout/i18n/nl.po	2012-02-29 09:45:02 +0000
+++ account_invoice_layout/i18n/nl.po	2012-03-08 00:03:21 +0000
@@ -7,14 +7,24 @@
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2012-02-09 07:20+0000\n"
 "Last-Translator: Erwin <Unknown>\n"
+=======
+"PO-Revision-Date: 2012-03-06 11:28+0000\n"
+"Last-Translator: Fabien (Open ERP) <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-02-10 04:48+0000\n"
 "X-Generator: Launchpad (build 14771)\n"
+=======
+"X-Launchpad-Export-Date: 2012-03-07 06:03+0000\n"
+"X-Generator: Launchpad (build 14907)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_invoice_layout
 #: selection:account.invoice.line,state:0

=== added file 'account_payment/i18n/lv.po'
--- account_payment/i18n/lv.po	1970-01-01 00:00:00 +0000
+++ account_payment/i18n/lv.po	2012-03-08 00:03:21 +0000
@@ -0,0 +1,726 @@
+# Latvian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-03-02 13:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Latvian <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-03-03 05:54+0000\n"
+"X-Generator: Launchpad (build 14886)\n"
+
+#. module: account_payment
+#: field:payment.order,date_scheduled:0
+msgid "Scheduled date if fixed"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,currency:0
+msgid "Partner Currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Set to draft"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,mode:0
+msgid "Select the Payment Mode to be applied."
+msgstr ""
+
+#. module: account_payment
+#: view:payment.mode:0
+#: view:payment.order:0
+msgid "Group By..."
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,line_ids:0
+msgid "Payment lines"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: field:payment.line,info_owner:0
+#: view:payment.order:0
+msgid "Owner Account"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,state:0
+msgid ""
+"When an order is placed the state is 'Draft'.\n"
+" Once the bank is confirmed the state is set to 'Confirmed'.\n"
+" Then the order is paid the state is 'Done'."
+msgstr ""
+
+#. module: account_payment
+#: help:account.invoice,amount_to_pay:0
+msgid ""
+"The amount which should be paid at the current date\n"
+"minus the amount which is already in payment order"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,company_id:0
+#: field:payment.mode,company_id:0
+#: field:payment.order,company_id:0
+msgid "Company"
+msgstr "Uzņēmums"
+
+#. module: account_payment
+#: field:payment.order,date_prefered:0
+msgid "Preferred date"
+msgstr ""
+
+#. module: account_payment
+#: model:res.groups,name:account_payment.group_account_payment
+msgid "Accounting / Payments"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Free"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+#: field:payment.order.create,entries:0
+msgid "Entries"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Used Account"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_maturity_date:0
+#: field:payment.order.create,duedate:0
+msgid "Due Date"
+msgstr "Apmaksas termiņš"
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Account Entry Line"
+msgstr "Konta Ieraksta Rinda"
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "_Add to payment order"
+msgstr ""
+
+#. module: account_payment
+#: 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 ""
+
+#. module: account_payment
+#: report:payment.order:0
+#: view:payment.order:0
+msgid "Amount"
+msgstr ""
+
+#. module: account_payment
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Total in Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new
+msgid "New Payment Order"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+#: field:payment.order,reference:0
+msgid "Reference"
+msgstr ""
+
+#. module: account_payment
+#: sql_constraint:payment.line:0
+msgid "The payment line name must be unique!"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.invoice:0
+msgid "Invalid BBA Structured Communication !"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_order_tree
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form
+msgid "Payment Orders"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid ""
+"The date of your Journal Entry is not in the defined period! You should "
+"change the date or remove this constraint from the journal."
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Directly"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_line_form
+#: model:ir.model,name:account_payment.model_payment_line
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment Line"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Amount Total"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,ml_date_created:0
+msgid "Invoice Effective Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Execution Type"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.line,state:0
+msgid "Structured"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: field:payment.order,state:0
+msgid "State"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Transaction Information"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_payment_mode_form
+#: model:ir.model,name:account_payment.model_payment_mode
+#: model:ir.ui.menu,name:account_payment.menu_action_payment_mode_form
+#: view:payment.mode:0
+#: view:payment.order:0
+msgid "Payment Mode"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_date_created:0
+msgid "Effective Date"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,ml_inv_ref:0
+msgid "Invoice Ref."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,date_prefered:0
+msgid ""
+"Choose an option for the Payment Order:'Fixed' stands for a date specified "
+"by you.'Directly' stands for the direct execution.'Due date' stands for the "
+"scheduled date of execution."
+msgstr ""
+
+#. module: account_payment
+#: code:addons/account_payment/account_move_line.py:110
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total debit"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_done:0
+msgid "Execution date"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,journal:0
+msgid "Bank or Cash Journal for the Payment Mode"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Fixed date"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,info_partner:0
+#: view:payment.order:0
+msgid "Destination Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Desitination Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Search Payment Orders"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,create_date:0
+msgid "Created"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Select Invoices to Pay"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+msgid "Currency Amount Total"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Make Payments"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,state:0
+msgid "Communication Type"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,partner_id:0
+#: field:payment.mode,partner_id:0
+#: report:payment.order:0
+msgid "Partner"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,bank_statement_line_id:0
+msgid "Bank statement line"
+msgstr ""
+
+#. module: account_payment
+#: selection:payment.order,date_prefered:0
+msgid "Due date"
+msgstr ""
+
+#. module: account_payment
+#: field:account.invoice,amount_to_pay:0
+msgid "Amount to be paid"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid ""
+"The selected account of your Journal Entry forces to provide a secondary "
+"currency. You should remove the secondary currency on the account or select "
+"a multi-currency view on the journal."
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Currency"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Yes"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,info_owner:0
+msgid "Address of the Main Partner"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,date:0
+msgid ""
+"If no payment date is specified, the bank will treat this payment line "
+"directly"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_payment_populate_statement
+msgid "Account Payment Populate Statement"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,name:0
+msgid "Mode of Payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Value Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Payment Type"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,amount_currency:0
+msgid "Payment amount in the partner currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,communication2:0
+msgid "The successor message of Communication."
+msgstr ""
+
+#. module: account_payment
+#: code:addons/account_payment/account_move_line.py:110
+#, python-format
+msgid "No partner defined on entry line"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,info_partner:0
+msgid "Address of the Ordering Customer."
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.populate.statement:0
+msgid "Populate Statement:"
+msgstr ""
+
+#. module: account_payment
+#: view:account.move.line:0
+msgid "Total credit"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.order,date_scheduled:0
+msgid "Select a date if you have chosen Preferred Date to be fixed."
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_payment
+#: field:account.payment.populate.statement,lines:0
+msgid "Payment Lines"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid "You can not create journal items on an account of type view."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,move_line_id:0
+msgid ""
+"This Entry Line will be referred for the information of the ordering "
+"customer."
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "Search"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.report.xml,name:account_payment.payment_order1
+#: model:ir.model,name:account_payment.model_payment_order
+msgid "Payment Order"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,date:0
+msgid "Payment Date"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Total:"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,date_created:0
+msgid "Creation date"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.populate.statement:0
+msgid "ADD"
+msgstr ""
+
+#. module: account_payment
+#: view:account.bank.statement:0
+msgid "Import payment lines"
+msgstr ""
+
+#. module: account_payment
+#: field:account.move.line,amount_to_pay:0
+msgid "Amount to pay"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,amount:0
+msgid "Amount in Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,partner_id:0
+msgid "The Ordering Customer"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_payment_make_payment
+msgid "Account make payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Invoice Ref"
+msgstr ""
+
+#. module: account_payment
+#: sql_constraint:account.invoice:0
+msgid "Invoice Number must be unique per Company!"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,name:0
+msgid "Your Reference"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Payment order"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "General Information"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+#: selection:payment.order,state:0
+msgid "Done"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,communication:0
+msgid "Communication"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+#: view:account.payment.populate.statement:0
+#: view:payment.order:0
+#: view:payment.order.create:0
+msgid "Cancel"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,bank_id:0
+msgid "Destination Bank Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Information"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid "Company must be the same for its related account and period."
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree
+msgid ""
+"A payment order is a payment request from your company to pay a supplier "
+"invoice or a customer credit note. Here you can register all payment orders "
+"that should be done, keep track of all payment orders and mention the "
+"invoice reference and the partner the payment should be done for."
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,amount:0
+msgid "Payment amount in the company currency"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order.create:0
+msgid "Search Payment lines"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,amount_currency:0
+msgid "Amount in Partner Currency"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,communication2:0
+msgid "Communication 2"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+msgid "Are you sure you want to make payment?"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.mode:0
+#: field:payment.mode,journal:0
+msgid "Journal"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.mode,bank_id:0
+msgid "Bank account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.order:0
+msgid "Confirm Payments"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,company_currency:0
+#: report:payment.order:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.ui.menu,name:account_payment.menu_main_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Payment"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Payment Order / Payment"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,move_line_id:0
+msgid "Entry line"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.line,communication:0
+msgid ""
+"Used as the message between ordering customer and current company. Depicts "
+"'What do you want to say to the recipient about this order ?'"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.mode,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_payment
+#: report:payment.order:0
+msgid "Bank Account"
+msgstr ""
+
+#. module: account_payment
+#: view:payment.line:0
+#: view:payment.order:0
+msgid "Entry Information"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.model,name:account_payment.model_payment_order_create
+msgid "payment.order.create"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.line,order_id:0
+msgid "Order"
+msgstr ""
+
+#. module: account_payment
+#: constraint:account.move.line:0
+msgid "You can not create journal items on closed account."
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,total:0
+msgid "Total"
+msgstr ""
+
+#. module: account_payment
+#: view:account.payment.make.payment:0
+#: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment
+msgid "Make Payment"
+msgstr ""
+
+#. module: account_payment
+#: field:payment.order,mode:0
+msgid "Payment mode"
+msgstr ""
+
+#. module: account_payment
+#: model:ir.actions.act_window,name:account_payment.action_create_payment_order
+msgid "Populate Payment"
+msgstr ""
+
+#. module: account_payment
+#: help:payment.mode,bank_id:0
+msgid "Bank Account for the Payment Mode"
+msgstr ""

=== renamed file 'account_payment/i18n/lv.po' => 'account_payment/i18n/lv.po.moved'
=== modified file 'account_payment/i18n/nl.po'
--- account_payment/i18n/nl.po	2012-02-29 09:45:02 +0000
+++ account_payment/i18n/nl.po	2012-03-08 00:03:21 +0000
@@ -7,14 +7,23 @@
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-02-08 00:35+0000\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2012-02-12 11:33+0000\n"
+=======
+"PO-Revision-Date: 2012-03-06 11:54+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: Erwin <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-02-13 04:50+0000\n"
 "X-Generator: Launchpad (build 14781)\n"
+=======
+"X-Launchpad-Export-Date: 2012-03-07 06:03+0000\n"
+"X-Generator: Launchpad (build 14907)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_payment
 #: field:payment.order,date_scheduled:0
@@ -517,7 +526,7 @@
 #. module: account_payment
 #: view:account.bank.statement:0
 msgid "Import payment lines"
-msgstr "Import betalingen"
+msgstr "Importeer betalingen"
 
 #. module: account_payment
 #: field:account.move.line,amount_to_pay:0
@@ -739,7 +748,7 @@
 #. module: account_payment
 #: field:payment.order,mode:0
 msgid "Payment mode"
-msgstr "Betaalmodus"
+msgstr "Betaalwijze"
 
 #. module: account_payment
 #: model:ir.actions.act_window,name:account_payment.action_create_payment_order
@@ -749,6 +758,7 @@
 #. module: account_payment
 #: help:payment.mode,bank_id:0
 msgid "Bank Account for the Payment Mode"
+<<<<<<< TREE
 msgstr "Bankrekening voor de betaalmodus"
 
 #~ msgid "Execution date:"
@@ -848,3 +858,6 @@
 #~ "* een basis mechanisme voor het eenvoudig aankoppelen van diverse "
 #~ "automatische betalingen.\n"
 #~ "    "
+=======
+msgstr "Bankrekening voor de betaalwijze"
+>>>>>>> MERGE-SOURCE

=== modified file 'account_voucher/i18n/fr.po'
--- account_voucher/i18n/fr.po	2012-02-29 09:45:02 +0000
+++ account_voucher/i18n/fr.po	2012-03-08 00:03:21 +0000
@@ -7,24 +7,34 @@
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-02-08 01:37+0100\n"
+<<<<<<< TREE
 "PO-Revision-Date: 2011-01-18 16:46+0000\n"
 "Last-Translator: Fabien (Open ERP) <[e-mail]>\n"
+=======
+"PO-Revision-Date: 2012-03-01 19:55+0000\n"
+"Last-Translator: gde (OpenERP) <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-02-09 06:44+0000\n"
 "X-Generator: Launchpad (build 14763)\n"
+=======
+"X-Launchpad-Export-Date: 2012-03-02 05:23+0000\n"
+"X-Generator: Launchpad (build 14886)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "last month"
-msgstr ""
+msgstr "Mois précédant"
 
 #. module: account_voucher
 #: view:account.voucher.unreconcile:0
 msgid "Unreconciliation transactions"
-msgstr "Transactions non rapprochées"
+msgstr "Écritures non lettrées"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:324
@@ -35,7 +45,7 @@
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Payment Ref"
-msgstr "Ref. du paiement"
+msgstr "Ref. du règlement"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -123,7 +133,7 @@
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Set to Draft"
-msgstr "Mettre en Brouillon"
+msgstr "Mettre à l'état \"Brouillon\""
 
 #. module: account_voucher
 #: help:account.voucher,reference:0
@@ -133,7 +143,7 @@
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by year of Invoice Date"
-msgstr ""
+msgstr "Grouper par année de facturation"
 
 #. module: account_voucher
 #: model:ir.actions.act_window,name:account_voucher.action_view_account_voucher_unreconcile
@@ -163,7 +173,7 @@
 #. module: account_voucher
 #: field:account.voucher,writeoff_acc_id:0
 msgid "Counterpart Account"
-msgstr ""
+msgstr "Compte de contrepartie"
 
 #. module: account_voucher
 #: field:account.voucher,account_id:0 field:account.voucher.line,account_id:0
@@ -184,7 +194,7 @@
 #. module: account_voucher
 #: field:account.voucher.line,reconcile:0
 msgid "Full Reconcile"
-msgstr ""
+msgstr "Lettrage complet"
 
 #. module: account_voucher
 #: field:account.voucher,date_due:0 field:account.voucher.line,date_due:0
@@ -225,7 +235,7 @@
 #. module: account_voucher
 #: field:account.voucher,is_multi_currency:0
 msgid "Multi Currency Voucher"
-msgstr ""
+msgstr "Reçu multi-devises"
 
 #. module: account_voucher
 #: field:account.voucher.line,amount:0
@@ -265,7 +275,7 @@
 #. module: account_voucher
 #: constraint:account.invoice:0
 msgid "Invalid BBA Structured Communication !"
-msgstr ""
+msgstr "Structure de communication BBA incorrecte !"
 
 #. module: account_voucher
 #: field:account.voucher,tax_id:0
@@ -275,12 +285,12 @@
 #. module: account_voucher
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "Le journal et la période doivent appartenir à la même société."
 
 #. module: account_voucher
 #: field:account.voucher,comment:0
 msgid "Counterpart Comment"
-msgstr ""
+msgstr "Commentaire de contrepartie"
 
 #. module: account_voucher
 #: field:account.voucher.line,account_analytic_id:0
@@ -292,7 +302,7 @@
 #: code:addons/account_voucher/account_voucher.py:931
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Avertissement"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -325,6 +335,8 @@
 "Computed as the difference between the amount stated in the voucher and the "
 "sum of allocation on the voucher lines."
 msgstr ""
+"Calculé comme la différence entre le montant indiqué sur le reçu et la somme "
+"des allocations sur les lignes du reçu."
 
 #. module: account_voucher
 #: selection:account.voucher,type:0 selection:sale.receipt.report,type:0
@@ -339,12 +351,12 @@
 #. module: account_voucher
 #: constraint:res.company:0
 msgid "Error! You can not create recursive companies."
-msgstr ""
+msgstr "Erreur ! Vous ne pouvez pas créer de sociétés récursives."
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "current month"
-msgstr ""
+msgstr "Mois en cours"
 
 #. module: account_voucher
 #: view:account.voucher:0 field:account.voucher,period_id:0
@@ -365,7 +377,7 @@
 #. module: account_voucher
 #: sql_constraint:res.company:0
 msgid "The company name must be unique !"
-msgstr ""
+msgstr "Le nom de la société doit être unique !"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,nbr:0
@@ -385,7 +397,7 @@
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Pro-forma Vouchers"
-msgstr ""
+msgstr "Reçus pro-forma"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -424,7 +436,7 @@
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Are you sure to unreconcile and cancel this record ?"
-msgstr ""
+msgstr "Êtes-vous sûr de vouloir délettrer et annuler cette entrée?"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -457,7 +469,7 @@
 #. module: account_voucher
 #: field:account.voucher,writeoff_amount:0
 msgid "Difference Amount"
-msgstr ""
+msgstr "Différence de  montant"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,due_delay:0
@@ -467,7 +479,7 @@
 #. module: account_voucher
 #: field:res.company,income_currency_exchange_account_id:0
 msgid "Income Currency Rate"
-msgstr ""
+msgstr "Taux de change d'achat"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:1063
@@ -483,7 +495,7 @@
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Validated Vouchers"
-msgstr ""
+msgstr "Reçus validés"
 
 #. module: account_voucher
 #: field:account.voucher,line_ids:0 view:account.voucher.line:0
@@ -528,7 +540,7 @@
 #: code:addons/account_voucher/account_voucher.py:1103
 #, python-format
 msgid "change"
-msgstr ""
+msgstr "modifier"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -541,6 +553,8 @@
 "Fields with internal purpose only that depicts if the voucher is a multi "
 "currency one or not"
 msgstr ""
+"Champ à usage interne uniquement qui décrit si le reçu est en multi-devises "
+"ou non"
 
 #. module: account_voucher
 #: field:account.statement.from.invoice,line_ids:0
@@ -556,7 +570,7 @@
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by month of Invoice Date"
-msgstr ""
+msgstr "Grouper par mois de facturation"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,month:0
@@ -601,12 +615,12 @@
 #. module: account_voucher
 #: help:account.voucher,paid:0
 msgid "The Voucher has been totally paid."
-msgstr ""
+msgstr "Le reçu a été entièrement réglé."
 
 #. module: account_voucher
 #: selection:account.voucher,payment_option:0
 msgid "Reconcile Payment Balance"
-msgstr ""
+msgstr "Lettrer la balance de paiement"
 
 #. module: account_voucher
 #: view:account.voucher:0 selection:account.voucher,state:0
@@ -621,11 +635,14 @@
 "Unable to create accounting entry for currency rate difference. You have to "
 "configure the field 'Income Currency Rate' on the company! "
 msgstr ""
+"Impossible de créer une entrée de la comptabilité à cause de la différence "
+"de taux de change. Vous devez configurer le champ 'Taux de change de vente' "
+"sur  la société! "
 
 #. module: account_voucher
 #: view:account.voucher:0 view:sale.receipt.report:0
 msgid "Draft Vouchers"
-msgstr ""
+msgstr "Reçus brouillons"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,price_total_tax:0
@@ -635,7 +652,7 @@
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Allocation"
-msgstr ""
+msgstr "Allocation"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -648,6 +665,8 @@
 "Check this box if you are unsure of that journal entry and if you want to "
 "note it as 'to be reviewed' by an accounting expert."
 msgstr ""
+"Cochez cette case si vous n'êtes pas sûr de cette pièce comptable et pour "
+"indiquer que cela devra être visé par un expert-comptable"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -667,7 +686,7 @@
 #. module: account_voucher
 #: field:account.voucher,paid:0
 msgid "Paid"
-msgstr ""
+msgstr "Réglé"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -698,7 +717,7 @@
 #. module: account_voucher
 #: field:account.voucher,paid_amount_in_company_currency:0
 msgid "Paid Amount in Company Currency"
-msgstr ""
+msgstr "Montant réglé dans la devise de la société"
 
 #. module: account_voucher
 #: field:account.bank.statement.line,amount_reconciled:0
@@ -744,13 +763,15 @@
 #. module: account_voucher
 #: model:ir.model,name:account_voucher.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Sociétés"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:462
 #, python-format
 msgid "Please define default credit/debit accounts on the journal \"%s\" !"
 msgstr ""
+"Définissez les comptes par défaut de crédit / débit des  sur le journal \"% "
+"s\"!"
 
 #. module: account_voucher
 #: selection:account.voucher.line,type:0
@@ -771,12 +792,12 @@
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Total Allocation"
-msgstr ""
+msgstr "Allocation totale"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Group by Invoice Date"
-msgstr ""
+msgstr "Grouper par date de facturation"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -796,7 +817,7 @@
 #. module: account_voucher
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Le numéro de facture doit être unique par société !"
 
 #. module: account_voucher
 #: view:sale.receipt.report:0 field:sale.receipt.report,price_total:0
@@ -923,12 +944,12 @@
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "year"
-msgstr ""
+msgstr "année"
 
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Currency Options"
-msgstr ""
+msgstr "Options de la devise"
 
 #. module: account_voucher
 #: help:account.voucher,payment_option:0
@@ -938,6 +959,10 @@
 "either choose to keep open this difference on the partner's account, or "
 "reconcile it with the payment(s)"
 msgstr ""
+"Ce champ vous aide à choisir ce que vous désirez faire avec une éventuelle "
+"différence entre le montant régler et la somme des montants alloués. Vous "
+"pouvez choisir de garder cette différence ouverte sur le compte du "
+"partenaire ou de la lettrer avec le ou les paiement(s)."
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -958,12 +983,12 @@
 #. module: account_voucher
 #: view:account.voucher:0
 msgid "Posted Vouchers"
-msgstr ""
+msgstr "Reçus validés"
 
 #. module: account_voucher
 #: field:account.voucher,payment_rate:0
 msgid "Exchange Rate"
-msgstr ""
+msgstr "Taux de change"
 
 #. module: account_voucher
 #: view:account.voucher:0
@@ -1012,7 +1037,7 @@
 #: model:ir.actions.act_window,name:account_voucher.action_purchase_receipt
 #: model:ir.ui.menu,name:account_voucher.menu_action_purchase_receipt
 msgid "Purchase Receipt"
-msgstr ""
+msgstr "Reçu d'achat"
 
 #. module: account_voucher
 #: help:account.voucher,payment_rate:0
@@ -1020,6 +1045,9 @@
 "The specific rate that will be used, in this voucher, between the selected "
 "currency (in 'Payment Rate Currency' field)  and the voucher currency."
 msgstr ""
+"Le taux spécifique qui sera utilisé, pour ce reçu, entre la devise "
+"sélectionné (dans le champ 'Taux de change du paiement') et la devise du "
+"reçu."
 
 #. module: account_voucher
 #: field:account.bank.statement.line,voucher_id:0 view:account.invoice:0
@@ -1052,7 +1080,7 @@
 #. module: account_voucher
 #: view:sale.receipt.report:0
 msgid "Month-1"
-msgstr ""
+msgstr "Mois -1"
 
 #. module: account_voucher
 #: selection:sale.receipt.report,month:0
@@ -1062,7 +1090,7 @@
 #. module: account_voucher
 #: help:account.voucher,tax_id:0
 msgid "Only for tax excluded from price"
-msgstr ""
+msgstr "Uniquement pour les taxes non comprises dans le prix"
 
 #. module: account_voucher
 #: code:addons/account_voucher/account_voucher.py:931
@@ -1071,6 +1099,9 @@
 "Unable to create accounting entry for currency rate difference. You have to "
 "configure the field 'Expense Currency Rate' on the company! "
 msgstr ""
+"Impossible de créer une entrée en comptabilité pour la différence de taux de "
+"change. Vous devez configurer le champ \"Taux de change d'achat\" de la "
+"société ! "
 
 #. module: account_voucher
 #: field:account.voucher,type:0

=== added file 'account_voucher/i18n/gu.po'
--- account_voucher/i18n/gu.po	1970-01-01 00:00:00 +0000
+++ account_voucher/i18n/gu.po	2012-03-08 00:03:21 +0000
@@ -0,0 +1,1114 @@
+# Gujarati translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-03-06 18:21+0000\n"
+"Last-Translator: Serpent Consulting Services <Unknown>\n"
+"Language-Team: Gujarati <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-03-07 06:03+0000\n"
+"X-Generator: Launchpad (build 14907)\n"
+
+#. module: account_voucher
+#: view:sale.receipt.report:0
+msgid "last month"
+msgstr "પૂર્વ માસ"
+
+#. module: account_voucher
+#: view:account.voucher.unreconcile:0
+msgid "Unreconciliation transactions"
+msgstr ""
+
+#. module: account_voucher
+#: code:addons/account_voucher/account_voucher.py:324
+#, python-format
+msgid "Write-Off"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Payment Ref"
+msgstr ""
+
+#. module: account_voucher
+#: view:account.voucher:0
+msgid "Total Amount"
+msgstr "કુલ રકમ"
+
+#. module: account_voucher