Version 14.38

swad_centre.c

@@ -443,6 +443,25 @@ static void Ctr_Configuration (bool PrintView)
      }
   }
 
+/*****************************************************************************/
+/********* Put a link (form) to view centres of current institution **********/
+/*****************************************************************************/
+// Gbl.CurrentIns.Ins.InsCod must be > 0
+
+void Ctr_PutLinkToViewCentresOfCurrentIns (void)
+  {
+   extern const char *The_ClassFormul[The_NUM_THEMES];
+   extern const char *Txt_Centres_of_INSTITUTION_X;
+
+   /***** Put form to view centres of current institution *****/
+   Act_FormStart (ActSeeCtr);
+   sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X,
+            Gbl.CurrentIns.Ins.ShortName);
+   Act_LinkFormSubmit (Gbl.Title,The_ClassFormul[Gbl.Prefs.Theme]);
+   Lay_PutSendIcon ("ctr",Gbl.Title,Gbl.Title);
+   fprintf (Gbl.F.Out,"</form>");
+  }
+
 /*****************************************************************************/
 /*************** Show the centres of the current institution *****************/
 /*****************************************************************************/
@@ -492,11 +511,13 @@ static void Ctr_ListCentres (void)
 
 static void Ctr_ListCentresForSeeing (void)
   {
-   extern const char *Txt_Centres;
+   extern const char *Txt_Centres_of_INSTITUTION_X;
    unsigned NumCtr;
 
    /***** Write heading *****/
-   Lay_StartRoundFrameTable10 (NULL,2,Txt_Centres);
+   sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X,
+            Gbl.CurrentIns.Ins.ShortName);
+   Lay_StartRoundFrameTable10 (NULL,2,Gbl.Title);
    Ctr_PutHeadCentresForSeeing (true);	// Order selectable
 
    /***** Write all the centres and their nuber of teachers *****/
