From 5b74f1d3dcca9838dd2c5c9aa002b10660841232 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 13 Aug 2022 12:33:00 +0200
Subject: [PATCH] Fix duplicate string

Conflicts:
	htdocs/public/members/new.php
---
 htdocs/install/step4.php        | 2 +-
 htdocs/langs/en_US/install.lang | 1 -
 htdocs/langs/en_US/main.lang    | 2 +-
 htdocs/public/members/new.php   | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/install/step4.php b/htdocs/install/step4.php
index 1bd7665f52a..1b179cf98ab 100644
--- a/htdocs/install/step4.php
+++ b/htdocs/install/step4.php
@@ -83,7 +83,7 @@ if ($db->ok) {
 	print '<input id="login" name="login" type="text" value="'.(GETPOSTISSET("login") ? GETPOST("login", 'alpha') : (isset($force_install_dolibarrlogin) ? $force_install_dolibarrlogin : '')).'"'.(@$force_install_noedit == 2 && $force_install_dolibarrlogin !== null ? ' disabled' : '').' autofocus></td></tr>';
 	print '<tr><td><label for="pass">'.$langs->trans("Password").' :</label></td><td>';
 	print '<input type="password" id="pass" name="pass" autocomplete="new-password" minlength="8"></td></tr>';
-	print '<tr><td><label for="pass_verif">'.$langs->trans("PasswordAgain").' :</label></td><td>';
+	print '<tr><td><label for="pass_verif">'.$langs->trans("PasswordRetype").' :</label></td><td>';
 	print '<input type="password" id="pass_verif" name="pass_verif" autocomplete="new-password" minlength="8"></td></tr>';
 	print '</table>';
 
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 4db9086dec9..dd451200c11 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -50,7 +50,6 @@ DatabaseName=Database name
 DatabasePrefix=Database table prefix
 DatabasePrefixDescription=Database table prefix. If empty, defaults to llx_.
 AdminLogin=User account for the Dolibarr database owner.
-PasswordAgain=Retype password confirmation
 AdminPassword=Password for Dolibarr database owner.
 CreateDatabase=Create database
 CreateUser=Create user account or grant user account permission on the Dolibarr database
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index c44bea6a078..cf748a60626 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -222,7 +222,7 @@ UserGroup=User group
 UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Password
-PasswordRetype=Retype your password
+PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
 Name=Name
 NameSlashCompany=Name / Company
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 31f1fa9f952..333ef90677f 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -564,7 +564,7 @@ print '<input type="text" name="email" maxlength="255" class="minwidth200" value
 if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 	print '<tr><td>'.$langs->trans("Login").' <span style="color: red">*</span></td><td><input type="text" name="login" maxlength="50" class="minwidth100"value="'.dol_escape_htmltag(GETPOST('login')).'"></td></tr>'."\n";
 	print '<tr><td>'.$langs->trans("Password").' <span style="color: red">*</span></td><td><input type="password" maxlength="128" name="pass1" class="minwidth100" value="'.dol_escape_htmltag(GETPOST("pass1", "none", 2)).'"></td></tr>'."\n";
-	print '<tr><td>'.$langs->trans("PasswordAgain").' <span style="color: red">*</span></td><td><input type="password" maxlength="128" name="pass2" class="minwidth100" value="'.dol_escape_htmltag(GETPOST("pass2", "none", 2)).'"></td></tr>'."\n";
+	print '<tr><td>'.$langs->trans("PasswordRetype").' <span style="color: red">*</span></td><td><input type="password" maxlength="128" name="pass2" class="minwidth100" value="'.dol_escape_htmltag(GETPOST("pass2", "none", 2)).'"></td></tr>'."\n";
 }
 // Gender
 print '<tr><td>'.$langs->trans("Gender").'</td>';