From b8b92a5ca8e3e5fcc8b6ee7417f22116e56150f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 2 May 2017 16:57:49 +0200 Subject: [PATCH] Version 16.202.1 --- css/{swad16.201.css => swad16.202.css} | 6 +- icon/warning64x64.gif | Bin 2769 -> 687 bytes swad_action.c | 14 +-- swad_changelog.h | 13 +- swad_course.c | 6 +- swad_help_URL.c | 168 ++++++++++++------------- swad_indicator.c | 3 +- swad_layout.c | 12 +- swad_menu.c | 2 +- swad_survey.c | 24 ++-- swad_tab.c | 2 +- swad_tab.h | 2 +- swad_text.c | 37 ++++-- 13 files changed, 158 insertions(+), 131 deletions(-) rename css/{swad16.201.css => swad16.202.css} (99%) diff --git a/css/swad16.201.css b/css/swad16.202.css similarity index 99% rename from css/swad16.201.css rename to css/swad16.202.css index 40232585..2bf6e6c1 100644 --- a/css/swad16.201.css +++ b/css/swad16.202.css @@ -1505,10 +1505,8 @@ a:hover /* Default ==> underlined */ } .ALERT_TXT { - box-sizing:border-box; - margin:0 auto; - padding:12px 12px 12px 45px; - background-position:12px 12px; + padding:8px 8px 8px 40px; + background-position:8px 8px; background-size:20px 20px; background-repeat:no-repeat; font-size:12pt; diff --git a/icon/warning64x64.gif b/icon/warning64x64.gif index 8b0c18bf32d63a43a11e1d80b50b747d322d4d92..5c9238d3087910e73ea0d224d6f55739090e3553 100644 GIT binary patch literal 687 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 K1bRRKu=Ia1^4gmK diff --git a/swad_action.c b/swad_action.c index 0a7e73c1..55554997 100644 --- a/swad_action.c +++ b/swad_action.c @@ -2845,14 +2845,14 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActUnbUsrMsg */{1016,-1,TabUnk,ActSeeRcvMsg ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Msg_UnbanSenderWhenShowingMsgs ,NULL}, /* ActUnbUsrLst */{1018,-1,TabUnk,ActSeeRcvMsg ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Msg_UnbanSenderWhenListingUsrs ,NULL}, - // TabAna ****************************************************************** + // TabSta ****************************************************************** // Actions in menu: - /* ActReqUseGbl */{ 761, 0,TabAna,ActReqUseGbl ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Sta_ReqShowFigures ,"pie64x64.gif" }, - /* ActSeePhoDeg */{ 447, 1,TabAna,ActSeePhoDeg ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Pho_ShowPhotoDegree ,"classphoto64x64.gif" }, - /* ActReqStaCrs */{ 767, 2,TabAna,ActReqStaCrs ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ind_ReqIndicatorsCourses ,"tablestats64x64.gif" }, - /* ActReqAccGbl */{ 591, 3,TabAna,ActReqAccGbl ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,Sta_SetIniEndDates ,Sta_AskShowGblHits ,"stats64x64.gif" }, - /* ActReqMyUsgRep */{1586, 4,TabAna,ActReqMyUsgRep ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Rep_ReqMyUsageReport ,"report64x64.png" }, - /* ActMFUAct */{ 993, 5,TabAna,ActMFUAct ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,MFU_ShowMyMFUActions ,"star64x64.gif" }, + /* ActReqUseGbl */{ 761, 0,TabSta,ActReqUseGbl ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Sta_ReqShowFigures ,"pie64x64.gif" }, + /* ActSeePhoDeg */{ 447, 1,TabSta,ActSeePhoDeg ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Pho_ShowPhotoDegree ,"classphoto64x64.gif" }, + /* ActReqStaCrs */{ 767, 2,TabSta,ActReqStaCrs ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ind_ReqIndicatorsCourses ,"tablestats64x64.gif" }, + /* ActReqAccGbl */{ 591, 3,TabSta,ActReqAccGbl ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,Sta_SetIniEndDates ,Sta_AskShowGblHits ,"stats64x64.gif" }, + /* ActReqMyUsgRep */{1586, 4,TabSta,ActReqMyUsgRep ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Rep_ReqMyUsageReport ,"report64x64.png" }, + /* ActMFUAct */{ 993, 5,TabSta,ActMFUAct ,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,0x1FE,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,MFU_ShowMyMFUActions ,"star64x64.gif" }, // Actions not in menu: /* ActSeeUseGbl */{ 84,-1,TabUnk,ActReqUseGbl ,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,0x1FF,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Sta_ShowFigures ,NULL}, diff --git a/swad_changelog.h b/swad_changelog.h index b737cf44..91ef53f7 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -220,13 +220,22 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.201.5 (2017-05-02)" -#define CSS_FILE "swad16.201.css" +#define Log_PLATFORM_VERSION "SWAD 16.202.1 (2017-05-02)" +#define CSS_FILE "swad16.202.css" #define JS_FILE "swad16.181.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 16.202.1: May 02, 2017 Changed help on surveys from STATS to ASSESSMENT. (218296 lines) + Version 16.202: May 02, 2017 Changes in layout of alerts. (218295 lines) +Copy the following icons to icon public directory: +sudo cp -a icon/info64x64.png /var/www/html/swad/icon/ +sudo cp -a icon/success64x64.png /var/www/html/swad/icon/ +sudo cp -a icon/question64x64.gif /var/www/html/swad/icon/ +sudo cp -a icon/warning64x64.gif /var/www/html/swad/icon/ +sudo cp -a icon/error64x64.gif /var/www/html/swad/icon/ + Version 16.201.5: May 02, 2017 Changes in layout of assignment print view. (218270 lines) Version 16.201.4: May 02, 2017 Icon to view course info when editing source of information. (218243 lines) Version 16.201.3: May 02, 2017 Code refactoring in forums. (218237 lines) diff --git a/swad_course.c b/swad_course.c index f7d8ea68..d267f713 100644 --- a/swad_course.c +++ b/swad_course.c @@ -467,12 +467,12 @@ static void Crs_Configuration (bool PrintView) Indicators.NumIndicators,Txt_of_PART_OF_A_TOTAL,Ind_NUM_INDICATORS); Act_LinkFormSubmit (Gbl.Title,"DAT",NULL); fprintf (Gbl.F.Out,"%s " - "\"%s\""", Gbl.Title, Gbl.Prefs.IconsURL, - (Indicators.NumIndicators == Ind_NUM_INDICATORS) ? "ok_green" : - "warning", + (Indicators.NumIndicators == Ind_NUM_INDICATORS) ? "ok_green16x16.gif" : + "warning64x64.png", Gbl.Title); Act_FormEnd (); fprintf (Gbl.F.Out,"" diff --git a/swad_help_URL.c b/swad_help_URL.c index 6c83e15d..fbdf0c2c 100644 --- a/swad_help_URL.c +++ b/swad_help_URL.c @@ -1009,6 +1009,90 @@ const char *Hlp_ASSESSMENT_Tests_test_results = "ASSESSMENT.Tests.en#test-results"; #endif +const char *Hlp_ASSESSMENT_Surveys = +#if L==1 + "ASSESSMENT.Surveys.es"; +#elif L==2 + "ASSESSMENT.Surveys.en"; +#elif L==3 + "ASSESSMENT.Surveys.en"; +#elif L==4 + "ASSESSMENT.Surveys.es"; +#elif L==5 + "ASSESSMENT.Surveys.en"; +#elif L==6 + "ASSESSMENT.Surveys.es"; +#elif L==7 + "ASSESSMENT.Surveys.en"; +#elif L==8 + "ASSESSMENT.Surveys.en"; +#elif L==9 + "ASSESSMENT.Surveys.en"; +#endif + +const char *Hlp_ASSESSMENT_Surveys_new_survey = +#if L==1 + "ASSESSMENT.Surveys.es#nueva-encuesta"; +#elif L==2 + "ASSESSMENT.Surveys.en#new-survey"; +#elif L==3 + "ASSESSMENT.Surveys.en#new-survey"; +#elif L==4 + "ASSESSMENT.Surveys.es#nueva-encuesta"; +#elif L==5 + "ASSESSMENT.Surveys.en#new-survey"; +#elif L==6 + "ASSESSMENT.Surveys.es#nueva-encuesta"; +#elif L==7 + "ASSESSMENT.Surveys.en#new-survey"; +#elif L==8 + "ASSESSMENT.Surveys.en#new-survey"; +#elif L==9 + "ASSESSMENT.Surveys.en#new-survey"; +#endif + +const char *Hlp_ASSESSMENT_Surveys_edit_survey = +#if L==1 + "ASSESSMENT.Surveys.es#editar-encuesta"; +#elif L==2 + "ASSESSMENT.Surveys.en#edit-survey"; +#elif L==3 + "ASSESSMENT.Surveys.en#edit-survey"; +#elif L==4 + "ASSESSMENT.Surveys.es#editar-encuesta"; +#elif L==5 + "ASSESSMENT.Surveys.en#edit-survey"; +#elif L==6 + "ASSESSMENT.Surveys.es#editar-encuesta"; +#elif L==7 + "ASSESSMENT.Surveys.en#edit-survey"; +#elif L==8 + "ASSESSMENT.Surveys.en#edit-survey"; +#elif L==9 + "ASSESSMENT.Surveys.en#edit-survey"; +#endif + +const char *Hlp_ASSESSMENT_Surveys_questions = +#if L==1 + "ASSESSMENT.Surveys.es#preguntas"; +#elif L==2 + "ASSESSMENT.Surveys.en#questions"; +#elif L==3 + "ASSESSMENT.Surveys.en#questions"; +#elif L==4 + "ASSESSMENT.Surveys.es#preguntas"; +#elif L==5 + "ASSESSMENT.Surveys.en#questions"; +#elif L==6 + "ASSESSMENT.Surveys.es#preguntas"; +#elif L==7 + "ASSESSMENT.Surveys.en#questions"; +#elif L==8 + "ASSESSMENT.Surveys.en#questions"; +#elif L==9 + "ASSESSMENT.Surveys.en#questions"; +#endif + const char *Hlp_ASSESSMENT_Announcements = #if L==1 "ASSESSMENT.Announcements.es"; @@ -2090,90 +2174,6 @@ const char *Hlp_MESSAGES_Email = /***** STATS tab *****/ -const char *Hlp_STATS_Surveys = -#if L==1 - "STATS.Surveys.es"; -#elif L==2 - "STATS.Surveys.en"; -#elif L==3 - "STATS.Surveys.en"; -#elif L==4 - "STATS.Surveys.es"; -#elif L==5 - "STATS.Surveys.en"; -#elif L==6 - "STATS.Surveys.es"; -#elif L==7 - "STATS.Surveys.en"; -#elif L==8 - "STATS.Surveys.en"; -#elif L==9 - "STATS.Surveys.en"; -#endif - -const char *Hlp_STATS_Surveys_new_survey = -#if L==1 - "STATS.Surveys.es#nueva-encuesta"; -#elif L==2 - "STATS.Surveys.en#new-survey"; -#elif L==3 - "STATS.Surveys.en#new-survey"; -#elif L==4 - "STATS.Surveys.es#nueva-encuesta"; -#elif L==5 - "STATS.Surveys.en#new-survey"; -#elif L==6 - "STATS.Surveys.es#nueva-encuesta"; -#elif L==7 - "STATS.Surveys.en#new-survey"; -#elif L==8 - "STATS.Surveys.en#new-survey"; -#elif L==9 - "STATS.Surveys.en#new-survey"; -#endif - -const char *Hlp_STATS_Surveys_edit_survey = -#if L==1 - "STATS.Surveys.es#editar-encuesta"; -#elif L==2 - "STATS.Surveys.en#edit-survey"; -#elif L==3 - "STATS.Surveys.en#edit-survey"; -#elif L==4 - "STATS.Surveys.es#editar-encuesta"; -#elif L==5 - "STATS.Surveys.en#edit-survey"; -#elif L==6 - "STATS.Surveys.es#editar-encuesta"; -#elif L==7 - "STATS.Surveys.en#edit-survey"; -#elif L==8 - "STATS.Surveys.en#edit-survey"; -#elif L==9 - "STATS.Surveys.en#edit-survey"; -#endif - -const char *Hlp_STATS_Surveys_questions = -#if L==1 - "STATS.Surveys.es#preguntas"; -#elif L==2 - "STATS.Surveys.en#questions"; -#elif L==3 - "STATS.Surveys.en#questions"; -#elif L==4 - "STATS.Surveys.es#preguntas"; -#elif L==5 - "STATS.Surveys.en#questions"; -#elif L==6 - "STATS.Surveys.es#preguntas"; -#elif L==7 - "STATS.Surveys.en#questions"; -#elif L==8 - "STATS.Surveys.en#questions"; -#elif L==9 - "STATS.Surveys.en#questions"; -#endif - const char *Hlp_STATS_Figures = #if L==1 "STATS.Figures.es"; diff --git a/swad_indicator.c b/swad_indicator.c index 5d4a2427..c8f85da3 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -591,7 +591,7 @@ static void Ind_ShowNumCoursesWithIndicators (unsigned NumCrssWithIndicatorYes[1 const char *ClassHighlight = "DAT RIGHT_MIDDLE LIGHT_BLUE"; /***** Write number of courses with each number of indicators valid *****/ - Lay_StartTableCenter (2); + Lay_StartTable (2); fprintf (Gbl.F.Out,""); if (PutForm) @@ -699,7 +699,6 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat extern const char *Txt_YES; extern const char *Txt_NO; extern const char *Txt_INFO_SRC_SHORT_TEXT[Inf_NUM_INFO_SOURCES]; - extern const char *Txt_No_of_indicators; extern const char *Txt_Courses; MYSQL_ROW row; unsigned NumCrs; diff --git a/swad_layout.c b/swad_layout.c index 271e4877..21e16d4a 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -67,11 +67,11 @@ extern struct Globals Gbl; static const char *Lay_AlertIcons[Lay_NUM_ALERT_TYPES] = { - "info16x16.gif", - "success16x16.gif", - "question16x16.gif", - "warning16x16.gif", - "error16x16.gif", + "info64x64.png", + "success64x64.png", + "question64x64.gif", // animated + "warning64x64.gif", // animated + "error64x64.gif", // animated "copy_on16x16.gif", }; @@ -1693,7 +1693,7 @@ void Lay_ShowAlertAndButton1 (Lay_AlertType_t AlertType,const char *Message) /***** Write message *****/ fprintf (Gbl.F.Out,"
", + " style=\"background-image:url('%s/%s'); background-size:20px 20px;\">", Gbl.Prefs.IconsURL,Lay_AlertIcons[AlertType]); if (Message) fprintf (Gbl.F.Out,"%s",Message); diff --git a/swad_menu.c b/swad_menu.c index 5ad7179c..99e4b214 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -248,7 +248,7 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB 0, // 10 0, // 11 }, - // TabAna ******************* + // TabSta ******************* { ActReqUseGbl, // 0 ActSeePhoDeg, // 1 diff --git a/swad_survey.c b/swad_survey.c index e52d5760..cc4fac13 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -181,7 +181,7 @@ void Svy_SeeAllSurveys (void) static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst) { - extern const char *Hlp_STATS_Surveys; + extern const char *Hlp_ASSESSMENT_Surveys; extern const char *Txt_Surveys; extern const char *Txt_START_END_TIME_HELP[Dat_NUM_START_END_TIME]; extern const char *Txt_START_END_TIME[Dat_NUM_START_END_TIME]; @@ -213,7 +213,7 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst) /***** Start frame *****/ Lay_StartRoundFrame ("100%",Txt_Surveys, - Svy_PutIconsListSurveys,Hlp_STATS_Surveys); + Svy_PutIconsListSurveys,Hlp_ASSESSMENT_Surveys); /***** Select whether show only my groups or all groups *****/ if (Gbl.CurrentCrs.Grps.NumGrps) @@ -410,7 +410,7 @@ void Svy_SeeOneSurvey (void) static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst, bool ShowOnlyThisSvyComplete) { - extern const char *Hlp_STATS_Surveys; + extern const char *Hlp_ASSESSMENT_Surveys; extern const char *Txt_Survey; extern const char *Txt_Today; extern const char *Txt_View_survey; @@ -431,7 +431,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst, /***** Start frame *****/ if (ShowOnlyThisSvyComplete) - Lay_StartRoundFrame (NULL,Txt_Survey,NULL,Hlp_STATS_Surveys); + Lay_StartRoundFrame (NULL,Txt_Survey,NULL,Hlp_ASSESSMENT_Surveys); /***** Get data of this survey *****/ Svy.SvyCod = SvyCod; @@ -1732,8 +1732,8 @@ static bool Svy_CheckIfSimilarSurveyExists (struct Survey *Svy) void Svy_RequestCreatOrEditSvy (void) { - extern const char *Hlp_STATS_Surveys_new_survey; - extern const char *Hlp_STATS_Surveys_edit_survey; + extern const char *Hlp_ASSESSMENT_Surveys_new_survey; + extern const char *Hlp_ASSESSMENT_Surveys_edit_survey; extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *Txt_New_survey; extern const char *Txt_Scope; @@ -1801,8 +1801,8 @@ void Svy_RequestCreatOrEditSvy (void) /***** Start frame *****/ Lay_StartRoundFrameTable (NULL,ItsANewSurvey ? Txt_New_survey : Txt_Edit_survey, - NULL,ItsANewSurvey ? Hlp_STATS_Surveys_new_survey : - Hlp_STATS_Surveys_edit_survey, + NULL,ItsANewSurvey ? Hlp_ASSESSMENT_Surveys_new_survey : + Hlp_ASSESSMENT_Surveys_edit_survey, 2); /***** Scope of the survey *****/ @@ -2564,7 +2564,7 @@ void Svy_RequestEditQuestion (void) static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst, char Txt[Cns_MAX_BYTES_TEXT + 1]) { - extern const char *Hlp_STATS_Surveys_questions; + extern const char *Hlp_ASSESSMENT_Surveys_questions; extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *Txt_Question; extern const char *Txt_New_question; @@ -2641,7 +2641,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst, } else Lay_StartRoundFrame (NULL,Txt_New_question, - NULL,Hlp_STATS_Surveys_questions); + NULL,Hlp_ASSESSMENT_Surveys_questions); /***** Start form *****/ Act_FormStart (ActRcvSvyQst); @@ -3129,7 +3129,7 @@ static unsigned Svy_GetNextQuestionIndexInSvy (long SvyCod) static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQst) { - extern const char *Hlp_STATS_Surveys_questions; + extern const char *Hlp_ASSESSMENT_Surveys_questions; extern const char *Txt_Questions; extern const char *Txt_No_INDEX; extern const char *Txt_Type; @@ -3159,7 +3159,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ Lay_StartRoundFrame (NULL,Txt_Questions, Svy->Status.ICanEdit ? Svy_PutIconToAddNewQuestion : NULL, - Hlp_STATS_Surveys_questions); + Hlp_ASSESSMENT_Surveys_questions); if (NumQsts) { diff --git a/swad_tab.c b/swad_tab.c index 46fdff2b..bca7a88b 100644 --- a/swad_tab.c +++ b/swad_tab.c @@ -53,7 +53,7 @@ const char *Tab_TabIcons[Tab_NUM_TABS] = /* TabUsr */ "usr64x64.gif", /* TabSoc */ "soc64x64.png", /* TabMsg */ "msg64x64.gif", - /* TabAna */ "sta64x64.gif", + /* TabSta */ "sta64x64.gif", /* TabPrf */ "prf64x64.gif", }; diff --git a/swad_tab.h b/swad_tab.h index e1a13b18..16149697 100644 --- a/swad_tab.h +++ b/swad_tab.h @@ -51,7 +51,7 @@ typedef enum TabUsr = 9, TabSoc = 10, TabMsg = 11, - TabAna = 12, + TabSta = 12, TabPrf = 13, } Tab_Tab_t; diff --git a/swad_text.c b/swad_text.c index 278d6921..e389352a 100644 --- a/swad_text.c +++ b/swad_text.c @@ -19441,7 +19441,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = NULL, // 11 }, { - // TabAna ********************************************************************** + // TabSta ********************************************************************** // 0: ActReqUseGbl #if L==1 "Xifres" @@ -21407,7 +21407,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = NULL, // 11 }, { - // TabAna ***************************************************** + // TabSta ***************************************************** // 0: ActReqUseGbl #if L==1 "Grans nombres sobre l'ús actual de tota la plataforma," @@ -40860,26 +40860,47 @@ const char *Txt_TABS_TXT[Tab_NUM_TABS] = "Mensagens" #endif , - // TabAna + // TabSta #if L==1 - "Anàlisis" + "Estadístiques" +#elif L==2 + "Statistik" +#elif L==3 + "Statistics" +#elif L==4 + "Estadísticas" +#elif L==5 + "Statistiques" +#elif L==6 + "Papy'aporeko" +#elif L==7 + "Statistiche" +#elif L==8 + "Statystyki" +#elif L==9 + "Estatísticas" +#endif +/* +#if L==1 + "Analítiques" #elif L==2 "Analytik" #elif L==3 "Analytics" #elif L==4 - "Análisis" + "Analíticas" #elif L==5 - "Analyse" + "Analytiques" #elif L==6 "Ñehesa'ÿijo" #elif L==7 - "Analisi" + "Analitiche" #elif L==8 "Analizy" #elif L==9 - "Análise" + "Análises" #endif +*/ , // TabPrf #if L==1