diff options
| author | Ramón M. Gómez <ramongomez@us.es> | 2018-06-25 10:53:40 +0200 |
|---|---|---|
| committer | Ramón M. Gómez <ramongomez@us.es> | 2018-06-25 10:53:40 +0200 |
| commit | a1be89b444f8226ad3d6e41ccaf921b7b3ebcec7 (patch) | |
| tree | 7a8269f2f7ee24df2547bce253066656f31dfb6f | |
| parent | bf518ed5fe81d7931ad459dcfec1cc78282b385d (diff) | |
| parent | 7059c451e448bca5c064961210a48d42f7398f23 (diff) | |
Merge branch 'devel' into pjlink
66 files changed, 422 insertions, 417 deletions
diff --git a/admin/WebConsole/idiomas/javascripts/eng/acciones_eng.js b/admin/WebConsole/idiomas/javascripts/eng/acciones_eng.js index 3e230582..f1fa153f 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/acciones_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/acciones_eng.js @@ -1,10 +1,10 @@ //____________________________________________________________________________ // -// Fichero de idiomas javascript: acciones_eng.js -// Idioma: Ingés +// Javascript language file: acciones_eng.js +// Language: English //____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="WARNING.- This task will be performed. ¿ Are you sure ?"; -TbMsg[1]="WARNING.- This job will be performed. ¿ Are you sure ?"; -TbMsg[2]="This task has been successfully initiated"; -TbMsg[3]="This job has been successfully initiated"; +TbMsg[0]="WARNING.- This task will be executed. Are you sure?"; +TbMsg[1]="WARNING.- This job will be executed. Are you sure?"; +TbMsg[2]="This task has been executed successfully "; +TbMsg[3]="This job has been executed successfully"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/accionmenu_eng.js b/admin/WebConsole/idiomas/javascripts/eng/accionmenu_eng.js index 51d2550d..e190705f 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/accionmenu_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/accionmenu_eng.js @@ -1,13 +1,11 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: accionmenu_eng.js -// Idioma: Ingés -//________________________________________________________________________________________________________ +// Javascript language file: accionmenu_eng.js +// Language: English +//____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="WARNING: You must introduce an item description"; -TbMsg[1]="WARNING: You must introduce an order number"; -TbMsg[2]="This item has been successfully included in this menu"; -TbMsg[3]="This item has been successfully excluded from this menu"; -TbMsg[4]="This item has been successfully modified"; - - +TbMsg[0]="WARNING: You must enter an item description"; +TbMsg[1]="WARNING: You must enter an order number"; +TbMsg[2]="This item has been included successfully in this menu"; +TbMsg[3]="This item has been excluded successfully from this menu"; +TbMsg[4]="This item has been modified successfully"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/administradores_centros_eng.js b/admin/WebConsole/idiomas/javascripts/eng/administradores_centros_eng.js index 5271887d..225a7897 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/administradores_centros_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/administradores_centros_eng.js @@ -1,8 +1,8 @@ //____________________________________________________________________________ // -// Fichero de idiomas javascript: administradores_centros_eng.js -// Idioma: Ingles +// Javascript language file: administradores_centros_eng.js +// Language: English //____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="The Administrator has been included in this Organizational Unit correctly"; -TbMsg[1]="This Administrator has properly been excluded from this Organizational Unit"; +TbMsg[0]="This Administrator has been included successfully in this Organizational Unit"; +TbMsg[1]="This Administrator has been excluded successfully from this Organizational Unit"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/administradores_usuarios_eng.js b/admin/WebConsole/idiomas/javascripts/eng/administradores_usuarios_eng.js index 793df1b7..c979eb1d 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/administradores_usuarios_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/administradores_usuarios_eng.js @@ -1,8 +1,8 @@ //____________________________________________________________________________ // -// Fichero de idiomas javascript: administradores_usuarios_eng.js -// Idioma: Ingles +// Javascript language file: administradores_usuarios_eng.js +// Language: English //____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="The Organizational Unit has been properly assigned to User"; -TbMsg[1]="The Organizational Unit has been properly excluded from this User"; +TbMsg[0]="The Organizational Unit has been assigned successfully to this User"; +TbMsg[1]="The Organizational Unit has been excluded successfully from this User"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/asistentes_eng.js b/admin/WebConsole/idiomas/javascripts/eng/asistentes_eng.js index c6bcd421..01753ce3 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/asistentes_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/asistentes_eng.js @@ -1,10 +1,10 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: asistentes.js -// Idioma: Inglés -//________________________________________________________________________________________________________ +// Javascript language file: asistentes.js +// Language: English +//____________________________________________________________________________ TbMsg=new Array; // Asistente de particionado -TbMsg["NOCACHESIZE"] = "¡El espacio libre en disco es menor que la cache!"; -TbMsg["NODISKSIZE"] = "¡El espacio libre en disco no puede ser menor que 0!"; -TbMsg["NOSUPPORT"] = "Este navegador no soporta la operación."; +TbMsg["NOCACHESIZE"] = "Free disk space is smaller than cache!"; +TbMsg["NODISKSIZE"] = "Free disk space cannot be lower than zero!"; +TbMsg["NOSUPPORT"] = "This browser does not support this operation."; diff --git a/admin/WebConsole/idiomas/javascripts/eng/aulas_eng.js b/admin/WebConsole/idiomas/javascripts/eng/aulas_eng.js index 1b45152b..56bf01e0 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/aulas_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/aulas_eng.js @@ -1,21 +1,21 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: aulas_eng.js -// Idioma: Ingés -//________________________________________________________________________________________________________ +// Javascript language file: aulas_eng.js +// Language: English +//____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="Computer template have been successfully registered and all the computers of this lab have been updated using this configuration"; -TbMsg[1]="WARNING: This environment will be refresh. Are you sure ?"; -TbMsg[2]="WARNING: This environment will be purge. Are you sure ?"; -TbMsg[3]="WARNING: The items of menus from this environment will be refresh. Are you sure ?"; -TbMsg[4]="WARNING: This environment will be switched: Are you sure?"; -TbMsg[5]="WARNING: Remote Console is already enabled for this environment. Follow up on the screen of Commands / Scripts"; -TbMsg[6]="WARNING: You must select the 'Remote Console' previously"; -TbMsg[7]="The update request is send with success"; -TbMsg[8]="There is something wrong with the requested update"; -TbMsg[9]="The switch request is send with success"; -TbMsg[10]="There is something wrong with the requested switch"; -TbMsg[11]="The scan request is send with success"; -TbMsg[12]="There is something wrong with requested scan"; +TbMsg[0]="Computer template have been registered successfully and all the computers in this lab have been updated using this template"; +TbMsg[1]="WARNING: This scope will be refreshed. Are you sure?"; +TbMsg[2]="WARNING: This scope will be purged. Are you sure?"; +TbMsg[3]="WARNING: The menu items from this scope will be refreshed. Are you sure?"; +TbMsg[4]="WARNING: This scope will be switched. Are you sure?"; +TbMsg[5]="WARNING: Remote Console is already enabled for this scope. Follow up on the Commands/Scripts screen"; +TbMsg[6]="WARNING: You must select previously 'Remote Console'"; +TbMsg[7]="Update request has been sent successfully"; +TbMsg[8]="Error requesting updating"; +TbMsg[9]="Switch request has been sent successfully"; +TbMsg[10]="Error requesting switching"; +TbMsg[11]="Scan request has been sent successfully"; +TbMsg[12]="Error requesting scanning"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/colasacciones_eng.js b/admin/WebConsole/idiomas/javascripts/eng/colasacciones_eng.js index d9865e7d..ef967559 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/colasacciones_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/colasacciones_eng.js @@ -1,28 +1,28 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: colasacciones_eng.js -// Idioma: Ingés -//________________________________________________________________________________________________________ +// Javascript language file: colasacciones_eng.js +// Language: English +//____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="WARNING: This action has finished in a way automatically and you can't change its final result manually"; -TbMsg[1]="WARNING: This action has finished and you can't change its status"; -TbMsg[2]="WARNING: This action has already finished in a way manually"; +TbMsg[0]="WARNING: This action has finished automatically and final result cannot be changed manually"; +TbMsg[1]="WARNING: This action has finished and status cannot be changed"; +TbMsg[2]="WARNING: This action has already finished manually"; TbMsg[3]="WARNING: This action has already been canceled"; -TbMsg[4]="WARNING: This action is already initiated"; +TbMsg[4]="WARNING: This action is already started"; TbMsg[5]="WARNING: This action is already stopped "; -TbMsg[6]="WARNING: This action has already been removed"; +TbMsg[6]="WARNING: This action has already been deleted"; -TbMsg[7]="WARNING: The final result of this action has been successfully modified "; -TbMsg[8]="WARNING: The status of this action has been successfully modified "; -TbMsg[9]="WARNING: This action has been successfully reinitialized"; -TbMsg[10]="WARNING: This action has been successfully removed"; +TbMsg[7]="WARNING: The final result of this action has been modified successfully "; +TbMsg[8]="WARNING: The status of this action has been modified successfully "; +TbMsg[9]="WARNING: This action has been reinitialized successfully"; +TbMsg[10]="WARNING: This action has been deleted successfully"; TbMsg[11]="WARNING: This action has finished successfully "; -TbMsg[12]="WARNING: This notification has already been removed or reinitialized"; +TbMsg[12]="WARNING: This notification has already been deleted or reinitialized"; TbMsg[13]="WARNING: This notification has already been reinitialized"; -TbMsg[14]="WARNING: It's already been successfully notified."; -TbMsg[15]="WARNING: It's already been unsuccessfully notified."; +TbMsg[14]="WARNING: It has already been notified successfully."; +TbMsg[15]="WARNING: It has already been notified unsuccessfully."; -TbMsg[16]="WARNING: The result of this notification has been successfully modified "; -TbMsg[17]="WARNING: This notification has been successfully reinitialized"; +TbMsg[16]="WARNING: The result of this notification has been modified successfully"; +TbMsg[17]="WARNING: This notification has been reinitialized successfully"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/comandos/comunescomandos_eng.js b/admin/WebConsole/idiomas/javascripts/eng/comandos/comunescomandos_eng.js index 3f13b558..0f81bee4 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/comandos/comunescomandos_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/comandos/comunescomandos_eng.js @@ -1,25 +1,24 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascripts: comunescomandos_eng.js (Común a todos los comandos) -// Idioma: Inglés +// Javascript language file: comunescomandos_eng.js +// Language: English //________________________________________________________________________________________________________ var CTbMsg=new Array; -CTbMsg[0]="WARNING.- Cancelled operation, you will might come back this screen in another moment to perform this command"; -CTbMsg[1]="WARNING: An error occurs when attempt to register command"; -CTbMsg[2]="The command has been successfully registered"; -CTbMsg[3]="WARNING: An error occurred while trying to register this Command as a Procedure"; -CTbMsg[4]="The command has been successfully registered as a Procedure"; -CTbMsg[5]="WARNING: An error occurred while trying to register this Command as a Task"; -CTbMsg[6]="The command has been successfully registered as a Task"; -CTbMsg[7]="WARNING: An error occurs when attempt to register command"; - -CTbMsg[8]="WARNING: Choose one mode of execution at least"; -CTbMsg[9]="WARNING: You must choose a way of immediate execution"; -CTbMsg[10]="WARNING: You must choose a way of inclusion this command on procedure"; -CTbMsg[11]="WARNING: You must specify the name of the new procedure where this command will be added"; -CTbMsg[12]="WARNING: You should choose the procedure that will add this command"; -CTbMsg[13]="WARNING: You must choose a way of inclusion this command on task executable"; -CTbMsg[14]="WARNING: You must specify the name of the new task where this command will be added"; -CTbMsg[15]="WARNING: You must choose the task that will add this command"; -CTbMsg[16]="AVISO: si el código incluye reinicio o apagado, puede provocar que el cliente no inicie correctamente"; -CTbMsg[17]="The command has been successfully registered, but there was some problems connecting repository REST API"; +CTbMsg[0]="WARNING: Canceled operation, you can return at any time on this screen to execute this command again"; +CTbMsg[1]="WARNING: Error sending this command"; +CTbMsg[2]="Command has been sent successfully"; +CTbMsg[3]="WARNING: Error registering this Command as a Procedure"; +CTbMsg[4]="The command has been registered successfully as a Procedure"; +CTbMsg[5]="WARNING: Error registering this Command as a Task"; +CTbMsg[6]="Command has been registered successfully as a Task"; +CTbMsg[7]="WARNING: Error trying to register command action"; +CTbMsg[8]="WARNING: You must choose at least one execution mode"; +CTbMsg[9]="WARNING: You must choose one immediate execution mode"; +CTbMsg[10]="WARNING: You must choose a way of including this command into a Procedure"; +CTbMsg[11]="WARNING: You must specify a name for the new procedure where this command will be added."; +CTbMsg[12]="WARNING: You must choose the procedure where this command will be added"; +CTbMsg[13]="WARNING: You must choose a way of including this command into an executable task"; +CTbMsg[14]="WARNING: You must specify a name for the new task where this command will be added"; +CTbMsg[15]="WARNING: You must choose the task where this command will be added"; +CTbMsg[16]="WARNING: If the code contains reboot or shutdown, the client might not boot successfully"; +CTbMsg[17]="Command has been sent successfully, but there was some problems connecting API REST Repository"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/comandos/configurar_eng.js b/admin/WebConsole/idiomas/javascripts/eng/comandos/configurar_eng.js index abc99019..38eef74f 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/comandos/configurar_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/comandos/configurar_eng.js @@ -1,16 +1,16 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascripts: configurar_eng.js -// Idioma: Ingés +// Javascript language file: configurar_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="WARNING.- There are partitions with the same number, you must select another or remove it clicking in the last column"; -TbMsg[1]="WARNING.- The number of the partition must be greater than zero"; -TbMsg[2]="El tipo de partición no se ha especificado"; -TbMsg[3]="WARNING.- The size of the partition must be greater than zero"; -TbMsg[4]="ATENCION: Se va a eliminar esta partición ¿ Esta seguro ?"; -TbMsg[5]="Debe especificar el tipo de sistema de ficheros si desea formatear la particion"; -TbMsg[6]="La CACHE solo puede definirse en la particion 4"; -TbMsg[7]="El número maximo de particiones es 4"; -TbMsg["EXTSIZE"]="El tamaño de las particiones lógicas es mayor que el de la partición extendida"; -TbMsg["HDSIZE"]="El tamaño de las particiones es mayor el tamaño del disco"; +TbMsg[0]="WARNING: Duplicated partition. There is another partition with the same number. Please, select another one or delete it by clicking in the last column"; +TbMsg[1]="WARNING: Partition number must be greater than zero"; +TbMsg[2]="Partition type not specified"; +TbMsg[3]="WARNING: Partition size must be greater than zero"; +TbMsg[4]="WARNING: This partition will be deleted. Are you sure?"; +TbMsg[5]="If you want to format this partition, you must specify file-system type"; +TbMsg[6]="CACHE can only be at partition 4"; +TbMsg[7]="Maximum number of partitions is 4"; +TbMsg["EXTSIZE"]="Logic partitions size is greater than extended partition size"; +TbMsg["HDSIZE"]="Partitions size is greater than disk size"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/comandos/crearimagen_eng.js b/admin/WebConsole/idiomas/javascripts/eng/comandos/crearimagen_eng.js index 6525d89b..07701edf 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/comandos/crearimagen_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/comandos/crearimagen_eng.js @@ -1,8 +1,8 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascripts: crearperfilsoftware_eng.js -// Idioma: Español +// Javascript language file: crearimagen_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="You must choose a image for this partition"; -TbMsg[1]="You must choose at least one partition and an image"; +TbMsg[0]="You must choose an image for this partition"; +TbMsg[1]="You must choose at least one partition and one image"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/comandos/crearimagenbasica_eng.js b/admin/WebConsole/idiomas/javascripts/eng/comandos/crearimagenbasica_eng.js index 99465fbf..2b6a9fa8 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/comandos/crearimagenbasica_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/comandos/crearimagenbasica_eng.js @@ -1,10 +1,10 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascripts: crearimagenbasica_esp.js -// Idioma: Español +// Javascript language file: crearimagenbasica_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; TbMsg[0]=""; -TbMsg[1]="Debe elegir una imagen para esta partición"; -TbMsg[2]="No ha seleccionado ninguna partición"; -TbMsg[3]="No ha seleccionado ningún método de sincronización"; +TbMsg[1]="You must choose an image for this partition"; +TbMsg[2]="No partition selected"; +TbMsg[3]="No synchronization method selected"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/comandos/crearperfilsoftware_eng.js b/admin/WebConsole/idiomas/javascripts/eng/comandos/crearperfilsoftware_eng.js index dbf1484a..343e7854 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/comandos/crearperfilsoftware_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/comandos/crearperfilsoftware_eng.js @@ -1,7 +1,7 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascripts: crearperfilsoftware_eng.js -// Idioma: Ingés +// Javascript language file: crearperfilsoftware_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; TbMsg[0]="You must select a software profile for this partition"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/comandos/crearsoftincremental_eng.js b/admin/WebConsole/idiomas/javascripts/eng/comandos/crearsoftincremental_eng.js index 675b5419..25d8932c 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/comandos/crearsoftincremental_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/comandos/crearsoftincremental_eng.js @@ -1,8 +1,11 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascripts: crearsoftincremental_eng.js -// Idioma: Ingés +// Javascript language file: crearsoftincremental_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="You must select a diferential software for this partition"; -TbMsg[1]="You must select at least a partition and a diferential software"; +TbMsg[0]=""; +TbMsg[1]="You must choose a basic image for this partition"; +TbMsg[2]="No partition selected"; +TbMsg[3]="You must choose an incremental image for this partition"; +TbMsg[4]="No synchronization method selected"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/comandos/ejecutarscripts_eng.js b/admin/WebConsole/idiomas/javascripts/eng/comandos/ejecutarscripts_eng.js index 577b52c8..05221224 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/comandos/ejecutarscripts_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/comandos/ejecutarscripts_eng.js @@ -1,11 +1,11 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascripts: ejecutarscripts_eng.js -// Idioma: Ingés +// Javascript language file: ejecutarscripts_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="WARNING.- Bash code will be performed ¿ Are you sure ?"; -TbMsg[1]="You must introduce some code lines or at least a file with Bash code"; -TbMsg[2]="You must introduce the title of the script whether you want to follow-up the accion or to save it like a procedure or task"; -TbMsg[3]="You must introduce the description of the script whether you want to follow-up the accion or to save it like a procedure or task"; -TbMsg[4]="\t!!!!! WARNING !!!!! \nYou have selected unicast to multiple computers,\nThe transfer may be delayed in time";
\ No newline at end of file +TbMsg[0]="WARNING.- Bash code will be executed. Are you sure?"; +TbMsg[1]="You must enter some code lines or at least a file with Bash code"; +TbMsg[2]="You must enter the title of the script whether to follow-up the action or save it as a procedure or task."; +TbMsg[3]="You must enter a description for the script whether to follow-up the action or to save it as a procedure or task"; +TbMsg[4]="\t!!!!! WARNING !!!!! \nYou have selected UNICAST for multiple computers,\nThe transfer may be delayed in time"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/comandos/eliminarimagencache_eng.js b/admin/WebConsole/idiomas/javascripts/eng/comandos/eliminarimagencache_eng.js index e52857b0..237e8771 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/comandos/eliminarimagencache_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/comandos/eliminarimagencache_eng.js @@ -1,7 +1,7 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascripts: eliminarimagencache_eng.js -// Idioma: Ingles +// Javascript language file: eliminarimagencache_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; TbMsg[0]=""; diff --git a/admin/WebConsole/idiomas/javascripts/eng/comandos/enviarmensaje_eng.js b/admin/WebConsole/idiomas/javascripts/eng/comandos/enviarmensaje_eng.js index 19d2316a..992120b2 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/comandos/enviarmensaje_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/comandos/enviarmensaje_eng.js @@ -1,9 +1,9 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascripts: enviarmensaje_eng.js -// Idioma: Inglés +// Javascript language file: enviarmensaje_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; TbMsg[0]=""; -TbMsg[1]="El mensaje debe tener un título."; -TbMsg[2]="El mensaje debe tener algún contenido."; +TbMsg[1]="The message needs a title."; +TbMsg[2]="The message cannot be empty."; diff --git a/admin/WebConsole/idiomas/javascripts/eng/comandos/iniciarsesion_eng.js b/admin/WebConsole/idiomas/javascripts/eng/comandos/iniciarsesion_eng.js index 86cd4cb3..d8658434 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/comandos/iniciarsesion_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/comandos/iniciarsesion_eng.js @@ -1,9 +1,9 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascripts: iniciarsesion_eng.js -// Idioma: Ingles +// Javascript language file: iniciarsesion_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; TbMsg[0]=""; TbMsg[1]="You must choose at least one partition"; -TbMsg["FILTER"]="Debe seleccionar al menos un ordenador que tenga la configuración elegida."; +TbMsg["FILTER"]="You must select at least one computer with the chosen configuration."; diff --git a/admin/WebConsole/idiomas/javascripts/eng/comandos/inventariosoftware_eng.js b/admin/WebConsole/idiomas/javascripts/eng/comandos/inventariosoftware_eng.js index faf6091e..8da24d42 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/comandos/inventariosoftware_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/comandos/inventariosoftware_eng.js @@ -1,7 +1,7 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascripts: iniciarsesion_eng.js -// Idioma: English +// Javascript language file: inventariosoftware_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; TbMsg[0]=""; diff --git a/admin/WebConsole/idiomas/javascripts/eng/comandos/particionaryformatear_eng.js b/admin/WebConsole/idiomas/javascripts/eng/comandos/particionaryformatear_eng.js index 6598e659..424206f4 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/comandos/particionaryformatear_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/comandos/particionaryformatear_eng.js @@ -1,15 +1,15 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascripts: particionaryformatear_eng.js -// Idioma: Ingés +// Javascript language file: particionaryformatear_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="WARNING.- There are not partitions table modified, therefore no command will be registered"; -TbMsg[1]="WARNING.- There are partitions with the same number, you must select another or remove it clicking in the last column"; -TbMsg[2]="WARNING.- The size of the partition must be greater than zero"; -TbMsg[3]="WARNING.- The partition must be correlative and there would not have spaces between partitions"; -TbMsg[4]="WARNING.- This partition is empty, therefore you can't to perform any operation"; -TbMsg[5]="WARNING.- This partition must be just formatted because the operating system has changed or has changed the size of some partition"; -TbMsg[6]="WARNING.- There is not coherent to hide this partition because it is not a Windows partition"; -TbMsg[7]="WARNING.- There is not coherent to show this partition because it is not a Windows partition"; -TbMsg[8]="You can't add more partitions"; +TbMsg[0]="WARNING: There are no changes in partition table, therefore no action will be executed"; +TbMsg[1]="WARNING: There are partitions with the same number. You must select another one or remove it by clicking in the last column"; +TbMsg[2]="WARNING: Partition size must be greater than zero"; +TbMsg[3]="WARNING: Partitions must be correlatives and they must not have spaces between them"; +TbMsg[4]="WARNING: Empty partition, therefore no action will be executed"; +TbMsg[5]="WARNING: This partition must be formatted because its OS has changed or some partition size has changed."; +TbMsg[6]="WARNING: There is not coherent to hide this partition because it is not a Windows partition"; +TbMsg[7]="WARNING: There is not coherent to show this partition because it is not a Windows partition"; +TbMsg[8]="You cannot add more partitions"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/comandos/restaurarimagen_eng.js b/admin/WebConsole/idiomas/javascripts/eng/comandos/restaurarimagen_eng.js index f6360cc3..d709af9d 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/comandos/restaurarimagen_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/comandos/restaurarimagen_eng.js @@ -1,15 +1,15 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascripts: restaurarimagen_eng.js -// Idioma: Inglés +// Javascript language file: restaurarimagen_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="You must select at least an Image for partition "; -TbMsg[1]="You can only select an Image for partition "; -TbMsg[2]="WARNING: You have selected an Image from other operating system for current partition "; -TbMsg[3]="Are you sure ?"; -TbMsg[4]="You must select at least a partition and an Image"; -TbMsg[5]="You must select at least a image path for partition "; -TbMsg[6]="You must choose only one image of the down"; -TbMsg["FILTER"]="Debe seleccionar al menos un ordenador que tenga la configuración elegida."; -TbMsg["UNICAST"]="\t!!!!! ATENCIÓN !!!!! \nHa seleccionado UNICAST en varios ordenadores,\nLa transferencia puede demorarse en el tiempo"; +TbMsg[0]="You must select an image for this partition"; +TbMsg[1]="You must select at least a partition and an image"; +TbMsg[2]="WARNING: You have selected an image from a different OS for current partition"; +TbMsg[3]="Are you sure ?" +TbMsg[4]="You must select at least an image for this partition" +TbMsg[5]="You must select at least an image path for this partition "; +TbMsg[6]="You must choose the image from only one of the drop-down"; +TbMsg["FILTER"]="You must choose at least one computer with the chosen configuration."; +TbMsg["UNICAST"]="\t!!!!! WARNING !!!!! \nYou have selected UNICAST for multiple computers,\nThe transfer may be delayed in time"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/comandos/restaurarimagenbasica_eng.js b/admin/WebConsole/idiomas/javascripts/eng/comandos/restaurarimagenbasica_eng.js index bce2cdc4..a7023e76 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/comandos/restaurarimagenbasica_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/comandos/restaurarimagenbasica_eng.js @@ -1,14 +1,14 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascripts: restaurarimagenbasica_esp.js -// Idioma: Español +// Javascript language file: restaurarimagenbasica_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="Debe elegir una imagen para esta partición"; -TbMsg[1]="Debe elegir al menos una partición y una imagen"; +TbMsg[0]="You must choose an image for this partition"; +TbMsg[1]="You must choose at least one partition and one image"; TbMsg[2]=""; -TbMsg[3]="¿ Está seguro ?"; -TbMsg[4]="Debe elegir al menos una imagen para la partición"; -TbMsg[5]="Debe elegir al menos un path de imagen para la partición "; -TbMsg[6]="Debe elegir la imagen de uno sólo de los desplegables"; -TbMsg[7]="Debe elegir un método de Sincronización"; +TbMsg[3]="Are you sure?"; +TbMsg[4]="You must choose at least an image for this partition"; +TbMsg[5]="You must choose an image path for this partition"; +TbMsg[6]="You must choose the image from only one of the drop-down"; +TbMsg[7]="You must choose a synchronization method"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/comandos/restaurarsoftincremental_eng.js b/admin/WebConsole/idiomas/javascripts/eng/comandos/restaurarsoftincremental_eng.js index 22a112d9..0cd47096 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/comandos/restaurarsoftincremental_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/comandos/restaurarsoftincremental_eng.js @@ -1,14 +1,14 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascripts: restaurarsoftincremental_esp.js -// Idioma: Español +// Javascript language file: restaurarsoftincremental_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="Debe elegir una imagen para esta partición"; -TbMsg[1]="Debe elegir al menos una partición y una imagen"; +TbMsg[0]="You must select an image for this partition"; +TbMsg[1]="You must select at least a partition and an image"; TbMsg[2]=" "; -TbMsg[3]="¿ Está seguro ?"; -TbMsg[4]="Debe elegir al menos una imagen para la partición"; -TbMsg[5]="Debe elegir al menos un path de imagen para la partición "; -TbMsg[6]="Debe elegir un software incremental para esta partición"; -TbMsg[7]="Debe elegir un método de Sincronización"; +TbMsg[3]="Are you sure ?"; +TbMsg[4]="You must select at least an image for this partition"; +TbMsg[5]="You must select at least an image path for this partition "; +TbMsg[6]="You must choose an incremental software for this partition"; +TbMsg[7]="You must choose a synchronization method"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/comunes_eng.js b/admin/WebConsole/idiomas/javascripts/eng/comunes_eng.js index 271dede0..1a2e7b1f 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/comunes_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/comunes_eng.js @@ -1,14 +1,14 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: comunes_eng.js -// Idioma: Ingés -//________________________________________________________________________________________________________ -CTbMsg=new Array; -CTbMsg[0]="WARNING.- This group contain others groups or elements. If you remove it, you will also remove all these. ¿ Are you sure ?"; -CTbMsg[1]="WARNING.- This group will be removed. ¿ Are you sure ?"; -CTbMsg[2]="This group has been successfully modified"; -CTbMsg[3]="This group has been successfully removed"; -CTbMsg[4]="The record has been successfully inserted"; -CTbMsg[5]="The record has been successfully modified"; -CTbMsg[6]="The record has been successfully removed"; -CTbMsg[7]="There is not exists any element in stack to be moved into this group"; +// Javascript language file: comunes_eng.js +// Language: English +//____________________________________________________________________________ +TbMsg=new Array; +CTbMsg[0]="WARNING.- This group contain others groups or elements. If you delete it, you will also delete all of them. Are you sure?"; +CTbMsg[1]="WARNING.- This group will be deleted. Are you sure?"; +CTbMsg[2]="This group has been modified successfully "; +CTbMsg[3]="This group has been deleted successfully"; +CTbMsg[4]="The record has been inserted successfully"; +CTbMsg[5]="The record has been modified successfully"; +CTbMsg[6]="The record has been deleted successfully"; +CTbMsg[7]="There is no pending element to move into this group"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/consolaremota_eng.js b/admin/WebConsole/idiomas/javascripts/eng/consolaremota_eng.js index f693216a..e3eff743 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/consolaremota_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/consolaremota_eng.js @@ -1,8 +1,8 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: consolaremota_eng.js -// Idioma: English -//________________________________________________________________________________________________________ +// Javascript language file: consolaremota_eng.js +// Language: English +//____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="Attention.-Has there been any error in the Remote Console application"; -TbMsg[1]="The Remote Console request was sent successfully"; +TbMsg[0]="WARNING: Error requesting Remote Console"; +TbMsg[1]="Remote Console request has been sent successfully"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/ejecutaracciones_eng.js b/admin/WebConsole/idiomas/javascripts/eng/ejecutaracciones_eng.js index d8d27714..2bbc31ac 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/ejecutaracciones_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/ejecutaracciones_eng.js @@ -1,10 +1,9 @@ //____________________________________________________________________________ // -// Fichero de idiomas javascript: ejecutaracciones_eng.js -// Idioma: Ingles +// Javascript language file: ejecutaracciones_eng.js +// Language: English //____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="ATENCIÓN.- El Procedimiento será ejecutado aplicándolo a este ámbito. ¿ Está seguro ?"; -TbMsg[1]="El Procedimiento ha sido gestionado correctamente para este ámbito"; -TbMsg[2]="ATENCIÓN.- El Procedimiento se convertirá en procedimiento de inicio (Autoexec) para todos los ordenadores de este ámbito. ¿ Está seguro ?"; - +TbMsg[0]="WARNING: This Procedure will be executed by applying it to this scope. Are you sure?"; +TbMsg[1]="This Procedure has been managed successfully for this scope"; +TbMsg[2]="WARNING: This Procedure will become Starting Procedure (Autoexec)for all the computers in this scope. Are you sure?"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/ejecutarprocedimientos_eng.js b/admin/WebConsole/idiomas/javascripts/eng/ejecutarprocedimientos_eng.js index 698e4c21..f35e2d10 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/ejecutarprocedimientos_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/ejecutarprocedimientos_eng.js @@ -1,8 +1,8 @@ //____________________________________________________________________________ // -// Fichero de idiomas javascript: ejecutarprocedimientos_eng.js -// Idioma: Inglés +// Javascript language file: ejecutarprocedimientos_eng.js +// Language: English //____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="WARNING.- This procedure will be executed Applying this environment. ¿ Are you sure ?"; -TbMsg[1]="This procedure has been successfully executed for this environment"; +TbMsg[0]="WARNING: This Procedure will be executed by applying it to this scope. Are you sure?"; +TbMsg[1]="This procedure has been executed successfully for this scope"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/hardwares_eng.js b/admin/WebConsole/idiomas/javascripts/eng/hardwares_eng.js index 28e179a7..182844e4 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/hardwares_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/hardwares_eng.js @@ -1,7 +1,6 @@ //____________________________________________________________________________ // -// Fichero de idiomas javascript: hardwares.js -// Idioma: Ingés +// Javascript language file: hardwares.js +// Language: English //____________________________________________________________________________ TbMsg=new Array; - diff --git a/admin/WebConsole/idiomas/javascripts/eng/iconos_eng.js b/admin/WebConsole/idiomas/javascripts/eng/iconos_eng.js index 25dd6bb7..aec2cbed 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/iconos_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/iconos_eng.js @@ -1,7 +1,7 @@ //____________________________________________________________________________ // -// Fichero de idiomas javascript: acciones_esp.js -// Idioma: Español +// Javascript language file: acciones_esp.js +// Language: English //____________________________________________________________________________ TbMsg=new Array; -TbMsg["DESCRIP"]="Description is a mandatory"; +TbMsg["DESCRIP"]="Description is mandatory."; diff --git a/admin/WebConsole/idiomas/javascripts/eng/imagenes_eng.js b/admin/WebConsole/idiomas/javascripts/eng/imagenes_eng.js index 171afd22..f5e46fa2 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/imagenes_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/imagenes_eng.js @@ -1,7 +1,6 @@ //____________________________________________________________________________ // -// Fichero de idiomas javascript: imagenes.js -// Idioma: Ingés +// Javascript language file: imagenes.js +// Language: English //____________________________________________________________________________ TbMsg=new Array; - diff --git a/admin/WebConsole/idiomas/javascripts/eng/imagenincremental_eng.js b/admin/WebConsole/idiomas/javascripts/eng/imagenincremental_eng.js index e9e69b92..ff046578 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/imagenincremental_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/imagenincremental_eng.js @@ -1,8 +1,8 @@ //____________________________________________________________________________ // -// Fichero de idiomas javascript: incrementalcomponente_soft_eng.js -// Idioma: Ingés +// Javascript language file: incrementalcomponente_soft_eng.js +// Language: English //____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="This incremental software has been successfully included in this image"; -TbMsg[1]="This incremental software has been successfully excluded from this iamge"; +TbMsg[0]="This incremental software has been included successfully into this image"; +TbMsg[1]="This incremental software has been excluded successfully from this image"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/inclusionacciones_eng.js b/admin/WebConsole/idiomas/javascripts/eng/inclusionacciones_eng.js index bb842521..c76954f4 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/inclusionacciones_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/inclusionacciones_eng.js @@ -1,10 +1,9 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: inclusionacciones_eng.js -// Idioma: Ingles -//________________________________________________________________________________________________________ +// Javascript language file: inclusionacciones_eng.js +// Language: English +//____________________________________________________________________________ TbMsg=new Array; TbMsg[0]=""; -TbMsg[1]=" ATENCIÓN: Debe introducir un número de orden correcto"; -TbMsg[2]="El proceso se ha ejecutado correctamente"; - +TbMsg[1]="WARNING: You must enter a correct sequence number."; +TbMsg[2]="Process has been executed successfully"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/incrementalcomponente_soft_eng.js b/admin/WebConsole/idiomas/javascripts/eng/incrementalcomponente_soft_eng.js index 16c594c8..7e51b034 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/incrementalcomponente_soft_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/incrementalcomponente_soft_eng.js @@ -1,8 +1,8 @@ //____________________________________________________________________________ // -// Fichero de idiomas javascript: incrementalcomponente_soft_eng.js -// Idioma: Ingés +// Javascript language file: incrementalcomponente_soft_eng.js +// Language: English //____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="This software component has been successfully included in this incremental software"; -TbMsg[1]="This software component has been successfully excluded from this incremental software"; +TbMsg[0]="This software component has been included successfully into this incremental software"; +TbMsg[1]="This software component has been excluded successfully from this incremental software"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/informacion_menus_eng.js b/admin/WebConsole/idiomas/javascripts/eng/informacion_menus_eng.js index 79274efe..682afaef 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/informacion_menus_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/informacion_menus_eng.js @@ -1,9 +1,9 @@ //____________________________________________________________________________ // -// Fichero de idiomas javascript: informacion_menus_eng.js -// Idioma: Ingés +// Javascript language file: informacion_menus_eng.js +// Language: English //____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="WARNING.- This item will be removed. ¿ Are you sure ?"; -TbMsg[1]="This item has been successfully excluded from this menu"; -TbMsg[2]="This item has been successfully modified"; +TbMsg[0]="WARNING: This item will be deleted. Are you sure?"; +TbMsg[1]="This item has been excluded successfully from this menu"; +TbMsg[2]="This item has been modified successfully"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/menus_eng.js b/admin/WebConsole/idiomas/javascripts/eng/menus_eng.js index 39ea2374..c8b562a9 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/menus_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/menus_eng.js @@ -1,7 +1,6 @@ //____________________________________________________________________________ // -// Fichero de idiomas javascript: menus_eng.js -// Idioma: Ingés +// Javascript language file: menus_eng.js +// Language: English //____________________________________________________________________________ TbMsg=new Array; - diff --git a/admin/WebConsole/idiomas/javascripts/eng/perfilcomponente_hard_eng.js b/admin/WebConsole/idiomas/javascripts/eng/perfilcomponente_hard_eng.js index 8a102354..beecbb53 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/perfilcomponente_hard_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/perfilcomponente_hard_eng.js @@ -1,8 +1,8 @@ //____________________________________________________________________________ // -// Fichero de idiomas javascript: perfilcomponente_hard_eng.js -// Idioma: Ingés +// Javascript language file: perfilcomponente_hard_eng.js +// Language: English //____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="This hardware component has been successfully included in this profile"; -TbMsg[1]="This hardware component has been successfully excluded from this profile"; +TbMsg[0]="This hardware component has been included successfully into this profile"; +TbMsg[1]="This hardware component has been excluded successfully from this profile"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/perfilcomponente_soft_eng.js b/admin/WebConsole/idiomas/javascripts/eng/perfilcomponente_soft_eng.js index d693301c..64ee42cb 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/perfilcomponente_soft_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/perfilcomponente_soft_eng.js @@ -1,8 +1,8 @@ //____________________________________________________________________________ // -// Fichero de idiomas javascript: perfilcomponente_soft_eng.js -// Idioma: Ingés +// Javascript language file: perfilcomponente_soft_eng.js +// Language: English //____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="This software component has been successfully included in this profile"; -TbMsg[1]="This software component has been successfully excluded from this profile"; +TbMsg[0]="This software component has been included successfully into this profile"; +TbMsg[1]="This software component has been excluded successfully from this profile"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/procedimientoscomandos_eng.js b/admin/WebConsole/idiomas/javascripts/eng/procedimientoscomandos_eng.js index c01dbc5d..48b35d95 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/procedimientoscomandos_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/procedimientoscomandos_eng.js @@ -1,10 +1,10 @@ //____________________________________________________________________________ // -// Fichero de idiomas javascript: procedimientoscomandos_eng.js -// Idioma: Ingés +// Javascript language file: procedimientoscomandos_eng.js +// Language: English //____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="WARNING.- This command will be excluded from procedure. ¿ Are you sure ?"; -TbMsg[1]="WARNING: You must introduce an order number"; -TbMsg[2]="This command has been successfully excluded from this procedure"; -TbMsg[3]="This commad has been successfully modified"; +TbMsg[0]="WARNING: This command will be excluded from this procedure. Are you sure?"; +TbMsg[1]="WARNING: You must enter a sequence number"; +TbMsg[2]="This command has been excluded successfully from this procedure"; +TbMsg[3]="This command has been modified successfully"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/programaciones_eng.js b/admin/WebConsole/idiomas/javascripts/eng/programaciones_eng.js index 35955178..de2f62f6 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/programaciones_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/programaciones_eng.js @@ -1,21 +1,21 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: programaciones_eng.js -// Idioma: Inglés -//________________________________________________________________________________________________________ +// Javascript language file: programaciones_eng.js +// Language: English +//____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="ATENCIÓN: Debe elegir algún año"; -TbMsg[1]="ATENCIÓN: Debe elegir algún mes"; -TbMsg[2]="ATENCIÓN: Debe elegir algún día de la semana, alguna semana o algún día del mes"; -TbMsg[3]="ATENCIÓN: Debe elegir algún día del mes"; -TbMsg[4]="ATENCIÓN: Debe elegir alguna hora"; -TbMsg[5]="ATENCIÓN: Debe introducir la descripción del bloque de programacion"; -TbMsg[6]="ATENCIÓN: Debe introducir los minutos entre los valores 0 y 59"; -TbMsg[7]="ATENCIÓN: Debe introducir los segundos entre los valores 0 y 59"; -TbMsg[8]="ATENCIÓN: Debe insertar algún bloque para poder suspender temporalmente la programación de todos ellos"; -TbMsg[9]="La programación se ha suspendido temporalmente con éxito"; -TbMsg[10]="La programación se ha activado de nuevo con éxito"; -TbMsg[11]="El bloque de programación se ha registrado correctamente"; -TbMsg[12]="El bloque de programación se ha modificado correctamente"; -TbMsg[13]="El bloque de programación se ha eliminado correctamente"; -TbMsg[14]="No existe ningún bloque seleccionado"; +TbMsg[0]="WARNING: You must choose a year"; +TbMsg[1]="WARNING: You must choose a month"; +TbMsg[2]="WARNING: You must choose a weekday, a week or a day of the month"; +TbMsg[3]="WARNING: You must choose a day of the month"; +TbMsg[4]="WARNING: You must choose a time"; +TbMsg[5]="WARNING: You must enter the programming block description"; +TbMsg[6]="WARNING: Minutes must be from 0 to 59"; +TbMsg[7]="WARNING: Seconds must be from 0 to 59"; +TbMsg[8]="WARNING: You must enter a block to pause the programming of all of them"; +TbMsg[9]="Programming has been paused successfully"; +TbMsg[10]="Programming has been resumed successfully"; +TbMsg[11]="Programming block has been registered successfully"; +TbMsg[12]="Programming block has been modified successfully"; +TbMsg[13]="Programming block has been deleted successfully"; +TbMsg[14]="There is no selected block"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/propiedades_aulas_eng.js b/admin/WebConsole/idiomas/javascripts/eng/propiedades_aulas_eng.js index 82f9c0c1..0428c2d0 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/propiedades_aulas_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/propiedades_aulas_eng.js @@ -1,26 +1,26 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: propiedades_aulas_eng.js -// Idioma: Inglés -//________________________________________________________________________________________________________ +// Javascript language file: propiedades_aulas_eng.js +// Language: English +//____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="El nombre del aula debe contener caracteres alfanumericos"; -TbMsg[1]="You must introduce a number of Capacity for this lab"; -TbMsg[2]="WARNING.- This lab contain others groups or labs. If you remove it, you will also remove all these. Are you sure?"; -TbMsg[3]="Time for begining of reserves periode must be smaller than final time"; -TbMsg[4]="Multicast speed is not valid, use numbers only"; -TbMsg[5]="Netmask is not valid"; +TbMsg[0]="Lab name must contain alphanumeric characters"; +TbMsg[1]="You must enter the maximum number of people for this lab"; +TbMsg[2]="WARNING: This lab contains computers groups or computers. If you delete it, you will also delete all of them. Are you sure?"; +TbMsg[3]="Start time for reservations must be before final time"; +TbMsg[4]="Multicast speed is not valid, please use numbers only"; +TbMsg[5]="Net mask is not valid"; TbMsg[6]="P2P mode is not valid"; -TbMsg[7]="El tiempo (segundos ) de semillero despues de la descarga p2p no es valida"; +TbMsg[7]="Seed time (seconds) after p2p download is not valid"; TbMsg[8]="Multicast mode is not valid"; TbMsg[9]="Multicast IP address is not valid"; TbMsg[10]="Multicast port is not valid"; TbMsg[11]="Multicast speed is not valid, use numbers only"; -TbMsg[12]="DNS server IP address is not valid"; +TbMsg[12]="IP address of DNS server is not valid"; TbMsg[13]="Proxy server URL is not valid"; -TbMsg[14]="Deben introducirse datos de validacion: pagina de login y pagina de validacion"; -TbMsg[15]="La URL de la pagina de login no es valida"; -TbMsg[16]="La URL de la pagina de validación no es valida"; -TbMsg[17]="La ubicacion solo puede contener caracteres alfanumericos"; -TbMsg[18]="Los comentarios solo pueden contener caracteres alfanumericos"; -TbMsg[19]="NTP server IP address is not valid"; +TbMsg[14]="You must enter validation data: login page and validation page"; +TbMsg[15]="Login page URL is not valid"; +TbMsg[16]="Validation page URL is not valid"; +TbMsg[17]="The location can only contain alphanumeric characters" +TbMsg[18]="The comments can only contain alphanumeric characters" +TbMsg[19]="IP address of NTP server is not valid"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/propiedades_centros_eng.js b/admin/WebConsole/idiomas/javascripts/eng/propiedades_centros_eng.js index 874bff00..32f1b408 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/propiedades_centros_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/propiedades_centros_eng.js @@ -1,10 +1,9 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: propiedades_usuarios_eng.js -// Idioma: Ingés -//________________________________________________________________________________________________________ +// Javascript language file: propiedades_usuarios_eng.js +// Language: English +//____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="You must introduce a name for this Organizing Unit y sólo puede contener caracteres alfanuméricos"; -TbMsg[1]="El comentario sólo puede contener caracteres alfanuméricos"; -TbMsg[2]="El directorio sólo puede contener caracteres alfanuméricos"; - +TbMsg[0]="You must enter a name for the Organizational Unit. It can only contain alphanumeric characters"; +TbMsg[1]="The comment can only contain alphanumeric characters"; +TbMsg[2]="The directory can only contain alphanumeric characters"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/propiedades_componentehardwares_eng.js b/admin/WebConsole/idiomas/javascripts/eng/propiedades_componentehardwares_eng.js index 4ee13c51..18c279af 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/propiedades_componentehardwares_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/propiedades_componentehardwares_eng.js @@ -1,8 +1,8 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: propiedades_componentehardwares_eng.js -// Idioma: Ingés -//________________________________________________________________________________________________________ +// Javascript language file: propiedades_componentehardwares_eng.js +// Language: English +//____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="You must introduce a name for this hardware component "; -TbMsg[1]="You must introduce a hardware type for this component";
\ No newline at end of file +TbMsg[0]="You must enter a name for this hardware component "; +TbMsg[1]="You must enter a hardware type for this component"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/propiedades_componentesoftwares_eng.js b/admin/WebConsole/idiomas/javascripts/eng/propiedades_componentesoftwares_eng.js index faf928ba..7fd39070 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/propiedades_componentesoftwares_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/propiedades_componentesoftwares_eng.js @@ -1,9 +1,9 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: propiedades_componentesoftwares_eng.js -// Idioma: Ingés -//________________________________________________________________________________________________________ +// Javascript language file: propiedades_componentesoftwares_eng.js +// Language: English +//____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="You must introduce a name for this software component "; -TbMsg[1]="You must introduce a software type for this component"; -TbMsg[2]="You must introduce an operating system name for this component";
\ No newline at end of file +TbMsg[0]="You must enter a name for this software component "; +TbMsg[1]="You must enter a software type for this component"; +TbMsg[2]="You must enter an OS name for this component"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/propiedades_entidades_eng.js b/admin/WebConsole/idiomas/javascripts/eng/propiedades_entidades_eng.js index bfc09a61..61bf4eb0 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/propiedades_entidades_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/propiedades_entidades_eng.js @@ -1,9 +1,9 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: propiedades_usuarios_eng.js -// Idioma: Ingés -//________________________________________________________________________________________________________ +// Javascript language file: propiedades_entidades_eng.js +// Language: English +//____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="You must introduce a name for this Entity y sólo puede contener caracteres alfanuméricos"; -TbMsg[1]="El comentario sólo puede contener caracteres alfanuméricos"; -TbMsg['PXE']="Si cambia está opción debe guardar de nuevo la configuración \ndel arranque PXE de los clientes en NetBootAvanzado"; +TbMsg[0]="You must enter a name for this Entity. It can only contain alphanumeric characters"; +TbMsg[1]="The comment can only contain alphanumeric characters"; +TbMsg['PXE']="If you change this option, you must save again the PXE boot configuration \nof clients in AdvancedNetBoot"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/propiedades_grupos_eng.js b/admin/WebConsole/idiomas/javascripts/eng/propiedades_grupos_eng.js index 791611bf..cf0fffa0 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/propiedades_grupos_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/propiedades_grupos_eng.js @@ -1,7 +1,7 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: propiedades_grupos_eng.js -// Idioma: Ingés +// Javascript language file: propiedades_grupos_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="You must introduce a name for this group"; +TbMsg[0]="You must enter a name for this group"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/propiedades_imagenes_eng.js b/admin/WebConsole/idiomas/javascripts/eng/propiedades_imagenes_eng.js index 2f5301dc..fc16ecd0 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/propiedades_imagenes_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/propiedades_imagenes_eng.js @@ -1,9 +1,15 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: propiedades_imagenes_eng.js -// Idioma: Ingés -//________________________________________________________________________________________________________ +// Javascript language file: propiedades_imagenes_eng.js propiedades_imagenes_eng.js +// Language: English +//____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="You must introduce a name for this image"; -TbMsg[1]="The image must contain at least some of a software profile"; -TbMsg[2]="WARNING: There are computers with this image in some of their partitions. ¿ Are you sure ?"; +TbMsg[0]="You must enter a name for this image"; +TbMsg[1]="The image must contain at least one software profile"; +TbMsg[2]="WARNING: There are computers with this image in one of their partitions. Are you sure?"; +TbMsg[3]="Canonical name of image-file fichero-imagen can only contain alphanumeric characters"; +TbMsg[4]="Missing partition number"; +TbMsg[5]="Missing partition type"; +TbMsg[6]="Missing repository"; +TbMsg[7]="Missing comment"; +TbMsg[8]="You must choose basic image for attaching this one"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/propiedades_menus_eng.js b/admin/WebConsole/idiomas/javascripts/eng/propiedades_menus_eng.js index ab85bf7e..646339f7 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/propiedades_menus_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/propiedades_menus_eng.js @@ -1,9 +1,9 @@ //____________________________________________________________________________ // -// Fichero de idiomas javascript: propiedades_menus_eng.js -// Idioma: Ingés +// Javascript language file: propiedades_menus_eng.js propiedades_menus_eng.js +// Language: English //____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="You must introduce a name for this menu"; -TbMsg[1]="WARNING: There are computers managed by this menu. You can't remove them until you change menu to this computers"; -TbMsg[2]="Las url de los menús personalizados,privados o públicos, deben empezar con http:// o https://"; +TbMsg[0]="You must enter a name for this menu"; +TbMsg[1]="WARNING: Some computers have already this menu. You can't delete it until you change that menu in those computers"; +TbMsg[2]="URLs of Personalized, Private or Public menus must start with http:// or https://"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/propiedades_ordenadores_eng.js b/admin/WebConsole/idiomas/javascripts/eng/propiedades_ordenadores_eng.js index 9ecf454d..7ddd7ab6 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/propiedades_ordenadores_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/propiedades_ordenadores_eng.js @@ -1,13 +1,13 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: propiedades_ordenadores_eng.js -// Idioma: Ingés +// Javascript language file: propiedades_ordenadores_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="El nombre del ordenador puede contener caracteres alfanuméricos, subrayados y guiones"; -TbMsg[1]="You must introduce an IP Address"; -TbMsg[2]="You must introduce a MAC Address"; -TbMsg[3]="The serial number must be an alphanumeric value"; +TbMsg[0]="Computer name can contain alphanumeric characters, underlined and hyphens"; +TbMsg[1]="You must enter an IP Address"; +TbMsg[2]="You must enter a MAC Address"; +TbMsg[3]="Serial number must be an alphanumeric character"; TbMsg[4]=""; -TbMsg[5]="You must introduce a OpenGnsys server"; -TbMsg[6]="Deben introducirse datos de validación: página de login y página de validación"; +TbMsg[5]="You must enter a default OpenGnsys repository"; +TbMsg[6]="You must enter validation data: login page and validation page"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/propiedades_perfilhardwares_eng.js b/admin/WebConsole/idiomas/javascripts/eng/propiedades_perfilhardwares_eng.js index 25ee5642..cc20b204 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/propiedades_perfilhardwares_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/propiedades_perfilhardwares_eng.js @@ -1,8 +1,8 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: propiedades_perfilhardwares_eng.js -// Idioma: Ingés +// Javascript language file: propiedades_perfilhardwares_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="You must introduce a name for this hardware profile"; -TbMsg[1]="WARNING: There are computers with this profile. You can't remove them until you change hardware profile to this computers"; +TbMsg[0]="You must enter a name for this hardware profile"; +TbMsg[1]="WARNING: Some computers contain this hardware profile. You can't delete it until you change hardware profile in those computers"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/propiedades_perfilsoftwares_eng.js b/admin/WebConsole/idiomas/javascripts/eng/propiedades_perfilsoftwares_eng.js index 712f263b..b82551d2 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/propiedades_perfilsoftwares_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/propiedades_perfilsoftwares_eng.js @@ -1,8 +1,8 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: propiedades_perfilsoftwares_eng.js -// Idioma: Ingés +// Javascript language file: propiedades_perfilsoftwares_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="You must introduce a name for this software profile"; -TbMsg[1]="WARNING: There are images with this profile. You can't remove them until you change software profile to this images"; +TbMsg[0]="You must enter a name for this software profile"; +TbMsg[1]="WARNING: Some computers contain this software profile. You can't delete it until you change software profile in those computers"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/propiedades_procedimientos_eng.js b/admin/WebConsole/idiomas/javascripts/eng/propiedades_procedimientos_eng.js index 03c1d5d7..7fb743ce 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/propiedades_procedimientos_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/propiedades_procedimientos_eng.js @@ -1,7 +1,7 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: propiedades_procedimientos_eng.js -// Idioma: Ingés +// Javascript language file: propiedades_procedimientos_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="You must introduce a name for this procedure"; +TbMsg[0]="You must enter a name for this procedure"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/propiedades_repositorios_eng.js b/admin/WebConsole/idiomas/javascripts/eng/propiedades_repositorios_eng.js index bc243de7..446a75f0 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/propiedades_repositorios_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/propiedades_repositorios_eng.js @@ -1,11 +1,11 @@ //____________________________________________________________________________ // -// Fichero de idiomas javascript: propiedades_repositorios_eng.js -// Idioma: Ingles +// Javascript language file: propiedades_repositorios_eng.js +// Language: English //____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="El nombre del repositorio sólo puede contener caracteres alfanuméricos"; -TbMsg[1]="Debe introducir una dirección IP"; -TbMsg[2]="ATENCIÓN: Hay imágenes alojadas por este repositorio. ¿Está seguro de querer eliminarlo ?"; -TbMsg[3]="Debe introducir un puerto de comunicaciones para los clientes"; -TbMsg[4]="Los comentarios sólo pueden contener caracteres alfanuméricos"; +TbMsg[0]="Repository name can only contain alphanumeric characters"; +TbMsg[1]="You must enter IP address"; +TbMsg[2]="WARNING: There are some images in this repository. Do you really want to delete it?"; +TbMsg[3]="You must enter Comm port for clients"; +TbMsg[4]="Comments can only contain alphanumeric characters."; diff --git a/admin/WebConsole/idiomas/javascripts/eng/propiedades_reservas_eng.js b/admin/WebConsole/idiomas/javascripts/eng/propiedades_reservas_eng.js index d3dc6fb6..f43a22aa 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/propiedades_reservas_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/propiedades_reservas_eng.js @@ -1,11 +1,11 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: propiedades_imagenes_eng.js -// Idioma: Inglés +// Javascript language file: propiedades_reservas_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="You must introduce a name for this reserva"; -TbMsg[1]="The image must contain at least some of a petitioner"; -TbMsg[2]="You must reserve at least a Lab"; -TbMsg[3]="You must to specify some state from this reserve"; -TbMsg[4]="WARNING.- You has specified time for previous action from this reserve. Are you sure?"; +TbMsg[0]="You must enter a name for this reservation"; +TbMsg[1]="The image must contain at least one petitioner"; +TbMsg[2]="You must choose one lab for this reservation"; +TbMsg[3]="You must specify state for this reservation"; +TbMsg[4]="WARNING: You have specified some time for previous actions to this reservation. Are you sure?" diff --git a/admin/WebConsole/idiomas/javascripts/eng/propiedades_softincrementales_eng.js b/admin/WebConsole/idiomas/javascripts/eng/propiedades_softincrementales_eng.js index e97e500c..5afa1caf 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/propiedades_softincrementales_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/propiedades_softincrementales_eng.js @@ -1,7 +1,7 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: propiedades_softincrementales_eng.js -// Idioma: Ingés +// Javascript language file: propiedades_softincrementales_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="You must introduce a name for this incremental software"; +TbMsg[0]="You must enter a name for this incremental software"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/propiedades_tareas_eng.js b/admin/WebConsole/idiomas/javascripts/eng/propiedades_tareas_eng.js index eede2409..ffceef96 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/propiedades_tareas_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/propiedades_tareas_eng.js @@ -1,7 +1,9 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: propiedades_tareas_eng.js -// Idioma: Ingés +// Javascript language file: propiedades_tareas_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="You must introduce a name for this task"; +TbMsg[0]="You must enter a name for this task"; +TbMsg[1]="You must choose a scope for this task"; +TbMsg[2]="WARNING: If you do not choose a scope for this task you will not be able to add procedures to this task. You can only include other tasks with their own scopes."; diff --git a/admin/WebConsole/idiomas/javascripts/eng/propiedades_tipohardwares_eng.js b/admin/WebConsole/idiomas/javascripts/eng/propiedades_tipohardwares_eng.js index 2cef3703..816b645b 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/propiedades_tipohardwares_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/propiedades_tipohardwares_eng.js @@ -1,8 +1,7 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: propiedades_tipohardwares_eng.js -// Idioma: Ingés +// Javascript language file: propiedades_tipohardwares_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="You must introduce a name for this hardware type "; - +TbMsg[0]="You must enter a name for this hardware type "; diff --git a/admin/WebConsole/idiomas/javascripts/eng/propiedades_trabajos_eng.js b/admin/WebConsole/idiomas/javascripts/eng/propiedades_trabajos_eng.js index f90396e0..7d1a3a8d 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/propiedades_trabajos_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/propiedades_trabajos_eng.js @@ -1,7 +1,7 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: propiedades_trabajos_eng.js -// Idioma: Ingés +// Javascript language file: propiedades_trabajos_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="You must introduce a name for this job"; +TbMsg[0]="You must enter a name for this job"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/propiedades_universidades_eng.js b/admin/WebConsole/idiomas/javascripts/eng/propiedades_universidades_eng.js index 7477ed4b..565f08e8 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/propiedades_universidades_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/propiedades_universidades_eng.js @@ -1,7 +1,7 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: propiedades_universidades_eng.js -// Idioma: Ingés +// Javascript language file: propiedades_universidades_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="You must introduce a name for this University"; +TbMsg[0]="You must enter a name for this University"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/propiedades_usuarios_eng.js b/admin/WebConsole/idiomas/javascripts/eng/propiedades_usuarios_eng.js index 4d7151e4..04200171 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/propiedades_usuarios_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/propiedades_usuarios_eng.js @@ -1,13 +1,13 @@ //________________________________________________________________________________________________________ // -// Fichero de idiomas javascript: propiedades_usuarios_eng.js -// Idioma: Ingés +// Javascript language file: propiedades_usuarios_eng.js +// Language: English //________________________________________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="You must introduce an user"; -TbMsg[1]="You must introduce a password for this user"; -TbMsg[2]="You must introduce a complete name"; -TbMsg[3]="You must introduce an organizing unit for this user"; -TbMsg[4]="You must introduce a language"; -TbMsg[5]="Los campos 'Password' y 'Confirmar password' no coinciden"; -TbMsg[6]="La clave debe tener un mínimo de 8 caracteres"; +TbMsg[0]="You must enter user name"; +TbMsg[1]="You must enter a password for this user"; +TbMsg[2]="You must enter complete name"; +TbMsg[3]="You must enter organizational unit for this user"; +TbMsg[4]="You must enter language"; +TbMsg[5]="'Password' and 'Confirm password' does not match"; +TbMsg[6]="The key must be at least 8 characters"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/reservas_eng.js b/admin/WebConsole/idiomas/javascripts/eng/reservas_eng.js index 890e7394..54457f61 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/reservas_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/reservas_eng.js @@ -1,7 +1,6 @@ //____________________________________________________________________________ // -// Fichero de idiomas javascript: reservas.js -// Idioma: Ingés +// Javascript language file: reservas_eng.js +// Language: English //____________________________________________________________________________ TbMsg=new Array; - diff --git a/admin/WebConsole/idiomas/javascripts/eng/softwares_eng.js b/admin/WebConsole/idiomas/javascripts/eng/softwares_eng.js index 1f399ec5..4e3522ee 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/softwares_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/softwares_eng.js @@ -1,6 +1,6 @@ //____________________________________________________________________________ // -// Fichero de idiomas javascript: softwares.js -// Idioma: Ingés +// Javascript language file: softwares_eng.js +// Language: English //____________________________________________________________________________ TbMsg=new Array; diff --git a/admin/WebConsole/idiomas/javascripts/eng/tareascomandos_eng.js b/admin/WebConsole/idiomas/javascripts/eng/tareascomandos_eng.js index d5cfa10d..7b9c146a 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/tareascomandos_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/tareascomandos_eng.js @@ -1,10 +1,10 @@ //____________________________________________________________________________ // // Fichero de idiomas javascript: tareascomandos_eng.js -// Idioma: Ingés +// Idioma: Inglés //____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="WARNING.- This command will be excluded from task. ¿ Are you sure ?"; -TbMsg[1]="WARNING: You must introduce an order number"; -TbMsg[2]="This command has been successfully excluded from this task"; -TbMsg[3]="This commad has been successfully modified"; +TbMsg[0]="WARNING: This command will be excluded from this task. Are you sure?"; +TbMsg[1]="WARNING: You must enter a sequence number"; +TbMsg[2]="This command has been excluded successfully from this task"; +TbMsg[3]="This command has been modified successfully"; diff --git a/admin/WebConsole/idiomas/javascripts/eng/trabajostareas_eng.js b/admin/WebConsole/idiomas/javascripts/eng/trabajostareas_eng.js index dc334d71..7e2f92a7 100644 --- a/admin/WebConsole/idiomas/javascripts/eng/trabajostareas_eng.js +++ b/admin/WebConsole/idiomas/javascripts/eng/trabajostareas_eng.js @@ -1,10 +1,10 @@ //____________________________________________________________________________ // -// Fichero de idiomas javascript: trabajostareas_eng.js -// Idioma: Ingés +// Javascript language file: trabajostareas_eng.js +// Language: English //____________________________________________________________________________ TbMsg=new Array; -TbMsg[0]="This task has been successfully included in this job"; -TbMsg[1]="WARNING: You must introduce an order number"; -TbMsg[2]="This task has been successfully excluded from this job"; -TbMsg[3]="This task has been successfully modified"; +TbMsg[0]="This task has been included successfully in this job"; +TbMsg[1]="WARNING: You must enter a sequence number"; +TbMsg[2]="This task has been excluded successfully from this job"; +TbMsg[3]="This task has been modified successfully"; diff --git a/admin/WebConsole/idiomas/php/eng/propiedades_aulas_eng.php b/admin/WebConsole/idiomas/php/eng/propiedades_aulas_eng.php index 8841a2ee..f308484e 100644 --- a/admin/WebConsole/idiomas/php/eng/propiedades_aulas_eng.php +++ b/admin/WebConsole/idiomas/php/eng/propiedades_aulas_eng.php @@ -58,4 +58,4 @@ $TbMsg['PROP_REMOTEACCESS']="Remote access"; $TbMsg['COMM_REMOTEACCESS']="allow remote access management to computers"; $TbMsg['COMM_DEFOGLIVE']="Assigned by administrator"; // Ticket-816 PCprofesor -$TbMsg['PROP_PROFCOMPUTER']="Professor's computer"; +$TbMsg['PROP_PROFCOMPUTER']="Teacher‘s computer", diff --git a/admin/WebConsole/idiomas/php/eng/propiedades_ordenadores_eng.php b/admin/WebConsole/idiomas/php/eng/propiedades_ordenadores_eng.php index 4b748df7..aec63524 100644 --- a/admin/WebConsole/idiomas/php/eng/propiedades_ordenadores_eng.php +++ b/admin/WebConsole/idiomas/php/eng/propiedades_ordenadores_eng.php @@ -31,4 +31,4 @@ $TbMsg["PROP_SERIALNO"]="Serial No."; $TbMsg["WARN_NOTDETECTED"]="<em>(not detected)</em>"; $TbMsg['COMM_DEFOGLIVE']="Assigned by administrator"; // Ticket-816 PCprofesor -$TbMsg['WARN_PROFESSOR']="professor"; +$TbMsg['WARN_PROFESSOR']="teacher"; diff --git a/admin/WebConsole/principal/imagenes.php b/admin/WebConsole/principal/imagenes.php index ac358491..7c0a123c 100644 --- a/admin/WebConsole/principal/imagenes.php +++ b/admin/WebConsole/principal/imagenes.php @@ -237,9 +237,16 @@ function SubarbolXML_Imagenes($grupoid,$amb,$litamb,$tipo) $rs=new Recordset; #### agp ### Añado la consulta el campo idrepositorio #### $cmd->texto="SELECT DISTINCT imagenes.idimagen,imagenes.descripcion,repositorios.nombrerepositorio,repositorios.ip - FROM imagenes INNER JOIN repositorios USING (idrepositorio) - WHERE imagenes.idrepositorio = repositorios.idrepositorio - AND imagenes.idcentro=".$idcentro." + FROM imagenes "; + // Para hallar el repositorio de las incrementales hay que buscar los datos de la imagen basica (en la propia tablas imágenes) + if ($tipo == 3) { + $cmd->texto.=" INNER JOIN imagenes AS basica INNER JOIN repositorios + WHERE basica.idrepositorio=repositorios.idrepositorio + AND imagenes.imagenid=basica.idimagen AND "; + } else { + $cmd->texto.=" INNER JOIN repositorios USING (idrepositorio) WHERE "; + } + $cmd->texto.=" imagenes.idcentro=".$idcentro." AND imagenes.grupoid=".$grupoid." AND imagenes.tipo=".$tipo." ORDER BY imagenes.descripcion"; diff --git a/client/shared/scripts/launchOgagentInstaller b/client/shared/scripts/launchOgagentInstaller index 58d63dde..85f507b0 100755 --- a/client/shared/scripts/launchOgagentInstaller +++ b/client/shared/scripts/launchOgagentInstaller @@ -13,7 +13,7 @@ # Global variables. PROG="$(basename "$0")" if which curl &>/dev/null; then - DOWNLOAD="curl -k --timeout 1 -o" + DOWNLOAD="curl -k -f --connect-timeout 1 -o" else DOWNLOAD="wget --no-check-certificate -T 1 -O" fi @@ -41,11 +41,10 @@ case "$(ogGetOsType $1 $2)" in # Downloading OGAgent installer for Windows. OGAGENTFILE="OGAgentSetup-${OGVERSION/pre/}.exe" TMPDIR="$(ogGetPath "$MNTDIR/Windows/Temp")" - eval $DOWNLOAD "$TMPDIR/$OGAGENTFILE" "https://$(ogGetServerIp)/opengnsys/descargas/$OGAGENTFILE" 2>/dev/null if ogListSoftware $1 $2 | grep -qi "opengnsys agent"; then echo "OGAgent for Windows is already installed, you need to uninstall it before re-install." else - if [ -s "$TMPDIR/$OGAGENTFILE" ]; then + if eval $DOWNLOAD "$TMPDIR/$OGAGENTFILE" "https://$(ogGetServerIp)/opengnsys/descargas/$OGAGENTFILE" 2>/dev/null; then # Run once OGAgent Installer. if hivexsh -w << EOT 2>/dev/null; then load $HIVE @@ -68,7 +67,7 @@ EOT exit $OG_ERR_NOTFOUND fi fi - ;; + ;; Linux) # OGAgent for Linux (only deb and redhat-based backages; TODO suse-based package). if ogListSoftware $1 $2 | grep -qi "ogagent"; then echo "OGAgent for Linux is already installed, you need to uninstall it before re-install." @@ -76,20 +75,19 @@ EOT SYSTEMDDIR="$MNTDIR/lib/systemd" [ -d "$SYSTEMDDIR" -a -d "${SYSTEMDDIR/lib/etc}" ] || ogRaiseError $OG_ERR_NOTFOUND "$1 $2 systemd" || exit $OG_ERR_NOTFOUND # Downloading OGAgent installer for Linux. - if [ -e $MNTDIR/etc/debian_version ]; then # Debian-based + if [ -e $MNTDIR/etc/debian_version ]; then # Debian-based OGAGENTFILE="ogagent_${OGVERSION/pre/}_all.deb" CODE="if ! dpkg -l ogagent &>/dev/null && [ -f /var/tmp/$OGAGENTFILE ]; then apt-get update; apt-get install -y /var/tmp/$OGAGENTFILE; fi" - fi - if [ -e $MNTDIR/etc/redhat-release ]; then # RedHat-based - OGAGENTFILE="ogagent-${OGVERSION/pre/}-1.noarch.rpm" + fi + if [ -e $MNTDIR/etc/redhat-release ]; then # RedHat-based + OGAGENTFILE="ogagent-${OGVERSION/pre/}-1.noarch.rpm" CODE="if ! rpm -q ogagent &>/dev/null && [ -f /var/tmp/$OGAGENTFILE ]; then yum install -y /var/tmp/$OGAGENTFILE; fi" - fi - [ -n "$OGAGENTFILE" ] || ogRaiseError $OG_ERR_NOTFOUND "$1 $2 ogagent" || exit $OG_ERR_NOTFOUND + fi + [ -n "$OGAGENTFILE" ] || ogRaiseError $OG_ERR_NOTFOUND "$1 $2 ogagent" || exit $OG_ERR_NOTFOUND TMPDIR="$MNTDIR/var/tmp" - eval $DOWNLOAD "$TMPDIR/$OGAGENTFILE" "https://$(ogGetServerIp)/opengnsys/descargas/$OGAGENTFILE" 2>/dev/null - if [ -s "$TMPDIR/$OGAGENTFILE" ]; then - # Creating systemd script. - cat << EOT > $SYSTEMDDIR/systemd-launchogagent + if eval $DOWNLOAD "$TMPDIR/$OGAGENTFILE" "https://$(ogGetServerIp)/opengnsys/descargas/$OGAGENTFILE" 2>/dev/null; then + # Creating systemd script. + cat << EOT > $SYSTEMDDIR/systemd-launchogagent #!/bin/bash [ $EUID = 0 ] || exit 4 start() { @@ -108,12 +106,12 @@ restart() { } case "\$1" in - start|restart) "\$1" ;; + start|restart) "\$1" ;; esac EOT chmod +x $SYSTEMDDIR/systemd-launchogagent - # Creating systemd service. - cat << EOT > $SYSTEMDDIR/system/launchogagent.service + # Creating systemd service. + cat << EOT > $SYSTEMDDIR/system/launchogagent.service [Unit] Description=Installing and configuring OGAgent @@ -127,21 +125,21 @@ TimeoutStartSec=5min WantedBy=multi-user.target EOT ln -fs /lib/systemd/system/launchogagent.service \ - ${SYSTEMDDIR/lib/etc}/system/multi-user.target.wants - echo "Scheduled OGAgent installation at next boot" - echo " (process will be executed in the background, do not shutdown until finish)." + ${SYSTEMDDIR/lib/etc}/system/multi-user.target.wants + echo "Scheduled OGAgent installation at next boot" + echo " (process will be executed in the background, do not shutdown until finish)." else ogRaiseError $OG_ERR_NOTFOUND "$1 $2 /var/tmp/$OGAGENTFILE" exit $OG_ERR_NOTFOUND fi fi - ;; + ;; MacOS) # OGAgent for macOS (TODO). - echo "OGAgent installer for macOS is not implemented yet." - ;; + echo "OGAgent installer for macOS is not implemented yet." + ;; *) # OS not detected or OGAgent not implemented. ogRaiseError $OG_ERR_NOTOS "$1 $2" exit $OG_ERR_NOTOS - ;; + ;; esac |