From 7a493fad80d3f370c10221a572073ea811680d99 Mon Sep 17 00:00:00 2001 From: "Robert Foerster (Dessa)" Date: Mon, 17 May 2010 09:14:30 +0000 Subject: [PATCH] - remove empty apache2 dir from the templates - actually include lucid in the templates (do'h) - reworded comments in dovecot configs and fix a typo - recorded merge of revision 898 via svnmerge from http://Dessa@svn.froxlor.org/branches/mgozdzik --- lib/configfiles_index.inc.php | 2 +- lng/polish.lng.php | 30 ++++++++++++++----- .../dovecot/etc_dovecot_dovecot.conf | 6 ++-- .../dovecot/etc_dovecot_dovecot.conf | 6 ++-- .../gentoo/dovecot/etc_dovecot_dovecot.conf | 6 ++-- 5 files changed, 32 insertions(+), 18 deletions(-) diff --git a/lib/configfiles_index.inc.php b/lib/configfiles_index.inc.php index 0c89a73f..0ee95b15 100644 --- a/lib/configfiles_index.inc.php +++ b/lib/configfiles_index.inc.php @@ -45,6 +45,6 @@ else $cfgPath = 'lib/configfiles/'; $configfiles = Array(); -$configfiles = array_merge(include $cfgPath . 'lenny.inc.php', include $cfgPath . 'etch.inc.php', include $cfgPath . 'hardy.inc.php', include $cfgPath . 'gentoo.inc.php', include $cfgPath . 'suse10.inc.php', include $cfgPath . 'freebsd.inc.php'); +$configfiles = array_merge(include $cfgPath . 'lenny.inc.php', include $cfgPath . 'etch.inc.php', include $cfgPath . 'hardy.inc.php', include $cfgPath . 'gentoo.inc.php', include $cfgPath . 'suse10.inc.php', include $cfgPath . 'freebsd.inc.php', include $cfgPath . 'lucid.inc.php'); ?> \ No newline at end of file diff --git a/lng/polish.lng.php b/lng/polish.lng.php index 1ca745ca..54d57731 100644 --- a/lng/polish.lng.php +++ b/lng/polish.lng.php @@ -344,12 +344,12 @@ $lng['serversettings']['ipaddress']['title'] = 'Adres IP'; $lng['serversettings']['ipaddress']['description'] = 'Jaki jest adres IP tego serwera?'; $lng['serversettings']['hostname']['title'] = 'Hostname'; $lng['serversettings']['hostname']['description'] = 'Jaki jest Hostname serwera?'; -$lng['serversettings']['apachereload_command']['title'] = 'Apache reload command'; -$lng['serversettings']['apachereload_command']['description'] = 'What\'s the apache command to reload apache configfiles?'; -$lng['serversettings']['bindconf_directory']['title'] = 'Bind config directory'; -$lng['serversettings']['bindconf_directory']['description'] = 'Where should bind configfiles be saved?'; -$lng['serversettings']['bindreload_command']['title'] = 'Bind reload command'; -$lng['serversettings']['bindreload_command']['description'] = 'What\'s the bind command to reload bind configfiles?'; +$lng['serversettings']['apachereload_command']['title'] = 'Komenda przeładowania Apache'; +$lng['serversettings']['apachereload_command']['description'] = 'Jaka jest komenda, do przeładowania plików konfiguracyjnych Apacha?'; +$lng['serversettings']['bindconf_directory']['title'] = 'Katalog z konfiguracją Bunda'; +$lng['serversettings']['bindconf_directory']['description'] = 'Gdzie maja być zapisywane pliki konfiguracyjne dla Binda?'; +$lng['serversettings']['bindreload_command']['title'] = 'Komenda przeładowania Binda'; +$lng['serversettings']['bindreload_command']['description'] = 'Jaka jest komenda, do przeładowania plików konfiguracyjnych Binda?'; $lng['serversettings']['binddefaultzone']['title'] = 'Bind default zone'; $lng['serversettings']['binddefaultzone']['description'] = 'What\'s the name of the default zone?'; $lng['serversettings']['vmail_uid']['title'] = 'Mails-UID'; @@ -367,7 +367,7 @@ $lng['serversettings']['webmail_url']['description'] = 'Jaki jest adres URL do W $lng['serversettings']['webftp_url']['title'] = 'URL do WebFTPa'; $lng['serversettings']['webftp_url']['description'] = 'Jaki jest adres URL do WebFTPa? (Musi się rozpoczynać do http(s)://)'; $lng['serversettings']['language']['description'] = 'Jaki jest standardowy język serwera?'; -$lng['serversettings']['maxloginattempts']['title'] = 'Max Login Attempts'; +$lng['serversettings']['maxloginattempts']['title'] = 'Maksymalna ilość prób logowania'; $lng['serversettings']['maxloginattempts']['description'] = 'Maximum login attempts after which the account gets deactivated.'; $lng['serversettings']['deactivatetime']['title'] = 'Czas zablokowania'; $lng['serversettings']['deactivatetime']['description'] = 'Czas (sek.) zablokowania dostępu do konta po nieudanym logowaniu.'; @@ -710,7 +710,7 @@ $lng['serversettings']['mod_fcgid']['tmpdir'] = 'Katalog plik $lng['serversettings']['ticket']['reset_cycle'] = 'Okresowe reset licznika użycia zgłoszeń pomocy technicznej'; $lng['serversettings']['ticket']['reset_cycle_desc'] = 'Resetowanie zgłoszeń pomocy technicznej powoduje ustawienie licznika na wartość 0 przy każdym cyklu'; $lng['admin']['tickets']['daily'] = 'Dziennie'; -$lng['admin']['tickets']['weekly'] = 'Wygodniowo'; +$lng['admin']['tickets']['weekly'] = 'Tygodniowo'; $lng['admin']['tickets']['monthly'] = 'Miesięcznie'; $lng['admin']['tickets']['yearly'] = 'Rocznie'; $lng['error']['ticketresetcycleiswrong'] = 'The cycle for ticket-resets has to be "daily", "weekly", "monthly" or "yearly".'; @@ -1376,4 +1376,18 @@ $lng['serversettings']['defaultwebsrverrhandler_err404'] = 'Plik/URL dla bł& $lng['serversettings']['defaultwebsrverrhandler_err500']['title'] = 'Plik/URL dla błędu 500'; $lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = '
'.$lng['panel']['not_supported'].'lighttpd
'; +// ADDED IN FROXLOR 0.9.6-svn4 +$lng['serversettings']['ticket']['default_priority'] = 'Standardowy priorytet dla zgłoszeń pomocy technicznej'; + +// ADDED IN FROXLOR 0.9.6-svn5 +$lng['serversettings']['mod_fcgid']['defaultini'] = 'Default PHP configuration for new domains'; + +// ADDED IN FROXLOR 0.9.6-svn6 +$lng['admin']['ftpserver'] = 'Serwer FTP'; +$lng['admin']['ftpserversettings'] = 'Ustawienia Serwera FTP'; +$lng['serversettings']['ftpserver']['desc'] = 'Jeśli pureftpd jest zaznaczone, plik .ftpquota z quotami użytkownika będzie tworzony i aktualizowany codziennie'; + +// CHANGED IN FROXLOR 0.9.6-svn6 +$lng['serversettings']['ftpprefix']['description'] = 'Which prefix should ftp accounts have?
If you change this you also have to change the Quota SQL Query in your FTP Server config file in case you use it! '; + ?> \ No newline at end of file diff --git a/templates/misc/configfiles/debian_etch/dovecot/etc_dovecot_dovecot.conf b/templates/misc/configfiles/debian_etch/dovecot/etc_dovecot_dovecot.conf index c6051be3..89ebc937 100644 --- a/templates/misc/configfiles/debian_etch/dovecot/etc_dovecot_dovecot.conf +++ b/templates/misc/configfiles/debian_etch/dovecot/etc_dovecot_dovecot.conf @@ -3,7 +3,7 @@ protocols = imap pop3 listen = * mail_access_groups = vmail mail_debug = no -## Uncomment this line to allow Plaintext Logins from foreign IP if the Connection doesn't use TLS +## allow Plaintext Logins from foreign IP if the Connection doesn't use TLS disable_plaintext_auth = no ### SSL Settings @@ -20,13 +20,13 @@ protocol imap { } protocol pop3 { - # Uncomment this line if you are migrating from Courier also see Migration from Courier + # leave this uncommented if you are migrating from Courier also see Migration from Courier pop3_uidl_format = UID%u-%v mail_plugins = quota } protocol lda { - # postmaster is the one in charge of the mail system. MUST be set to a vailid address! + # postmaster is the one in charge of the mail system. MUST be set to a valid address! postmaster_address = auth_socket_path = /var/run/dovecot/auth-master mail_plugins = quota diff --git a/templates/misc/configfiles/debian_lenny/dovecot/etc_dovecot_dovecot.conf b/templates/misc/configfiles/debian_lenny/dovecot/etc_dovecot_dovecot.conf index c6051be3..89ebc937 100644 --- a/templates/misc/configfiles/debian_lenny/dovecot/etc_dovecot_dovecot.conf +++ b/templates/misc/configfiles/debian_lenny/dovecot/etc_dovecot_dovecot.conf @@ -3,7 +3,7 @@ protocols = imap pop3 listen = * mail_access_groups = vmail mail_debug = no -## Uncomment this line to allow Plaintext Logins from foreign IP if the Connection doesn't use TLS +## allow Plaintext Logins from foreign IP if the Connection doesn't use TLS disable_plaintext_auth = no ### SSL Settings @@ -20,13 +20,13 @@ protocol imap { } protocol pop3 { - # Uncomment this line if you are migrating from Courier also see Migration from Courier + # leave this uncommented if you are migrating from Courier also see Migration from Courier pop3_uidl_format = UID%u-%v mail_plugins = quota } protocol lda { - # postmaster is the one in charge of the mail system. MUST be set to a vailid address! + # postmaster is the one in charge of the mail system. MUST be set to a valid address! postmaster_address = auth_socket_path = /var/run/dovecot/auth-master mail_plugins = quota diff --git a/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot.conf b/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot.conf index 777da1b3..e2ec3240 100644 --- a/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot.conf +++ b/templates/misc/configfiles/gentoo/dovecot/etc_dovecot_dovecot.conf @@ -3,7 +3,7 @@ protocols = imap pop3 listen = * mail_access_groups = vmail mail_debug = no -## Uncomment this line to allow Plaintext Logins from foreign IP if the Connection doesn't use TLS +## allow Plaintext Logins from foreign IP if the Connection doesn't use TLS disable_plaintext_auth = no ### SSL Settings @@ -20,13 +20,13 @@ protocol imap { } protocol pop3 { - # Uncomment this line if you are migrating from Courier also see Migration from Courier + # leave this uncommented if you are migrating from Courier also see Migration from Courier pop3_uidl_format = UID%u-%v mail_plugins = quota } protocol lda { - # postmaster is the one in charge of the mail system. MUST be set to a vailid address! + # postmaster is the one in charge of the mail system. MUST be set to a valid address! postmaster_address = auth_socket_path = /var/run/dovecot/auth-master mail_plugins = quota