diff --git a/app/devices/app_languages.php b/app/devices/app_languages.php
index 1e0e9ea264..63b83741f7 100644
--- a/app/devices/app_languages.php
+++ b/app/devices/app_languages.php
@@ -21,6 +21,48 @@ $text['title-devices']['ru-ru'] = "Устройства";
 $text['title-devices']['sv-se'] = "Enheter";
 $text['title-devices']['uk-ua'] = "Пристрої";
 
+$text['title-device_import']['en-us'] = "Device Import";
+$text['title-device_import']['ar-eg'] = "";
+$text['title-device_import']['de-at'] = "";
+$text['title-device_import']['de-ch'] = "";
+$text['title-device_import']['de-de'] = "";
+$text['title-device_import']['es-cl'] = "";
+$text['title-device_import']['es-mx'] = "";
+$text['title-device_import']['fr-ca'] = "";
+$text['title-device_import']['fr-fr'] = "";
+$text['title-device_import']['he-il'] = "";
+$text['title-device_import']['it-it'] = "";
+$text['title-device_import']['nl-nl'] = "";
+$text['title-device_import']['pl-pl'] = "";
+$text['title-device_import']['pt-br'] = "";
+$text['title-device_import']['pt-pt'] = "";
+$text['title-device_import']['ro-ro'] = "";
+$text['title-device_import']['ru-ru'] = "";
+$text['title-device_import']['sv-se'] = "";
+$text['title-device_import']['uk-ua'] = "";
+
+$text['title-device_export']['en-us'] = "Device Export";
+$text['title-device_export']['ar-eg'] = "";
+$text['title-device_export']['de-at'] = "Exportieren"; //copied from de-de
+$text['title-device_export']['de-ch'] = "Exportieren"; //copied from de-de
+$text['title-device_export']['de-de'] = "Exportieren";
+$text['title-device_export']['ek-gr'] = "Εξαγωγή";
+$text['title-device_export']['es-cl'] = "Exportar";
+$text['title-device_export']['es-mx'] = "Exportar"; //copied from es-cl
+$text['title-device_export']['fr-ca'] = "Exporter"; //copied from fr-fr
+$text['title-device_export']['fr-fr'] = "Exporter";
+$text['title-device_export']['he-il'] = "";
+$text['title-device_export']['it-it'] = "Esporta";
+$text['title-device_export']['nl-nl'] = "";
+$text['title-device_export']['pl-pl'] = "Eksportuj";
+$text['title-device_export']['pt-br'] = "Exportar";
+$text['title-device_export']['pt-pt'] = "Exportar";
+$text['title-device_export']['ro-ro'] = "";
+$text['title-device_export']['ru-ru'] = "Экспорт";
+$text['title-device_export']['sv-se'] = "Export";
+$text['title-device_export']['uk-ua'] = "Експортувати";
+$text['title-device_export']['tr-tr'] = "Dışa Aktar";
+
 $text['title-device_profiles']['en-us'] = "Profiles";
 $text['title-device_profiles']['ar-eg'] = "";
 $text['title-device_profiles']['de-at'] = "Profile"; //copied from de-de
@@ -4282,6 +4324,50 @@ $text['label-custom']['ru-ru'] = "";
 $text['label-custom']['sv-se'] = "";
 $text['label-custom']['uk-ua'] = "";
 
