diff --git a/htdocs/adherents/liste.php b/htdocs/adherents/liste.php index f89016f3dd1..75bbc7d09ee 100644 --- a/htdocs/adherents/liste.php +++ b/htdocs/adherents/liste.php @@ -21,7 +21,7 @@ /** * \file htdocs/adherents/liste.php * \ingroup adherent - * \brief Page to list all members of fundation + * \brief Page to list all members of foundation * \version $Id$ */ diff --git a/htdocs/includes/modules/modMultiCompany.class.php b/htdocs/includes/modules/modMultiCompany.class.php index c0673828c9a..f84f87ee307 100644 --- a/htdocs/includes/modules/modMultiCompany.class.php +++ b/htdocs/includes/modules/modMultiCompany.class.php @@ -102,7 +102,7 @@ class modMultiCompany extends DolibarrModules // 'order' to add a tab in customer order view // 'product' to add a tab in product view // 'propal' to add a tab in propal view - // 'member' to add a tab in fundation member view + // 'member' to add a tab in foundation member view // Boxes diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 4bd52e0414e..ca1a2e33ae9 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -633,7 +633,7 @@ DelaysOfToleranceTransactionsToConciliate=Tolerance delay (in days) before alert DelaysOfToleranceMembers=Tolerance delay (in days) before alert on delayed adherant membership fee DelaysOfToleranceChequesToDeposit=Tolerance delay (in days) before alert for cheques deposit to do SetupDescription1=All parameters available in the setup area allow you to setup Dolibarr before starting using it. -SetupDescription2=The 2 most important setup steps are the 2 first ones in the left setup menu, this means Company/fundation setup page and Modules setup page: +SetupDescription2=The 2 most important setup steps are the 2 first ones in the left setup menu, this means Company/foundation setup page and Modules setup page: SetupDescription3=Company/fundation setup is required because input information is used on Dolibarr displays and to modify Dolibarr behaviour (for example for features related to your country). SetupDescription4=Modules setup is required because Dolibarr is not a simple ERP/CRM but a sum of several modules, all more or less independant. It's only after activating modules you're interesting in that you will see features appeared in Dolibarr menu. EventsSetup=Setup for events logs @@ -645,7 +645,7 @@ LogEventDesc=You can enable the log for Dolibarr security events here. Administr AreaForAdminOnly=Those features can be used by administrator users only. SystemInfoDesc=System information is miscellanous technical information you get in read only mode and visible for administrators only. SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit. -CompanyFundationDesc=Edit on this page all known information of the company or fundation you need to manage +CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here AvailableModules=Available modules ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules). @@ -796,7 +796,7 @@ LDAPNamingAttribute=Key in LDAP LDAPSynchronizeUsers=Synchronize Dolibarr users with LDAP LDAPSynchronizeGroups=Synchronize Dolibarr groups with LDAP LDAPSynchronizeContacts=Synchronize Dolibarr contacts with LDAP -LDAPSynchronizeMembers=Synchronize members of Dolibarr fundation module with LDAP +LDAPSynchronizeMembers=Synchronize members of Dolibarr foundation module with LDAP LDAPTypeExample=OpenLdap, Egroupware or Active Directory LDAPPrimaryServer=Primary server LDAPSecondaryServer=Secondary server diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index b962798dc35..3b24685dbe7 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -239,7 +239,7 @@ ExportCardToFormat=Export card to format ContactNotLinkedToCompany=Contact not linked to any third party DolibarrLogin=Dolibarr login NoDolibarrAccess=No Dolibarr access -ExportDataset_company_1=Companies/fundations and properties +ExportDataset_company_1=Companies/foundations and properties ExportDataset_company_2=Contacts and properties DeliveriesAddress=Delivery addresses DeliveryAddress=Delivery address diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index 4a33bcd627b..164259674a1 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -43,8 +43,8 @@ PredefinedMailContentSendProposal=Veuillez trouver ci-joint la proposition comme PredefinedMailContentSendOrder=Veuillez trouver ci-joint la commande __ORDERREF__\n\nCordialement\n\n DemoDesc=Dolibarr is not a compact ERP but is built from several fonctionnal modules. A demo that includes all modules does not mean anything as this never occurs. So, several demo profiles are available. ChooseYourDemoProfil=Choose the demo profil that match your activity... -DemoFundation=Manage members of a fundation -DemoFundation2=Manage members and bank account of a fundation +DemoFundation=Manage members of a foundation +DemoFundation2=Manage members and bank account of a foundation DemoCompanyServiceOnly=Manage a freelance activiy selling service only DemoCompanyShopWithCashDesk=Manage a shop with a cash desk DemoCompanyProductAndStocks=Manage a small or medium company selling products diff --git a/htdocs/langs/en_US/trips.lang b/htdocs/langs/en_US/trips.lang index c6d288327aa..03a12f37a8d 100644 --- a/htdocs/langs/en_US/trips.lang +++ b/htdocs/langs/en_US/trips.lang @@ -8,7 +8,7 @@ AddTrip=Add trip ListOfTrips=List of trips ListOfFees=List of fees NewTrip=New trip -CompanyVisited=Company/fundation visited +CompanyVisited=Company/foundation visited Kilometers=Kilometers FeesKilometersOrAmout=Amount or kilometers DeleteTrip=Delete trip diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang index f41561fd5e8..61505577b7b 100755 --- a/htdocs/langs/en_US/users.lang +++ b/htdocs/langs/en_US/users.lang @@ -87,8 +87,8 @@ MyInformations=My data ExportDataset_user_1=Dolibarr's users and properties DomainUser=Domain user %s Reactivate=Reactivate -CreateInternalUserDesc=This form allows you to creat an user internal to your company/fundation. To creat an external user (customer, supplier, ...), use button 'Create Dolibarr user' from third party's contact card. -InternalExternalDesc=An internal user is a user that is part of your company/fundation.
An external user is a customer, supplier or other.

In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display) +CreateInternalUserDesc=This form allows you to creat an user internal to your company/foundation. To creat an external user (customer, supplier, ...), use button 'Create Dolibarr user' from third party's contact card. +InternalExternalDesc=An internal user is a user that is part of your company/foundation.
An external user is a customer, supplier or other.

In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display) PermissionInheritedFromAGroup=Permission granted because ineherited from one of a user's group. IdPhoneCaller=Id phone caller UserLogged=User %s connected