diff --git a/app/conferences/app_languages.php b/app/conferences/app_languages.php
index ce131b2ce6..4f451c876e 100644
--- a/app/conferences/app_languages.php
+++ b/app/conferences/app_languages.php
@@ -1,123 +1,123 @@
 <?php
 
-    //conferences
-    $content_conferences['title']['en-us'] = 'Conferences';
-    $content_conferences['title']['pt-pt'] = 'Conferências';
+	//conferences
+	$text['title']['en-us'] = 'Conferences';
+	$text['title']['pt-pt'] = 'Conferências';
 
-    $content_conferences['description']['en-us'] = 'Conferences is used to setup conference rooms with a name, description, and optional pin number.';
-    $content_conferences['description']['pt-pt'] = 'As conferências são utilizadas para configurar salas de conferências com um nome, descrição e número pin opcional.';
+	$text['description']['en-us'] = 'Conferences is used to setup conference rooms with a name, description, and optional pin number.';
+	$text['description']['pt-pt'] = 'As conferências são utilizadas para configurar salas de conferências com um nome, descrição e número pin opcional.';
 
-    $content_conferences['title2']['en-us'] = 'Active Conferences';
-    $content_conferences['title2']['pt-pt'] = 'Conferências Activas';
+	$text['title-2']['en-us'] = 'Active Conferences';
+	$text['title-2']['pt-pt'] = 'Conferências Activas';
 
-    $content_conferences['title3']['en-us'] = 'Active Conference';
-    $content_conferences['title3']['pt-pt'] = 'Conferência Activa';
+	$text['title-3']['en-us'] = 'Active Conference';
+	$text['title-3']['pt-pt'] = 'Conferência Activa';
 
-    $content_conferences['description2']['en-us'] = 'and then select a conference to monitor and interact with it.';
-    $content_conferences['description2']['pt-pt'] = 'e selecione uma conferência para monitorizar e interagir com ele.';
+	$text['description-2']['en-us'] = 'and then select a conference to monitor and interact with it.';
+	$text['description-2']['pt-pt'] = 'e selecione uma conferência para monitorizar e interagir com ele.';
 
-    $content_conferences['table-name']['en-us'] = 'Name';
-    $content_conferences['table-name']['pt-pt'] = 'Nome';
+	$text['table-name']['en-us'] = 'Name';
+	$text['table-name']['pt-pt'] = 'Nome';
 
-    $content_conferences['table-extension']['en-us'] = 'Extension';
-    $content_conferences['table-extension']['pt-pt'] = 'Extensão';
+	$text['table-extension']['en-us'] = 'Extension';
+	$text['table-extension']['pt-pt'] = 'Extensão';
 
-    $content_conferences['table-profile']['en-us'] = 'Profile';
-    $content_conferences['table-profile']['pt-pt'] = 'Perfil';
+	$text['table-profile']['en-us'] = 'Profile';
+	$text['table-profile']['pt-pt'] = 'Perfil';
 
-    $content_conferences['table-order']['en-us'] = 'Order';
-    $content_conferences['table-order']['pt-pt'] = 'Ordem';
+	$text['table-order']['en-us'] = 'Order';
+	$text['table-order']['pt-pt'] = 'Ordem';
 
-    $content_conferences['table-enabled']['en-us'] = 'Enabled';
-    $content_conferences['table-enabled']['pt-pt'] = 'Activo';
+	$text['table-enabled']['en-us'] = 'Enabled';
+	$text['table-enabled']['pt-pt'] = 'Activo';
 
-    $content_conferences['table-description']['en-us'] = 'Description';
-    $content_conferences['table-description']['pt-pt'] = 'Descrição';
+	$text['table-description']['en-us'] = 'Description';
+	$text['table-description']['pt-pt'] = 'Descrição';
 
-    //conferences_delete
-    $content_conferences['confirm-delete']['en-us'] = 'Delete Complete';
-    $content_conferences['confirm-delete']['pt-pt'] = 'Eliminação Completa';
+	//conferences_delete
+	$text['confirm-delete']['en-us'] = 'Delete Complete';
+	$text['confirm-delete']['pt-pt'] = 'Eliminação Completa';
 
