diff --git a/app/fax/app_languages.php b/app/fax/app_languages.php
index 2598df2bf7..71796fb94b 100644
--- a/app/fax/app_languages.php
+++ b/app/fax/app_languages.php
@@ -1,156 +1,156 @@
 <?php
 
-	$content_fax['title']['en-us'] = 'Fax Server';
-	$content_fax['title']['pt-pt'] = 'Servidor de Fax';
+	$text['title']['en-us'] = 'Fax Server';
+	$text['title']['pt-pt'] = 'Servidor de Fax';
 
-	$content_fax['description']['en-us'] = 'To receive a FAX setup a fax extension and then direct the incoming to it.';
-	$content_fax['description']['pt-pt'] = 'Para receber um FAX, configure uma extensão de fax e encaminhe o tráfego de entrada para essa extensão.';
+	$text['description']['en-us'] = 'To receive a FAX setup a fax extension and then direct the incoming to it.';
+	$text['description']['pt-pt'] = 'Para receber um FAX, configure uma extensão de fax e encaminhe o tráfego de entrada para essa extensão.';
 
-	$content_fax['confirm-delete']['en-us'] = 'Are you sure you want to delete this?';
-	$content_fax['confirm-delete']['pt-pt'] = 'Tem a certeza que pretende apagar?';
+	$text['confirm-delete']['en-us'] = 'Are you sure you want to delete this?';
+	$text['confirm-delete']['pt-pt'] = 'Tem a certeza que pretende apagar?';
 
-	$content_fax['label-extension']['en-us'] = 'Extension';
-	$content_fax['label-extension']['pt-pt'] = 'Extensão';
+	$text['label-extension']['en-us'] = 'Extension';
+	$text['label-extension']['pt-pt'] = 'Extensão';
 
-	$content_fax['label-destination-number']['en-us'] = 'Destination Number';
-	$content_fax['label-destination-number']['pt-pt'] = '';
+	$text['label-destination-number']['en-us'] = 'Destination Number';
+	$text['label-destination-number']['pt-pt'] = '';
 
-	$content_fax['label-name']['en-us'] = 'Name';
-	$content_fax['label-name']['pt-pt'] = 'Nome';
+	$text['label-name']['en-us'] = 'Name';
+	$text['label-name']['pt-pt'] = 'Nome';
 
-	$content_fax['label-email']['en-us'] = 'Email';
-	$content_fax['label-email']['pt-pt'] = 'E-mail';
+	$text['label-email']['en-us'] = 'Email';
+	$text['label-email']['pt-pt'] = 'E-mail';
 
-	$content_fax['label-description']['en-us'] = 'Description';
-	$content_fax['label-description']['pt-pt'] = 'Descrição';
+	$text['label-description']['en-us'] = 'Description';
+	$text['label-description']['pt-pt'] = 'Descrição';
 
-	$content_fax['label-upload']['en-us'] = 'Upload';
-	$content_fax['label-upload']['pt-pt'] = 'Carregar';
+	$text['label-upload']['en-us'] = 'Upload';
+	$text['label-upload']['pt-pt'] = 'Carregar';
 
-	$content_fax['description-upload']['en-us'] = 'Select the file to upload and send as a fax.';
-	$content_fax['description-upload']['pt-pt'] = 'Selecione o ficheiro para fazer o upload e enviar por fax.';
+	$text['description-upload']['en-us'] = 'Select the file to upload and send as a fax.';
+	$text['description-upload']['pt-pt'] = 'Selecione o ficheiro para fazer o upload e enviar por fax.';
 
-	$content_fax['button-back']['en-us'] = 'Back';
-	$content_fax['button-back']['pt-pt'] = 'Voltar';
+	$text['button-back']['en-us'] = 'Back';
+	$text['button-back']['pt-pt'] = 'Voltar';
 
-	$content_fax['button-settings']['en-us'] = 'Settings';
-	$content_fax['button-settings']['pt-pt'] = 'Configurações';
+	$text['button-settings']['en-us'] = 'Settings';
+	$text['button-settings']['pt-pt'] = 'Configurações';
 
-	$content_fax['button-send']['en-us'] = 'Send';
-	$content_fax['button-send']['pt-pt'] = 'Enviar';
+	$text['button-send']['en-us'] = 'Send';
+	$text['button-send']['pt-pt'] = 'Enviar';
 
-	$content_fax['button-copy']['en-us'] = 'Copy';
-	$content_fax['button-copy']['pt-pt'] = 'Copiar';
+	$text['button-copy']['en-us'] = 'Copy';
+	$text['button-copy']['pt-pt'] = 'Copiar';
 
-	$content_fax['button-save']['en-us'] = 'Save';
-	$content_fax['button-save']['pt-pt'] = 'Guardar';
+	$text['button-save']['en-us'] = 'Save';
+	$text['button-save']['pt-pt'] = 'Guardar';
 
 	//fax_copy
-	$content_fax['confirm-copy']['en-us'] = 'Copy Complete';
-	$content_fax['confirm-copy']['pt-pt'] = 'Cópia Completa';
+	$text['confirm-copy']['en-us'] = 'Copy Complete';
+	$text['confirm-copy']['pt-pt'] = 'Cópia Completa';
 
 	//fax_delete
