diff --git a/swad_changelog.h b/swad_changelog.h
index 9701bc668..9cec11376 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -110,12 +110,13 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
-#define Log_PLATFORM_VERSION "SWAD 15.60.4 (2015/12/08)"
+#define Log_PLATFORM_VERSION "SWAD 15.60.5 (2015/12/08)"
#define CSS_FILE "swad15.59.4.css"
// Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/*
+ Version 15.60.5: Dec 08, 2015 Changed some messages related to login. (186589 lines)
Version 15.60.4: Dec 08, 2015 Change in text about first / last year of a degree. (186589 lines)
Version 15.60.3: Dec 08, 2015 Fixed bug in country.
Code refactoring in menu. (186588 lines)
diff --git a/swad_password.c b/swad_password.c
index 88c98f74e..77969cf97 100644
--- a/swad_password.c
+++ b/swad_password.c
@@ -215,10 +215,10 @@ void Pwd_ActChgMyPwd2 (void)
void Pwd_PutLinkToSendNewPasswd (void)
{
- extern const char *Txt_I_forgot_my_password;
+ extern const char *Txt_Forgotten_password;
Act_PutContextualLink (ActReqSndNewPwd,Pwd_PutLinkToSendNewPasswdParams,
- "key16x16.gif",Txt_I_forgot_my_password);
+ "key16x16.gif",Txt_Forgotten_password);
}
static void Pwd_PutLinkToSendNewPasswdParams (void)
@@ -234,15 +234,15 @@ void Pwd_ShowFormSendNewPwd (void)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_If_you_have_forgotten_your_password_;
- extern const char *Txt_Password;
+ extern const char *Txt_Forgotten_password;
extern const char *Txt_nick_email_or_ID;
- extern const char *Txt_Email_new_password;
+ extern const char *Txt_Get_a_new_password;
/***** Start of form *****/
Act_FormStart (ActSndNewPwd);
/***** Start frame *****/
- Lay_StartRoundFrame (NULL,Txt_Password);
+ Lay_StartRoundFrame (NULL,Txt_Forgotten_password);
/***** Help text *****/
Lay_ShowAlert (Lay_INFO,Txt_If_you_have_forgotten_your_password_);
@@ -257,7 +257,7 @@ void Pwd_ShowFormSendNewPwd (void)
Usr_MAX_LENGTH_USR_LOGIN,Gbl.Usrs.Me.UsrIdLogin);
/***** Send button and end table *****/
- Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Email_new_password);
+ Lay_EndRoundFrameWithButton (Lay_CONFIRM_BUTTON,Txt_Get_a_new_password);
/***** End form *****/
Act_FormEnd ();
diff --git a/swad_text.c b/swad_text.c
index 2844cc0de..71d4ae716 100644
--- a/swad_text.c
+++ b/swad_text.c
@@ -9884,27 +9884,6 @@ const char *Txt_Email_X_has_already_been_confirmed_before = // Warning: it is ve
" has already been confirmed before."; // Necessita de tradução
#endif
-const char *Txt_Email_new_password =
-#if L==1
- "Enviarme una nueva contraseña"; // Necessita traduccio
-#elif L==2
- "Neues Passwort beantragen";
-#elif L==3
- "E-mail new password";
-#elif L==4
- "Enviarme una nueva contraseña";
-#elif L==5
- "Envoyez-moi un nouveau mot de passe";
-#elif L==6
- "Enviarme una nueva contraseña"; // Okoteve traducción
-#elif L==7
- "Invia una nuova password";
-#elif L==8
- "E-mail nowe hasło";
-#elif L==9
- "Enviar uma nova senha";
-#endif
-
const char *Txt_Email_X_removed = // Warning: it is very important to include %s in the following sentences
#if L==1
"Correu %s eliminat.";
@@ -12026,6 +12005,27 @@ const char *Txt_Force_students_to_read_this_information =
"Forçar os estudantes a ler esta informação";
#endif
+const char *Txt_Forgotten_password =
+#if L==1
+ "Contrasenya oblidada?";
+#elif L==2
+ "Passwort vergessen?";
+#elif L==3
+ "Forgotten password?";
+#elif L==4
+ "¿Contraseña olvidada?";
+#elif L==5
+ "Mot de passe oublié?";
+#elif L==6
+ "¿Contraseña olvidada?"; // Okoteve traducción
+#elif L==7
+ "Password dimenticata?";
+#elif L==8
+ "Zapomniane hasło?";
+#elif L==9
+ "Senha esquecida?";
+#endif
+
const char *Txt_Forum =
#if L==1
"Foro"; // Necessita traduccio
@@ -12575,6 +12575,27 @@ const char *Txt_Generate_exam =
"Gerar teste";
#endif
+const char *Txt_Get_a_new_password =
+#if L==1
+ "Rebre una nova contrasenya";
+#elif L==2
+ "Neues Passwort beantragen";
+#elif L==3
+ "Get a new password";
+#elif L==4
+ "Recibir una nueva contraseña";
+#elif L==5
+ "Recevoir un nouveau mot de passe";
+#elif L==6
+ "Recibir una nueva contraseña"; // Okoteve traducción
+#elif L==7
+ "Ottenere una nuova password";
+#elif L==8
+ "Uzyskaj nowe hasło";
+#elif L==9
+ "Obter uma nova senha";
+#endif
+
const char *Txt_Go_back =
#if L==1
"Tornar enrere";
@@ -13439,27 +13460,6 @@ const char *Txt_hours_ABBREVIATION = // Abbreviation of "hours"
"h";
#endif
-const char *Txt_I_forgot_my_password =
-#if L==1
- "He oblidat la meva contrasenya";
-#elif L==2
- "Ich habe mein Passwort vergessen";
-#elif L==3
- "I forgot my password";
-#elif L==4
- "He olvidado mi contraseña";
-#elif L==5
- "J'ai oublié mon mot de passe";
-#elif L==6
- "He olvidado mi contraseña"; // Okoteve traducción
-#elif L==7
- "Ho dimenticato la mia password";
-#elif L==8
- "Nie pamiętam hasła";
-#elif L==9
- "Esqueci minha senha";
-#endif
-
const char *Txt_I_have_read_this_information =
#if L==1
"He leído esta información"; // Necessita traduccio
diff --git a/swad_user.c b/swad_user.c
index d89260a07..f905e460d 100644
--- a/swad_user.c
+++ b/swad_user.c
@@ -1414,7 +1414,7 @@ void Usr_Logout (void)
void Usr_WriteFormLogin (void)
{
extern const char *The_ClassFormBold[The_NUM_THEMES];
- extern const char *Txt_New_on_PLATFORM_Sign_up;
+ extern const char *Txt_Create_account;
extern const char *Txt_Enter_from_X;
extern const char *Txt_Log_in;
extern const char *Txt_User;
@@ -1426,8 +1426,7 @@ void Usr_WriteFormLogin (void)
fprintf (Gbl.F.Out,"