@@ -1011,7 +1032,7 @@ void Ctr_WriteSelectorOfCentre (Act_Action_t NextAction)
 
 static void Ctr_ListCentresForEdition (void)
   {
-   extern const char *Txt_Centres;
+   extern const char *Txt_Centres_of_INSTITUTION_X;
    extern const char *Txt_Remove_centre;
    extern const char *Txt_Another_place;
    extern const char *Txt_CENTRE_STATUS[Ctr_NUM_STATUS_TXT];
@@ -1029,7 +1050,9 @@ static void Ctr_ListCentresForEdition (void)
    Usr_UsrDataConstructor (&UsrDat);
 
    /***** Write heading *****/
-   Lay_StartRoundFrameTable10 (NULL,2,Txt_Centres);
+   sprintf (Gbl.Title,Txt_Centres_of_INSTITUTION_X,
+            Gbl.CurrentIns.Ins.ShortName);
+   Lay_StartRoundFrameTable10 (NULL,2,Gbl.Title);
    Ctr_PutHeadCentresForEdition ();
 
    /***** Write all the centres *****/
@@ -1820,7 +1843,7 @@ void Ctr_ChangeCtrPhotoAttribution (void)
 static void Ctr_PutFormToCreateCentre (void)
   {
    extern const char *The_ClassFormul[The_NUM_THEMES];
-   extern const char *Txt_New_centre;
+   extern const char *Txt_New_centre_of_INSTITUTION_X;
    extern const char *Txt_Another_place;
    extern const char *Txt_CENTRE_STATUS[Ctr_NUM_STATUS_TXT];
    extern const char *Txt_Create_centre;
@@ -1838,7 +1861,9 @@ static void Ctr_PutFormToCreateCentre (void)
       Lay_ShowErrorAndExit ("You can not edit centres.");
 
    /***** Start of frame *****/
-   Lay_StartRoundFrameTable10 (NULL,2,Txt_New_centre);
+   sprintf (Gbl.Title,Txt_New_centre_of_INSTITUTION_X,
+            Gbl.CurrentIns.Ins.ShortName);
+   Lay_StartRoundFrameTable10 (NULL,2,Gbl.Title);
 
    /***** Write heading *****/
    Ctr_PutHeadCentresForEdition ();

swad_centre.h

@@ -90,6 +90,7 @@ void Ctr_SeeCtrWithPendingDegs (void);
 void Ctr_ShowConfiguration (void);
 void Ctr_PrintConfiguration (void);
 
+void Ctr_PutLinkToViewCentresOfCurrentIns (void);
 void Ctr_ShowCtrsOfCurrentIns (void);
 void Ctr_EditCentres (void);
 void Ctr_GetListCentres (long InsCod);

swad_changelog.h

@@ -35,12 +35,13 @@
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 14.37.3 (2014/12/13)"
+#define Log_PLATFORM_VERSION	"SWAD 14.38 (2014/12/13)"
 
 // 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 | tail -1
 
 /*
+	Version 14.38    :Dic 13, 2014	Link in "my courses" to courses, degrees, centres, institutions or countries. (171083 lines)
 	Version 14.37.3  :Dic 13, 2014	The title of list of courses in current degree now contains the short name of the degree. (170898 lines)
 	Version 14.37.2  :Dic 13, 2014	Changes in search of courses link in "my courses". (170874 lines)
 	Version 14.37.1  :Dic 13, 2014	Fixed bug in HTML entities in swad_text.c (translation).

swad_country.c

@@ -410,6 +410,22 @@ static void Cty_Configuration (bool PrintView)
      }
   }
 
+/*****************************************************************************/
+/******************** Put a link (form) to view countries ********************/
+/*****************************************************************************/
+
+void Cty_PutLinkToViewCountries (void)
+  {
+   extern const char *The_ClassFormul[The_NUM_THEMES];
+   extern const char *Txt_Countries;
+
+   /***** Put form to view institutions of current country *****/
+   Act_FormStart (ActSeeCty);
+   Act_LinkFormSubmit (Txt_Countries,The_ClassFormul[Gbl.Prefs.Theme]);
+   Lay_PutSendIcon ("earth",Txt_Countries,Txt_Countries);
+   fprintf (Gbl.F.Out,"</form>");
+  }
+
 /*****************************************************************************/
 /*************************** List all the countries **************************/
 /*****************************************************************************/

swad_country.h

@@ -75,6 +75,7 @@ void Cty_SeeCtyWithPendingInss (void);
 void Cty_ShowConfiguration (void);
 void Cty_PrintConfiguration (void);
 
+void Cty_PutLinkToViewCountries (void);
 void Cty_ListCountries (void);
 void Cty_ListCountries1 (void);
 void Cty_ListCountries2 (void);

swad_course.c

@@ -75,6 +75,7 @@ static void Crs_PutFormToConfigLogIn (bool IsForm);
 
 static void Crs_WriteListMyCoursesToSelectOne (void);
 
+static void Crs_PutLinkToViewCoursesOfCurrentDeg (void);
 static void Crs_GetListCoursesInDegree (Crs_WhatCourses_t WhatCourses);
 static void Crs_ListCourses (void);
 static void Crs_EditCourses (void);
@@ -94,7 +95,7 @@ static void Crs_GetDataOfCourseFromRow (struct Course *Crs,MYSQL_ROW row);
 static void Crs_EmptyCourseCompletely (long CrsCod);
 static bool Crs_RenameCourse (struct Course *Crs,Cns_ShortOrFullName_t ShortOrFullName);
 static void Crs_PutLinkToGoToCrs (struct Course *Crs);
-static void Usr_PutFormToSearchCourses (void);
+static void Crs_PutLinkToSearchCourses (void);
 
 static void Crs_PutParamOtherCrsCod (long CrsCod);
 static long Crs_GetParamOtherCrsCod (void);
@@ -647,6 +648,25 @@ unsigned Crs_GetNumCrssWithUsrs (Rol_Role_t Role,const char *SubQuery)
    return (unsigned) DB_QueryCOUNT (Query,"can not get number of courses with users");
   }
 
+/*****************************************************************************/
+/************ Put a link (form) to view courses of current degree ************/
+/*****************************************************************************/
+// Gbl.CurrentDeg.Deg.DegCod must be > 0
+
+static void Crs_PutLinkToViewCoursesOfCurrentDeg (void)
+  {
+   extern const char *The_ClassFormul[The_NUM_THEMES];
+   extern const char *Txt_Courses_of_DEGREE_X;
+
+   /***** Put form to view courses of current degree *****/
+   Act_FormStart (ActSeeCrs);
+   sprintf (Gbl.Title,Txt_Courses_of_DEGREE_X,
+            Gbl.CurrentDeg.Deg.ShortName);
+   Act_LinkFormSubmit (Gbl.Title,The_ClassFormul[Gbl.Prefs.Theme]);
+   Lay_PutSendIcon ("hierarchy",Gbl.Title,Gbl.Title);
+   fprintf (Gbl.F.Out,"</form>");
+  }
+
 /*****************************************************************************/
 /************************** Show courses of a degree *************************/
 /*****************************************************************************/
@@ -919,7 +939,8 @@ static void Crs_ListCoursesForSeeing (void)
    Crs_StatusTxt_t StatusTxt;
 
    /***** Write heading *****/
-   sprintf (Gbl.Message,Txt_Courses_of_DEGREE_X,Gbl.CurrentDeg.Deg.ShortName);
+   sprintf (Gbl.Message,Txt_Courses_of_DEGREE_X,
+            Gbl.CurrentDeg.Deg.ShortName);
    Lay_StartRoundFrameTable10 (NULL,2,Gbl.Message);
    Crs_PutHeadCoursesForSeeing ();
 
@@ -1024,7 +1045,8 @@ static void Crs_ListCoursesForEdition (void)
    Usr_UsrDataConstructor (&UsrDat);
 
    /***** Write heading *****/
-   sprintf (Gbl.Message,Txt_Courses_of_DEGREE_X,Gbl.CurrentDeg.Deg.ShortName);
+   sprintf (Gbl.Message,Txt_Courses_of_DEGREE_X,
+            Gbl.CurrentDeg.Deg.ShortName);
    Lay_StartRoundFrameTable10 (NULL,2,Gbl.Message);
    Crs_PutHeadCoursesForEdition ();
 
@@ -1321,7 +1343,8 @@ static void Crs_PutFormToCreateCourse (void)
    Crs = &Gbl.Degs.EditingCrs;
 
    /***** Write heading *****/
-   sprintf (Gbl.Message,Txt_New_course_of_DEGREE_X,Gbl.CurrentDeg.Deg.ShortName);
+   sprintf (Gbl.Message,Txt_New_course_of_DEGREE_X,
+            Gbl.CurrentDeg.Deg.ShortName);
    Lay_StartRoundFrameTable10 (NULL,2,Gbl.Message);
    Crs_PutHeadCoursesForEdition ();
 
@@ -2597,7 +2620,17 @@ void Crs_ReqSelectOneOfMyCourses (void)
 
    /***** Search / select more courses *****/
    fprintf (Gbl.F.Out,"<div align=\"center\">");
-   Usr_PutFormToSearchCourses ();
+   Crs_PutLinkToSearchCourses ();
+   if (Gbl.CurrentDeg.Deg.DegCod > 0)
+      Crs_PutLinkToViewCoursesOfCurrentDeg ();
+   else if (Gbl.CurrentCtr.Ctr.CtrCod > 0)
+      Deg_PutLinkToViewDegreesOfCurrentCtr ();
+   else if (Gbl.CurrentIns.Ins.InsCod > 0)
+      Ctr_PutLinkToViewCentresOfCurrentIns ();
+   else if (Gbl.CurrentCty.Cty.CtyCod > 0)
+      Ins_PutLinkToViewInstitutionsOfCurrentCty ();
+   else
+      Cty_PutLinkToViewCountries ();
    fprintf (Gbl.F.Out,"</div>");
 
    /***** Select one of my courses *****/
@@ -2614,7 +2647,7 @@ void Crs_ReqSelectOneOfMyCourses (void)
 /******************* Put a link (form) to search courses *********************/
 /*****************************************************************************/
 
-static void Usr_PutFormToSearchCourses (void)
+static void Crs_PutLinkToSearchCourses (void)
   {
    extern const char *The_ClassFormul[The_NUM_THEMES];
    extern const char *Txt_Search_courses;
@@ -2634,10 +2667,10 @@ static void Usr_PutFormToSearchCourses (void)
   }
 
 /*****************************************************************************/
-/**** Put a link (form) to remove all the students in the current course *****/
+/****************** Put a link (form) to select my courses *******************/
 /*****************************************************************************/
 
-void Usr_PutFormToSelectMyCourses (void)
+void Crs_PutFormToSelectMyCourses (void)
   {
    extern const char *The_ClassFormul[The_NUM_THEMES];
    extern const char *Txt_My_courses;

swad_course.h

@@ -127,7 +127,7 @@ void Crs_RenameCourseFull (void);
 void Crs_ChangeCrsStatus (void);
 void Crs_ContEditAfterChgCrs (void);
 
-void Usr_PutFormToSelectMyCourses (void);
+void Crs_PutFormToSelectMyCourses (void);
 void Crs_PutParamCrsCod (long CrsCod);
 
 void Crs_ReqSelectOneOfMyCourses (void);

swad_degree.c

@@ -903,6 +903,25 @@ void Deg_ReqEditDegreeTypes (void)
    Deg_FreeListDegTypes ();
   }
 
+/*****************************************************************************/
+/*********** Put a link (form) to view degrees of current centre *************/
+/*****************************************************************************/
+// Gbl.CurrentCtr.Ctr.CtrCod must be > 0
+
+void Deg_PutLinkToViewDegreesOfCurrentCtr (void)
+  {
+   extern const char *The_ClassFormul[The_NUM_THEMES];
+   extern const char *Txt_Degrees_of_CENTRE_X;
+
+   /***** Put form to view degrees of current centre *****/
+   Act_FormStart (ActSeeDeg);
+   sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X,
+            Gbl.CurrentCtr.Ctr.ShortName);
+   Act_LinkFormSubmit (Gbl.Title,The_ClassFormul[Gbl.Prefs.Theme]);
+   Lay_PutSendIcon ("deg",Gbl.Title,Gbl.Title);
+   fprintf (Gbl.F.Out,"</form>");
+  }
+
 /*****************************************************************************/
 /************* Show the degrees belonging to the current centre **************/
 /*****************************************************************************/
