Merge pull request #731 from grandoc/3.3

fix some translations

README

@@ -108,7 +108,7 @@ Other modules:
 - RSS
 
 Miscellanous:
-- Mutli-user, with several permissions levels for each feature.
+- Multi-user, with several permissions levels for each feature.
 - Serveral menu managers (can be used by internal users, as a back-office,
   with a particular menu, or by external users, as a front-office, with
   another menu and permissions).

README-FR

@@ -122,7 +122,7 @@ V - CE QUE DOLIBARR NE PEUT PAS FAIRE (TACHES A FAIRE)
 Voici un liste de fonctionnalites pas encore gérées par Dolibarr:
 - Pas de compta analytique (uniquement gestion de trésorerie).
 - Dolibarr ne gère qu'une seule monnaie à la fois (mono-devise).
-- Dolibarr ne gère en standard qu'une société/institution/association (mono-société). Pour en gérer plusieurs (comme vos filiales), il faut, soit faire plusieurs installations de Dolibarr, soit installer le module MutliCompany qui permet de gérer n société/institutions/associations dans une seule instance par une isolation logique des données.
+- Dolibarr ne gère en standard qu'une société/institution/association (mono-société). Pour en gérer plusieurs (comme vos filiales), il faut, soit faire plusieurs installations de Dolibarr, soit installer le module MultiCompany qui permet de gérer n société/institutions/associations dans une seule instance par une isolation logique des données.
 - Ne gère pas la double tva (Fédérale / provinciale) du canada.
 - Dolibarr ne contient pas de module de Gestion de la paie.
 - Les taches du module de gestion de projets n'ont pas de dépendance entre elle.

README.md

@@ -105,7 +105,7 @@ See ChangeLog file found into package.
 
 ### Miscellanous:
 
-- Mutli-user, with several permissions levels for each feature.
+- Multi-user, with several permissions levels for each feature.
 - Serveral menu managers (can be used by internal users, as a back-office, with a particular menu, or by external users, as a front-office, with another menu and permissions).
 - Very user friendly and easy to use.
 - Optional WYSIWYG forms, optional Ajax forms.

htdocs/install/mysql/migration/3.2.0-3.3.0.sql

@@ -925,3 +925,5 @@ UPDATE llx_c_action_trigger SET code='FICHINTER_VALIDATE' WHERE code='FICHEINTER
 UPDATE llx_c_departements SET ncc='ALAVA', nom='Álava' WHERE code_departement='01' AND fk_region=419;
 
 ALTER TABLE llx_product_fournisseur_price DROP FOREIGN KEY fk_product_fournisseur;
+
+UPDATE llx_const set name='PRODUIT_MULTI_PRICES' where name='PRODUIT_MUTLI_PRICES';

htdocs/langs/ar_SA/admin.lang

@@ -213,7 +213,7 @@ ModuleFamilyProducts=إدارة المنتجات
 ModuleFamilyHr=إدارة الموارد البشرية
 ModuleFamilyProjects=مشاريع / العمل التعاوني
 ModuleFamilyOther=أخرى
-ModuleFamilyTechnic=Mutli بين وحدات وأدوات
+ModuleFamilyTechnic=Multi بين وحدات وأدوات
 ModuleFamilyExperimental=نماذج تجريبية
 ModuleFamilyFinancial=الوحدات المالية (المحاسبة / الخزانة)
 ModuleFamilyECM=إدارة المحتوى في المؤسسة

htdocs/langs/da_DK/admin.lang

@@ -199,7 +199,7 @@ ModuleFamilyProducts=Produkter Management
 ModuleFamilyHr=Human Resource Management
 ModuleFamilyProjects=Projekter / samarbejde
 ModuleFamilyOther=Anden
-ModuleFamilyTechnic=Mutli-moduler værktøjer
+ModuleFamilyTechnic=Multi-moduler værktøjer
 ModuleFamilyExperimental=Eksperimentel moduler
 ModuleFamilyFinancial=Finansielle Modules (Regnskabsmæssig / Treasury)
 ModuleFamilyECM=ECM

