Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-20 07:25:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 15.225.5

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-06-15 13:40:16 +02:00
parent 5a286d9445
commit db079c2b9f
3 changed files with 24 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -128,13 +128,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.225.4 (2016-06-15)" #define Log_PLATFORM_VERSION "SWAD 15.225.5 (2016-06-15)"
#define CSS_FILE "swad15.224.3.css" #define CSS_FILE "swad15.224.3.css"
#define JS_FILE "swad15.216.js" #define JS_FILE "swad15.216.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/* /*
Version 15.225.5: Jun 15, 2016 Simplification in texts (links) to view guests and admins. (202586 lines)
Version 15.225.4: Jun 15, 2016 Listing possible duplicate users. Not finished. (202623 lines) Version 15.225.4: Jun 15, 2016 Listing possible duplicate users. Not finished. (202623 lines)
1 change necessary in database: 1 change necessary in database:
INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1578','es','N','Listar usuarios duplicados'); INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1578','es','N','Listar usuarios duplicados');

74
swad_text.c
View File

@ -33229,7 +33229,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] =
#endif #endif
}, },
{ {
#if L==1 // Rol_ROLE_CTR_ADM - Usr_SEX_UNKNOWN #if L==1 // Rol_DEG_ADM - Usr_SEX_UNKNOWN
"Administradors" "Administradors"
#elif L==2 #elif L==2
"Administratoren" "Administratoren"
@ -33249,7 +33249,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] =
"Administradores" "Administradores"
#endif #endif
, ,
#if L==1 // Rol_ROLE_CTR_ADM - Usr_SEX_FEMALE #if L==1 // Rol_DEG_ADM - Usr_SEX_FEMALE
"Administradoras" // Necessita traduccio "Administradoras" // Necessita traduccio
#elif L==2 #elif L==2
"Administratoren" "Administratoren"
@ -33269,7 +33269,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] =
"Administradoras" "Administradoras"
#endif #endif
, ,
#if L==1 // Rol_ROLE_CTR_ADM - Usr_SEX_MALE #if L==1 // Rol_DEG_ADM - Usr_SEX_MALE
"Administradors" "Administradors"
#elif L==2 #elif L==2
"Administratoren" "Administratoren"
@ -33289,7 +33289,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] =
"Administradores" "Administradores"
#endif #endif
, ,
#if L==1 // Rol_ROLE_CTR_ADM - Usr_SEX_ALL #if L==1 // Rol_DEG_ADM - Usr_SEX_ALL
"Administradors" "Administradors"
#elif L==2 #elif L==2
"Administratoren" "Administratoren"
@ -33310,7 +33310,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] =
#endif #endif
}, },
{ {
#if L==1 // Rol_ROLE_INS_ADM - Usr_SEX_UNKNOWN #if L==1 // Rol_CTR_ADM - Usr_SEX_UNKNOWN
"Administradors" "Administradors"
#elif L==2 #elif L==2
"Administratoren" "Administratoren"
@ -33330,7 +33330,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] =
"Administradores" "Administradores"
#endif #endif
, ,
#if L==1 // Rol_ROLE_INS_ADM - Usr_SEX_FEMALE #if L==1 // Rol_CTR_ADM - Usr_SEX_FEMALE
"Administradoras" // Necessita traduccio "Administradoras" // Necessita traduccio
#elif L==2 #elif L==2
"Administratoren" "Administratoren"
@ -33350,7 +33350,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] =
"Administradoras" "Administradoras"
#endif #endif
, ,
#if L==1 // Rol_ROLE_INS_ADM - Usr_SEX_MALE #if L==1 // Rol_CTR_ADM - Usr_SEX_MALE
"Administradors" "Administradors"
#elif L==2 #elif L==2
"Administratoren" "Administratoren"
@ -33370,7 +33370,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] =
"Administradores" "Administradores"
#endif #endif
, ,
#if L==1 // Rol_ROLE_INS_ADM - Usr_SEX_ALL #if L==1 // Rol_CTR_ADM - Usr_SEX_ALL
"Administradors" "Administradors"
#elif L==2 #elif L==2
"Administratoren" "Administratoren"
@ -33391,7 +33391,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] =
#endif #endif
}, },
{ {
#if L==1 // Rol_ROLE_DEG_ADM - Usr_SEX_UNKNOWN #if L==1 // Rol_INS_ADM - Usr_SEX_UNKNOWN
"Administradors" "Administradors"
#elif L==2 #elif L==2
"Administratoren" "Administratoren"
@ -33411,7 +33411,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] =
"Administradores" "Administradores"
#endif #endif
, ,
#if L==1 // Rol_ROLE_DEG_ADM - Usr_SEX_FEMALE #if L==1 // Rol_INS_ADM - Usr_SEX_FEMALE
"Administradoras" // Necessita traduccio "Administradoras" // Necessita traduccio
#elif L==2 #elif L==2
"Administratoren" "Administratoren"
@ -33431,7 +33431,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] =
"Administradoras" "Administradoras"
#endif #endif
, ,
#if L==1 // Rol_ROLE_DEG_ADM - Usr_SEX_MALE #if L==1 // Rol_INS_ADM - Usr_SEX_MALE
"Administradors" "Administradors"
#elif L==2 #elif L==2
"Administratoren" "Administratoren"
@ -33451,7 +33451,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] =
"Administradores" "Administradores"
#endif #endif
, ,
#if L==1 // Rol_ROLE_DEG_ADM - Usr_SEX_ALL #if L==1 // Rol_INS_ADM - Usr_SEX_ALL
"Administradors" "Administradors"
#elif L==2 #elif L==2
"Administratoren" "Administratoren"
@ -33472,7 +33472,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] =
#endif #endif
}, },
{ {
#if L==1 // Rol_ROLE_SYS_ADM - Usr_SEX_UNKNOWN #if L==1 // Rol_SYS_ADM - Usr_SEX_UNKNOWN
"Superusuaris" "Superusuaris"
#elif L==2 #elif L==2
"Superuser" "Superuser"
@ -33492,7 +33492,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] =
"Superutilizadores" "Superutilizadores"
#endif #endif
, ,
#if L==1 // Rol_ROLE_SYS_ADM - Usr_SEX_FEMALE #if L==1 // Rol_SYS_ADM - Usr_SEX_FEMALE
"Superusuarias" // Necessita traduccio "Superusuarias" // Necessita traduccio
#elif L==2 #elif L==2
"Superuser" "Superuser"
@ -33512,7 +33512,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] =
"Superutilizadoras" "Superutilizadoras"
#endif #endif
, ,
#if L==1 // Rol_ROLE_SYS_ADM - Usr_SEX_MALE #if L==1 // Rol_SYS_ADM - Usr_SEX_MALE
"Superusuaris" "Superusuaris"
#elif L==2 #elif L==2
"Superuser" "Superuser"
@ -33532,7 +33532,7 @@ const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS] =
"Superutilizadores" "Superutilizadores"
#endif #endif
, ,
#if L==1 // Rol_ROLE_SYS_ADM - Usr_SEX_ALL #if L==1 // Rol_SYS_ADM - Usr_SEX_ALL
"Superusuaris" "Superusuaris"
#elif L==2 #elif L==2
"Superuser" "Superuser"
@ -35025,27 +35025,6 @@ const char *Txt_Search_courses =
"Procurar disciplinas"; "Procurar disciplinas";
#endif #endif
const char *Txt_See_administrators =
#if L==1
"Veure administradors";
#elif L==2
"Siehe Administratoren";
#elif L==3
"See administrators";
#elif L==4
"Ver administradores";
#elif L==5
"Voir administrateurs";
#elif L==6
"Ver administradores"; // Okoteve traducción
#elif L==7
"Vedi amministratori";
#elif L==8
"Wiadomości administratorzy";
#elif L==9
"Veja administradores";
#endif
const char *Txt_See_exam = const char *Txt_See_exam =
#if L==1 #if L==1
"Veure exàmen"; "Veure exàmen";
@ -35109,27 +35088,6 @@ const char *Txt_See_full_notice =
"Veja aviso completo"; "Veja aviso completo";
#endif #endif
const char *Txt_See_guests =
#if L==1
"Veure convidats";
#elif L==2
"Siehe Eingeladen";
#elif L==3
"See guests";
#elif L==4
"Ver invitados";
#elif L==5
"Voir invités";
#elif L==6
"Ver invitados"; // Okoteve traducción
#elif L==7
"Vedi ospiti";
#elif L==8
"Wiadomości zaproszenie";
#elif L==9
"Veja convidados";
#endif
const char *Txt_See_message = const char *Txt_See_message =
#if L==1 #if L==1
"Veure missatge"; "Veure missatge";

