From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/admin/lib/lang/de_tpl_default_admin.lng |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/interface/web/admin/lib/lang/de_tpl_default_admin.lng b/interface/web/admin/lib/lang/de_tpl_default_admin.lng
index 22c7839..9767400 100644
--- a/interface/web/admin/lib/lang/de_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/de_tpl_default_admin.lng
@@ -6,13 +6,13 @@
 $wb['name_txt'] = 'PHP Name';
 $wb['Name'] = 'Name';
 $wb['FastCGI Settings'] = 'FastCGI Einstellungen';
-$wb['PHP-FPM Settings'] = 'PHP FPM Einstellungen';
+$wb['PHP-FPM Settings'] = 'PHP-FPM Einstellungen';
 $wb['Additional PHP Versions'] = 'Zusätzliche PHP Versionen';
 $wb['Form to edit additional PHP versions'] = 'Formular, um zusätzliche PHP Versionen hinzuzufügen';
 $wb['server_php_name_error_empty'] = 'Das Name Feld darf nicht leer sein.';
 $wb['php_fastcgi_binary_txt'] = 'Pfad zum PHP FastCGI Binary';
 $wb['php_fastcgi_ini_dir_txt'] = 'Pfad zum php.ini Verzeichnis';
-$wb['php_fpm_init_script_txt'] = 'Pfad zum PHP FPM Init Script';
+$wb['php_fpm_init_script_txt'] = 'Pfad zum PHP-FPM Init Script';
 $wb['php_fpm_ini_dir_txt'] = 'Pfad zum php.ini Verzeichnis';
-$wb['php_fpm_pool_dir_txt'] = 'Pfad zum PHP FPM Pool Verzeichnis';
+$wb['php_fpm_pool_dir_txt'] = 'Pfad zum PHP-FPM Pool Verzeichnis';
 ?>

--
Gitblit v1.9.1