Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

htdocs/adherents/card.php

@@ -554,7 +554,7 @@ if (empty($reshook))
 			$result=$object->create($user);
 			if ($result > 0)
 			{
-				// Fundation categories
+				// Foundation categories
 				$memcats = GETPOST('memcats', 'array');
 				$object->setCategories($memcats);
 
@@ -1567,12 +1567,12 @@ else
 	        if (! $adht->cotisation)
 	        {
 	        	print $langs->trans("SubscriptionNotRecorded");
-		        if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Affiche picto retard uniquement si non brouillon et non resilie
+		        if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
 	        }
 	        else
 	        {
 	            print $langs->trans("SubscriptionNotReceived");
-	            if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // Affiche picto retard uniquement si non brouillon et non resilie
+	            if ($object->statut > 0) print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft and not terminated
 	        }
         }
         print '</td></tr>';

htdocs/admin/commande.php

@@ -166,8 +166,8 @@ else if ($action == 'setdoc')
 {
 	if (dolibarr_set_const($db, "COMMANDE_ADDON_PDF",$value,'chaine',0,'',$conf->entity))
 	{
-		// La constante qui a ete lue en avant du nouveau set
-		// on passe donc par une variable pour avoir un affichage coherent
+		// The constant that was read before the new set
+		// We therefore requires a variable to have a coherent view
 		$conf->global->COMMANDE_ADDON_PDF = $value;
 	}
 
@@ -181,8 +181,8 @@ else if ($action == 'setdoc')
 
 else if ($action == 'setmod')
 {
-	// TODO Verifier si module numerotation choisi peut etre active
-	// par appel methode canBeActivated
+	// TODO Check if numbering module chosen can be activated 
+	// by calling method canBeActivated
 
 	dolibarr_set_const($db, "COMMANDE_ADDON",$value,'chaine',0,'',$conf->entity);
 }