Added variable $s_reset_password_msg2 in strings_*.txt files for proper

message in manage_user_page.php depending on meaning of 'Reset password'


git-svn-id: http://mantisbt.svn.sourceforge.net/svnroot/mantisbt/trunk@658 f5dc347c-c33d-0410-90a0-b07cc1902cb9

lang/strings_chinese_traditional.txt

@@ -397,7 +397,8 @@
 	$s_edit_user_title = "�s��ϥΪ�";
 	$s_reset_password_button = "���]�K�X";
 	$s_delete_user_button = "�R���ϥΪ�";
-	$s_reset_password_msg = "���]�K�X sets the password to be blank.";
+	$s_reset_password_msg = "Reset Password sets the randomly generated password.";
+	$s_reset_password_msg2 = "���]�K�X sets the password to be blank.";
 
 	# manage_user_reset.php3
 	$s_account_reset_protected_msg = "�b�����O�@. Cannot reset the password.";
@@ -612,4 +613,4 @@
 	# view_bug_page.php3
 	$s_view_advanced_link = "�i���˵�";
 	$s_viewing_bug_simple_details_title = "�˵����θԲӸ��(²��)";
-?>
+?>

lang/strings_danish.txt

@@ -398,7 +398,8 @@
 	$s_edit_user_title = "Ret Bruger";
 	$s_reset_password_button = "Nulstil Password";
 	$s_delete_user_button = "Slet Bruger";
-	$s_reset_password_msg = "Nulstil Password stiller password til at være tomt.";
+	$s_reset_password_msg = "Reset Password sets the randomly generated password.";
+	$s_reset_password_msg2 = "Nulstil Password stiller password til at være tomt.";
 
 	# manage_user_reset.php3
 	$s_account_reset_protected_msg = "Konto beskyttet. Kan ikke nulstille password.";
@@ -613,4 +614,4 @@
 	# view_bug_page.php3
 	$s_view_advanced_link = "Vis avanceret";
 	$s_viewing_bug_simple_details_title = "Enkel oversigt over fejl i dette projekt";
-?>
+?>

lang/strings_dutch.txt

@@ -397,7 +397,8 @@
 	$s_edit_user_title = "Pas gebruiker aan";
 	$s_reset_password_button = "Zet wachtwoord terug op begininstellingen";
 	$s_delete_user_button = "Verwijder gebruiker";
-	$s_reset_password_msg = "Zetten van wachtwoord op begininstellingen zet het wachtwoord op blanco.";
+	$s_reset_password_msg = "Reset Password sets the randomly generated password.";
+	$s_reset_password_msg2 = "Zetten van wachtwoord op begininstellingen zet het wachtwoord op blanco.";
 
 	# manage_user_reset.php3
 	$s_account_reset_protected_msg = "Account beschermt. Wachtwoord kan niet op begininstellingen worden teruggezet.";
@@ -612,4 +613,4 @@
 	# view_bug_page.php3
 	$s_view_advanced_link = "Bekijk Gevorderd";
 	$s_viewing_bug_simple_details_title = "Bekijk opdracht details";
-?>
+?>

lang/strings_english.txt

@@ -402,7 +402,8 @@
 	$s_edit_user_title = "Edit User";
 	$s_reset_password_button = "Reset Password";
 	$s_delete_user_button = "Delete User";
-	$s_reset_password_msg = "Reset Password sets the password to be blank.";
+	$s_reset_password_msg = "Reset Password sets the randomly generated password.";
+	$s_reset_password_msg2 = "Reset Password sets the password to be blank.";
 
 	# manage_user_reset.php3
 	$s_account_reset_protected_msg = "Account protected. Cannot reset the password.";
@@ -616,4 +617,4 @@
 	# view_bug_page.php3
 	$s_view_advanced_link = "View Advanced";
 	$s_viewing_bug_simple_details_title = "Viewing Bug Simple Details";
-?>
+?>

lang/strings_french.txt

@@ -399,7 +399,8 @@
 	$s_edit_user_title = "Modifier un utilisateur";
 	$s_reset_password_button = "Effacer le mot de passe";
 	$s_delete_user_button = "Supprimer l'utilisateur";