@@ -1113,11 +1132,13 @@ static void Deg_ListDegreeTypesForEdition (void)
 
 static void Deg_ListDegreesForSeeing (void)
   {
-   extern const char *Txt_Degrees;
+   extern const char *Txt_Degrees_of_CENTRE_X;
    unsigned NumDeg;
 
    /***** Write heading *****/
-   Lay_StartRoundFrameTable10 (NULL,2,Txt_Degrees);
+   sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X,
+            Gbl.CurrentCtr.Ctr.ShortName);
+   Lay_StartRoundFrameTable10 (NULL,2,Gbl.Title);
    Deg_PutHeadDegreesForSeeing ();
 
    /***** List the degrees *****/
@@ -1243,7 +1264,7 @@ static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg)
 
 static void Deg_ListDegreesForEdition (void)
   {
-   extern const char *Txt_Degrees;
+   extern const char *Txt_Degrees_of_CENTRE_X;
    extern const char *Txt_Remove_degree;
    extern const char *Txt_DEGREE_With_year_for_optional_courses;
    extern const char *Txt_DEGREE_Without_year_for_optional_courses;
@@ -1263,7 +1284,9 @@ static void Deg_ListDegreesForEdition (void)
    Usr_UsrDataConstructor (&UsrDat);
 
    /***** Write heading *****/
-   Lay_StartRoundFrameTable10 (NULL,2,Txt_Degrees);
+   sprintf (Gbl.Title,Txt_Degrees_of_CENTRE_X,
+            Gbl.CurrentCtr.Ctr.ShortName);
+   Lay_StartRoundFrameTable10 (NULL,2,Gbl.Title);
    Deg_PutHeadDegreesForEdition ();
 
    /***** List the degrees *****/
@@ -1651,7 +1674,7 @@ static void Deg_PutFormToCreateDegType (void)
 
 static void Deg_PutFormToCreateDegree (void)
   {
-   extern const char *Txt_New_degree;
+   extern const char *Txt_New_degree_of_CENTRE_X;
    extern const char *Txt_DEGREE_STATUS[Deg_NUM_STATUS_TXT];
    extern const char *Txt_Create_degree;
    struct Degree *Deg;
@@ -1671,7 +1694,9 @@ static void Deg_PutFormToCreateDegree (void)
    Deg = &Gbl.Degs.EditingDeg;
 
    /***** Start of frame *****/
-   Lay_StartRoundFrameTable10 (NULL,2,Txt_New_degree);
+   sprintf (Gbl.Title,Txt_New_degree_of_CENTRE_X,
+            Gbl.CurrentCtr.Ctr.ShortName);
+   Lay_StartRoundFrameTable10 (NULL,2,Gbl.Title);
 
    /***** Write heading *****/
    Deg_PutHeadDegreesForEdition ();

swad_degree.h

@@ -114,6 +114,7 @@ void Deg_InitCurrentCourse (void);
 void Deg_WriteSelectorDegTypes (void);
 void Deg_SeeDegTypes (void);
 void Deg_ReqEditDegreeTypes (void);
+void Deg_PutLinkToViewDegreesOfCurrentCtr (void);
 void Deg_ShowDegsOfCurrentCtr (void);
 
 unsigned Deg_ConvStrToYear (const char *StrYear);

swad_institution.c

@@ -389,6 +389,25 @@ static void Ins_Configuration (bool PrintView)
      }
   }
 
