diff --git a/app/calls/app_languages.php b/app/calls/app_languages.php
index dcdab4d5d8..441a67f58a 100644
--- a/app/calls/app_languages.php
+++ b/app/calls/app_languages.php
@@ -1,90 +1,87 @@
 <?php
 
-    $text['title']['en-us'] = 'Calls';
-    $text['title']['pt-pt'] = 'Chamadas';
+	$text['title']['en-us'] = 'Calls';
+	$text['title']['pt-pt'] = 'Chamadas';
 
-    $text['description']['en-us'] = 'Directs incoming calls for extension:';
-    $text['description']['pt-pt'] = 'Direciona as chamadas recebidas para a extensão:';
+	$text['description']['en-us'] = 'Directs incoming calls for extension:';
+	$text['description']['pt-pt'] = 'Direciona as chamadas recebidas para a extensão:';
 
-    $text['description-2']['en-us'] = 'Use the links to configure call forward follow me, or do no disturb.';
-    $text['description-2']['pt-pt'] = 'Utilizar os links para definir as funcinalidades de encaminhamento de chamada, segue-me, ou de não perturbar.';
+	$text['description-2']['en-us'] = 'Use the links to configure call forward follow me, or do no disturb.';
+	$text['description-2']['pt-pt'] = 'Utilizar os links para definir as funcinalidades de encaminhamento de chamada, segue-me, ou de não perturbar.';
 
-    $text['description-3']['en-us'] = 'The following list the extensions that have been assigned to this user account.';
-    $text['description-3']['pt-pt'] = 'A tabela a seguir lista as extensões que foram atribuídas a esta conta de utilizador.';
+	$text['description-3']['en-us'] = 'The following list the extensions that have been assigned to this user account.';
+	$text['description-3']['pt-pt'] = 'A tabela a seguir lista as extensões que foram atribuídas a esta conta de utilizador.';
 
-    $text['label-call-forward']['en-us'] = 'Call Forward';
-    $text['label-call-forward']['pt-pt'] = 'Encaminhamento de Chamadas';
+	$text['label-call-forward']['en-us'] = 'Call Forward';
+	$text['label-call-forward']['pt-pt'] = 'Encaminhamento de Chamadas';
 
-    $text['label-enabled']['en-us'] = 'Enabled';
-    $text['label-enabled']['pt-pt'] = 'Activo';
+	$text['label-enabled']['en-us'] = 'Enabled';
+	$text['label-enabled']['pt-pt'] = 'Activo';
 
-    $text['label-enable']['en-us'] = 'Enable';
-    $text['label-enable']['pt-pt'] = 'Activar';
+	$text['label-enable']['en-us'] = 'Enable';
+	$text['label-enable']['pt-pt'] = 'Activar';
 
-    $text['label-disabled']['en-us'] = 'Disabled';
-    $text['label-disabled']['pt-pt'] = 'Desactivo';
+	$text['label-disabled']['en-us'] = 'Disabled';
+	$text['label-disabled']['pt-pt'] = 'Desactivo';
 
-    $text['label-disable']['en-us'] = 'Disabled';
-    $text['label-disable']['pt-pt'] = 'Desactivar';
+	$text['label-number']['en-us'] = 'Number';
+	$text['label-number']['pt-pt'] = 'Número';
 
-    $text['label-number']['en-us'] = 'Number';
-    $text['label-number']['pt-pt'] = 'Número';
+	$text['label-follow-me']['en-us'] = 'Follow Me';
+	$text['label-follow-me']['pt-pt'] = 'Segue-me';
 
-    $text['label-follow-me']['en-us'] = 'Follow Me';
-    $text['label-follow-me']['pt-pt'] = 'Segue-me';
+	$text['label-ring-1']['en-us'] = 'Ring 1st Number';
+	$text['label-ring-1']['pt-pt'] = '1º Número a Tocar';
 
-    $text['label-ring-1']['en-us'] = 'Ring 1st Number';
-    $text['label-ring-1']['pt-pt'] = '1º Número a Tocar';
+	$text['label-ring-2']['en-us'] = 'Ring 2nd Number';
+	$text['label-ring-2']['pt-pt'] = '2º Número a Tocar';
 