-	$content_fax['confirm-delete']['en-us'] = 'Delete Complete';
-	$content_fax['confirm-delete']['pt-pt'] = 'Eliminação Completa';
+	$text['confirm-delete']['en-us'] = 'Delete Complete';
+	$text['confirm-delete']['pt-pt'] = 'Eliminação Completa';
 
 	//fax_edit
-	$content_fax['confirm-add']['en-us'] = 'Add Complete';
-	$content_fax['confirm-add']['pt-pt'] = 'Adição Completa';
+	$text['confirm-add']['en-us'] = 'Add Complete';
+	$text['confirm-add']['pt-pt'] = 'Adição Completa';
 
-	$content_fax['confirm-update']['en-us'] = 'Update Complete';
-	$content_fax['confirm-update']['pt-pt'] = 'Actualização Completa';        
+	$text['confirm-update']['en-us'] = 'Update Complete';
+	$text['confirm-update']['pt-pt'] = 'Actualização Completa';        
 
-	$content_fax['confirm-ext']['en-us'] = 'Please provide: Extension';
-	$content_fax['confirm-ext']['pt-pt'] = 'Por favor, forneça: Extensão';
+	$text['confirm-ext']['en-us'] = 'Please provide: Extension';
+	$text['confirm-ext']['pt-pt'] = 'Por favor, forneça: Extensão';
 
-	$content_fax['confirm-fax']['en-us'] = 'Please provide: A file to Fax';
-	$content_fax['confirm-fax']['pt-pt'] = 'Por favor forneça: um ficheiro para enviar Fax';
+	$text['confirm-fax']['en-us'] = 'Please provide: A file to Fax';
+	$text['confirm-fax']['pt-pt'] = 'Por favor forneça: um ficheiro para enviar Fax';
 
-	$content_fax['confirm-faxadd']['en-us'] = 'Fax Add';
-	$content_fax['confirm-faxadd']['pt-pt'] = 'Adição de Fax';
+	$text['confirm-fax-add']['en-us'] = 'Fax Add';
+	$text['confirm-fax-add']['pt-pt'] = 'Adição de Fax';
 
-	$content_fax['confirm-faxedit']['en-us'] = 'Fax Edit';
-	$content_fax['confirm-faxedit']['pt-pt'] = 'Edição de Fax'; 
+	$text['confirm-fax-edit']['en-us'] = 'Fax Edit';
+	$text['confirm-fax-edit']['pt-pt'] = 'Edição de Fax'; 
 
-	$content_fax['confirm-copyinfo']['en-us'] = 'Do you really want to copy this?';
-	$content_fax['confirm-copyinfo']['pt-pt'] = 'Deseja realmente copiar isto?';
+	$text['confirm-copy-info']['en-us'] = 'Do you really want to copy this?';
+	$text['confirm-copy-info']['pt-pt'] = 'Deseja realmente copiar isto?';
 
-	$content_fax['description-name']['en-us'] = 'Enter the name here.';
-	$content_fax['description-name']['pt-pt'] = 'Insira aqui o nome.';
+	$text['description-name']['en-us'] = 'Enter the name here.';
+	$text['description-name']['pt-pt'] = 'Insira aqui o nome.';
 
-	$content_fax['description-extension']['en-us'] = 'Enter the fax extension here.';
-	$content_fax['description-extension']['pt-pt'] = 'Insira aqui a extensão do fax';
+	$text['description-extension']['en-us'] = 'Enter the fax extension here.';
+	$text['description-extension']['pt-pt'] = 'Insira aqui a extensão do fax';
 
-	$content_fax['description-destination-number']['en-us'] = 'Enter the fax destination number';
-	$content_fax['description-destination-number']['pt-pt'] = 'Insira o número de fax para onde pretende enviar';
+	$text['description-destination-number']['en-us'] = 'Enter the fax destination number';
+	$text['description-destination-number']['pt-pt'] = 'Insira o número de fax para onde pretende enviar';
 
-	$content_fax['description-email']['en-us'] = 'Enter the email address to send the FAX to.';
-	$content_fax['description-email']['pt-pt'] = 'Insira o endereço de e-mail para enviar o fax.';
+	$text['description-email']['en-us'] = 'Enter the email address to send the FAX to.';
+	$text['description-email']['pt-pt'] = 'Insira o endereço de e-mail para enviar o fax.';
 
-	$content_fax['description-info']['en-us'] = 'Enter the description here.';
-	$content_fax['description-info']['pt-pt'] = 'Insira aqui a descrição';
+	$text['description-info']['en-us'] = 'Enter the description here.';
+	$text['description-info']['pt-pt'] = 'Insira aqui a descrição';
 
-	$content_fax['label-pin']['en-us'] = 'PIN Number';
-	$content_fax['label-pin']['pt-pt'] = 'Numero PIN';
+	$text['label-pin']['en-us'] = 'PIN Number';
+	$text['label-pin']['pt-pt'] = 'Numero PIN';
 