+$text['header-device_import']['en-us'] = "Device Import";
+$text['header-device_import']['ar-eg'] = "";
+$text['header-device_import']['de-at'] = "Importieren"; //copied from de-de
+$text['header-device_import']['de-ch'] = "Importieren"; //copied from de-de
+$text['header-device_import']['de-de'] = "Importieren";
+$text['header-device_import']['el-gr'] = "Εισαγωγή";
+$text['header-device_import']['es-cl'] = "Importar";
+$text['header-device_import']['es-mx'] = "Importar"; //copied from es-cl
+$text['header-device_import']['fr-ca'] = "Importer"; //copied from fr-fr
+$text['header-device_import']['fr-fr'] = "Importer";
+$text['header-device_import']['he-il'] = "";
+$text['header-device_import']['it-it'] = "";
+$text['header-device_import']['nl-nl'] = "";
+$text['header-device_import']['pl-pl'] = "Importuj";
+$text['header-device_import']['pt-br'] = "Importar";
+$text['header-device_import']['pt-pt'] = "Importat";
+$text['header-device_import']['ro-ro'] = "";
+$text['header-device_import']['ru-ru'] = "Импорт";
+$text['header-device_import']['sv-se'] = "Importera";
+$text['header-device_import']['uk-ua'] = "";
+$text['header-device_import']['tr-tr'] = "İçe Aktar";
+
+$text['header-device_export']['en-us'] = "Device Export";
+$text['header-device_export']['ar-eg'] = "";
+$text['header-device_export']['de-at'] = "Exportieren"; //copied from de-de
+$text['header-device_export']['de-ch'] = "Exportieren"; //copied from de-de
+$text['header-device_export']['de-de'] = "Exportieren";
+$text['header-device_export']['ek-gr'] = "Εξαγωγή";
+$text['header-device_export']['es-cl'] = "Exportar";
+$text['header-device_export']['es-mx'] = "Exportar"; //copied from es-cl
+$text['header-device_export']['fr-ca'] = "Exporter"; //copied from fr-fr
+$text['header-device_export']['fr-fr'] = "Exporter";
+$text['header-device_export']['he-il'] = "";
+$text['header-device_export']['it-it'] = "Esporta";
+$text['header-device_export']['nl-nl'] = "";
+$text['header-device_export']['pl-pl'] = "Eksportuj";
+$text['header-device_export']['pt-br'] = "Exportar";
+$text['header-device_export']['pt-pt'] = "Exportar";
+$text['header-device_export']['ro-ro'] = "";
+$text['header-device_export']['ru-ru'] = "Экспорт";
+$text['header-device_export']['sv-se'] = "Export";
+$text['header-device_export']['uk-ua'] = "Експортувати";
+$text['header-device_export']['tr-tr'] = "Dışa Aktar";
+
 $text['header-profiles']['en-us'] = "Profiles";
 $text['header-profiles']['ar-eg'] = "";
 $text['header-profiles']['de-at'] = "Profile"; //copied from de-de
diff --git a/app/devices/device_download.php b/app/devices/device_download.php
index 7d554c6a88..989b782fba 100644
--- a/app/devices/device_download.php
+++ b/app/devices/device_download.php
@@ -120,16 +120,18 @@
 	$row_style["1"] = "row_style1";
 
 //begin the page content
+	$document['title'] = $text['title-device_export'];
 	require_once "resources/header.php";
 
+	echo "<div style='float: right;'>\n";
+	echo "	<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='devices.php'\" value='".$text['button-back']."'>\n";
+	echo "</div>\n";
+
+	echo "<b>".$text['header-device_export']."</b>\n";
+	echo "<br /><br />\n";
+
 	echo "<form method='post' name='frm' action='device_download.php' autocomplete='off'>\n";
 	echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-	echo "<tr>\n";
-	echo "	<td valign='top' align='left' nowrap='nowrap'><b>".$text['header-export']."</b><br /></td>\n";
-	echo "	<td valign='top' align='right' colspan='2'>\n";
-	echo "		<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='devices.php'\" value='".$text['button-back']."'>\n";
-	echo "	</td>\n";
-	echo "	</tr>\n";
 	echo "	<th><input type=\"checkbox\" id=\"selectall\" onclick=\"checkbox_toggle();\"/></th>\n";
 	echo "	<th>Column Name</th>\n";
 	echo "	<th>Description</th>\n";
@@ -177,4 +179,4 @@
 //include the footer
 	require_once "resources/footer.php";
 