-	$s_reset_password_msg = "(Effacer le mot de passe le remplace par \"\" (vide)).";
+	$s_reset_password_msg = "Reset Password sets the randomly generated password.";
+	$s_reset_password_msg2 = "(Effacer le mot de passe le remplace par \"\" (vide)).";
 
 	# manage_user_reset.php3
 	$s_account_reset_protected_msg = "Ce compte est prot�g� : impossible de modifier le mot de passe.";
@@ -614,4 +615,4 @@
 	# view_bug_page.php3
 	$s_view_advanced_link = "Vue d�taill�e";
 	$s_viewing_bug_simple_details_title = "Affichage simplifi� des d�tails du bug";
-?>
+?>

lang/strings_french2.txt

@@ -397,7 +397,8 @@
 	$s_edit_user_title = "Modifier un utilisateur";
 	$s_reset_password_button = "Effacer le mot de passe";
 	$s_delete_user_button = "Supprimer l'utilisateur";
-	$s_reset_password_msg = "(Effacer le mot de passe le remplace par \"\" (vide)).";
+	$s_reset_password_msg = "Reset Password sets the randomly generated password.";
+	$s_reset_password_msg2 = "(Effacer le mot de passe le remplace par \"\" (vide)).";
 
 	# manage_user_reset.php3
 	$s_account_reset_protected_msg = "Ce compte est protégé : impossible de modifier le mot de passe.";
@@ -612,4 +613,4 @@
 	# view_bug_page.php3
 	$s_view_advanced_link = "Vue détaillée";
 	$s_viewing_bug_simple_details_title = "Affichage simplifié des détails du bug";
-?>
+?>

lang/strings_german.txt

@@ -398,7 +398,8 @@
 	$s_edit_user_title = "Benutzer �ndern";
 	$s_reset_password_button = "Passwort zur�cksetzen";
 	$s_delete_user_button = "Benutzer l�schen";
-	$s_reset_password_msg = "Passwort zur�cksetzen l�scht das Passwort.";
+	$s_reset_password_msg = "Reset Password sets the randomly generated password.";
+	$s_reset_password_msg2 = "Passwort zur�cksetzen l�scht das Passwort.";
 
 	# manage_user_reset.php3
 	$s_account_reset_protected_msg = "Konto gesch�tzt. Passwort-L�schung nicht m�glich.";
@@ -613,4 +614,4 @@
 	# view_bug_page.php3
 	$s_view_advanced_link = "erweiterte Anzeige";
 	$s_viewing_bug_simple_details_title = "Einfache Fehleransicht anzeigen";
-?>
+?>

lang/strings_italian.txt

@@ -399,7 +399,8 @@
 	$s_edit_user_title = "Elimina Utente";
 	$s_reset_password_button = "Resetta Password";
 	$s_delete_user_button = "Elimina Utente";
-	$s_reset_password_msg = "Resetta le Password e imposta il valore a 'nullo'.";
+	$s_reset_password_msg = "Reset Password sets the randomly generated password.";
+	$s_reset_password_msg2 = "Resetta le Password e imposta il valore a 'nullo'.";
 
 	# manage_user_reset.php3
 	$s_account_reset_protected_msg = "Account Protetto. Non e' possibile resettare la password.";
@@ -614,4 +615,4 @@
 	# view_bug_page.php3
 	$s_view_advanced_link = "Visualizzazione Avanzata";
 	$s_viewing_bug_simple_details_title = "Dettaglio Visualizzazione Semplice del Bug";
-?>
+?>

lang/strings_korean.txt

@@ -398,7 +398,8 @@
 	$s_edit_user_title = "����� ����";
 	$s_reset_password_button = "�н����� �ʱ�ȭ";
 	$s_delete_user_button = "����� ����";
-	$s_reset_password_msg = "�н����� �ʱ�ȭ�� �н����带 �������� ����ϴ�.";
+	$s_reset_password_msg = "Reset Password sets the randomly generated password.";
+	$s_reset_password_msg2 = "�н����� �ʱ�ȭ�� �н����带 �������� ����ϴ�.";
 
 	# manage_user_reset.php3
 	$s_account_reset_protected_msg = "��ȣ�� �����Դϴ�. �н����带 �ʱ�ȭ�Ҽ� �����ϴ�.";