-	$content_fax['description-pin']['en-us'] = 'Enter the PIN number here.';
-	$content_fax['description-pin']['pt-pt'] = 'Insira aqui o número do PIN.';
+	$text['description-pin']['en-us'] = 'Enter the PIN number here.';
+	$text['description-pin']['pt-pt'] = 'Insira aqui o número do PIN.';
 
-	$content_fax['label-callerid-name']['en-us'] = 'Caller ID Name';
-	$content_fax['label-callerid-name']['pt-pt'] = 'Nome de Origem';
+	$text['label-caller-id-name']['en-us'] = 'Caller ID Name';
+	$text['label-caller-id-name']['pt-pt'] = 'Nome de Origem';
 
-	$content_fax['label-callerid-number']['en-us'] = 'Caller ID Number';
-	$content_fax['label-callerid-number']['pt-pt'] = 'Número de Origem';
+	$text['label-caller-id-number']['en-us'] = 'Caller ID Number';
+	$text['label-caller-id-number']['pt-pt'] = 'Número de Origem';
 
-	$content_fax['description-callerid-name']['en-us'] = 'Enter the Caller ID name here.';
-	$content_fax['description-callerid-name']['pt-pt'] = 'Insira aqui o nome de origem.';
+	$text['description-caller-id-name']['en-us'] = 'Enter the Caller ID name here.';
+	$text['description-caller-id-name']['pt-pt'] = 'Insira aqui o nome de origem.';
 
-	$content_fax['description-callerid-number']['en-us'] = 'Enter the Caller ID number here.';
-	$content_fax['description-callerid-number']['pt-pt'] = 'Insira aqui o número de origem.';
+	$text['description-caller-id-number']['en-us'] = 'Enter the Caller ID number here.';
+	$text['description-caller-id-number']['pt-pt'] = 'Insira aqui o número de origem.';
 
-	$content_fax['label-forward']['en-us'] = 'Forward Number';
-	$content_fax['label-forward']['pt-pt'] = 'Número de Encaminhamento';
+	$text['label-forward']['en-us'] = 'Forward Number';
+	$text['label-forward']['pt-pt'] = 'Número de Encaminhamento';
 
-	$content_fax['description-forwardnumber']['en-us'] = 'Enter the forward number here. Used to forward the fax to a registered extension or external number.';
-	$content_fax['description-forwardnumber']['pt-pt'] = 'Insira aqui o número de encaminhamento. Utilizado para encaminhar o fax para uma extensão registada ou número externo.';
+	$text['description-forward-number']['en-us'] = 'Enter the forward number here. Used to forward the fax to a registered extension or external number.';
+	$text['description-forward-number']['pt-pt'] = 'Insira aqui o número de encaminhamento. Utilizado para encaminhar o fax para uma extensão registada ou número externo.';
 
-	$content_fax['label-userlist']['en-us'] = 'User List';
-	$content_fax['label-userlist']['pt-pt'] = 'Lista de utilizadores';
+	$text['label-user-list']['en-us'] = 'User List';
+	$text['label-user-list']['pt-pt'] = 'Lista de utilizadores';
 
-	$content_fax['button-add']['en-us'] = 'Add';
-	$content_fax['button-add']['pt-pt'] = 'Adicionar';
+	$text['button-add']['en-us'] = 'Add';
+	$text['button-add']['pt-pt'] = 'Adicionar';
 
-	$content_fax['description-useradd']['en-us'] = 'Assign the users that can manage this fax extension.';
-	$content_fax['description-useradd']['pt-pt'] = 'Atribuir os utilizadores que podem gerir esta extensão de fax.';
+	$text['description-user-add']['en-us'] = 'Assign the users that can manage this fax extension.';
+	$text['description-user-add']['pt-pt'] = 'Atribuir os utilizadores que podem gerir esta extensão de fax.';
 
-	$content_fax['label-file']['en-us'] = 'File not found.';
-	$content_fax['label-file']['pt-pt'] = 'Ficheiro não encontrado.';
+	$text['label-file']['en-us'] = 'File not found.';
+	$text['label-file']['pt-pt'] = 'Ficheiro não encontrado.';
 
-	$content_fax['description2']['en-us'] = 'To send a fax you can upload a .tif file or if ghost script has been installed then you can also send a fax by uploading a PDF.';
-	$content_fax['description2']['pt-pt'] = 'Para enviar um fax, pode carregar um ficheiro .tif ou se o ghost script foi instalado, então também pode enviar um fax, carregando um ficheiro .pdf.';
+	$text['description-2']['en-us'] = 'To send a fax you can upload a .tif file or if ghost script has been installed then you can also send a fax by uploading a PDF.';
+	$text['description-2']['pt-pt'] = 'Para enviar um fax, pode carregar um ficheiro .tif ou se o ghost script foi instalado, então também pode enviar um fax, carregando um ficheiro .pdf.';
 
-	$content_fax['description3']['en-us'] = 'When sending a fax you can view status of the transmission by viewing the logs from the Status tab or by watching the response from the console.';
-	$content_fax['description3']['pt-pt'] = 'Ao enviar um fax, pode ver o estado da transmissão, visualizando os logs da tab Status ou assistindo a resposta através da consola.';
+	$text['description-3']['en-us'] = 'When sending a fax you can view status of the transmission by viewing the logs from the Status tab or by watching the response from the console.';
+	$text['description-3']['pt-pt'] = 'Ao enviar um fax, pode ver o estado da transmissão, visualizando os logs da tab Status ou assistindo a resposta através da consola.';
 
