diff --git a/swad_changelog.h b/swad_changelog.h
index 0cf839ccb..beb7e404b 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -121,20 +121,18 @@
// TODO: Insert "http://" to WWW when WWW does not start with "*://"
// TODO: Put link "Ir a ..." after editing a degree, centre or institution (similar to course)
-// TODO: Change "Año o semestre" to "Curso o semestre"
-// TODO: Change "El curso de la asignatura..." to "El curso/semestre de la asignatura..."
-
/*****************************************************************************/
/****************************** Public constants *****************************/
/*****************************************************************************/
-#define Log_PLATFORM_VERSION "SWAD 15.139.1 (2016-02-29)"
+#define Log_PLATFORM_VERSION "SWAD 15.139.2 (2016-02-29)"
#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.139.2: Feb 29, 2016 Changed message related to year/semester. (195731 lines)
Version 15.139.1: Feb 29, 2016 Remove fields FirstYear and LastYear from database table degrees. (195732 lines)
1 change necessary in database:
ALTER TABLE degrees DROP COLUMN FirstYear,DROP COLUMN LastYear;
diff --git a/swad_text.c b/swad_text.c
index 268270d6e..3cd5aa2be 100644
--- a/swad_text.c
+++ b/swad_text.c
@@ -4905,7 +4905,7 @@ const char *Txt_Congratulations_You_have_created_your_account_X_Now_Y_will_reque
"Parabéns! Você criou seu ACC conta."
" Agora %s vai pedir-lhe alguns dados para completar o seu perfil."
" Em seguida, você será capaz de aplicar para a matrícula em cursos."
- " Se um curso não existir,"
+ " Se uma disciplina não existir,"
" você pode criá-lo antes de solicitar a inscrição do mesmo"
" (o mesmo se aplica às instituições, centros e graus).";
#endif
@@ -14211,31 +14211,31 @@ const char *Txt_In_a_type_of_group_with_single_enrollment_students_can_not_be_re
const char *Txt_In_the_year_X_of_the_degree_Y_already_existed_a_course_with_the_name_Z = // Warning: it is very important to include three %s in the following sentences
#if L==1
- "En el curso %s de la titulación %s"
+ "En el año/semestre %s de la titulación %s"
" ya existía una asignatura con el nombre %s."; // Necessita traduccio
#elif L==2
- "In the year %s of the degree %s"
+ "In the year/semester %s of the degree %s"
" already existed a course with the name %s."; // Need Übersetzung
#elif L==3
- "In the year %s of the degree %s"
+ "In the year/semester %s of the degree %s"
" already existed a course with the name %s.";
#elif L==4
- "En el curso %s de la titulación %s"
+ "En el año/semestre %s de la titulación %s"
" ya existía una asignatura con el nombre %s.";
#elif L==5
- "In the year %s of the degree %s"
+ "In the year/semester %s of the degree %s"
" already existed a course with the name %s."; // Besoin de traduction
#elif L==6
- "En el curso %s de la titulación %s"
+ "En el año/semestre %s de la titulación %s"
" ya existía una asignatura con el nombre %s."; // Okoteve traducción
#elif L==7
- "Nell'anno %s di laurea %s"
+ "Nell'anno/semester %s di laurea %s"
" già esiste un corso con il nome %s.";
#elif L==8
- "W roku %s stopnia %s"
+ "W roku/semestr %s stopnia %s"
" istnialy juz kursów z nazwa %s.";
#elif L==9
- "In the year %s of the degree %s"
+ "In the year/semester %s of the degree %s"
" already existed a course with the name %s."; // Necessita de tradução
#endif
@@ -40531,23 +40531,23 @@ const char *Txt_The_course_X_already_exists = // Warning: it is very important t
const char *Txt_The_course_X_already_exists_in_year_Y = // Warning: it is very important to include two %s in the following sentences
#if L==1
- "La asignatura %s ya existe en el curso %s."; // Necessita traduccio
+ "La asignatura %s ya existe en el año/semestre %s."; // Necessita traduccio
#elif L==2
- "Die Kurs %s wurde bereits in Studienjahr %s eingegeben.";
+ "Die Kurs %s wurde bereits in Studienjahr/Semester %s eingegeben.";
#elif L==3
- "The course %s already exists in year %s.";
+ "The course %s already exists in year/semester %s.";
#elif L==4
- "La asignatura %s ya existe en el curso %s.";
+ "La asignatura %s ya existe en el año/semestre %s.";
#elif L==5
- "The course %s already exists in year %s."; // Besoin de traduction
+ "The course %s already exists in year/semester %s."; // Besoin de traduction
#elif L==6
- "La asignatura %s ya existe en el curso %s."; // Okoteve traducción
+ "La asignatura %s ya existe en el año/semestre %s."; // Okoteve traducción
#elif L==7
- "Il corso %s esiste già nell'anno %s.";
+ "Il corso %s esiste già nell'anno/semester %s.";
#elif L==8
- "The course %s already exists in year %s."; // Potrzebujesz tlumaczenie
+ "The course %s already exists in year/semester %s."; // Potrzebujesz tlumaczenie
#elif L==9
- "The course %s already exists in year %s."; // Necessita de tradução
+ "The course %s already exists in year/semester %s."; // Necessita de tradução
#endif
const char *Txt_The_course_X_has_been_moved_to_the_degree_Y = // Warning: it is very important to include two %s in the following sentences
@@ -44563,44 +44563,44 @@ const char *Txt_The_works_of_X_have_been_removed_in_a_total_of_Y_of_his_her_Z_co
const char *Txt_The_year_X_is_not_allowed = // Warning: it is very important to include %u in the following sentences
#if L==1
- "El curso %u no está permitido."; // Necessita traduccio
+ "El año/semestre %u no está permitido."; // Necessita traduccio
#elif L==2
- "The year %u is not enabled."; // Need Übersetzung
+ "The year/semester %u is not enabled."; // Need Übersetzung
#elif L==3
- "The year %u is not enabled.";
+ "The year/semester %u is not enabled.";
#elif L==4
- "El curso %u no está permitido.";
+ "El año/semestre %u no está permitido.";
#elif L==5
- "The year %u is not enabled."; // Besoin de traduction
+ "The year/semester %u is not enabled."; // Besoin de traduction
#elif L==6
- "El curso %u no está permitido."; // Okoteve traducción
+ "El año/semestre %u no está permitido."; // Okoteve traducción
#elif L==7
- "L'anno %u non è consentito.";
+ "L'anno/semester %u non è consentito.";
#elif L==8
- "The year %u is not allowed."; // Potrzebujesz tlumaczenie
+ "The year/semester %u is not allowed."; // Potrzebujesz tlumaczenie
#elif L==9
- "The year %u is not allowed."; // Necessita de tradução
+ "The year/semester %u is not allowed."; // Necessita de tradução
#endif
const char *Txt_The_year_of_the_course_X_has_changed = // Warning: it is very important to include %s in the following sentences
#if L==1
- "El curso de la asignatura %s ha cambiado."; // Necessita traduccio
+ "El año/semestre de la asignatura %s ha cambiado."; // Necessita traduccio
#elif L==2
- "The year of the couse %s has changed."; // Need Übersetzung
+ "The year/semester of the couse %s has changed."; // Need Übersetzung
#elif L==3
- "The year of the couse %s has changed.";
+ "The year/semester of the couse %s has changed.";
#elif L==4
- "El curso de la asignatura %s ha cambiado.";
+ "El año/semestre de la asignatura %s ha cambiado.";
#elif L==5
- "The year of the couse %s has changed."; // Besoin de traduction
+ "The year/semester of the couse %s has changed."; // Besoin de traduction
#elif L==6
- "El curso de la asignatura %s ha cambiado."; // Okoteve traducción
+ "El año/semestre de la asignatura %s ha cambiado."; // Okoteve traducción
#elif L==7
- "L'anno del corso %s è cambiato.";
+ "L'anno/semestre del corso %s è cambiato.";
#elif L==8
- "The year of the couse %s has changed."; // Potrzebujesz tlumaczenie
+ "The year/semestre of the couse %s has changed."; // Potrzebujesz tlumaczenie
#elif L==9
- "The year of the couse %s has changed."; // Necessita de tradução
+ "The year/semestre of the couse %s has changed."; // Necessita de tradução
#endif
const char *Txt_The_ZIP_file_has_been_received_successfully =