+/*****************************************************************************/
+/********* Put a link (form) to view institutions of current country *********/
+/*****************************************************************************/
+// Gbl.CurrentCty.Cty.CtyCod must be > 0
+
+void Ins_PutLinkToViewInstitutionsOfCurrentCty (void)
+  {
+   extern const char *The_ClassFormul[The_NUM_THEMES];
+   extern const char *Txt_Institutions_of_COUNTRY_X;
+
+   /***** Put form to view institutions of current country *****/
+   Act_FormStart (ActSeeIns);
+   sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X,
+            Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]);
+   Act_LinkFormSubmit (Gbl.Title,The_ClassFormul[Gbl.Prefs.Theme]);
+   Lay_PutSendIcon ("ins",Gbl.Title,Gbl.Title);
+   fprintf (Gbl.F.Out,"</form>");
+  }
+
 /*****************************************************************************/
 /**************** List the institutions of the current country ***************/
 /*****************************************************************************/
@@ -424,11 +443,13 @@ void Ins_ShowInssOfCurrentCty (void)
 
 static void Ins_ListInstitutionsForSeeing (void)
   {
-   extern const char *Txt_Institutions;
+   extern const char *Txt_Institutions_of_COUNTRY_X;
    unsigned NumIns;
 
    /***** Table head *****/
-   Lay_StartRoundFrameTable10 (NULL,2,Txt_Institutions);
+   sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X,
+            Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]);
+   Lay_StartRoundFrameTable10 (NULL,2,Gbl.Title);
    Ins_PutHeadInstitutionsForSeeing (true);	// Order selectable
 
    /***** Write all the institutions and their nuber of users *****/
