Merge pull request #12400 from grandoc/new_branch_09_11_2019

internationalization

htdocs/adherents/agenda.php

@@ -110,7 +110,7 @@ $contactstatic = new Contact($db);
 $form = new Form($db);
 
 /*
- * Fiche categorie de client et/ou fournisseur
+ * Customer and/or supplier category sheet
  */
 if ($object->id > 0)
 {

htdocs/adherents/subscription.php

@@ -24,7 +24,7 @@
 /**
  *       \file       htdocs/adherents/subscription.php
  *       \ingroup    member
- *       \brief      Onglet d'ajout, edition, suppression des adhesions d'un adherent
+ *       \brief      tab for Adding, editing, deleting a member's memberships
  */
 
 require '../main.inc.php';
@@ -86,7 +86,7 @@ if ($rowid)
     // Define variables to know what current user can do on properties of user linked to edited member
     if ($object->user_id)
     {
-        // $user est le user qui edite, $object->user_id est l'id de l'utilisateur lies au membre edite
+        // $user is the user editing, $object->user_id is the user's id linked to the edited member
         $caneditfielduser=( (($user->id == $object->user_id) && $user->rights->user->self->creer)
         || (($user->id != $object->user_id) && $user->rights->user->user->creer) );
         $caneditpassworduser=( (($user->id == $object->user_id) && $user->rights->user->self->password)
@@ -554,12 +554,12 @@ if ($rowid > 0)
 	    if (! $adht->subscription)
 	    {
 	        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")); // Display a delay picto only if it is not a draft and is not canceled
 	    }
 	    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")); // Display a delay picto only if it is not a draft and is not canceled
 	    }
 	}
 	print '</td></tr>';

htdocs/adherents/type.php

@@ -412,7 +412,7 @@ if ($rowid > 0)
 		$object->fetch_optionals();
 
 		/*
-		 * Confirmation suppression
+		 * Confirmation deletion
 		 */
 		if ($action == 'delete')
 		{

htdocs/adherents/type_ldap.php

@@ -121,7 +121,7 @@ print '</div>';
 dol_fiche_end();
 
 /*
- * Barre d'actions
+ * Action bar
  */
 
 print '<div class="tabsAction">';
@@ -137,7 +137,7 @@ if ($conf->global->LDAP_MEMBER_TYPE_ACTIVE == 1) print "<br>\n";
 
 
 
-// Affichage attributs LDAP
+// Display LDAP attributes
 print load_fiche_titre($langs->trans("LDAPInformationsForThisMemberType"));
 
 print '<table width="100%" class="noborder">';
@@ -147,7 +147,7 @@ print '<td>'.$langs->trans("LDAPAttributes").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print '</tr>';
 
-// Lecture LDAP
+// LDAP reading
 $ldap=new Ldap();
 $result=$ldap->connect_bind();
 if ($result > 0)

htdocs/adherents/type_translation.php

@@ -22,7 +22,7 @@
 /**
  *	\file       htdocs/adherents/type_translation.php
  *	\ingroup    product
- *	\brief      Page de traduction des produits
+ *	\brief      Member translation page
  */
 
 require '../main.inc.php';
@@ -50,7 +50,7 @@ $result=restrictedArea($user, 'adherent', $id, 'adherent_type');
  * Actions
  */
 
-// retour a l'affichage des traduction si annulation
+// return to translation display if cancellation
 if ($cancel == $langs->trans("Cancel"))
 {
 	$action = '';
@@ -70,7 +70,7 @@ if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->rights->ad
 	$object->fetch($id);
 	$current_lang = $langs->getDefaultLang();
 
-	// update de l'objet
+	// update of object
 	if ( $_POST["forcelangprod"] == $current_lang )
 	{
 		$object->label			= $_POST["libelle"];
@@ -84,7 +84,7 @@ if ($action == 'vadd' && $cancel != $langs->trans("Cancel") && $user->rights->ad
 		$object->multilangs[$_POST["forcelangprod"]]["other"]		= dol_htmlcleanlastbr($_POST["other"]);
 	}
 
-	// sauvegarde en base
+	// backup into database
 	if ( $object->setMultiLangs($user) > 0 )
 	{
 		$action = '';
@@ -103,7 +103,7 @@ if ($action == 'vedit' && $cancel != $langs->trans("Cancel") && $user->rights->a
 	$object->fetch($id);
 	$current_lang = $langs->getDefaultLang();
 
-	foreach ($object->multilangs as $key => $value) // enregistrement des nouvelles valeurs dans l'objet
+	foreach ($object->multilangs as $key => $value) // saving new values in the object
 	{
 		if ( $key == $current_lang )
 		{