diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php index 03309c31c3b..3cf7e1101ba 100644 --- a/htdocs/admin/company.php +++ b/htdocs/admin/company.php @@ -305,7 +305,7 @@ if ($action == 'edit' || $action == 'updateedit') print ''."\n"; $var=!$var; - print ''.$langs->trans("Tel").''; + print ''.$langs->trans("Phone").''; print ''; print ''."\n"; @@ -315,7 +315,7 @@ if ($action == 'edit' || $action == 'updateedit') print ''."\n"; $var=!$var; - print ''.$langs->trans("Mail").''; + print ''.$langs->trans("EMail").''; print ''; print ''."\n"; diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 80f6d04921a..3ea5c305c7a 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -385,12 +385,17 @@ if (GETPOST('actionadd') || GETPOST('actionmodify')) $ok=0; $fieldnamekey=$listfield[$f]; // We take translate key of field - if ($fieldnamekey == 'libelle') $fieldnamekey='Label'; + if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) $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'; + if ($fieldnamekey == 'note') $fieldnamekey = 'Note'; + if ($fieldnamekey == 'taux') $fieldnamekey = 'Rate'; + if ($fieldnamekey == 'type') $fieldnamekey = 'Type'; + if ($fieldnamekey == 'position') $fieldnamekey = 'Position'; + if ($fieldnamekey == 'unicode') $fieldnamekey = 'Unicode'; $msg.=$langs->trans("ErrorFieldRequired",$langs->transnoentities($fieldnamekey)).'
'; } diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php index a3b886af78a..e91c47fbb10 100644 --- a/htdocs/core/class/html.formadmin.class.php +++ b/htdocs/core/class/html.formadmin.class.php @@ -339,7 +339,7 @@ class FormAdmin while ($i < $num) { $obj=$this->db->fetch_object($resql); - $paperformat[$obj->code]=$obj->label.' - '.round($obj->width).'x'.round($obj->height).' '.$obj->unit; + $paperformat[$obj->code]= $langs->trans('PaperFormat'.strtoupper($obj->code)).' - '.round($obj->width).'x'.round($obj->height).' '.$obj->unit; $i++; } diff --git a/htdocs/langs/ca_ES/dict.lang b/htdocs/langs/ca_ES/dict.lang index 0b3ad8ca7bb..30c5c6466e6 100644 --- a/htdocs/langs/ca_ES/dict.lang +++ b/htdocs/langs/ca_ES/dict.lang @@ -305,7 +305,7 @@ DemandReasonTypeSRC_SHOP=Contacte botiga DemandReasonTypeSRC_WOM=Boca a boca DemandReasonTypeSRC_PARTNER=Soci DemandReasonTypeSRC_EMPLOYEE=Empleat -DemandReasonTypeSRC_SPONSORSHIP=Patrocinador +DemandReasonTypeSRC_SPONSORING=Patrocinador #### Paper formats ####= PaperFormatEU4A0=Format 4A0 PaperFormatEU2A0=Format 2A0 diff --git a/htdocs/langs/en_US/dict.lang b/htdocs/langs/en_US/dict.lang index e92698c1335..a49e01acd37 100644 --- a/htdocs/langs/en_US/dict.lang +++ b/htdocs/langs/en_US/dict.lang @@ -305,4 +305,4 @@ DemandReasonTypeSRC_SHOP=Shop contact DemandReasonTypeSRC_WOM=Word of mouth DemandReasonTypeSRC_PARTNER=Partner DemandReasonTypeSRC_EMPLOYEE=Employee -DemandReasonTypeSRC_SPONSORSHIP=Sponsorship \ No newline at end of file +DemandReasonTypeSRC_SPONSORING=Sponsorship \ No newline at end of file diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 4294368ffec..b645a43b480 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -823,7 +823,7 @@ LogEventDesc=Puede habilitar el registro de eventos de seguridad Dolibarr aquí. AreaForAdminOnly=Estas funciones solo son accesibles a un usuario administrador. SystemInfoDesc=La información del sistema es información técnica accesible solamente en solo lectura a los administradores. SystemAreaForAdminOnly=Esta área solo es accesible a los usuarios de tipo administradores. Ningún permiso Dolibarr permite extender el círculo de usuarios autorizados a esta área. -CompanyFundationDesc=Editar en esta página toda la información conocida sobre la empresa o asociación a administrar (para ello haga clic en el botón "Modificar" a pié de página) +CompanyFundationDesc=Editar en esta página toda la información conocida sobre la empresa o asociación a administrar (para ello haga clic en el botón "Modificar" a pie de página) DisplayDesc=Puede encontrar aquí todos los parámetros relacionados con la apariencia de Dolibarr AvailableModules=Módulos disponibles ToActivateModule=Para activar los módulos, vaya al área de Configuración (Inicio->Configuración->Módulos). diff --git a/htdocs/langs/es_ES/dict.lang b/htdocs/langs/es_ES/dict.lang index a6e34bdf173..bf0b59e3ef1 100644 --- a/htdocs/langs/es_ES/dict.lang +++ b/htdocs/langs/es_ES/dict.lang @@ -308,7 +308,7 @@ DemandReasonTypeSRC_SHOP=Contacto tienda DemandReasonTypeSRC_WOM=Boca a boca DemandReasonTypeSRC_PARTNER=Socio DemandReasonTypeSRC_EMPLOYEE=Empleado -DemandReasonTypeSRC_SPONSORSHIP=Patrocinador +DemandReasonTypeSRC_SPONSORING=Patrocinador #### Paper formats #### PaperFormatEU4A0=Formato 4A0 diff --git a/htdocs/langs/fr_FR/dict.lang b/htdocs/langs/fr_FR/dict.lang index 4d9c7b2736d..7758a917891 100644 --- a/htdocs/langs/fr_FR/dict.lang +++ b/htdocs/langs/fr_FR/dict.lang @@ -309,7 +309,7 @@ DemandReasonTypeSRC_SHOP=Contact en magazin DemandReasonTypeSRC_WOM=Bouche à oreille DemandReasonTypeSRC_PARTNER=Partenaire DemandReasonTypeSRC_EMPLOYEE=Employé -DemandReasonTypeSRC_SPONSORSHIP=Parrainage/Sponsoring +DemandReasonTypeSRC_SPONSORING=Parrainage/Sponsoring #### Paper formats #### PaperFormatEU4A0=Format 4A0