Merge branch 'master' into intercept_load_balance

# Conflicts:
#	resources/install/scripts/intercept_group.lua

core/databases/app_defaults.php

@@ -131,6 +131,9 @@ if ($domains_processed == 1) {
 			if (strlen($_SESSION['switch']['sounds']['dir']) > 0) {
 				$tmp .= correct_path("	sounds_dir = [[".$_SESSION['switch']['sounds']['dir']."]];\n");
 			}
+			if (strlen($_SESSION['switch']['phrases']['dir']) > 0) {
+				$tmp .= correct_path("	phrases_dir = [[".$_SESSION['switch']['phrases']['dir']."]];\n");
+			}
 			if (strlen($_SESSION['switch']['db']['dir']) > 0) {
 				$tmp .= correct_path("	database_dir = [[".$_SESSION['switch']['db']['dir']."]];\n");
 			}

core/user_settings/app_languages.php

@@ -9,7 +9,7 @@ $text['title-user_dashboard']['pl'] = "Panel użytkowników";
 $text['title-user_dashboard']['he'] = "ממשק משתמש";
 $text['title-user_dashboard']['uk'] = "Панель користувача";
 $text['title-user_dashboard']['sv-se'] = "Användarpanel";
-$text['title-user_dashboard']['de-at'] = "Benutzer-Übersichtsseite";
+$text['title-user_dashboard']['de-at'] = "Benutzerübersicht";
 $text['title-user_dashboard']['ro'] = "Panou control utilizator";
 $text['title-user_dashboard']['fa'] = "";
 $text['title-user_dashboard']['ar-eg'] = "الصفحه الرئيسيه للمستخدم";
@@ -359,7 +359,7 @@ $text['label-followme']['pl'] = "Podążaj za mną";
 $text['label-followme']['he'] = "עקוב אחרי";
 $text['label-followme']['uk'] = "Follow Me";
 $text['label-followme']['sv-se'] = "Följ Mig";
-$text['label-followme']['de-at'] = "Follow Me";
+$text['label-followme']['de-at'] = "Anrufweiterschaltung";
 $text['label-followme']['ro'] = "Urmează-mă";
 $text['label-followme']['fa'] = "";
 $text['label-followme']['ar-eg'] = "خدمة اتبعني";
@@ -457,7 +457,7 @@ $text['label-callforward']['pl'] = "Przekierowanie rozmowy";
 $text['label-callforward']['he'] = "עקוב אחרי";
 $text['label-callforward']['uk'] = "Переадресація дзвінків";
 $text['label-callforward']['sv-se'] = "Vidarekoppling";
-$text['label-callforward']['de-at'] = "Anrufweiterleitung";
+$text['label-callforward']['de-at'] = "Rufumleitung";
 $text['label-callforward']['ro'] = "Redirecționare apel";
 $text['label-callforward']['fa'] = "";
 $text['label-callforward']['ar-eg'] = "تحويل المكالمات";
@@ -471,7 +471,7 @@ $text['header-user_dashboard']['pl'] = "Panel użytkowników";
 $text['header-user_dashboard']['he'] = "ממשק משתמש";
 $text['header-user_dashboard']['uk'] = "Панель користувача";
 $text['header-user_dashboard']['sv-se'] = "Användarpanel";
-$text['header-user_dashboard']['de-at'] = "Benutzer-Übersichtsseite";
+$text['header-user_dashboard']['de-at'] = "Benutzerübersicht";
 $text['header-user_dashboard']['ro'] = "Panou control utilizator";
 $text['header-user_dashboard']['fa'] = "";
 $text['header-user_dashboard']['ar-eg'] = "الصفحه الرئيسيه للمستخدم";

core/user_settings/app_menu.php

@@ -29,7 +29,7 @@ $apps[$x]['menu'][1]['title']['pl'] = "Panel użytkowników";
 $apps[$x]['menu'][1]['title']['he'] = "ממשק משתמש";
 $apps[$x]['menu'][1]['title']['uk'] = "Панель користувача";
 $apps[$x]['menu'][1]['title']['sv-se'] = "Användarpanel";
-$apps[$x]['menu'][1]['title']['de-at'] = "Benutzer-Übersichtsseite";
+$apps[$x]['menu'][1]['title']['de-at'] = "Benutzerübersicht";
 $apps[$x]['menu'][1]['title']['ro'] = "Panou control utilizator";
 $apps[$x]['menu'][1]['title']['ar-eg'] = "الصفحه الرئيسيه للمستخدم";
 $apps[$x]['menu'][1]['uuid'] = "92c8ffdb-3c82-4f08-aec0-82421ec41bb5";