From d6a331ad7c7e1d8be9ef3d08eb0771c34b58b884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 27 Mar 2015 21:41:53 +0100 Subject: [PATCH] Version 14.102.8 --- swad_changelog.h | 4 +++- swad_mail.c | 12 ++++++------ swad_password.c | 4 ++-- swad_text.c | 20 ++++++++++---------- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index e249c5596..af41b56bb 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -103,11 +103,13 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.102.6 (2015/03/27)" +#define Log_PLATFORM_VERSION "SWAD 14.102.8 (2015/03/27)" // 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 14.102.8: Mar 27, 2015 Fixed bug in form to edit account. (183989 lines) + Version 14.102.7: Mar 27, 2015 Minor change in help text. (183988 lines) Version 14.102.6: Mar 27, 2015 Changes in layout of sign up. (183987 lines) Version 14.102.5: Mar 27, 2015 Changes in layout of log in. (183909 lines) Version 14.102.4: Mar 25, 2015 Fixed bug in ranking. (183883 lines) diff --git a/swad_mail.c b/swad_mail.c index 418a9715d..78a092826 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -1050,16 +1050,16 @@ void Mai_ShowFormChangeUsrEmail (void) { /* The first mail is the current one */ fprintf (Gbl.F.Out,"" - "" "%s:" "" - "", + ""); } else // NumEmail >= 2 { diff --git a/swad_password.c b/swad_password.c index 50932a2ee..45c1197a1 100644 --- a/swad_password.c +++ b/swad_password.c @@ -242,7 +242,7 @@ void Pwd_ShowFormSendNewPwd (void) void Pwd_ChkIdLoginAndSendNewPwd (void) { - extern const char *Txt_You_must_enter_your_ID_or_your_nickname; + extern const char *Txt_You_must_enter_your_nick_email_or_ID; extern const char *Txt_There_was_a_problem_sending_an_email_automatically; extern const char *Txt_If_you_have_written_your_ID_nickname_or_email_correctly_; extern const char *Txt_There_are_more_than_one_user_with_the_ID_X_Please_type_a_nick_or_email; @@ -253,7 +253,7 @@ void Pwd_ChkIdLoginAndSendNewPwd (void) /***** Check if user's ID or nickname is not empty *****/ if (!Gbl.Usrs.Me.UsrIdLogin[0]) { - Lay_ShowAlert (Lay_WARNING,Txt_You_must_enter_your_ID_or_your_nickname); + Lay_ShowAlert (Lay_WARNING,Txt_You_must_enter_your_nick_email_or_ID); Pwd_ShowFormSendNewPwd (); return; } diff --git a/swad_text.c b/swad_text.c index 926643702..ba6b39086 100644 --- a/swad_text.c +++ b/swad_text.c @@ -50637,25 +50637,25 @@ const char *Txt_You_must_enter_the_range_of_floating_point_values_allowed_as_ans "You must enter the range of floating point values allowed as answer."; // Necessita de tradução #endif -const char *Txt_You_must_enter_your_ID_or_your_nickname = +const char *Txt_You_must_enter_your_nick_email_or_ID = #if L==0 - "Debe escribir su ID (DNI/cédula) o su apodo."; // Necessita traduccio + "Ha d'escriure el seu @sobrenom, correu o ID (DNI/cèdula)."; #elif L==1 - "Bitte geben Sie Ihre Ausweis-Nr. oder Ihren Benutzernamen ein."; + "Bitte geben Sie Ihre @Benutzername, E-mail oder Ausweis-Nr."; #elif L==2 - "You must enter your ID or your nickname."; + "You must enter your @nick, e-mail or ID."; #elif L==3 - "Debe escribir su ID (DNI/cédula) o su apodo."; + "Debe escribir su @apodo, correo o ID (DNI/cédula)."; #elif L==4 - "Vous devez entrer votre numéro d'identité ou votre surnom."; + "Vous devez entrer votre @surnom, courrier ou numéro d'identité."; #elif L==5 - "Debe escribir su ID (DNI/cédula) o su apodo."; // Okoteve traducción + "Debe escribir su @apodo, correo o ID (DNI/cédula)."; // Okoteve traducción #elif L==6 - "Devi inserire il tuo numero di carta d'identità o il tuo nome utente."; + "Devi inserire il tuo @nome-utente, e-mail o numero carta d'identità."; #elif L==7 - "You must enter your ID or your nickname."; // Potrzebujesz tlumaczenie + "Musisz napisać @pseudonim, e-mail lub ID."; #elif L==8 - "Você deve digitar seu nº identif. ou seu alcunha."; + "Você deve digitar seu @alcunha, e-mail ou nº identif."; #endif const char *Txt_You_must_mark_an_answer_as_correct =