-?>
+?>
\ No newline at end of file
diff --git a/app/devices/device_imports.php b/app/devices/device_imports.php
index 893fcde7af..3b4b5b1327 100644
--- a/app/devices/device_imports.php
+++ b/app/devices/device_imports.php
@@ -55,7 +55,7 @@
 	}
 
 //set the max php execution time
-	ini_set(max_execution_time,7200);
+	ini_set('max_execution_time',7200);
 
 //get the http get values and set them as php variables
 	$action = check_str($_POST["action"]);
@@ -138,6 +138,7 @@
 	if (strlen($delimiter) > 0 && file_exists($_SESSION['file']) && $action != 'import') {
 
 		//form to match the fields to the column names
+			$document['title'] = $text['title-device_import'];
 			require_once "resources/header.php";
 
 			echo "<form action='device_imports.php' method='POST' enctype='multipart/form-data' name='frmUpload' onSubmit=''>\n";
@@ -238,6 +239,7 @@
 	if (file_exists($_SESSION['file']) && $action == 'import') {
 
 		//form to match the fields to the column names
+			//$document['title'] = $text['title-device_import'];
 			//require_once "resources/header.php";
 
 		//user selected fields
@@ -353,13 +355,14 @@
 	}
 
 //include the header
+	$document['title'] = $text['title-device_import'];
 	require_once "resources/header.php";
 
 //begin the content
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "	<tr>\n";
 	echo "	<td valign='top' align='left' width='30%' nowrap='nowrap'>\n";
-	echo "		<b>".$text['header-import']."</b><br />\n";
+	echo "		<b>".$text['header-device_import']."</b><br />\n";
 	echo "		".$text['description-import']."\n";
 	echo "	</td>\n";
 	echo "	<td valign='top' width='70%' align='right'>\n";
diff --git a/app/devices/device_profile_edit.php b/app/devices/device_profile_edit.php
index 2b7eee860e..094e9fdf11 100644
--- a/app/devices/device_profile_edit.php
+++ b/app/devices/device_profile_edit.php
@@ -309,6 +309,7 @@
 	$token = $object->create($_SERVER['PHP_SELF']);
 
 //show the header
+	$document['title'] = $text['title-device_profile'];
 	require_once "resources/header.php";
 
 //show the content
diff --git a/app/devices/device_profiles.php b/app/devices/device_profiles.php
index 05cc49e726..7826e58e44 100644
--- a/app/devices/device_profiles.php
+++ b/app/devices/device_profiles.php
@@ -126,6 +126,7 @@
 	$token = $object->create($_SERVER['PHP_SELF']);
 
 //include the header
+	$document['title'] = $text['title-device_profiles'];
 	require_once "resources/header.php";
 
 //show the content
diff --git a/app/devices/device_vendor_edit.php b/app/devices/device_vendor_edit.php
index 9544f582e2..1e5a24a72f 100644
--- a/app/devices/device_vendor_edit.php
+++ b/app/devices/device_vendor_edit.php
@@ -142,6 +142,7 @@
 	$token = $object->create($_SERVER['PHP_SELF']);
 
 //show the header
+	$document['title'] = $text['title-device_vendor'];
 	require_once "resources/header.php";
 
 //show the content
diff --git a/app/devices/device_vendors.php b/app/devices/device_vendors.php
index a19fc5e097..29f70925e3 100644
--- a/app/devices/device_vendors.php
+++ b/app/devices/device_vendors.php
@@ -114,6 +114,7 @@
 	$token = $object->create($_SERVER['PHP_SELF']);
 
 //include the header
+	$document['title'] = $text['title-device_vendors'];
 	require_once "resources/header.php";
 
 //show the content
diff --git a/app/devices/devices.php b/app/devices/devices.php
index 7a45a03ab3..adc48b40d2 100644
--- a/app/devices/devices.php
+++ b/app/devices/devices.php
@@ -208,6 +208,7 @@
 	$token = $object->create($_SERVER['PHP_SELF']);
 
 //include the header
+	$document['title'] = $text['title-devices'];
 	require_once "resources/header.php";
 
 //show the content