-    $text['label-ring-2']['en-us'] = 'Ring 2nd Number';
-    $text['label-ring-2']['pt-pt'] = '2º Número a Tocar';
+	$text['label-ring-3']['en-us'] = 'Ring 3rd Number';
+	$text['label-ring-3']['pt-pt'] = '3º Número a Tocar';
 
-    $text['label-ring-3']['en-us'] = 'Ring 3rd Number';
-    $text['label-ring-3']['pt-pt'] = '3º Número a Tocar';
+	$text['label-ring-4']['en-us'] = 'Ring 4th Number';
+	$text['label-ring-4']['pt-pt'] = '4º Número a Tocar';
 
-    $text['label-ring-4']['en-us'] = 'Ring 4th Number';
-    $text['label-ring-4']['pt-pt'] = '4º Número a Tocar';
+	$text['label-ring-5']['en-us'] = 'Ring 5th Number';
+	$text['label-ring-5']['pt-pt'] = '5º Número a Tocar';
 
-    $text['label-ring-5']['en-us'] = 'Ring 5th Number';
-    $text['label-ring-5']['pt-pt'] = '5º Número a Tocar';
+	$text['label-ring-order']['en-us'] = 'Ring Order';
+	$text['label-ring-order']['pt-pt'] = 'Pedir Chamada';
 
-    $text['label-ring-order']['en-us'] = 'Ring Order';
-    $text['label-ring-order']['pt-pt'] = 'Pedir Chamada';
+	$text['check-sequence']['en-us'] = 'sequence';
+	$text['ckeck-sequence']['pt-pt'] = 'sequêncial';
 
-    $text['check-sequence']['en-us'] = 'sequence';
-    $text['ckeck-sequence']['pt-pt'] = 'sequêncial';
+	$text['check-simultaneous']['en-us'] = 'simultaneous';
+	$text['ckeck-simultaneous']['pt-pt'] = 'simultâneo';
 
-    $text['check-simultaneous']['en-us'] = 'simultaneous';
-    $text['ckeck-simultaneous']['pt-pt'] = 'simultâneo';
+	$text['label-prompt']['en-us'] = 'Prompt to accept the call';
+	$text['label-prompt']['pt-pt'] = 'Perguntar para aceitar a chamada';
 
-    $text['label-prompt']['en-us'] = 'Prompt to accept the call';
-    $text['label-prompt']['pt-pt'] = 'Perguntar para aceitar a chamada';
+	$text['check-true']['en-us'] = 'true';
+	$text['ckeck-true']['pt-pt'] = 'verdadeiro';
 
-    $text['check-true']['en-us'] = 'true';
-    $text['ckeck-true']['pt-pt'] = 'verdadeiro';
+	$text['check-false']['en-us'] = 'false';
+	$text['ckeck-false']['pt-pt'] = 'falso';
 
-    $text['check-false']['en-us'] = 'false';
-    $text['ckeck-false']['pt-pt'] = 'falso';
+	$text['label-dnd']['en-us'] = 'Do Not Disturb';
+	$text['label-dnd']['pt-pt'] = 'Não Perturbar';
 
-    $text['label-dnd']['en-us'] = 'Do Not Disturb';
-    $text['label-dnd']['pt-pt'] = 'Não Perturbar';
+	$text['button-back']['en-us'] = 'Back';
+	$text['button-back']['pt-pt'] = 'Voltar';
 
-    $text['button-back']['en-us'] = 'Back';
-    $text['button-back']['pt-pt'] = 'Voltar';
+	$text['button-save']['en-us'] = 'Save';
+	$text['button-save']['pt-pt'] = 'Guardar';
 
-    $text['button-save']['en-us'] = 'Save';
-    $text['button-save']['pt-pt'] = 'Guardar';
+	$text['confirm-update']['en-us'] = 'Update Complete';
+	$text['confirm-update']['pt-pt'] = 'Actualização Completa';
 
-    $text['confirm-update']['en-us'] = 'Update Complete';
-    $text['confirm-update']['pt-pt'] = 'Actualização Completa';
+	$text['table-extension']['en-us'] = 'Extension';
+	$text['table-extension']['pt-pt'] = 'Extensão';
 
