Merge branch 'devel' into uefi (fast-forward)

8 files changed, 24 insertions, 24 deletions

diff --git a/admin/WebConsole/idiomas/php/eng/comandos/configurar_eng.php b/admin/WebConsole/idiomas/php/eng/comandos/configurar_eng.php
index 16d1d06a..60085635 100644
--- a/admin/WebConsole/idiomas/php/eng/comandos/configurar_eng.php
+++ b/admin/WebConsole/idiomas/php/eng/comandos/configurar_eng.php
@@ -22,6 +22,6 @@
 	$TbMsg[14]='Format';
 	$TbMsg[15]='Hide';
 	$TbMsg[16]='Show';
-	$TbMsg[17]='¡¡ Free  space !!';
+	$TbMsg[17]='Free space !!';
 
 	$TbMsg["HD"]='Disk';
diff --git a/admin/WebConsole/idiomas/php/eng/comandos/crearimagenbasica_eng.php b/admin/WebConsole/idiomas/php/eng/comandos/crearimagenbasica_eng.php
index 6f1d3545..e20b703f 100644
--- a/admin/WebConsole/idiomas/php/eng/comandos/crearimagenbasica_eng.php
+++ b/admin/WebConsole/idiomas/php/eng/comandos/crearimagenbasica_eng.php
@@ -4,13 +4,13 @@
 //	Php image file: crearimagenbasica_eng.php (Comandos)
 //	Language: English
 //________________________________________________________________________________________________________
-	$TbMsg=array();
+	if (empty($TbMsg))  $TbMsg=array();
 	$TbMsg[0]='Generation of base image  <br> (experimental)' ;
 	$TbMsg[1]='Computer features';
-        $TbMsg[2]='Name';
-        $TbMsg[3]='IP Address';
-        $TbMsg[4]='MAC Address';
-        $TbMsg[5]='Hardware profile';
+	$TbMsg[2]='Name';
+	$TbMsg[3]='IP Address';
+	$TbMsg[4]='MAC Address';
+	$TbMsg[5]='Hardware profile';
 	$TbMsg[6]='Data to supply';
 	$TbMsg[7]='Disk';
 	$TbMsg[8]='Par';
@@ -20,5 +20,5 @@
 	$TbMsg[12]='Additional Options';
 	$TbMsg[13]='Delete image previously';
 	$TbMsg[14]='Copy image to cache';
-	$TbMsg[15]='Delete image previously from cache';
+	$TbMsg[15]='Deleting image previously from cache';
 	$TbMsg[16]='Do not delete files from target';
diff --git a/admin/WebConsole/idiomas/php/eng/comandos/crearsoftincremental_eng.php b/admin/WebConsole/idiomas/php/eng/comandos/crearsoftincremental_eng.php
index a26a34f4..d9a3ccce 100644
--- a/admin/WebConsole/idiomas/php/eng/comandos/crearsoftincremental_eng.php
+++ b/admin/WebConsole/idiomas/php/eng/comandos/crearsoftincremental_eng.php
@@ -4,15 +4,15 @@
 //	Php language file: crearsoftincremental_eng.php (Comandos)
 //	Language: English
 //________________________________________________________________________________________________________
-	$TbMsg=array();
-	$TbMsg[0]='Generation of  incremental image  <br> (experimental)';
+	if (empty($TbMsg))  $TbMsg=array();
+	$TbMsg[0]='Generation of incremental image  <br> (experimental)';
 	$TbMsg[1]='Computer features';
 	$TbMsg[2]='Name';
 	$TbMsg[3]='IP Address';
 	$TbMsg[4]='MAC Address';
 	$TbMsg[5]='Hardware profile';
 	$TbMsg[6]='Data to supply';
-	$TbMsg[7]='Disco';
+	$TbMsg[7]='Disk';
 	$TbMsg[8]='Par';
 	$TbMsg[9]='OS name';
 	$TbMsg[10]='Incremental image / Repository';
@@ -20,5 +20,5 @@
 	$TbMsg[12]='Incremental software';
 	$TbMsg[13]='Delete Incremental previously';
 	$TbMsg[14]='Copy Incremental to cache';
-	$TbMsg[15]='Delete Incremental previously from cache';
-	$TbMsg[16]='Do not delete files  from target';
+	$TbMsg[15]='Deleting Incremental previously from cache';
+	$TbMsg[16]='Do not delete files from target';
diff --git a/admin/WebConsole/idiomas/php/eng/comandos/ejecutarscripts_eng.php b/admin/WebConsole/idiomas/php/eng/comandos/ejecutarscripts_eng.php
index 38e217ca..fa00a89f 100644
--- a/admin/WebConsole/idiomas/php/eng/comandos/ejecutarscripts_eng.php
+++ b/admin/WebConsole/idiomas/php/eng/comandos/ejecutarscripts_eng.php
@@ -54,7 +54,7 @@
 
 	$TbMsg["WCRP31"]='Remote partitions cloning Wizard';
 	$TbMsg["WCRP32"]='Select MASTER PC:';
-	$TbMsg["WCRP33"]='Select the image or partition to send from Master PC';
+	$TbMsg["WCRP33"]='Choose the image or partition to send from Master PC';
 	$TbMsg["WCRP34"]='Select the client target partition';
 	$TbMsg["WCRP35"]='Select the transfer mode';
 	$TbMsg["WCRP36"]='Select cloning tool';
