diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 08d7a182f33..4b02032c1b7 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -25,7 +25,7 @@ DBStoringCharset=Database charset to store data
DBSortingCharset=Database charset to sort data
WarningModuleNotActive=Module %s must be enabled
WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
-DolibarrSetup=Dolibarr setup
+DolibarrSetup=Dolibarr install or upgrade
DolibarrUser=Dolibarr user
InternalUser=Internal user
ExternalUser=External user
@@ -124,7 +124,7 @@ SystemToolsAreaDesc=This area provides administration features. Use the menu to
PurgeAreaDesc=This page allows you to delete all files built or stored by Dolibarr (temporary files or all files in %s directory). Using this feature is not necessary. It is provided for users whose Dolibarr is hosted by a provider that does not offer permissions to delete files built by the web server.
PurgeDeleteLogFile=Delete log file %s defined for Syslog module (no risk to loose data)
PurgeDeleteTemporaryFiles=Delete all temporary files (no risk to loose data)
-PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory %s. Temporary files but also files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
+PurgeDeleteAllFilesInDocumentsDir=Delete all files in directory %s. Temporary files but also database backup dumps, files attached to elements (third parties, invoices, ...) and uploaded into the ECM module will be deleted.
PurgeRunNow=Purge now
PurgeNothingToDelete=No directory or file to delete.
PurgeNDirectoriesDeleted=%s files or directories deleted.
@@ -159,6 +159,7 @@ NameColumn=Name columns
ExtendedInsert=Extended INSERT
DelayedInsert=Delayed insert
EncodeBinariesInHexa=Encode binary data in hexadecimal
+IgnoreDuplicateRecords=Ignore errors of duplicate records (INSERT IGNORE)
Yes=Yes
No=No
AutoDetectLang=Autodetect (browser language)
@@ -218,6 +219,7 @@ MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
MAIN_MAIL_SMTPS_PW=SMTP Password if authentication required
MAIN_MAIL_EMAIL_TLS= Use TLS (SSL) encrypt
FeatureNotAvailableOnLinux=Feature not available on Unix like systems. Test your sendmail program locally.
+SubmitTranslation=If translation for this language is not complete or you find errors, you can correct this by editing files into directory langs/%s and submit modified files on www.dolibarr.org forum.
ModuleSetup=Module setup
ModulesSetup=Modules setup
ModuleFamilyBase=System
@@ -234,7 +236,8 @@ MenuHandlers=Menu handlers
MenuAdmin=Menu editor
ThisIsProcessToFollow=This is setup to process:
StepNb=Step %s
-DownloadPackageFromWebSite=Download package from web site %s.
+FindPackageFromWebSite=Find a package that provides feature you want (for example on web site %s).
+DownloadPackageFromWebSite=Download package.
UnpackPackageInDolibarrRoot=Unpack package file into Dolibarr's root directory %s
SetupIsReadyForUse=Install is finished and Dolibarr is ready to use with this new component.
CurrentVersion=Dolibarr current version
@@ -267,9 +270,10 @@ MinLength=Minimum length
LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
ExamplesWithCurrentSetup=Examples with current running setup
ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories contenaining templates files with OpenDocument format.
Put here full path of directories.
Add a carriage return between eah directory.
To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.
Files in those directories must end with .odt.
+ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.
Put here full path of directories.
Add a carriage return between eah directory.
To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.
Files in those directories must end with .odt.
NumberOfModelFilesFound=Number of ODT templates files found in those directories
ExampleOfDirectoriesForModelGen=Examples of syntax:
c:\mydir
/home/mydir
DOL_DATA_ROOT/ecm/ecmdir
+FirstnameNamePosition=Position of firstname/name
# Modules
Module0Name=Users & groups
@@ -313,7 +317,7 @@ Module56Desc=Telephony integration
Module57Name=Standing orders
Module57Desc=Standing orders and withdrawal's management
Module58Name=ClickToDial
-Module58Desc=ClickToDial integration
+Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
Module59Name=Bookmark4u
Module59Desc=Add function to generate Bookmark4u account from a Dolibarr account
Module70Name=Interventions
@@ -324,6 +328,8 @@ Module80Name=Sendings
Module80Desc=Sendings and delivery order's management
Module85Name=Banks and cash
Module85Desc=Management of bank or cash accounts
+Module100Name=ExternalSite
+Module100Desc=Include any external web site into Dolibarr menus and view it into a Dolibarr frame
Module200Name=LDAP
Module200Desc=LDAP directory synchronisation
Module210Name=PostNuke
@@ -383,8 +389,8 @@ Module13452Desc=Search engine in AJAX to find a name from a part of a phone numb
Module50100Name=Point of sales
Module50100Desc=Point of sales module
Permission11=Read invoices
-Permission12=Create invoices
-Permission13=Modify invoices
+Permission12=Create/modify invoices
+Permission13=Unvalidate invoices
Permission14=Validate invoices
Permission15=Send invoices by email
Permission16=Create payments for invoices
@@ -399,6 +405,7 @@ Permission28=Export commercial proposals
Permission31=Read products
Permission32=Create/modify products
Permission34=Delete products
+Permission36=See/manage hidden products
Permission38=Export products
Permission41=Read projects (shared project and projects i'm contact for)
Permission42=Create/modify projects (shared project and projects i'm contact for)
@@ -450,7 +457,7 @@ Permission144=Delete tasks
Permission146=Read providers
Permission147=Read stats
Permission151=Read standing orders
-Permission152=Setup standing orders
+Permission152=Create/modify a standing orders request
Permission153=Read standing orders receipts
Permission161=Read contracts
Permission162=Create/modify contracts
@@ -530,6 +537,7 @@ Permission404=Delete discounts
Permission531=Read services
Permission532=Create/modify services
Permission534=Delete services
+Permission536=See/manage hidden services
Permission538=Export services
Permission700=Read donations
Permission701=Create/modify donations
@@ -545,17 +553,16 @@ Permission1104=Validate delivery orders
Permission1109=Delete delivery orders
Permission1181=Read suppliers
Permission1182=Read supplier orders
-Permission1183=Create supplier orders
+Permission1183=Create/modify supplier orders
Permission1184=Validate supplier orders
Permission1185=Approve supplier orders
Permission1186=Order supplier orders
Permission1187=Acknowledge receipt of supplier orders
-Permission1188=Close supplier orders
-Permission1189=Cancel supplier orders
+Permission1188=Delete supplier orders
Permission1201=Get result of an export
Permission1202=Create/Modify an export
Permission1231=Read supplier invoices
-Permission1232=Create supplier invoices
+Permission1232=Create/modify supplier invoices
Permission1233=Validate supplier invoices
Permission1234=Delete supplier invoices
Permission1236=Export supplier invoices, attributes and payments
@@ -595,7 +602,7 @@ BackToModuleList=Back to modules list
BackToDictionnaryList=Back to dictionaries list
VATReceivedOnly=Special rate not charged
VATManagement=VAT Management
-VATIsUsedDesc=The VAT rate by default when creating prospects, invoices, orders etc follow the active standard rule:
If the seller is subjected to VAT, then VAT by default=0. End of rule.
If the (selling country= buying country), then the VAT by default=VAT of the product in the selling country. End of rule.
If seller and buyer in the European Community and goods are sold having new means of transport (car, ship, plane), the default VAT=0 ( The VAT should be paid by the buyer at the customoffice of his country and not at the seller). End of rule.
If seller and buyer in the European Community and goods sold by other means rather than new means of transport, then the VAT by default=VAT of product sold. End of rule.
Else the proposed default VAT=1. End of rule.
+VATIsUsedDesc=The VAT rate by default when creating prospects, invoices, orders etc follow the active standard rule:
If the seller is subjected to VAT, then VAT by default=0. End of rule.
If the (selling country= buying country), then the VAT by default=VAT of the product in the selling country. End of rule.
If seller and buyer in the European Community and goods are transport products (car, ship, plane), the default VAT=0 ( The VAT should be paid by the buyer at the customoffice of his country and not at the seller). End of rule.
If seller and buyer in the European Community and buyer is not a company, then the VAT by default=VAT of product sold. End of rule.
If seller and buyer in the European Community and buyer is a company, then the VAT by default=0. End of rule.
Else the proposed default VAT=0. End of rule.
VATIsNotUsedDesc=By default the proposed VAT is 0 which can be used for cases like associations, individuals ou small companies.
VATIsUsedExampleFR=In France, it means companies or organisations having a real fiscal system (Simplified real or normal real). A system in which VAT is declared.
VATIsNotUsedExampleFR=In France, it means associations that are non VAT declared or companies, organisations or liberal professions that have chosen the micro enterprise fiscal system (VAT in franchise) and paid a franchise VAT without any VAT declaration. This choice will display the reference "Non applicable VAT - art-293B of CGI" on invoices.
@@ -764,6 +771,10 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
YouMustRunCommandFromCommandLineAfterLoginToUser=You must run this command from command line after login to a shell with user %s.
YourPHPDoesNotHaveSSLSupport=SSL functions not available in your PHP
DownloadMoreSkins=More skins to download
+SimpleNumRefModelDesc=Return the reference number with format %syymm-nnnn where yy is year, mm is month and nnnn is a sequence without hole and with no reset
+ListOfEntities=List of entities
+AddEntity=Add entity
+EditEntity=Edit entity
##### Module password generation
PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: 8 characters containing shared numbers and characters in lowercase.
@@ -854,10 +865,6 @@ HideTreadedOrders=Hide the treated or canceled orders in the list
ValidOrderAfterPropalClosed=To validate the order after proposal closer, makes it possible not to step by the provisional order
FreeLegalTextOnOrders=Free text on orders
WatermarkOnDraftOrders=Watermark on draft orders (any if empty)
-##### Fiche inter #####
-FicheinterNumberingModules=Intervention numbering modules
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (any if empty)
##### Clicktodial #####
ClickToDialSetup=Click To Dial module setup
ClickToDialUrlDesc=Url called when a click on phone picto is done. Dans l'url, vous pouvez utiliser les balises
%%1$s qui sera remplacé par le téléphone de l'appelé
%%2$s qui sera remplacé par le téléphone de l'appelant (le votre)
%%3$s qui sera remplacé par votre login clicktodial (défini sur votre fiche utilisateur)
%%4$s qui sera remplacé par votre mot de passe clicktodial (défini sur votre fiche utilisateur).
@@ -865,6 +872,10 @@ ClickToDialUrlDesc=Url called when a click on phone picto is done. Dans l'url,
Bookmark4uSetup=Bookmark4u module setup
##### Interventions #####
InterventionsSetup=Interventions module setup
+FreeLegalTextOnInterventions=Free text on intervention documents
+FicheinterNumberingModules=Intervention numbering modules
+TemplatePDFInterventions=Intervention card documents models
+WatermarkOnDraftInterventionCards=Watermark on intervention card documents (any if empty)
##### Members #####
MembersSetup=Members module setup
MemberMainOptions=Main options
@@ -1009,7 +1020,7 @@ NumberOfProductShowInSelect=Max number of products in combos select lists (0=no
ConfirmDeleteProductLineAbility=Confirmation when removing product lines in forms
ModifyProductDescAbility=Personalization of product descriptions in forms
ViewProductDescInFormAbility=Visualization of product descriptions in the forms (otherwise as popup tooltip)
-UseSearchToSelectProduct=Use a search form to choose a product (instead of using a list box)
+UseSearchToSelectProduct=Use a search form to choose a product (instead of using a list box).
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
@@ -1025,6 +1036,7 @@ YouCanUseDOL_DATA_ROOT=You can use DOL_DATA_ROOT/dolibarr.log for a log file in
ErrorUnknownSyslogConstant=Constant %s is not a known syslog constant
##### Donations #####
DonationsSetup=Donation module setup
+DonationsReceiptModel=Template of donation receipt
##### Barcode #####
BarcodeSetup=Barcode setup
PaperFormatModule=Print format module
@@ -1067,7 +1079,7 @@ FCKeditorForUsers=WYSIWIG creation/edition of user's description and note
FCKeditorForCompany=WYSIWIG creation/edition of companie's description and note
FCKeditorForProduct=WYSIWIG creation/edition of products/service's description and note
FCKeditorForMembers=WYSIWIG creation/edition of member's description and note
-FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...)
Warning: Using this option is seriously not recommanded as it can create problems with special characters and page formating when building PDF files.
+FCKeditorForProductDetails=WYSIWIG creation/edition of products details lines for all entities (proposals, orders, invoices, etc...). Warning: Using this option for this case is seriously not recommanded as it can create problems with special characters and page formating when building PDF files.
FCKeditorForProductDetailsPerso=WYSIWIG creation/edition of products personalized details lines for all entities (proposals, orders, invoices, etc...)
FCKeditorForMailing=WYSIWIG creation/edition of mailings
##### OSCommerce 1 #####
@@ -1137,8 +1149,9 @@ YourCompanyDoesNotUseVAT=Your company has been defined to not use VAT (Home - Se
##### Agenda #####
AgendaSetup=Actions and agenda module setup
PasswordTogetVCalExport=Key to authorize export link
+PastDelayVCalExport=Do not export event older than
##### ClickToDial #####
-ClickToDialDesc=This module allows to add an icon after the phone number of Dolibarr contacts. A click on this icon, will call a serveur with a particular URL you define below. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example.
+ClickToDialDesc=This module allows to add an icon after phone numbers. A click on this icon will call a server with a particular URL you define below. This can be used to call a call center system from Dolibarr that can call the phone number on a SIP system for example.
##### Point Of Sales (CashDesk) #####
CashDesk=Point of sales
CashDeskSetup=Point of sales module setup
@@ -1163,6 +1176,7 @@ FreeLegalTextOnChequeReceipts=Free text on cheque receipts
MultiCompanySetup=Multi-company module setup
##### Suppliers #####
SuppliersSetup=Supplier module setup
+SuppliersCommandModel=Complete template of supplier order (logo...)
##### GeoIPMaxmind #####
GeoIPMaxmindSetup=GeoIP Maxmind module setup
PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.
Example: /usr/local/share/GeoIP/GeoIP.dat