@@ -613,4 +614,4 @@
 	# view_bug_page.php3
 	$s_view_advanced_link = "�ڼ��� ����";
 	$s_viewing_bug_simple_details_title = "������ ����";
-?>
+?>

lang/strings_norwegian.txt

@@ -397,7 +397,8 @@
 	$s_edit_user_title = "Redigere bruker";
 	$s_reset_password_button = "Nullstille passord";
 	$s_delete_user_button = "Slette bruker";
-	$s_reset_password_msg = "Nullstille passord setter passordet til blank.";
+	$s_reset_password_msg = "Reset Password sets the randomly generated password.";
+	$s_reset_password_msg2 = "Nullstille passord setter passordet til blank.";
 
 	# manage_user_reset.php3
 	$s_account_reset_protected_msg = "Kontoen er beskyttet. Kan ikke nullstille passord.";
@@ -612,4 +613,4 @@
 	# view_bug_page.php3
 	$s_view_advanced_link = "Vis Avansert";
 	$s_viewing_bug_simple_details_title = "Oversikt over feil - enkel";
-?>
+?>

lang/strings_polish.txt

@@ -403,7 +403,8 @@
 	$s_edit_user_title = "Edycja U�ytkownika";
 	$s_reset_password_button = "Nowe has�o";
 	$s_delete_user_button = "Usu� U�ytkownika";
-	$s_reset_password_msg = "Po operacji 'Nowe has�o' u�ytkownik nie b�dzie musia� podawa� has�a przy logowaniu.";
+	$s_reset_password_msg = "Operacja 'Nowe has�o' ustawia losowo wygenerowane has�o";
+	$s_reset_password_msg2 = "Po operacji 'Nowe has�o' u�ytkownik nie b�dzie musia� podawa� has�a przy logowaniu.";
 
 	# manage_user_reset.php3
 	$s_account_reset_protected_msg = "Konto jest zabezpieczone. Nie mo�na przypisa� nowego has�a.";

lang/strings_portuguese_brazil.txt

@@ -397,7 +397,8 @@
 	$s_edit_user_title = "Editar usu�rio";
 	$s_reset_password_button = "Limpar Senha";
 	$s_delete_user_button = "Remover Usu�rio";
-	$s_reset_password_msg = "Limpar Senha configura a senha para em branco.";
+	$s_reset_password_msg = "Reset Password sets the randomly generated password.";
+	$s_reset_password_msg2 = "Limpar Senha configura a senha para em branco.";
 
 	# manage_user_reset.php3
 	$s_account_reset_protected_msg = "Conta Protegida. N�o � poss�vel limpar a senha.";
@@ -612,4 +613,4 @@
 	# view_bug_page.php3
 	$s_view_advanced_link = "Visualiza��o Avan�ada";
 	$s_viewing_bug_simple_details_title = "Detalhes Simplificados do Bug";
-?>
+?>

lang/strings_portuguese_standard.txt

@@ -397,7 +397,8 @@
 	$s_edit_user_title = "Editar Utilizador";
 	$s_reset_password_button = "Limpar Senha";
 	$s_delete_user_button = "Remover Utilizador";
-	$s_reset_password_msg = "Limpar Senha configura a senha para em branco.";
+	$s_reset_password_msg = "Reset Password sets the randomly generated password.";
+	$s_reset_password_msg2 = "Limpar Senha configura a senha para em branco.";
 
 	# manage_user_reset.php3
 	$s_account_reset_protected_msg = "Conta Protegida. N�o � poss�vel limpar a senha.";
@@ -612,4 +613,4 @@
 	# view_bug_page.php3
 	$s_view_advanced_link = "Visualiza��o Avan�ada";
 	$s_viewing_bug_simple_details_title = "Detalhes Simplificados do Bug";
-?>
+?>

lang/strings_russian.txt