-    $text['table-extension']['en-us'] = 'Extension';
-    $text['table-extension']['pt-pt'] = 'Extensão';
+	$text['table-tools']['en-us'] = 'Tools';
+	$text['table-tools']['pt-pt'] = 'Ferramentas';
 
-    $text['table-tools']['en-us'] = 'Tools';
-    $text['table-tools']['pt-pt'] = 'Ferramentas';
-
-    $text['table-description']['en-us'] = 'Description';
-    $text['table-description']['pt-pt'] = 'Descrição';
+	$text['table-description']['en-us'] = 'Description';
+	$text['table-description']['pt-pt'] = 'Descrição';
 
 ?>
\ No newline at end of file
diff --git a/app/calls/v_calls.php b/app/calls/v_calls.php
index 506eab3be4..c39f8d55fe 100644
--- a/app/calls/v_calls.php
+++ b/app/calls/v_calls.php
@@ -35,15 +35,16 @@ else {
 }
 
 //get the https values and set as variables
-$order_by = check_str($_GET["order_by"]);
-$order = check_str($_GET["order"]); 
+	$order_by = check_str($_GET["order_by"]);
+	$order = check_str($_GET["order"]); 
 
 //add multi-lingual support
+	unset($text);
 	echo "<!--\n";
-	require_once "app_languages.php";
+	require_once "app/calls/app_languages.php";
 	echo "-->\n";
 	foreach($text as $key => $value) {
-		$text[$key] = $value[$_SESSION['domain']['language']['code']];                
+		$text[$key] = $value[$_SESSION['domain']['language']['code']];
 	}
 
 //begin the content
@@ -59,7 +60,7 @@ $order = check_str($_GET["order"]);
 		echo "		<table width=\"100%\" border=\"0\" cellpadding=\"6\" cellspacing=\"0\">\n";
 		echo "		<tr>\n";
 		echo "		<td align='left'><b>".$text['title']."</b><br>\n";
-		echo "			".$text['description2']."\n";
+		echo "			".$text['description-2']."\n";
 		echo "			".$text['description-3']." \n";
 		echo "		</td>\n";
 		echo "		</tr>\n";
@@ -154,15 +155,15 @@ $order = check_str($_GET["order"]);
 			echo "	<td valign='top' class='".$row_style[$c]."'>".$row['extension']."</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."'>\n";
 			if (permission_exists('call_forward')) {
-				echo "		<a href='".PROJECT_PATH."/app/calls/v_call_edit.php?id=".$row[extension_uuid]."&a=call_forward' alt='Call Forward'>".$text['label-call-forward']."</a> \n";
+				echo "		<a href='".PROJECT_PATH."/app/calls/v_call_edit.php?id=".$row['extension_uuid']."&a=call_forward' alt='Call Forward'>".$text['label-call-forward']."</a> \n";
 				echo "		&nbsp;&nbsp;\n";
 			}
 			if (permission_exists('follow_me')) {
-				echo "		<a href='".PROJECT_PATH."/app/calls/v_call_edit.php?id=".$row[extension_uuid]."&a=follow_me' alt='Follow Me'>".$text['label-follow-me']."</a> \n";
+				echo "		<a href='".PROJECT_PATH."/app/calls/v_call_edit.php?id=".$row['extension_uuid']."&a=follow_me' alt='Follow Me'>".$text['label-follow-me']."</a> \n";
 				echo "		&nbsp;&nbsp;\n";
 			}
 			if (permission_exists('do_not_disturb')) {
-				echo "		<a href='".PROJECT_PATH."/app/calls/v_call_edit.php?id=".$row[extension_uuid]."&a=do_not_disturb' alt='Do Not Disturb'>".$text['label-dnd']."</a> \n";
+				echo "		<a href='".PROJECT_PATH."/app/calls/v_call_edit.php?id=".$row['extension_uuid']."&a=do_not_disturb' alt='Do Not Disturb'>".$text['label-dnd']."</a> \n";
 			}
 			echo "	</td>\n";
 			echo "	<td valign='top' class='row_stylebg' width='40%'>".$row['description']."&nbsp;</td>\n";
@@ -196,4 +197,4 @@ $order = check_str($_GET["order"]);
 		require_once "includes/footer.php";
 	}
 
-?>
+?>
\ No newline at end of file