diff --git a/admin/WebConsole/idiomas/php/eng/comandos/eliminarimagenrepo_eng.php b/admin/WebConsole/idiomas/php/eng/comandos/eliminarimagenrepo_eng.php
index 8582fc92..3259b608 100644
--- a/admin/WebConsole/idiomas/php/eng/comandos/eliminarimagenrepo_eng.php
+++ b/admin/WebConsole/idiomas/php/eng/comandos/eliminarimagenrepo_eng.php
@@ -4,19 +4,19 @@
 //	Php language file: eliminarimagenrepositorio_eng.php (Comandos)
 //	Language: English
 //________________________________________________________________________________________________________
-	$TbMsg=array();
+	if (empty($TbMsg))  $TbMsg=array();
 	$TbMsg[0]='Image creation';
 	$TbMsg[1]='Computer features';
 	$TbMsg[2]='Name';
 	$TbMsg[3]='IP Address';
 	$TbMsg[4]='MAC Address';
-	$TbMsg[5]='Delete Image from Repository';
+	$TbMsg[5]='Deleting Image from Repository';
 	$TbMsg[6]='Data to supply';
 	$TbMsg[7]='Available Images';
 	$TbMsg[8]='Par';
 	$TbMsg[9]='OS name';
 	$TbMsg[10]='----------- Image name -----------';
-	$TbMsg[11]='Nº';
+	$TbMsg[11]='No.';
 	$TbMsg[12]='Mark';
 	$TbMsg[13]='Size';
 	$TbMsg[14]='Locked Image';
@@ -31,11 +31,11 @@
 	$TbMsg[23]='Version Limitations 1.5';
 	$TbMsg[24]='Deleting Image is allowed if Repository and Web server are hosted on the same server';
 	$TbMsg[25]='NOT Created';
-	$TbMsg[26]='Delete Image object';
+	$TbMsg[26]='Deleting Image object';
 	$TbMsg[27]='Type';
 	$TbMsg[28]='View Full Repository';
 	$TbMsg[29]='View Organizational Unit';
 	$TbMsg[30]='Organizational Unit';
 	$TbMsg[31]='Archive';
 	$TbMsg[32]='Directory';
-	$TbMsg[33]='WARNING: Image is hosted in a directory that does not match with the organizational unit.'
+	$TbMsg[33]='WARNING: Image is hosted in a directory that does not match with the organizational unit.';
diff --git a/admin/WebConsole/idiomas/php/eng/comandos/particionaryformatear_eng.php b/admin/WebConsole/idiomas/php/eng/comandos/particionaryformatear_eng.php
index 47003e15..d5c979e5 100644
--- a/admin/WebConsole/idiomas/php/eng/comandos/particionaryformatear_eng.php
+++ b/admin/WebConsole/idiomas/php/eng/comandos/particionaryformatear_eng.php
@@ -4,7 +4,7 @@
 //	Php language file: particionaryformatear_eng.php (Comandos)
 //	Language: English
 //________________________________________________________________________________________________________
-	$TbMsg=array();
+	if(empty($TbMsg))  $TbMsg=array();
 	$TbMsg[0]='Centers';
 	$TbMsg[1]='Group of labs';
 	$TbMsg[2]='Labs';
@@ -22,4 +22,4 @@
 	$TbMsg[14]='Format';
 	$TbMsg[15]='Hide';
 	$TbMsg[16]='Show';
-	$TbMsg[17]='¡¡ Free  space !!';
+	$TbMsg[17]='Free space !!';
diff --git a/admin/WebConsole/idiomas/php/eng/propiedades_aulas_eng.php b/admin/WebConsole/idiomas/php/eng/propiedades_aulas_eng.php
index f308484e..9191b82d 100644
--- a/admin/WebConsole/idiomas/php/eng/propiedades_aulas_eng.php
+++ b/admin/WebConsole/idiomas/php/eng/propiedades_aulas_eng.php
@@ -4,7 +4,7 @@
 //	Php language file: propiedades_aulas_eng.php
 //	Language: English
 //________________________________________________________
-$TbMsg=array();
+if (empty($TbMsg))  $TbMsg=array();
 $TbMsg[0]="No Option";
 $TbMsg[1]="Insert";
 $TbMsg[2]="Modify";
@@ -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']="Teacher‘s computer",
+$TbMsg['PROP_PROFCOMPUTER']="Teacher‘s computer";
diff --git a/admin/WebConsole/idiomas/php/eng/reservas_eng.php b/admin/WebConsole/idiomas/php/eng/reservas_eng.php
index ae1b8d82..ebcd2902 100644
--- a/admin/WebConsole/idiomas/php/eng/reservas_eng.php
+++ b/admin/WebConsole/idiomas/php/eng/reservas_eng.php
@@ -4,9 +4,9 @@
 //	Pph language file: reserves_eng.php 
 //	Language: English 
 //________________________________________________________________________________________________________
-	$TbMsg=array();
+	if (empty($TbMsg))  $TbMsg=array();
 	$TbMsg[0]='"New reservations group"';
-	$TbMsg[1]='"Define new reservation";
+	$TbMsg[1]='"Define new reservation"';
 	$TbMsg[2]='"Set reserve"';
 	$TbMsg[3]='"Rename"';
 	$TbMsg[4]='"Delete reservations group"';