- recorded merge of revisions 733,805 via svnmerge from http://Dessa@svn.froxlor.org/branches/mgozdzik

- add a missing german language string
- set version to 0.9.5
- improve debian/postinst message a bit
This commit is contained in:
Robert Foerster (Dessa)
2010-04-19 13:32:24 +00:00
parent cc89f26982
commit d4f3093ae3
6 changed files with 157 additions and 78 deletions

View File

@@ -1347,7 +1347,7 @@ $lng['cron']['changewarning'] = 'Changing these values can have a negative cause
$lng['serversettings']['stdsubdomainhost']['title'] = 'Customer standard subdomain';
$lng['serversettings']['stdsubdomainhost']['description'] = 'What hostname should be used to create standard subdomains for customer. If empty, the system-hostname is used.';
// ADDED IN FROXLOR 0.9.4-1
// ADDED IN FROXLOR 0.9.4-svn1
$lng['ftp']['account_edit'] = 'Edit ftp account';
$lng['ftp']['editpassdescription'] = 'Set new password or leave blank for no change.';
$lng['mysql']['sendinfomail'] = 'Send data via email to me';