@@ -397,7 +397,8 @@
 	$s_edit_user_title = "�������������� ������������";
 	$s_reset_password_button = "�������� ������";
 	$s_delete_user_button = "������� ������������";
-	$s_reset_password_msg = "��������� ������ ������� � ����, ��� ������ ������ ����� ������ ������.";
+	$s_reset_password_msg = "Reset Password sets the randomly generated password.";
+	$s_reset_password_msg2 = "��������� ������ ������� � ����, ��� ������ ������ ����� ������ ������.";
 
 	# manage_user_reset.php3
 	$s_account_reset_protected_msg = "������� �������. ���������� �������� ������.";
@@ -612,4 +613,4 @@
 	# view_bug_page.php3
 	$s_view_advanced_link = "���������� ��������� ����������";
 	$s_viewing_bug_simple_details_title = "���������� �������� ���������� �� ���������";
-?>
+?>

lang/strings_spanish.txt

@@ -398,7 +398,8 @@
 	$s_edit_user_title = "Editar Usuario";
 	$s_reset_password_button = "Restear Clave";
 	$s_delete_user_button = "Eliminar Usuario";
-	$s_reset_password_msg = "Resetar la clave significa blanquear clave.";
+	$s_reset_password_msg = "Reset Password sets the randomly generated password.";
+	$s_reset_password_msg2 = "Resetar la clave significa blanquear clave.";
 
 	# manage_user_reset.php3
 	$s_account_reset_protected_msg = "Cuenta Protegida. Imposible resetear la clave.";
@@ -613,4 +614,4 @@
 	# view_bug_page.php3
 	$s_view_advanced_link = "Cambiar a Vista Avanzada";
 	$s_viewing_bug_simple_details_title = "Vista Simple.";
-?>
+?>

lang/strings_swedish.txt

@@ -397,7 +397,8 @@
 	$s_edit_user_title = "Redigera anv�ndarkonto";
 	$s_reset_password_button = "Nollst�ll l�senord";
 	$s_delete_user_button = "Ta bort kontot";
-	$s_reset_password_msg = "Nollst�ll l�senordet s�tter ett tomt l�senord.";
+	$s_reset_password_msg = "Reset Password sets the randomly generated password.";
+	$s_reset_password_msg2 = "Nollst�ll l�senordet s�tter ett tomt l�senord.";
 
 	# manage_user_reset.php3
 	$s_account_reset_protected_msg = "Kontot skyddat. Kan inte nollst�lla l�senordet.";
@@ -612,4 +613,4 @@
 	# view_bug_page.php3
 	$s_view_advanced_link = "Visa advancerad";
 	$s_viewing_bug_simple_details_title = "Visar bug, enkel";
-?>
+?>

lang/strings_turkish.txt

@@ -398,7 +398,8 @@
 	$s_edit_user_title = "Kullan�c� D�zenle";
 	$s_reset_password_button = "�ifre S�f�rla";
 	$s_delete_user_button = "Kullan�c� Sil";
-	$s_reset_password_msg = "�ifre S�f�rla sifreyi bo� hale getirir .";
+	$s_reset_password_msg = "Reset Password sets the randomly generated password.";
+	$s_reset_password_msg2 = "�ifre S�f�rla sifreyi bo� hale getirir .";
 
 	# manage_user_reset.php3
 	$s_account_reset_protected_msg = "Hesap korumal�. Sifre s�f�rlanamaz.";
@@ -613,4 +614,4 @@
 	# view_bug_page.php3
 	$s_view_advanced_link = "Detayl� Link";
 	$s_viewing_bug_simple_details_title = "Basit Bug Detaylar� �zleniyor";
-?>
+?>

manage_user_page.php

@@ -101,7 +101,13 @@
 
 <p>
 <div align="center">
-	<?php echo $s_reset_password_msg ?>
+<?php
+	if ( ON == $g_allow_signup ) {
+		PRINT "$s_reset_password_msg";
+	} else {
+		PRINT "$s_reset_password_msg2";
+	}
+?>
 </div>
 
-<?php print_page_bot1( __FILE__ ) ?>
+<?php print_page_bot1( __FILE__ ) ?>