From 92f29683b83e9fb9072445d21339b2becfc964b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 2 Mar 2016 14:53:46 +0100 Subject: [PATCH] Version 15.143.2 --- swad_changelog.h | 7 ++++- swad_institution.c | 8 +++--- swad_text.c | 72 ++++++++++++++++++++++++++++++++++++---------- 3 files changed, 67 insertions(+), 20 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 99e8982bf..46943ee75 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -120,17 +120,22 @@ // TODO: FIX BUG: In results of search of students, no mark of confirmation is shown even if the student really has confirmed his/her registration in the course // TODO: Insert "http://" to WWW when WWW does not start with "*://" +// TODO: Change "Nombre completo" to "Nombre completo del centro (facultad, escuela,...)" +// TODO: Change "Nombre completo" to "Nombre completo de la titulación (carrera, máster,...)" +// TODO: Change "Nombre completo" to "Nombre completo de la asignatura o curso" + /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.143.1 (2016-03-02)" +#define Log_PLATFORM_VERSION "SWAD 15.143.2 (2016-03-02)" #define CSS_FILE "swad15.137.2.css" #define JS_FILE "swad15.131.3.js" // 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.143.2: Mar 02, 2016 Change text message. (196086 lines) Version 15.143.1: Mar 02, 2016 Changes in actions of buttons after editing. (196042 lines) Version 15.143: Mar 01, 2016 Button to go to another institution after editing. (196041 lines) Version 15.142.1: Mar 01, 2016 Changes in some help messages. (195985 lines) diff --git a/swad_institution.c b/swad_institution.c index 10ed1988b..90d10ca6a 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -1968,8 +1968,8 @@ static void Ins_PutHeadInstitutionsForEdition (void) { extern const char *Txt_Code; extern const char *Txt_Country; - extern const char *Txt_Short_name; - extern const char *Txt_Full_name; + extern const char *Txt_Short_name_of_the_institution; + extern const char *Txt_Full_name_of_the_institution; extern const char *Txt_WWW; extern const char *Txt_Users; extern const char *Txt_Centres_ABBREVIATION; @@ -2014,8 +2014,8 @@ static void Ins_PutHeadInstitutionsForEdition (void) "", Txt_Code, Txt_Country, - Txt_Short_name, - Txt_Full_name, + Txt_Short_name_of_the_institution, + Txt_Full_name_of_the_institution, Txt_WWW, Txt_Users, Txt_Centres_ABBREVIATION, diff --git a/swad_text.c b/swad_text.c index 3a57072a8..437e78a01 100644 --- a/swad_text.c +++ b/swad_text.c @@ -12733,7 +12733,7 @@ const char *Txt_From_this_time_you_will_not_receive_messages_from_X = // Warning const char *Txt_Full_name = #if L==1 - "Nombre completo"; // Necessita traduccio + "Nom complet"; #elif L==2 "Vollständiger Name"; #elif L==3 @@ -12754,7 +12754,7 @@ const char *Txt_Full_name = const char *Txt_Full_BR_Name = #if L==1 - "Nombre
completo"; // Necessita traduccio + "Nom
complet"; #elif L==2 "Vollständiger
Name"; #elif L==3 @@ -12773,6 +12773,27 @@ const char *Txt_Full_BR_Name = "Nome
completo"; #endif +const char *Txt_Full_name_of_the_institution = +#if L==1 + "Nom complet de la institució"; +#elif L==2 + "Vollständiger Name der Institution"; +#elif L==3 + "Full name of the institution"; +#elif L==4 + "Nombre completo de la institución"; +#elif L==5 + "Nom complet de l'institution"; +#elif L==6 + "Nombre completo de la institución"; // Okoteve traducción +#elif L==7 + "Nome completo dell'istituzione"; +#elif L==8 + "Pełna nazwa instytucji"; +#elif L==9 + "Nome completo da instituição"; +#endif + const char *Txt_Function = #if L==1 "Funció"; @@ -22736,23 +22757,23 @@ const char *Txt_New_holiday = const char *Txt_New_institution_of_COUNTRY_X = // Warning: it is very important to include %s in the following sentences #if L==1 - "Nova institución de %s"; + "Nova institución (universitat, institut, escola, acadèmia, organització, empresa...) de %s"; #elif L==2 - "Neue Hochschule von %s"; + "Neue Hochschule (Universität, Hochschule, Schule, Hochschule, Organisation, Unternehmen...) von %s"; #elif L==3 - "New institution of %s"; + "New institution (university, college, school, academy, organization, company...) of %s"; #elif L==4 - "Nueva institución de %s"; + "Nueva institución (universidad, instituto, colegio, academia, organización, empresa...) de %s"; #elif L==5 - "Nouvel établissement de %s"; + "Nouvel établissement (université, collège, école, académie, organisation, entreprise...) de %s"; #elif L==6 - "Nueva institución de %s"; // Okoteve traducción + "Nueva institución (universidad, instituto, colegio, academia, organización, empresa...) de %s"; // Okoteve traducción #elif L==7 - "Nuova istituzione di %s"; + "Nuova istituzione (università, istituto, scuola, accademia, organizzazione, società...) di %s"; #elif L==8 - "Nowa instytucja %s"; + "Nowa instytucja (uniwersytet, uczelnia, szkoła, akademia, organizacja, firma...) %s"; #elif L==9 - "Nova institução de %s"; + "Nova institução (universidade, faculdade, escola, academia, organização, empresa...) de %s"; #endif const char *Txt_New_link = @@ -35236,7 +35257,7 @@ const char *Txt_shared_files_area = const char *Txt_Short_name = #if L==1 - "Nombre breve"; // Necessita traduccio + "Nom breu"; #elif L==2 "Kurzname"; #elif L==3 @@ -35250,14 +35271,14 @@ const char *Txt_Short_name = #elif L==7 "Nome breve"; #elif L==8 - "Short name"; // Potrzebujesz tlumaczenie + "Nazwa skrócona"; #elif L==9 "Nome abreviado"; #endif const char *Txt_Short_BR_Name = #if L==1 - "Nombre
breve"; // Necessita traduccio + "Nom
breu"; #elif L==2 "Kurzname"; #elif L==3 @@ -35271,11 +35292,32 @@ const char *Txt_Short_BR_Name = #elif L==7 "Nome
breve"; #elif L==8 - "Short
name"; // Potrzebujesz tlumaczenie + "Nazwa
skrócona"; #elif L==9 "Nome
abreviado"; #endif +const char *Txt_Short_name_of_the_institution = +#if L==1 + "Nom breu de la institució"; +#elif L==2 + "Kurzname der Institution"; +#elif L==3 + "Short name of the institution"; +#elif L==4 + "Nombre breve de la institución"; +#elif L==5 + "Nom abrégé de l'institution"; +#elif L==6 + "Nombre breve de la institución"; // Okoteve traducción +#elif L==7 + "Nome breve dell'istituzione"; +#elif L==8 + "Skrócona nazwa instytucji"; +#elif L==9 + "Nome abreviado da instituição"; +#endif + const char *Txt_Shortcut = #if L==1 "Accés directe";