@@ -964,7 +985,7 @@ void Ins_WriteSelectorOfInstitution (Act_Action_t NextAction)
 
 static void Ins_ListInstitutionsForEdition (void)
   {
-   extern const char *Txt_Institutions;
+   extern const char *Txt_Institutions_of_COUNTRY_X;
    extern const char *Txt_Remove_institution;
    extern const char *Txt_Another_country;
    extern const char *Txt_INSTITUTION_STATUS[Ins_NUM_STATUS_TXT];
@@ -984,7 +1005,9 @@ static void Ins_ListInstitutionsForEdition (void)
    Cty_GetListCountries (Cty_GET_ONLY_COUNTRIES);
 
    /***** Write heading *****/
-   Lay_StartRoundFrameTable10 (NULL,2,Txt_Institutions);
+   sprintf (Gbl.Title,Txt_Institutions_of_COUNTRY_X,
+            Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]);
+   Lay_StartRoundFrameTable10 (NULL,2,Gbl.Title);
    Ins_PutHeadInstitutionsForEdition ();
 
    /***** Write all the institutions *****/
@@ -1598,7 +1621,7 @@ void Ins_ChangeInsStatus (void)
 
 static void Ins_PutFormToCreateInstitution (void)
   {
-   extern const char *Txt_New_institution;
+   extern const char *Txt_New_institution_of_COUNTRY_X;
    extern const char *Txt_INSTITUTION_STATUS[Ins_NUM_STATUS_TXT];
    extern const char *Txt_Create_institution;
    struct Institution *Ins;
@@ -1618,7 +1641,9 @@ static void Ins_PutFormToCreateInstitution (void)
       Lay_ShowErrorAndExit ("You can not edit institutions.");
 
    /***** Start of frame *****/
-   Lay_StartRoundFrameTable10 (NULL,2,Txt_New_institution);
+   sprintf (Gbl.Title,Txt_New_institution_of_COUNTRY_X,
+            Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]);
+   Lay_StartRoundFrameTable10 (NULL,2,Gbl.Title);
 
    /***** Write heading *****/
    Ins_PutHeadInstitutionsForEdition ();

