diff --git a/dev/translation/sanity_check_en_langfiles.php b/dev/translation/sanity_check_en_langfiles.php
index ea27b2ffc3b..3adf0e92f7c 100755
--- a/dev/translation/sanity_check_en_langfiles.php
+++ b/dev/translation/sanity_check_en_langfiles.php
@@ -283,6 +283,23 @@ if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($a
if (preg_match('/^MonthShort/', $value)) $qualifiedforclean=0;
if (preg_match('/^Day\d/', $value)) $qualifiedforclean=0;
if (preg_match('/^ExportDataset_/', $value)) $qualifiedforclean=0;
+ if (preg_match('/^ImportDataset_/', $value)) $qualifiedforclean=0;
+ if (preg_match('/^ActionAC_/', $value)) $qualifiedforclean=0;
+ if (preg_match('/^TypeLocaltax/', $value)) $qualifiedforclean=0;
+ if (preg_match('/^StatusProspect/', $value)) $qualifiedforclean=0;
+ if (preg_match('/^PL_/', $value)) $qualifiedforclean=0;
+ if (preg_match('/^TE_/', $value)) $qualifiedforclean=0;
+ if (preg_match('/^JuridicalStatus/', $value)) $qualifiedforclean=0;
+ if (preg_match('/^CalcMode/', $value)) $qualifiedforclean=0;
+ if (preg_match('/^newLT/', $value)) $qualifiedforclean=0;
+ if (preg_match('/^LT\dSummary/', $value)) $qualifiedforclean=0;
+ if (preg_match('/^LT\dPaid/', $value)) $qualifiedforclean=0;
+ if (preg_match('/^LT\dPayment/', $value)) $qualifiedforclean=0;
+ if (preg_match('/^LT\dCustomer/', $value)) $qualifiedforclean=0;
+ if (preg_match('/^LT\dSupplier/', $value)) $qualifiedforclean=0;
+ if (preg_match('/^LT\dReport/', $value)) $qualifiedforclean=0;
+ if (preg_match('/^TypeContact_contrat_/', $value)) $qualifiedforclean=0;
+ if (preg_match('/^ErrorPriceExpression/', $value)) $qualifiedforclean=0;
if ($qualifiedforclean)
{
@@ -300,12 +317,13 @@ if ((! empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($a
if (empty($unused)) print "No string not used found.\n";
else
{
- $filetosave='/tmp/notused.lang';
+ $filetosave='/tmp/'.($argv[2]?$argv[2]:"").'notused.lang';
print "Strings in en_US that are never used are saved into file ".$filetosave.":\n";
file_put_contents($filetosave, join("",$unused));
print "To remove from original file, run command :\n";
if (($argv[2]?$argv[2]:"")) print 'cd htdocs/langs/en_US; mv '.($argv[2]?$argv[2]:"")." ".($argv[2]?$argv[2]:"").".tmp; ";
- print "diff ".($argv[2]?$argv[2]:"").".tmp ".$filetosave." | grep \< | cut -b 3- > ".($argv[2]?$argv[2]:"")."\n";
+ print "diff ".($argv[2]?$argv[2]:"").".tmp ".$filetosave." | grep \< | cut -b 3- > ".($argv[2]?$argv[2]:"");
+ if (($argv[2]?$argv[2]:"")) print "; rm ".($argv[2]?$argv[2]:"").".tmp;\n";
}
}
diff --git a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
index 743137ded67..b31b90e5a88 100644
--- a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
@@ -28,8 +28,6 @@ global $user;
$langs = $GLOBALS['langs'];
$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
-$langs->load("expensereports");
-
$var=true;
$total=0;
foreach($linkedObjectBlock as $key => $objectlink)
diff --git a/htdocs/langs/en_US/bookmarks.lang b/htdocs/langs/en_US/bookmarks.lang
index 19e383b2b3e..e529130e1bc 100644
--- a/htdocs/langs/en_US/bookmarks.lang
+++ b/htdocs/langs/en_US/bookmarks.lang
@@ -16,4 +16,3 @@ SetHereATitleForLink=Set a title for the bookmark
UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external http URL or a relative Dolibarr URL
ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if linked page must open in new window or not
BookmarksManagement=Bookmarks management
-ListOfBookmarks=List of bookmarks
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index bbb03afa4f2..ff20b6afb1c 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -12,45 +12,27 @@ BoxLastProspects=Latest modified prospects
BoxLastCustomers=Latest modified customers
BoxLastSuppliers=Latest modified suppliers
BoxLastCustomerOrders=Latest customer orders
-BoxLastValidatedCustomerOrders=Latest validated customer orders
-BoxLastBooks=Latest bookmarks
BoxLastActions=Latest actions
BoxLastContracts=Latest contracts
BoxLastContacts=Latest contacts/addresses
BoxLastMembers=Latest members
BoxFicheInter=Latest interventions
BoxCurrentAccounts=Open accounts balance
-BoxSalesTurnover=Sales turnover
-BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
-BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
-BoxTitleLastBooks=Latest %s recorded bookmarks
-BoxTitleNbOfCustomers=Number of clients
BoxTitleLastRssInfos=Latest %s news from %s
BoxTitleLastProducts=Latest %s modified products/services
BoxTitleProductsAlertStock=Products in stock alert
-BoxTitleLastCustomerOrders=Latest %s customer orders
-BoxTitleLastModifiedCustomerOrders=Latest %s modified customer orders
BoxTitleLastSuppliers=Latest %s recorded suppliers
-BoxTitleLastCustomers=Latest %s recorded customers
BoxTitleLastModifiedSuppliers=Latest %s modified suppliers
BoxTitleLastModifiedCustomers=Latest %s modified customers
BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastPropals=Latest %s proposals
-BoxTitleLastModifiedPropals=Latest %s modified proposals
BoxTitleLastCustomerBills=Latest %s customer's invoices
-BoxTitleLastModifiedCustomerBills=Latest %s modified customer invoices
BoxTitleLastSupplierBills=Latest %s supplier's invoices
-BoxTitleLastModifiedSupplierBills=Latest %s modified supplier invoices
BoxTitleLastModifiedProspects=Latest %s modified prospects
-BoxTitleLastProductsInContract=Latest %s products/services in a contract
BoxTitleLastModifiedMembers=Latest %s members
BoxTitleLastFicheInter=Latest %s modified interventions
BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer invoices
BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier invoices
BoxTitleCurrentAccounts=Open accounts balances
-BoxTitleSalesTurnover=Sales turnover
-BoxTitleTotalUnpaidCustomerBills=Unpaid customer invoices
-BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier invoices
BoxTitleLastModifiedContacts=Latest %s modified contacts/addresses
BoxMyLastBookmarks=My latest %s bookmarks
BoxOldestExpiredServices=Oldest active expired services
@@ -73,7 +55,6 @@ NoRecordedOrders=No recorded customer's orders
NoRecordedProposals=No recorded proposals
NoRecordedInvoices=No recorded customer's invoices
NoUnpaidCustomerBills=No unpaid customer's invoices
-NoRecordedSupplierInvoices=No recorded supplier's invoices
NoUnpaidSupplierBills=No unpaid supplier's invoices
NoModifiedSupplierBills=No recorded supplier's invoices
NoRecordedProducts=No recorded products/services
@@ -82,8 +63,6 @@ NoContractedProducts=No products/services contracted
NoRecordedContracts=No recorded contracts
NoRecordedInterventions=No recorded interventions
BoxLatestSupplierOrders=Latest supplier orders
-BoxTitleLatestSupplierOrders=Latest %s supplier orders
-BoxTitleLatestModifiedSupplierOrders=Latest %s modified supplier orders
NoSupplierOrder=No recorded supplier order
BoxCustomersInvoicesPerMonth=Customer invoices per month
BoxSuppliersInvoicesPerMonth=Supplier invoices per month
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index f3b5f77f296..7b80d1a6f47 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -1,8 +1,6 @@
# Language file - Source file is en_US - cashdesk
CashDeskMenu=Point of sale
CashDesk=Point of sale
-CashDesks=Point of sales
-CashDeskBank=Bank account
CashDeskBankCash=Bank account (cash)
CashDeskBankCB=Bank account (card)
CashDeskBankCheque=Bank account (cheque)
@@ -12,7 +10,6 @@ CashDeskProducts=Products
CashDeskStock=Stock
CashDeskOn=on
CashDeskThirdParty=Third party
-CashdeskDashboard=Point of sale access
ShoppingCart=Shopping cart
NewSell=New sell
BackOffice=Back office
@@ -22,7 +19,6 @@ SellFinished=Sell finished
PrintTicket=Print ticket
NoProductFound=No article found
ProductFound=product found
-ProductsFound=products found
NoArticle=No article
Identification=Identification
Article=Article
@@ -30,8 +26,6 @@ Difference=Difference
TotalTicket=Total ticket
NoVAT=No VAT for this sale
Change=Excess received
-CalTip=Click to view the calendar
-CashDeskSetupStock=You ask to decrease stock on invoice creation but warehouse for this is was not defined
Change stock module setup, or choose a warehouse
BankToPay=Charge Account
ShowCompany=Show company
ShowStock=Show warehouse
diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang
index a3cfb6828a1..976c8a50d93 100644
--- a/htdocs/langs/en_US/categories.lang
+++ b/htdocs/langs/en_US/categories.lang
@@ -2,7 +2,6 @@
Rubrique=Tag/Category
Rubriques=Tags/Categories
categories=tags/categories
-TheCategorie=The tag/category
NoCategoryYet=No tag/category of this type created
In=In
AddIn=Add in
@@ -12,65 +11,38 @@ CategoriesArea=Tags/Categories area
ProductsCategoriesArea=Products/Services tags/categories area
SuppliersCategoriesArea=Suppliers tags/categories area
CustomersCategoriesArea=Customers tags/categories area
-ThirdPartyCategoriesArea=Third parties tags/categories area
MembersCategoriesArea=Members tags/categories area
ContactsCategoriesArea=Contacts tags/categories area
AccountsCategoriesArea=Accounts tags/categories area
-MainCats=Main tags/categories
SubCats=Subcategories
-CatStatistics=Statistics
CatList=List of tags/categories
-AllCats=All tags/categories
-ViewCat=View tag/category
-NewCat=Add tag/category
NewCategory=New tag/category
ModifCat=Modify tag/category
CatCreated=Tag/category created
CreateCat=Create tag/category
CreateThisCat=Create this tag/category
-ValidateFields=Validate the fields
NoSubCat=No subcategory.
SubCatOf=Subcategory
FoundCats=Found tags/categories
-FoundCatsForName=Tags/categories found for the name :
-FoundSubCatsIn=Subcategories found in the tag/category
-ErrSameCatSelected=You selected the same tag/category several times
-ErrForgotCat=You forgot to choose the tag/category
-ErrForgotField=You forgot to inform the fields
-ErrCatAlreadyExists=This name is already used
-AddProductToCat=Add this product to a tag/category?
ImpossibleAddCat=Impossible to add the tag/category %s
-ImpossibleAssociateCategory=Impossible to associate the tag/category to
WasAddedSuccessfully=%s was added successfully.
ObjectAlreadyLinkedToCategory=Element is already linked to this tag/category.
-CategorySuccessfullyCreated=This tag/category %s has been added successfully.
ProductIsInCategories=Product/service is linked to following tags/categories
-SupplierIsInCategories=Third party is linked to following suppliers tags/categories
CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
CompanyIsInSuppliersCategories=This third party is linked to following suppliers tags/categories
MemberIsInCategories=This member is linked to following members tags/categories
ContactIsInCategories=This contact is linked to following contacts tags/categories
ProductHasNoCategory=This product/service is not in any tags/categories
-SupplierHasNoCategory=This supplier is not in any tags/categories
CompanyHasNoCategory=This thirdparty is not in any tags/categories
MemberHasNoCategory=This member is not in any tags/categories
ContactHasNoCategory=This contact is not in any tags/categories
-AccountHasNoCategory=This account is not in any tags/categories
ClassifyInCategory=Add to tag/category
-NoneCategory=None
NotCategorized=Without tag/category
CategoryExistsAtSameLevel=This category already exists with this ref
-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=Tags/categories tree
DeleteCategory=Delete tag/category
ConfirmDeleteCategory=Are you sure you want to delete this tag/category ?
-RemoveFromCategory=Remove link with tag/category
-RemoveFromCategoryConfirm=Are you sure you want to unlink the transaction from the tag/category ?
NoCategoriesDefined=No tag/category defined
SuppliersCategoryShort=Suppliers tag/category
CustomersCategoryShort=Customers tag/category
@@ -90,10 +62,6 @@ ThisCategoryHasNoCustomer=This category does not contain any customer.
ThisCategoryHasNoMember=This category does not contain any member.
ThisCategoryHasNoContact=This category does not contain any contact.
ThisCategoryHasNoAccount=This category does not contain any account.
-AssignedToCustomer=Assigned to a customer
-AssignedToTheCustomer=Assigned to the customer
-InternalCategory=Internal category
-CategoryContents=Tag/category contents
CategId=Tag/category id
CatSupList=List of supplier tags/categories
CatCusList=List of customer/prospect tags/categories
@@ -103,7 +71,6 @@ CatContactList=List of contact tags/categories
CatSupLinks=Links between suppliers and tags/categories
CatCusLinks=Links between customers/prospects and tags/categories
CatProdLinks=Links between products/services and tags/categories
-CatMemberLinks=Links between members and tags/categories
DeleteFromCat=Remove from tags/category
ExtraFieldsCategories=Complementary attributes
CategoriesSetup=Tags/categories setup
diff --git a/htdocs/langs/en_US/commercial.lang b/htdocs/langs/en_US/commercial.lang
index 03798ed96aa..825f429a3a2 100644
--- a/htdocs/langs/en_US/commercial.lang
+++ b/htdocs/langs/en_US/commercial.lang
@@ -1,8 +1,6 @@
# Dolibarr language file - Source file is en_US - commercial
Commercial=Commercial
CommercialArea=Commercial area
-CommercialCard=Commercial card
-CustomerArea=Customers area
Customer=Customer
Customers=Customers
Prospect=Prospect
@@ -12,13 +10,10 @@ NewAction=New event
AddAction=Create event
AddAnAction=Create an event
AddActionRendezVous=Create a Rendez-vous event
-Rendez-Vous=Rendezvous
ConfirmDeleteAction=Are you sure you want to delete this event ?
CardAction=Event card
-PercentDone=Percentage complete
ActionOnCompany=Related company
ActionOnContact=Related contact
-TaskRDV=Meetings
TaskRDVWith=Meeting with %s
ShowTask=Show task
ShowAction=Show event
@@ -28,30 +23,21 @@ SalesRepresentative=Sales representative
SalesRepresentatives=Sales representatives
SalesRepresentativeFollowUp=Sales representative (follow-up)
SalesRepresentativeSignature=Sales representative (signature)
-CommercialInterlocutor=Commercial interlocutor
-ErrorWrongCode=Wrong code
NoSalesRepresentativeAffected=No particular sales representative assigned
ShowCustomer=Show customer
ShowProspect=Show prospect
ListOfProspects=List of prospects
ListOfCustomers=List of customers
LastDoneTasks=Latest %s completed tasks
-LastRecordedTasks=Latest recorded tasks
LastActionsToDo=Oldest %s not completed actions
-DoneAndToDoActionsFor=Completed and To do events for %s
DoneAndToDoActions=Completed and To do events
DoneActions=Completed events
-DoneActionsFor=Completed events for %s
ToDoActions=Incomplete events
-ToDoActionsFor=Incomplete events for %s
SendPropalRef=Submission of commercial proposal %s
SendOrderRef=Submission of order %s
StatusNotApplicable=Not applicable
StatusActionToDo=To do
StatusActionDone=Complete
-MyActionsAsked=Events I have recorded
-MyActionsToDo=Events I have to do
-MyActionsDone=Events assigned to me
StatusActionInProcess=In process
TasksHistoryForThisContact=Events for this contact
LastProspectDoNotContact=Do not contact
@@ -59,13 +45,8 @@ LastProspectNeverContacted=Never contacted
LastProspectToContact=To contact
LastProspectContactInProcess=Contact in process
LastProspectContactDone=Contact done
-DateActionPlanned=Date event planned for
-DateActionDone=Date event done
-ActionAskedBy=Event reported by
ActionAffectedTo=Event assigned to
ActionDoneBy=Event done by
-ActionUserAsk=Reported by
-ErrorStatusCantBeZeroIfStarted=If field 'Date done' is filled, action is started (or finished), so field 'Status' can't be 0%%.
ActionAC_TEL=Phone call
ActionAC_FAX=Send fax
ActionAC_PROP=Send proposal by mail
@@ -85,13 +66,6 @@ ActionAC_OTH_AUTO=Other (automatically inserted events)
ActionAC_MANUAL=Manually inserted events
ActionAC_AUTO=Automatically inserted events
Stats=Sales statistics
-CAOrder=Sales volume (validated orders)
-FromTo=from %s to %s
-MargeOrder=Margins (validated orders)
-RecapAnnee=Summary of the year
-NoData=There is no data
StatusProsp=Prospect status
DraftPropals=Draft commercial proposals
-SearchPropal=Search a commercial proposal
-CommercialDashboard=Commercial summary
NoLimit=No limit
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index bd57c1226dd..f13a2ec02ec 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -1,33 +1,25 @@
# Dolibarr language file - Source file is en_US - companies
ErrorCompanyNameAlreadyExists=Company name %s already exists. Choose another one.
-ErrorPrefixAlreadyExists=Prefix %s already exists. Choose another one.
ErrorSetACountryFirst=Set the country first
SelectThirdParty=Select a third party
-DeleteThirdParty=Delete a third party
ConfirmDeleteCompany=Are you sure you want to delete this company and all inherited information ?
DeleteContact=Delete a contact/address
ConfirmDeleteContact=Are you sure you want to delete this contact and all inherited information ?
MenuNewThirdParty=New third party
-MenuNewCompany=New company
MenuNewCustomer=New customer
MenuNewProspect=New prospect
MenuNewSupplier=New supplier
MenuNewPrivateIndividual=New private individual
-MenuSocGroup=Groups
NewCompany=New company (prospect, customer, supplier)
NewThirdParty=New third party (prospect, customer, supplier)
-NewSocGroup=New company group
-NewPrivateIndividual=New private individual (prospect, customer, supplier)
CreateDolibarrThirdPartySupplier=Create a third party (supplier)
ProspectionArea=Prospection area
-SocGroup=Group of companies
IdThirdParty=Id third party
IdCompany=Company Id
IdContact=Contact Id
Contacts=Contacts/Addresses
ThirdPartyContacts=Third party contacts
ThirdPartyContact=Third party contact/address
-StatusContactValidated=Status of contact/address
Company=Company
CompanyName=Company name
AliasNames=Alias name (commercial, trademark, ...)
@@ -37,7 +29,6 @@ CountryIsInEEC=Country is inside European Economic Community
ThirdPartyName=Third party name
ThirdParty=Third party
ThirdParties=Third parties
-ThirdPartyAll=Third parties (all)
ThirdPartyProspects=Prospects
ThirdPartyProspectsStats=Prospects
ThirdPartyCustomers=Customers
@@ -49,9 +40,7 @@ Company/Fundation=Company/Foundation
Individual=Private individual
ToCreateContactWithSameName=Will create automatically a physical contact with same informations
ParentCompany=Parent company
-Subsidiary=Subsidiary
Subsidiaries=Subsidiaries
-NoSubsidiary=No subsidiary
ReportByCustomers=Report by customers
ReportByQuarter=Report by rate
CivilityCode=Civility code
@@ -60,7 +49,6 @@ Lastname=Last name
Firstname=First name
PostOrFunction=Post/Function
UserTitle=Title
-Surname=Surname/Pseudo
Address=Address
State=State/Province
StateShort=State
@@ -86,7 +74,6 @@ DefaultLang=Language by default
VATIsUsed=VAT is used
VATIsNotUsed=VAT is not used
CopyAddressFromSoc=Fill address with thirdparty address
-NoEmailDefined=There is no email defined
##### Local Taxes #####
LocalTax1IsUsed=Use second tax
LocalTax1IsUsedES= RE is used
@@ -98,8 +85,6 @@ LocalTax1ES=RE
LocalTax2ES=IRPF
TypeLocaltax1ES=RE Type
TypeLocaltax2ES=IRPF Type
-TypeES=Type
-ThirdPartyEMail=%s
WrongCustomerCode=Customer code invalid
WrongSupplierCode=Supplier code invalid
CustomerCodeModel=Customer code model
@@ -252,16 +237,13 @@ ProfId5RU=-
ProfId6RU=-
VATIntra=VAT number
VATIntraShort=VAT number
-VATIntraVeryShort=VAT
VATIntraSyntaxIsValid=Syntax is valid
VATIntraValueIsValid=Value is valid
ProspectCustomer=Prospect / Customer
Prospect=Prospect
CustomerCard=Customer Card
Customer=Customer
-CustomerDiscount=Customer Discount
CustomerRelativeDiscount=Relative customer discount
-CustomerAbsoluteDiscount=Absolute customer discount
CustomerRelativeDiscountShort=Relative discount
CustomerAbsoluteDiscountShort=Absolute discount
CompanyHasRelativeDiscount=This customer has a default discount of %s%%
@@ -271,11 +253,8 @@ CompanyHasCreditNote=This customer still has credit notes for %s %s
CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
CustomerAbsoluteDiscountAllUsers=Absolute discounts (granted by all users)
CustomerAbsoluteDiscountMy=Absolute discounts (granted by yourself)
-DefaultDiscount=Default discount
-AvailableGlobalDiscounts=Absolute discounts available
DiscountNone=None
Supplier=Supplier
-CompanyList=Company's list
AddContact=Create contact
AddContactAddress=Create contact/address
EditContact=Edit contact
@@ -285,7 +264,6 @@ ContactsAddresses=Contacts/Addresses
NoContactDefinedForThirdParty=No contact defined for this third party
NoContactDefined=No contact defined
DefaultContact=Default contact/address
-AddCompany=Create company
AddThirdParty=Create third party
DeleteACompany=Delete a company
PersonalInformations=Personal data
@@ -294,23 +272,16 @@ CustomerCode=Customer code
SupplierCode=Supplier code
CustomerCodeShort=Customer code
SupplierCodeShort=Supplier code
-CustomerAccount=Customer account
-SupplierAccount=Supplier account
CustomerCodeDesc=Customer code, unique for all customers
SupplierCodeDesc=Supplier code, unique for all suppliers
RequiredIfCustomer=Required if third party is a customer or prospect
RequiredIfSupplier=Required if third party is a supplier
ValidityControledByModule=Validity controled by module
ThisIsModuleRules=This is rules for this module
-LastProspect=Latest
ProspectToContact=Prospect to contact
CompanyDeleted=Company "%s" deleted from database.
ListOfContacts=List of contacts/addresses
ListOfContactsAddresses=List of contacts/adresses
-ListOfProspectsContacts=List of prospect contacts
-ListOfCustomersContacts=List of customer contacts
-ListOfSuppliersContacts=List of supplier contacts
-ListOfCompanies=List of companies
ListOfThirdParties=List of third parties
ShowCompany=Show thirdparty
ShowContact=Show contact
@@ -322,19 +293,15 @@ ContactForProposals=Proposal's contact
ContactForContracts=Contract's contact
ContactForInvoices=Invoice's contact
NoContactForAnyOrder=This contact is not a contact for any order
-NoContactForAnyOrderOrShipment=This contact is not a contact for any order or shipment
NoContactForAnyProposal=This contact is not a contact for any commercial proposal
NoContactForAnyContract=This contact is not a contact for any contract
NoContactForAnyInvoice=This contact is not a contact for any invoice
NewContact=New contact
NewContactAddress=New contact/address
-LastContacts=Latest contacts
MyContacts=My contacts
-Phones=Phones
Capital=Capital
CapitalOf=Capital of %s
EditCompany=Edit company
-EditDeliveryAddress=Edit delivery address
ThisUserIsNot=This user is not a prospect, customer nor supplier
VATIntraCheck=Check
VATIntraCheckDesc=The link %s allows to ask the european VAT checker service. An external internet access from server is required for this service to work.
@@ -379,10 +346,7 @@ ChangeToContact=Change status to 'To be contacted'
ChangeContactInProcess=Change status to 'Contact in process'
ChangeContactDone=Change status to 'Contact done'
ProspectsByStatus=Prospects by status
-BillingContact=Billing contact
-NoRIB=No BAN defined
NoParentCompany=None
-ExportImport=Import-Export
ExportCardToFormat=Export card to format
ContactNotLinkedToCompany=Contact not linked to any third party
DolibarrLogin=Dolibarr login
@@ -394,24 +358,14 @@ ImportDataset_company_2=Contacts/Addresses (of thirdparties or not) and attribut
ImportDataset_company_3=Bank details
ImportDataset_company_4=Third parties/Sales representatives (Affect sales representatives users to companies)
PriceLevel=Price level
-DeliveriesAddress=Delivery addresses
DeliveryAddress=Delivery address
-DeliveryAddressLabel=Delivery address label
-DeleteDeliveryAddress=Delete a delivery address
-ConfirmDeleteDeliveryAddress=Are you sure you want to delete this delivery address ?
-NewDeliveryAddress=New delivery address
-AddDeliveryAddress=Add delivery address
AddAddress=Add address
-NoOtherDeliveryAddress=No alternative delivery address defined
SupplierCategory=Supplier category
JuridicalStatus200=Independent
DeleteFile=Delete file
ConfirmDeleteFile=Are you sure you want to delete this file?
AllocateCommercial=Assigned to sales representative
-SelectCountry=Select a country
-SelectCompany=Select a third party
Organization=Organization
-AutomaticallyGenerated=Automatically generated
FiscalYearInformation=Information on the fiscal year
FiscalMonthStart=Starting month of the fiscal year
YouMustCreateContactFirst=To be able to add email notifications, you must first insert email contacts for the third party
@@ -423,7 +377,6 @@ LastModifiedThirdParties=Latest %s modified third parties
UniqueThirdParties=Total of unique third parties
InActivity=Open
ActivityCeased=Closed
-ActivityStateFilter=Activity status
ProductsIntoElements=List of products/services into %s
CurrentOutstandingBill=Current outstanding bill
OutstandingBill=Max. for outstanding bill
@@ -431,15 +384,10 @@ OutstandingBillReached=Max. for outstanding bill reached
MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
ManagingDirectors=Manager(s) name (CEO, director, president...)
-SearchThirdparty=Search third party
-SearchContact=Search contact
MergeOriginThirdparty=Duplicate third party (third party you want to delete)
MergeThirdparties=Merge third parties
ConfirmMergeThirdparties=Are you sure you want to merge this third party into the current one ? All linked objects (invoices, orders, ...) will be moved to current third party so you will be able to delete the duplicate one.
ThirdpartiesMergeSuccess=Thirdparties have been merged
-ErrorThirdpartiesMerge=There was an error when deleting the thirdparties. Please check the log. Changes have been reverted.
SaleRepresentativeLogin=Login of sales representative
SaleRepresentativeFirstname=Firstname of sales representative
SaleRepresentativeLastname=Lastname of sales representative
-ModelModulesContact=Document Models of contact
-ModelModulesThirdParties=Document models of third party
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index c2893c0dbcc..66869d57e3f 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -1,7 +1,4 @@
# Dolibarr language file - Source file is en_US - compta
-Accountancy=Accountancy
-AccountancyCard=Accountancy card
-Treasury=Treasury
MenuFinancial=Financial
TaxModuleSetupToModifyRules=Go to Taxes module setup to modify rules for calculation
TaxModuleSetupToModifyRulesLT=Go to Company setup to modify rules for calculation
@@ -15,13 +12,9 @@ VATReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using
LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
Param=Setup
RemainingAmountPayment=Amount payment remaining :
-AmountToBeCharged=Total amount to pay :
-AccountsGeneral=Accounts
Account=Account
-Accounts=Accounts
Accountparent=Account parent
Accountsparent=Accounts parent
-BillsForSuppliers=Bills for suppliers
Income=Income
Outcome=Expense
ReportInOut=Income / Expense
@@ -34,8 +27,6 @@ Balance=Balance
Debit=Debit
Credit=Credit
Piece=Accounting Doc.
-Withdrawal=Withdrawal
-Withdrawals=Withdrawals
AmountHTVATRealReceived=Net collected
AmountHTVATRealPaid=Net paid
VATToPay=VAT sells
@@ -45,7 +36,6 @@ VATSummary=VAT Balance
LT2SummaryES=IRPF Balance
LT1SummaryES=RE Balance
VATPaid=VAT paid
-SalaryPaid=Salary paid
LT2PaidES=IRPF Paid
LT1PaidES=RE Paid
LT2CustomerES=IRPF sales
@@ -54,36 +44,27 @@ LT1CustomerES=RE sales
LT1SupplierES=RE purchases
VATCollected=VAT collected
ToPay=To pay
-ToGet=To get back
SpecialExpensesArea=Area for all special payments
-TaxAndDividendsArea=Sale taxes, social/fiscal taxes contributions and dividends area
SocialContribution=Social or fiscal tax
SocialContributions=Social or fiscal taxes
SocialContributionsDeductibles=Deductible social or fiscal taxes
SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
MenuSpecialExpenses=Special expenses
MenuTaxAndDividends=Taxes and dividends
-MenuSalaries=Salaries
MenuSocialContributions=Social/fiscal taxes
MenuNewSocialContribution=New social/fiscal tax
NewSocialContribution=New social/fiscal tax
ContributionsToPay=Social/fiscal taxes to pay
AccountancyTreasuryArea=Accountancy/Treasury area
-AccountancySetup=Accountancy setup
NewPayment=New payment
Payments=Payments
PaymentCustomerInvoice=Customer invoice payment
-PaymentSupplierInvoice=Supplier invoice payment
PaymentSocialContribution=Social/fiscal tax payment
PaymentVat=VAT payment
-PaymentSalary=Salary payment
ListPayment=List of payments
-ListOfPayments=List of payments
ListOfCustomerPayments=List of customer payments
-ListOfSupplierPayments=List of supplier payments
DateStartPeriod=Date start period
DateEndPeriod=Date end period
-NewVATPayment=New VAT payment
newLT1Payment=New tax 2 payment
newLT2Payment=New tax 3 payment
LT1Payment=Tax 2 payment
@@ -103,12 +84,10 @@ Refund=Refund
SocialContributionsPayments=Social/fiscal taxes payments
ShowVatPayment=Show VAT payment
TotalToPay=Total to pay
-TotalVATReceived=Total VAT received
CustomerAccountancyCode=Customer accountancy code
SupplierAccountancyCode=Supplier accountancy code
CustomerAccountancyCodeShort=Cust. account. code
SupplierAccountancyCodeShort=Sup. account. code
-AccountNumberShort=Account number
AccountNumber=Account number
NewAccount=New account
SalesTurnover=Sales turnover
@@ -116,9 +95,6 @@ SalesTurnoverMinimum=Minimum sales turnover
ByExpenseIncome=By expenses & incomes
ByThirdParties=By third parties
ByUserAuthorOfInvoice=By invoice author
-AccountancyExport=Accountancy export
-ErrorWrongAccountancyCodeForCompany=Bad customer accountancy code for %s
-SuppliersProductsSellSalesTurnover=The generated turnover by the sales of supplier's products.
CheckReceipt=Check deposit
CheckReceiptShort=Check deposit
LastCheckReceiptShort=Latest %s check receipts
@@ -189,16 +165,12 @@ DescSellsJournal=Sales Journal
DescPurchasesJournal=Purchases Journal
InvoiceRef=Invoice ref.
CodeNotDef=Not defined
-AddRemind=Dispatch available amount
-RemainToDivide= Remain to dispatch :
WarningDepositsNotIncluded=Deposits invoices are not included in this version with this accountancy module.
DatePaymentTermCantBeLowerThanObjectDate=Payment term date can't be lower than object date.
Pcg_version=Pcg version
Pcg_type=Pcg type
Pcg_subtype=Pcg subtype
InvoiceLinesToDispatch=Invoice lines to dispatch
-InvoiceDispatched=Dispatched invoices
-AccountancyDashboard=Accountancy summary
ByProductsAndServices=By products and services
RefExt=External ref
ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click onto button "%s".
diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang
index 620d212c386..bb4bb033b03 100644
--- a/htdocs/langs/en_US/contracts.lang
+++ b/htdocs/langs/en_US/contracts.lang
@@ -1,12 +1,9 @@
# Dolibarr language file - Source file is en_US - contracts
ContractsArea=Contracts area
ListOfContracts=List of contracts
-LastModifiedContracts=Latest %s modified contracts
AllContracts=All contracts
ContractCard=Contract card
-ContractStatus=Contract status
ContractStatusNotRunning=Not running
-ContractStatusRunning=Running
ContractStatusDraft=Draft
ContractStatusValidated=Validated
ContractStatusClosed=Closed
@@ -17,7 +14,6 @@ ServiceStatusNotLateShort=Not expired
ServiceStatusLate=Running, expired
ServiceStatusLateShort=Expired
ServiceStatusClosed=Closed
-ServicesLegend=Services legend
Contracts=Contracts
ContractsSubscriptions=Contracts/Subscriptions
ContractsAndLine=Contracts and line of contracts
@@ -33,7 +29,6 @@ MenuClosedServices=Closed services
NewContract=New contract
NewContractSubscription=New contract/subscription
AddContract=Create contract
-SearchAContract=Search a contract
DeleteAContract=Delete a contract
CloseAContract=Close a contract
ConfirmDeleteAContract=Are you sure you want to delete this contract and all its services ?
@@ -46,22 +41,16 @@ ConfirmActivateService=Are you sure you want to activate this service with date
RefContract=Contract reference
DateContract=Contract date
DateServiceActivate=Service activation date
-DateServiceUnactivate=Service deactivation date
-DateServiceStart=Date for beginning of service
-DateServiceEnd=Date for end of service
ShowContract=Show contract
ListOfServices=List of services
ListOfInactiveServices=List of not active services
ListOfExpiredServices=List of expired active services
ListOfClosedServices=List of closed services
-ListOfRunningContractsLines=List of running contract lines
ListOfRunningServices=List of running services
NotActivatedServices=Inactive services (among validated contracts)
BoardNotActivatedServices=Services to activate among validated contracts
LastContracts=Latest %s contracts
-LastActivatedServices=Latest %s activated services
LastModifiedServices=Latest %s modified services
-EditServiceLine=Edit service line
ContractStartDate=Start date
ContractEndDate=End date
DateStartPlanned=Planned start date
@@ -72,10 +61,7 @@ DateStartReal=Real start date
DateStartRealShort=Real start date
DateEndReal=Real end date
DateEndRealShort=Real end date
-NbOfServices=Nb of services
CloseService=Close service
-ServicesNomberShort=%s service(s)
-RunningServices=Running services
BoardRunningServices=Expired running services
ServiceStatus=Status of service
DraftContracts=Drafts contracts
@@ -88,7 +74,6 @@ ConfirmMoveToAnotherContract=I choosed new target contract and confirm I want to
ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same third party), you want to move this service to ?
PaymentRenewContractId=Renew contract line (number %s)
ExpiredSince=Expiration date
-RelatedContracts=Related contracts
NoExpiredServices=No expired active services
ListOfServicesToExpireWithDuration=List of Services to expire in %s days
ListOfServicesToExpireWithDurationNeg=List of Services expired from more than %s days
@@ -104,4 +89,3 @@ TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up cont
TypeContact_contrat_external_BILLING=Billing customer contact
TypeContact_contrat_external_CUSTOMER=Follow-up customer contact
TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact
-Error_CONTRACT_ADDON_NotDefined=Constant CONTRACT_ADDON not defined
diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index b7f68681d30..d52433ed267 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -1,8 +1,5 @@
# Dolibarr language file - Source file is en_US - cron
# About page
-About = About
-CronAbout = About Cron
-CronAboutPage = Cron about page
# Right
Permission23101 = Read Scheduled job
Permission23102 = Create/update Scheduled job
@@ -18,15 +15,10 @@ CronExplainHowToRunUnix=On Unix environment you should use the following crontab
CronExplainHowToRunWin=On Microsoft(tm) Windows environement you can use Scheduled task tools to run the command line each 5 minutes
CronMethodDoesNotExists=Class %s does not contains any method %s
# Menu
-CronJobs=Scheduled jobs
-CronListActive=List of enabled/scheduled jobs
-CronListInactive=List of disabled jobs
EnabledAndDisabled=Enabled and disabled
# Page list
-CronDateLastRun=Last run
CronLastOutput=Last run output
CronLastResult=Last result code
-CronListOfCronJobs=List of scheduled jobs
CronCommand=Command
CronList=Scheduled jobs
CronDelete=Delete scheduled jobs
@@ -34,7 +26,6 @@ CronConfirmDelete=Are you sure you want to delete these scheduled jobs ?
CronExecute=Launch scheduled jobs
CronConfirmExecute=Are you sure you want to execute these scheduled jobs now ?
CronInfo=Scheduled job module allow to execute job that have been planned
-CronWaitingJobs=Waiting jobs
CronTask=Job
CronNone=None
CronDtStart=Not before
@@ -46,10 +37,6 @@ CronFrequency=Frequency
CronClass=Class
CronMethod=Method
CronModule=Module
-CronAction=Action
-CronStatus=Status
-CronStatusActive=Enabled
-CronStatusInactive=Disabled
CronNoJobs=No jobs registered
CronPriority=Priority
CronLabel=Description
@@ -59,7 +46,6 @@ CronEach=Every
JobFinished=Job launched and finished
#Page card
CronAdd= Add jobs
-CronHourStart= Start hour and date of job
CronEvery=Execute job each
CronObject=Instance/Object to create
CronArgs=Parameters
@@ -81,12 +67,10 @@ CronCommandHelp=The system command line to execute.
CronCreateJob=Create new Scheduled Job
CronFrom=From
# Info
-CronInfoPage=Information
# Common
CronType=Job type
CronType_method=Call method of a Dolibarr Class
CronType_command=Shell command
-CronMenu=Cron
CronCannotLoadClass=Cannot load class %s or object %s
UseMenuModuleToolsToAddCronJobs=Go into menu "Home - Admin tools - Scheduled jobs" to see and edit scheduled jobs.
JobDisabled=Job disabled
diff --git a/htdocs/langs/en_US/deliveries.lang b/htdocs/langs/en_US/deliveries.lang
index d4dfcbd81b8..4242cc7ea81 100644
--- a/htdocs/langs/en_US/deliveries.lang
+++ b/htdocs/langs/en_US/deliveries.lang
@@ -1,15 +1,11 @@
# Dolibarr language file - Source file is en_US - deliveries
Delivery=Delivery
DeliveryRef=Ref Delivery
-Deliveries=Deliveries
DeliveryCard=Delivery card
DeliveryOrder=Delivery order
-DeliveryOrders=Delivery orders
DeliveryDate=Delivery date
-DeliveryDateShort=Deliv. date
CreateDeliveryOrder=Generate delivery order
DeliveryStateSaved=Delivery state saved
-QtyDelivered=Qty delivered
SetDeliveryDate=Set shipping date
ValidateDeliveryReceipt=Validate delivery receipt
ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt ?
@@ -31,4 +27,4 @@ Recipient=Recipient
ErrorStockIsNotEnough=There's not enough stock
Shippable=Shippable
NonShippable=Not Shippable
-ShowReceiving=Show delivery receipt
\ No newline at end of file
+ShowReceiving=Show delivery receipt
diff --git a/htdocs/langs/en_US/donations.lang b/htdocs/langs/en_US/donations.lang
index 24ce0cc17b0..89f9c1857f4 100644
--- a/htdocs/langs/en_US/donations.lang
+++ b/htdocs/langs/en_US/donations.lang
@@ -3,19 +3,12 @@ Donation=Donation
Donations=Donations
DonationRef=Donation ref.
Donor=Donor
-Donors=Donors
AddDonation=Create a donation
NewDonation=New donation
DeleteADonation=Delete a donation
ConfirmDeleteADonation=Are you sure you want to delete this donation ?
ShowDonation=Show donation
-DonationPromise=Gift promise
-PromisesNotValid=Not validated promises
-PromisesValid=Validated promises
-DonationsPaid=Donations paid
-DonationsReceived=Donations received
PublicDonation=Public donation
-DonationsNumber=Donation number
DonationsArea=Donations area
DonationStatusPromiseNotValidated=Draft promise
DonationStatusPromiseValidated=Validated promise
@@ -27,12 +20,9 @@ DonationTitle=Donation receipt
DonationDatePayment=Payment date
ValidPromess=Validate promise
DonationReceipt=Donation receipt
-BuildDonationReceipt=Build receipt
DonationsModels=Documents models for donation receipts
LastModifiedDonations=Latest %s modified donations
-SearchADonation=Search a donation
DonationRecipient=Donation recipient
-ThankYou=Thank You
IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount
MinimumAmount=Minimum amount is %s
FreeTextOnDonations=Free text to show in footer
diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang
index d5d69daa7cf..1f19562af27 100644
--- a/htdocs/langs/en_US/ecm.lang
+++ b/htdocs/langs/en_US/ecm.lang
@@ -1,14 +1,5 @@
# Dolibarr language file - Source file is en_US - ecm
-DocsMine=My documents
-DocsGenerated=Generated documents
-DocsElements=Elements documents
-DocsThirdParties=Documents third parties
-DocsContracts=Documents contracts
-DocsProposals=Documents proposals
-DocsOrders=Documents orders
-DocsInvoices=Documents invoices
ECMNbOfDocs=Nb of documents in directory
-ECMNbOfDocsSmall=Nb of doc.
ECMSection=Directory
ECMSectionManual=Manual directory
ECMSectionAuto=Automatic directory
@@ -18,7 +9,6 @@ ECMSections=Directories
ECMRoot=Root
ECMNewSection=New directory
ECMAddSection=Add directory
-ECMNewDocument=New document
ECMCreationDate=Creation date
ECMNbOfFilesInDir=Number of files in directory
ECMNbOfSubDir=Number of sub-directories
@@ -28,11 +18,9 @@ ECMArea=EDM area
ECMAreaDesc=The EDM (Electronic Document Management) area allows you to save, share and search quickly all kind of documents in Dolibarr.
ECMAreaDesc2=* Automatic directories are filled automatically when adding documents from card of an element.
* Manual directories can be used to save documents not linked to a particular element.
ECMSectionWasRemoved=Directory %s has been deleted.
-ECMDocumentsSection=Document of directory
ECMSearchByKeywords=Search by keywords
ECMSearchByEntity=Search by object
ECMSectionOfDocuments=Directories of documents
-ECMTypeManual=Manual
ECMTypeAuto=Automatic
ECMDocsBySocialContributions=Documents linked to social or fiscal taxes
ECMDocsByThirdParties=Documents linked to third parties
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
old mode 100755
new mode 100644
index 3fe2f9b5852..ba9debb49ba
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -17,7 +17,6 @@ ErrorFailToCreateFile=Failed to create file '%s'.
ErrorFailToRenameDir=Failed to rename directory '%s' into '%s'.
ErrorFailToCreateDir=Failed to create directory '%s'.
ErrorFailToDeleteDir=Failed to delete directory '%s'.
-ErrorFailedToDeleteJoinedFiles=Cannot delete environment because joined files are present. Remove joined files first.
ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type.
ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only.
ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different.
@@ -30,7 +29,6 @@ ErrorBarCodeRequired=Bar code required
ErrorCustomerCodeAlreadyUsed=Customer code already used
ErrorBarCodeAlreadyUsed=Bar code already used
ErrorPrefixRequired=Prefix required
-ErrorUrlNotValid=The website address is incorrect
ErrorBadSupplierCodeSyntax=Bad syntax for supplier code
ErrorSupplierCodeRequired=Supplier code required
ErrorSupplierCodeAlreadyUsed=Supplier code already used
@@ -83,7 +81,6 @@ ErrorFieldRefNotIn=Wrong value for field number %s (value '%s' is
ErrorsOnXLines=Errors on %s source record(s)
ErrorFileIsInfectedWithAVirus=The antivirus program was not able to validate the file (file might be infected by a virus)
ErrorSpecialCharNotAllowedForField=Special characters are not allowed for field "%s"
-ErrorDatabaseParameterWrong=Database setup parameter '%s' has a value not compatible to use Dolibarr (must have value '%s').
ErrorNumRefModel=A reference exists into database (%s) and is not compatible with this numbering rule. Remove record or renamed reference to activate this module.
ErrorQtyTooLowForThisSupplier=Quantity too low for this supplier or no price defined on this product for this supplier
ErrorModuleSetupNotComplete=Setup of module looks to be uncomplete. Go on Home - Setup - Modules to complete.
@@ -93,12 +90,10 @@ ErrorBadMaskBadRazMonth=Error, bad reset value
ErrorMaxNumberReachForThisMask=Max number reach for this mask
ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
ErrorSelectAtLeastOne=Error. Select at least one entry.
-ErrorProductWithRefNotExist=Product with reference '%s' don't exist
ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transation that is conciliated
ErrorProdIdAlreadyExist=%s is assigned to another third
ErrorFailedToSendPassword=Failed to send password
ErrorFailedToLoadRSSFile=Fails to get RSS feed. Try to add constant MAIN_SIMPLEXMLLOAD_DEBUG if error messages does not provide enough information.
-ErrorPasswordDiffers=Passwords differs, please type them again.
ErrorForbidden=Access denied.
You try to access to a page, area or feature of a disabled module or without being in an authenticated session or that is not allowed to your user.
ErrorForbidden2=Permission for this login can be defined by your Dolibarr administrator from menu %s->%s.
ErrorForbidden3=It seems that Dolibarr is not used through an authenticated session. Take a look at Dolibarr setup documentation to know how to manage authentications (htaccess, mod_auth or other...).
@@ -106,7 +101,6 @@ ErrorNoImagickReadimage=Class Imagick is not found in this PHP. No preview can b
ErrorRecordAlreadyExists=Record already exists
ErrorCantReadFile=Failed to read file '%s'
ErrorCantReadDir=Failed to read directory '%s'
-ErrorFailedToFindEntity=Failed to read environment '%s'
ErrorBadLoginPassword=Bad value for login or password
ErrorLoginDisabled=Your account has been disabled
ErrorFailedToRunExternalCommand=Failed to run external command. Check it is available and runnable by your PHP server. If PHP Safe Mode is enabled, check that command is inside a directory defined by parameter safe_mode_exec_dir.
@@ -168,7 +162,6 @@ ErrorGlobalVariableUpdater3=The requested data was not found in result
ErrorGlobalVariableUpdater4=SOAP client failed with error '%s'
ErrorGlobalVariableUpdater5=No global variable selected
ErrorFieldMustBeANumeric=Field %s must be a numeric value
-ErrorFieldMustBeAnInteger=Field %s must be an integer
ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
ErrorOppStatusRequiredIfAmount=You set an estimated amount for this opportunity/lead. So you must also enter its status
ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
@@ -181,8 +174,6 @@ ErrorSupplierCountryIsNotDefined=Country for this supplier is not defined. Corre
WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
WarningMandatorySetupNotComplete=Mandatory setup parameters are not yet defined
WarningSafeModeOnCheckExecDir=Warning, PHP option safe_mode is on so command must be stored inside a directory declared by php parameter safe_mode_exec_dir.
-WarningAllowUrlFopenMustBeOn=Parameter allow_url_fopen must be set to on in filer php.ini for having this module working completely. You must modify this file manually.
-WarningBuildScriptNotRunned=Script %s was not yet ran to build graphics, or there is no data to show.
WarningBookmarkAlreadyExists=A bookmark with this title or this target (URL) already exists.
WarningPassIsEmpty=Warning, database password is empty. This is a security hole. You should add a password to your database and change your conf.php file to reflect this.
WarningConfFileMustBeReadOnly=Warning, your config file (htdocs/conf/conf.php) can be overwritten by the web server. This is a serious security hole. Modify permissions on file to be in read only mode for operating system user used by Web server. If you use Windows and FAT format for your disk, you must know that this file system does not allow to add permissions on file, so can't be completely safe.
@@ -193,7 +184,6 @@ WarningUntilDirRemoved=All security warnings (visible by admin users only) will
WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
WarningUsingThisBoxSlowDown=Warning, using this box slow down seriously all pages showing the box.
WarningClickToDialUserSetupNotComplete=Setup of ClickToDial information for your user are not complete (see tab ClickToDial onto your user card).
-WarningNotRelevant=Irrelevant operation for this dataset
WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
WarningPaymentDateLowerThanInvoiceDate=Payment date (%s) is earlier than invoice date (%s) for invoice %s.
WarningTooManyDataPleaseUseMoreFilters=Too many data (more than %s lines). Please use more filters or set the constant %s to a higher limit.
diff --git a/htdocs/langs/en_US/expensereports.lang b/htdocs/langs/en_US/expensereports.lang
deleted file mode 100644
index b378b12060d..00000000000
--- a/htdocs/langs/en_US/expensereports.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - expensereports
-RelatedExpenseReports=associated expense reports
\ No newline at end of file
diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang
index 0b6a699224b..55e592dc91d 100644
--- a/htdocs/langs/en_US/exports.lang
+++ b/htdocs/langs/en_US/exports.lang
@@ -18,18 +18,11 @@ ExportableFields=Exportable fields
ExportedFields=Exported fields
ImportModelName=Import profile name
ImportModelSaved=Import profile saved under name %s.
-ImportableFields=Importable fields
-ImportedFields=Imported fields
DatasetToExport=Dataset to export
DatasetToImport=Import file into dataset
-NoDiscardedFields=No fields in source file are discarded
-Dataset=Dataset
ChooseFieldsOrdersAndTitle=Choose fields order...
-FieldsOrder=Fields order
FieldsTitle=Fields title
-FieldOrder=Field order
FieldTitle=Field title
-ChooseExportFormat=Choose export format
NowClickToGenerateToBuildExportFile=Now, select file format in combo box and click on "Generate" to build export file...
AvailableFormats=Available formats
LibraryShort=Library
@@ -72,13 +65,10 @@ MoveField=Move field column number %s
ExampleOfImportFile=Example_of_import_file
SaveImportProfile=Save this import profile
ErrorImportDuplicateProfil=Failed to save this import profile with this name. An existing profile already exists with this name.
-ImportSummary=Import setup summary
TablesTarget=Targeted tables
FieldsTarget=Targeted fields
-TableTarget=Targeted table
FieldTarget=Targeted field
FieldSource=Source field
-DoNotImportFirstLine=Do not import first line of source file
NbOfSourceLines=Number of lines in source file
NowClickToTestTheImport=Check import parameters you have defined. If they are correct, click on button "%s" to launch a simulation of import process (no data will be changed in your database, it's only a simulation for the moment)...
RunSimulateImportFile=Launch the import simulation
@@ -119,7 +109,6 @@ ExportFieldAutomaticallyAdded=Field %s was automatically added. It will a
CsvOptions=Csv Options
Separator=Separator
Enclosure=Enclosure
-SuppliersProducts=Suppliers Products
SpecialCode=Special code
ExportStringFilter=%% allows replacing one or more characters in the text
ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day
YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days
> YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days
< YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
@@ -130,7 +119,6 @@ SetThisValueTo2ToExcludeFirstLine=For example, set this value to 3 to exclude th
KeepEmptyToGoToEndOfFile=Keep this field empty to go up to the end of file
## filters
SelectFilterFields=If you want to filter on some values, just input values here.
-FilterableFields=Filterable Fields
FilteredFields=Filtered fields
FilteredFieldsValues=Value for filter
FormatControlRule=Format control rule
diff --git a/htdocs/langs/en_US/help.lang b/htdocs/langs/en_US/help.lang
index a4c11246461..8c549f71514 100644
--- a/htdocs/langs/en_US/help.lang
+++ b/htdocs/langs/en_US/help.lang
@@ -22,6 +22,5 @@ ToGetHelpGoOnSparkAngels2=Sometimes, there is no company available at the moment
BackToHelpCenter=Otherwise, click here to go back to help center home page.
LinkToGoldMember=You can call one of the coach preselected by Dolibarr for your language (%s) by clicking his Widget (status and maximum price are automatically updated):
PossibleLanguages=Supported languages
-MakeADonation=Help Dolibarr project, make a donation
SubscribeToFoundation=Help Dolibarr project, subscribe to the foundation
SeeOfficalSupport=For official Dolibarr support in your language:
%s
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index a8e579c950c..b38e322d2d7 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -956,7 +956,6 @@ else
}
if (! empty($conf->expensereport->enabled) && $user->rights->expensereport->creer)
{
- $langs->load("expensereports");
$langs->load("trips");
print '';
}