diff --git a/actions/admin/settings/100.panel.php b/actions/admin/settings/100.panel.php index faf5364472..ffbb9f4fc0 100644 --- a/actions/admin/settings/100.panel.php +++ b/actions/admin/settings/100.panel.php @@ -45,7 +45,7 @@ 'settinggroup' => 'panel', 'varname' => 'default_theme', 'type' => 'option', - 'default' => 'Froxlor', + 'default' => 'Sparkle', 'option_mode' => 'one', 'option_options_method' => array( '\\Froxlor\\UI\\Template', diff --git a/lng/english.lng.php b/lng/english.lng.php index 223064f3e9..beb260310b 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -839,7 +839,8 @@ $lng['panel']['view'] = 'view'; $lng['question']['phpsetting_reallydelete'] = 'Do you really want to delete these settings? All domains which use these settings currently will be changed to the default config.'; $lng['question']['fpmsetting_reallydelete'] = 'Do you really want to delete these php-fpm settings? All php configurations which use these settings currently will be changed to the default config.'; -$lng['admin']['phpsettings']['addnew'] = 'Create new settings'; +$lng['admin']['phpsettings']['addnew'] = 'Create new PHP configuration'; +$lng['admin']['fpmsettings']['addnew'] = 'Create new PHP version'; $lng['error']['phpsettingidwrong'] = 'A PHP Configuration with this id doesn\'t exist'; $lng['error']['descriptioninvalid'] = 'The description is too short, too long or contains illegal characters.'; $lng['error']['info'] = 'Info'; diff --git a/lng/german.lng.php b/lng/german.lng.php index 9587d6e2f9..dde344d59d 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -832,7 +832,8 @@ $lng['panel']['view'] = 'ansehen'; $lng['question']['phpsetting_reallydelete'] = 'Wollen Sie diese PHP-Einstellungen wirklich löschen? Alle Domains die diese Einstellungen bis jetzt verwendet haben, werden dann auf die Standardeinstellungen umgestellt.'; $lng['question']['fpmsetting_reallydelete'] = 'Wollen Sie diese PHP-FPM Einstellungen wirklich löschen? Alle PHP Konfigurationen die diese Einstellungen bis jetzt verwendet haben, werden dann auf die Standardeinstellungen umgestellt.'; -$lng['admin']['phpsettings']['addnew'] = 'Neue Konfiguration erstellen'; +$lng['admin']['phpsettings']['addnew'] = 'Neue PHP Konfiguration erstellen'; +$lng['admin']['fpmsettings']['addnew'] = 'Neue PHP Version erstellen'; $lng['error']['phpsettingidwrong'] = 'Eine PHP-Konfiguration mit dieser ID existiert nicht'; $lng['error']['descriptioninvalid'] = 'Der Beschreibungstext ist zu kurz, zu lang oder enthält ungültige Zeichen'; $lng['error']['info'] = 'Info'; diff --git a/templates/Sparkle/admin/phpconfig/fpmdaemons.tpl b/templates/Sparkle/admin/phpconfig/fpmdaemons.tpl index 693a89d75a..2bb01e1069 100644 --- a/templates/Sparkle/admin/phpconfig/fpmdaemons.tpl +++ b/templates/Sparkle/admin/phpconfig/fpmdaemons.tpl @@ -11,7 +11,7 @@ $header