htdocs/langs/en_US/admin.lang

@@ -261,7 +261,7 @@ ModuleFamilyProducts=Products Management
 ModuleFamilyHr=Human Resource Management
 ModuleFamilyProjects=Projects/Collaborative work
 ModuleFamilyOther=Other
-ModuleFamilyTechnic=Mutli-modules tools
+ModuleFamilyTechnic=Multi-modules tools
 ModuleFamilyExperimental=Experimental modules
 ModuleFamilyFinancial=Financial Modules (Accounting/Treasury)
 ModuleFamilyECM=Electronic Content Management (ECM)
@@ -924,7 +924,7 @@ MAIN_PROXY_HOST=Name/Address of proxy server
 MAIN_PROXY_PORT=Port of proxy server
 MAIN_PROXY_USER=Login to use the proxy server
 MAIN_PROXY_PASS=Password to use the proxy server
-DefineHereComplementaryAttributes=Define here all atributes, not already available by default, and that you want to be supported for %s.
+DefineHereComplementaryAttributes=Define here all attributes, not already available by default, and that you want to be supported for %s.
 ExtraFields=Complementary attributes
 ExtraFieldsThirdParties=Complementary attributes (thirdparty)
 ExtraFieldsContacts=Complementary attributes (contact/address)
@@ -967,7 +967,7 @@ NotificationsDesc=EMails notifications feature allows you to silently send autom
 ModelModules=Documents templates
 DocumentModelOdt=Generate documents from OpenDocuments templates (.ODT files for OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Watermark on draft document
-CompanyIdProfChecker=Rules ono Professional Ids
+CompanyIdProfChecker=Rules on Professional Ids
 MustBeUnique=Must be unique ?
 MustBeMandatory=Must be mandatory ?
 Miscellanous=Miscellaneous
@@ -1188,7 +1188,7 @@ LDAPDescUsers=This page allows you to define LDAP attributes name in LDAP tree f
 LDAPDescGroups=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr groups.
 LDAPDescMembers=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members module.
 LDAPDescValues=Example values are designed for <b>OpenLDAP</b> with following loaded schemas: <b>core.schema, cosine.schema, inetorgperson.schema</b>). If you use thoose values and OpenLDAP, modify your LDAP config file <b>slapd.conf</b> to have all thoose schemas loaded.
-ForANonAnonymousAccess=For an authenticated acces (for a write access for example)
+ForANonAnonymousAccess=For an authenticated access (for a write access for example)
 ##### Products #####
 ProductSetup=Products module setup
 ServiceSetup=Services module setup
@@ -1198,7 +1198,7 @@ ConfirmDeleteProductLineAbility=Confirmation when removing product lines in form
 ModifyProductDescAbility=Personalization of product descriptions in forms
 ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
 ViewProductDescInThirdpartyLanguageAbility=Visualization of products descriptions in the thirdparty language
-UseSearchToSelectProduct=Use a search form to choose a product (instead of using a list box).<br>Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
+UseSearchToSelectProduct=Use a search form to choose a product (rather than a drop-down list).<br>Also if you have a large number of product (> 100 000), you can increase speed by setting constant PRODUCT_DONOTSEARCH_ANYWHERE to 1 in Setup->Other. Search will then be limited to start of string.
 UseEcoTaxeAbility=Support Eco-Taxe (WEEE)
 SetDefaultBarcodeTypeProducts=Default barcode type to use for products
 SetDefaultBarcodeTypeThirdParties=Default barcode type to use for third parties

htdocs/langs/et_EE/admin.lang

@@ -259,7 +259,7 @@ ModuleFamilyProducts=Tooted juhtimine
 ModuleFamilyHr=Human Resource Management
 ModuleFamilyProjects=Projektid / koostööprojektid töö
 ModuleFamilyOther=Teine
-ModuleFamilyTechnic=Mutli-moodulid tööriistad
+ModuleFamilyTechnic=Multi-moodulid tööriistad
 ModuleFamilyExperimental=Eksperimentaalse moodulid
 ModuleFamilyFinancial=Financial Modules (Raamatupidamine / Treasury)
 ModuleFamilyECM=Electronic sisuhaldus (ECM)