-    //conferences_add
-    $content_conferences['confirm-add']['en-us'] = 'Add Complete';
-    $content_conferences['confirm-add']['pt-pt'] = 'Adição Completa';
+	//conferences_add
+	$text['confirm-add']['en-us'] = 'Add Complete';
+	$text['confirm-add']['pt-pt'] = 'Adição Completa';
 
-    $content_conferences['confirm-update']['en-us'] = 'Update Complete';
-    $content_conferences['confirm-update']['pt-pt'] = 'Actualização Completa';
+	$text['confirm-update']['en-us'] = 'Update Complete';
+	$text['confirm-update']['pt-pt'] = 'Actualização Completa';
 
-    $content_conferences['confirm-name']['en-us'] = 'Please provide: Name';
-    $content_conferences['confirm-name']['pt-pt'] = 'Por favor, forneça: Nome';
+	$text['confirm-name']['en-us'] = 'Please provide: Name';
+	$text['confirm-name']['pt-pt'] = 'Por favor, forneça: Nome';
 
-    $content_conferences['confirm-extension']['en-us'] = 'Please provide: Extension';
-    $content_conferences['confirm-extension']['pt-pt'] = 'Por favor, forneça: Extensão';
+	$text['confirm-extension']['en-us'] = 'Please provide: Extension';
+	$text['confirm-extension']['pt-pt'] = 'Por favor, forneça: Extensão';
 
-    $content_conferences['confirm-profile']['en-us'] = 'Please provide: Profile';
-    $content_conferences['confirm-profile']['pt-pt'] = 'Por favor, forneça: Perfil';
+	$text['confirm-profile']['en-us'] = 'Please provide: Profile';
+	$text['confirm-profile']['pt-pt'] = 'Por favor, forneça: Perfil';
 
-    $content_conferences['confirm-enabled']['en-us'] = 'Please provide: Enabled';
-    $content_conferences['confirm-enabled']['pt-pt'] = 'Por favor, forneça: Ativado';
+	$text['confirm-enabled']['en-us'] = 'Please provide: Enabled';
+	$text['confirm-enabled']['pt-pt'] = 'Por favor, forneça: Ativado';
 
-    $content_conferences['label-confadd']['en-us'] = 'Conferences Add';
-    $content_conferences['label-confadd']['pt-pt'] = 'Adição de Conferências';
+	$text['label-conference-add']['en-us'] = 'Conferences Add';
+	$text['label-conference-add']['pt-pt'] = 'Adição de Conferências';
 
-    $content_conferences['label-confedit']['en-us'] = 'Conferences Edit';
-    $content_conferences['label-confedit']['pt-pt'] = 'Edição de Conferências';
+	$text['label-conference-edit']['en-us'] = 'Conferences Edit';
+	$text['label-conference-edit']['pt-pt'] = 'Edição de Conferências';
 
-    $content_conferences['button-back']['en-us'] = 'Back';
-    $content_conferences['button-back']['pt-pt'] = 'Voltar';
+	$text['button-back']['en-us'] = 'Back';
+	$text['button-back']['pt-pt'] = 'Voltar';
 
-    $content_conferences['label-extension']['en-us'] = 'Extension';
-    $content_conferences['label-extension']['pt-pt'] = 'Extensão';
+	$text['label-extension']['en-us'] = 'Extension';
+	$text['label-extension']['pt-pt'] = 'Extensão';
 
-    $content_conferences['label-name']['en-us'] = 'Name';
-    $content_conferences['label-name']['pt-pt'] = 'Nome';
+	$text['label-name']['en-us'] = 'Name';
+	$text['label-name']['pt-pt'] = 'Nome';
 
-    $content_conferences['description-name']['en-us'] = 'Enter the conference name.';
-    $content_conferences['description-name']['pt-pt'] = 'Insira o nome da conferência.';
+	$text['description-name']['en-us'] = 'Enter the conference name.';
+	$text['description-name']['pt-pt'] = 'Insira o nome da conferência.';
 
