Fix merge of translations.

This commit is contained in:
Alexis de Lattre
2013-11-13 10:17:33 +01:00
parent 7ad64af788
commit 7ac9a4e486
2 changed files with 15 additions and 301 deletions

View File

@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-11-12 21:32+0000\n"
"PO-Revision-Date: 2013-11-12 21:32+0000\n"
"POT-Creation-Date: 2013-11-13 09:13+0000\n"
"PO-Revision-Date: 2013-11-13 09:13+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -93,7 +93,6 @@ msgid "Reconciled"
msgstr ""
#. module: account_banking_sepa_credit_transfer
<<<<<<< TREE
#: selection:banking.export.sepa,charge_bearer:0
#: selection:banking.export.sepa.wizard,charge_bearer:0
msgid "Following Service Level"
@@ -118,8 +117,6 @@ msgid "The type of the field '%s' is %s. It should be a string or unicode."
msgstr ""
#. module: account_banking_sepa_credit_transfer
=======
>>>>>>> MERGE-SOURCE
#: selection:banking.export.sepa,state:0
msgid "Sent"
msgstr ""
@@ -135,17 +132,7 @@ msgid "Generate"
msgstr ""
#. module: account_banking_sepa_credit_transfer
<<<<<<< TREE
#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:169
=======
#: field:banking.export.sepa,msg_identification:0
#: field:banking.export.sepa.wizard,msg_identification:0
msgid "Message identification"
msgstr ""
#. module: account_banking_sepa_credit_transfer
#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:287
>>>>>>> MERGE-SOURCE
#, python-format
msgid "The generated XML file is not valid against the official XML Schema Definition. The generated XML file and the full error have been written in the server logs. Here is the error, which may give you an idea on the cause of the problem : %s"
msgstr ""
@@ -232,71 +219,9 @@ msgid "This IBAN is not valid : %s"
msgstr ""
#. module: account_banking_sepa_credit_transfer
#: view:banking.export.sepa:0
#: field:banking.export.sepa,payment_order_ids:0
#: field:banking.export.sepa.wizard,payment_order_ids:0
<<<<<<< TREE
=======
msgid "Payment orders"
msgstr ""
#. module: account_banking_sepa_credit_transfer
#: model:ir.actions.act_window,name:account_banking_sepa_credit_transfer.act_banking_export_sepa_payment_order
msgid "Generated SEPA Credit Transfer files"
msgstr ""
#. module: account_banking_sepa_credit_transfer
#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:89
#, python-format
msgid "This IBAN is not valid : %s"
msgstr ""
#. module: account_banking_sepa_credit_transfer
#: view:banking.export.sepa.wizard:0
msgid "SEPA XML file generation"
msgstr ""
#. module: account_banking_sepa_credit_transfer
#: view:banking.export.sepa.wizard:0
msgid "Reference for further communication"
msgstr ""
#. module: account_banking_sepa_credit_transfer
#: view:banking.export.sepa.wizard:0
msgid "Processing details"
msgstr ""
#. module: account_banking_sepa_credit_transfer
#: model:ir.model,name:account_banking_sepa_credit_transfer.model_banking_export_sepa
msgid "SEPA export"
msgstr ""
#. module: account_banking_sepa_credit_transfer
#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:242
#, python-format
msgid "Missing Bank Account on invoice '%s' (payment order line reference '%s')."
msgstr ""
#. module: account_banking_sepa_credit_transfer
#: selection:banking.export.sepa,charge_bearer:0
#: selection:banking.export.sepa.wizard,charge_bearer:0
msgid "Borne by debtor"
msgstr ""
#. module: account_banking_sepa_credit_transfer
#: field:banking.export.sepa,nb_transactions:0
#: field:banking.export.sepa.wizard,nb_transactions:0
msgid "Number of transactions"
msgstr ""
#. module: account_banking_sepa_credit_transfer
#: selection:banking.export.sepa,charge_bearer:0
#: selection:banking.export.sepa.wizard,charge_bearer:0
msgid "Following service level"
msgstr ""
#. module: account_banking_sepa_credit_transfer
#: view:banking.export.sepa:0
>>>>>>> MERGE-SOURCE
msgid "Payment Orders"
msgstr ""
@@ -306,16 +231,10 @@ msgid "General Information"
msgstr ""
#. module: account_banking_sepa_credit_transfer
<<<<<<< TREE
#: model:ir.actions.act_window,name:account_banking_sepa_credit_transfer.act_banking_export_sepa_payment_order
#: model:ir.actions.act_window,name:account_banking_sepa_credit_transfer.action_account_banking_sepa
#: model:ir.ui.menu,name:account_banking_sepa_credit_transfer.menu_account_banking_sepa
msgid "SEPA Credit Transfer Files"
=======
#: field:banking.export.sepa,charge_bearer:0
#: field:banking.export.sepa.wizard,charge_bearer:0
msgid "Charge bearer"
>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account_banking_sepa_credit_transfer
@@ -340,34 +259,7 @@ msgid "Cancel"
msgstr ""
#. module: account_banking_sepa_credit_transfer
<<<<<<< TREE
#: field:banking.export.sepa,create_date:0
msgid "Generation Date"
=======
#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:132
#, python-format
msgid "Payment Type Code '%s' is not supported. The only Payment Type Codes supported for SEPA Credit Transfers are 'pain.001.001.02', 'pain.001.001.03' and 'pain.001.001.04'."
msgstr ""
#. module: account_banking_sepa_credit_transfer
#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:89
#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:132
#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:242
#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:287
#, python-format
msgid "Error :"
msgstr ""
#. module: account_banking_sepa_credit_transfer
#: field:banking.export.sepa,batch_booking:0
#: field:banking.export.sepa.wizard,batch_booking:0
msgid "Batch booking"
>>>>>>> MERGE-SOURCE
msgstr ""
#. module: account_banking_sepa_credit_transfer
#: model:ir.actions.act_window,name:account_banking_sepa_credit_transfer.action_account_banking_sepa
#: model:ir.ui.menu,name:account_banking_sepa_credit_transfer.menu_account_banking_sepa
msgid "Generated SEPA Credit Transfer XML files"
msgstr ""

