vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into clean/tools/duplicates/missing/unused/translations

Browse source
This commit is contained in:
Laurent Destailleur 2024-03-16 14:21:29 +01:00 committed by GitHub
commit 9107f166c7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
htdocs/langs/en_US/agenda.lang
View file

@ -21,7 +21,6 @@ MenuDoneMyActions=My terminated events
ListOfEvents=List of events (default calendar)
ActionsAskedBy=Events reported by
ActionsToDoBy=Events assigned to
ActionsDoneBy=Events done by
ActionAssignedTo=Event assigned to
ViewCal=Month view
ViewDay=Day view

1
htdocs/langs/en_US/commercial.lang
View file

@ -47,7 +47,6 @@ LastProspectToContact=To contact
LastProspectContactInProcess=Contact in process
LastProspectContactDone=Contact done
ActionAffectedTo=Event assigned to
ActionDoneBy=Event done by
ActionAC_TEL=Phone call
ActionAC_FAX=Send fax
ActionAC_PROP=Send proposal by mail

2
htdocs/website/index.php
View file

@ -3397,7 +3397,7 @@ if (!GETPOST('hide_websitemenu')) {
// Edit CKEditor
if (getDolGlobalInt('WEBSITE_ALLOW_CKEDITOR')) {
print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editcontent&token='.newToken().'" class="button bordertransp"'.$disabled.'>'.dol_escape_htmltag($langs->trans("CKEditor")).'</a>';
print '<a href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$pageid.'&action=editcontent&token='.newToken().'" class="button bordertransp"'.$disabled.'>'.dol_escape_htmltag("CKEditor").'</a>';
}
print '</span>';