swad_institution.h

@@ -97,6 +97,7 @@ void Ins_SeeInsWithPendingCtrs (void);
 void Ins_ShowConfiguration (void);
 void Ins_PrintConfiguration (void);
 
+void Ins_PutLinkToViewInstitutionsOfCurrentCty (void);
 void Ins_ShowInssOfCurrentCty (void);
 void Ins_EditInstitutions (void);
 void Ins_GetListInstitutions (long CtyCod,Ins_GetExtraData_t GetExtraData);

swad_search.c

@@ -91,7 +91,7 @@ void Sch_ReqSysSearch (void)
    if (Gbl.Usrs.Me.Logged)
      {
       fprintf (Gbl.F.Out,"<div align=\"center\">");
-      Usr_PutFormToSelectMyCourses ();
+      Crs_PutFormToSelectMyCourses ();
       fprintf (Gbl.F.Out,"</div>");
      }
 
@@ -109,7 +109,7 @@ void Sch_ReqCtySearch (void)
    if (Gbl.Usrs.Me.Logged)
      {
       fprintf (Gbl.F.Out,"<div align=\"center\">");
-      Usr_PutFormToSelectMyCourses ();
+      Crs_PutFormToSelectMyCourses ();
       fprintf (Gbl.F.Out,"</div>");
      }
 
@@ -127,7 +127,7 @@ void Sch_ReqInsSearch (void)
    if (Gbl.Usrs.Me.Logged)
      {
       fprintf (Gbl.F.Out,"<div align=\"center\">");
-      Usr_PutFormToSelectMyCourses ();
+      Crs_PutFormToSelectMyCourses ();
       fprintf (Gbl.F.Out,"</div>");
      }
 
@@ -145,7 +145,7 @@ void Sch_ReqCtrSearch (void)
    if (Gbl.Usrs.Me.Logged)
      {
       fprintf (Gbl.F.Out,"<div align=\"center\">");
-      Usr_PutFormToSelectMyCourses ();
+      Crs_PutFormToSelectMyCourses ();
       fprintf (Gbl.F.Out,"</div>");
      }
 
@@ -163,7 +163,7 @@ void Sch_ReqDegSearch (void)
    if (Gbl.Usrs.Me.Logged)
      {
       fprintf (Gbl.F.Out,"<div align=\"center\">");
-      Usr_PutFormToSelectMyCourses ();
+      Crs_PutFormToSelectMyCourses ();
       fprintf (Gbl.F.Out,"</div>");
      }
 
@@ -181,7 +181,7 @@ void Sch_ReqCrsSearch (void)
    if (Gbl.Usrs.Me.Logged)
      {
       fprintf (Gbl.F.Out,"<div align=\"center\">");
-      Usr_PutFormToSelectMyCourses ();
+      Crs_PutFormToSelectMyCourses ();
       fprintf (Gbl.F.Out,"</div>");
      }
 

swad_text.c

@@ -3845,6 +3845,27 @@ const char *Txt_CENTRES_HELP_ORDER[2] =
 #endif
 	};
 