-    $content_conferences['description-extension']['en-us'] = 'Enter the conference extension number.';
-    $content_conferences['description-extension']['pt-pt'] = 'Insira a extensão da conferência';
+	$text['description-extension']['en-us'] = 'Enter the conference extension number.';
+	$text['description-extension']['pt-pt'] = 'Insira a extensão da conferência';
 
-    $content_conferences['description3']['en-us'] = 'to monitor and interact with the conference room.';
-    $content_conferences['description3']['pt-pt'] = 'para monitorizar e interagir com a sala de conferências.';
+	$text['description-3']['en-us'] = 'to monitor and interact with the conference room.';
+	$text['description-3']['pt-pt'] = 'para monitorizar e interagir com a sala de conferências.';
 
-    $content_conferences['label-pin']['en-us'] = 'Pin Number';
-    $content_conferences['label-pin']['pt-pt'] = 'Numero Pin';
+	$text['label-pin']['en-us'] = 'Pin Number';
+	$text['label-pin']['pt-pt'] = 'Numero Pin';
 
-    $content_conferences['description-pin']['en-us'] = 'Optional pin number to secure access to the conference.';
-    $content_conferences['description-pin']['pt-pt'] = 'Número de pin opcional para garantir o acesso à conferência.';
+	$text['description-pin']['en-us'] = 'Optional pin number to secure access to the conference.';
+	$text['description-pin']['pt-pt'] = 'Número de pin opcional para garantir o acesso à conferência.';
 
-    $content_conferences['confirm-delete2']['en-us'] = 'Do you really want to delete this?';
-    $content_conferences['confirm-delete2']['pt-pt'] = 'Deseja realmente apagar isto?';
+	$text['confirm-delete-2']['en-us'] = 'Do you really want to delete this?';
+	$text['confirm-delete-2']['pt-pt'] = 'Deseja realmente apagar isto?';
 
-    $content_conferences['button-add']['en-us'] = 'Add';
-    $content_conferences['button-add']['pt-pt'] = 'Adicionar';
+	$text['button-add']['en-us'] = 'Add';
+	$text['button-add']['pt-pt'] = 'Adicionar';
 
-    $content_conferences['button-save']['en-us'] = 'Save';
-    $content_conferences['button-save']['pt-pt'] = 'Gravar';
+	$text['button-save']['en-us'] = 'Save';
+	$text['button-save']['pt-pt'] = 'Gravar';
 
-    $content_conferences['label-description']['en-us'] = 'Description';
-    $content_conferences['label-description']['pt-pt'] = 'Descrição';
+	$text['label-description']['en-us'] = 'Description';
+	$text['label-description']['pt-pt'] = 'Descrição';
 
-    $content_conferences['description-info']['en-us'] = 'Enter the description.';
-    $content_conferences['description-info']['pt-pt'] = 'Insira a descrição.';
+	$text['description-info']['en-us'] = 'Enter the description.';
+	$text['description-info']['pt-pt'] = 'Insira a descrição.';
 
-    $content_conferences['description-confenable']['en-us'] = 'Select whether to enable or disable the conference.';
-    $content_conferences['description-confenable']['pt-pt'] = 'Selecione se deseja ativar ou desativar a conferência.';
+	$text['description-conference-enable']['en-us'] = 'Select whether to enable or disable the conference.';
+	$text['description-conference-enable']['pt-pt'] = 'Selecione se deseja ativar ou desativar a conferência.';
 
-    $content_conferences['description-order']['en-us'] = 'Enter the order number.';
-    $content_conferences['description-order']['pt-pt'] = 'Digite o número do pedido.';
+	$text['description-order']['en-us'] = 'Enter the order number.';
+	$text['description-order']['pt-pt'] = 'Digite o número do pedido.';
 
-    $content_conferences['label-order']['en-us'] = 'Order';
-    $content_conferences['label-order']['pt-pt'] = 'Pedido';
+	$text['label-order']['en-us'] = 'Order';
+	$text['label-order']['pt-pt'] = 'Pedido';
 
