From 6eb2fe4689a8fe0c0592c3efe1ed37ff28f91e24 Mon Sep 17 00:00:00 2001 From: "Laurent Destailleur (aka Eldy)" Date: Tue, 3 Dec 2024 10:31:41 +0100 Subject: [PATCH] Fix trans --- htdocs/comm/mailing/index.php | 8 +++---- htdocs/langs/en_US/admin.lang | 16 +++++++------- htdocs/langs/en_US/companies.lang | 2 +- htdocs/langs/en_US/mails.lang | 36 +++++++++++++++---------------- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index 5151e5223d9..225ba2eb748 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -83,11 +83,11 @@ print ''; print '
'; print ''; print ''; -print ''; print ''; -print ''; +print ''; print "
'.$titlesearch.'
'; +print '
'; print $langs->trans("Ref").':
'; -print $langs->trans("Other").':
'; +print $langs->trans("Other").':

\n"; @@ -189,7 +189,7 @@ if ($result) { print ' | '.$langs->trans("Phone"); } print ''; - print ''.$langs->trans("AllEMailings").''; + print '...'; print ''; $num = $db->num_rows($result); diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 210e2dfe7fd..90e30555733 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -568,8 +568,8 @@ Module10Name=Accounting (simplified) Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table. Module20Name=Proposals Module20Desc=Commercial proposal management -Module22Name=Mass Emailings -Module22Desc=Manage bulk emailing +Module22Name=Mass Emails +Module22Desc=Manage mass/bulk email campaign Module23Name=Energy Module23Desc=Monitoring the consumption of energies Module25Name=Sales Orders @@ -848,10 +848,10 @@ Permission212=Order lines Permission213=Activate line Permission214=Setup Telephony Permission215=Setup providers -Permission221=Read emailings -Permission222=Create/modify emailings (topic, recipients...) -Permission223=Validate emailings (allows sending) -Permission229=Delete emailings +Permission221=Read mass emails +Permission222=Create/modify mass emails (topic, recipients...) +Permission223=Validate mass emails (allows sending) +Permission229=Delete mass emails Permission237=View recipients and info Permission238=Manually send mailings Permission239=Delete mailings after validation or sent @@ -1818,9 +1818,9 @@ FCKeditorForNotePrivate=WYSIWYG creation/modification of the field "private note FCKeditorForCompany=WYSIWYG creation/modification of the field description of elements (except products/services) FCKeditorForProductDetails=WYSIWYG creation/modification of products description or lines for objects (lines of proposals, orders, invoices, etc...). FCKeditorForProductDetails2=Warning: Using this option for this case is seriously not recommended as it can create problems with special characters and page formatting when building PDF files. -FCKeditorForMailing= WYSIWYG creation/modification for mass eMailings (Tools->eMailing) +FCKeditorForMailing= WYSIWYG creation/modification for mass eMails (Tools->Mass eMails) FCKeditorForUserSignature=WYSIWYG creation/modification of user signature -FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->eMailing) +FCKeditorForMail=WYSIWYG creation/modification for all mail (except Tools->Mass eMails) FCKeditorForTicket=WYSIWYG creation/modification for tickets ##### Stock ##### StockSetup=Stock module setup diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 9cd0ebf20c9..ad0813153e1 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -79,7 +79,7 @@ Chat=Chat PhonePro=Bus. phone PhonePerso=Pers. phone PhoneMobile=Mobile -No_Email=Refuse bulk emailings +No_Email=Refuse mass emails Fax=Fax Zip=Zip Code Town=City diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang index 9ace4fc3d3c..c2a7d07b030 100644 --- a/htdocs/langs/en_US/mails.lang +++ b/htdocs/langs/en_US/mails.lang @@ -1,9 +1,9 @@ # Dolibarr language file - Source file is en_US - mails Mailing=EMailing EMailing=EMailing -EMailings=EMailings +EMailings=Mass EMails SMSings=SMSings -AllEMailings=All eMailings +AllEMailings=All mass eMails MailCard=EMailing card MailRecipients=Recipients MailRecipient=Recipient @@ -26,19 +26,19 @@ MailFile=Attached files MailMessage=Email body SubjectNotIn=Not in Subject BodyNotIn=Not in Body -ShowEMailing=Show emailing -ListOfEMailings=List of emailings -NewMailing=New emailing +ShowEMailing=Show mass Email +ListOfEMailings=List of mass Email +NewMailing=New mass Email NewSMSing=New smsing -EditMailing=Edit emailing -ResetMailing=Resend emailing +EditMailing=Edit mass Email +ResetMailing=Resend mass Email ConfirmResetMailingTargetMassaction=Confirmation of the reset of targets statusin error ResetMailingTargetMassaction=Reset status in error -DeleteMailing=Delete emailing -PreviewMailing=Preview emailing -CreateMailing=Create emailing +DeleteMailing=Delete mass Email +PreviewMailing=Preview mass Email +CreateMailing=Create mass Email TestMailing=Test -ValidMailing=Valid emailing +ValidMailing=Valid mass Email MailingStatusDraft=Draft MailingStatusValidated=Validated MailingStatusSent=Sent @@ -108,24 +108,24 @@ EmailCollectorFilterDesc=All filters must match to have an email being collected LineInFile=Line %s in file RecipientSelectionModules=Defined requests for recipient's selection MailSelectedRecipients=Selected recipients -MailingArea=EMailings area -LastMailings=Latest %s emailings +MailingArea=Mass Emails +LastMailings=Latest %s mass emails TargetsStatistics=Targets statistics NbOfCompaniesContacts=Unique contacts/addresses MailNoChangePossible=Recipients for validated emailing can't be changed -SearchAMailing=Search mailing -SendMailing=Send emailing +SearchAMailing=Search a mass Email +SendMailing=Send mass Email SentBy=Sent by AdvancedAlternative=Advanced alternative MailingNeedCommand=Sending an emailing can be performed from command line. Ask your server administrator to launch the following command to send the emailing to all recipients: MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. For this, go on Home - Setup - Other. ConfirmSendingEmailing=If you want to send emailing directly from this screen, please confirm you are sure you want to send emailing now from your browser ? -LimitSendingEmailing=Note: Sending of emailings from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. +LimitSendingEmailing=Note: Sending of a mass email from web interface is done in several times for security and timeout reasons, %s recipients at a time for each sending session. TargetsReset=Clear list ToClearAllRecipientsClickHere=Click here to clear the recipient list for this emailing ToAddRecipientsChooseHere=Add recipients by choosing from the lists -NbOfEMailingsReceived=Mass emailings received -NbOfEMailingsSend=Mass emailings sent +NbOfEMailingsReceived=Mass emails received +NbOfEMailingsSend=Mass emails sent IdRecord=ID record DeliveryReceipt=Delivery Ack. YouCanUseCommaSeparatorForSeveralRecipients=You can use the comma separator to specify several recipients.