htdocs/langs/fa_IR/admin.lang

@@ -221,7 +221,7 @@ ModuleFamilyProducts= سیسیتم کالاها
 ModuleFamilyHr= سیستم استخدامی
 ModuleFamilyProjects= سیستم پروژه ها
 ModuleFamilyOther= دیگر سیستم ها
-ModuleFamilyTechnic=Mutli بين وحدات وأدوات
+ModuleFamilyTechnic=Multi بين وحدات وأدوات
 ModuleFamilyExperimental=نماذج تجريبية
 ModuleFamilyFinancial=الوحدات المالية (المحاسبة / الخزانة)
 ModuleFamilyECM=تولید محتوی الکترونیکی

htdocs/langs/fi_FI/admin.lang

@@ -197,7 +197,7 @@ ModuleFamilyProducts=Tuotteet Management
 ModuleFamilyHr=Human Resource Management
 ModuleFamilyProjects=Projektit / Yhteistyöhankkeet työn
 ModuleFamilyOther=Muu
-ModuleFamilyTechnic=Mutli-modules työkalut
+ModuleFamilyTechnic=Multi-modules työkalut
 ModuleFamilyExperimental=Kokeellinen modules
 ModuleFamilyFinancial=Financial Modules (kirjanpidon / Treasury)
 ModuleFamilyECM=ECM

htdocs/langs/he_IL/admin.lang

@@ -259,7 +259,7 @@ ModuleFamilyProducts=מוצרי ניהול
 ModuleFamilyHr=ניהול משאבי אנוש
 ModuleFamilyProjects=פרויקטים / עבודה שיתופית
 ModuleFamilyOther=אחר
-ModuleFamilyTechnic=Mutli מודולים כלים
+ModuleFamilyTechnic=Multi מודולים כלים
 ModuleFamilyExperimental=הניסוי מודולים
 ModuleFamilyFinancial=מודולים פיננסיים (חשבונאות / משרד האוצר)
 ModuleFamilyECM=ניהול תוכן אלקטרוני (ECM)

htdocs/langs/hu_HU/admin.lang

@@ -259,7 +259,7 @@ ModuleFamilyProducts=Termékek kezelése
 ModuleFamilyHr=Az emberi erőforrás menedzsment
 ModuleFamilyProjects=Projektek / kollaboratív munkát
 ModuleFamilyOther=Más
-ModuleFamilyTechnic=Mutli-modulok eszközök
+ModuleFamilyTechnic=Multi-modulok eszközök
 ModuleFamilyExperimental=Kísérleti modulok
 ModuleFamilyFinancial=Pénzügyi modulok (Számviteli / Kincstár)
 ModuleFamilyECM=Elektronikus Content Management (ECM)

htdocs/langs/is_IS/admin.lang

@@ -234,7 +234,7 @@ ModuleFamilyProducts=Vörur Stjórn
 ModuleFamilyHr=Mannauðsstjórnun
 ModuleFamilyProjects=Verkefni / samvinna vinna
 ModuleFamilyOther=Önnur
-ModuleFamilyTechnic=Mutli-einingar verkfæri
+ModuleFamilyTechnic=Multi-einingar verkfæri
 ModuleFamilyExperimental=Experimental mát
 ModuleFamilyFinancial=Financial einingar (Bókhald / ríkissjóðs)
 ModuleFamilyECM=ECM

htdocs/langs/ja_JP/admin.lang

@@ -259,7 +259,7 @@ ModuleFamilyProducts=製品の管理
 ModuleFamilyHr=人的資源管理
 ModuleFamilyProjects=プロジェクト/共同作業
 ModuleFamilyOther=その他
-ModuleFamilyTechnic=Mutli-モジュールツール
+ModuleFamilyTechnic=Multi-モジュールツール
 ModuleFamilyExperimental=実験的なモジュール
 ModuleFamilyFinancial=金融モジュール（会計/財務）
 ModuleFamilyECM=電子コンテンツ管理（ECM）

