Merge branch 'master' of https://github.com/fusionpbx/fusionpbx

core/install/app_languages.php

@@ -1,15 +1,15 @@
 <?php
 
-$text['title-install_first_time']['en-us'] = "First Time Install";
-$text['title-install_first_time']['es-cl'] = "Instale Primera Vez";
-$text['title-install_first_time']['pt-pt'] = "Première installation";
-$text['title-install_first_time']['fr-fr'] = "Première installation";
-$text['title-install_first_time']['pt-br'] = "Première installation";
-$text['title-install_first_time']['pl'] = "Zainstalować";
-$text['title-install_first_time']['sv-se'] = "Första gången Installera";
-$text['title-install_first_time']['uk'] = "Перший раз Встановіть";
-$text['title-install_first_time']['de-at'] = "Erstinstallation";
-$text['title-install_first_time']['ar-eg'] = "للمرة الأولى قم بتثبيت";
+$text['title-install']['en-us'] = "Install";
+$text['title-install']['es-cl'] = "Instale";
+$text['title-install']['pt-pt'] = "Installation";
+$text['title-install']['fr-fr'] = "Installation";
+$text['title-install']['pt-br'] = "Installation";
+$text['title-install']['pl'] = "Zainstalować";
+$text['title-install']['sv-se'] = "Installera";
+$text['title-install']['uk'] = "Перший раз Встановіть";
+$text['title-install']['de-at'] = "Erstinstallation";
+$text['title-install']['ar-eg'] = "للمرة الأولى قم بتثبيت";
 
 $text['title-detected_configuration']['en-us'] = "Detected Configuration";
 $text['title-detected_configuration']['es-cl'] = "Configuración detectado";

core/install/resources/classes/detect_switch.php

@@ -135,14 +135,14 @@ require_once "resources/classes/EventSocket.php";
 					$this->$field = normalize_path($matches[2]);
 				}
 			}
-			$this->_voicemail_vdir = 	normalize_path($this->_storage_dir . DIRECTORY_SEPARATOR . "voicemail");
-			$this->_phrases_vdir = 		normalize_path($this->_conf_dir . DIRECTORY_SEPARATOR . "lang");
-			$this->_extensions_vdir = 	normalize_path($this->_conf_dir . DIRECTORY_SEPARATOR . "directory");
+			$this->_voicemail_vdir =	normalize_path($this->_storage_dir . DIRECTORY_SEPARATOR . "voicemail");
+			$this->_phrases_vdir =		normalize_path($this->_conf_dir . DIRECTORY_SEPARATOR . "lang");
+			$this->_extensions_vdir =	normalize_path($this->_conf_dir . DIRECTORY_SEPARATOR . "directory");
 			$this->_sip_profiles_vdir =	normalize_path($this->_conf_dir . DIRECTORY_SEPARATOR . "sip_profiles");
 			$this->_dialplan_vdir =		normalize_path($this->_conf_dir . DIRECTORY_SEPARATOR . "dialplan");
 			$this->_backup_vdir =		normalize_path(sys_get_temp_dir());
-		}	
-	
+		}
+
 		protected function connect_event_socket(){
 			$esl = new EventSocket;
 			if ($esl->connect($this->event_host, $this->event_port, $this->event_password)) {