FIX resolve conflicts

htdocs/langs/en_US/accountancy.lang

@@ -302,6 +302,7 @@ NotYetAccounted=Not yet transferred to accounting
 ShowTutorial=Show Tutorial
 NotReconciled=Not reconciled
 WarningRecordWithoutSubledgerAreExcluded=Warning, all lines without subledger account defined are filtered and excluded from this view
+AccountRemovedFromCurrentChartOfAccount=Accounting account that does not exist in the current chart of accounts
 
 ## Admin
 BindingOptions=Binding options
@@ -395,6 +396,21 @@ Range=Range of accounting account
 Calculated=Calculated
 Formula=Formula
 
+## Reconcile
+Unlettering=Unreconcile
+AccountancyNoLetteringModified=No reconcile modified
+AccountancyOneLetteringModifiedSuccessfully=One reconcile successfully modified
+AccountancyLetteringModifiedSuccessfully=%s reconcile successfully modified
+AccountancyNoUnletteringModified=No unreconcile modified
+AccountancyOneUnletteringModifiedSuccessfully=One unreconcile successfully modified
+AccountancyUnletteringModifiedSuccessfully=%s unreconcile successfully modified
+
+## Confirm box
+ConfirmMassUnlettering=Bulk Unreconcile confirmation
+ConfirmMassUnletteringQuestion=Are you sure you want to Unreconcile the %s selected record(s)?
+ConfirmMassDeleteBookkeepingWriting=Bulk Delete confirmation
+ConfirmMassDeleteBookkeepingWritingQuestion=This will delete the transaction from the accounting (all lines related to the same transaction will be deleted) Are you sure you want to delete the %s selected record(s)?
+
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=No accounting account group available for country %s (See Home - Setup - Dictionaries)
@@ -407,6 +423,9 @@ Binded=Lines bound
 ToBind=Lines to bind
 UseMenuToSetBindindManualy=Lines not yet bound, use menu <a href="%s">%s</a> to make the binding manually
 SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
+AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
+AccountancyErrorMismatchBalanceAmount=The balance (%s) is not equal to 0
+AccountancyErrorLetteringBookkeeping=Errors have occurred concerning the transactions: %s
 
 ## Import
 ImportAccountingEntries=Accounting entries

htdocs/langs/en_US/admin.lang

@@ -1345,6 +1345,7 @@ TransKeyWithoutOriginalValue=You forced a new translation for the translation ke
 TitleNumberOfActivatedModules=Activated modules
 TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=You must at least enable 1 module
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Yes in summer
 OnlyFollowingModulesAreOpenedToExternalUsers=Note, only the following modules are available to external users (irrespective of the permissions of such users) and only if permissions are granted:<br>
@@ -1925,7 +1926,7 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
 HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
-UseBorderOnTable=Active border on tables
+UseBorderOnTable=Show left-right borders on tables
 BtnActionColor=Color of the action button
 TextBtnActionColor=Text color of the action button
 TextTitleColor=Text color of Page title
@@ -2066,12 +2067,24 @@ EmailcollectorOperations=Operations to do by collector
 EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Collect now
-ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s?
 DateLastCollectResult=Date of latest collect try
 DateLastcollectResultOk=Date of latest collect success
 LastResult=Latest result
+EmailCollectorHideMailHeaders=Hide headers of collected e-mails
+EmailCollectorHideMailHeadersHelp=When enabled, e-mail headers are ignored during the collection
 EmailCollectorConfirmCollectTitle=Email collect confirmation
-EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
+EmailCollectorConfirmCollect=Do you want to run this collector now?
+EmailCollectorExampleToCollectTicketRequestsDesc=Collect emails that match some rules and create automatically a ticket (Module Ticket must be enabled) with the email informations. You can use this collector if you provide some support by email, so your ticket request will be automatically generated. Activate also Collect_Responses to collect answers of your client directly on the ticket view (you must reply from Dolibarr).
+EmailCollectorExampleToCollectTicketRequests=Example collecting the ticket request (first message only)
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Scan your mailbox "Sent" directory to find emails that was sent as an answer of another email directly from your email software and not from Dolibarr. If such an email is found, the event of answer is recorded into Dolibarr
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Example collecting e-mail answers sent from an external e-mail software
+EmailCollectorExampleToCollectDolibarrAnswersDesc=Collect all emails that are an answer of an email sent from your application. An event (Module Agenda must be enabled) with the email response will be recorded at the good place. For example, if your send a commercial proposal, order, invoice or message for a ticket by email from the application, and your customer answers your email, the system will automatically catch the answer and add it into your ERP.
+EmailCollectorExampleToCollectDolibarrAnswers=Example collecting all ingoing messages being answers to messages sent from Dolibarr'
+EmailCollectorExampleToCollectLeadsDesc=Collect emails that match some rules and create automatically a lead (Module Project must be enabled) with the email informations. You can use this collector if you want to follow your lead using the module Project (1 lead = 1 project), so your leads will be automatically generated. If the collector Collect_Responses is also enabled, when you send an email from your leads, proposals or any other object, you may also see answers of your customers or partners directly on the application.<br>Note: With this initial example, the title of the lead is generated including the email. If the thirdparty can't be found in database (new customer), the lead will be attached to the thirdparty with ID 1.
+EmailCollectorExampleToCollectLeads=Example collecting leads
+EmailCollectorExampleToCollectJobCandidaturesDesc=Collect emails applying to job offers (Module Recruitment must be enabled). You can complete this collector if you want to automatically create a candidature for a job request. Note: With this initial example, the title of the candidature is generated including the email.
+EmailCollectorExampleToCollectJobCandidatures=Example collecting job candidatures received by e-mail
 NoNewEmailToProcess=No new email (matching filters) to process
 NothingProcessed=Nothing done
 XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
@@ -2143,7 +2156,7 @@ DeleteEmailCollector=Delete email collector
 ConfirmDeleteEmailCollector=Are you sure you want to delete this email collector?
 RecipientEmailsWillBeReplacedWithThisValue=Recipient emails will be always replaced with this value
 AtLeastOneDefaultBankAccountMandatory=At least 1 default bank account must be defined
-RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Based on the library SabreDAV version
 NotAPublicIp=Not a public IP
@@ -2234,3 +2247,5 @@ TemplateforBusinessCards=Template for a business card in different size
 InventorySetup= Inventory Setup
 ExportUseLowMemoryMode=Use a low memory mode
 ExportUseLowMemoryModeHelp=Use the low memory mode to execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+ShowQuickAddLink=Show a button to quickly add an element in top right menu
+HashForPing=Hash used for ping

htdocs/langs/en_US/agenda.lang

@@ -45,6 +45,7 @@ CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Proposal %s signed
 PropalClosedRefusedInDolibarr=Proposal %s refused
 PropalValidatedInDolibarr=Proposal %s validated
+PropalBackToDraftInDolibarr=Proposal %s go back to draft status
 PropalClassifiedBilledInDolibarr=Proposal %s classified billed
 InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
@@ -66,6 +67,7 @@ ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
 ShipmentDeletedInDolibarr=Shipment %s deleted
 ShipmentCanceledInDolibarr=Shipment %s canceled
 ReceptionValidatedInDolibarr=Reception %s validated
+ReceptionClassifyClosedInDolibarr=Reception %s classified closed
 OrderCreatedInDolibarr=Order %s created
 OrderValidatedInDolibarr=Order %s validated
 OrderDeliveredInDolibarr=Order %s classified delivered

htdocs/langs/en_US/expensereports.lang

@@ -0,0 +1 @@
+ExpenseReportPayments=Expense report payments

htdocs/langs/en_US/members.lang

@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=For security reasons, you must be granted permissions to edit all users to be able to link a member to a user that is not yours.
 SetLinkToUser=Link to a Dolibarr user
 SetLinkToThirdParty=Link to a Dolibarr third party
-MembersCards=Business cards for members
+MembersCards=Generation of cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -163,7 +163,7 @@ MoreActionsOnSubscription=Complementary action suggested by default when recordi
 MoreActionBankDirect=Create a direct entry on bank account
 MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
 MoreActionInvoiceOnly=Create an invoice with no payment
-LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
 DocForAllMembersCards=Generate business cards for all members
 DocForOneMemberCards=Generate business cards for a particular member

htdocs/langs/en_US/modulebuilder.lang

@@ -52,7 +52,7 @@ LanguageFile=File for language
 ObjectProperties=Object Properties
 ConfirmDeleteProperty=Are you sure you want to delete the property <strong>%s</strong>? This will change code in PHP class but also remove column from table definition of object.
 NotNull=Not NULL
-NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
+NotNullDesc=1=Set database to NOT NULL, 0=Allow null values, -1=Allow null values by forcing value to NULL if empty ('' or 0)
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -127,9 +127,9 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-IncludeRefGeneration=The reference of object must be generated automatically
-IncludeRefGenerationHelp=Check this if you want to include code to manage the generation automatically of the reference
-IncludeDocGeneration=I want to generate some documents from the object
+IncludeRefGeneration=The reference of object must be generated automatically by custom numbering rules
+IncludeRefGenerationHelp=Check this if you want to include code to manage the generation of the reference automatically using custom numbering rules
+IncludeDocGeneration=I want to generate some documents from templates for the object
 IncludeDocGenerationHelp=If you check this, some code will be generated to add a "Generate document" box on the record.
 ShowOnCombobox=Show value into combobox
 KeyForTooltip=Key for tooltip

htdocs/langs/en_US/partnership.lang

@@ -59,6 +59,7 @@ BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
 ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
 PartnershipType=Partnership type
 PartnershipRefApproved=Partnership %s approved
+KeywordToCheckInWebsite=If you want to check that a given keyword is present into the website of each partner, define this keyword here
 
 #
 # Template Mail
@@ -89,4 +90,5 @@ PartnershipDraft=Draft
 PartnershipAccepted=Accepted
 PartnershipRefused=Refused
 PartnershipCanceled=Canceled
-PartnershipManagedFor=Partners are
+PartnershipManagedFor=Partners are
+

htdocs/langs/en_US/recruitment.lang

@@ -74,3 +74,5 @@ JobClosedTextCanceled=The job position is closed.
 ExtrafieldsJobPosition=Complementary attributes (job positions)
 ExtrafieldsApplication=Complementary attributes (job applications)
 MakeOffer=Make an offer
+WeAreRecruiting=We are recruiting. This is a list of open positions to be filled...
+NoPositionOpen=No positions open at the moment

htdocs/langs/en_US/ticket.lang

@@ -90,10 +90,10 @@ TicketPublicAccess=A public interface requiring no identification is available a
 TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
 TicketParamModule=Module variable setup
 TicketParamMail=Email setup
-TicketEmailNotificationFrom=Notification email from
-TicketEmailNotificationFromHelp=Used into ticket message answer by example
-TicketEmailNotificationTo=Notifications email to
-TicketEmailNotificationToHelp=Send email notifications to this address.
+TicketEmailNotificationFrom=Sender e-mail for ticket answers
+TicketEmailNotificationFromHelp=Sender e-mail for ticket answers sent from Dolibarr
+TicketEmailNotificationTo=Notify ticket creation to this e-mail address
+TicketEmailNotificationToHelp=If present, this e-mail address will be notified of a ticket creation
 TicketNewEmailBodyLabel=Text message sent after creating a ticket
 TicketNewEmailBodyHelp=The text specified here will be inserted into the email confirming the creation of a new ticket from the public interface. Information on the consultation of the ticket are automatically added.
 TicketParamPublicInterface=Public interface setup
@@ -219,12 +219,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
 TicketGoIntoContactTab=Please go into "Contacts" tab to select them
 TicketMessageMailIntro=Introduction
 TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
-TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
-TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
-TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
+TicketMessageMailIntroLabelAdmin=Introduction text to all ticket answers
+TicketMessageMailIntroText=Hello,<br>A new answer has been added to a ticket that you follow. Here is the message:<br>
+TicketMessageMailIntroHelpAdmin=This text will be inserted before the answer when replying to a ticket from Dolibarr
 TicketMessageMailSignature=Signature
 TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
-TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=Signature of response email
 TicketMessageMailSignatureHelpAdmin=This text will be inserted after the response message.
 TicketMessageHelp=Only this text will be saved in the message list on ticket card.
@@ -289,7 +289,7 @@ TicketNewEmailBody=This is an automatic email to confirm you have registered a n
 TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
 TicketNewEmailBodyInfosTicket=Information for monitoring the ticket
 TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
-TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
 TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
 TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket by clicking the following link
 TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.

htdocs/langs/en_US/users.lang

@@ -123,4 +123,8 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
-WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s 
+WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
+DateLastLogin=Date last login
+DatePreviousLogin=Date previous login
+IPLastLogin=IP last login
+IPPreviousLogin=IP previous login

htdocs/langs/en_US/withdrawals.lang

@@ -137,6 +137,7 @@ SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
 ICS=Creditor Identifier - ICS
+IDS=Debitor Identifier
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -154,4 +155,5 @@ ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default
 ErrorICSmissing=Missing ICS in Bank account %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Total amount of direct debit order differs from sum of lines
 WarningSomeDirectDebitOrdersAlreadyExists=Warning: There is already some pending Direct Debit orders (%s) requested for an amount of %s
-WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s  
+WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s  
+UsedFor=Used for %s