+const char *Txt_Centres_of_INSTITUTION_X =	// Warning: it is very important to include %s in the following sentences
+#if   L==0
+	"Centres de %s";
+#elif L==1
+	"Lehrinstitute von %s";
+#elif L==2
+	"Centres of %s";
+#elif L==3
+	"Centros de %s";
+#elif L==4
+	"Centres de %s";
+#elif L==5
+	"Centros de %s";	// Okoteve traducción
+#elif L==6
+	"Centri di %s";
+#elif L==7
+	"Centra %s";
+#elif L==8
+	"Centros de %s";
+#endif
+
 const char *Txt_CENTRES_ORDER[2] =
    {
 #if   L==0
@@ -7258,6 +7279,27 @@ const char *Txt_degrees =
 	"titulaçoes";
 #endif
 
+const char *Txt_Degrees_of_CENTRE_X =	// Warning: it is very important to include %s in the following sentences
+#if   L==0
+	"Titulacions de %s";
+#elif L==1
+	"Studiengang von %s";
+#elif L==2
+	"Degrees of %s";
+#elif L==3
+	"Titulaciones de %s";
+#elif L==4
+	"Études de %s";
+#elif L==5
+	"Titulaciones de %s";	// Okoteve traducción
+#elif L==6
+	"Lauree di %s";
+#elif L==7
+	"Stopnie %s";
+#elif L==8
+	"Titulaçoes de %s";
+#endif
+
 const char *Txt_Degrees_with_pending_courses =
 #if   L==0
 	"Titulacions amb assignatures pendents d'activar";
@@ -14207,6 +14249,27 @@ const char *Txt_INSTITUTIONS_HELP_ORDER[2] =
 #endif
 	};
 