View File

@@ -6,15 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: OpenERP Server 7.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-11-12 21:33+0000\n"
"PO-Revision-Date: 2013-11-12 21:33+0000\n"
"POT-Creation-Date: 2013-11-13 09:14+0000\n"
"PO-Revision-Date: 2013-11-13 09:14+0000\n"
"Last-Translator: <>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2013-11-12 06:38+0000\n"
"X-Generator: Launchpad (build 16820)\n"
"Content-Transfer-Encoding: \n"
"Plural-Forms: \n"
#. module: account_banking_sepa_credit_transfer
#: field:banking.export.sepa,prefered_exec_date:0
@@ -28,20 +27,10 @@ msgid "Create"
msgstr "Créer"
#. module: account_banking_sepa_credit_transfer
<<<<<<< TREE
#: field:banking.export.sepa,nb_transactions:0
#: field:banking.export.sepa.wizard,nb_transactions:0
msgid "Number of Transactions"
msgstr "Nombre de transactions"
=======
#: help:banking.export.sepa.wizard,msg_identification:0
msgid ""
"This is the message identification of the entire SEPA XML file. 35 "
"characters max."
msgstr ""
"Ceci est le libellé d'identification du fichier SEPA XML. 35 caractères "
"maximum."
>>>>>>> MERGE-SOURCE
#. module: account_banking_sepa_credit_transfer
#: field:banking.export.sepa,filename:0
@@ -104,7 +93,6 @@ msgid "Reconciled"
msgstr "Réconcilié"
#. module: account_banking_sepa_credit_transfer
<<<<<<< TREE
#: selection:banking.export.sepa,charge_bearer:0
#: selection:banking.export.sepa.wizard,charge_bearer:0
msgid "Following Service Level"
@@ -129,8 +117,6 @@ msgid "The type of the field '%s' is %s. It should be a string or unicode."
msgstr "Le champ '%s' est de type %s. Le type devrait être string ou unicode."
#. module: account_banking_sepa_credit_transfer
=======
>>>>>>> MERGE-SOURCE
#: selection:banking.export.sepa,state:0
msgid "Sent"
msgstr "Envoyé"
@@ -146,28 +132,10 @@ msgid "Generate"
msgstr "Générer"
#. module: account_banking_sepa_credit_transfer
<<<<<<< TREE
#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:169
=======
#: field:banking.export.sepa,msg_identification:0
#: field:banking.export.sepa.wizard,msg_identification:0
msgid "Message identification"
msgstr "Libellé d'identification"
#. module: account_banking_sepa_credit_transfer
#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:287
>>>>>>> MERGE-SOURCE
#, python-format
msgid ""
"The generated XML file is not valid against the official XML Schema "
"Definition. The generated XML file and the full error have been written in "
"the server logs. Here is the error, which may give you an idea on the cause "
"of the problem : %s"
msgstr ""
"Le fichier XML généré n'est pas valide par rapport à la Définition du Schéma "
"XML officiel. Le fichier XML généré et le message d'erreur complet ont été "
"écrits dans les logs du serveur. Voici l'erreur, qui vous donnera peut-être "
"une idée sur la cause du problème : %s"
msgid "The generated XML file is not valid against the official XML Schema Definition. The generated XML file and the full error have been written in the server logs. Here is the error, which may give you an idea on the cause of the problem : %s"
msgstr "Le fichier XML généré n'est pas valide par rapport à la Définition du Schéma XML officiel. Le fichier XML généré et le message d'erreur complet ont été écrits dans les logs du serveur. Voici l'erreur, qui vous donnera peut-être une idée sur la cause du problème : %s"
#. module: account_banking_sepa_credit_transfer
#: selection:banking.export.sepa,charge_bearer:0
@@ -235,7 +203,6 @@ msgstr "Le '%s' est vide ou égal à 0. La valeur devrait être non nulle."
#. module: account_banking_sepa_credit_transfer
#: help:banking.export.sepa,charge_bearer:0
<<<<<<< TREE
msgid "Following service level : transaction charges are to be applied following the rules agreed in the service level and/or scheme (SEPA Core messages must use this). Shared : transaction charges on the creditor side are to be borne by the creditor, transaction charges on the debtor side are to be borne by the debtor. Borne by creditor : all transaction charges are to be borne by the creditor. Borne by debtor : all transaction charges are to be borne by the debtor."
msgstr "Suivant le niveau de service : la répartition des frais bancaires suit les règles pré-établies dans le schema ou dans le contrat avec la banque (les messages SEPA Core doivent utiliser ce paramètre). Partagés : les frais bancaires côté débiteur sont à la charge du débiteur, les frais bancaires côté créancier sont à la charge du créancier. Supportés par le créancier : tous les frais bancaires sont à la charge du créancier. Supportés par le débiteur : tous les frais bancaires sont à la charge du débiteur."
@@ -250,148 +217,36 @@ msgstr "Le code du Type de paiement '%s' n'est pas supporté. Les seuls codes de
#, python-format
msgid "This IBAN is not valid : %s"
msgstr "Cet IBAN n'est pas valide : %s"
=======
#: help:banking.export.sepa.wizard,charge_bearer:0
msgid ""
"Shared : transaction charges on the sender side are to be borne by the "
"debtor, transaction charges on the receiver side are to be borne by the "
"creditor (most transfers use this). Borne by creditor : all transaction "
"charges are to be borne by the creditor. Borne by debtor : all transaction "
"charges are to be borne by the debtor. Following service level : transaction "
"charges are to be applied following the rules agreed in the service level "
"and/or scheme."
msgstr ""
"Partagés : les frais bancaires côté émetteur sont à la charge de l'émetteur "
"et les frais bancaires côté destinataire sont à la charge du destinataire "
"(la plupart des virements utilisent cette répartition). Supportés par le "
"destinataire : tous les frais bancaires sont à la charge du destinataire. "
"Supportés par l'émetteur : tous les frais bancaires sont à la charge de "
"l'émetteur. Suivant le niveau de service : la répartition des frais "
"bancaires suit les règles pré-établies dans le contrat avec la banque."
#. module: account_banking_sepa_credit_transfer
#: selection:banking.export.sepa,charge_bearer:0
#: selection:banking.export.sepa.wizard,charge_bearer:0
msgid "Borne by creditor"
msgstr "Supportés par le destinataire"
>>>>>>> MERGE-SOURCE
#. module: account_banking_sepa_credit_transfer
#: view:banking.export.sepa:0
#: field:banking.export.sepa,payment_order_ids:0
#: field:banking.export.sepa.wizard,payment_order_ids:0
msgid "Payment Orders"
msgstr "Ordres de paiement"
#. module: account_banking_sepa_credit_transfer
<<<<<<< TREE
=======
#: model:ir.actions.act_window,name:account_banking_sepa_credit_transfer.act_banking_export_sepa_payment_order
msgid "Generated SEPA Credit Transfer files"
msgstr ""
#. module: account_banking_sepa_credit_transfer
#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:89
#, python-format
msgid "This IBAN is not valid : %s"
msgstr "Cet IBAN n'est pas valide : %s"
#. module: account_banking_sepa_credit_transfer
#: view:banking.export.sepa.wizard:0
msgid "SEPA XML file generation"
msgstr "Génération du fichier SEPA XML"
#. module: account_banking_sepa_credit_transfer
#: view:banking.export.sepa.wizard:0
msgid "Reference for further communication"
msgstr "Référence pour communication ultérieure"
#. module: account_banking_sepa_credit_transfer
#: view:banking.export.sepa.wizard:0
msgid "Processing details"
msgstr "Paramètres"
#. module: account_banking_sepa_credit_transfer
#: model:ir.model,name:account_banking_sepa_credit_transfer.model_banking_export_sepa
msgid "SEPA export"
msgstr "Export SEPA"
#. module: account_banking_sepa_credit_transfer
#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:242
#, python-format
msgid ""
"Missing Bank Account on invoice '%s' (payment order line reference '%s')."
msgstr ""
#. module: account_banking_sepa_credit_transfer
#: selection:banking.export.sepa,charge_bearer:0
#: selection:banking.export.sepa.wizard,charge_bearer:0
msgid "Borne by debtor"
msgstr "Supportés par l'émetteur"
#. module: account_banking_sepa_credit_transfer
#: field:banking.export.sepa,nb_transactions:0
#: field:banking.export.sepa.wizard,nb_transactions:0
msgid "Number of transactions"
msgstr "Nombre de transactions"
#. module: account_banking_sepa_credit_transfer
#: selection:banking.export.sepa,charge_bearer:0
#: selection:banking.export.sepa.wizard,charge_bearer:0
msgid "Following service level"
msgstr "Suivant le niveau de service"
#. module: account_banking_sepa_credit_transfer
#: view:banking.export.sepa:0
msgid "Payment Orders"
msgstr ""
#. module: account_banking_sepa_credit_transfer
>>>>>>> MERGE-SOURCE
#: view:banking.export.sepa:0
msgid "General Information"
<<<<<<< TREE
msgstr "Informations générales"
=======
msgstr ""
>>>>>>> MERGE-SOURCE
#. module: account_banking_sepa_credit_transfer
<<<<<<< TREE
#: model:ir.actions.act_window,name:account_banking_sepa_credit_transfer.act_banking_export_sepa_payment_order
#: model:ir.actions.act_window,name:account_banking_sepa_credit_transfer.action_account_banking_sepa
#: model:ir.ui.menu,name:account_banking_sepa_credit_transfer.menu_account_banking_sepa
msgid "SEPA Credit Transfer Files"
msgstr "Fichiers de virement SEPA"
=======
#: field:banking.export.sepa,charge_bearer:0
#: field:banking.export.sepa.wizard,charge_bearer:0
msgid "Charge bearer"
msgstr "Répartition des frais"
>>>>>>> MERGE-SOURCE
#. module: account_banking_sepa_credit_transfer
#: help:banking.export.sepa,batch_booking:0
#: help:banking.export.sepa.wizard,batch_booking:0
msgid ""
"If true, the bank statement will display only one debit line for all the "
"wire transfers of the SEPA XML file ; if false, the bank statement will "
"display one debit line per wire transfer of the SEPA XML file."
msgstr ""
"Si coché, le relevé de compte ne comportera qu'une ligne de débit pour tous "
"les virements du fichier SEPA XML ; si non coché, le relevé de compte "
"comportera une ligne de débit pour chaque virement du fichier SEPA XML."
msgid "If true, the bank statement will display only one debit line for all the wire transfers of the SEPA XML file ; if false, the bank statement will display one debit line per wire transfer of the SEPA XML file."
msgstr "Si coché, le relevé de compte ne comportera qu'une ligne de débit pour tous les virements du fichier SEPA XML ; si non coché, le relevé de compte comportera une ligne debit pour chaque virement du fichier SEPA XML."
#. module: account_banking_sepa_credit_transfer
#: help:banking.export.sepa.wizard,prefered_exec_date:0
msgid ""
"This is the date on which the file should be processed by the bank. Please "
"keep in mind that banks only execute on working days and typically use a "
"delay of two days between execution date and effective transfer date."
msgstr ""
"C'est la date à laquelle le fichier doit être traité par la banque. Gardez "
"en tête que les banques réalisent des traitements seulement les jours ouvrés "
"et ont habituellement un délai de 2 jours entre la date de traitement et la "
"date du transfert effectif."
msgid "This is the date on which the file should be processed by the bank. Please keep in mind that banks only execute on working days and typically use a delay of two days between execution date and effective transfer date."
msgstr "C'est la date à laquelle le fichier doit être traité par la banque. Gardez en tête que les banques réalisent des traitements seulement les jours ouvrés et ont habituellement un délai de 2 jours entre la date de traitement et la date du transfert effectif."
#. module: account_banking_sepa_credit_transfer
#: field:banking.export.sepa.wizard,file:0
@@ -404,40 +259,7 @@ msgid "Cancel"
msgstr "Annuler"
#. module: account_banking_sepa_credit_transfer
<<<<<<< TREE
#: field:banking.export.sepa,create_date:0
msgid "Generation Date"
msgstr "Generation Date"
=======
#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:132
#, python-format
msgid ""
"Payment Type Code '%s' is not supported. The only Payment Type Codes "
"supported for SEPA Credit Transfers are 'pain.001.001.02', 'pain.001.001.03' "
"and 'pain.001.001.04'."
msgstr ""
"Le code '%s' pour le Type de Paiment n'est pas supporté. Les seuls codes de "
"Types de Paiement supportés pour les virements SEPA sont 'pain.001.001.02', "
"'pain.001.001.03' et 'pain.001.001.04'."
msgstr "Date de génération"
#. module: account_banking_sepa_credit_transfer
#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:89
#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:132
#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:242
#: code:addons/account_banking_sepa_credit_transfer/wizard/export_sepa.py:287
#, python-format
msgid "Error :"
msgstr "Erreur :"
#. module: account_banking_sepa_credit_transfer
#: field:banking.export.sepa,batch_booking:0
#: field:banking.export.sepa.wizard,batch_booking:0
msgid "Batch booking"
msgstr "Débit groupé"
>>>>>>> MERGE-SOURCE
#. module: account_banking_sepa_credit_transfer
#: model:ir.actions.act_window,name:account_banking_sepa_credit_transfer.action_account_banking_sepa
#: model:ir.ui.menu,name:account_banking_sepa_credit_transfer.menu_account_banking_sepa
msgid "Generated SEPA Credit Transfer XML files"
msgstr ""