-	$content_fax['label-faxnumber']['en-us'] = 'Fax Number';
-	$content_fax['label-faxnumber']['pt-pt'] = 'Número de Fax';
+	$text['label-fax-number']['en-us'] = 'Fax Number';
+	$text['label-fax-number']['pt-pt'] = 'Número de Fax';
 
-	$content_fax['description-faxnumber']['en-us'] = 'Enter the number here.';
-	$content_fax['description-faxnumber']['pt-pt'] = 'Insira aqui o numero.';
+	$text['description-fax-number']['en-us'] = 'Enter the number here.';
+	$text['description-fax-number']['pt-pt'] = 'Insira aqui o numero.';
 
-	$content_fax['label-location']['en-us'] = 'location';
-	$content_fax['label-location']['pt-pt'] = 'localização';
+	$text['label-location']['en-us'] = 'location';
+	$text['label-location']['pt-pt'] = 'localização';
 
-	$content_fax['table-file']['en-us'] = 'File Name (download)';
-	$content_fax['table-file']['pt-pt'] = 'Nome do Ficheiro (descarregado)';
+	$text['table-file']['en-us'] = 'File Name (download)';
+	$text['table-file']['pt-pt'] = 'Nome do Ficheiro (descarregado)';
 
-	$content_fax['table-view']['en-us'] = 'View';
-	$content_fax['table-view']['pt-pt'] = 'Visualizar';
+	$text['table-view']['en-us'] = 'View';
+	$text['table-view']['pt-pt'] = 'Visualizar';
 
-	$content_fax['table-modified']['en-us'] = 'Last Modified';
-	$content_fax['table-modified']['pt-pt'] = 'Última alteração';
+	$text['table-modified']['en-us'] = 'Last Modified';
+	$text['table-modified']['pt-pt'] = 'Última alteração';
 
-	$content_fax['table-size']['en-us'] = 'Size';
-	$content_fax['table-size']['pt-pt'] = 'Tamanho';
+	$text['table-size']['en-us'] = 'Size';
+	$text['table-size']['pt-pt'] = 'Tamanho';
 
 ?>
\ No newline at end of file
diff --git a/app/fax/fax.php b/app/fax/fax.php
index cc425a2f6b..0eb9796e93 100644
--- a/app/fax/fax.php
+++ b/app/fax/fax.php
@@ -40,8 +40,8 @@ require_once "includes/paging.php";
 	echo "<!--\n";
 	require_once "app_languages.php";
 	echo "-->\n";
