diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index f657f25ce1910d8db2be399ddf430f26a94277ff..ef8f2ea127f17c5102eb41c81048d6b5ed5c7a5d 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -45,6 +45,7 @@ ModulesCommon=Common modules
 ModulesInterfaces=Interfaces modules
 ModulesOther=Other modules
 ModulesJob=Setup modules
+ModulesSpecial=Special modules
 ParameterInDolibarr=Parameter %s
 LanguageParameter=Language parameter %s
 LanguageBrowserParameter=Parameter %s
@@ -154,6 +155,8 @@ Module40Name=Suppliers
 Module40Desc=Suppliers' management
 Module42Name=Syslog
 Module42Desc=Logging facilities (syslog)
+Module49Name=Editors
+Module49Desc=Editors' management
 Module50Name=Products
 Module50Desc=Products' management
 Module52Name=Stocks
@@ -186,6 +189,8 @@ Module200Name=LDAP
 Module200Desc=LDAP directory synchronisation
 Module210Name=PostNuke
 Module210Desc=PostNuke integration
+Module240Name=Data exports
+Module240Desc=Tool to export Dolibarr datas (with assistants)
 Module310Name=Members
 Module310Desc=Foundation members management
 Module320Name=RSS Feed
@@ -209,7 +214,7 @@ Module900Desc=Interface to show an OSCommerce shop via Web services.\nThis modul
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1780Name=Categories
-Module1780Desc=Categories' management
+Module1780Desc=Categories' management (products, suppliers and customers)
 Module2300Name=Menus
 Module2300Desc=Menus' management
 Permission11=Read invoices
diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang
index 5c4eb106ebce26a16f39ae80af3e1beb4c187519..fa8abb0fc628d397ef3a5f011bde2a4c674994f2 100644
--- a/htdocs/langs/en_US/categories.lang
+++ b/htdocs/langs/en_US/categories.lang
@@ -8,7 +8,8 @@ AddIn=Add in
 modify=modify
 Classify=Classify
 CategoriesArea=Categories area
-ProductsCategoriesArea=Products/Services' categories Area
+ProductsCategoriesArea=Products/Services' categories area
+SuppliersCategoriesArea=Suppliers' categories area
 MainCats=Main categories
 SubCats=Subcategories
 CatStatistics=Statistics
@@ -37,15 +38,22 @@ ImpossibleAddCat=Impossible to add the category
 ImpossibleAssociateCategory=Impossible to associate the category to
 WasAddedSuccessfully=was added successfully.
 CategorySuccessfullyCreated=La cat�gorie %s a �t� ajout� avec succ�s.
-ProductIsInCategories=Product/service owns to categories
+ProductIsInCategories=Product/service owns to following categories
+SupplierIsInCategories=Supplier owns to following categories
+CompanyIsInCategories=Companie owns to following categories
 ProductHasNoCategory=This product/service is not in any categories
+SupplierHasNoCategory=This supplier is not in any categories
+CompanyHasNoCategory=This company is not in any categories
 ClassifyInCategory=Classify in category
 NoneCategory=None
 CategoryExistsAtSameLevel=This category already exists at same place
 ReturnInProduct=Back to product/service card
+ReturnInSupplier=Back to supplier card
+ReturnInCompany=Back to customer/prospect card
 ContentsVisibleByAll=The contents will be visible by all
 ContentsVisibleByAllShort=Contents visible by all
 ContentsNotVisibleByAllShort=Contents not visible by all
 CategoriesTree=Categories tree
 DeleteCategory=Delete category
-ConfirmDeleteCategory=Are you sure you want to delete this category ?
\ No newline at end of file
+ConfirmDeleteCategory=Are you sure you want to delete this category ?
+NoCategoriesDefined=No category defined
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 45bcf065d708b3397d899ce48b6188c8dbf4f1cf..f60cbe3075f42c3a67295b4e75e6d143ac3b894e 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -189,8 +189,8 @@ Module200Name=LDAP
 Module200Desc=Synchronisation avec un annuaire LDAP
 Module210Name=PostNuke
 Module210Desc=Int�gration avec PostNuke
-Module240Name=Exports utilisateurs
-Module240Desc= Permet exports par les utilisateurs, via un assistant, de lot de donn�es personalis�es
+Module240Name=Exports de donn�es
+Module240Desc=Outil d'exports de donn�es Dolibarr (via un assistant)
 Module310Name=Adh�rents
 Module310Desc=Gestion des adh�rents d'une association
 Module320Name=Fils RSS
@@ -214,7 +214,7 @@ Module900Desc=Interface de visualisation d'une boutique OSCommerce par acc
 Module1200Name=Mantis
 Module1200Desc=Interface avec le bug tracking Mantis
 Module1780Name=Cat�gories
-Module1780Desc=Gestion des cat�gories
+Module1780Desc=Gestion des cat�gories (produits, fournisseurs et clients)
 Module2200Name=Droit de pr�ts
 Module2200Desc=Gestion du droit de pr�ts
 Module2300Name=Menus
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index b73e89408cbe0135023e422b9ffe595ebc7fdb99..71810a1f0a847819b5e23dc3fec71dd731a6017e 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -9,7 +9,7 @@ modify=modifier
 Classify=Classer
 CategoriesArea=Espace cat�gories
 ProductsCategoriesArea=Espace cat�gories de produits et services
-SuppliersCategoriesArea=Espace cat�gories de produits et services
+SuppliersCategoriesArea=Espace cat�gories de fournisseurs
 MainCats=Cat�gories principales
 SubCats=Sous-cat�gories
 CatStatistics=Statistiques
@@ -56,3 +56,4 @@ ContentsNotVisibleByAllShort=Contenu non visible par tous
 CategoriesTree=Arbre des cat�gories
 DeleteCategory=Supprimer categorie
 ConfirmDeleteCategory=Etes vous sur de vouloir supprimer cette cat�gorie ?
+NoCategoriesDefined=Aucune cat�gorie d�finie
\ No newline at end of file