-    $content_conferences['description-useradd']['en-us'] = 'Assign the users that are can manage this conference extension.';
-    $content_conferences['description-useradd']['pt-pt'] = 'Atribuir os utilizadores que podem gerir esta extensão de conferência.';
+	$text['description-user-add']['en-us'] = 'Assign the users that are can manage this conference extension.';
+	$text['description-user-add']['pt-pt'] = 'Atribuir os utilizadores que podem gerir esta extensão de conferência.';
 
-    $content_conferences['description-profile']['en-us'] = 'Conference Profile is a collection of settings for the conference.';
-    $content_conferences['description-profile']['pt-pt'] = 'Perfil de conferência é um conjunto de definições para a conferência.';
+	$text['description-profile']['en-us'] = 'Conference Profile is a collection of settings for the conference.';
+	$text['description-profile']['pt-pt'] = 'Perfil de conferência é um conjunto de definições para a conferência.';
 
-    $content_conferences['description-flags']['en-us'] = 'Optional conference flags. examples: mute|deaf|waste|moderator';
-    $content_conferences['description-flags']['pt-pt'] = 'Flags opcionais de conferências. exemplos: mute|deaf|waste|moderator';
+	$text['description-flags']['en-us'] = 'Optional conference flags. examples: mute|deaf|waste|moderator';
+	$text['description-flags']['pt-pt'] = 'Flags opcionais de conferências. exemplos: mute|deaf|waste|moderator';
 
 ?>
\ No newline at end of file
diff --git a/app/conferences/conference_delete.php b/app/conferences/conference_delete.php
index 5bb6cf7c16..f67530a044 100644
--- a/app/conferences/conference_delete.php
+++ b/app/conferences/conference_delete.php
@@ -26,7 +26,6 @@
 require_once "root.php";
 require_once "includes/require.php";
 require_once "includes/checkauth.php";
-include "app_languages.php";
 if (permission_exists('conference_delete')) {
 	//access granted
 }
@@ -35,8 +34,10 @@ else {
 	exit;
 }
 
