diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index a7b38cc85c7..1a11ac4f65a 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -52,7 +52,8 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'users', 'other', 'commercial'));
 
-$mesg = ''; $error = 0; $errors = array();
+$error = 0;
+$errors = array();
 
 // Get parameters
 $action = (GETPOST('action', 'alpha') ? GETPOST('action', 'alpha') : 'view');
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index d49388d26c9..46f9320ab32 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -491,7 +491,7 @@ class Notify
 								$link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
 								$dir_output = $conf->facture->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'invoice');
 								$object_type = 'facture';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoiceCancelled", $link);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextInvoiceCanceled", $link);
 								break;
 							case 'BILL_VALIDATE':
 								$link = '<a href="'.$urlwithroot.'/compta/facture/card.php?facid='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
@@ -509,7 +509,7 @@ class Notify
 								$link = '<a href="'.$urlwithroot.'/commande/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
 								$dir_output = $conf->commande->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'commande');
 								$object_type = 'order';
-								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextOrderCancelled", $link);
+								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextOrderCanceled", $link);
 								break;
 							case 'ORDER_VALIDATE':
 								$link = '<a href="'.$urlwithroot.'/commande/card.php?id='.$object->id.'&entity='.$object->entity.'">'.$newref.'</a>';
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index eecfe22c4b3..393cb4067c1 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -560,11 +560,11 @@ if (!empty($conf->use_javascript_ajax)) {
 
 	if (empty($conf->dol_no_mouse_hover)) {
 		print '<div style="border: 1px solid #888888; width: '.$widthforcrop.'px;">';
-		print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$object->entity.'&file='.urlencode($original_file).'" alt="" id="cropbox" width="'.$widthforcrop.'px"/>';
+		print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.urlencode($modulepart).'&entity='.((int) $object->entity).'&file='.urlencode($original_file).'" alt="" id="cropbox" width="'.$widthforcrop.'px"/>';
 		print '</div>';
 		print '</div><br>';
 
-		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.((int) $id).($num ? '&num='.$num : '').'" method="POST">';
+		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.((int) $id).($num ? '&num='.urlencode($num) : '').'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="backtourl" value="'.$backtourl.'">';
 		print '
@@ -608,7 +608,7 @@ jQuery(document).ready(function() {
         console.log("We click on submitcrop");
 	    var idClicked = e.target.id;
 	    if (parseInt(jQuery(\'#w\').val())) return true;
-	    alert(\''.dol_escape_js($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Dimension"))).'\');
+	    alert(\''.dol_escape_js($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Size"))).'\');
 	    return false;
 	});
 });
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 57b3cf539cf..526483b1339 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -6,7 +6,7 @@ ErrorSetACountryFirst=Set the country first
 SelectThirdParty=Select a third party
 ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
 DeleteContact=Delete a contact/address
-ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
+ConfirmDeleteContact=Are you sure you want to delete this contact?
 MenuNewThirdParty=New Third Party
 MenuNewCustomer=New Customer
 MenuNewProspect=New Prospect
@@ -527,4 +527,4 @@ HideSocialNetworks=Hide social networks
 ExternalSystemID=External system ID
 IDOfPaymentInAnExternalSystem=ID of the payment mode into an external system (like Stripe, Paypal, ...)
 AADEWebserviceCredentials=AADE Webservice Credentials
-ThirdPartyMustBeACustomerToCreateBANOnStripe=The third-party must be a customer to allow the creation of its bank info on Stripe side 
+ThirdPartyMustBeACustomerToCreateBANOnStripe=The third-party must be a customer to allow the creation of its bank info on Stripe side
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index f519e098d01..95042a5cc24 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -562,7 +562,6 @@ New=New
 Discount=Discount
 Unknown=Unknown
 General=General
-Dimensions=Dimensions
 Size=Size
 OriginalSize=Original size
 RotateImage=Rotate 90°
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index 32cd6681507..12955cc9f0e 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -207,6 +207,7 @@ EMailTextInterventionValidated=The intervention %s has been validated.
 EMailTextInterventionClosed=The intervention %s has been closed.
 EMailTextInvoiceValidated=Invoice %s has been validated.
 EMailTextInvoicePayed=Invoice %s has been paid.
+EMailTextInvoiceCanceled=Invoice %s has been canceled.
 EMailTextProposalValidated=Proposal %s has been validated.
 EMailTextProposalClosedSigned=Proposal %s has been closed signed.
 EMailTextProposalClosedSignedWeb=Proposal %s has been closed signed on portal page.
@@ -214,6 +215,7 @@ EMailTextProposalClosedRefused=Proposal %s has been closed refused.
 EMailTextProposalClosedRefusedWeb=Proposal %s has been closed refuse on portal page.
 EMailTextOrderValidated=Order %s has been validated.
 EMailTextOrderClose=Order %s has been delivered.
+EMailTextOrderCanceled=Order %s has been canceled.
 EMailTextSupplierOrderApprovedBy=Purchase order %s has been approved by %s.
 EMailTextSupplierOrderValidatedBy=Purchase order %s has been recorded by %s.
 EMailTextSupplierOrderSubmittedBy=Purchase order %s has been submitted by %s.
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index 3cfa2ee7236..4974dab92f1 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -134,5 +134,4 @@ UserPublicPageDesc=You can enable a virtual card for this user. An url with the
 EnablePublicVirtualCard=Enable the user's virtual business card
 UserEnabledDisabled=User status changed: %s
 AlternativeEmailForOAuth2=Alternative Email for OAuth2 login
-ConfirmDeleteContact= Are you sure that you want delete this contact ?
-ContactDeleted= Contact has been delete successfully
+ContactDeleted=Contact has been delete successfully
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index 9dc673aa745..512fbc064d0 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -842,16 +842,14 @@ print '<input type="submit" class="button small reposition" name="PROJECT_TIMESH
 print '</td>';
 print '</tr>';
 
-$key = 'PROJECT_DISPLAY_LINKED_BY_CONTACT';
-echo '<tr class="oddeven">',
-		'<td class="left">',
-			$form->textwithpicto($langs->transnoentities($key), $langs->transnoentities($key . '_help')),
-		'</td>',
-		'<td class="right" colspan="2">',
-			ajax_constantonoff($key),
-		'</td>',
-	'</tr>';
-
+print '<tr class="oddeven">';
+print '<td class="left">';
+print $form->textwithpicto($langs->transnoentities('PROJECT_DISPLAY_LINKED_BY_CONTACT'), $langs->transnoentities('PROJECT_DISPLAY_LINKED_BY_CONTACT_help'));
+print '</td>';
+print '<td class="right" colspan="2">';
+print ajax_constantonoff('PROJECT_DISPLAY_LINKED_BY_CONTACT');
+print '</td>';
+print '</tr>';
 
 print '</table>';
 print '</div>';
diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index fd0109db515..7591c58c98b 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -60,7 +60,8 @@ if (isModEnabled('notification')) {
 	$langs->load("mails");
 }
 
-$mesg = ''; $error = 0; $errors = array();
+$error = 0;
+$errors = array();
 
 
 // Get parameters