+const char *Txt_Institutions_of_COUNTRY_X =	// Warning: it is very important to include %s in the following sentences
+#if   L==0
+	"Institucions de %s";
+#elif L==1
+	"Hochschulen von %s";
+#elif L==2
+	"Institutions of %s";
+#elif L==3
+	"Instituciones de %s";
+#elif L==4
+	"Établissements de %s";
+#elif L==5
+	"Instituciones de %s";	// Okoteve traducción
+#elif L==6
+	"Istituzioni di %s";
+#elif L==7
+	"Instytucje %s";
+#elif L==8
+	"Instituções de %s";
+#endif
+
 const char *Txt_INSTITUTIONS_ORDER[2] =
    {
 #if   L==0
@@ -14333,28 +14396,37 @@ const char *Txt_IP =		// Internet Protocol address
 #elif L==8
 	"IP";
 #endif
-
+/*
 const char *Txt_X_is_busy_at_the_moment_Try_again_in_a_few_seconds =	// Warning: it is very important to include %s in the following sentences
 #if   L==0
-	"%s está ocupado en este momento. Vuelva a intentarlo dentro de unos segundos.";	// Necessita traduccio
+	"%s está ocupado en este momento."
+        " Vuelva a intentarlo dentro de unos segundos.";	// Necessita traduccio
 #elif L==1
-	"%s ist im Moment beschäftigt. Wieder in ein paar Sekunden noch einmal.";
+	"%s ist im Moment beschäftigt."
+	" Wieder in ein paar Sekunden noch einmal.";
 #elif L==2
-	"%s is busy at the moment. Try again in a few seconds.";
+	"%s is busy at the moment."
+	" Try again in a few seconds.";
 #elif L==3
-	"%s está ocupado en este momento. Vuelva a intentarlo dentro de unos segundos.";
+	"%s está ocupado en este momento."
+	" Vuelva a intentarlo dentro de unos segundos.";
 #elif L==4
-	"%s est occupé en ce moment. Essayez à nouveau dans quelques secondes.";
+	"%s est occupé en ce moment."
+	" Essayez à nouveau dans quelques secondes.";
 #elif L==5
-	"%s está ocupado en este momento. Vuelva a intentarlo dentro de unos segundos.";	// Okoteve traducción
+	"%s está ocupado en este momento."
+	" Vuelva a intentarlo dentro de unos segundos.";	// Okoteve traducción
 #elif L==6
-	"%s è occupato in questo momento. Riprova tra pochi secondi.";
+	"%s è occupato in questo momento."
+	" Riprova tra pochi secondi.";
 #elif L==7
-	"%s jest zajety. Spróbuj ponownie za kilka sekund.";
+	"%s jest zajety."
+	" Spróbuj ponownie za kilka sekund.";
 #elif L==8
-	"%s está ocupado no momento. Tente novamente em alguns segundos.";
+	"%s está ocupado no momento."
+	" Tente novamente em alguns segundos.";
 #endif
-
+*/
 const char *Txt_It_is_mandatory_to_choose_a_group =
 #if   L==0
 	"Elegir grupo es obligatorio";		// Necessita traduccio
@@ -23824,25 +23896,25 @@ const char *Txt_New_banner =
 	"Novo banner";
 #endif
 
-const char *Txt_New_centre =
+const char *Txt_New_centre_of_INSTITUTION_X =	// Warning: it is very important to include %s in the following sentences
 #if   L==0
-	"Nuevo centro";	// Necessita traduccio
+	"Nou centre de %s";
 #elif L==1
-	"Neues Lehrinstitut";
+	"Neues Lehrinstitut von %s";
 #elif L==2
-	"New centre";
+	"New centre of %s";
 #elif L==3
-	"Nuevo centro";
+	"Nuevo centro de %s";
 #elif L==4
-	"Nouveau centre";
+	"Nouveau centre de %s";
 #elif L==5
-	"Nuevo centro";	// Okoteve traducción
+	"Nuevo centro de %s";	// Okoteve traducción
 #elif L==6
-	"Nuovo centro";
+	"Nuovo centro di %s";
 #elif L==7
-	"Nowe centrum";
+	"Nowe centrum %s";
 #elif L==8
-	"Novo centro";
+	"Novo centro de %s";
 #endif
 
 const char *Txt_New_country =
@@ -23887,25 +23959,25 @@ const char *Txt_New_course_of_DEGREE_X =	// Warning: it is very important to inc
 	"Nova disciplina de %s";
 #endif
 
-const char *Txt_New_degree =
+const char *Txt_New_degree_of_CENTRE_X =	// Warning: it is very important to include %s in the following sentences
 #if   L==0
-	"Nueva titulación";	// Necessita traduccio
+	"Nova titulació de %s";
 #elif L==1
-	"Neuer Studiengang";
+	"Neuer Studiengang von %s";
 #elif L==2
-	"New degree";
+	"New degree of %s";
 #elif L==3
-	"Nueva titulación";
+	"Nueva titulación de %s";
 #elif L==4
-	"Nouvel étude";
+	"Nouvel étude de %s";
 #elif L==5
-	"Nueva titulación";	// Okoteve traducción
+	"Nueva titulación de %s";	// Okoteve traducción
 #elif L==6
-	"Nuova laurea";
+	"Nuova laurea di %s";
 #elif L==7
-	"Nowy stopien";
+	"Nowy stopien %s";
 #elif L==8
-	"Nova titulação";
+	"Nova titulação de %s";
 #endif
 
 const char *Txt_New_department =
@@ -24034,25 +24106,25 @@ const char *Txt_New_holiday =
 	"Nova féria";
 #endif
 
-const char *Txt_New_institution =
+const char *Txt_New_institution_of_COUNTRY_X =	// Warning: it is very important to include %s in the following sentences
 #if   L==0
-	"Nueva institución";	// Necessita traduccio
+	"Nova institución de %s";
 #elif L==1
-	"Neue Hochschule";
+	"Neue Hochschule von %s";
 #elif L==2
-	"New institution";
+	"New institution of %s";
 #elif L==3
-	"Nueva institución";
+	"Nueva institución de %s";
 #elif L==4
-	"Nouvel établissement";
+	"Nouvel établissement de %s";
 #elif L==5
-	"Nueva institución";	// Okoteve traducción
+	"Nueva institución de %s";	// Okoteve traducción
 #elif L==6
-	"Nuova istituzione";
+	"Nuova istituzione di %s";
 #elif L==7
-	"Nowa instytucja";
+	"Nowa instytucja %s";
 #elif L==8
-	"Nova institução";
+	"Nova institução de %s";
 #endif
 
 const char *Txt_New_link =