- recorded merge of revisions 737-1483 via svnmerge from http://Dessa@svn.froxlor.org/branches/philderbeast

- fixes #103
This commit is contained in:
Robert Foerster (Dessa)
2010-11-26 12:30:54 +00:00
parent 01404187cc
commit 6066601568
24 changed files with 2593 additions and 1301 deletions

View File

@@ -1515,4 +1515,8 @@ $lng['serversettings']['login_domain_login'] = 'Allow login with domains';
$lng['panel']['unlock'] = 'unlock';
$lng['question']['customer_reallyunlock'] = 'Do you really want to unlock customer %s?';
?>
//ADDED IN FROXLOR NGINX BRANCH
$lng['serversettings']['perl_server']['title'] = 'Perl server location';
$lng['serversettings']['perl_server']['description'] = 'This is only used for Nginx<br />defaultis set for using the guide found at: http://wiki.nginx.org/SimpleCGI';
?>