-	foreach($content_fax as $key => $value) {
-		$content_fax[$key] = $value[$_SESSION['domain']['language']['code']];
+	foreach($text as $key => $value) {
+		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
 //get the http get values and set them as php variables
@@ -58,7 +58,7 @@ require_once "includes/paging.php";
 	echo "			<tr>\n";
 	echo "				<td align='left'>\n";
 	echo "					<p><span class=\"vexpl\"><span class=\"red\"><strong>FAX<br></strong></span>\n";
-	echo "					".$content_fax['description']."\n";
+	echo "					".$text['description']."\n";
 	echo "					</p>\n";
 	echo "				</td>\n";
 	echo "			</tr>\n";
@@ -124,10 +124,10 @@ require_once "includes/paging.php";
 	echo "<div align='center'>\n";
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
-	echo th_order_by('fax_extension', $content_fax['label-extension'], $order_by, $order);
-	echo th_order_by('fax_name', $content_fax['label-name'], $order_by, $order);
-	echo th_order_by('fax_email', $content_fax['label-email'], $order_by, $order);
-	echo th_order_by('fax_description', $content_fax['label-description'], $order_by, $order);
+	echo th_order_by('fax_extension', $text['label-extension'], $order_by, $order);
+	echo th_order_by('fax_name', $text['label-name'], $order_by, $order);
+	echo th_order_by('fax_email', $text['label-email'], $order_by, $order);
+	echo th_order_by('fax_description', $text['label-description'], $order_by, $order);
 	echo "<td align='right' width='42'>\n";
 	if (permission_exists('fax_extension_add')) {
 		echo "	<a href='fax_edit.php' alt='add'>$v_link_label_add</a>\n";
@@ -147,7 +147,7 @@ require_once "includes/paging.php";
 				echo "		<a href='fax_view.php?id=".$row['fax_uuid']."' alt='edit'>$v_link_label_edit</a>\n";
 			}
 			if (permission_exists('fax_extension_delete')) {
-				echo "		<a href='fax_delete.php?id=".$row['fax_uuid']."' alt='delete' onclick=\"return confirm('".$content_fax['confirm-delete']."')\">$v_link_label_delete</a>\n";
+				echo "		<a href='fax_delete.php?id=".$row['fax_uuid']."' alt='delete' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>\n";
 			}
 			echo "	</td>\n";
 			echo "</tr>\n";
diff --git a/app/fax/fax_copy.php b/app/fax/fax_copy.php
index 73fa574e88..3e28883e0f 100644
--- a/app/fax/fax_copy.php
+++ b/app/fax/fax_copy.php
@@ -36,8 +36,10 @@ else {
 	exit;
 }
 
-        foreach($content_fax as $key => $value) {
-		$content_fax[$key] = $value[$_SESSION['domain']['language']['code']];
+//add multi-lingual support
+	require_once "app_languages.php";
+	foreach($text as $key => $value) {
+		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
 //set the http get/post variable(s) to a php variable
@@ -110,7 +112,7 @@ else {
 	require_once "includes/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=fax.php\">\n";
 	echo "<div align='center'>\n";
-	echo "".$content_fax['confirm-copy']."\n";
+	echo "".$text['confirm-copy']."\n";
 	echo "</div>\n";
 	require_once "includes/footer.php";
 	return;
diff --git a/app/fax/fax_delete.php b/app/fax/fax_delete.php
index d2d42e148d..06bb5fa9b1 100644
--- a/app/fax/fax_delete.php
+++ b/app/fax/fax_delete.php
@@ -35,9 +35,10 @@ else {
 	exit;
 }
 
-        //prepare the languages
-	foreach($content_fax as $key => $value) {
-		$content_fax[$key] = $value[$_SESSION['domain']['language']['code']];
+//add multi-lingual support
+	require_once "app_languages.php";
+	foreach($text as $key => $value) {
+		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
 //get the http get value and set it as a php variable
@@ -92,7 +93,7 @@ else {
 	require_once "includes/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=fax.php\">\n";
 	echo "<div align='center'>\n";
-	echo "".$content_fax['confirm-delete']."\n";
+	echo "".$text['confirm-delete']."\n";
 	echo "</div>\n";
 	require_once "includes/footer.php";
 	return;
diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php
index e188738512..d05c65b80a 100644
--- a/app/fax/fax_edit.php
+++ b/app/fax/fax_edit.php
@@ -36,8 +36,8 @@ else {
 
 //add multi-lingual support
 	require_once "app_languages.php";
-	foreach($content_fax as $key => $value) {
-		$content_fax[$key] = $value[$_SESSION['domain']['language']['code']];
+	foreach($text as $key => $value) {
+		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
 //get the fax_extension and save it as a variable
@@ -131,7 +131,7 @@ else {
 		//redirect the browser
 			require_once "includes/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=fax_edit.php?id=$fax_uuid\">\n";
-			echo "<div align='center'>".$content_fax['confirm-delete']."</div>";
+			echo "<div align='center'>".$text['confirm-delete']."</div>";
 			require_once "includes/footer.php";
 			return;
 	}
@@ -160,7 +160,7 @@ else {
 		//redirect the browser
 			require_once "includes/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=fax_edit.php?id=$fax_uuid\">\n";
-			echo "<div align='center'>".$content_fax['confirm-add']."</div>";
+			echo "<div align='center'>".$text['confirm-add']."</div>";
 			require_once "includes/footer.php";
 			return;
 	}
@@ -176,8 +176,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 
 	//check for all required data
-		if (strlen($fax_extension) == 0) { $msg .= "".$content_fax['confirm-ext']."<br>\n"; }
-		if (strlen($fax_name) == 0) { $msg .= "".$content_fax['confirm-fax']."<br>\n"; }
+		if (strlen($fax_extension) == 0) { $msg .= "".$text['confirm-ext']."<br>\n"; }
+		if (strlen($fax_name) == 0) { $msg .= "".$text['confirm-fax']."<br>\n"; }
 		//if (strlen($fax_email) == 0) { $msg .= "Please provide: Email<br>\n"; }
 		//if (strlen($fax_pin_number) == 0) { $msg .= "Please provide: Pin Number<br>\n"; }
 		//if (strlen($fax_caller_id_name) == 0) { $msg .= "Please provide: Caller ID Name<br>\n"; }
@@ -454,10 +454,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				echo "<meta http-equiv=\"refresh\" content=\"2;url=fax.php\">\n";
 				echo "<div align='center'>\n";
 				if ($action == "update" && permission_exists('fax_extension_edit')) {
-					echo "".$content_fax['confirm-update']."\n";
+					echo "".$text['confirm-update']."\n";
 				}
 				if ($action == "add" && permission_exists('fax_extension_add')) {
-					echo "".$content_fax['confirm-add']."\n";
+					echo "".$text['confirm-add']."\n";
 				}
 				echo "</div>\n";
 				require_once "includes/footer.php";
@@ -508,109 +508,109 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<table width='100%'  border='0' cellpadding='6' cellspacing='0'>\n";
 	echo "<tr>\n";
 	if ($action == "add") {
-		echo "<td align='left' width='30%' nowrap><b>".$content_fax['confirm-faxadd']."</b></td>\n";
+		echo "<td align='left' width='30%' nowrap><b>".$text['confirm-fax-add']."</b></td>\n";
 	}
 	if ($action == "update") {
-		echo "<td align='left' width='30%' nowrap><b>".$content_fax['confirm-faxedit']."</b></td>\n";
+		echo "<td align='left' width='30%' nowrap><b>".$text['confirm-fax-edit']."</b></td>\n";
 	}
 	echo "<td width='70%' align='right'>\n";
-	echo "	<input type='button' class='btn' name='' alt='copy' onclick=\"if (confirm('".$content_fax['confirm-copyinfo']."')){window.location='fax_copy.php?id=".$fax_uuid."';}\" value='".$content_fax['button-copy']."'>\n";
-	echo "	<input type='button' class='btn' name='' alt='back' onclick=\"window.location='fax.php'\" value='".$content_fax['button-back']."'>\n";
+	echo "	<input type='button' class='btn' name='' alt='copy' onclick=\"if (confirm('".$text['confirm-copy-info']."')){window.location='fax_copy.php?id=".$fax_uuid."';}\" value='".$text['button-copy']."'>\n";
+	echo "	<input type='button' class='btn' name='' alt='back' onclick=\"window.location='fax.php'\" value='".$text['button-back']."'>\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap>\n";
-	echo "	".$content_fax['label-name'].":\n";
+	echo "	".$text['label-name'].":\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='fax_name' maxlength='255' value=\"$fax_name\">\n";
 	echo "<br />\n";
-	echo "".$content_fax['description-name']."\n";
+	echo "".$text['description-name']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap>\n";
-	echo "	".$content_fax['label-extension'].":\n";
+	echo "	".$text['label-extension'].":\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='fax_extension' maxlength='255' value=\"$fax_extension\">\n";
 	echo "<br />\n";
-	echo "".$content_fax['description-extension']."\n";
+	echo "".$text['description-extension']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-	echo "	".$content_fax['label-destination-number'].":\n";
+	echo "	".$text['label-destination-number'].":\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='fax_destination_number' maxlength='255' value=\"$fax_destination_number\">\n";
 	echo "<br />\n";
-	echo " ".$content_fax['description-destination-number']."\n";
+	echo " ".$text['description-destination-number']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-	echo "	".$content_fax['label-email'].":\n";
+	echo "	".$text['label-email'].":\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='fax_email' maxlength='255' value=\"$fax_email\">\n";
 	echo "<br />\n";
-	echo "	".$content_fax['description-email']."\n";
+	echo "	".$text['description-email']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-	echo "	".$content_fax['label-pin'].":\n";
+	echo "	".$text['label-pin'].":\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='fax_pin_number' maxlength='255' value=\"$fax_pin_number\">\n";
 	echo "<br />\n";
-	echo "".$content_fax['description-pin']."\n";
+	echo "".$text['description-pin']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-	echo "	".$content_fax['label-callerid-name'].":\n";
+	echo "	".$text['label-caller-id-name'].":\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='fax_caller_id_name' maxlength='255' value=\"$fax_caller_id_name\">\n";
 	echo "<br />\n";
-	echo "".$content_fax['description-callerid-name']."\n";
+	echo "".$text['description-caller-id-name']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-	echo "	".$content_fax['label-callerid-number'].":\n";
+	echo "	".$text['label-caller-id-number'].":\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='fax_caller_id_number' maxlength='255' value=\"$fax_caller_id_number\">\n";
 	echo "<br />\n";
-	echo "".$content_fax['description-callerid-number']."\n";
+	echo "".$text['description-caller-id-number']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-	echo "	".$content_fax['label-forward'].":\n";
+	echo "	".$text['label-forward'].":\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='fax_forward_number' maxlength='255' value=\"".format_phone($fax_forward_number)."\">\n";
 	echo "<br />\n";
-	echo "".$content_fax['description-forwardnumber']."\n";
+	echo "".$text['description-forward-number']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
 	if (if_group("admin") || if_group("superadmin")) {
 		if ($action == "update") {
 			echo "	<tr>";
-			echo "		<td class='vncell' valign='top'>".$content_fax['label-userlist'].":</td>";
+			echo "		<td class='vncell' valign='top'>".$text['label-user-list'].":</td>";
 			echo "		<td class='vtable'>";
 
 			echo "			<table width='52%'>\n";
@@ -626,7 +626,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				echo "			<tr>\n";
 				echo "				<td class='vtable'>".$field['username']."</td>\n";
 				echo "				<td>\n";
-				echo "					<a href='fax_edit.php?id=".$fax_uuid."&domain_uuid=".$_SESSION['domain_uuid']."&user_uuid=".$field['user_uuid']."&a=delete' alt='delete' onclick=\"return confirm('".$content_fax['confirm-delete']."')\">$v_link_label_delete</a>\n";
+				echo "					<a href='fax_edit.php?id=".$fax_uuid."&domain_uuid=".$_SESSION['domain_uuid']."&user_uuid=".$field['user_uuid']."&a=delete' alt='delete' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>\n";
 				echo "				</td>\n";
 				echo "			</tr>\n";
 			}
@@ -644,10 +644,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				echo "			<option value='".$field['user_uuid']."'>".$field['username']."</option>\n";
 			}
 			echo "			</select>";
-			echo "			<input type=\"submit\" class='btn' value=\"".$content_fax['button-add']."\">\n";
+			echo "			<input type=\"submit\" class='btn' value=\"".$text['button-add']."\">\n";
 			unset($sql, $result);
 			echo "			<br>\n";
-			echo "			".$content_fax['description-useradd']."\n";
+			echo "			".$text['description-user-add']."\n";
 			echo "			<br />\n";
 			echo "		</td>";
 			echo "	</tr>";
@@ -656,12 +656,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap>\n";
-	echo "	".$content_fax['label-description'].":\n";
+	echo "	".$text['label-description'].":\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='fax_description' maxlength='255' value=\"$fax_description\">\n";
 	echo "<br />\n";
-	echo "".$content_fax['description-info']."\n";
+	echo "".$text['description-info']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 	echo "	<tr>\n";
@@ -670,7 +670,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "			<input type='hidden' name='fax_uuid' value='$fax_uuid'>\n";
 		echo "			<input type='hidden' name='dialplan_uuid' value='$dialplan_uuid'>\n";
 	}
-	echo "			<input type='submit' name='submit' class='btn' value='".$content_fax['button-save']."'>\n";
+	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
diff --git a/app/fax/fax_view.php b/app/fax/fax_view.php
index a8dd67fcbf..495d1f911a 100644
--- a/app/fax/fax_view.php
+++ b/app/fax/fax_view.php
@@ -35,9 +35,10 @@ else {
 	exit;
 }
 
-         //prepare the languages
-	foreach($content_fax as $key => $value) {
-		$content_fax[$key] = $value[$_SESSION['domain']['language']['code']];
+//add multi-lingual support
+	require_once "app_languages.php";
+	foreach($text as $key => $value) {
+		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
 //get the fax_extension and save it as a variable
@@ -160,7 +161,7 @@ else {
 			fpassthru($fd);
 		}
 		else {
-			echo "".$content_fax['label-file']."";
+			echo "".$text['label-file']."";
 		}
 		exit;
 	}
@@ -331,13 +332,13 @@ else {
 	echo "<table width='100%'  border='0' cellpadding='6' cellspacing='0'>\n";
 	echo "<tr>\n";
 	echo "		<td align='left' width='30%'>\n";
-	echo "			<span class=\"vexpl\"><span class=\"red\"><strong>".$content_fax['title']."</strong></span>\n";
+	echo "			<span class=\"vexpl\"><span class=\"red\"><strong>".$text['title']."</strong></span>\n";
 	echo "		</td>\n";
 	echo "		<td width='70%' align='right'>\n";
 	if (permission_exists('fax_extension_add') || permission_exists('fax_extension_edit')) {
-		echo "			<input type='button' class='btn' name='' alt='settings' onclick=\"window.location='fax_edit.php?id=$fax_uuid'\" value='".$content_fax['button-settings']."'>\n";
+		echo "			<input type='button' class='btn' name='' alt='settings' onclick=\"window.location='fax_edit.php?id=$fax_uuid'\" value='".$text['button-settings']."'>\n";
 	}
-	echo "			<input type='button' class='btn' name='' alt='back' onclick=\"window.location='fax.php'\" value='".$content_fax['button-back']."'>\n";
+	echo "			<input type='button' class='btn' name='' alt='back' onclick=\"window.location='fax.php'\" value='".$text['button-back']."'>\n";
 	echo "		</td>\n";
 	echo "</tr>\n";
 	echo "</table>\n";
@@ -349,33 +350,33 @@ else {
 	echo "	<tr>\n";
 	echo "		<td colspan='2' align='left'>\n";
 	//pkg_add -r ghostscript8-nox11; rehash
-	echo "			".$content_fax['description2']." \n";
-	echo "			".$content_fax['description3']."\n";
+	echo "			".$text['description-2']." \n";
+	echo "			".$text['description-3']."\n";
 	echo "			<br /><br />\n";
 	echo "		</td>\n";
 	echo "	</tr>\n";
 
 	echo "<tr>\n";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap>\n";
-	echo "		".$content_fax['label-faxnumber'].":\n";
+	echo "		".$text['label-fax-number'].":\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "		<input type=\"text\" name=\"fax_number\" class='formfld' style='' value=\"\">\n";
 	echo "<br />\n";
-	echo "".$content_fax['description-faxnumber']."\n";
+	echo "".$text['description-fax-number']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap>\n";
-	echo "	".$content_fax['label-upload'].":\n";
+	echo "	".$text['label-upload'].":\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<input name=\"id\" type=\"hidden\" value=\"\$id\">\n";
 	echo "	<input name=\"type\" type=\"hidden\" value=\"fax_send\">\n";
 	echo "	<input name=\"fax_file\" type=\"file\" class=\"btn\" id=\"fax_file\">\n";
 	echo "	<br />\n";
-	echo "	".$content_fax['description-upload']."\n";
+	echo "	".$text['description-upload']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
@@ -385,7 +386,7 @@ else {
 	echo "			<input type=\"hidden\" name=\"fax_caller_id_number\" value=\"".$fax_caller_id_number."\">\n";
 	echo "			<input type=\"hidden\" name=\"fax_extension\" value=\"".$fax_extension."\">\n";
 	echo "			<input type=\"hidden\" name=\"id\" value=\"".$fax_uuid."\">\n";
-	echo "			<input name=\"submit\" type=\"submit\" class=\"btn\" id=\"upload\" value=\"".$content_fax['button-send']."\">\n";
+	echo "			<input name=\"submit\" type=\"submit\" class=\"btn\" id=\"upload\" value=\"".$text['button-send']."\">\n";
 	echo "		</td>\n";
 	echo "	</tr>";
 	echo "</table>";
@@ -405,7 +406,7 @@ else {
 		echo "		</td>\n";
 		echo "		<td align='right'>";
 		if ($v_path_show) {
-			echo "<b>".$content_fax['label-location'].":</b>&nbsp;";
+			echo "<b>".$text['label-location'].":</b>&nbsp;";
 			echo $dir_fax_inbox."&nbsp; &nbsp; &nbsp;";
 		}
 		echo "		</td>\n";
@@ -420,10 +421,10 @@ else {
 		echo "	<div id=\"\">\n";
 		echo "	<table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n";
 		echo "	<tr>\n";
-		echo "		<th width=\"60%\" class=\"listhdrr\">".$content_fax['table-file']."</td>\n";
-		echo "		<th width=\"10%\" class=\"listhdrr\">".$content_fax['table-view']."</td>\n";
-		echo "		<th width=\"20%\" class=\"listhdr\">".$content_fax['table-modified']."</td>\n";
-		echo "		<th width=\"10%\" class=\"listhdr\" nowrap>Size".$content_fax['table-size']."</td>\n";
+		echo "		<th width=\"60%\" class=\"listhdrr\">".$text['table-file']."</td>\n";
+		echo "		<th width=\"10%\" class=\"listhdrr\">".$text['table-view']."</td>\n";
+		echo "		<th width=\"20%\" class=\"listhdr\">".$text['table-modified']."</td>\n";
+		echo "		<th width=\"10%\" class=\"listhdr\" nowrap>Size".$text['table-size']."</td>\n";
 		echo "	</tr>";
 
 
@@ -519,7 +520,7 @@ else {
 						echo "    <table border=\"0\" cellspacing=\"0\" cellpadding=\"1\">\n";
 						echo "      <tr>\n";
 						if (permission_exists('fax_inbox_delete')) {
-							echo "        <td><a href=\"fax_view.php?id=".$fax_uuid."&type=fax_inbox&a=del&fax_extension=".urlencode($fax_extension)."&filename=".urlencode($file)."\" onclick=\"return confirm('".$content_fax['confirm-delete']."')\">$v_link_label_delete</a></td>\n";
+							echo "        <td><a href=\"fax_view.php?id=".$fax_uuid."&type=fax_inbox&a=del&fax_extension=".urlencode($fax_extension)."&filename=".urlencode($file)."\" onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a></td>\n";
 						}
 						echo "      </tr>\n";
 						echo "   </table>\n";
@@ -548,7 +549,7 @@ else {
 		echo "		</td>\n";
 		echo "		<td align='right'>\n";
 		if ($v_path_show) {
-			echo "<b>".$content_fax['label-location'].": </b>\n";
+			echo "<b>".$text['label-location'].": </b>\n";
 			echo $dir_fax_sent."&nbsp; &nbsp; &nbsp;\n";
 		}
 		echo "		</td>\n";
@@ -557,10 +558,10 @@ else {
 		echo "\n";
 		echo "    <table width=\"100%\" border=\"0\" cellpadding=\"0\" cellspacing=\"0\">\n";
 		echo "    <tr>\n";
-		echo "		<th width=\"60%\">".$content_fax['table-file']."</td>\n";
-		echo "		<th width=\"10%\">".$content_fax['table-view']."</td>\n";
-		echo "		<th width=\"20%\">".$content_fax['table-modified']."</td>\n";
-		echo "		<th width=\"10%\" nowrap>".$content_fax['table-size']."</td>\n";
+		echo "		<th width=\"60%\">".$text['table-file']."</td>\n";
+		echo "		<th width=\"10%\">".$text['table-view']."</td>\n";
+		echo "		<th width=\"20%\">".$text['table-modified']."</td>\n";
+		echo "		<th width=\"10%\" nowrap>".$text['table-size']."</td>\n";
 		echo "		</tr>";
 
 		if ($handle = opendir($dir_fax_sent)) {
@@ -653,7 +654,7 @@ else {
 						echo "    <table border=\"0\" cellspacing=\"0\" cellpadding=\"1\">\n";
 						echo "      <tr>\n";
 						if (permission_exists('fax_sent_delete')) {
-							echo "        <td><a href=\"fax_view.php?id=".$fax_uuid."&type=fax_sent&a=del&fax_extension=".urlencode($fax_extension)."&filename=".urlencode($file)."\" onclick=\"return confirm('".$content_fax['confirm-delete']."')\">$v_link_label_delete</a></td>\n";
+							echo "        <td><a href=\"fax_view.php?id=".$fax_uuid."&type=fax_sent&a=del&fax_extension=".urlencode($fax_extension)."&filename=".urlencode($file)."\" onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a></td>\n";
 						}
 						echo "      </tr>\n";
 						echo "   </table>\n";