diff --git a/ChangeLog b/ChangeLog
index b84c24045a32ae0c6f0764666019ed174ebd1a6c..24c8b2e643ce803395e072ba28c1d6cb132e64f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,6 +40,8 @@ For users:
not work with this.
- New: [ task #326 ]: Add a numbering module to suggest automatically a product ref
- Fix: Errors weren't being shown in customer's & supplier's orders
+- New: Add conditional substitution IF/ELSEIF/ENDIF for ODT templates
+- New: Basic implementation of hooks and triggers for a lot (most) of core modules: action/calendar, trips and expenses, dons, vat payment, contact/society, contract, product lines, expedition, order supplier and order invoice (lines included), intervention card, project, tasks
For developers:
- New: Add webservice for thirdparty creation and list.
@@ -52,6 +54,7 @@ For developers:
- New: removed deprecated methods
ldap::connect, formadmin::select_lang,
html::select_tva
+- New: Add custom substitution function for ODT product lines: mymodule_completesubstitutionarray_lines()
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 13864a37183ef7a6dc14287443829f55305a7360..e4dead271f413c2903d2c3cd70fbb67335fd3fae 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -6,6 +6,7 @@
* Copyright (C) 2010-2011 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2011 Remy Younes <ryounes@gmail.com>
+ * Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -338,18 +339,23 @@ if ($id == 11)
$langs->load("propal");
$langs->load("bills");
$langs->load("interventions");
- $elementList = array("commande"=>$langs->trans("Order"),
- "order_supplier"=>$langs->trans("SupplierOrder"),
- "contrat"=>$langs->trans("Contract"),
- "project"=>$langs->trans("Project"),
- "project_task"=>$langs->trans("Task"),
- "propal"=>$langs->trans("Propal"),
- "facture"=>$langs->trans("Bill"),
- "facture_fourn"=>$langs->trans("SupplierBill"),
- "fichinter"=>$langs->trans("InterventionCard"));
- if (! empty($conf->global->MAIN_SUPPORT_CONTACT_TYPE_FOR_THIRDPARTIES)) $elementList["societe"]=$langs->trans("ThirdParty");
- $sourceList = array("internal"=>$langs->trans("Internal"),
- "external"=>$langs->trans("External"));
+ $elementList = array(
+ 'commande' => $langs->trans('Order'),
+ 'invoice_supplier' => $langs->trans('SupplierBill'),
+ 'order_supplier' => $langs->trans('SupplierOrder'),
+ 'contrat' => $langs->trans('Contract'),
+ 'project' => $langs->trans('Project'),
+ 'project_task' => $langs->trans('Task'),
+ 'propal' => $langs->trans('Proposal'),
+ 'facture' => $langs->trans('Bill'),
+ 'facture_fourn' => $langs->trans('SupplierBill'),
+ 'fichinter' => $langs->trans('InterventionCard')
+ );
+ if (! empty($conf->global->MAIN_SUPPORT_CONTACT_TYPE_FOR_THIRDPARTIES)) $elementList["societe"] = $langs->trans('ThirdParty');
+ $sourceList = array(
+ 'internal' => $langs->trans('Internal'),
+ 'external' => $langs->trans('External')
+ );
}
$msg='';
@@ -380,9 +386,12 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
$fieldnamekey=$listfield[$f];
// We take translate key of field
if ($fieldnamekey == 'libelle') $fieldnamekey='Label';
+ if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments';
if ($fieldnamekey == 'nbjour') $fieldnamekey='NbOfDays';
if ($fieldnamekey == 'decalage') $fieldnamekey='Offset';
if ($fieldnamekey == 'module') $fieldnamekey='Module';
+ if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
+
$msg.=$langs->trans("ErrorFieldRequired",$langs->transnoentities($fieldnamekey)).'<br>';
}
}
@@ -827,7 +836,15 @@ if ($id)
{
$showfield=1;
$valuetoshow=$obj->$fieldlist[$field];
- if ($valuetoshow=='all') {
+ if ($value == 'element')
+ {
+ $valuetoshow = $elementList[$valuetoshow];
+ }
+ else if ($value == 'source')
+ {
+ $valuetoshow = $sourceList[$valuetoshow];
+ }
+ else if ($valuetoshow=='all') {
$valuetoshow=$langs->trans('All');
}
else if ($fieldlist[$field]=='pays') {
@@ -910,6 +927,17 @@ if ($id)
$key=$langs->trans("SendingMethod".strtoupper($obj->code));
$valuetoshow=($obj->code && $key != "SendingMethod".strtoupper($obj->code))?$key:$obj->$fieldlist[$field];
}
+ else if ($fieldlist[$field] == 'libelle' && $tabname[$_GET['id']]==MAIN_DB_PREFIX.'c_paper_format')
+ {
+ $key = $langs->trans('PaperFormat'.strtoupper($obj->code));
+ $valuetoshow = ($obj->code && ($key != 'PaperFormat'.strtoupper($obj->code))) ? $key : $obj->$fieldlist[$field];
+ }
+ else if ($fieldlist[$field] == 'libelle' && $tabname[$_GET['id']] == MAIN_DB_PREFIX.'c_type_fees')
+ {
+ $langs->load('trips');
+ $key = $langs->trans(strtoupper($obj->code));
+ $valuetoshow = ($obj->code && ($key != strtoupper($obj->code))) ? $key : $obj->$fieldlist[$field];
+ }
else if ($fieldlist[$field]=='region_id' || $fieldlist[$field]=='pays_id') {
$showfield=0;
}
diff --git a/htdocs/cashdesk/tpl/ticket.tpl.php b/htdocs/cashdesk/tpl/ticket.tpl.php
index 52a58a2bad8496259447bfbb98725165afed918a..49e99bd0d9c8624aded68187c99501a0982a4d2a 100644
--- a/htdocs/cashdesk/tpl/ticket.tpl.php
+++ b/htdocs/cashdesk/tpl/ticket.tpl.php
@@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
* Copyright (C) 2011 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,6 +19,7 @@
include_once(DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php');
$langs->load("main");
+$langs->load('cashdesk');
header("Content-type: text/html; charset=".$conf->file->character_set_client);
$facid=GETPOST('facid','int');
@@ -27,7 +29,7 @@ $object->fetch($facid);
?>
<html>
<head>
-<title>Print ticket</title>
+<title><?php echo $langs->trans('PrintTicket') ?></title>
<style type="text/css">
body {
diff --git a/htdocs/cashdesk/tpl/validation2.tpl.php b/htdocs/cashdesk/tpl/validation2.tpl.php
index bddaadc9f2f5cb623d1886bc5e136d0f42b0f1d4..e58c83205c98e211098c78203327f642e50538fe 100644
--- a/htdocs/cashdesk/tpl/validation2.tpl.php
+++ b/htdocs/cashdesk/tpl/validation2.tpl.php
@@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2007-2008 Jeremie Ollivier <jeremie.o@laposte.net>
+ * Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -31,7 +32,7 @@ $langs->load("main");
largeur = 600;
hauteur = 500
opt = 'width='+largeur+', height='+hauteur+', left='+(screen.width - largeur)/2+', top='+(screen.height-hauteur)/2+'';
- window.open('validation_ticket.php?facid=<?php echo $_GET['facid']; ?>', 'Print ticket', opt);
+ window.open('validation_ticket.php?facid=<?php echo $_GET['facid']; ?>', '<?php echo $langs->trans('PrintTicket') ?>', opt);
}
popupTicket();
diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index a4316343284d1d11c843a6931c6a28d170b8a2a6..67b96147dbccbb57610db56c8908c78a02a1fddc 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -267,7 +267,7 @@ if ($id > 0)
}
// TVA Intra
- print '<tr><td nowrap>'.$langs->trans('VATIntraVeryShort').'</td><td colspan="3">';
+ print '<tr><td nowrap>'.$langs->trans('VATIntra').'</td><td colspan="3">';
print $object->tva_intra;
print '</td></tr>';
diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php
index a7cd25c270ae1fe49a9ee404548418586fce4980..e9c6000d40915fddb84e506857d46f4838ca4d8b 100644
--- a/htdocs/core/modules/export/export_csv.modules.php
+++ b/htdocs/core/modules/export/export_csv.modules.php
@@ -60,7 +60,7 @@ class ExportCsv extends ModeleExports
$this->enclosure='"';
$this->id='csv'; // Same value then xxx in file name export_xxx.modules.php
- $this->label='Csv'; // Label of driver
+ $this->label = 'CSV'; // Label of driver
$this->desc=$langs->trans("CSVFormatDesc",$this->separator,$this->enclosure,$this->escape);
$this->extension='csv'; // Extension for generated file by this driver
$this->picto='mime/other'; // Picto
diff --git a/htdocs/core/modules/export/export_excel.modules.php b/htdocs/core/modules/export/export_excel.modules.php
index c63dbe63cc575f6776d947788a79499f1c2c22fb..ee0bd7211c35aee250fb45028725e6c5d4003a8c 100644
--- a/htdocs/core/modules/export/export_excel.modules.php
+++ b/htdocs/core/modules/export/export_excel.modules.php
@@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -54,12 +55,12 @@ class ExportExcel extends ModeleExports
*/
function __construct($db)
{
- global $conf;
+ global $conf, $langs;
$this->db = $db;
$this->id='excel'; // Same value then xxx in file name export_xxx.modules.php
$this->label='Excel 95'; // Label of driver
- $this->desc='<b>Excel</b> file format (.xls)<br>This is native Excel 95 format (BIFF5).';
+ $this->desc = $langs->trans('Excel95FormatDesc');
$this->extension='xls'; // Extension for generated file by this driver
$this->picto='mime/xls'; // Picto
$this->version='1.30'; // Driver version
diff --git a/htdocs/core/modules/export/export_excel2007.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php
index 19316e61e2b810d7ad197a7495516555bfffa42f..4bb3f6ee624ae2c31fd9da8e5e8ba708c3c28fb8 100755
--- a/htdocs/core/modules/export/export_excel2007.modules.php
+++ b/htdocs/core/modules/export/export_excel2007.modules.php
@@ -1,5 +1,6 @@
<?php
/* Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -55,12 +56,12 @@ class ExportExcel2007 extends ExportExcel
*/
function __construct($db)
{
- global $conf;
+ global $conf, $langs;
$this->db = $db;
$this->id='excel2007'; // Same value then xxx in file name export_xxx.modules.php
$this->label='Excel 2007'; // Label of driver
- $this->desc='<b>Excel</b> file format (.xlsx)<br>This is native Excel 2007 format (SpreadsheetML).';
+ $this->desc = $langs->trans('Excel2007FormatDesc');
$this->extension='xlsx'; // Extension for generated file by this driver
$this->picto='mime/xls'; // Picto
$this->version='1.30'; // Driver version
diff --git a/htdocs/core/modules/export/export_tsv.modules.php b/htdocs/core/modules/export/export_tsv.modules.php
index b8ef3ba491cdcb0590d615f3d939e2d443ff5d3a..d67cf3b80de7ed81fd8a8105a920b862688df75f 100644
--- a/htdocs/core/modules/export/export_tsv.modules.php
+++ b/htdocs/core/modules/export/export_tsv.modules.php
@@ -1,18 +1,19 @@
<?php
/* Copyright (C) 2006-2008 Laurent Destailleur <eldy@users.sourceforge.net>
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation; either version 2 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
@@ -51,12 +52,12 @@ class ExportTsv extends ModeleExports
*/
function __construct($db)
{
- global $conf;
+ global $conf, $langs;
$this->db = $db;
$this->id='tsv'; // Same value then xxx in file name export_xxx.modules.php
- $this->label='Tsv'; // Label of driver
- $this->desc='<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by separator [tab].';
+ $this->label = 'TSV'; // Label of driver
+ $this->desc = $langs->trans('TsvFormatDesc');
$this->extension='tsv'; // Extension for generated file by this driver
$this->picto='mime/other'; // Picto
$this->version='1.15'; // Driver version
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index 63a87521e9b12b89ede25dc69ee7d47ae808b0db..5aeed0d784a845f5551e480c95cfafa6c496cba6 100755
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -239,7 +239,7 @@ class mailing_contacts1 extends MailingTargets
'firstname' => $obj->firstname,
'other' =>
($langs->transnoentities("ThirdParty").'='.$obj->companyname).';'.
- ($langs->transnoentities("Civility").'='.($obj->civilite?$langs->transnoentities("Civility".$obj->civilite):'')),
+ ($langs->transnoentities("UserTitle").'='.($obj->civilite?$langs->transnoentities("Civility".$obj->civilite):'')),
'source_url' => $this->url($obj->id),
'source_id' => $obj->id,
'source_type' => 'contact'
diff --git a/htdocs/core/modules/mailings/contacts2.modules.php b/htdocs/core/modules/mailings/contacts2.modules.php
index b3a6f059a3d129308f3156c15e559ad8bd6313f4..ed1905d634e607448a45f6ab63f52ff0d5c3999b 100755
--- a/htdocs/core/modules/mailings/contacts2.modules.php
+++ b/htdocs/core/modules/mailings/contacts2.modules.php
@@ -103,7 +103,7 @@ class mailing_contacts2 extends MailingTargets
'firstname' => $obj->firstname,
'other' =>
($langs->transnoentities("ThirdParty").'='.$obj->companyname).';'.
- ($langs->transnoentities("Civility").'='.($obj->civilite?$langs->transnoentities("Civility".$obj->civilite):'')),
+ ($langs->transnoentities("UserTitle").'='.($obj->civilite?$langs->transnoentities("Civility".$obj->civilite):'')),
'source_url' => $this->url($obj->id),
'source_id' => $obj->id,
'source_type' => 'contact'
diff --git a/htdocs/core/modules/mailings/contacts3.modules.php b/htdocs/core/modules/mailings/contacts3.modules.php
index 296a3fa925e2d5e9f348af0c9bd6fe1655814328..9f0453ada2f4f24ee93de5752ccf5e4ee4c29f16 100755
--- a/htdocs/core/modules/mailings/contacts3.modules.php
+++ b/htdocs/core/modules/mailings/contacts3.modules.php
@@ -107,7 +107,7 @@ class mailing_contacts3 extends MailingTargets
'firstname' => $obj->firstname,
'other' =>
($langs->transnoentities("ThirdParty").'='.$obj->companyname).';'.
- ($langs->transnoentities("Civility").'='.($obj->civilite?$langs->transnoentities("Civility".$obj->civilite):'')),
+ ($langs->transnoentities("UserTitle").'='.($obj->civilite?$langs->transnoentities("Civility".$obj->civilite):'')),
'source_url' => $this->url($obj->id),
'source_id' => $obj->id,
'source_type' => 'contact'
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index 46691ba7a6225665c38757f5ccac42cb2a8906a7..2d6500dafcee97e98a0b6ab9c64886811890829c 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -201,7 +201,7 @@ class mailing_fraise extends MailingTargets
'firstname' => $obj->firstname,
'other' =>
($langs->transnoentities("Login").'='.$obj->login).';'.
- ($langs->transnoentities("Civility").'='.($obj->civilite?$langs->transnoentities("Civility".$obj->civilite):'')).';'.
+ ($langs->transnoentities("UserTitle").'='.($obj->civilite?$langs->transnoentities("Civility".$obj->civilite):'')).';'.
($langs->transnoentities("DateEnd").'='.dol_print_date($this->db->jdate($obj->datefin),'day')).';'.
($langs->transnoentities("Company").'='.$obj->societe),
'source_url' => $this->url($obj->id),
diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php
index 6567381cae1bcc4c30beebebc79749ec8d9efc01..d4686c509acd70bf4839898fabae244a340fe6ed 100644
--- a/htdocs/core/modules/mailings/pomme.modules.php
+++ b/htdocs/core/modules/mailings/pomme.modules.php
@@ -180,7 +180,7 @@ class mailing_pomme extends MailingTargets
'firstname' => $obj->firstname,
'other' =>
($langs->transnoentities("Login").'='.$obj->login).';'.
-// ($langs->transnoentities("Civility").'='.$obj->civilite).';'.
+// ($langs->transnoentities("UserTitle").'='.$obj->civilite).';'.
($langs->transnoentities("PhonePro").'='.$obj->office_phone),
'source_url' => $this->url($obj->id),
'source_id' => $obj->id,
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index 6b9de8fd21e2ba7a49d124c670cfac953b0087e5..ba103b9516f7e19a920a65a26f858c5096c36982 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -173,7 +173,7 @@ class modAdherent extends DolibarrModules
$this->export_code[$r]=$this->rights_class.'_'.$r;
$this->export_label[$r]='MembersAndSubscriptions';
$this->export_permission[$r]=array(array("adherent","export"));
- $this->export_fields_array[$r]=array('a.rowid'=>'Id','a.civilite'=>"UserTitle",'a.nom'=>"Lastname",'a.prenom'=>"Firstname",'a.login'=>"Login",'a.morphy'=>'MorPhy','a.societe'=>'Company','a.adresse'=>"Address",'a.cp'=>"Zip",'a.ville'=>"Town",'a.pays'=>"Country",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.naiss'=>"Birthday",'a.statut'=>"Status",'a.photo'=>"Photo",'a.note'=>"Note",'a.datec'=>'DateCreation','a.datevalid'=>'DateValidation','a.tms'=>'DateLastModification','a.datefin'=>'DateEndSubscription','ta.rowid'=>'MemberTypeId','ta.libelle'=>'MemberTypeLabel','c.rowid'=>'SubscriptionId','c.dateadh'=>'DateSubscription','c.cotisation'=>'Amount');
+ $this->export_fields_array[$r]=array('a.rowid'=>'Id','a.civilite'=>"UserTitle",'a.nom'=>"Lastname",'a.prenom'=>"Firstname",'a.login'=>"Login",'a.morphy'=>'Nature','a.societe'=>'Company','a.adresse'=>"Address",'a.cp'=>"Zip",'a.ville'=>"Town",'a.pays'=>"Country",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.naiss'=>"Birthday",'a.statut'=>"Status",'a.photo'=>"Photo",'a.note'=>"Note",'a.datec'=>'DateCreation','a.datevalid'=>'DateValidation','a.tms'=>'DateLastModification','a.datefin'=>'DateEndSubscription','ta.rowid'=>'MemberTypeId','ta.libelle'=>'MemberTypeLabel','c.rowid'=>'SubscriptionId','c.dateadh'=>'DateSubscription','c.cotisation'=>'Amount');
$this->export_entities_array[$r]=array('a.rowid'=>'member','a.civilite'=>"member",'a.nom'=>"member",'a.prenom'=>"member",'a.login'=>"member",'a.morphy'=>'member','a.societe'=>'member','a.adresse'=>"member",'a.cp'=>"member",'a.ville'=>"member",'a.pays'=>"member",'a.phone'=>"member",'a.phone_perso'=>"member",'a.phone_mobile'=>"member",'a.email'=>"member",'a.naiss'=>"member",'a.statut'=>"member",'a.photo'=>"member",'a.note'=>"member",'a.datec'=>'member','a.datevalid'=>'member','a.tms'=>'member','a.datefin'=>'member','ta.rowid'=>'member_type','ta.libelle'=>'member_type','c.rowid'=>'subscription','c.dateadh'=>'subscription','c.cotisation'=>'subscription');
// Add extra fields
$sql="SELECT name, label FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'member'";
@@ -207,7 +207,7 @@ class modAdherent extends DolibarrModules
$this->import_entities_array[$r]=array(); // We define here only fields that use another icon that the one defined into import_icon
$this->import_tables_array[$r]=array('a'=>MAIN_DB_PREFIX.'adherent','extra'=>MAIN_DB_PREFIX.'adherent_extrafields');
$this->import_tables_creator_array[$r]=array('a'=>'fk_user_author'); // Fields to store import user id
- $this->import_fields_array[$r]=array('a.civilite'=>"Civility",'a.nom'=>"Lastname*",'a.prenom'=>"Firstname",'a.login'=>"Login*","a.pass"=>"Password","a.fk_adherent_type"=>"MemberType*",'a.morphy'=>'MorPhy*','a.societe'=>'Company','a.adresse'=>"Address",'a.cp'=>"Zip",'a.ville'=>"Town",'a.pays'=>"Country",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.naiss'=>"Birthday",'a.statut'=>"Status*",'a.photo'=>"Photo",'a.note'=>"Note",'a.datec'=>'DateCreation','a.datefin'=>'DateEndSubscription');
+ $this->import_fields_array[$r]=array('a.civilite'=>"UserTitle",'a.nom'=>"Lastname*",'a.prenom'=>"Firstname",'a.login'=>"Login*","a.pass"=>"Password","a.fk_adherent_type"=>"MemberType*",'a.morphy'=>'Nature*','a.societe'=>'Company','a.adresse'=>"Address",'a.cp'=>"Zip",'a.ville'=>"Town",'a.pays'=>"Country",'a.phone'=>"PhonePro",'a.phone_perso'=>"PhonePerso",'a.phone_mobile'=>"PhoneMobile",'a.email'=>"Email",'a.naiss'=>"Birthday",'a.statut'=>"Status*",'a.photo'=>"Photo",'a.note'=>"Note",'a.datec'=>'DateCreation','a.datefin'=>'DateEndSubscription');
// Add extra fields
$sql="SELECT name, label FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'member'";
$resql=$this->db->query($sql);
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 45dd5de80a12f41f84a3970e8639cb86aa2920a2..a898db1a9bbf2cb56368e0b9278e3b8086ab538e 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -173,7 +173,7 @@ class modCommande extends DolibarrModules
$this->export_code[$r]=$this->rights_class.'_'.$r;
$this->export_label[$r]='CustomersOrdersAndOrdersLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
$this->export_permission[$r]=array(array("commande","commande","export"));
- $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.cp'=>'Zip','s.ville'=>'Town','s.fk_pays'=>'Country','s.tel'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefClient",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_commande'=>"DateOrder",'c.amount_ht'=>"Amount",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total_ttc'=>"TotalTTC",'c.facture'=>"OrderShortStatusInvoicee",'c.fk_statut'=>'Status','c.note'=>"Note",'c.date_livraison'=>'DeliveryDate','cd.rowid'=>'LineId','cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct','cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'Label');
+ $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.cp'=>'Zip','s.ville'=>'Town','s.fk_pays'=>'Country','s.tel'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.date_creation'=>"DateCreation",'c.date_commande'=>"DateOrder",'c.amount_ht'=>"Amount",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total_ttc'=>"TotalTTC",'c.facture'=>"OrderShortStatusInvoicee",'c.fk_statut'=>'Status','c.note'=>"Note",'c.date_livraison'=>'DeliveryDate','cd.rowid'=>'LineId','cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct','cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'Label');
$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.cp'=>'company','s.ville'=>'company','s.fk_pays'=>'company','s.tel'=>'company','s.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"order",'c.ref'=>"order",'c.ref_client'=>"order",'c.fk_soc'=>"order",'c.date_creation'=>"order",'c.date_commande'=>"order",'c.amount_ht'=>"order",'c.remise_percent'=>"order",'c.total_ht'=>"order",'c.total_ttc'=>"order",'c.facture'=>"order",'c.fk_statut'=>"order",'c.note'=>"order",'c.date_livraison'=>"order",'cd.rowid'=>'order_line','cd.description'=>"order_line",'cd.product_type'=>'order_line','cd.tva_tx'=>"order_line",'cd.qty'=>"order_line",'cd.total_ht'=>"order_line",'cd.total_tva'=>"order_line",'cd.total_ttc'=>"order_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product');
$this->export_dependencies_array[$r]=array('order_line'=>'cd.rowid','product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index 7c140968dd069afcec618f52d588714f8b863af9..f550d715b9cc876cd2668b83b1b09445c1320cc3 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -169,7 +169,7 @@ class modPropale extends DolibarrModules
$this->export_code[$r]=$this->rights_class.'_'.$r;
$this->export_label[$r]='ProposalsAndProposalsLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
$this->export_permission[$r]=array(array("propale","export"));
- $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.cp'=>'Zip','s.ville'=>'Town','cp.code'=>'Country','s.tel'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefClient",'c.fk_soc'=>"IdCompany",'c.datec'=>"DateCreation",'c.datep'=>"DatePropal",'c.fin_validite'=>"DateEndPropal",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total'=>"TotalTTC",'c.fk_statut'=>'Status','c.note'=>"Note",'c.date_livraison'=>'DeliveryDate','cd.rowid'=>'LineId','cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct','cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'Label');
+ $this->export_fields_array[$r]=array('s.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.cp'=>'Zip','s.ville'=>'Town','cp.code'=>'Country','s.tel'=>'Phone','s.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",'c.fk_soc'=>"IdCompany",'c.datec'=>"DateCreation",'c.datep'=>"DatePropal",'c.fin_validite'=>"DateEndPropal",'c.remise_percent'=>"GlobalDiscount",'c.total_ht'=>"TotalHT",'c.total'=>"TotalTTC",'c.fk_statut'=>'Status','c.note'=>"Note",'c.date_livraison'=>'DeliveryDate','cd.rowid'=>'LineId','cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct','cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'Label');
$this->export_entities_array[$r]=array('s.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.cp'=>'company','s.ville'=>'company','cp.code'=>'company','s.tel'=>'company','s.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"propal",'c.ref'=>"propal",'c.ref_client'=>"propal",'c.fk_soc'=>"propal",'c.datec'=>"propal",'c.datep'=>"propal",'c.fin_validite'=>"propal",'c.remise_percent'=>"propal",'c.total_ht'=>"propal",'c.total'=>"propal",'c.fk_statut'=>"propal",'c.note'=>"propal",'c.date_livraison'=>"propal",'cd.rowid'=>'propal_line','cd.description'=>"propal_line",'cd.product_type'=>'propal_line','cd.tva_tx'=>"propal_line",'cd.qty'=>"propal_line",'cd.total_ht'=>"propal_line",'cd.total_tva'=>"propal_line",'cd.total_ttc'=>"propal_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product');
$this->export_dependencies_array[$r]=array('propal_line'=>'cd.rowid','product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index 8034ac96dc61229b78850d2d1fdd2086f0011d2e..1f9ea080ee77906539df33758eec0d62974893ea 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -355,7 +355,7 @@ class modSociete extends DolibarrModules
$this->import_icon[$r]='contact';
$this->import_entities_array[$r]=array('s.fk_soc'=>'company'); // We define here only fields that use another icon that the one defined into import_icon
$this->import_tables_array[$r]=array('s'=>MAIN_DB_PREFIX.'socpeople'); // List of tables to insert into (insert done in same order)
- $this->import_fields_array[$r]=array('s.fk_soc'=>'ThirdPartyName*','s.civilite'=>'Civility','s.name'=>"Name*",'s.firstname'=>"Firstname",'s.address'=>"Address",'s.cp'=>"Zip",'s.ville'=>"Town",'s.fk_pays'=>"CountryCode",'s.birthday'=>"BirthdayDate",'s.poste'=>"Role",'s.phone'=>"Phone",'s.phone_perso'=>"PhonePerso",'s.phone_mobile'=>"PhoneMobile",'s.fax'=>"Fax",'s.email'=>"Email",'s.note'=>"Note",'s.datec'=>"DateCreation");
+ $this->import_fields_array[$r]=array('s.fk_soc'=>'ThirdPartyName*','s.civilite'=>'UserTitle','s.name'=>"Name*",'s.firstname'=>"Firstname",'s.address'=>"Address",'s.cp'=>"Zip",'s.ville'=>"Town",'s.fk_pays'=>"CountryCode",'s.birthday'=>"BirthdayDate",'s.poste'=>"Role",'s.phone'=>"Phone",'s.phone_perso'=>"PhonePerso",'s.phone_mobile'=>"PhoneMobile",'s.fax'=>"Fax",'s.email'=>"Email",'s.note'=>"Note",'s.datec'=>"DateCreation");
$this->import_fieldshidden_array[$r]=array('s.fk_user_creat'=>'user->id'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
$this->import_convertvalue_array[$r]=array(
's.fk_soc'=>array('rule'=>'fetchidfromref','file'=>'/societe/class/societe.class.php','class'=>'Societe','method'=>'fetch','element'=>'ThirdParty'),
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 8727c16a9baf1220ca948261650fe60eba69eb0d..3e5927f40aab32237f8ba0e42bcca75d902325fc 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -775,7 +775,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
{
print '<li class="directory collapsed">';
print '<div class="ecmjqft">';
- print $langs->trans("ECMNoDirecotyYet");
+ print $langs->trans("ECMNoDirectoryYet");
print '</div>';
print "</li>\n";
}
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index b37dc17944ebcd3b974152c39ff5368519682e14..8d0c498069ca2d7a617f402e71e6cfe858c6bfec 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2005-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr>
+ * Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -34,34 +35,56 @@ $langs->load("exports");
//if (! $user->admin)
// accessforbidden();
-$entitytoicon=array(
- 'invoice'=>'bill','invoice_line'=>'bill',
- 'order'=>'order' ,'order_line'=>'order',
- 'propal'=>'propal', 'propal_line'=>'propal',
- 'intervention'=>'intervention' ,'inter_line'=>'intervention',
- 'member'=>'user' ,'member_type'=>'group','subscription'=>'payment',
- 'tax'=>'generic' ,'tax_type'=>'generic',
- 'account'=>'account',
- 'payment'=>'payment',
- 'product'=>'product','stock'=>'generic','warehouse'=>'stock',
- 'category'=>'category',
- 'other'=>'generic',
- );
-$entitytolang=array( // Translation code
- 'user'=>'User',
- 'company'=>'Company','contact'=>'Contact',
- 'invoice'=>'Bill','invoice_line'=>'InvoiceLine',
- 'order'=>'Order','order_line'=>'OrderLine',
- 'propal'=>'Proposal','propal_line'=>'ProposalLine',
- 'intervention'=>'Intervention' ,'inter_line'=>'InterLine',
- 'member'=>'Member','member_type'=>'MemberType','subscription'=>'Subscription',
- 'tax'=>'SocialContribution','tax_type'=>'DictionnarySocialContributions',
- 'account'=>'BankTransactions',
- 'payment'=>'Payment',
- 'product'=>'Product','stock'=>'Stock','warehouse'=>'Warehouse',
- 'category'=>'Category',
- 'other'=>'Other'
- );
+$entitytoicon = array(
+ 'invoice' => 'bill',
+ 'invoice_line' => 'bill',
+ 'order' => 'order',
+ 'order_line' => 'order',
+ 'propal' => 'propal',
+ 'propal_line' => 'propal',
+ 'intervention' => 'intervention',
+ 'inter_line' => 'intervention',
+ 'member' => 'user',
+ 'member_type' => 'group',
+ 'subscription' => 'payment',
+ 'payment' => 'payment',
+ 'tax' => 'generic',
+ 'tax_type' => 'generic',
+ 'stock' => 'generic',
+ 'other' => 'generic',
+ 'account' => 'account',
+ 'product' => 'product',
+ 'warehouse' => 'stock',
+ 'category' => 'category',
+);
+
+// Translation code
+$entitytolang = array(
+ 'user' => 'User',
+ 'company' => 'Company',
+ 'contact' => 'Contact',
+ 'invoice' => 'Bill',
+ 'invoice_line' => 'InvoiceLine',
+ 'order' => 'Order',
+ 'order_line' => 'OrderLine',
+ 'propal' => 'Proposal',
+ 'propal_line' => 'ProposalLine',
+ 'intervention' => 'Intervention',
+ 'inter_line' => 'InterLine',
+ 'member' => 'Member',
+ 'member_type' => 'MemberType',
+ 'subscription' => 'Subscription',
+ 'tax' => 'SocialContribution',
+ 'tax_type' => 'DictionnarySocialContributions',
+ 'account' => 'BankTransactions',
+ 'payment' => 'Payment',
+ 'product' => 'Product',
+ 'stock' => 'Stock',
+ 'warehouse' => 'Warehouse',
+ 'category' => 'Category',
+ 'other' => 'Other',
+ 'trip' => 'TripsAndExpenses'
+);
$array_selected=isset($_SESSION["export_selected_fields"])?$_SESSION["export_selected_fields"]:array();
$datatoexport=GETPOST("datatoexport");
diff --git a/htdocs/fourn/fiche.php b/htdocs/fourn/fiche.php
index 4142ee966e5ec45f00adb94b748f1b64eea0fa1c..6e33902453a8b45216e13a48748a7f58abf74e54 100644
--- a/htdocs/fourn/fiche.php
+++ b/htdocs/fourn/fiche.php
@@ -179,7 +179,7 @@ if ($object->fetch($id))
}
// TVA Intra
- print '<tr><td nowrap>'.$langs->trans('VATIntraVeryShort').'</td><td colspan="3">';
+ print '<tr><td nowrap>'.$langs->trans('VATIntra').'</td><td colspan="3">';
print $object->tva_intra;
print '</td></tr>';
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index f7f424ffc82b1f9ff11519534b270c0446603b4a..6fad3e67919a6aa57867d7b1aad8b50d16d80c71 100644
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -403,36 +403,36 @@ TypeContact_facture_internal_SALESREPFOLL=ممثل العميل متابعة ف
TypeContact_facture_external_BILLING=الزبون فاتورة الاتصال
TypeContact_facture_external_SHIPPING=العملاء الشحن الاتصال
TypeContact_facture_external_SERVICE=خدمة العملاء الاتصال
-TypeContact_facture_fourn_internal_SALESREPFOLL=ممثل المورد متابعة فاتورة
-TypeContact_facture_fourn_external_BILLING=المورد فاتورة الاتصال
-TypeContact_facture_fourn_external_SHIPPING=المورد الشحن الاتصال
-TypeContact_facture_fourn_external_SERVICE=المورد خدمة الاتصال
+TypeContact_invoice_supplier_internal_SALESREPFOLL=ممثل المورد متابعة فاتورة
+TypeContact_invoice_supplier_external_BILLING=المورد فاتورة الاتصال
+TypeContact_invoice_supplier_external_SHIPPING=المورد الشحن الاتصال
+TypeContact_invoice_supplier_external_SERVICE=المورد خدمة الاتصال
PDFLinceDescription=نموذج الفاتورة كاملة مع الطاقة المتجددة الاسبانية وIRPF
// STOP - Lines generated via autotranslator.php tool (2010-07-17 11:14:33).
-
-
-// START - Lines generated via autotranslator.php tool (2010-09-04 01:33:40).
-// Reference language: en_US -> ar_AR
-InvoiceReplacement=استبدال الفاتورة
-// STOP - Lines generated via autotranslator.php tool (2010-09-04 01:40:36).
-
-
-// START - Lines generated via autotranslator.php tool (2012-02-29 15:55:27).
-// Reference language: en_US -> ar_SA
-BillsCustomer=الزبون فاتورة
-BillsSuppliersUnpaidForCompany=مورد غير المسددة لفواتير %s
-BillsLate=في وقت متأخر المدفوعات
-DisabledBecauseNotErasable=تعطيل لأنه لا يمكن أن تمحى
-ConfirmUnvalidateBill=هل أنت متأكد أنك تريد تغيير <b>%s</b> فاتورة إلى وضع مشروع؟
-UnvalidateBill=Unvalidate فاتورة
-NumberOfBillsByMonth=ملحوظة من الفواتير من قبل شهر
-AmountOfBillsByMonthHT=كمية من الفواتير من قبل شهر (بعد خصم الضرائب)
-AddRelativeDiscount=خلق خصم قريب
-EditRelativelDiscount=تحرير relatvie الخصم
-EditGlobalDiscounts=تعديل الخصومات مطلق
-AddCreditNote=علما خلق الائتمان
-InvoiceNotChecked=لا فاتورة مختارة
-ShowUnpaidAll=وتظهر جميع الفواتير غير المسددة
-ClosePaidInvoicesAutomatically=تصنيف "سيولي" كل معيار أو الفواتير استبدال سيولي entierely.
-AllCompletelyPayedInvoiceWillBeClosed=كل فاتورة مع عدم وجود لا تزال لدفع ستغلق تلقائيا إلى "فياض" الوضع.
-// STOP - Lines generated via autotranslator.php tool (2012-02-29 15:56:17).
+
+
+// START - Lines generated via autotranslator.php tool (2010-09-04 01:33:40).
+// Reference language: en_US -> ar_AR
+InvoiceReplacement=استبدال الفاتورة
+// STOP - Lines generated via autotranslator.php tool (2010-09-04 01:40:36).
+
+
+// START - Lines generated via autotranslator.php tool (2012-02-29 15:55:27).
+// Reference language: en_US -> ar_SA
+BillsCustomer=الزبون فاتورة
+BillsSuppliersUnpaidForCompany=مورد غير المسددة لفواتير %s
+BillsLate=في وقت متأخر المدفوعات
+DisabledBecauseNotErasable=تعطيل لأنه لا يمكن أن تمحى
+ConfirmUnvalidateBill=هل أنت متأكد أنك تريد تغيير <b>%s</b> فاتورة إلى وضع مشروع؟
+UnvalidateBill=Unvalidate فاتورة
+NumberOfBillsByMonth=ملحوظة من الفواتير من قبل شهر
+AmountOfBillsByMonthHT=كمية من الفواتير من قبل شهر (بعد خصم الضرائب)
+AddRelativeDiscount=خلق خصم قريب
+EditRelativelDiscount=تحرير relatvie الخصم
+EditGlobalDiscounts=تعديل الخصومات مطلق
+AddCreditNote=علما خلق الائتمان
+InvoiceNotChecked=لا فاتورة مختارة
+ShowUnpaidAll=وتظهر جميع الفواتير غير المسددة
+ClosePaidInvoicesAutomatically=تصنيف "سيولي" كل معيار أو الفواتير استبدال سيولي entierely.
+AllCompletelyPayedInvoiceWillBeClosed=كل فاتورة مع عدم وجود لا تزال لدفع ستغلق تلقائيا إلى "فياض" الوضع.
+// STOP - Lines generated via autotranslator.php tool (2012-02-29 15:56:17).
diff --git a/htdocs/langs/ar_SA/ecm.lang b/htdocs/langs/ar_SA/ecm.lang
index d00207d88929541a302f9bc0ce6cdd9b8d75d482..2bd63a25d32e6cb7977dc9c594da1790d3a8a57f 100644
--- a/htdocs/langs/ar_SA/ecm.lang
+++ b/htdocs/langs/ar_SA/ecm.lang
@@ -52,7 +52,7 @@ ECMDocsByOrders=وثائق مرتبطة أوامر العملاء
ECMDocsByContracts=وثائق مرتبطة بعقود
ECMDocsByInvoices=وثائق مرتبطة عملاء الفواتير
ECMDocsByProducts=الوثائق المرتبطة بالمنتجات
-ECMNoDirecotyYet=لا الدليل
+ECMNoDirectoryYet=لا الدليل
ShowECMSection=وتظهر الدليل
DeleteSection=إزالة الدليل
ConfirmDeleteSection=يمكنك التأكد من أنك تريد حذف الدليل <b>٪ ق؟</b>
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index fa967e8461be2dd9ce9670fc137e60c7b974319e..8d21a2700d90ba0f1c9c8a9fda592c5ced9a0d91 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -382,10 +382,10 @@ TypeContact_facture_internal_SALESREPFOLL=Responsable seguiment factura a client
TypeContact_facture_external_BILLING=Contacte client facturació
TypeContact_facture_external_SHIPPING=Contacte client entregues
TypeContact_facture_external_SERVICE=Contacte client serveis
-TypeContact_facture_fourn_internal_SALESREPFOLL=Responsable seguiment factures de proveïdor
-TypeContact_facture_fourn_external_BILLING=Contacte proveïdor facturació
-TypeContact_facture_fourn_external_SHIPPING=Contacte proveïdor entregues
-TypeContact_facture_fourn_external_SERVICE=Contacte proveïdor serveis
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Responsable seguiment factures de proveïdor
+TypeContact_invoice_supplier_external_BILLING=Contacte proveïdor facturació
+TypeContact_invoice_supplier_external_SHIPPING=Contacte proveïdor entregues
+TypeContact_invoice_supplier_external_SERVICE=Contacte proveïdor serveis
# crabe PDF Model
PDFCrabeDescription=Model de factura complet (model recomanat per defecte)
# oursin PDF Model
diff --git a/htdocs/langs/ca_ES/ecm.lang b/htdocs/langs/ca_ES/ecm.lang
index 55df2e125c18666810871d48fa98d33bc29a7ee2..85a978e6001a55b371a7dd2e186f62043f5e1995 100644
--- a/htdocs/langs/ca_ES/ecm.lang
+++ b/htdocs/langs/ca_ES/ecm.lang
@@ -43,7 +43,7 @@ ECMDocsByOrders=Documents associats a comandes
ECMDocsByContracts=Documents associats a contractes
ECMDocsByInvoices=Documents associats a factures
ECMDocsByProducts=Documents enllaçats a productes
-ECMNoDirecotyYet=No s'ha creat carpeta
+ECMNoDirectoryYet=No s'ha creat carpeta
ShowECMSection=Mostrar carpeta
DeleteSection=Eliminació carpeta
ConfirmDeleteSection=Confirmeu l'eliminació de la carpeta <b>%s</b>?
diff --git a/htdocs/langs/ca_ES/mailmanspip.lang b/htdocs/langs/ca_ES/mailmanspip.lang
new file mode 100644
index 0000000000000000000000000000000000000000..11d442ca66e6c47193473cba93933ac8b29e9a38
--- /dev/null
+++ b/htdocs/langs/ca_ES/mailmanspip.lang
@@ -0,0 +1,19 @@
+# Dolibarr language file - ca_ES - mailmanspip
+CHARSET=UTF-8
+MailmanSpipSetup=Configuració del mòdul Mailman i SPIP
+MailmanTitle=Sistema de llistes de correu Mailman
+DescADHERENT_MAILMAN_LISTS=Llista (es) per a la subscripció automàtica dels nous membres (separats per comes)
+TestSubscribe=Per comprovar la subscripció a llistes Mailman
+TestUnSubscribe=Per comprovar la cancel·lació de subscripcions a llistes Mailman
+MailmanCreationSuccess=La prova de subscripció ha estat realitzada amb èxit
+MailmanDeletionSuccess=La prova de desubscripció ha estat realitzada amb èxit
+SynchroMailManEnabled=Una actualització de Mailman ha d'efectuar-se
+SynchroSpipEnabled=Una actualització de Mailman ha d'efectuar-se
+DescADHERENT_MAILMAN_ADMINPW=Contrasenya d'administrador Mailman
+DescADHERENT_MAILMAN_URL=URL per a les subscripcions Mailman
+DescADHERENT_MAILMAN_UNSUB_URL=URL per a les desubscripcions Mailman
+SPIPTitle=Sistema de gestió de continguts SPIP
+DescADHERENT_SPIP_SERVEUR=Servidor SPIP
+DescADHERENT_SPIP_DB=Nom de la base de dades d'SPIP
+DescADHERENT_SPIP_USER=Usuari de la base de dades d'SPIP
+DescADHERENT_SPIP_PASS=Contrasenya de la base de dades d'SPIP
\ No newline at end of file
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index 84fb4131547a5b24f696f0092787675d45670410..f915134e890840c93545429a5e32b458de187256 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -409,30 +409,30 @@ TypeContact_facture_internal_SALESREPFOLL=Repræsentant opfølgning kundefaktura
TypeContact_facture_external_BILLING=Kundefaktura kontakt
TypeContact_facture_external_SHIPPING=Kunde shipping kontakt
TypeContact_facture_external_SERVICE=Kundeservice kontakt
-TypeContact_facture_fourn_internal_SALESREPFOLL=Repræsentant opfølgning leverandør faktura
-TypeContact_facture_fourn_external_BILLING=Leverandør faktura kontakt
-TypeContact_facture_fourn_external_SHIPPING=Leverandør shipping kontakt
-TypeContact_facture_fourn_external_SERVICE=Leverandør service kontakt
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Repræsentant opfølgning leverandør faktura
+TypeContact_invoice_supplier_external_BILLING=Leverandør faktura kontakt
+TypeContact_invoice_supplier_external_SHIPPING=Leverandør shipping kontakt
+TypeContact_invoice_supplier_external_SERVICE=Leverandør service kontakt
PDFLinceDescription=En komplet faktura model med spanske RE og IRPF
// STOP - Lines generated via autotranslator.php tool (2010-07-17 11:20:16).
-
-
-// START - Lines generated via autotranslator.php tool (2012-02-29 15:59:19).
-// Reference language: en_US -> da_DK
-BillsCustomer=Kundens faktura
-BillsSuppliersUnpaidForCompany=Ulønnet leverandørens fakturaer for %s
-BillsLate=Forsinkede betalinger
-DisabledBecauseNotErasable=Deaktiveret, fordi kan ikke slettes
-ConfirmUnvalidateBill=Er du sikker på at du vil ændre fakturere <b>%s</b> at udarbejde status?
-UnvalidateBill=Unvalidate faktura
-NumberOfBillsByMonth=Nb af fakturaer efter måned
-AmountOfBillsByMonthHT=Mængden af fakturaer efter måned (efter skat)
-AddRelativeDiscount=Opret relative rabat
-EditRelativelDiscount=Rediger relatvie rabat
-EditGlobalDiscounts=Rediger absolutte rabatter
-AddCreditNote=Opret kreditnota
-InvoiceNotChecked=Ingen valgt faktura
-ShowUnpaidAll=Vis alle ubetalte fakturaer
-ClosePaidInvoicesAutomatically=Klassificere "betales" hele standarden eller udskiftning af fakturaer entierely betales.
-AllCompletelyPayedInvoiceWillBeClosed=Alle faktura uden mangler at betale, vil automatisk blive lukket for status "betales".
-// STOP - Lines generated via autotranslator.php tool (2012-02-29 16:00:06).
+
+
+// START - Lines generated via autotranslator.php tool (2012-02-29 15:59:19).
+// Reference language: en_US -> da_DK
+BillsCustomer=Kundens faktura
+BillsSuppliersUnpaidForCompany=Ulønnet leverandørens fakturaer for %s
+BillsLate=Forsinkede betalinger
+DisabledBecauseNotErasable=Deaktiveret, fordi kan ikke slettes
+ConfirmUnvalidateBill=Er du sikker på at du vil ændre fakturere <b>%s</b> at udarbejde status?
+UnvalidateBill=Unvalidate faktura
+NumberOfBillsByMonth=Nb af fakturaer efter måned
+AmountOfBillsByMonthHT=Mængden af fakturaer efter måned (efter skat)
+AddRelativeDiscount=Opret relative rabat
+EditRelativelDiscount=Rediger relatvie rabat
+EditGlobalDiscounts=Rediger absolutte rabatter
+AddCreditNote=Opret kreditnota
+InvoiceNotChecked=Ingen valgt faktura
+ShowUnpaidAll=Vis alle ubetalte fakturaer
+ClosePaidInvoicesAutomatically=Klassificere "betales" hele standarden eller udskiftning af fakturaer entierely betales.
+AllCompletelyPayedInvoiceWillBeClosed=Alle faktura uden mangler at betale, vil automatisk blive lukket for status "betales".
+// STOP - Lines generated via autotranslator.php tool (2012-02-29 16:00:06).
diff --git a/htdocs/langs/da_DK/ecm.lang b/htdocs/langs/da_DK/ecm.lang
index 39dcf3cb08efea5bbb10f6a8bf57e7d48376f7d9..8e7e5b6419260eb68188f52d59ee634631fdbe46 100644
--- a/htdocs/langs/da_DK/ecm.lang
+++ b/htdocs/langs/da_DK/ecm.lang
@@ -54,7 +54,7 @@ ECMDocsByOrders=Dokumenter knyttet til kundernes ordrer
ECMDocsByContracts=Dokumenter i forbindelse med kontrakter
ECMDocsByInvoices=Dokumenter knyttet til kunder fakturaer
ECMDocsByProducts=Dokumenter i tilknytning til produkter
-ECMNoDirecotyYet=Nr. bibliotek skabt
+ECMNoDirectoryYet=Nr. bibliotek skabt
ShowECMSection=Vis mappe
DeleteSection=Fjern mappe
ConfirmDeleteSection=Kan du bekræfte, at du ønsker at slette den <b>mappe %s?</b>
diff --git a/htdocs/langs/de_AT/bills.lang b/htdocs/langs/de_AT/bills.lang
index d5bb8e05518c4baf92e9bb30eb1572e6807d004a..bde2ce665ac4c5d244b47de141f90703621f85a7 100644
--- a/htdocs/langs/de_AT/bills.lang
+++ b/htdocs/langs/de_AT/bills.lang
@@ -390,8 +390,8 @@ TypeContact_facture_internal_SALESREPFOLL=Repräsentative Follow-up Debitorenrec
TypeContact_facture_external_BILLING=Debitorenrechnung Kontakt
TypeContact_facture_external_SHIPPING=Customer Versand Kontakt
TypeContact_facture_external_SERVICE=Kundenservice kontaktieren
-TypeContact_facture_fourn_internal_SALESREPFOLL=Repräsentative Follow-up Lieferantenrechnung
-TypeContact_facture_fourn_external_BILLING=Lieferantenrechnung Kontakt
-TypeContact_facture_fourn_external_SHIPPING=Supplier Versand Kontakt
-TypeContact_facture_fourn_external_SERVICE=Supplier Service Kontakt
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Repräsentative Follow-up Lieferantenrechnung
+TypeContact_invoice_supplier_external_BILLING=Lieferantenrechnung Kontakt
+TypeContact_invoice_supplier_external_SHIPPING=Supplier Versand Kontakt
+TypeContact_invoice_supplier_external_SERVICE=Supplier Service Kontakt
PDFLinceDescription=Eine vollständige Rechnung Modell mit spanischen und RE IRPF
diff --git a/htdocs/langs/de_AT/ecm.lang b/htdocs/langs/de_AT/ecm.lang
index 9996d2a98c1618a379e948016a53749f5ab68c6d..7f91a7c49bf278b792a2d391b3cd22444cf273ca 100644
--- a/htdocs/langs/de_AT/ecm.lang
+++ b/htdocs/langs/de_AT/ecm.lang
@@ -49,7 +49,7 @@ ECMDocsByOrders=Mit Kundenaufträgen verknüpfte Dokumente
ECMDocsByContracts=Mit Verträgen verknüpfte Dokumente
ECMDocsByInvoices=Mit Kundenrechnungen verknüpfte Dokumente
ECMDocsByProducts=Mit Produkten verknüpfte Dokumente
-ECMNoDirecotyYet=Noch kein Verzeichnis erstellt
+ECMNoDirectoryYet=Noch kein Verzeichnis erstellt
ShowECMSection=Zeige Verzeichnis
DeleteSection=Lösche Verzeichnis
ConfirmDeleteSection=Möchten Sie das Verzeichnis <b>%s</b> wirklich löschen?
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index 92d53ef69e371e92439c118d71eecdc078101423..924d3a95b79fa438585a0d20ba503dd8e9312ec0 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -383,10 +383,10 @@ TypeContact_facture_internal_SALESREPFOLL=Repräsentative Follow-up Kundenrechnu
TypeContact_facture_external_BILLING=Kundenrechnung Kontakt
TypeContact_facture_external_SHIPPING=Kundenversand Kontakt
TypeContact_facture_external_SERVICE=Kundenservice Kontakt
-TypeContact_facture_fourn_internal_SALESREPFOLL=Repräsentative Follow-up Lieferantenrechnung
-TypeContact_facture_fourn_external_BILLING=Lieferantenrechnung Kontakt
-TypeContact_facture_fourn_external_SHIPPING=Lieferantenversand Kontakt
-TypeContact_facture_fourn_external_SERVICE=Lieferantenservice Kontakt
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Repräsentative Follow-up Lieferantenrechnung
+TypeContact_invoice_supplier_external_BILLING=Lieferantenrechnung Kontakt
+TypeContact_invoice_supplier_external_SHIPPING=Lieferantenversand Kontakt
+TypeContact_invoice_supplier_external_SERVICE=Lieferantenservice Kontakt
# crabe PDF Model
PDFCrabeDescription=Rechnung Modell Crabe. Eine vollständige Rechnung Modell (Empfohlene Vorlage)
# oursin PDF Model
diff --git a/htdocs/langs/de_DE/ecm.lang b/htdocs/langs/de_DE/ecm.lang
index 9ec40b46bbd2aa2f7e8afc8befa73a05a4dc71c1..d45a7603c9f29c956f4134cf45ee0f56937ae5a3 100644
--- a/htdocs/langs/de_DE/ecm.lang
+++ b/htdocs/langs/de_DE/ecm.lang
@@ -50,7 +50,7 @@ ECMDocsByOrders=Mit Kundenaufträgen verknüpfte Dokumente
ECMDocsByContracts=Mit Verträgen verknüpfte Dokumente
ECMDocsByInvoices=Mit Kundenrechnungen verknüpfte Dokumente
ECMDocsByProducts=Mit Produkten verknüpfte Dokumente
-ECMNoDirecotyYet=Noch kein Verzeichnis erstellt
+ECMNoDirectoryYet=Noch kein Verzeichnis erstellt
ShowECMSection=Zeige Verzeichnis
DeleteSection=Lösche Verzeichnis
ConfirmDeleteSection=Möchten Sie das Verzeichnis <b>%s</b> wirklich löschen?
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index 6916832a169da10caf0f0e0c05aef897eaf6d444..5b0fc47eb7e12651527ae3b3307c94f740ed437c 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -361,10 +361,10 @@ TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer i
TypeContact_facture_external_BILLING=Αντιπρόσωπος τιμολογίου πελάτη
TypeContact_facture_external_SHIPPING=Αντιπρόσωπος αποστολής πελάτη
TypeContact_facture_external_SERVICE=Αντιπρόσωπος υπηρεσίας πελάτη
-TypeContact_facture_fourn_internal_SALESREPFOLL=Representative following-up supplier invoice
-TypeContact_facture_fourn_external_BILLING=Αντιπρόσωπος τιμολογίου προμηθευτή
-TypeContact_facture_fourn_external_SHIPPING=Αντιπρόσωπος αποστολής προμηθευτή
-TypeContact_facture_fourn_external_SERVICE=Αντιπρόσωπος υπηρεσίας προμηθευτή
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up supplier invoice
+TypeContact_invoice_supplier_external_BILLING=Αντιπρόσωπος τιμολογίου προμηθευτή
+TypeContact_invoice_supplier_external_SHIPPING=Αντιπρόσωπος αποστολής προμηθευτή
+TypeContact_invoice_supplier_external_SERVICE=Αντιπρόσωπος υπηρεσίας προμηθευτή
=
=
# oursin PDF model
@@ -413,31 +413,31 @@ TitanNumRefModelDesc3=Define the variable SOCIETE_FISCAL_MONTH_START with the mo
TitanNumRefModelDesc4=In this example, we shall have on the 1st September 2006 an invoice named FA0700001
# pluton
PlutonNumRefModelDesc1=Return a customizable invoice number according to a defined mask.
-
-
-// START - Lines generated via autotranslator.php tool (2011-06-26 15:35:22).
-// Reference language: en_US -> el_GR
-BillsCustomer=Τιμολόγιο του Πελάτη
-BillsSuppliersUnpaidForCompany=Απλήρωτα τιμολόγια προμηθευτή για %s
-BillsLate=Η καθυστέρηση των πληρωμών
-DisabledBecauseNotErasable=Άτομα με ειδικές ανάγκες, επειδή δεν μπορούν να διαγραφούν
-NumberOfBillsByMonth=Nb των τιμολογίων ανά μήνα
-AmountOfBillsByMonthHT=Ποσό των τιμολογίων ανά μήνα (μετά από φόρους)
-AddDiscount=Δημιουργία απόλυτη έκπτωση
+
+
+// START - Lines generated via autotranslator.php tool (2011-06-26 15:35:22).
+// Reference language: en_US -> el_GR
+BillsCustomer=Τιμολόγιο του Πελάτη
+BillsSuppliersUnpaidForCompany=Απλήρωτα τιμολόγια προμηθευτή για %s
+BillsLate=Η καθυστέρηση των πληρωμών
+DisabledBecauseNotErasable=Άτομα με ειδικές ανάγκες, επειδή δεν μπορούν να διαγραφούν
+NumberOfBillsByMonth=Nb των τιμολογίων ανά μήνα
+AmountOfBillsByMonthHT=Ποσό των τιμολογίων ανά μήνα (μετά από φόρους)
+AddDiscount=Δημιουργία απόλυτη έκπτωση
AddGlobalDiscount=Προσθήκη έκπτωσης
-AddCreditNote=Δημιουργία πιστωτικό σημείωμα
-InvoiceNotChecked=Δεν έχει επιλεγεί τιμολόγιο
-ShowUnpaidAll=Εμφάνιση όλων των απλήρωτων τιμολογίων
-ClosePaidInvoicesAutomatically=Ταξινομήστε "Πληρωμένες» όλα τα τιμολόγια entierely payed.
-AllCompletelyPayedInvoiceWillBeClosed=Όλα τιμολόγιο χωρίς παραμένουν να πληρώσουν θα κλείσει αυτόματα σε κατάσταση "Πληρωμένες».
-// STOP - Lines generated via autotranslator.php tool (2011-06-26 15:36:46).
-
-
-// START - Lines generated via autotranslator.php tool (2012-02-29 16:06:57).
-// Reference language: en_US -> el_GR
-ConfirmUnvalidateBill=Είστε βέβαιοι ότι θέλετε να αλλάξετε τιμολόγιο <b>%s</b> το καθεστώς σχέδιο;
-UnvalidateBill=Unvalidate τιμολόγιο
-AddRelativeDiscount=Δημιουργία σχετική έκπτωση
-EditRelativelDiscount=Επεξεργασία relatvie έκπτωση
-EditGlobalDiscounts=Επεξεργασία απόλυτη εκπτώσεις
-// STOP - Lines generated via autotranslator.php tool (2012-02-29 16:07:37).
+AddCreditNote=Δημιουργία πιστωτικό σημείωμα
+InvoiceNotChecked=Δεν έχει επιλεγεί τιμολόγιο
+ShowUnpaidAll=Εμφάνιση όλων των απλήρωτων τιμολογίων
+ClosePaidInvoicesAutomatically=Ταξινομήστε "Πληρωμένες» όλα τα τιμολόγια entierely payed.
+AllCompletelyPayedInvoiceWillBeClosed=Όλα τιμολόγιο χωρίς παραμένουν να πληρώσουν θα κλείσει αυτόματα σε κατάσταση "Πληρωμένες».
+// STOP - Lines generated via autotranslator.php tool (2011-06-26 15:36:46).
+
+
+// START - Lines generated via autotranslator.php tool (2012-02-29 16:06:57).
+// Reference language: en_US -> el_GR
+ConfirmUnvalidateBill=Είστε βέβαιοι ότι θέλετε να αλλάξετε τιμολόγιο <b>%s</b> το καθεστώς σχέδιο;
+UnvalidateBill=Unvalidate τιμολόγιο
+AddRelativeDiscount=Δημιουργία σχετική έκπτωση
+EditRelativelDiscount=Επεξεργασία relatvie έκπτωση
+EditGlobalDiscounts=Επεξεργασία απόλυτη εκπτώσεις
+// STOP - Lines generated via autotranslator.php tool (2012-02-29 16:07:37).
diff --git a/htdocs/langs/el_GR/ecm.lang b/htdocs/langs/el_GR/ecm.lang
index d306bdf1ae9ce14a3ce11eeb8869da5380bc3eab..9de6b3892ba64ad34d956b3afb6c058ecd5e3921 100644
--- a/htdocs/langs/el_GR/ecm.lang
+++ b/htdocs/langs/el_GR/ecm.lang
@@ -42,7 +42,7 @@ ECMDocsByOrders=Έγγραφα συνδεδεμένα με παραγγελίε
ECMDocsByContracts=Έγγραφα συνδεδεμένα με συμβόλαια
ECMDocsByInvoices=Έγγραφα συνδεδεμένα με τιμολόγια πελατών
ECMDocsByProducts=Έγγραφα συνδεδεμένα με προϊόντα
-ECMNoDirecotyYet=Δεν δημιουργήθηκε φάκελος
+ECMNoDirectoryYet=Δεν δημιουργήθηκε φάκελος
ShowECMSection=Εμφάνιση φακέλου
DeleteSection=Διαγραφή φακέλου
ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b> ?
@@ -50,9 +50,9 @@ ECMDirectoryForFiles=Relative directory for files
CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
ECMFileManager=Διαχειριστής Αρχείων
ECMSelectASection=Select a directory on left tree...
-
-
-// START - Lines generated via autotranslator.php tool (2011-06-26 15:35:22).
-// Reference language: en_US -> el_GR
-ECMDocsByProposals=Έγγραφα που σχετίζονται με τις προτάσεις
-// STOP - Lines generated via autotranslator.php tool (2011-06-26 15:37:32).
+
+
+// START - Lines generated via autotranslator.php tool (2011-06-26 15:35:22).
+// Reference language: en_US -> el_GR
+ECMDocsByProposals=Έγγραφα που σχετίζονται με τις προτάσεις
+// STOP - Lines generated via autotranslator.php tool (2011-06-26 15:37:32).
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 7b9781d26df93b16de55677116ba8dad2ca83cdd..ac8fcccfb3a3db76ff3d1c810476b6499e33b599 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -650,7 +650,7 @@ Permission2501=Read/Download documents
Permission2502=Download documents
Permission2503=Submit or delete documents
Permission2515=Setup documents directories
-Permission50001=Use Point of sales
+Permission50101=Use Point of sales
Permission50201= Read transactions
Permission50202= Import transactions
DictionnaryCompanyType=Company types
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index acb4c6e192377a6a90a53244abf4e5a051b947b8..a93dd9c4a99b49a33c672613f973b406c4f66a8a 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -383,10 +383,10 @@ TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer i
TypeContact_facture_external_BILLING=Customer invoice contact
TypeContact_facture_external_SHIPPING=Customer shipping contact
TypeContact_facture_external_SERVICE=Customer service contact
-TypeContact_facture_fourn_internal_SALESREPFOLL=Representative following-up supplier invoice
-TypeContact_facture_fourn_external_BILLING=Supplier invoice contact
-TypeContact_facture_fourn_external_SHIPPING=Supplier shipping contact
-TypeContact_facture_fourn_external_SERVICE=Supplier service contact
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up supplier invoice
+TypeContact_invoice_supplier_external_BILLING=Supplier invoice contact
+TypeContact_invoice_supplier_external_SHIPPING=Supplier shipping contact
+TypeContact_invoice_supplier_external_SERVICE=Supplier service contact
# crabe PDF Model
PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (Template recommanded)
# oursin PDF Model
diff --git a/htdocs/langs/en_US/dict.lang b/htdocs/langs/en_US/dict.lang
index 7db388745c675e25679b7aa1e1a0e50b7d24b012..e92698c1335a4093190b3da2a3cfeab47ffbfba7 100644
--- a/htdocs/langs/en_US/dict.lang
+++ b/htdocs/langs/en_US/dict.lang
@@ -252,6 +252,7 @@ CivilityMME=Mrs.
CivilityMR=Mr.
CivilityMLE=Ms.
CivilityMTRE=Master
+CivilityDR=Doctor
##### Currencies #####
Currencyeuros=Euros
diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang
index 1519bf6c8fd2bcc4dd6318b7a785ef5d96f90fe3..8e754b080b0d124e3194e671695529183e01c90e 100644
--- a/htdocs/langs/en_US/ecm.lang
+++ b/htdocs/langs/en_US/ecm.lang
@@ -43,7 +43,7 @@ ECMDocsByOrders=Documents linked to customers orders
ECMDocsByContracts=Documents linked to contracts
ECMDocsByInvoices=Documents linked to customers invoices
ECMDocsByProducts=Documents linked to products
-ECMNoDirecotyYet=No directory created
+ECMNoDirectoryYet=No directory created
ShowECMSection=Show directory
DeleteSection=Remove directory
ConfirmDeleteSection=Can you confirm you want to delete the directory <b>%s</b> ?
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index c8afa127767eba24f3d2b0833c4fd3ed221c21d6..6b9885eb4cb7f5848268a7fb35e4f4a1cf5ceda5 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -109,7 +109,7 @@ ErrNoZipEngine=No engine to unzip %s file in this PHP
ErrorFileMustBeADolibarrPackage=The file %s must be a Dolibarr zip package
ErrorFileRequired=It takes a package Dolibarr file
ErrorPhpCurlNotInstalled=The PHP CURL is not installed, this is essential to talk with Paypal
-ErrorFailedToAddToMailmanList=Failed to add record to Mailman list or Spip base
+ErrorFailedToAddToMailmanList=Failed to add record to Mailman list or SPIP base
# Warnings
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang
index d7bd3bfd85e310021c8c4baf41a52da772c304c6..f8bae40357719e46561be0c055cdb95ce464288c 100644
--- a/htdocs/langs/en_US/exports.lang
+++ b/htdocs/langs/en_US/exports.lang
@@ -112,4 +112,7 @@ SourceExample=Example of possible data value
ExampleAnyRefFoundIntoElement=Any ref found for element <b>%s</b>
ExampleAnyCodeOrIdFoundIntoDictionnary=Any code (or id) found into dictionnary <b>%s</b>
CSVFormatDesc=<b>Comma Separated Value</b> file format (.csv).<br>This is a text file format where fields are separated by separator [ %s ]. If separator is found inside a field content, field is rounded by round character [ %s ]. Escape character to escape round character is [ %s ].
+Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is native Excel 95 format (BIFF5).
+Excel2007FormatDesc=<b>Excel</b> file format (.xlsx)<br>This is native Excel 2007 format (SpreadsheetML).
+TsvFormatDesc=<b>Tab Separated Value</b> file format (.tsv)<br>This is a text file format where fields are separated by a tabulator [tab].
ExportFieldAutomaticallyAdded=Field <b>%s</b> was automatically added. It will avoid you to have similar lines to be treated as duplicate records (with this field added, all ligne will own its own id and will differ).
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index bbd5697de4d9fa5f385b00a63cb9e1e670ff310d..61932489271e0bb18a741953dcf167cc6f6df3ce 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -131,6 +131,7 @@ SystemInfo=Info. sistema
SystemTools=Utilidades sistema
SystemToolsArea=Área utilidades del sistema
SystemToolsAreaDesc=Esta área ofrece distintas funciones de administración. Utilice la menú para elegir la funcionalidad buscada.
+Purge=Purgar
PurgeAreaDesc=Esta página le permite eliminar todos los archivos creados o guardados por Dolibarr (archivos temporales o todos los archivos del directorio <b>%s</b>). El uso de esta función no es necesaria. Se proporciona para los usuarios que albergan a Dolibarr en un servidor que no ofrece los permisos de eliminación de archivos salvaguardados por el servidor Web.
PurgeDeleteLogFile=Borrar el archivo log <b>%s</b> definido por el módulo Syslog (no hay riesgo de pérdida de datos)
PurgeDeleteTemporaryFiles=Eliminar todos los archivos temporales (sin riesgo de perdida de datos)
@@ -183,7 +184,7 @@ AutoDetectLang=Autodetección (navegador)
FeatureDisabledInDemo=Opción deshabilitada en demo
Rights=Permisos
BoxesDesc=Los paneles son pequeñas zonas de información que se muestran en algunas páginas. Puede elegir activar o desactivar un panel haciendo clic en 'Activar', o haciendo click en el cubo de basura para desactivarlo. Solo se muestran los paneles relacionados con un <a href="modules.php">módulo</a> activo.
-OnlyActiveElementsAreShown=Sólo los elementos de <a href="%s">módulos activados</a> son mostrados
+OnlyActiveElementsAreShown=Sólo los elementos de <a href="%s">módulos activados</a> son mostrados.
ModulesDesc=Los módulos Dolibarr definen las funcionalidades disponibles en la aplicación. Algunos módulos requieren derechos que deberán indicarse a los usuarios para que puedan acceder a sus funcionalidades.
ModulesInterfaceDesc=Los módulos de interfaz son módulos que permiten vincular a Dolibarr con sistemas, aplicaciones o servicios externos.
ModulesSpecialDesc=Los módulos complementarios son módulos de uso muy específico o menos corriente que los módulos normales.
@@ -277,7 +278,7 @@ YouCanSubmitFile=Seleccione paquete:
CurrentVersion=Versión actual de Dolibarr
CallUpdatePage=Llamar a la página de actualización de la estructura y datos de la base de datos %s.
LastStableVersion=Última versión estable disponible
-GenericMaskCodes=Puede introducir cualquier máscara numérica. En esta máscara, puede utilizar las siguientes etiquetas:<br><b>{000000} </b> corresponde a un número que se incrementa en cada uno de %s. Introduzca tantos ceros como longitud desee mostrar. El contador se completará a partir de ceros por la izquierda con el fin de tener tantos ceros como la máscara. <br> <b> {000000+000}</ b> Igual que el anterior, con una compensación correspondiente al número a la derecha del signo + se aplica a partir del primer %s. <br> <b> {000000@x}</b> igual que el anterior, pero el contador se restablece a cero cuando se llega a x meses (x entre 1 y 12). Si esta opción se utiliza y x es de 2 o superior, entonces la secuencia{yy}{mm} ou {yyyy}{mm} también es necesaria. <br> <b> {dd} </b> días (01 a 31). <br><b> {mm}</b> mes (01 a 12). <br><b>{yy}</b>, <b>{yyyy}</b> ou <b>{y}</b> año en 2, 4 ó 1 cifra.<br>
+GenericMaskCodes=Puede introducir cualquier máscara numérica. En esta máscara, puede utilizar las siguientes etiquetas:<br><b>{000000} </b> corresponde a un número que se incrementa en cada uno de %s. Introduzca tantos ceros como longitud desee mostrar. El contador se completará a partir de ceros por la izquierda con el fin de tener tantos ceros como la máscara. <br> <b> {000000+000}</ b> Igual que el anterior, con una compensación correspondiente al número a la derecha del signo + se aplica a partir del primer %s. <br> <b> {000000@x}</b> igual que el anterior, pero el contador se restablece a cero cuando se llega a x meses (x entre 1 y 12). Si esta opción se utiliza y x es de 2 o superior, entonces la secuencia {yy}{mm} o {yyyy}{mm} también es necesaria. <br> <b> {dd} </b> días (01 a 31). <br><b> {mm}</b> mes (01 a 12). <br><b>{yy}</b>, <b>{yyyy}</b> ou <b>{y}</b> año en 2, 4 ó 1 cifra.<br>
GenericMaskCodes2=<b>{cccc}</b> el código de cliente en n caracteres<br><b>{cccc000}</b> el código de cliente en n caracteres es seguido por un contador propio al cliente sin offset, completado con ceros hasta completar la máscara, y volviendo a cero al mismo tiempo que el contador global.<br><b>{tttt}</b>El código del tipo de la empresa en n caracteres (ver diccionarios-tipos de empresas).<br>
GenericMaskCodes3=Cualquier otro carácter en la máscara se quedará sin cambios. <br>No se permiten espacios <br>
GenericMaskCodes4a=<u>Ejemplo en la 99 ª %s del tercero La Empresa realizada el 31/03/2007: </u><br>
@@ -311,7 +312,7 @@ FollowingSubstitutionKeysCanBeUsed=Colocando los siguientes tags en la plantilla
FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Crear_un_modelo_de_documento_ODT
FirstnameNamePosition=Orden visualización nombre/apellidos
DescWeather=Los siguientes gráficos se mostrarán en el panel si el número de elementos llegan a estos valores:
-KeyForWebServicesAccess=clave para usar los Web Services (parámetro "dolibarrkey" en webservices)
+KeyForWebServicesAccess=Clave para usar los Web Services (parámetro "dolibarrkey" en webservices)
TestSubmitForm=Formulario de pruebas
ThisForceAlsoTheme=Usar este gestor de menús predetermina también el tema, sea cual sea la elección del usuario. Además, este gestor de menús, especial para smartphones, solamente funciona en algunos teléfonos. Use otro gestor si observa cualquier problema.
ThemeDir=Directorio de los temas
@@ -380,7 +381,7 @@ Module59Name=Bookmark4u
Module59Desc=Añade función para generar una cuenta Bookmark4u desde una cuenta Dolibarr
Module70Name=Intervenciones
Module70Desc=Gestión de las intervenciones a terceros
-Module75Name=Notas de gastos y desplazamientos
+Module75Name=Notas de gasto y desplazamientos
Module75Desc=Gestión de las notas de gastos y desplazamientos
Module80Name=Expediciones
Module80Desc=Gestión de expediciones y recepciones
@@ -391,7 +392,7 @@ Module100Desc=Incluye cualquier sitio web externo en los menús de Dolibarr, vi
Module105Name=Mailman y SPIP
Module105Desc=Interfaz con Mailman o SPIP para el módulo Miembros
Module200Name=LDAP
-Module200Desc=Sincronización con un anuario LDAP
+Module200Desc=Sincronización con un directorio LDAP
Module210Name=PostNuke
Module210Desc=Integración con PostNuke
Module240Name=Exportaciones de datos
@@ -661,7 +662,7 @@ Permission2501=Consultar/Recuperar documentos
Permission2502=Recuperar documentos
Permission2503=Enviar o eliminar documentos
Permission2515=Configuración directorios de documentos
-Permission50001=Usar TPV
+Permission50101=Usar TPV
Permission50201=Consultar las transacciones
Permission50202=Importar las transacciones
DictionnaryCompanyType=Tipos de empresa
@@ -669,9 +670,9 @@ DictionnaryCompanyJuridicalType=Formas jurídicas
DictionnaryProspectLevel=Perspectiva nivel cliente potencial
DictionnaryCanton=Departamentos/Provincias/Zonas
DictionnaryRegion=Regiones
-DictionnaryCountry=Paises
+DictionnaryCountry=Países
DictionnaryCurrency=Monedas
-DictionnaryCivility=Título cortesía
+DictionnaryCivility=Títulos de cortesía
DictionnaryActions=Tipos de eventos de la agenda
DictionnarySocialContributions=Tipos de cargas sociales
DictionnaryVAT=Tasa de IVA (Impuesto sobre ventas en EEUU)
@@ -679,11 +680,11 @@ DictionnaryPaymentConditions=Condiciones de pago
DictionnaryPaymentModes=Modos de pago
DictionnaryTypeContact=Tipos de contactos/direcciones
DictionnaryEcotaxe=Baremos CEcoParticipación (DEEE)
-DictionnaryPaperFormat=Formatos papel
-DictionnaryFees=Tipo de desplazamientos y honorarios
+DictionnaryPaperFormat=Formatos de papel
+DictionnaryFees=Tipos de desplazamientos y honorarios
DictionnarySendingMethods=Métodos de expedición
DictionnaryStaff=Empleados
-DictionnaryAvailability=Tiempo de entrega
+DictionnaryAvailability=Tiempos de entrega
DictionnaryOrderMethods=Métodos de pedido
DictionnarySource=Orígenes de presupuestos/pedidos
SetupSaved=Configuración guardada
@@ -834,7 +835,7 @@ TriggerDisabledAsModuleDisabled=Triggers de este archivo desactivados ya que el
TriggerAlwaysActive=Triggers de este archivo siempre activos, ya que los módulos Dolibarr relacionados están activados
TriggerActiveAsModuleActive=Triggers de este archivo activos ya que el módulo <b>%s</b> está activado
GeneratedPasswordDesc=Indique aquí que norma quiere utilizar para generar las contraseñas cuando quiera generar una nueva contraseña
-DictionnaryDesc=Indique aquí los datos de referencia. Puede completar/modificar los datos predefinidos con los suyos
+DictionnaryDesc=Indique aquí los datos de referencia. Puede completar/modificar los datos predefinidos con los suyos.
ConstDesc=Cualquier otro parámetro no editable en las páginas anteriores
OnceSetupFinishedCreateUsers=Atención, está bajo una cuenta de administrador de Dolibarr. Los administradores se utilizan para configurar a Dolibarr. Para un uso corriente de Dolibarr, se recomienda utilizar una cuenta no administrador creada desde el menú "Usuarios y grupos"
MiscellanousDesc=Defina aquí los otros parámetros relacionados con la seguridad.
@@ -871,7 +872,7 @@ ShowProfIdInAddress=Mostrar el identificador profesional en las direcciones de l
TranslationUncomplete=Traducción parcial
SomeTranslationAreUncomplete=Algunos idiomas están traducidos en parte o pueden contener errores. Si lo encuentra, puede corregir los archivos de texto <b>.lang</b> del directorio <b>htdocs/langs</b> y enviarlos al foro <a href="http://www.dolibarr.fr/forum" target="_blank">http://www.dolibarr.fr</a>.
MenuUseLayout=Hacer el menú izquierdo ocultable (la opción javascript no debería deshabilitarse)
-MAIN_DISABLE_METEO=Deshabilitar la vista meteo
+MAIN_DISABLE_METEO=Deshabilitar la vista meteorológica
TestLoginToAPI=Comprobar conexión a la API
ProxyDesc=Algunas de las características de Dolibarr requieren que el servidor tenga acceso a Internet. Defina aqui los parámetros para dicho acceso. Si el servidor está detrás de un proxy, estos parámetros indican a Dolibarr cómo pasarlo.
ExternalAccess=Acceso externo
@@ -880,7 +881,7 @@ MAIN_PROXY_HOST=Nombre/Dirección del servidor proxy
MAIN_PROXY_PORT=Puerto del servidor proxy
MAIN_PROXY_USER=Login del servidor proxy
MAIN_PROXY_PASS=Contraseña del servidor proxy
-DefineHereComplementaryAttributes=Defina aquí la lista de atributos adicionales, no disponibles en estándar, y que desea gestionar para %s.
+DefineHereComplementaryAttributes=Defina aquí la lista de atributos adicionales, no disponibles por defecto, y que desea gestionar para %s.
ExtraFields=Atributos adicionales
ExtraFieldHasWrongValue=El atributo %s tiene un valor incorrecto.
AlphaNumOnlyCharsAndNoSpace=solamente caracteres alfanuméricos sin espacios
@@ -906,7 +907,7 @@ DisableForgetPasswordLinkOnLogonPage=No mostrar el vínculo "Contraseña olvidad
UsersSetup=Configuración del módulo usuarios
UserMailRequired=E-Mail necesario para crear un usuario nuevo
##### Company setup #####
-CompanySetup=Configuración del módulo empresas
+CompanySetup=Configuración del módulo terceros
CompanyCodeChecker=Módulo de generación y control de los códigos de terceros (clientes/proveedores)
AccountCodeManager=Módulo de generación de los códigos contables (clientes/proveedores)
ModuleCompanyCodeAquarium=Devuelve un código contable compuesto de<br>%s seguido del código tercero de proveedor para el código contable de proveedor,<br>%s seguido del código tercero de cliente para el código contable de cliente.
@@ -1148,6 +1149,8 @@ UseSearchToSelectProduct=Utilizar un formulario de búsqueda para la selección
UseEcoTaxeAbility=Asumir ecotasa (DEEE)
SetDefaultBarcodeTypeProducts=Tipo de código de barras utilizado por defecto para los productos
SetDefaultBarcodeTypeThirdParties=Tipo de código de barras utilizado por defecto para los terceros
+ProductCodeChecker=Módulo para la generación y comprobación del código de un producto o servicio
+ProductOtherConf=Configuración de productos/servicios
##### Syslog #####
SyslogSetup=Configuración del módulo Syslog
SyslogOutput=Salida del log
diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang
index 5ac9113c3a2cc6453191a9267fd63319c2f0303c..c5453132c1fb3e5d9c86ac065dbad2038e47099d 100644
--- a/htdocs/langs/es_ES/banks.lang
+++ b/htdocs/langs/es_ES/banks.lang
@@ -137,7 +137,7 @@ PaymentNumberUpdateFailed=Numero de pago no pudo ser modificado
PaymentDateUpdateSucceeded=Fecha de pago modificada
PaymentDateUpdateFailed=Fecha de pago no pudo ser modificada
Transactions=Transacciones
-BankTransactionLine=Transancción bancaria
+BankTransactionLine=Transacción bancaria
AllAccounts=Todas las cuentas bancarias/de caja
BackToAccount=Volver a la cuenta
ShowAllAccounts=Mostrar para todas las cuentas
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index 2f65ee241ec0c319d1cfdcd066ba251fbf27b81d..18be5b85314e3b2d194f2f6fe1840b9701c35d55 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -11,8 +11,8 @@ BillsSuppliersUnpaid=Facturas de proveedores pendientes de pago
BillsSuppliersUnpaidForCompany=Facturas de proveedores pendientes de pago de %s
BillsUnpaid=Pendientes de pago
BillsLate=Retraso en el pago
-BillsStatistics=Estadísticas facturas a clientes
-BillsStatisticsSuppliers=Estadísticas facturas de proveedores
+BillsStatistics=Estadísticas de facturas a clientes
+BillsStatisticsSuppliers=Estadísticas de facturas de proveedores
DisabledBecauseNotErasable=Desactivado por no ser eliminable
InvoiceStandard=Factura estándar
InvoiceStandardAsk=Factura estándar
@@ -22,7 +22,7 @@ InvoiceProFormaAsk=Factura pro-forma
InvoiceProFormaDesc=La <b>factura pro-forma</b> es la imagen de una factura definitiva, pero que no tiene ningún valor contable.
InvoiceReplacement=Factura rectificativa
InvoiceReplacementAsk=Factura rectificativa de la factura
-InvoiceReplacementDesc=La <b>factura rectificativa</b> sirve para cancelar y para sustituir una factura existente sobre la que aún no hay pagos.<br><br>Nota: Sólo una factura sin ningún pago puede rectificarse. Si esta última no está cerrada, pasará automáticamente al estado'abandonada'.
+InvoiceReplacementDesc=La <b>factura rectificativa</b> sirve para cancelar y para sustituir una factura existente sobre la que aún no hay pagos.<br><br>Nota: Sólo una factura sin ningún pago puede rectificarse. Si esta última no está cerrada, pasará automáticamente al estado 'abandonada'.
InvoiceAvoir=Abono
InvoiceAvoirAsk=Abono para corregir la factura
InvoiceAvoirDesc=El <b>abono</b> es una factura negativa destinada a compensar un importe de factura que difiere del importe realmente pagado (por haber pagado de más o por devolución de productos, por ejemplo).
@@ -382,10 +382,10 @@ TypeContact_facture_internal_SALESREPFOLL=Responsable seguimiento factura a clie
TypeContact_facture_external_BILLING=Contacto cliente facturación
TypeContact_facture_external_SHIPPING=Contacto cliente entregas
TypeContact_facture_external_SERVICE=Contacto cliente servicios
-TypeContact_facture_fourn_internal_SALESREPFOLL=Responsable seguimiento facturas de proveedor
-TypeContact_facture_fourn_external_BILLING=Contacto proveedor facturación
-TypeContact_facture_fourn_external_SHIPPING=Contacto proveedor entregas
-TypeContact_facture_fourn_external_SERVICE=Contacto proveedor servicios
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Responsable seguimiento facturas de proveedor
+TypeContact_invoice_supplier_external_BILLING=Contacto proveedor facturación
+TypeContact_invoice_supplier_external_SHIPPING=Contacto proveedor entregas
+TypeContact_invoice_supplier_external_SERVICE=Contacto proveedor servicios
# crabe PDF Model
PDFCrabeDescription=Modelo de factura completo (modelo recomendado por defecto)
# oursin PDF Model
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index ebc12b3171246330823243e149fc927e69e5d192..1420452207cf0814150004eff34f3a7850e45d75 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -58,8 +58,8 @@ Name=Nombre
Lastname=Apellidos
Firstname=Nombre
PostOrFunction=Puesto/función
-UserTitle=Título cortesía
-Surname=Pseudonimo
+UserTitle=Título de cortesía
+Surname=Seudónimo
Address=Dirección
State=Provincia
Region=Región
@@ -306,10 +306,10 @@ PL_LOW=Bajo
PL_MEDIUM=Medio
PL_HIGH=Alto
TE_UNKNOWN=-
-TE_STARTUP=Pequeña
+TE_STARTUP=Startup
TE_GROUP=Gran empresa
TE_MEDIUM=PYME
-TE_ADMIN=Adminstracción
+TE_ADMIN=Administración
TE_SMALL=TPE
TE_RETAIL=Minorista
TE_WHOLE=Mayorista
diff --git a/htdocs/langs/es_ES/deliveries.lang b/htdocs/langs/es_ES/deliveries.lang
index 62824ebf1e6e0de47defb10fdc1477f7edcb3e79..6f0a6f1b78cb8100f4778b6efa88f0eee101fce9 100644
--- a/htdocs/langs/es_ES/deliveries.lang
+++ b/htdocs/langs/es_ES/deliveries.lang
@@ -15,7 +15,7 @@ ValidateDeliveryReceiptConfirm=¿Está seguro de que desea validar esta entrega?
DeleteDeliveryReceipt=Eliminar la nota de entrega
DeleteDeliveryReceiptConfirm=¿Está seguro de querer eliminar esta nota de entrega?
DeliveryMethod=Método de envío
-TrackingNumber=Nº de tracking
+TrackingNumber=Nº de seguimiento
DeliveryNotValidated=Nota de recepción no validada
# merou PDF model
NameAndSignature=Nombre y firma :
diff --git a/htdocs/langs/es_ES/dict.lang b/htdocs/langs/es_ES/dict.lang
index f100321c9156481abeaaec93051cdbc4e63a3a54..a6e34bdf173baf6e096bfbec0bd6f3732de88021 100644
--- a/htdocs/langs/es_ES/dict.lang
+++ b/htdocs/langs/es_ES/dict.lang
@@ -252,6 +252,7 @@ CivilityMME=Señora
CivilityMR=Señor
CivilityMLE=Señorita
CivilityMTRE=Don
+CivilityDR=Doctor
##### Currencies #####
Currencyeuros=Euros
@@ -296,11 +297,36 @@ CurrencySingXPF=Franco CFP
CurrencyCentSingEUR=céntimo
CurrencyThousandthSingTND=milésimo
-#### Input reasons #####
+#### Input reasons ####
DemandReasonTypeSRC_INTE=Internet
DemandReasonTypeSRC_CAMP_MAIL=Campaña correo
DemandReasonTypeSRC_CAMP_EMAIL=Campaña E-Mailing
DemandReasonTypeSRC_CAMP_PHO=Campaña telefónica
DemandReasonTypeSRC_CAMP_FAX=Campaña fax
DemandReasonTypeSRC_COMM=Contacto comercial
-DemandReasonTypeSRC_SHOP=Contacto tienda
\ No newline at end of file
+DemandReasonTypeSRC_SHOP=Contacto tienda
+DemandReasonTypeSRC_WOM=Boca a boca
+DemandReasonTypeSRC_PARTNER=Socio
+DemandReasonTypeSRC_EMPLOYEE=Empleado
+DemandReasonTypeSRC_SPONSORSHIP=Patrocinador
+
+#### Paper formats ####
+PaperFormatEU4A0=Formato 4A0
+PaperFormatEU2A0=Formato 2A0
+PaperFormatEUA0=Formato A0
+PaperFormatEUA1=Formato A1
+PaperFormatEUA2=Formato A2
+PaperFormatEUA3=Formato A3
+PaperFormatEUA4=Formato A4
+PaperFormatEUA5=Formato A5
+PaperFormatEUA6=Formato A6
+PaperFormatUSLETTER=Formato carta EE. UU.
+PaperFormatUSLEGAL=Formato legal EE. UU.
+PaperFormatUSEXECUTIVE=Formato ejecutivo EE. UU.
+PaperFormatUSLEDGER=Formato tabloide
+PaperFormatCAP1=Formato canadiense P1
+PaperFormatCAP2=Formato canadiense P2
+PaperFormatCAP3=Formato canadiense P3
+PaperFormatCAP4=Formato canadiense P4
+PaperFormatCAP5=Formato canadiense P5
+PaperFormatCAP6=Formato canadiense P6
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/ecm.lang b/htdocs/langs/es_ES/ecm.lang
index b61e954edd7b2dab8725008d575d113b81fce15b..5d63340af91b80195b7df537b3135bc38dcdc00c 100644
--- a/htdocs/langs/es_ES/ecm.lang
+++ b/htdocs/langs/es_ES/ecm.lang
@@ -43,7 +43,7 @@ ECMDocsByOrders=Documentos asociados a pedidos
ECMDocsByContracts=Documentos asociados a contratos
ECMDocsByInvoices=Documentos asociados a facturas
ECMDocsByProducts=Documentos enlazados a productos
-ECMNoDirecotyYet=No se ha creado el directorio
+ECMNoDirectoryYet=No se ha creado el directorio
ShowECMSection=Mostrar directorio
DeleteSection=Eliminación directorio
ConfirmDeleteSection=¿Está seguro de querer eliminar el directorio <b>%s</b>?
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index b137735f7e83f0c4cd0d63a65aab8a74634e88a6..794c5ba874aef46c241802c4182034d6ba92b0bb 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -110,6 +110,7 @@ ErrNoZipEngine=En este PHP no hay motor para descomprimir el archivo %s
ErrorFileMustBeADolibarrPackage=El archivo %s debe ser un paquete Dolibarr en formato zip
ErrorFileRequired=Se requiere un archivo de paquete Dolibarr en formato zip
ErrorPhpCurlNotInstalled=La extensión PHP CURL no se encuentra instalada, es indispensable para dialogar con Paypal.
+ErrorFailedToAddToMailmanList=Ha ocurrido un error al intentar añadir un registro a la lista Mailman o base de datos SPIP
# Warnings
WarningSafeModeOnCheckExecDir=Atención, está activada la opción PHP <b>safe_mode</b>, el comando deberá estar dentro de un directorio declarado dentro del parámetro php <b>safe_mode_exec_dir</b>.
diff --git a/htdocs/langs/es_ES/exports.lang b/htdocs/langs/es_ES/exports.lang
index 4a77067a36cfb65be8957637941c212a717a72b3..6a65a2600466687ae48e0d52bccca67b55d90a15 100644
--- a/htdocs/langs/es_ES/exports.lang
+++ b/htdocs/langs/es_ES/exports.lang
@@ -32,7 +32,7 @@ FieldOrder=Orden del campo
FieldTitle=Título campo
ChooseExportFormat=Elija el formato de exportación
NowClickToGenerateToBuildExportFile=Ahora, seleccione el formato de exportación de la lista desplegable y haga clic en "Generar" para generar el archivo exportación...
-AvailableFormats=Formatos dispo.
+AvailableFormats=Formatos disponibles
LibraryShort=Librería
LibraryUsed=Librería utilizada
LibraryVersion=Versión
@@ -112,4 +112,7 @@ SourceExample=Ejemplo de datos de origen posibles
ExampleAnyRefFoundIntoElement=Todas las referencias encontradas para los elementos <b>%s</b>
ExampleAnyCodeOrIdFoundIntoDictionnary=Todos los códigos (o id) encontrados en el diccionario <b>%s</b>
CSVFormatDesc=Archivo con formato <b>Valores separados por coma</b> (.csv).<br>Es un fichero con formato de texto en el que los campos son separados por el carácter [ %s ]. Si el separador se encuentra en el contenido de un campo, El campo debe de estar acotado por el carácter [ %s ]. El carácter de escape para incluir un carácter de entorno en un dato es [ %s ].
+Excel95FormatDesc=Archivo con formato <b>Excel</b> (.xls)<br>Este es el formato nativo de Excel 95 (BIFF5).
+Excel2007FormatDesc=Archivo con formato <b>Excel</b> (.xlsx)<br>Este es el formato nativo de Excel 2007 (SpreadsheetML).
+TsvFormatDesc=Archivo con formato <b>Valores separados por tabulador</b> (.tsv)<br>Este es un formato de archivo de texto en el que los campos son separados por un tabulador [tab].
ExportFieldAutomaticallyAdded=Se ha añadido automáticamente el campo <b>%s</b>, ya que evitará que líneas idénticas sean consideradas como duplicadas (con este campo, cada línea tendrá un id propio).
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/ldap.lang b/htdocs/langs/es_ES/ldap.lang
index 20594967669e8de25e611fa9857f7663198bd02a..7f9c78d11d412256315d5ed40c6ed3f510896f25 100644
--- a/htdocs/langs/es_ES/ldap.lang
+++ b/htdocs/langs/es_ES/ldap.lang
@@ -27,4 +27,4 @@ GroupSynchronized=Grupo sincronizado
MemberSynchronized=Miembro sincronizado
ContactSynchronized=Contacto sincronizado
ForceSynchronize=Forzar sincronización Dolibarr -> LDAP
-ErrorFailedToReadLDAP=Error de la lectura del anuario LDAP. Comprobar la configuración del módulo LDAP y la accesibilidad del anuario.
\ No newline at end of file
+ErrorFailedToReadLDAP=Error de la lectura del directorio LDAP. Comprobar la configuración del módulo LDAP y la accesibilidad del anuario.
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index ba4acfc091a15b056cf7269fece11430d2c7d62c..ea5d7bec1df37a5ba737665a17fc2be786e60afc 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -75,7 +75,8 @@ MailingStatusRead=Leido
CheckRead=Confirmación de lectura
YourMailUnsubcribeOK=El correo electrónico <b>%s</b> es correcta desuscribe.
MailtoEMail=mailto email (hyperlink)
-ActivateCheckRead=Activar Confirmación de lectura y desuscribe option
+ActivateCheckRead=Activar confirmación de lectura y opción de desuscripción
+ActivateCheckReadKey=Clave usada para encriptar la URL de la confirmación de lectura y la función de desuscripción
# Libelle des modules de liste de destinataires mailing=
MailingModuleDescContactCompanies=Contactos de terceros (clientes potenciales, clientes, proveedores...)
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 15f70c365e4deff590448652267aac418470ca1d..6defc575dbb9e1225fac47756fdd9917eb525b11 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -34,7 +34,7 @@ ErrorFileNotUploaded=El archivo no se ha podido transferir
ErrorInternalErrorDetected=Error detectado
ErrorNoRequestRan=Ninguna petición realizada
ErrorWrongHostParameter=Parámetro Servidor inválido
-ErrorYourCountryIsNotDefined=Su país no está definido. Corrígalo yendo a Inicio-Configuración-Empresa/Institución-Editar
+ErrorYourCountryIsNotDefined=Su país no está definido. Corríjalo yendo a Inicio-Configuración-Empresa/Institución-Editar
ErrorRecordIsUsedByChild=Imposible de suprimir este registro. Esta siendo utilizado como padre por al menos un registro hijo.
ErrorWrongValue=Valor incorrecto
ErrorWrongValueForParameterX=Valor incorrecto del parámetro %s
@@ -200,13 +200,13 @@ Now=Ahora
Date=Fecha
DateStart=Fecha inicio
DateEnd=Fecha fin
-DateCreation=Fecha creación
-DateModification=Fecha modificación
+DateCreation=Fecha de creación
+DateModification=Fecha de modificación
DateModificationShort=Fecha modif.
DateLastModification=Fecha última modificación
-DateValidation=Fecha validación
-DateClosing=Fecha cierre
-DateDue=Fecha vencimiento
+DateValidation=Fecha de validación
+DateClosing=Fecha de cierre
+DateDue=Fecha de vencimiento
DateValue=Fecha valor
DateValueShort=Fecha valor
DateOperation=Fecha operación
@@ -655,4 +655,6 @@ ShortFriday=V
ShortSaturday=S
ShortSunday=D
-View=Ver
\ No newline at end of file
+View=Ver
+Test=Prueba
+Element=Elemento
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
index 6064019bddb30605bf842fe59be3025d89a59089..4f55167c6cb1b5a50fe7c3200a15535c7187d4e2 100644
--- a/htdocs/langs/es_ES/members.lang
+++ b/htdocs/langs/es_ES/members.lang
@@ -98,8 +98,8 @@ EditType=Edición del tipo de miembro
DeleteType=Eliminar
VoteAllowed=Voto autorizado
Physical=Físico
-Moral=Moral
-MorPhy=Moral/Físico
+Moral=Jurídico
+MorPhy=Jurídico/Físico
Reenable=Reactivar
ResiliateMember=Dar de baja un miembro
ConfirmResiliateMember=¿Está seguro de querer dar de baja a este miembro?
@@ -113,7 +113,7 @@ ConfirmValidateMember=¿Está seguro de querer validar a este miembro?
FollowingLinksArePublic=Los vínculos siguientes son páginas accesibles a todos y no protegidas por ninguna habilitación Dolibarr.
PublicMemberList=Listado público de miembros
BlankSubscriptionForm=Formulario público de auto-inscripción
-BlankSubscriptionFormDesc=Dolibarr puede proporcionar una URL de página pública para que los visitantes externos soliciten afiliarse. Si se encuentra activo un módulo de pago en línea, se propondrá automáticamente un formulario de pago.
+BlankSubscriptionFormDesc=Dolibarr puede proporcionar una página pública para que los visitantes externos puedan solicitar afiliarse. Si se encuentra activo un módulo de pago en línea, se propondrá automáticamente un formulario de pago.
EnablePublicSubscriptionForm=Activar el formulario público de auto-inscripción
MemberPublicLinks=Enlaces/páginas públicas
ExportDataset_member_1=Miembros y afiliaciones
diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang
index 87c1f55ff7b69b3ca4c37933046d47d6e33304c2..fff6666111c5f707b9af994ea6b3d119dbe13c00 100644
--- a/htdocs/langs/es_ES/orders.lang
+++ b/htdocs/langs/es_ES/orders.lang
@@ -17,7 +17,7 @@ SupplierOrder=Pedido a proveedor
SuppliersOrders=Pedidos a proveedor
SuppliersOrdersRunning=Pedidos a proveedor en curso
CustomerOrder=Pedido de cliente
-CustomersOrders=Pedidos de cliente
+CustomersOrders=Pedidos de clientes
CustomersOrdersRunning=Pedidos de cliente en curso
CustomersOrdersAndOrdersLines=Pedidos de cliente y líneas de pedido
OrdersToValid=Pedidos de clientes a validar
@@ -76,7 +76,7 @@ LastModifiedOrders=Los %s últimos pedidos modificados
LastClosedOrders=Los %s últimos pedidos cerrados
AllOrders=Todos los pedidos
NbOfOrders=Número de pedidos
-OrdersStatistics=Estadísticas de pedidos
+OrdersStatistics=Estadísticas de pedidos de clientes
OrdersStatisticsSuppliers=Estadísticas de pedidos a proveedores
NumberOfOrdersByMonth=Número de pedidos por mes
AmountOfOrdersByMonthHT=Importe total de pedidos por mes (sin IVA)
@@ -88,7 +88,7 @@ ConfirmDeleteOrder=¿Está seguro de querer eliminar este pedido?
ConfirmValidateOrder=¿Está seguro de querer validar este pedido bajo la referencia <b>%s</b> ?
ConfirmUnvalidateOrder=¿Está seguro de querer restaurar el pedido <b>%s</b> al estado borrador?
ConfirmCancelOrder=¿Está seguro de querer anular este pedido?
-ConfirmMakeOrder=¿Está seguro de querer confirmar este pedido en fecha de<b>%s</b> ?
+ConfirmMakeOrder=¿Está seguro de querer confirmar este pedido en fecha de <b>%s</b> ?
GenerateBill=Facturar
ClassifyShipped=Clasificar enviado
ClassifyBilled=Clasificar facturado
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index de602fe94f92148d5ea50bcdb36415714387f652..da0fc25f0e997e1f672353c8873052adf69bc804 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -168,4 +168,6 @@ CustomerPrices=Precios clientes
SuppliersPrices=Precios proveedores
CustomCode=Código aduanero
CountryOrigin=País de origen
-HiddenIntoCombo=Oculto en las listas
\ No newline at end of file
+HiddenIntoCombo=Oculto en las listas
+ProductCodeModel=Modelo de código de producto
+ServiceCodeModel=Modelo de código de servicio
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index c75e00976dc0725fd65cbfbf818168228f10cd14..979f70f813f42c7ba2a1a449902043df9657b76b 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -4,12 +4,12 @@ Project=Proyecto
Projects=Proyectos
SharedProject=Proyecto compartido
PrivateProject=Contactos del proyecto
-MyProjectsDesc=Esta vista proyecto se limita a los proyectos en los que usted es un contacto afectado (cualquier tipo).
-ProjectsPublicDesc=Esta vista muestra todos los proyectos en los que usted tiene derecho a tener visibilidad.
-ProjectsDesc=Esta vista muestra todos los proyectos (su autorizaciones le ofrecen una visión completa).
+MyProjectsDesc=Esta vista muestra aquellos proyectos en los que usted es un contacto afectado (cualquier tipo).
+ProjectsPublicDesc=Esta vista muestra todos los proyectos a los que usted tiene derecho a visualizar.
+ProjectsDesc=Esta vista muestra todos los proyectos (sus permisos de usuario le permiten tener una visión completa).
MyTasksDesc=Esta vista se limita a los proyectos y tareas en los que usted es un contacto afectado en al menos una tarea (cualquier tipo).
TasksPublicDesc=Esta vista muestra todos los proyectos y tareas en los que usted tiene derecho a tener visibilidad.
-TasksDesc=Esta vista muestra todos los proyectos y tareas (su autorizaciones le ofrecen una visión completa).
+TasksDesc=Esta vista muestra todos los proyectos y tareas (sus permisos de usuario le permiten tener una visión completa).
Myprojects=Mis proyectos
ProjectsArea=Área proyectos
NewProject=Nuevo proyecto
diff --git a/htdocs/langs/es_ES/propal.lang b/htdocs/langs/es_ES/propal.lang
index 900dfcb858c48260de9cc32badbfb97f2f21960e..5d7c5027ffb9961c58d4c0885158109a7e8dfe6f 100644
--- a/htdocs/langs/es_ES/propal.lang
+++ b/htdocs/langs/es_ES/propal.lang
@@ -62,10 +62,10 @@ FileUploaded=El archivo se ha subido correctamente
AssociatedDocuments=Documentos asociados al presupuesto :
ErrorCantOpenDir=Imposible abrir el directorio
DatePropal=Fecha presupuesto
-DateEndPropal=Fecha fin validez
+DateEndPropal=Fecha fin de validez
DateEndPropalShort=Fecha fin
ValidityDuration=Duración de validez
-CloseAs=Cerrar al estatuto
+CloseAs=Cerrar con el estado
ClassifyBilled=Clasificar facturado
BuildBill=Crear factura
ErrorPropalNotFound=Presupuesto %s inexistente
diff --git a/htdocs/langs/es_ES/trips.lang b/htdocs/langs/es_ES/trips.lang
index 7c70d2c734a384248348a75675aa39d6630726f6..a5483e2fa99dd8623fb1b64c26439b128d6316cd 100644
--- a/htdocs/langs/es_ES/trips.lang
+++ b/htdocs/langs/es_ES/trips.lang
@@ -3,7 +3,7 @@ CHARSET=UTF-8
Trip=Desplazamiento
Trips=Desplazamientos
TripsAndExpenses=Honorarios
-TripsAndExpensesStatistics=Estadísticas honorarios
+TripsAndExpensesStatistics=Estadísticas de honorarios
TripId=Id honorario
TripCard=Ficha honorario
AddTrip=Crear honorario
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index a07d59f1110e18c652b60c03665f0ebbfa2e5f01..6b7f9cfc53e2eb86ebb3489b6a978a64c6cc3872 100644
--- a/htdocs/langs/et_EE/bills.lang
+++ b/htdocs/langs/et_EE/bills.lang
@@ -380,10 +380,10 @@ TypeContact_facture_internal_SALESREPFOLL=Esindaja järelmeetmeid kliendi arve
TypeContact_facture_external_BILLING=Kliendi arve kontaktandmed
TypeContact_facture_external_SHIPPING=Kliendi shipping kontakt
TypeContact_facture_external_SERVICE=Klienditeenindus kontakt
-TypeContact_facture_fourn_internal_SALESREPFOLL=Esindaja järelmeetmeid tarnija arve
-TypeContact_facture_fourn_external_BILLING=Tarnija arve kontaktandmed
-TypeContact_facture_fourn_external_SHIPPING=Tarnija shipping kontakt
-TypeContact_facture_fourn_external_SERVICE=Tarnija teenuse kontakt
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Esindaja järelmeetmeid tarnija arve
+TypeContact_invoice_supplier_external_BILLING=Tarnija arve kontaktandmed
+TypeContact_invoice_supplier_external_SHIPPING=Tarnija shipping kontakt
+TypeContact_invoice_supplier_external_SERVICE=Tarnija teenuse kontakt
PDFCrabeDescription=Arve PDF malli Crabe. Täieliku arve malli (mall soovitatud,)
PDFOursinDescription=Arve PDF malli Oursin. Täieliku arve malli (mall alternatiiv)
TerreNumRefModelDesc1=Tagasi numero koos formaadis %syymm-nnnn välja standardsete arvete ja %syymm-nnnn kreeditarvete kus YY aastat, KK kuud ja nnnn on jada, millel ei ole katki ja ei ole tagasi 0
diff --git a/htdocs/langs/et_EE/ecm.lang b/htdocs/langs/et_EE/ecm.lang
index 316382ed56a9fe8d2aea588e02507d9f6b9b400a..67b6d5f8313e22a7f527b966705a3b22d38319fb 100644
--- a/htdocs/langs/et_EE/ecm.lang
+++ b/htdocs/langs/et_EE/ecm.lang
@@ -50,7 +50,7 @@ ECMDocsByOrders=Dokumendid, mis on seotud klientide tellimusi
ECMDocsByContracts=Dokumendid, mis on seotud lepingute
ECMDocsByInvoices=Dokumendid, mis on seotud klientide arved
ECMDocsByProducts=Dokumendid seotud tooted
-ECMNoDirecotyYet=Ei kataloog loodud
+ECMNoDirectoryYet=Ei kataloog loodud
ShowECMSection=Näita kataloog
DeleteSection=Eemalda kataloog
ConfirmDeleteSection=Kas võite kinnitada, et soovid kustutada kataloog <b>%s?</b>
diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang
index 5005a67561420ff0c36e3985902093fcf97c508f..79663a1a4d779cea0c5ac310b668575fdff7fba4 100644
--- a/htdocs/langs/fa_IR/bills.lang
+++ b/htdocs/langs/fa_IR/bills.lang
@@ -403,15 +403,15 @@ TypeContact_facture_internal_SALESREPFOLL=ممثل العميل متابعة ف
TypeContact_facture_external_BILLING=الزبون فاتورة الاتصال
TypeContact_facture_external_SHIPPING=العملاء الشحن الاتصال
TypeContact_facture_external_SERVICE=خدمة العملاء الاتصال
-TypeContact_facture_fourn_internal_SALESREPFOLL=ممثل المورد متابعة فاتورة
-TypeContact_facture_fourn_external_BILLING=المورد فاتورة الاتصال
-TypeContact_facture_fourn_external_SHIPPING=المورد الشحن الاتصال
-TypeContact_facture_fourn_external_SERVICE=المورد خدمة الاتصال
+TypeContact_invoice_supplier_internal_SALESREPFOLL=ممثل المورد متابعة فاتورة
+TypeContact_invoice_supplier_external_BILLING=المورد فاتورة الاتصال
+TypeContact_invoice_supplier_external_SHIPPING=المورد الشحن الاتصال
+TypeContact_invoice_supplier_external_SERVICE=المورد خدمة الاتصال
PDFLinceDescription=نموذج الفاتورة كاملة مع الطاقة المتجددة الاسبانية وIRPF
// STOP - Lines generated via autotranslator.php tool (2010-07-17 11:14:33).
-
-
-// START - Lines generated via autotranslator.php tool (2010-09-04 01:33:40).
-// Reference language: en_US -> ar_AR
-InvoiceReplacement=استبدال الفاتورة
-// STOP - Lines generated via autotranslator.php tool (2010-09-04 01:40:36).
+
+
+// START - Lines generated via autotranslator.php tool (2010-09-04 01:33:40).
+// Reference language: en_US -> ar_AR
+InvoiceReplacement=استبدال الفاتورة
+// STOP - Lines generated via autotranslator.php tool (2010-09-04 01:40:36).
diff --git a/htdocs/langs/fa_IR/ecm.lang b/htdocs/langs/fa_IR/ecm.lang
index d00207d88929541a302f9bc0ce6cdd9b8d75d482..2bd63a25d32e6cb7977dc9c594da1790d3a8a57f 100644
--- a/htdocs/langs/fa_IR/ecm.lang
+++ b/htdocs/langs/fa_IR/ecm.lang
@@ -52,7 +52,7 @@ ECMDocsByOrders=وثائق مرتبطة أوامر العملاء
ECMDocsByContracts=وثائق مرتبطة بعقود
ECMDocsByInvoices=وثائق مرتبطة عملاء الفواتير
ECMDocsByProducts=الوثائق المرتبطة بالمنتجات
-ECMNoDirecotyYet=لا الدليل
+ECMNoDirectoryYet=لا الدليل
ShowECMSection=وتظهر الدليل
DeleteSection=إزالة الدليل
ConfirmDeleteSection=يمكنك التأكد من أنك تريد حذف الدليل <b>٪ ق؟</b>
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index a4fa767173f20198527a744aa90b4c9db0e6d561..9c383ea1fde08be77cb0e789fd8c7181ea7226a6 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -407,30 +407,30 @@ TypeContact_facture_internal_SALESREPFOLL=Edustaja seurantaan asiakkaan laskussa
TypeContact_facture_external_BILLING=Asiakkaan lasku yhteystiedot
TypeContact_facture_external_SHIPPING=Asiakas merenkulku yhteystiedot
TypeContact_facture_external_SERVICE=Asiakaspalvelu ottaa yhteyttä
-TypeContact_facture_fourn_internal_SALESREPFOLL=Edustaja seurantaan toimittaja laskussa
-TypeContact_facture_fourn_external_BILLING=Toimittajan lasku yhteystiedot
-TypeContact_facture_fourn_external_SHIPPING=Toimittajan merenkulku yhteystiedot
-TypeContact_facture_fourn_external_SERVICE=Toimittajan huoltoliikkeestä
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Edustaja seurantaan toimittaja laskussa
+TypeContact_invoice_supplier_external_BILLING=Toimittajan lasku yhteystiedot
+TypeContact_invoice_supplier_external_SHIPPING=Toimittajan merenkulku yhteystiedot
+TypeContact_invoice_supplier_external_SERVICE=Toimittajan huoltoliikkeestä
PDFLinceDescription=Täydellinen lasku malli Espanjan RE ja IRPF
// STOP - Lines generated via autotranslator.php tool (2010-07-17 11:27:05).
-
-
-// START - Lines generated via autotranslator.php tool (2012-02-29 16:10:23).
-// Reference language: en_US -> fi_FI
-BillsCustomer=Asiakkaan laskussa
-BillsSuppliersUnpaidForCompany=Maksamattomat toimittajan laskut %s
-BillsLate=Maksuviivästykset
-DisabledBecauseNotErasable=Käytössä sillä ei voida poistaa
-ConfirmUnvalidateBill=Oletko varma että haluat muuttaa laskun <b>%s</b> Luonnos-tilaan?
-UnvalidateBill=Unvalidate lasku
-NumberOfBillsByMonth=Nb laskuista kuukausittain
-AmountOfBillsByMonthHT=Määrä laskut kuukausittain (verojen jälkeen)
-AddRelativeDiscount=Luo suhteellinen alennus
-EditRelativelDiscount=Muokkaa relatvie alennus
-EditGlobalDiscounts=Muokkaa absoluuttinen alennukset
-AddCreditNote=Luo hyvityslasku
-InvoiceNotChecked=Ei laskun valittu
-ShowUnpaidAll=Näytä kaikki maksamattomat laskut
-ClosePaidInvoicesAutomatically=Luokittele "maksanut" kaikki vakio-tai korvaavan laskuja entierely maksanut.
-AllCompletelyPayedInvoiceWillBeClosed=Kaikki lasku ilman jää maksaa automaattisesti suljettu tila "maksanut".
-// STOP - Lines generated via autotranslator.php tool (2012-02-29 16:11:08).
+
+
+// START - Lines generated via autotranslator.php tool (2012-02-29 16:10:23).
+// Reference language: en_US -> fi_FI
+BillsCustomer=Asiakkaan laskussa
+BillsSuppliersUnpaidForCompany=Maksamattomat toimittajan laskut %s
+BillsLate=Maksuviivästykset
+DisabledBecauseNotErasable=Käytössä sillä ei voida poistaa
+ConfirmUnvalidateBill=Oletko varma että haluat muuttaa laskun <b>%s</b> Luonnos-tilaan?
+UnvalidateBill=Unvalidate lasku
+NumberOfBillsByMonth=Nb laskuista kuukausittain
+AmountOfBillsByMonthHT=Määrä laskut kuukausittain (verojen jälkeen)
+AddRelativeDiscount=Luo suhteellinen alennus
+EditRelativelDiscount=Muokkaa relatvie alennus
+EditGlobalDiscounts=Muokkaa absoluuttinen alennukset
+AddCreditNote=Luo hyvityslasku
+InvoiceNotChecked=Ei laskun valittu
+ShowUnpaidAll=Näytä kaikki maksamattomat laskut
+ClosePaidInvoicesAutomatically=Luokittele "maksanut" kaikki vakio-tai korvaavan laskuja entierely maksanut.
+AllCompletelyPayedInvoiceWillBeClosed=Kaikki lasku ilman jää maksaa automaattisesti suljettu tila "maksanut".
+// STOP - Lines generated via autotranslator.php tool (2012-02-29 16:11:08).
diff --git a/htdocs/langs/fi_FI/ecm.lang b/htdocs/langs/fi_FI/ecm.lang
index 04a68d3ed30be7bd6d6f650aaaa8f3432d3438c5..714a0b21372553ac04a322449f046ede3e39dd2f 100644
--- a/htdocs/langs/fi_FI/ecm.lang
+++ b/htdocs/langs/fi_FI/ecm.lang
@@ -52,7 +52,7 @@ ECMDocsByOrders=Asiakirjat liittyvät asiakkaiden tilauksia
ECMDocsByContracts=Asiakirjat liittyvät sopimukset
ECMDocsByInvoices=Liittyvien asiakirjojen asiakkaille laskuja
ECMDocsByProducts=Asiakirjat liittyvät tuotteet
-ECMNoDirecotyYet=Ei hakemiston luonut
+ECMNoDirectoryYet=Ei hakemiston luonut
ShowECMSection=Näytä hakemisto
DeleteSection=Poista hakemistosta
ConfirmDeleteSection=Voitteko vahvistaa, haluatko poistaa <b>hakemistosta %s?</b>
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 53d1af01f023fc33dd92fdcb48f0b84d59f76efe..d79da5b8ff5ab5461b31040fbc6725636e11991f 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -658,7 +658,7 @@ Permission2501= Lire/Récupérer les documents
Permission2502= Récupérer les documents
Permission2503= Soumettre ou supprimer des documents
Permission2515= Administrer les rubriques de documents
-Permission50001=Utiliser Point de vente
+Permission50101=Utiliser Point de vente
Permission50201= Consulter les transactions
Permission50202= Importer les transactions
DictionnaryCompanyType= Types de sociétés
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 882b177099a5fe893ddae0713729fada179b7c99..866773ee131dbedde98802acc992c17ef605b2dc 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -384,10 +384,10 @@ TypeContact_facture_internal_SALESREPFOLL=Responsable suivi facture client
TypeContact_facture_external_BILLING=Contact client facturation
TypeContact_facture_external_SHIPPING=Contact client livraison
TypeContact_facture_external_SERVICE=Contact client prestation
-TypeContact_facture_fourn_internal_SALESREPFOLL=Responsable suivi facture fournisseur
-TypeContact_facture_fourn_external_BILLING=Contact fournisseur facturation
-TypeContact_facture_fourn_external_SHIPPING=Contact fournisseur livraison
-TypeContact_facture_fourn_external_SERVICE=Contact fournisseur prestation
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Responsable suivi facture fournisseur
+TypeContact_invoice_supplier_external_BILLING=Contact fournisseur facturation
+TypeContact_invoice_supplier_external_SHIPPING=Contact fournisseur livraison
+TypeContact_invoice_supplier_external_SERVICE=Contact fournisseur prestation
# crabe PDF Model
PDFCrabeDescription=Modèle de facture PDF complet (modèle recommandé par défaut)
# oursin PDF Model
diff --git a/htdocs/langs/fr_FR/dict.lang b/htdocs/langs/fr_FR/dict.lang
index d8b066765cd5e0a3b49d56c1fd7fde0902a5ff8f..4d9c7b2736de5e3e48340b1a27cd0152a0019a2b 100644
--- a/htdocs/langs/fr_FR/dict.lang
+++ b/htdocs/langs/fr_FR/dict.lang
@@ -252,6 +252,7 @@ CivilityMME=Madame
CivilityMR=Monsieur
CivilityMLE=Mademoiselle
CivilityMTRE=Maître
+CivilityDR=Docteur
##### Currencies #####
Currencyeuros=Euros
@@ -297,7 +298,7 @@ CurrencySingXPF=Franc CFP
CurrencyCentSingEUR=centime
CurrencyThousandthSingTND=millime
-#### Input reasons #####
+#### Input reasons ####
DemandReasonTypeSRC_INTE=Internet
DemandReasonTypeSRC_CAMP_MAIL=Campagne Publipostage
DemandReasonTypeSRC_CAMP_EMAIL=Campagne EMailing
@@ -309,3 +310,24 @@ DemandReasonTypeSRC_WOM=Bouche à oreille
DemandReasonTypeSRC_PARTNER=Partenaire
DemandReasonTypeSRC_EMPLOYEE=Employé
DemandReasonTypeSRC_SPONSORSHIP=Parrainage/Sponsoring
+
+#### Paper formats ####
+PaperFormatEU4A0=Format 4A0
+PaperFormatEU2A0=Format 2A0
+PaperFormatEUA0=Format A0
+PaperFormatEUA1=Format A1
+PaperFormatEUA2=Format A2
+PaperFormatEUA3=Format A3
+PaperFormatEUA4=Format A4
+PaperFormatEUA5=Format A5
+PaperFormatEUA6=Format A6
+PaperFormatUSLETTER=Format Lettre US
+PaperFormatUSLEGAL=Formato Legal US
+PaperFormatUSEXECUTIVE=Formato Exécutif US
+PaperFormatUSLEDGER=Format Ledger/Tabloid
+PaperFormatCAP1=Format P1 Canadien
+PaperFormatCAP2=Format P2 Canadien
+PaperFormatCAP3=Format P3 Canadien
+PaperFormatCAP4=Format P4 Canadien
+PaperFormatCAP5=Format P5 Canadien
+PaperFormatCAP6=Format P6 Canadien
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/ecm.lang b/htdocs/langs/fr_FR/ecm.lang
index 27aef45cfba8ab67bca6d6df31eba89d03dfd8ae..ffbbf6ee79d18af3f3846da2e7cac83b3d1370a1 100644
--- a/htdocs/langs/fr_FR/ecm.lang
+++ b/htdocs/langs/fr_FR/ecm.lang
@@ -43,7 +43,7 @@ ECMDocsByOrders=Documents associés aux commandes
ECMDocsByContracts=Documents associés aux contrats
ECMDocsByInvoices=Documents associés aux factures
ECMDocsByProducts=Documents associés aux produits
-ECMNoDirecotyYet=Aucun répertoire créé
+ECMNoDirectoryYet=Aucun répertoire créé
ShowECMSection=Afficher répertoire
DeleteSection=Suppression répertoire
ConfirmDeleteSection=Confirmez-vous la suppression du répertoire <b>%s</b> ?
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index 689374bd843459c230ff6ec22e10f92374674671..f14b4b22a30c3aa68bd4b777aef840000f1d357c 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -110,7 +110,7 @@ ErrNoZipEngine=Pas de moteur pour décompresser le fichier %s dans ce PHP
ErrorFileMustBeADolibarrPackage=Le fichier doit être un package Dolibarr
ErrorFileRequired=Il faut un fichier de package Dolibarr
ErrorPhpCurlNotInstalled=L'extension PHP CURL n'est pas installée, ceci est indispensable pour dialoguer avec Paypal.
-ErrorFailedToAddToMailmanList=Echec de l'ajout à une liste Mailman ou base Spip
+ErrorFailedToAddToMailmanList=Echec de l'ajout à une liste Mailman ou base SPIP
# Warnings
WarningMandatorySetupNotComplete=Les informations de configuration obligatoire doivent être renseignées
diff --git a/htdocs/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang
index e3563035a5aac6581948bb0b748e032fd4686f8a..19eb4fe957105c2efe41c54d3e3bf65b03c9357d 100644
--- a/htdocs/langs/fr_FR/exports.lang
+++ b/htdocs/langs/fr_FR/exports.lang
@@ -112,4 +112,7 @@ SourceExample=Exemple de donnée source possible
ExampleAnyRefFoundIntoElement=Toute réf trouvée pour les éléments <b>%s</b>
ExampleAnyCodeOrIdFoundIntoDictionnary=Tout code (ou id) trouvée dans le dictionnaire <b>%s</b>
CSVFormatDesc=Fichier au format <b>Comma Separated Value</b> (.csv).<br>C'est un fichier au format texte dans lequel les champs sont séparés par le caractère [ %s ]. Si le séparateur est trouvé dans le contenu d'un champ, le champ doit être entouré du caractère [ %s ]. Le caractère d'échappement pour inclure un caractère de contour dans une donnée est [ %s ].
+Excel95FormatDesc=Format <b>Excel</b> (.xls).<br>Format Excel 95 (BIFF5).
+Excel2007FormatDesc=Format <b>Excel</b> (.xls).<br>Format standard Excel 2007 (SpreadsheetML).
+TsvFormatDesc=Format de fichier à <b>Valeurs Séparées par des Tabulations</b> (.tsv).<br>C'est un fichier texte dont les champs sont séparés par des tabulations [tab].
ExportFieldAutomaticallyAdded=Le champ <b>%s</b> a été ajouté automatiquement car il évitera que des lignes identiques soient considérées comme des doublons (avec ce champ, aucune ligne ne sera identique mais aura un id propre).
diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
index 374a7a7988e2da82e39f3ca0e16bd23794be9f22..d0c5cb1044c87a2e7dbb673dad06562fddc266ec 100644
--- a/htdocs/langs/he_IL/bills.lang
+++ b/htdocs/langs/he_IL/bills.lang
@@ -380,10 +380,10 @@ TypeContact_facture_internal_SALESREPFOLL=לקוחות נציג הבאה למע
TypeContact_facture_external_BILLING=חשבונית הלקוח קשר
TypeContact_facture_external_SHIPPING=משלוח לקוחות צור קשר
TypeContact_facture_external_SERVICE=צור קשר עם שירות הלקוחות
-TypeContact_facture_fourn_internal_SALESREPFOLL=נציג הספק הבאה למעלה החשבונית
-TypeContact_facture_fourn_external_BILLING=חשבונית הספק לתקשר
-TypeContact_facture_fourn_external_SHIPPING=משלוח הספק לתקשר
-TypeContact_facture_fourn_external_SERVICE=שירות הספק לתקשר
+TypeContact_invoice_supplier_internal_SALESREPFOLL=נציג הספק הבאה למעלה החשבונית
+TypeContact_invoice_supplier_external_BILLING=חשבונית הספק לתקשר
+TypeContact_invoice_supplier_external_SHIPPING=משלוח הספק לתקשר
+TypeContact_invoice_supplier_external_SERVICE=שירות הספק לתקשר
PDFCrabeDescription=חשבונית תבנית PDF Crabe. תבנית חשבונית מלאה (תבנית מומלצים)
PDFOursinDescription=חשבונית תבנית PDF Oursin. תבנית חשבונית מלאה (חלופה תבנית)
TerreNumRefModelDesc1=חזור נומרו עם פורמט %syymm-nnnn חשבוניות סטנדרטיים %syymm-nnnn להערות אשראי שבו yy הוא שנה, מ"מ הוא חודש nnnn הוא רצף ללא הפסקה וללא חזרה 0
diff --git a/htdocs/langs/he_IL/ecm.lang b/htdocs/langs/he_IL/ecm.lang
index 580d6aeb402f9548fff24943e417902763f5d5c9..bdf1879f4081a29ef49b0fbd208cdd45b0f5e70e 100644
--- a/htdocs/langs/he_IL/ecm.lang
+++ b/htdocs/langs/he_IL/ecm.lang
@@ -50,7 +50,7 @@ ECMDocsByOrders=מסמכים קשורים הזמנות הלקוחות
ECMDocsByContracts=מסמכים קשורים בחוזים
ECMDocsByInvoices=מסמכים קשורים חשבוניות ללקוחות
ECMDocsByProducts=מסמכים קשורים מוצרים
-ECMNoDirecotyYet=לא נוצר המדריך
+ECMNoDirectoryYet=לא נוצר המדריך
ShowECMSection=הצג ספרייה
DeleteSection=להסיר את הספרייה
ConfirmDeleteSection=האם אתה יכול לאשר שברצונך למחוק את <b>%s</b> במדריך?
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index 4a1a2ae430da5c73a2134502fc5b17e03328f7b8..8546d155e7b297c1c59ab500b83f1e658a1dcb5c 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -380,10 +380,10 @@ TypeContact_facture_internal_SALESREPFOLL=Reprezentatív nyomon követése vevő
TypeContact_facture_external_BILLING=Ügyfél számla Kapcsolat
TypeContact_facture_external_SHIPPING=Megrendelő szállítási kapcsolattartó
TypeContact_facture_external_SERVICE=Ügyfélszolgálat Kapcsolat
-TypeContact_facture_fourn_internal_SALESREPFOLL=Reprezentatív nyomon követése beszállítói számla
-TypeContact_facture_fourn_external_BILLING=Szállító számlát Kapcsolat
-TypeContact_facture_fourn_external_SHIPPING=Szállító szállítási kapcsolat
-TypeContact_facture_fourn_external_SERVICE=Szállító szolgálat Kapcsolat
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Reprezentatív nyomon követése beszállítói számla
+TypeContact_invoice_supplier_external_BILLING=Szállító számlát Kapcsolat
+TypeContact_invoice_supplier_external_SHIPPING=Szállító szállítási kapcsolat
+TypeContact_invoice_supplier_external_SERVICE=Szállító szolgálat Kapcsolat
PDFCrabeDescription=Számla PDF sablon Crabe. A teljes számla sablon (Template ajánlott)
PDFOursinDescription=Számla PDF sablon Oursin. A teljes számla sablon (Template alternatív)
TerreNumRefModelDesc1=Vissza a numero formátumban %syymm-nnnn szabványos számlák és %syymm-nnnn a jóváírási ahol yy év, hónap és mm nnnn sorozata szünet nélkül, és nincs visszaút 0
diff --git a/htdocs/langs/hu_HU/ecm.lang b/htdocs/langs/hu_HU/ecm.lang
index b98a61d3471b8ababcc3e48264212407a7500e83..12059c49a6c1bb8dc7e94b3af3c994bb617cb33d 100644
--- a/htdocs/langs/hu_HU/ecm.lang
+++ b/htdocs/langs/hu_HU/ecm.lang
@@ -42,7 +42,7 @@ ECMDocsByOrders=Megrendelésekkel kapcsolatban álló dokumentumok
ECMDocsByContracts=Szerződésekkel kapcsolatban álló dokumentumok
ECMDocsByInvoices=Ügyfél számlákkal kapcsolatban álló dokumentumok
ECMDocsByProducts=Termékekkel kapcsolatban álló dokumentumok
-ECMNoDirecotyYet=Nem lett könyvtár létrehozva
+ECMNoDirectoryYet=Nem lett könyvtár létrehozva
ShowECMSection=Könyvtár mutatása
DeleteSection=Könyvátr eltávolítása
ConfirmDeleteSection=Biztos törölni akarja a(z) <b>%s</b> könyvtárat?
diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang
index 584f29a7927558dd7b48eb673d7070ededbeea13..21209b0158f622e867a9e96b206f0dc30136d454 100644
--- a/htdocs/langs/is_IS/bills.lang
+++ b/htdocs/langs/is_IS/bills.lang
@@ -366,10 +366,10 @@ TypeContact_facture_internal_SALESREPFOLL=Fulltrúi eftirfarandi upp viðskiptav
TypeContact_facture_external_BILLING=Viðskiptavinur Reikningar samband
TypeContact_facture_external_SHIPPING=Viðskiptavinur siglinga samband
TypeContact_facture_external_SERVICE=Þjónustudeild samband
-TypeContact_facture_fourn_internal_SALESREPFOLL=Fulltrúi eftirfarandi upp birgir Reikningar
-TypeContact_facture_fourn_external_BILLING=Birgir Reikningar samband
-TypeContact_facture_fourn_external_SHIPPING=Birgir siglinga samband
-TypeContact_facture_fourn_external_SERVICE=Birgir Þjónusta Hafa samband
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Fulltrúi eftirfarandi upp birgir Reikningar
+TypeContact_invoice_supplier_external_BILLING=Birgir Reikningar samband
+TypeContact_invoice_supplier_external_SHIPPING=Birgir siglinga samband
+TypeContact_invoice_supplier_external_SERVICE=Birgir Þjónusta Hafa samband
Of=du
PDFBerniqueDescription=Invoice líkan Bernique
PDFBigorneauDescription=Invoice líkan Bigorneau
@@ -391,25 +391,25 @@ TitanNumRefModelDesc3=Define breytunnar SOCIETE_FISCAL_MONTH_START með mánaða
TitanNumRefModelDesc4=Í þessu dæmi skulum við hafa á 1 September 2006 um reikning sem heitir FA0700001
PlutonNumRefModelDesc1=Fara aftur á sérhannaðar reikningsnúmer samkvæmt skilgreiningu lagsins.
// STOP - Lines generated via autotranslator.php tool (2010-06-30 00:15:29).
-
-
-// START - Lines generated via autotranslator.php tool (2012-02-29 16:26:19).
-// Reference language: en_US -> is_IS
-BillsCustomer=Viðskiptavinar Reikningar
-BillsSuppliersUnpaidForCompany=Reikninga ógreidda birgis til %s
-BillsLate=Vanskil
-DisabledBecauseNotErasable=Óvirkt því ekki hægt að þurrkast út
-ConfirmUnvalidateBill=Ertu viss um að þú viljir breyta vörureikningi <b>%s</b> að drög stöðu?
-UnvalidateBill=Unvalidate reikning
-NumberOfBillsByMonth=Nb reikninga eftir mánuði
-AmountOfBillsByMonthHT=Upphæð á reikningi eftir mánuði (eftir skatta)
-AddDiscount=Búa afslátt
-AddRelativeDiscount=Búa til ættingja afslátt
-EditRelativelDiscount=Breyta relatvie afslátt
-EditGlobalDiscounts=Breyta hreinum afslætti
-AddCreditNote=Búa inneignarnótuna
-InvoiceNotChecked=Engin reikningur valinn
-ShowUnpaidAll=Sýna alla ógreiddra reikninga
-ClosePaidInvoicesAutomatically=Flokka "borgað" allt staðall eða skipti reikningar entierely borgað.
-AllCompletelyPayedInvoiceWillBeClosed=Allt Reikningar með ekki áfram að borga verður sjálfkrafa lokað til stöðu "borgað".
-// STOP - Lines generated via autotranslator.php tool (2012-02-29 16:27:05).
+
+
+// START - Lines generated via autotranslator.php tool (2012-02-29 16:26:19).
+// Reference language: en_US -> is_IS
+BillsCustomer=Viðskiptavinar Reikningar
+BillsSuppliersUnpaidForCompany=Reikninga ógreidda birgis til %s
+BillsLate=Vanskil
+DisabledBecauseNotErasable=Óvirkt því ekki hægt að þurrkast út
+ConfirmUnvalidateBill=Ertu viss um að þú viljir breyta vörureikningi <b>%s</b> að drög stöðu?
+UnvalidateBill=Unvalidate reikning
+NumberOfBillsByMonth=Nb reikninga eftir mánuði
+AmountOfBillsByMonthHT=Upphæð á reikningi eftir mánuði (eftir skatta)
+AddDiscount=Búa afslátt
+AddRelativeDiscount=Búa til ættingja afslátt
+EditRelativelDiscount=Breyta relatvie afslátt
+EditGlobalDiscounts=Breyta hreinum afslætti
+AddCreditNote=Búa inneignarnótuna
+InvoiceNotChecked=Engin reikningur valinn
+ShowUnpaidAll=Sýna alla ógreiddra reikninga
+ClosePaidInvoicesAutomatically=Flokka "borgað" allt staðall eða skipti reikningar entierely borgað.
+AllCompletelyPayedInvoiceWillBeClosed=Allt Reikningar með ekki áfram að borga verður sjálfkrafa lokað til stöðu "borgað".
+// STOP - Lines generated via autotranslator.php tool (2012-02-29 16:27:05).
diff --git a/htdocs/langs/is_IS/ecm.lang b/htdocs/langs/is_IS/ecm.lang
index 41520375f89cc19d7955785a4d0629b4f8a12481..c0c61471747f26ecca2e5aeb3ffe35eb3697fcc6 100644
--- a/htdocs/langs/is_IS/ecm.lang
+++ b/htdocs/langs/is_IS/ecm.lang
@@ -56,7 +56,7 @@ ECMDocsByOrders=Skjöl tengd viðskiptavinum pantanir
ECMDocsByContracts=Skjöl tengd samningum
ECMDocsByInvoices=Skjöl tengd viðskiptavinum reikninga
ECMDocsByProducts=Skjöl sem tengjast vöru
-ECMNoDirecotyYet=Engin skrá búin til
+ECMNoDirectoryYet=Engin skrá búin til
ShowECMSection=Sýna skrá
DeleteSection=Fjarlægja möppu
ConfirmDeleteSection=Getur þú staðfestir að þú viljir eyða <b>skrá %s ?</b>
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index f4a60cf322edf0507585f5b37d7446f91745662c..4b0cae280881b540d599e3219c9ee040dca12f1e 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -397,10 +397,10 @@ TypeAmountOfEachNewDiscount =Importo in input per ognuna delle due parti:
TypeContact_facture_external_BILLING =Contatto fatturazioni clienti
TypeContact_facture_external_SERVICE =Contatto servizio clienti
TypeContact_facture_external_SHIPPING =Contatto spedizioni clienti
-TypeContact_facture_fourn_external_BILLING =Contatto fatturazioni fornitori
-TypeContact_facture_fourn_external_SERVICE =Contatto servizio fornitori
-TypeContact_facture_fourn_external_SHIPPING =Contatto spedizioni fornitori
-TypeContact_facture_fourn_internal_SALESREPFOLL =Responsabile pagamenti fornitori
+TypeContact_invoice_supplier_external_BILLING =Contatto fatturazioni fornitori
+TypeContact_invoice_supplier_external_SERVICE =Contatto servizio fornitori
+TypeContact_invoice_supplier_external_SHIPPING =Contatto spedizioni fornitori
+TypeContact_invoice_supplier_internal_SALESREPFOLL =Responsabile pagamenti fornitori
TypeContact_facture_internal_SALESREPFOLL =Responsabile pagamenti clienti
Unpaid =Non pagato
UnvalidateBill =Invalida fattura
diff --git a/htdocs/langs/it_IT/ecm.lang b/htdocs/langs/it_IT/ecm.lang
index 6cc1ad9f39bcd11dd9fc6451f9d8a024ac8dc710..ae4ee4b6eeb5da2f1e76a4854f96e545c961d3e1 100644
--- a/htdocs/langs/it_IT/ecm.lang
+++ b/htdocs/langs/it_IT/ecm.lang
@@ -37,7 +37,7 @@ ECMNbOfFilesInSubDir =Numero di file nella sottodirectory
ECMNbOfSubDir =Numero di sottodirectory
ECMNewDocument =Nuovo documento
ECMNewSection =Nuova sezione
-ECMNoDirecotyYet =Nessuna directory creata
+ECMNoDirectoryYet =Nessuna directory creata
ECMRoot =Root
ECMSearchByEntity =Ricerca per oggetto
ECMSearchByKeywords =Ricerca per parole chiave
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index 73e67e54990741217a97ca8e59d6386b404bee62..f2172127b5f65c39eded263c9c107fb0fe3a8c65 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -380,10 +380,10 @@ TypeContact_facture_internal_SALESREPFOLL=代表的なフォローアップ顧
TypeContact_facture_external_BILLING=顧客の請求書の連絡先
TypeContact_facture_external_SHIPPING=顧客の出荷お問い合わせ
TypeContact_facture_external_SERVICE=カスタマーサービスの連絡先
-TypeContact_facture_fourn_internal_SALESREPFOLL=代表的なフォローアップサプライヤーの請求書
-TypeContact_facture_fourn_external_BILLING=サプライヤの請求書の連絡先
-TypeContact_facture_fourn_external_SHIPPING=サプライヤの出荷の連絡先
-TypeContact_facture_fourn_external_SERVICE=サプライヤサービスの連絡先
+TypeContact_invoice_supplier_internal_SALESREPFOLL=代表的なフォローアップサプライヤーの請求書
+TypeContact_invoice_supplier_external_BILLING=サプライヤの請求書の連絡先
+TypeContact_invoice_supplier_external_SHIPPING=サプライヤの出荷の連絡先
+TypeContact_invoice_supplier_external_SERVICE=サプライヤサービスの連絡先
PDFCrabeDescription=請求書PDFテンプレートのカニ。完全な請求書テンプレート（テンプレートをおすすめ）
PDFOursinDescription=請求書PDFテンプレートOursin。完全な請求書テンプレート（テンプレートの代替）
TerreNumRefModelDesc1=yyは年である貸方の標準的な請求書と%syymm-nnnnの形式%syymm-NNNN withニュメロを返し、mmは月とnnnnはありません休憩0〜ノーリターンでシーケンスです。
diff --git a/htdocs/langs/ja_JP/ecm.lang b/htdocs/langs/ja_JP/ecm.lang
index 412c9c67e359dff935efd26dc3c0173fa03814fd..4d44c1dbee12f4783a224e8112b452463793a611 100644
--- a/htdocs/langs/ja_JP/ecm.lang
+++ b/htdocs/langs/ja_JP/ecm.lang
@@ -33,7 +33,7 @@ ECMSectionOfDocuments=ドキュメントのディレクトリ
ECMTypeManual=マニュアル
ECMTypeAuto=自動
ECMDocsByProducts=製品にリンクされたドキュメント
-ECMNoDirecotyYet=作成されたディレクトリなし
+ECMNoDirectoryYet=作成されたディレクトリなし
ShowECMSection=ディレクトリを表示する
DeleteSection=ディレクトリを削除します。
ConfirmDeleteSection=あなたは、ディレクトリ<b>%sを</b>削除するかどうか確認できますか？
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index c84cbf4576b5cd35ef345aad3e4bb3ee5b72d7a3..faf0e2b69b476820cecdd356982ea720844400c6 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -364,80 +364,80 @@ TitanNumRefModelDesc3=Angi verdien SOCIETE_FISCAL_MONTH_START med den måneden s
TitanNumRefModelDesc4=I dette eksempel får vi den 1 september 2006 en faktura med nummeret FA0700001.
# pluton
PlutonNumRefModelDesc1=Gir et fakturanummer etter egendefinerte regler.
-
-
-// START - Lines generated via autotranslator.php tool (2010-07-17 11:45:17).
-// Reference language: en_US
-InvoiceDepositAsk=Innskudd faktura
-InvoiceDepositDesc=Denne typen faktura gjøres når et innskudd har blitt mottatt.
-InvoiceProForma=Proforma faktura
-InvoiceProFormaAsk=Proforma faktura
-InvoiceProFormaDesc=<b>Proforma faktura</b> er et bilde av en ekte faktura, men har ingen regnskapsføring verdi.
-InvoiceReplacementDesc=<b>Erstatning faktura</b> brukes til å avbryte og erstatte fullstendig faktura uten betaling allerede mottatt. <br><br> Merk: Bare faktura uten betaling på det kan erstattes. Hvis ikke stengt, vil det bli automatisk stengt for 'forlatt'.
-UsedByInvoice=Brukes til å betale faktura %s
-ConsumedBy=Konsumert av
-NotConsumed=Ikke forbrukt
-HelpPaymentHigherThanReminderToPay=Oppmerksomhet, er betalingen mengden av en eller flere regninger høyere enn resten til å betale. <br> Endre din oppføring, ellers bekrefte og tenke på å lage en kreditnota av det overskytende mottatt for hver overbetalte fakturaer.
-BillStatusConverted=Konvertert til rabatt
-BillShortStatusConverted=Behandlet
-ShowInvoiceDeposit=Vis depositum faktura
-AlreadyPaidNoCreditNotesNoDeposits=Allerede betalt (uten kreditt notater og innskudd)
-SetDate=Angi dato
-Deposit=Innskudd
-Deposits=Innskudd
-DiscountFromDeposit=Betalinger fra forekomst faktura %s
-AbsoluteDiscountUse=Denne typen kreditt kan brukes på faktura før godkjenningen sin
-CreditNoteDepositUse=Faktura må godkjennes for å bruke denne kongen av studiepoeng
-NewRelativeDiscount=Nye relative rabatt
-IdSocialContribution=Sosiale bidrag id
-PaymentId=Betaling id
-DescTaxAndDividendsArea=Dette området inneholder et sammendrag av alle betalinger gjøres for skatt eller sosiale bidrag. Bare poster med betaling i løpet av faste året er tatt med her.
-NbOfPayments=Nb av betalinger
-SplitDiscount=Split rabatt i to
-ConfirmSplitDiscount=Er du sikker på at du vil dele denne rabatten av <b>%s</b> %s i to lavere rabatter?
-TypeAmountOfEachNewDiscount=Inngang beløp for hver av to deler:
-TotalOfTwoDiscountMustEqualsOriginal=Totalt to nye rabatt må være lik originale rabattbeløpet.
-ConfirmRemoveDiscount=Er du sikker på at du vil fjerne denne rabatten?
-RelatedBill=Relaterte faktura
-RelatedBills=Relaterte fakturaer
-UseCredit=Bruk kredittkort
-ShowUnpaidLateOnly=Vis sent ubetalte faktura bare
-PaymentInvoiceRef=Betaling faktura %s
-ValidateInvoice=Valider faktura
-Cash=Kontanter
-Reported=Forsinket
-DisabledBecausePayments=Ikke mulig siden det er noen betalinger
-CantRemovePaymentWithOneInvoicePaid=Kan ikke fjerne betalingen siden det er i alle fall på faktura klassifisert utbetales
-ExpectedToPay=Forventet utbetaling
-PayedByThisPayment=Betales av denne betalingen
-TypeContact_facture_internal_SALESREPFOLL=Representant oppfølging kunde faktura
-TypeContact_facture_external_BILLING=Kunden faktura kontakt
-TypeContact_facture_external_SHIPPING=Kunden shipping kontakt
-TypeContact_facture_external_SERVICE=Kundeservice Kontakt
-TypeContact_facture_fourn_internal_SALESREPFOLL=Representant oppfølging leverandørfaktura
-TypeContact_facture_fourn_external_BILLING=Leverandørfaktura kontakt
-TypeContact_facture_fourn_external_SHIPPING=Leverandør shipping kontakt
-TypeContact_facture_fourn_external_SERVICE=Leverandør service kontakt
-PDFLinceDescription=En komplett faktura modell med spanske RE og IRPF
-// STOP - Lines generated via autotranslator.php tool (2010-07-17 11:50:35).
-
-
-// START - Lines generated via autotranslator.php tool (2012-02-29 17:06:43).
-// Reference language: en_US -> nb_NO
-BillsCustomer=Kundens faktura
-BillsSuppliersUnpaidForCompany=Ubetalt leverandørens fakturaer for %s
-BillsLate=Sene betalinger
-DisabledBecauseNotErasable=Deaktivert fordi kan ikke slettes
-ConfirmUnvalidateBill=Er du sikker på at du vil endre faktura <b>%s</b> til utkastet status?
-UnvalidateBill=Unvalidate faktura
-NumberOfBillsByMonth=Nb av fakturaer etter måned
-AmountOfBillsByMonthHT=Mengde fakturaer per måned (netto etter skatt)
-AddRelativeDiscount=Lag relativ rabatt
-EditRelativelDiscount=Rediger relatvie rabatt
-EditGlobalDiscounts=Rediger absolutte rabatter
-AddCreditNote=Lag kreditt notat
-InvoiceNotChecked=Ingen faktura er valgt
-ShowUnpaidAll=Vis alle ubetalte fakturaer
-ClosePaidInvoicesAutomatically=Klassifisere "betalt" alle standard eller utskifting fakturaer entierely utbetales.
-AllCompletelyPayedInvoiceWillBeClosed=Alle faktura uten gjenstår å betale vil bli automatisk stengt for status "betales".
-// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:07:28).
+
+
+// START - Lines generated via autotranslator.php tool (2010-07-17 11:45:17).
+// Reference language: en_US
+InvoiceDepositAsk=Innskudd faktura
+InvoiceDepositDesc=Denne typen faktura gjøres når et innskudd har blitt mottatt.
+InvoiceProForma=Proforma faktura
+InvoiceProFormaAsk=Proforma faktura
+InvoiceProFormaDesc=<b>Proforma faktura</b> er et bilde av en ekte faktura, men har ingen regnskapsføring verdi.
+InvoiceReplacementDesc=<b>Erstatning faktura</b> brukes til å avbryte og erstatte fullstendig faktura uten betaling allerede mottatt. <br><br> Merk: Bare faktura uten betaling på det kan erstattes. Hvis ikke stengt, vil det bli automatisk stengt for 'forlatt'.
+UsedByInvoice=Brukes til å betale faktura %s
+ConsumedBy=Konsumert av
+NotConsumed=Ikke forbrukt
+HelpPaymentHigherThanReminderToPay=Oppmerksomhet, er betalingen mengden av en eller flere regninger høyere enn resten til å betale. <br> Endre din oppføring, ellers bekrefte og tenke på å lage en kreditnota av det overskytende mottatt for hver overbetalte fakturaer.
+BillStatusConverted=Konvertert til rabatt
+BillShortStatusConverted=Behandlet
+ShowInvoiceDeposit=Vis depositum faktura
+AlreadyPaidNoCreditNotesNoDeposits=Allerede betalt (uten kreditt notater og innskudd)
+SetDate=Angi dato
+Deposit=Innskudd
+Deposits=Innskudd
+DiscountFromDeposit=Betalinger fra forekomst faktura %s
+AbsoluteDiscountUse=Denne typen kreditt kan brukes på faktura før godkjenningen sin
+CreditNoteDepositUse=Faktura må godkjennes for å bruke denne kongen av studiepoeng
+NewRelativeDiscount=Nye relative rabatt
+IdSocialContribution=Sosiale bidrag id
+PaymentId=Betaling id
+DescTaxAndDividendsArea=Dette området inneholder et sammendrag av alle betalinger gjøres for skatt eller sosiale bidrag. Bare poster med betaling i løpet av faste året er tatt med her.
+NbOfPayments=Nb av betalinger
+SplitDiscount=Split rabatt i to
+ConfirmSplitDiscount=Er du sikker på at du vil dele denne rabatten av <b>%s</b> %s i to lavere rabatter?
+TypeAmountOfEachNewDiscount=Inngang beløp for hver av to deler:
+TotalOfTwoDiscountMustEqualsOriginal=Totalt to nye rabatt må være lik originale rabattbeløpet.
+ConfirmRemoveDiscount=Er du sikker på at du vil fjerne denne rabatten?
+RelatedBill=Relaterte faktura
+RelatedBills=Relaterte fakturaer
+UseCredit=Bruk kredittkort
+ShowUnpaidLateOnly=Vis sent ubetalte faktura bare
+PaymentInvoiceRef=Betaling faktura %s
+ValidateInvoice=Valider faktura
+Cash=Kontanter
+Reported=Forsinket
+DisabledBecausePayments=Ikke mulig siden det er noen betalinger
+CantRemovePaymentWithOneInvoicePaid=Kan ikke fjerne betalingen siden det er i alle fall på faktura klassifisert utbetales
+ExpectedToPay=Forventet utbetaling
+PayedByThisPayment=Betales av denne betalingen
+TypeContact_facture_internal_SALESREPFOLL=Representant oppfølging kunde faktura
+TypeContact_facture_external_BILLING=Kunden faktura kontakt
+TypeContact_facture_external_SHIPPING=Kunden shipping kontakt
+TypeContact_facture_external_SERVICE=Kundeservice Kontakt
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Representant oppfølging leverandørfaktura
+TypeContact_invoice_supplier_external_BILLING=Leverandørfaktura kontakt
+TypeContact_invoice_supplier_external_SHIPPING=Leverandør shipping kontakt
+TypeContact_invoice_supplier_external_SERVICE=Leverandør service kontakt
+PDFLinceDescription=En komplett faktura modell med spanske RE og IRPF
+// STOP - Lines generated via autotranslator.php tool (2010-07-17 11:50:35).
+
+
+// START - Lines generated via autotranslator.php tool (2012-02-29 17:06:43).
+// Reference language: en_US -> nb_NO
+BillsCustomer=Kundens faktura
+BillsSuppliersUnpaidForCompany=Ubetalt leverandørens fakturaer for %s
+BillsLate=Sene betalinger
+DisabledBecauseNotErasable=Deaktivert fordi kan ikke slettes
+ConfirmUnvalidateBill=Er du sikker på at du vil endre faktura <b>%s</b> til utkastet status?
+UnvalidateBill=Unvalidate faktura
+NumberOfBillsByMonth=Nb av fakturaer etter måned
+AmountOfBillsByMonthHT=Mengde fakturaer per måned (netto etter skatt)
+AddRelativeDiscount=Lag relativ rabatt
+EditRelativelDiscount=Rediger relatvie rabatt
+EditGlobalDiscounts=Rediger absolutte rabatter
+AddCreditNote=Lag kreditt notat
+InvoiceNotChecked=Ingen faktura er valgt
+ShowUnpaidAll=Vis alle ubetalte fakturaer
+ClosePaidInvoicesAutomatically=Klassifisere "betalt" alle standard eller utskifting fakturaer entierely utbetales.
+AllCompletelyPayedInvoiceWillBeClosed=Alle faktura uten gjenstår å betale vil bli automatisk stengt for status "betales".
+// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:07:28).
diff --git a/htdocs/langs/nb_NO/ecm.lang b/htdocs/langs/nb_NO/ecm.lang
index 1a20f87774eab151e10afcc9c490bddbaf4eb97c..e804091568ef2f6aa57849799693cdb0cbf7a8fc 100644
--- a/htdocs/langs/nb_NO/ecm.lang
+++ b/htdocs/langs/nb_NO/ecm.lang
@@ -43,7 +43,7 @@ ECMDocsByOrders=Dokumenter knyttet til kundeordre
ECMDocsByContracts=Dokumenter knyttet til kontrakter
ECMDocsByInvoices=Dokumenter knyttet til kundefakturaer
ECMDocsByProducts=Dokumenter knyttet til produkter
-ECMNoDirecotyYet=Ingen mapper opprettet
+ECMNoDirectoryYet=Ingen mapper opprettet
ShowECMSection=Vis mappe
DeleteSection=Fjern mappe
ConfirmDeleteSection=Er du sikker på at du vil slette mappen <b>%s</b> ?
diff --git a/htdocs/langs/nl_BE/ecm.lang b/htdocs/langs/nl_BE/ecm.lang
index 29f8e8959eae5416e9dc860b8fba991cac352103..2bb338af544582c75ff7a641ac69479a0fafa9d3 100644
--- a/htdocs/langs/nl_BE/ecm.lang
+++ b/htdocs/langs/nl_BE/ecm.lang
@@ -43,7 +43,7 @@ ECMDocsByOrders=Documenten in verband met klantenbestellingen
ECMDocsByContracts=Documenten in verband met contracten
ECMDocsByInvoices=Documenten in verband met klantenfacturen
ECMDocsByProducts=Documenten in verband met producten
-ECMNoDirecotyYet=Geen directorie aangemaakt
+ECMNoDirectoryYet=Geen directorie aangemaakt
ShowECMSection=Toon directorie
DeleteSection=Verwijder directorie
ConfirmDeleteSection=Kunt u bevestigen dat u directorie <b>%s</b> wilt verwijderen?
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index 0949684e5f3f1231664e017a6db6832ee403452c..d8d7bae1abef3ba6775559579fdbd05cf4127311 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -366,10 +366,10 @@ TypeContact_facture_internal_SALESREPFOLL = Verantwoordelijke toezicht afnemersf
TypeContact_facture_external_BILLING = Afnemersfactureringscontact
TypeContact_facture_external_SHIPPING = Afnemersleveringscontact
TypeContact_facture_external_SERVICE = Afnemersservicecontact
-TypeContact_facture_fourn_internal_SALESREPFOLL = Verantwoordelijke verkoper factuur bijhouden
-TypeContact_facture_fourn_external_BILLING = Leverancier factureringscontact
-TypeContact_facture_fourn_external_SHIPPING = Leverancier leveringscontact
-TypeContact_facture_fourn_external_SERVICE = Leverancier servicecontact
+TypeContact_invoice_supplier_internal_SALESREPFOLL = Verantwoordelijke verkoper factuur bijhouden
+TypeContact_invoice_supplier_external_BILLING = Leverancier factureringscontact
+TypeContact_invoice_supplier_external_SHIPPING = Leverancier leveringscontact
+TypeContact_invoice_supplier_external_SERVICE = Leverancier servicecontact
# oursin PDF model =
Of = van
# bernique PDF model =
@@ -388,24 +388,24 @@ PDFOursinDescription = Model van complete factuur sjabloon (basis, beheert de mo
PDFTourteauDescription = Modelfactuur zonder vervanging
# NumRef Modules =
TerreNumRefModelDesc1 = Geeft het aantal als %syymm-nnnn voor facturen en %syymm-nnnn voor de activa is waar yy jaar, mm de maand en nnnn een opeenvolgend nummer is zonder vervangings 0 (nul)
-
-
-// START - Lines generated via autotranslator.php tool (2011-10-10 01:46:39).
-// Reference language: en_US -> nl_NL
-PaymentRule=Betaling regel
-AddDiscount=Maak een korting
-AddRelativeDiscount=Maak een relatieve korting
-EditRelativelDiscount=Edit relatvie korting
-EditGlobalDiscounts=Edit absolute kortingen
-AddCreditNote=Maak een credit nota
-AllCompletelyPayedInvoiceWillBeClosed=Alle factuur zonder te blijven om te betalen zal automatisch worden gesloten om status "Betaald".
-TerreNumRefModelError=Een wetsvoorstel te beginnen met $ syymm bestaat al en is niet compatibel met dit model van de reeks. Verwijderen of hernoemen naar deze module te activeren.
-ClosePaidInvoicesAutomatically=Classificeren "Betaalde" alle standaard of vervanging facturen entierely betaald.
-// STOP - Lines generated via autotranslator.php tool (2011-10-10 02:25:52).
-
-
-// START - Lines generated via autotranslator.php tool (2012-02-29 17:11:50).
-// Reference language: en_US -> nl_NL
-ConfirmUnvalidateBill=Weet u zeker dat u te factureren <b>%s</b> veranderen om ontwerp-status?
-UnvalidateBill=Unvalidate factuur
-// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:12:06).
+
+
+// START - Lines generated via autotranslator.php tool (2011-10-10 01:46:39).
+// Reference language: en_US -> nl_NL
+PaymentRule=Betaling regel
+AddDiscount=Maak een korting
+AddRelativeDiscount=Maak een relatieve korting
+EditRelativelDiscount=Edit relatvie korting
+EditGlobalDiscounts=Edit absolute kortingen
+AddCreditNote=Maak een credit nota
+AllCompletelyPayedInvoiceWillBeClosed=Alle factuur zonder te blijven om te betalen zal automatisch worden gesloten om status "Betaald".
+TerreNumRefModelError=Een wetsvoorstel te beginnen met $ syymm bestaat al en is niet compatibel met dit model van de reeks. Verwijderen of hernoemen naar deze module te activeren.
+ClosePaidInvoicesAutomatically=Classificeren "Betaalde" alle standaard of vervanging facturen entierely betaald.
+// STOP - Lines generated via autotranslator.php tool (2011-10-10 02:25:52).
+
+
+// START - Lines generated via autotranslator.php tool (2012-02-29 17:11:50).
+// Reference language: en_US -> nl_NL
+ConfirmUnvalidateBill=Weet u zeker dat u te factureren <b>%s</b> veranderen om ontwerp-status?
+UnvalidateBill=Unvalidate factuur
+// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:12:06).
diff --git a/htdocs/langs/nl_NL/ecm.lang b/htdocs/langs/nl_NL/ecm.lang
index c1c1feab72f0520b14e9e3f2ad7e586a5dc52dc7..bbee924ddb569df34aa3e94a9fae74c14c34008f 100644
--- a/htdocs/langs/nl_NL/ecm.lang
+++ b/htdocs/langs/nl_NL/ecm.lang
@@ -42,7 +42,7 @@ ECMDocsByOrders = Documenten gekoppeld aan afnemersorders
ECMDocsByContracts = Documenten gekoppeld aan contracten
ECMDocsByInvoices = Documenten gekoppeld aan afnemersfacturen
ECMDocsByProducts = Documenten gekoppeld aan producten
-ECMNoDirecotyYet = Geen map aangemaakt
+ECMNoDirectoryYet = Geen map aangemaakt
ShowECMSection = Toon map
DeleteSection = Verwijder map
ConfirmDeleteSection = Kunt u bevestigen dat u de map <b>%s</b> wilt verwijderen?
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index c814b5de2199fd7deaf0b354101d6061b16ddd67..422892976c94557b38d10ab5d20b23171bda223e 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -387,51 +387,51 @@ ConfirmClassifyPaidPartiallyReasonOther=Kwota porzucił dla innej przyczyny
NoSupplierBillsUnpaid=Nr dostawców niezapłaconych faktur
CustomerBillsUnpaid=Należne wpłaty klientów faktury
// STOP - Lines generated via autotranslator.php tool (2009-08-19 20:27:54).
-
-
-// START - Lines generated via autotranslator.php tool (2010-09-04 01:33:40).
-// Reference language: en_US -> pl_PL
-ClassifyCanceled=Klasyfikacji "Abandoned"
-BillStatusCanceled=Opuszczony
-BillShortStatusCanceled=Opuszczony
-ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Wybór ten jest możliwe, jeżeli faktury zostały wyposażone w odpowiedni komentarz. (Przykład "Tylko podatku odpowiadającej cenie, które zostały faktycznie zapłacone daje prawa do odliczenia")
-AlreadyPaidNoCreditNotesNoDeposits=Już wypłacone (bez not kredytowych i depozytów)
-RelatedBill=Podobne faktury
-RelatedBills=Faktur związanych
-ValidateInvoice=faktura Validate
-Cash=Gotówka
-Reported=Opóźniony
-DisabledBecausePayments=Nie możliwe, ponieważ istnieją pewne płatności
-CantRemovePaymentWithOneInvoicePaid=Nie można usunąć płatności, ponieważ istnieje przynajmniej na fakturze sklasyfikowane płatne
-ExpectedToPay=Oczekuje płatności
-PayedByThisPayment=Wypłacana przez płatność
-TypeContact_facture_internal_SALESREPFOLL=Przedstawiciela w ślad za klienta faktura
-TypeContact_facture_external_BILLING=kontakt faktury klienta
-TypeContact_facture_external_SHIPPING=kontakt koszty klientów
-TypeContact_facture_external_SERVICE=kontakt z działem obsługi klienta
-TypeContact_facture_fourn_internal_SALESREPFOLL=Przedstawiciela w ślad za faktury dostawcy
-TypeContact_facture_fourn_external_BILLING=kontakt fakturze dostawcy
-TypeContact_facture_fourn_external_SHIPPING=kontakt koszty dostawcy
-TypeContact_facture_fourn_external_SERVICE=Dostawca usługi kontakt
-// STOP - Lines generated via autotranslator.php tool (2010-09-04 01:41:21).
-
-
-// START - Lines generated via autotranslator.php tool (2012-02-29 17:18:29).
-// Reference language: en_US -> pl_PL
-BillsCustomer=Klienta faktura
-BillsSuppliersUnpaidForCompany=Nieodpłatnej dostawcy faktury za %s
-BillsLate=Opóźnienia w płatnościach
-DisabledBecauseNotErasable=Wyłączone, ponieważ nie mogą być skasowane
-ConfirmUnvalidateBill=Czy na pewno chcesz zmienić status faktury <b>%s</b> do projektu?
-UnvalidateBill=Unvalidate faktury
-NumberOfBillsByMonth=Nb faktur przez miesiąc
-AmountOfBillsByMonthHT=Kwota faktur przez miesiąc (netto)
-AddRelativeDiscount=Tworzenie względnej zniżki
-EditRelativelDiscount=Edytuj zniżki relatvie
-EditGlobalDiscounts=Edytuj bezwzględne zniżki
-AddCreditNote=Tworzenie noty kredytowej
-InvoiceNotChecked=Nie wybrano faktura
-ShowUnpaidAll=Pokaż wszystkie niezapłacone faktury
-ClosePaidInvoicesAutomatically=Klasyfikowanie "Opłacone" wszystkie standardy lub fakturach zastępczych entierely zapłaci.
-AllCompletelyPayedInvoiceWillBeClosed=Wszystko faktura bez pozostawać do zapłaty zostanie automatycznie zamknięta do statusu "płatny".
-// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:19:17).
+
+
+// START - Lines generated via autotranslator.php tool (2010-09-04 01:33:40).
+// Reference language: en_US -> pl_PL
+ClassifyCanceled=Klasyfikacji "Abandoned"
+BillStatusCanceled=Opuszczony
+BillShortStatusCanceled=Opuszczony
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Wybór ten jest możliwe, jeżeli faktury zostały wyposażone w odpowiedni komentarz. (Przykład "Tylko podatku odpowiadającej cenie, które zostały faktycznie zapłacone daje prawa do odliczenia")
+AlreadyPaidNoCreditNotesNoDeposits=Już wypłacone (bez not kredytowych i depozytów)
+RelatedBill=Podobne faktury
+RelatedBills=Faktur związanych
+ValidateInvoice=faktura Validate
+Cash=Gotówka
+Reported=Opóźniony
+DisabledBecausePayments=Nie możliwe, ponieważ istnieją pewne płatności
+CantRemovePaymentWithOneInvoicePaid=Nie można usunąć płatności, ponieważ istnieje przynajmniej na fakturze sklasyfikowane płatne
+ExpectedToPay=Oczekuje płatności
+PayedByThisPayment=Wypłacana przez płatność
+TypeContact_facture_internal_SALESREPFOLL=Przedstawiciela w ślad za klienta faktura
+TypeContact_facture_external_BILLING=kontakt faktury klienta
+TypeContact_facture_external_SHIPPING=kontakt koszty klientów
+TypeContact_facture_external_SERVICE=kontakt z działem obsługi klienta
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Przedstawiciela w ślad za faktury dostawcy
+TypeContact_invoice_supplier_external_BILLING=kontakt fakturze dostawcy
+TypeContact_invoice_supplier_external_SHIPPING=kontakt koszty dostawcy
+TypeContact_invoice_supplier_external_SERVICE=Dostawca usługi kontakt
+// STOP - Lines generated via autotranslator.php tool (2010-09-04 01:41:21).
+
+
+// START - Lines generated via autotranslator.php tool (2012-02-29 17:18:29).
+// Reference language: en_US -> pl_PL
+BillsCustomer=Klienta faktura
+BillsSuppliersUnpaidForCompany=Nieodpłatnej dostawcy faktury za %s
+BillsLate=Opóźnienia w płatnościach
+DisabledBecauseNotErasable=Wyłączone, ponieważ nie mogą być skasowane
+ConfirmUnvalidateBill=Czy na pewno chcesz zmienić status faktury <b>%s</b> do projektu?
+UnvalidateBill=Unvalidate faktury
+NumberOfBillsByMonth=Nb faktur przez miesiąc
+AmountOfBillsByMonthHT=Kwota faktur przez miesiąc (netto)
+AddRelativeDiscount=Tworzenie względnej zniżki
+EditRelativelDiscount=Edytuj zniżki relatvie
+EditGlobalDiscounts=Edytuj bezwzględne zniżki
+AddCreditNote=Tworzenie noty kredytowej
+InvoiceNotChecked=Nie wybrano faktura
+ShowUnpaidAll=Pokaż wszystkie niezapłacone faktury
+ClosePaidInvoicesAutomatically=Klasyfikowanie "Opłacone" wszystkie standardy lub fakturach zastępczych entierely zapłaci.
+AllCompletelyPayedInvoiceWillBeClosed=Wszystko faktura bez pozostawać do zapłaty zostanie automatycznie zamknięta do statusu "płatny".
+// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:19:17).
diff --git a/htdocs/langs/pl_PL/ecm.lang b/htdocs/langs/pl_PL/ecm.lang
index 8c56c51bdcffac2eeaa986c5f473fd0950b5cbfb..a29c29da33a084cb0d190eb837b33b13f45499a1 100644
--- a/htdocs/langs/pl_PL/ecm.lang
+++ b/htdocs/langs/pl_PL/ecm.lang
@@ -54,7 +54,7 @@ ECMDocsByOrders=Dokumenty związane z zamówień klientów
ECMDocsByContracts=Dokumenty związane z umowami
ECMDocsByInvoices=Dokumenty związane z odbiorców faktur
ECMDocsByProducts=Dokumenty związane z produktami
-ECMNoDirecotyYet=Nr katalogu stworzonym
+ECMNoDirectoryYet=Nr katalogu stworzonym
ShowECMSection=Pokaż katalog
DeleteSection=Usuwanie katalogu
ConfirmDeleteSection=Czy może Pan potwierdzić, które chcesz usunąć <b>katalogu %s?</b>
diff --git a/htdocs/langs/pt_BR/ecm.lang b/htdocs/langs/pt_BR/ecm.lang
index 044a688fe79c87d63ad63b9f89a3310be6f73b2b..20779a29d9daaf9dec748332ffea64632e69be1e 100644
--- a/htdocs/langs/pt_BR/ecm.lang
+++ b/htdocs/langs/pt_BR/ecm.lang
@@ -44,7 +44,7 @@ ECMDocsByNfes=Documentos Associados a Notas Fiscais
ECMDocsByContracts=Documentos Associados a Contratos
ECMDocsByInvoices=Documentos Associados a Faturas
ECMDocsByProducts=Documentos ligados a produtos
-ECMNoDirecotyYet=Não foi Criada a Pasta
+ECMNoDirectoryYet=Não foi Criada a Pasta
ShowECMSection=Mostrar Pasta
DeleteSection=Apagar Pasta
ConfirmDeleteSection=Confirma o eliminar da pasta <b>%s</b>?
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index f5a46c845556ce9520159c30bdaa436918a91812..7937c5309f5c99104c99e7de04573b307f23e778 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -385,47 +385,47 @@ ConfirmRemoveDiscount=Tem certeza de que deseja remover este desconto?
UseCredit=Uso de crédito
ShowUnpaidLateOnly=Mostrar tarde unpaid factura única
// STOP - Lines generated via autotranslator.php tool (2009-08-13 21:10:10).
-
-
-// START - Lines generated via autotranslator.php tool (2010-09-04 01:33:40).
-// Reference language: en_US -> pt_PT
-AlreadyPaidNoCreditNotesNoDeposits=Já pagas (sem notas de crédito e depósitos)
-RelatedBill=factura relacionados
-RelatedBills=facturas relacionadas
-ValidateInvoice=Validar a factura
-Cash=Numerário
-Reported=Atrasado
-DisabledBecausePayments=Não é possível, pois há alguns pagamentos
-CantRemovePaymentWithOneInvoicePaid=Não é possível remover o pagamento desde há pelo menos na factura paga classificados
-ExpectedToPay=pagamento esperado
-PayedByThisPayment=Pago por esse pagamento
-TypeContact_facture_internal_SALESREPFOLL=Representante fatura do cliente seguimento
-TypeContact_facture_external_BILLING=contacto na factura do Cliente
-TypeContact_facture_external_SHIPPING=contato com o transporte do cliente
-TypeContact_facture_external_SERVICE=contactar o serviço ao cliente
-TypeContact_facture_fourn_internal_SALESREPFOLL=Representante fatura do fornecedor seguimento
-TypeContact_facture_fourn_external_BILLING=Fornecedor Contactar com factura
-TypeContact_facture_fourn_external_SHIPPING=Fornecedor Contactar com transporte
-TypeContact_facture_fourn_external_SERVICE=Fornecedor contactar o serviço de
-// STOP - Lines generated via autotranslator.php tool (2010-09-04 01:41:28).
-
-
-// START - Lines generated via autotranslator.php tool (2012-02-29 15:45:52).
-// Reference language: en_US -> pt_PT
-BillsCustomer=Fatura do Cliente
-BillsSuppliersUnpaidForCompany=Facturas de fornecedores não remunerado para a %s
-BillsLate=Os pagamentos em atraso
-DisabledBecauseNotErasable=Desativada porque não podem ser apagados
-ConfirmUnvalidateBill=Tem certeza de que deseja alterar <b>%s</b> factura ao estatuto de projecto?
-UnvalidateBill=Unvalidate factura
-NumberOfBillsByMonth=Nb de faturas por mês
-AmountOfBillsByMonthHT=Quantidade de faturas por mês (líquidos de impostos)
-AddRelativeDiscount=Criar desconto relativo
-EditRelativelDiscount=Editar desconto relatvie
-EditGlobalDiscounts=Editar descontos absolutos
-AddCreditNote=Criar nota de crédito
-InvoiceNotChecked=Factura não selecionado
-ShowUnpaidAll=Mostrar todas as faturas não pagas
-ClosePaidInvoicesAutomatically=Classificar "Pago" padrão tudo ou facturas de substituição entierely pagas.
-AllCompletelyPayedInvoiceWillBeClosed=Tudo sem nota fiscal continuam a pagar será automaticamente fechada ao status de "payed".
-// STOP - Lines generated via autotranslator.php tool (2012-02-29 15:46:35).
+
+
+// START - Lines generated via autotranslator.php tool (2010-09-04 01:33:40).
+// Reference language: en_US -> pt_PT
+AlreadyPaidNoCreditNotesNoDeposits=Já pagas (sem notas de crédito e depósitos)
+RelatedBill=factura relacionados
+RelatedBills=facturas relacionadas
+ValidateInvoice=Validar a factura
+Cash=Numerário
+Reported=Atrasado
+DisabledBecausePayments=Não é possível, pois há alguns pagamentos
+CantRemovePaymentWithOneInvoicePaid=Não é possível remover o pagamento desde há pelo menos na factura paga classificados
+ExpectedToPay=pagamento esperado
+PayedByThisPayment=Pago por esse pagamento
+TypeContact_facture_internal_SALESREPFOLL=Representante fatura do cliente seguimento
+TypeContact_facture_external_BILLING=contacto na factura do Cliente
+TypeContact_facture_external_SHIPPING=contato com o transporte do cliente
+TypeContact_facture_external_SERVICE=contactar o serviço ao cliente
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Representante fatura do fornecedor seguimento
+TypeContact_invoice_supplier_external_BILLING=Fornecedor Contactar com factura
+TypeContact_invoice_supplier_external_SHIPPING=Fornecedor Contactar com transporte
+TypeContact_invoice_supplier_external_SERVICE=Fornecedor contactar o serviço de
+// STOP - Lines generated via autotranslator.php tool (2010-09-04 01:41:28).
+
+
+// START - Lines generated via autotranslator.php tool (2012-02-29 15:45:52).
+// Reference language: en_US -> pt_PT
+BillsCustomer=Fatura do Cliente
+BillsSuppliersUnpaidForCompany=Facturas de fornecedores não remunerado para a %s
+BillsLate=Os pagamentos em atraso
+DisabledBecauseNotErasable=Desativada porque não podem ser apagados
+ConfirmUnvalidateBill=Tem certeza de que deseja alterar <b>%s</b> factura ao estatuto de projecto?
+UnvalidateBill=Unvalidate factura
+NumberOfBillsByMonth=Nb de faturas por mês
+AmountOfBillsByMonthHT=Quantidade de faturas por mês (líquidos de impostos)
+AddRelativeDiscount=Criar desconto relativo
+EditRelativelDiscount=Editar desconto relatvie
+EditGlobalDiscounts=Editar descontos absolutos
+AddCreditNote=Criar nota de crédito
+InvoiceNotChecked=Factura não selecionado
+ShowUnpaidAll=Mostrar todas as faturas não pagas
+ClosePaidInvoicesAutomatically=Classificar "Pago" padrão tudo ou facturas de substituição entierely pagas.
+AllCompletelyPayedInvoiceWillBeClosed=Tudo sem nota fiscal continuam a pagar será automaticamente fechada ao status de "payed".
+// STOP - Lines generated via autotranslator.php tool (2012-02-29 15:46:35).
diff --git a/htdocs/langs/pt_PT/ecm.lang b/htdocs/langs/pt_PT/ecm.lang
index e2afe18971e11fb06d66796ff349481209f1105f..d4a700dae94cc05e9e0941ff8fdfd847a41b97d7 100644
--- a/htdocs/langs/pt_PT/ecm.lang
+++ b/htdocs/langs/pt_PT/ecm.lang
@@ -43,7 +43,7 @@ ECMDocsByOrders=Documentos Associados a Pedidos
ECMDocsByContracts=Documentos Associados a Contratos
ECMDocsByInvoices=Documentos Associados a Facturas
ECMDocsByProducts=Documentos ligados a produtos
-ECMNoDirecotyYet=Não foi Criada a Pasta
+ECMNoDirectoryYet=Não foi Criada a Pasta
ShowECMSection=Mostrar Pasta
DeleteSection=Apagar Pasta
ConfirmDeleteSection=¿Confirma o eliminar da pasta <b>%s</b>?
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index 1185d0f9739f11cf1ef813f761ea6d67d8d3b9a3..e0042ad162bbcc490135ca16e4e037d19fecec6c 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -407,31 +407,31 @@ TypeContact_facture_internal_SALESREPFOLL=Reprezentant client urmărirea factura
TypeContact_facture_external_BILLING=Clientul factura de contact
TypeContact_facture_external_SHIPPING=Clientul de transport maritim de contact
TypeContact_facture_external_SERVICE=Contactaţi serviciul clienţi
-TypeContact_facture_fourn_internal_SALESREPFOLL=Reprezentant furnizorul urmărirea factura
-TypeContact_facture_fourn_external_BILLING=A lua legatura cu furnizorul factură
-TypeContact_facture_fourn_external_SHIPPING=Furnizor de transport maritim de contact
-TypeContact_facture_fourn_external_SERVICE=Furnizor de servicii de contact
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Reprezentant furnizorul urmărirea factura
+TypeContact_invoice_supplier_external_BILLING=A lua legatura cu furnizorul factură
+TypeContact_invoice_supplier_external_SHIPPING=Furnizor de transport maritim de contact
+TypeContact_invoice_supplier_external_SERVICE=Furnizor de servicii de contact
PDFLinceDescription=Un model de factura complet, cu RE şi spaniolă IRPF
// STOP - Lines generated via autotranslator.php tool (2010-07-17 11:37:32).
-
-
-// START - Lines generated via autotranslator.php tool (2012-02-29 17:23:15).
-// Reference language: en_US -> ro_RO
-BillsCustomer=Clientului factura
-BillsSuppliersUnpaidForCompany=Furnizorul de facturi neplătite pentru %s
-BillsLate=Întârzierea efectuării plăţilor
-DisabledBecauseNotErasable=Dezactivate, deoarece nu pot fi şterse
-ConfirmUnvalidateBill=Sunteţi sigur că doriţi să schimbaţi <b>%s</b> factura la statutul de proiect?
-UnvalidateBill=Unvalidate factura
-NumberOfBillsByMonth=NB a facturilor de către luni
-AmountOfBillsByMonthHT=Valoarea facturilor de către luna (net de impozit)
-AddRelativeDiscount=Crearea reducere relativă
-EditRelativelDiscount=Editare relatvie reducere
-EditGlobalDiscounts=Editare reduceri absolute
-AddCreditNote=Creaţi note de credit
-InvoiceNotChecked=Nu factură selectat
-ShowUnpaidAll=Arata toate facturile neachitate
-ClosePaidInvoicesAutomatically=Clasifica "platiti", toate facturile standard sau de înlocuire entierely platite.
-AllCompletelyPayedInvoiceWillBeClosed=Toate cu factura nu rămân la plata vor fi închise automat la statutul de "platite".
-// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:24:55).
+
+
+// START - Lines generated via autotranslator.php tool (2012-02-29 17:23:15).
+// Reference language: en_US -> ro_RO
+BillsCustomer=Clientului factura
+BillsSuppliersUnpaidForCompany=Furnizorul de facturi neplătite pentru %s
+BillsLate=Întârzierea efectuării plăţilor
+DisabledBecauseNotErasable=Dezactivate, deoarece nu pot fi şterse
+ConfirmUnvalidateBill=Sunteţi sigur că doriţi să schimbaţi <b>%s</b> factura la statutul de proiect?
+UnvalidateBill=Unvalidate factura
+NumberOfBillsByMonth=NB a facturilor de către luni
+AmountOfBillsByMonthHT=Valoarea facturilor de către luna (net de impozit)
+AddRelativeDiscount=Crearea reducere relativă
+EditRelativelDiscount=Editare relatvie reducere
+EditGlobalDiscounts=Editare reduceri absolute
+AddCreditNote=Creaţi note de credit
+InvoiceNotChecked=Nu factură selectat
+ShowUnpaidAll=Arata toate facturile neachitate
+ClosePaidInvoicesAutomatically=Clasifica "platiti", toate facturile standard sau de înlocuire entierely platite.
+AllCompletelyPayedInvoiceWillBeClosed=Toate cu factura nu rămân la plata vor fi închise automat la statutul de "platite".
+// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:24:55).
diff --git a/htdocs/langs/ro_RO/ecm.lang b/htdocs/langs/ro_RO/ecm.lang
index a1730eae276b131c362e5a5df92582f5ef99736b..f8902f0e27217c1ccd714e6540fda673b00e0233 100644
--- a/htdocs/langs/ro_RO/ecm.lang
+++ b/htdocs/langs/ro_RO/ecm.lang
@@ -52,7 +52,7 @@ ECMDocsByOrders=Documente legate de ordinele de la clienţi
ECMDocsByContracts=Documente legate de contractele de
ECMDocsByInvoices=Documente legate de clienţi facturi
ECMDocsByProducts=Documente legate de produse
-ECMNoDirecotyYet=Nu directorul creat
+ECMNoDirectoryYet=Nu directorul creat
ShowECMSection=Arata director
DeleteSection=Eliminaţi director
ConfirmDeleteSection=Puteţi confirma că doriţi să ştergeţi <b>directorul %s?</b>
diff --git a/htdocs/langs/ro_RO/install.lang b/htdocs/langs/ro_RO/install.lang
index 542c5d04af330bac5755e16331ec793b04a7055d..8e1012b307ae29887f5ac71c61b684e83e15cafa 100644
--- a/htdocs/langs/ro_RO/install.lang
+++ b/htdocs/langs/ro_RO/install.lang
@@ -599,10 +599,10 @@ TypeContact_facture_internal_SALESREPFOLL=Reprezentant client urmărirea factura
TypeContact_facture_external_BILLING=Clientul factura de contact
TypeContact_facture_external_SHIPPING=Clientul de transport maritim de contact
TypeContact_facture_external_SERVICE=Contactaţi serviciul clienţi
-TypeContact_facture_fourn_internal_SALESREPFOLL=Reprezentant furnizorul urmărirea factura
-TypeContact_facture_fourn_external_BILLING=A lua legatura cu furnizorul factură
-TypeContact_facture_fourn_external_SHIPPING=Furnizor de transport maritim de contact
-TypeContact_facture_fourn_external_SERVICE=Furnizor de servicii de contact
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Reprezentant furnizorul urmărirea factura
+TypeContact_invoice_supplier_external_BILLING=A lua legatura cu furnizorul factură
+TypeContact_invoice_supplier_external_SHIPPING=Furnizor de transport maritim de contact
+TypeContact_invoice_supplier_external_SERVICE=Furnizor de servicii de contact
PDFLinceDescription=Un model de factura complet, cu RE şi spaniolă IRPF
// STOP - Lines generated via autotranslator.php tool (2010-07-17 11:37:32).
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index 098271fc7d56b14f3400fd5a9932e5e44efba757..e921f27252a98df208c4f7da389e5ac435fd042d 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -393,10 +393,10 @@ TypeContact_facture_internal_SALESREPFOLL=Четко отследить счет
TypeContact_facture_external_BILLING=обратитесь в отдел счетов-фактур Покупателям
TypeContact_facture_external_SHIPPING=обратитесь в службу доставки
TypeContact_facture_external_SERVICE=обратитесь в клиентскую службу
-TypeContact_facture_fourn_internal_SALESREPFOLL=Четко отследить счет-фактуру поставщика
-TypeContact_facture_fourn_external_BILLING=обратитесь в отдел счетов-фактур Поставщика
-TypeContact_facture_fourn_external_SHIPPING=обратитесь в службу доставки Поставщика
-TypeContact_facture_fourn_external_SERVICE=обратитесь в клиентскую службу Поставщика
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Четко отследить счет-фактуру поставщика
+TypeContact_invoice_supplier_external_BILLING=обратитесь в отдел счетов-фактур Поставщика
+TypeContact_invoice_supplier_external_SHIPPING=обратитесь в службу доставки Поставщика
+TypeContact_invoice_supplier_external_SERVICE=обратитесь в клиентскую службу Поставщика
// STOP - Lines generated via autotranslator.php tool (2010-09-04 01:41:38).
// до сюда перевел
diff --git a/htdocs/langs/ru_RU/ecm.lang b/htdocs/langs/ru_RU/ecm.lang
index 7ba42b5aeff4c531ff190da6626c7ec9956f6228..315af0102680b24fbf9b95c6209c60fe551ebd40 100644
--- a/htdocs/langs/ru_RU/ecm.lang
+++ b/htdocs/langs/ru_RU/ecm.lang
@@ -52,7 +52,7 @@ ECMDocsByOrders=Документы, связанные с заказчиками
ECMDocsByContracts=Документы, связанные с контрактами
ECMDocsByInvoices=Документы, связанные с заказчиками счетами
ECMDocsByProducts=Документы, связанные с продуктами
-ECMNoDirecotyYet=Нет создали каталог
+ECMNoDirectoryYet=Нет создали каталог
ShowECMSection=Показать каталог
DeleteSection=Удаление директории
ConfirmDeleteSection=Можете ли вы подтвердить, вы хотите удалить <b>каталог %s?</b>
diff --git a/htdocs/langs/ru_UA/ecm.lang b/htdocs/langs/ru_UA/ecm.lang
index 97ead6d4e8962c250c2b70678a26c649d7779ede..cb85473fb883b44703c6b1c16078df053ae3007b 100644
--- a/htdocs/langs/ru_UA/ecm.lang
+++ b/htdocs/langs/ru_UA/ecm.lang
@@ -32,7 +32,7 @@ ECMSearchByEntity=Поиск по статьям
ECMDocsByContracts=Документы связаны с контрактами
ECMDocsByInvoices=Документы связаны с клиентами счетов
ECMDocsByProducts=Документы связаны с продуктами
-ECMNoDirecotyYet=Нет каталог, созданный
+ECMNoDirectoryYet=Нет каталог, созданный
ShowECMSection=Показать каталог
DeleteSection=Удалить каталог
ConfirmDeleteSection=Можете ли вы подтвердить, что вы хотите удалить каталог <b>%s?</b>
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index 52fe7b2f7c16e6a630ce1810d8c1969025f9de80..f9b0452d70d2e686c9f2c5c7d70ee688fa6b8ec8 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -368,10 +368,10 @@ TypeContact_facture_internal_SALESREPFOLL = Predstavnik za sledenje računa kupc
TypeContact_facture_external_BILLING = Kontakt za račun kupcu
TypeContact_facture_external_SHIPPING = Kontakt za pošiljanje kupcu
TypeContact_facture_external_SERVICE = Kontakt za servis pri kupcu
-TypeContact_facture_fourn_internal_SALESREPFOLL = Predstavnik za sledenje računa dobavitelja
-TypeContact_facture_fourn_external_BILLING = Kontakt za račun dobavitelja
-TypeContact_facture_fourn_external_SHIPPING = Kontakt za pošiljanje pri dobavitelju
-TypeContact_facture_fourn_external_SERVICE = Kontakt za servis pri dobavitelju
+TypeContact_invoice_supplier_internal_SALESREPFOLL = Predstavnik za sledenje računa dobavitelja
+TypeContact_invoice_supplier_external_BILLING = Kontakt za račun dobavitelja
+TypeContact_invoice_supplier_external_SHIPPING = Kontakt za pošiljanje pri dobavitelju
+TypeContact_invoice_supplier_external_SERVICE = Kontakt za servis pri dobavitelju
# crabe PDF Model = undefined
PDFCrabeDescription = Predloga računa Crabe. Predloga kompletnega računa (Podpora DDV opcije, popusti, pogoji plačila, logo, itd...)
# oursin PDF Model = undefined
@@ -379,13 +379,13 @@ PDFOursinDescription = Predloga računa oursin
# NumRef Modules = undefined
TerreNumRefModelDesc1 = Predlaga številko v formatu %syymm-nnnn za standardne račune in %syymm-nnnn za dobropise kjer je yy leto, mm mesec in nnnn zaporedna številka brez presledkov in večja od 0
TerreNumRefModelError = Račun z začetkom $syymm že obstaja in ni kompatibilen s tem modelom zaporedja. Odstranite ga ali ga preimenujte za aktiviranje tega modula.
-
-
-// START - Lines generated via autotranslator.php tool (2012-02-29 17:30:17).
-// Reference language: en_US -> sl_SI
-ConfirmUnvalidateBill=Ali ste prepričani, da želite spremeniti računu <b>%s</b> na status osnutka?
-UnvalidateBill=Unvalidate račun
-AddRelativeDiscount=Ustvarite relativno popust
-EditRelativelDiscount=Uredi relatvie popust
-EditGlobalDiscounts=Uredi absolutne popuste
-// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:30:40).
+
+
+// START - Lines generated via autotranslator.php tool (2012-02-29 17:30:17).
+// Reference language: en_US -> sl_SI
+ConfirmUnvalidateBill=Ali ste prepričani, da želite spremeniti računu <b>%s</b> na status osnutka?
+UnvalidateBill=Unvalidate račun
+AddRelativeDiscount=Ustvarite relativno popust
+EditRelativelDiscount=Uredi relatvie popust
+EditGlobalDiscounts=Uredi absolutne popuste
+// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:30:40).
diff --git a/htdocs/langs/sl_SI/ecm.lang b/htdocs/langs/sl_SI/ecm.lang
index 98f93574bff409d4b455b43e01242d4f0814f755..ff3a7ac544a23af0b1a787085925d0e9e9d132dd 100644
--- a/htdocs/langs/sl_SI/ecm.lang
+++ b/htdocs/langs/sl_SI/ecm.lang
@@ -42,7 +42,7 @@ ECMDocsByOrders = Dokumenti, povezani z naročili kupcev
ECMDocsByContracts = Dokumenti, povezani s pogodbami
ECMDocsByInvoices = Dokumenti, povezani z računi za kupce
ECMDocsByProducts = Dokumenti, povezani s proizvodi
-ECMNoDirecotyYet = Ni kreiranih map
+ECMNoDirectoryYet = Ni kreiranih map
ShowECMSection = Prikaži mapo
DeleteSection = Odstrani mapo
ConfirmDeleteSection = Prosim, potrdite, da želite izbrisati mapo <b>%s</b> ?
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index 42b89de9cfae20f018360f91ef36d939b7b3bf37..2b477bb3084cb1d63d6cb4082af055d3e42b0f5d 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -367,10 +367,10 @@ TypeContact_facture_internal_SALESREPFOLL=Representanten uppföljning kundfaktur
TypeContact_facture_external_BILLING=Kundfaktura kontakt
TypeContact_facture_external_SHIPPING=Kunden Frakt Kontakta
TypeContact_facture_external_SERVICE=Kundtjänst kontakt
-TypeContact_facture_fourn_internal_SALESREPFOLL=Representanten uppföljning leverantörsfaktura
-TypeContact_facture_fourn_external_BILLING=Leverantörsfaktura kontakt
-TypeContact_facture_fourn_external_SHIPPING=Leverantör Frakt Kontakta
-TypeContact_facture_fourn_external_SERVICE=Leverantör tjänst kontakt
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Representanten uppföljning leverantörsfaktura
+TypeContact_invoice_supplier_external_BILLING=Leverantörsfaktura kontakt
+TypeContact_invoice_supplier_external_SHIPPING=Leverantör Frakt Kontakta
+TypeContact_invoice_supplier_external_SERVICE=Leverantör tjänst kontakt
Of=du
PDFBerniqueDescription=Faktura modell Bernique
PDFBigorneauDescription=Faktura modell Bigorneau
@@ -391,24 +391,24 @@ TitanNumRefModelDesc3=Definiera rörliga SOCIETE_FISCAL_MONTH_START med den mån
TitanNumRefModelDesc4=I detta exempel skall vi ha den 1 september 2006 av en faktura som heter FA0700001
PlutonNumRefModelDesc1=Återgå ett anpassningsbart fakturanummer enligt en fastställd mask.
// STOP - Lines generated via autotranslator.php tool (2010-08-27 08:53:49).
-
-
-// START - Lines generated via autotranslator.php tool (2012-02-29 17:32:03).
-// Reference language: en_US -> sv_SE
-BillsCustomer=Kundens faktura
-BillsSuppliersUnpaidForCompany=Obetald leverantörens fakturor för %s
-BillsLate=Sena betalningar
-DisabledBecauseNotErasable=Inaktiverats på grund kan inte raderas
-ConfirmUnvalidateBill=Är du säker på att du vill ändra faktura <b>%s</b> att utarbeta status?
-UnvalidateBill=Unvalidate faktura
-NumberOfBillsByMonth=Nb av fakturor per månad
-AmountOfBillsByMonthHT=Mängd av fakturor per månad (netto efter skatt)
-AddRelativeDiscount=Skapa relativ rabatt
-EditRelativelDiscount=Redigera relatvie rabatt
-EditGlobalDiscounts=Redigera absoluta rabatter
-AddCreditNote=Skapa kreditnota
-InvoiceNotChecked=Faktura vald
-ShowUnpaidAll=Visa alla obetalda fakturor
-ClosePaidInvoicesAutomatically=Klassificera "betalade" alla standard eller fakturor ersättning entierely betalt.
-AllCompletelyPayedInvoiceWillBeClosed=Alla fakturor utan återstår att betala kommer automatiskt stängd för status "betald".
-// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:32:49).
+
+
+// START - Lines generated via autotranslator.php tool (2012-02-29 17:32:03).
+// Reference language: en_US -> sv_SE
+BillsCustomer=Kundens faktura
+BillsSuppliersUnpaidForCompany=Obetald leverantörens fakturor för %s
+BillsLate=Sena betalningar
+DisabledBecauseNotErasable=Inaktiverats på grund kan inte raderas
+ConfirmUnvalidateBill=Är du säker på att du vill ändra faktura <b>%s</b> att utarbeta status?
+UnvalidateBill=Unvalidate faktura
+NumberOfBillsByMonth=Nb av fakturor per månad
+AmountOfBillsByMonthHT=Mängd av fakturor per månad (netto efter skatt)
+AddRelativeDiscount=Skapa relativ rabatt
+EditRelativelDiscount=Redigera relatvie rabatt
+EditGlobalDiscounts=Redigera absoluta rabatter
+AddCreditNote=Skapa kreditnota
+InvoiceNotChecked=Faktura vald
+ShowUnpaidAll=Visa alla obetalda fakturor
+ClosePaidInvoicesAutomatically=Klassificera "betalade" alla standard eller fakturor ersättning entierely betalt.
+AllCompletelyPayedInvoiceWillBeClosed=Alla fakturor utan återstår att betala kommer automatiskt stängd för status "betald".
+// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:32:49).
diff --git a/htdocs/langs/sv_SE/ecm.lang b/htdocs/langs/sv_SE/ecm.lang
index 731c1f063d72236b80e936563fdd81ede732b1fa..c1a6f7880d7ce9b71863a44016249189bbe3841d 100644
--- a/htdocs/langs/sv_SE/ecm.lang
+++ b/htdocs/langs/sv_SE/ecm.lang
@@ -50,7 +50,7 @@ ECMDocsByOrders=Dokument med koppling till kunderna order
ECMDocsByContracts=Handlingar som är kopplade till kontrakt
ECMDocsByInvoices=Dokument med koppling till kunderna fakturor
ECMDocsByProducts=Dokument med koppling till produkter
-ECMNoDirecotyYet=Ingen katalog skapas
+ECMNoDirectoryYet=Ingen katalog skapas
ShowECMSection=Visa katalog
DeleteSection=Ta bort katalog
ConfirmDeleteSection=Kan du bekräfta att du vill ta bort katalogen <b>%s?</b>
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index e4234ff35a615f5712a9dabf8f3d893efdeaad94..f4b2a87558aca25d7d50131f3d767009c7c421e3 100755
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -396,8 +396,8 @@ TypeContact_facture_internal_SALESREPFOLL= Müşteri fatura izleme temsilci
TypeContact_facture_external_BILLING=Müşteri faturası ilgilisi
TypeContact_facture_external_SHIPPING=Müşteri sevkiyat ilgilisi
TypeContact_facture_external_SERVICE=Müşteri hizmeti ilgilisi
-TypeContact_facture_fourn_internal_SALESREPFOLL= Tedarikçi fatura izleme temsilcisi
-TypeContact_facture_fourn_external_BILLING=Tedarikçi fatura ilgilisi
+TypeContact_invoice_supplier_internal_SALESREPFOLL= Tedarikçi fatura izleme temsilcisi
+TypeContact_invoice_supplier_external_BILLING=Tedarikçi fatura ilgilisi
BillsCustomer=Müşteri faturası
BillsSuppliersUnpaidForCompany=%s için ödenmemiş tedarikçi faturaları
BillsLate=Geç ödemeler
@@ -406,8 +406,8 @@ NumberOfBillsByMonth=Aylık fatura sayısı
AmountOfBillsByMonthHT=Aylık fatura tutarı (vergisiz net)
AddDiscount=İndirim oluştur
AddRelativeDiscount=Göreceli indirim
-TypeContact_facture_fourn_external_SHIPPING=Tedarikçi sevkiyat ilgilisi
-TypeContact_facture_fourn_external_SERVICE=Tedarikçi hizmet ilgilisi
+TypeContact_invoice_supplier_external_SHIPPING=Tedarikçi sevkiyat ilgilisi
+TypeContact_invoice_supplier_external_SERVICE=Tedarikçi hizmet ilgilisi
ConfirmUnvalidateBill=Fatura <b>%s</b> taslak durumuna değiştirmek istediğinizden emin misiniz?
UnvalidateBill=Faturanın doğrulamasını kaldır
diff --git a/htdocs/langs/tr_TR/ecm.lang b/htdocs/langs/tr_TR/ecm.lang
index 5a663e02b38b4cbaa5f47e8f8418aca600bb01b2..611e0448804a7b256bfc36fdbf6279b0cc0f721d 100644
--- a/htdocs/langs/tr_TR/ecm.lang
+++ b/htdocs/langs/tr_TR/ecm.lang
@@ -50,7 +50,7 @@ ECMDocsByOrders=Müşteri siparişleri ile bağlantılı belgeler
ECMDocsByContracts=Sözleşmeler ile bağlantılı Belgeler
ECMDocsByInvoices=Müşteri faturaları ile bağlantılı belgeler
ECMDocsByProducts=Ürünlere bağlantılı belgeler
-ECMNoDirecotyYet=Hiçbir dizin oluşturulmadı
+ECMNoDirectoryYet=Hiçbir dizin oluşturulmadı
ShowECMSection=Dizini göster
DeleteSection=Dizini kaldır
ConfirmDeleteSection=<b>%s</b> Dizinini silmek istediğinizi onaylayabilir misiniz?
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index a9da9f585a1abbe1ad7cac3b92d4284963d51c8d..d3330a6a4310a6c9b7abb7c929a1e6cbdc1fa83f 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -366,10 +366,10 @@ TypeContact_facture_internal_SALESREPFOLL=代表随访客户发票
TypeContact_facture_external_BILLING=客户发票接触
TypeContact_facture_external_SHIPPING=客户航运联系
TypeContact_facture_external_SERVICE=客户服务联系
-TypeContact_facture_fourn_internal_SALESREPFOLL=代表随访供应商发票
-TypeContact_facture_fourn_external_BILLING=供应商发票接触
-TypeContact_facture_fourn_external_SHIPPING=航运供应商联系
-TypeContact_facture_fourn_external_SERVICE=服务供应商联系
+TypeContact_invoice_supplier_internal_SALESREPFOLL=代表随访供应商发票
+TypeContact_invoice_supplier_external_BILLING=供应商发票接触
+TypeContact_invoice_supplier_external_SHIPPING=航运供应商联系
+TypeContact_invoice_supplier_external_SERVICE=服务供应商联系
Of=杜
PDFBerniqueDescription=发票模型Bernique
PDFBigorneauDescription=发票模型Bigorneau
@@ -396,24 +396,24 @@ PlutonNumRefModelDesc1=返回一个可定制的发票号码，按确定的面具
// Reference language: en_US -> zh_CN
InvoiceReplacement=更换发票
// STOP - Lines generated via autotranslator.php tool (2010-09-04 01:41:53).
-
-
-// START - Lines generated via autotranslator.php tool (2012-02-29 17:37:09).
-// Reference language: en_US -> zh_CN
-BillsCustomer=客户的发票
-BillsSuppliersUnpaidForCompany=%s未付供应商的发票
-BillsLate=逾期付款
-DisabledBecauseNotErasable=禁用，因为不能被擦除
-ConfirmUnvalidateBill=你确定你要更改发票<b>%s</b>草案的地位吗？
-UnvalidateBill=Unvalidate发票
-NumberOfBillsByMonth=铌，按月发票
-AmountOfBillsByMonthHT=通过一个月的发票金额（税后）
-AddRelativeDiscount=建立相对折扣
-EditRelativelDiscount=编辑relatvie折扣
-EditGlobalDiscounts=编辑绝对折扣
-AddCreditNote=创建信用票据
-InvoiceNotChecked=选择无发票
-ShowUnpaidAll=显示所有未付发票
-ClosePaidInvoicesAutomatically=分类“支付最高”的所有entierely支付最高标准或更换发票。
-AllCompletelyPayedInvoiceWillBeClosed=所有发票仍然没有支付将被自动关闭状态“支付最高”。
-// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:38:07).
+
+
+// START - Lines generated via autotranslator.php tool (2012-02-29 17:37:09).
+// Reference language: en_US -> zh_CN
+BillsCustomer=客户的发票
+BillsSuppliersUnpaidForCompany=%s未付供应商的发票
+BillsLate=逾期付款
+DisabledBecauseNotErasable=禁用，因为不能被擦除
+ConfirmUnvalidateBill=你确定你要更改发票<b>%s</b>草案的地位吗？
+UnvalidateBill=Unvalidate发票
+NumberOfBillsByMonth=铌，按月发票
+AmountOfBillsByMonthHT=通过一个月的发票金额（税后）
+AddRelativeDiscount=建立相对折扣
+EditRelativelDiscount=编辑relatvie折扣
+EditGlobalDiscounts=编辑绝对折扣
+AddCreditNote=创建信用票据
+InvoiceNotChecked=选择无发票
+ShowUnpaidAll=显示所有未付发票
+ClosePaidInvoicesAutomatically=分类“支付最高”的所有entierely支付最高标准或更换发票。
+AllCompletelyPayedInvoiceWillBeClosed=所有发票仍然没有支付将被自动关闭状态“支付最高”。
+// STOP - Lines generated via autotranslator.php tool (2012-02-29 17:38:07).
diff --git a/htdocs/langs/zh_CN/ecm.lang b/htdocs/langs/zh_CN/ecm.lang
index 1ecd4009b8e48ffe1c8867f4baf0547de40bef47..b2985eb6bed58fbf32697548493ba3465cd23acb 100644
--- a/htdocs/langs/zh_CN/ecm.lang
+++ b/htdocs/langs/zh_CN/ecm.lang
@@ -51,7 +51,7 @@ ECMDocsByOrders=文件链接到客户的订单
ECMDocsByContracts=文件与合约
ECMDocsByInvoices=文件与客户发票
ECMDocsByProducts=文件与产品
-ECMNoDirecotyYet=没有目录中创建
+ECMNoDirectoryYet=没有目录中创建
ShowECMSection=显示目录
DeleteSection=删除目录
ConfirmDeleteSection=你能确认你要删除的目录<b>％s吗</b> ？
diff --git a/htdocs/product/admin/product_extrafields.php b/htdocs/product/admin/product_extrafields.php
index d417b7319c5ba848f238711e19f0ba2a997821a1..acc396f9f637f3ea9e5a3656afb0c6efcd0bb459 100755
--- a/htdocs/product/admin/product_extrafields.php
+++ b/htdocs/product/admin/product_extrafields.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2001-2002 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003 Jean-Louis Bergamo <jlb@j1b.org>
* Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -87,7 +88,7 @@ $head = product_admin_prepare_head();
dol_fiche_head($head, 'attributes', $tab, 0, 'product');
-print $langs->trans("DefineHereComplementaryAttributes",$textobject).'<br>'."\n";
+print $langs->trans('DefineHereComplementaryAttributes', $tab).'<br>'."\n";
print '<br>';
dol_htmloutput_errors($mesg);
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index bde9bb72bfa5eda3dec5ae480eeaa02a3f185017..6dab8f2189cfbc6bbe539fc0efa04904ee3db3f4 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -602,6 +602,7 @@ class Project extends CommonObject
if (!$error)
{
+ $this->statut = 2;
$this->db->commit();
return 1;
}
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index a60fab5b03a925e18c9a7400357a312caa1a7835..45f19ccc95a85bf40bafdfc945bc5ba8c31af57f 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -68,24 +68,6 @@ $projectstatic = new Project($db);
* Actions
*/
-// Envoi fichier
-if (GETPOST('sendit') && ! empty($conf->global->MAIN_UPLOAD_DOC))
-{
- dol_add_file_process($upload_dir,0,1,'userfile');
-}
-
-// Delete
-if ($action=='delete')
-{
- $langs->load("other");
- $file = $upload_dir . '/' . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
- $ret=dol_delete_file($file);
- if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
- else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
- Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
- exit;
-}
-
// Retreive First Task ID of Project if withprojet is on to allow project prev next to work
if (! empty($project_ref) && ! empty($withproject))
{
@@ -120,6 +102,25 @@ if ($id > 0 || ! empty($ref))
dol_print_error($db);
}
}
+
+// Envoi fichier
+if (GETPOST('sendit') && ! empty($conf->global->MAIN_UPLOAD_DOC))
+{
+ dol_add_file_process($upload_dir,0,1,'userfile');
+}
+
+// Delete
+if ($action=='delete')
+{
+ $langs->load("other");
+ $file = $upload_dir . '/' . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
+ $ret=dol_delete_file($file);
+ if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
+ else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
+ Header('Location: '.$_SERVER["PHP_SELF"].'?id='.$id);
+ exit;
+}
+
/*
* View
*/
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 561a06db79bf0248768dc7ab213bddf09f91808c..96de5c19145321285a6290313b94983ad15adc36 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -180,7 +180,7 @@ if ($action == 'add')
if (! in_array(GETPOST('morphy'),array('mor','phy')))
{
$error+=1;
- $errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("MorPhy"))."<br>\n";
+ $errmsg .= $langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv('Nature'))."<br>\n";
}
if (empty($_POST["nom"]))
{
@@ -407,7 +407,7 @@ $morphys["phy"] = $langs->trans("Physical");
$morphys["mor"] = $langs->trans("Moral");
if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY))
{
- print '<tr class="morphy"><td>'.$langs->trans("MorPhy").' <FONT COLOR="red">*</FONT></td><td>'."\n";
+ print '<tr class="morphy"><td>'.$langs->trans('Nature').' <FONT COLOR="red">*</FONT></td><td>'."\n";
print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1);
print '</td></tr>'."\n";
}
@@ -417,7 +417,7 @@ else
print '<input type="hidden" id="morphy" name="morphy" value="'.$conf->global->MEMBER_NEWFORM_FORCEMORPHY.'">';
}
// Civility
-print '<tr><td>'.$langs->trans("Civility").'</td><td>';
+print '<tr><td>'.$langs->trans('UserTitle').'</td><td>';
print $formcompany->select_civility(GETPOST('civilite_id'),'civilite_id').'</td></tr>'."\n";
// Lastname
print '<tr><td>'.$langs->trans("Lastname").' <FONT COLOR="red">*</FONT></td><td><input type="text" name="nom" size="40" value="'.dol_escape_htmltag(GETPOST('nom')).'"></td></tr>'."\n";
@@ -486,7 +486,7 @@ foreach($extrafields->attribute_label as $key=>$value)
}
// Comments
print '<tr>';
-print '<td valign="top">'.$langs->trans("Comments").' :</td>';
+print '<td valign="top">'.$langs->trans("Comments").'</td>';
print '<td valign="top"><textarea name="comment" wrap="soft" cols="60" rows="'.ROWS_4.'">'.dol_escape_htmltag(GETPOST('comment')).'</textarea></td>';
print '</tr>'."\n";