htdocs/langs/pl_PL/admin.lang

@@ -200,7 +200,7 @@ ModuleFamilyProducts=Produkty Management
 ModuleFamilyHr=Zarządzanie zasobami ludzkimi
 ModuleFamilyProjects=Projekty / współpracy
 ModuleFamilyOther=Inny
-ModuleFamilyTechnic=Mutli-modules narzędzia
+ModuleFamilyTechnic=Multi-modules narzędzia
 ModuleFamilyExperimental=Eksperymentalne modules
 ModuleFamilyFinancial=Moduły finansowe (Księgowość / Skarbu)
 ModuleFamilyECM=ECM

htdocs/langs/ro_RO/admin.lang

@@ -198,7 +198,7 @@ ModuleFamilyProducts=Produse de Management
 ModuleFamilyHr=Managementul resurselor umane
 ModuleFamilyProjects=Proiecte / Colaborativă munca
 ModuleFamilyOther=Alt
-ModuleFamilyTechnic=Mutli-module de unelte
+ModuleFamilyTechnic=Multi-module de unelte
 ModuleFamilyExperimental=Experimentale module
 ModuleFamilyFinancial=Module financiar (Contabilitate / Trezoreriei)
 ModuleFamilyECM=ECM

htdocs/langs/ru_RU/admin.lang

@@ -197,7 +197,7 @@ ModuleFamilyProducts=Продукты управления
 ModuleFamilyHr=Кадровый менеджмент
 ModuleFamilyProjects=Проекты / Совместная работа
 ModuleFamilyOther=Другой
-ModuleFamilyTechnic=Mutli-модулей инструменты
+ModuleFamilyTechnic=Multi-модулей инструменты
 ModuleFamilyExperimental=Экспериментальный модуль
 ModuleFamilyFinancial=Финансовые модули (Бухгалтерия / Казначейство)
 ModuleFamilyECM=ECM

htdocs/product/stock/product.php

@@ -539,11 +539,11 @@ if ($resql)
 		print '<td align="right">'.(price2num($obj->pmp)?price(price2num($obj->pmp*$obj->reel,'MT')):'').'</td>'; // Ditto : Show PMP from movement or from product
         // Sell price
 		print '<td align="right">';
-        if (empty($conf->global->PRODUIT_MUTLI_PRICES)) print price(price2num($product->price,'MU'));
+        if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price,'MU'));
         else print $langs->trans("Variable");
         print '</td>'; // Ditto : Show PMP from movement or from product
         print '<td align="right">';
-        if (empty($conf->global->PRODUIT_MUTLI_PRICES)) print price(price2num($product->price*$obj->reel,'MT')).'</td>'; // Ditto : Show PMP from movement or from product
+        if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($product->price*$obj->reel,'MT')).'</td>'; // Ditto : Show PMP from movement or from product
         else print $langs->trans("Variable");
 		print '</tr>'; ;
 		$total += $obj->reel;
@@ -564,11 +564,11 @@ print '<td class="liste_total" align="right">';
 print price(price2num($totalvalue,'MT'));
 print '</td>';
 print '<td class="liste_total" align="right">';
-if (empty($conf->global->PRODUIT_MUTLI_PRICES)) print ($total?price($totalvaluesell/$total):'&nbsp;');
+if (empty($conf->global->PRODUIT_MULTI_PRICES)) print ($total?price($totalvaluesell/$total):'&nbsp;');
 else print $langs->trans("Variable");
 print '</td>';
 print '<td class="liste_total" align="right">';
-if (empty($conf->global->PRODUIT_MUTLI_PRICES)) print price(price2num($totalvaluesell,'MT'));
+if (empty($conf->global->PRODUIT_MULTI_PRICES)) print price(price2num($totalvaluesell,'MT'));
 else print $langs->trans("Variable");
 print '</td>';
 print "</tr>";

htdocs/societe/admin/societe_extrafields.php

@@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 $langs->load("companies");
 $langs->load("admin");
+$langs->load("members");
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);