-        foreach($content_conferences as $key => $value) {
-		$content_conferences[$key] = $value[$_SESSION['domain']['language']['code']];                
+//add multi-lingual support
+	require_once "app/calls/app_languages.php";
+	foreach($text as $key => $value) {
+		$text[$key] = $value[$_SESSION['domain']['language']['code']];                
 	}
 
 if (count($_GET)>0) {
@@ -88,7 +89,7 @@ if (strlen($id)>0) {
 	require_once "includes/header.php";
 	echo "<meta http-equiv=\"refresh\" content=\"2;url=conferences.php\">\n";
 	echo "<div align='center'>\n";
-	echo "".$content_conferences['confirm-delete']."\n";
+	echo "".$text['confirm-delete']."\n";
 	echo "</div>\n";
 	require_once "includes/footer.php";
 	return;
diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php
index 3f9a450214..1e588d128a 100644
--- a/app/conferences/conference_edit.php
+++ b/app/conferences/conference_edit.php
@@ -26,7 +26,6 @@
 require_once "root.php";
 require_once "includes/require.php";
 require_once "includes/checkauth.php";
-include "app_languages.php";
 if (permission_exists('conference_add') || permission_exists('conference_edit')) {
 	//access granted
 }
@@ -35,8 +34,10 @@ else {
 	exit;
 }
 
-        foreach($content_conferences as $key => $value) {
-		$content_conferences[$key] = $value[$_SESSION['domain']['language']['code']];                
+//add multi-lingual support
+	require_once "app/calls/app_languages.php";
+	foreach($text as $key => $value) {
+		$text[$key] = $value[$_SESSION['domain']['language']['code']];                
 	}
 
 //action add or update
@@ -79,7 +80,7 @@ else {
 		//redirect the browser
 			require_once "includes/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=conferences_edit.php?id=$conference_uuid\">\n";
-			echo "<div align='center'>".$content_conferences['confirm-delete']."</div>";
+			echo "<div align='center'>".$text['confirm-delete']."</div>";
 			require_once "includes/footer.php";
 			return;
 	}
@@ -108,7 +109,7 @@ else {
 		//redirect the browser
 			require_once "includes/header.php";
 			echo "<meta http-equiv=\"refresh\" content=\"2;url=conferences_edit.php?id=$conference_uuid\">\n";
-			echo "<div align='center'>".$content_conferences['confirm-add']."</div>";
+			echo "<div align='center'>".$text['confirm-add']."</div>";
 			require_once "includes/footer.php";
 			return;
 	}
@@ -122,14 +123,14 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 	//check for all required data
 		//if (strlen($dialplan_uuid) == 0) { $msg .= "Please provide: Dialplan UUID<br>\n"; }
-		if (strlen($conference_name) == 0) { $msg .= "".$content_conferences['confirm-name']."<br>\n"; }
-		if (strlen($conference_extension) == 0) { $msg .= "".$content_conferences['confirm-extension']."<br>\n"; }
+		if (strlen($conference_name) == 0) { $msg .= "".$text['confirm-name']."<br>\n"; }
+		if (strlen($conference_extension) == 0) { $msg .= "".$text['confirm-extension']."<br>\n"; }
 		//if (strlen($conference_pin_number) == 0) { $msg .= "Please provide: Pin Number<br>\n"; }
-		if (strlen($conference_profile) == 0) { $msg .= "".$content_conferences['confirm-profile']."<br>\n"; }
+		if (strlen($conference_profile) == 0) { $msg .= "".$text['confirm-profile']."<br>\n"; }
 		//if (strlen($conference_flags) == 0) { $msg .= "Please provide: Flags<br>\n"; }
 		//if (strlen($conference_order) == 0) { $msg .= "Please provide: Order<br>\n"; }
 		//if (strlen($conference_description) == 0) { $msg .= "Please provide: Description<br>\n"; }
-		if (strlen($conference_enabled) == 0) { $msg .= "".$content_conferences['confirm-enabled']."<br>\n"; }
+		if (strlen($conference_enabled) == 0) { $msg .= "".$text['confirm-enabled']."<br>\n"; }
 		if (strlen($msg) > 0 && strlen($_POST["persistformvar"]) == 0) {
 			require_once "includes/header.php";
 			require_once "includes/persistformvar.php";
@@ -226,7 +227,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					require_once "includes/header.php";
 					echo "<meta http-equiv=\"refresh\" content=\"2;url=conferences.php\">\n";
 					echo "<div align='center'>\n";
-					echo "".$content_conferences['confirm-add']."\n";
+					echo "".$text['confirm-add']."\n";
 					echo "</div>\n";
 					require_once "includes/footer.php";
 					return;
@@ -294,7 +295,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					require_once "includes/header.php";
 					echo "<meta http-equiv=\"refresh\" content=\"2;url=conferences.php\">\n";
 					echo "<div align='center'>\n";
-					echo "".$content_conferences['confirm-update']."\n";
+					echo "".$text['confirm-update']."\n";
 					echo "</div>\n";
 					require_once "includes/footer.php";
 					return;
@@ -344,51 +345,51 @@ 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='nowrap'><b>".$content_conferences['label-confadd']."</b></td>\n";
+		echo "<td align='left' width='30%' nowrap='nowrap'><b>".$text['label-conference-add']."</b></td>\n";
 	}
 	if ($action == "update") {
-		echo "<td align='left' width='30%' nowrap='nowrap'><b>".$content_conferences['label-confedit']."</b></td>\n";
+		echo "<td align='left' width='30%' nowrap='nowrap'><b>".$text['label-conference-edit']."</b></td>\n";
 	}
-	echo "<td width='70%' align='right'><input type='button' class='btn' name='' alt='back' onclick=\"window.location='conferences.php'\" value='".$content_conferences['button-back']."'></td>\n";
+	echo "<td width='70%' align='right'><input type='button' class='btn' name='' alt='back' onclick=\"window.location='conferences.php'\" value='".$text['button-back']."'></td>\n";
 	echo "</tr>\n";
 	echo "<tr>\n";
 	echo "<td align='left' colspan='2'>\n";
-	echo "".$content_conferences['description']." \n";
-	echo "Click on <a href='".PROJECT_PATH."/app/conferences_active/conference_interactive.php?c=".str_replace(" ", "-", $conference_name)."'>".$content_conferences['title3']."</a> \n";
-	echo "".$content_conferences['description3']."<br /><br />\n";
+	echo "".$text['description']." \n";
+	echo "Click on <a href='".PROJECT_PATH."/app/conferences_active/conference_interactive.php?c=".str_replace(" ", "-", $conference_name)."'>".$text['title-3']."</a> \n";
+	echo "".$text['description-3']."<br /><br />\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$content_conferences['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='conference_name' maxlength='255' value=\"$conference_name\">\n";
 	echo "<br />\n";
-	echo "".$content_conferences['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='nowrap'>\n";
-	echo "	".$content_conferences['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='conference_extension' maxlength='255' value=\"$conference_extension\">\n";
 	echo "<br />\n";
-	echo "".$content_conferences['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='nowrap'>\n";
-	echo "	".$content_conferences['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='conference_pin_number' maxlength='255' value=\"$conference_pin_number\">\n";
 	echo "<br />\n";
-	echo "".$content_conferences['description-pin']."\n";
+	echo "".$text['description-pin']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
@@ -412,7 +413,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='conferences_edit.php?id=".$conference_uuid."&domain_uuid=".$_SESSION['domain_uuid']."&user_uuid=".$field['user_uuid']."&a=delete' alt='delete' onclick=\"return confirm('".$content_conferences['confirm-delete2']."')\">$v_link_label_delete</a>\n";
+				echo "					<a href='conferences_edit.php?id=".$conference_uuid."&domain_uuid=".$_SESSION['domain_uuid']."&user_uuid=".$field['user_uuid']."&a=delete' alt='delete' onclick=\"return confirm('".$text['confirm-delete-2']."')\">$v_link_label_delete</a>\n";
 				echo "				</td>\n";
 				echo "			</tr>\n";
 			}
@@ -431,10 +432,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_conferences['button-add']."\">\n";
+			echo "			<input type=\"submit\" class='btn' value=\"".$text['button-add']."\">\n";
 			unset($sql, $result);
 			echo "			<br>\n";
-			echo "			".$content_conferences['description-useradd']."\n";
+			echo "			".$text['description-user-add']."\n";
 			echo "			<br />\n";
 			echo "		</td>";
 			echo "	</tr>";
@@ -443,7 +444,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 	echo "<tr>\n";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$content_conferences['table-profile'].":\n";
+	echo "	".$text['table-profile'].":\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "    <select class='formfld' name='conference_profile'>\n";
@@ -455,7 +456,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	if ($conference_profile == "cdquality") { echo "<option value='cdquality' selected='selected'>cdquality</option>\n"; } else {	echo "<option value='cdquality'>cdquality</option>\n"; }
 	echo "    </select>\n";
 	echo "<br />\n";
-	echo "".$content_conferences['description-profile']."\n";
+	echo "".$text['description-profile']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
@@ -466,13 +467,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='conference_flags' maxlength='255' value=\"$conference_flags\">\n";
 	echo "<br />\n";
-	echo "".$content_conferences['description-flags']."\n";
+	echo "".$text['description-flags']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$content_conferences['label-order'].":\n";
+	echo "	".$text['label-order'].":\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "              <select name='conference_order' class='formfld'>\n";
@@ -488,13 +489,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 	echo "              </select>\n";
 	echo "<br />\n";
-	echo "".$content_conferences['description-order']."\n";
+	echo "".$text['description-order']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$content_conferences['table-enabled'].":\n";
+	echo "	".$text['table-enabled'].":\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<select class='formfld' name='conference_enabled'>\n";
@@ -513,18 +514,18 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	}
 	echo "	</select>\n";
 	echo "<br />\n";
-	echo "".$content_conferences['description-confenable']."\n";
+	echo "".$text['description-conference-enable']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$content_conferences['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='conference_description' maxlength='255' value=\"$conference_description\">\n";
 	echo "<br />\n";
-	echo "".$content_conferences['description-info']."\n";
+	echo "".$text['description-info']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
@@ -534,7 +535,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "				<input type='hidden' name='dialplan_uuid' value=\"$dialplan_uuid\">\n";
 		echo "				<input type='hidden' name='conference_uuid' value='$conference_uuid'>\n";
 	}
-	echo "				<input type='submit' name='submit' class='btn' value='".$content_conferences['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/conferences/conferences.php b/app/conferences/conferences.php
index 6f61e4646d..b91ee336b0 100644
--- a/app/conferences/conferences.php
+++ b/app/conferences/conferences.php
@@ -26,7 +26,6 @@
 require_once "root.php";
 require_once "includes/require.php";
 require_once "includes/checkauth.php";
-include "app_languages.php";
 if (permission_exists('conference_view')) {
 	//access granted
 }
@@ -35,8 +34,10 @@ else {
 	exit;
 }
 
-        foreach($content_conferences as $key => $value) {
-		$content_conferences[$key] = $value[$_SESSION['domain']['language']['code']];                
+//add multi-lingual support
+	require_once "app/calls/app_languages.php";
+	foreach($text as $key => $value) {
+		$text[$key] = $value[$_SESSION['domain']['language']['code']];                
 	}
     
 require_once "includes/header.php";
@@ -55,14 +56,14 @@ require_once "includes/paging.php";
 
 	echo "<table width='100%' border='0'>\n";
 	echo "	<tr>\n";
-	echo "		<td align='left' width='50%' nowrap><b>".$content_conferences['title']."</b></td>\n";
+	echo "		<td align='left' width='50%' nowrap><b>".$text['title']."</b></td>\n";
 	echo "		<td width='50%' align='right'>&nbsp;</td>\n";
 	echo "	</tr>\n";
 	echo "	<tr>\n";
 	echo "		<td align='left' colspan='2'>\n";
-	echo "			".$content_conferences['description']." \n";
+	echo "			".$text['description']." \n";
 	if (permission_exists('conferences_active_advanced_view')) {
-		echo "			Show <a href='".PROJECT_PATH."/app/conferences_active/v_conferences_active.php'>".$content_conferences['title2']."</a> ".$content_conferences['description2']."<br /><br />\n";
+		echo "			Show <a href='".PROJECT_PATH."/app/conferences_active/v_conferences_active.php'>".$text['title-2']."</a> ".$text['description-2']."<br /><br />\n";
 	}
 	echo "		</td>\n";
 	echo "	</tr>\n";
@@ -130,13 +131,13 @@ 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('conference_name', $content_conferences['table-name'], $order_by, $order);
-	echo th_order_by('conference_extension', $content_conferences['table-extension'], $order_by, $order);
-	echo th_order_by('conference_profile', $content_conferences['table-profile'], $order_by, $order);
+	echo th_order_by('conference_name', $text['table-name'], $order_by, $order);
+	echo th_order_by('conference_extension', $text['table-extension'], $order_by, $order);
+	echo th_order_by('conference_profile', $text['table-profile'], $order_by, $order);
 	//echo th_order_by('conference_flags', 'Flags', $order_by, $order);
-	echo th_order_by('conference_order', $content_conferences['table-order'], $order_by, $order);
-	echo th_order_by('conference_enabled', $content_conferences['table-enabled'], $order_by, $order);
-	echo th_order_by('conference_description', $content_conferences['table-description'], $order_by, $order);
+	echo th_order_by('conference_order', $text['table-order'], $order_by, $order);
+	echo th_order_by('conference_enabled', $text['table-enabled'], $order_by, $order);
+	echo th_order_by('conference_description', $text['table-description'], $order_by, $order);
 	echo "<td align='right' width='42'>\n";
 	if (permission_exists('conference_add')) {
 		echo "	<a href='conference_edit.php' alt='add'>$v_link_label_add</a>\n";