10
swad_user.c
View File

@ -6539,11 +6539,12 @@ static void Usr_UpdateMyPrefAboutListWithPhotosPhotoInDB (void)
static void Usr_PutLinkToSeeAdmins (void) static void Usr_PutLinkToSeeAdmins (void)
{ {
extern const char *Txt_See_administrators; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
/***** Put form to list admins *****/ /***** Put form to list admins *****/
Lay_PutContextualLink (ActLstOth,NULL,"adm16x16.gif", Lay_PutContextualLink (ActLstOth,NULL,"adm16x16.gif",
Txt_See_administrators,Txt_See_administrators); Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN],
Txt_ROLES_PLURAL_Abc[Rol_DEG_ADM][Usr_SEX_UNKNOWN]);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -6552,11 +6553,12 @@ static void Usr_PutLinkToSeeAdmins (void)
static void Usr_PutLinkToSeeGuests (void) static void Usr_PutLinkToSeeGuests (void)
{ {
extern const char *Txt_See_guests; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
/***** Put form to list guests *****/ /***** Put form to list guests *****/
Lay_PutContextualLink (ActLstGst,NULL,"usrs64x64.gif", Lay_PutContextualLink (ActLstGst,NULL,"usrs64x64.gif",
Txt_See_guests,Txt_See_guests); Txt_ROLES_PLURAL_Abc[Rol__GUEST_][Usr_SEX_UNKNOWN],
Txt_ROLES_PLURAL_Abc[Rol__GUEST_][Usr_SEX_UNKNOWN]);
} }
/*****************************************************************************/ /*****************************************************************************/