diff --git a/docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt b/docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt index dfdc8591688fb1bd9a7c7c443d69c3253bde56fd..17701bf9a366afae2ffb529a25bc250653d71fab 100644 --- a/docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt +++ b/docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt @@ -145,7 +145,10 @@ apt-get -y install bind9 dnsutils 6) Install vlogger and webalizer -apt-get -y install vlogger webalizer +apt-get -y install vlogger webalizer awstats + +mkdir /usr/share/awstats/tools +cp -prf /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/share/awstats/tools/awstats_buildstaticpages.pl 7) Install Jailkit (optional, only needed if you want to use chrooting for SSH users) diff --git a/docs/INSTALL_DEBIAN_5.0_multiserver.txt b/docs/INSTALL_DEBIAN_5.0_multiserver.txt index 941fba82895f7c281182c4763731e913a11b0e82..03513f2a48d98cb9ab4b31f4136b746a0e50ae2a 100644 --- a/docs/INSTALL_DEBIAN_5.0_multiserver.txt +++ b/docs/INSTALL_DEBIAN_5.0_multiserver.txt @@ -28,7 +28,10 @@ STANDALONE_OR_INETD=standalone VIRTUALCHROOT=true [...] -apt-get install vlogger webalizer +apt-get install vlogger webalizer awstats + +mkdir /usr/share/awstats/tools +cp -prf /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/share/awstats/tools/awstats_buildstaticpages.pl apt-get install gcc make diff --git a/docs/INSTALL_DEBIAN_6.0_courier_mydns.txt b/docs/INSTALL_DEBIAN_6.0_courier_mydns.txt index 1402eb8f06866230146a7f4fff6871b61570bdc3..96f46957833aa210a4b6e671d4004d3067223ab2 100644 --- a/docs/INSTALL_DEBIAN_6.0_courier_mydns.txt +++ b/docs/INSTALL_DEBIAN_6.0_courier_mydns.txt @@ -263,7 +263,10 @@ update-rc.d mydns defaults 6) Install vlogger and webalizer -apt-get -y install vlogger webalizer +apt-get -y install vlogger webalizer awstats + +mkdir /usr/share/awstats/tools +cp -prf /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/share/awstats/tools/awstats_buildstaticpages.pl 7) Install Jailkit (optional, only needed if you want to use chrooting for SSH users) diff --git a/docs/INSTALL_DEBIAN_6.0_dovecot_bind.txt b/docs/INSTALL_DEBIAN_6.0_dovecot_bind.txt index 6aa9068caf5a2f517cdef2e787bbedf7c5b3e565..b9da8f836b44379519fb11348c0ca3f8094ef35f 100644 --- a/docs/INSTALL_DEBIAN_6.0_dovecot_bind.txt +++ b/docs/INSTALL_DEBIAN_6.0_dovecot_bind.txt @@ -139,7 +139,10 @@ apt-get -y install bind9 dnsutils 6) Install vlogger and webalizer -apt-get -y install vlogger webalizer +apt-get -y install vlogger webalizer awstats + +mkdir /usr/share/awstats/tools +cp -prf /usr/share/doc/awstats/examples/awstats_buildstaticpages.pl /usr/share/awstats/tools/awstats_buildstaticpages.pl 7) Install Jailkit (optional, only needed if you want to use chrooting for SSH users) diff --git a/docs/INSTALL_OPENSUSE_11_3.txt b/docs/INSTALL_OPENSUSE_11_3.txt index 0d0c750ae9d0c84ff6863d51dd37bd6531e8396e..e036d6b11aea0b91d86af2621503a6e6a95bd7c2 100644 --- a/docs/INSTALL_OPENSUSE_11_3.txt +++ b/docs/INSTALL_OPENSUSE_11_3.txt @@ -64,6 +64,11 @@ then execute: mkdir -p /var/run/clamav ln -s /var/lib/clamav/clamd-socket /var/run/clamav/clamd +# On 64Bit systems, run this command to symlink the dovecot library folder. Thats for 64Bit systems only, so do not exekute the ln command on 32bit systems. + +ln -s /usr/lib64/dovecot/modules /usr/lib/dovecot + + chkconfig --add amavis chkconfig --add clamd /etc/init.d/amavis start diff --git a/install/dist/lib/centos52.lib.php b/install/dist/lib/centos52.lib.php index 782759420b252a1825ef1cee17d50e8410056e2b..f00414a62cfef12f055f350be73ee16d19f1f137 100644 --- a/install/dist/lib/centos52.lib.php +++ b/install/dist/lib/centos52.lib.php @@ -35,7 +35,7 @@ class installer extends installer_dist { // amavisd user config file $configfile = 'fedora_amavisd_conf'; - if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["courier"]["config_dir"].'/amavisd.conf~'); + if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["amavis"]["config_dir"].'/amavisd.conf~'); if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf~')) exec('chmod 400 '.$conf["amavis"]["config_dir"].'/amavisd.conf~'); $content = rf("tpl/".$configfile.".master"); $content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content); diff --git a/install/dist/lib/centos53.lib.php b/install/dist/lib/centos53.lib.php index 17293fc13dd2c22fea2745095da8189c538bd235..d69bc020065a2a372e0d5c711fd300f4c8bc762e 100644 --- a/install/dist/lib/centos53.lib.php +++ b/install/dist/lib/centos53.lib.php @@ -35,7 +35,7 @@ class installer extends installer_dist { // amavisd user config file $configfile = 'fedora_amavisd_conf'; - if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["courier"]["config_dir"].'/amavisd.conf~'); + if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["amavis"]["config_dir"].'/amavisd.conf~'); if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf~')) exec('chmod 400 '.$conf["amavis"]["config_dir"].'/amavisd.conf~'); $content = rf("tpl/".$configfile.".master"); $content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content); diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index 8c7710194f0fb541569a91971a940e9b66903965..20f832b55170fa971e7a8c390dee4e4d8df8c775 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -345,7 +345,7 @@ class installer_dist extends installer_base { // amavisd user config file $configfile = 'fedora_amavisd_conf'; - if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["courier"]["config_dir"].'/amavisd.conf~'); + if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf')) copy($conf["amavis"]["config_dir"].'/amavisd.conf',$conf["amavis"]["config_dir"].'/amavisd.conf~'); if(is_file($conf["amavis"]["config_dir"].'/amavisd.conf~')) exec('chmod 400 '.$conf["amavis"]["config_dir"].'/amavisd.conf~'); $content = rf("tpl/".$configfile.".master"); $content = str_replace('{mysql_server_ispconfig_user}',$conf['mysql']['ispconfig_user'],$content); @@ -529,7 +529,7 @@ class installer_dist extends installer_base { // copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf'); $content = rf("tpl/apache_ispconfig.conf.master"); $records = $this->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ".$conf["server_id"]." AND virtualhost = 'y'"); - if(count($records) > 0) { + if(is_array($records) && count($records) > 0) { foreach($records as $rec) { $content .= "NameVirtualHost ".$rec["ip_address"].":80\n"; $content .= "NameVirtualHost ".$rec["ip_address"].":443\n"; @@ -579,7 +579,7 @@ class installer_dist extends installer_base { $tcp_public_services = ''; $udp_public_services = ''; - $row = $this->db->queryOneRecord("SELECT * FROM firewall WHERE server_id = ".intval($conf['server_id'])); + $row = $this->db->queryOneRecord('SELECT * FROM '.$conf["mysql"]["database"].'.firewall WHERE server_id = '.intval($conf['server_id'])); if(trim($row["tcp_port"]) != '' || trim($row["udp_port"]) != ''){ $tcp_public_services = trim(str_replace(',',' ',$row["tcp_port"])); @@ -698,6 +698,13 @@ class installer_dist extends installer_base { wf("$install_dir/server/lib/$configfile", $content); + //* Create the config file for remote-actions (but only, if it does not exist, because + // the value is a autoinc-value and so changed by the remoteaction_core_module + if (!file_exists($install_dir.'/server/lib/remote_action.inc.php')) { + $content = ''; + wf($install_dir.'/server/lib/remote_action.inc.php', $content); + } + //* Enable the server modules and plugins. // TODO: Implement a selector which modules and plugins shall be enabled. diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php index 51e7e6dff9557f7c4b37f242ecf244663ddbf0ee..428cb98ae935842db7cb3cb505d8d632947cc044 100644 --- a/install/dist/lib/gentoo.lib.php +++ b/install/dist/lib/gentoo.lib.php @@ -670,14 +670,14 @@ class installer extends installer_base //* Create the config file for ISPConfig server $this->write_config_file("$install_dir/server/lib/$configfile", $content); - //* Create the config file for remote-actions (but only, if it does not exist, because - //* the value is a autoinc-value and so changed by the remoteaction_core_module + //* Create the config file for remote-actions (but only, if it does not exist, because + // the value is a autoinc-value and so changed by the remoteaction_core_module if (!file_exists($install_dir.'/server/lib/remote_action.inc.php')) { $content = ''; - $this->write_config_file("$install_dir/server/lib/remote_action.inc.php", $content); + wf($install_dir.'/server/lib/remote_action.inc.php', $content); } - //* Enable the server modules and plugins. + // Enable the server modules and plugins. // TODO: Implement a selector which modules and plugins shall be enabled. $dir = $install_dir.'/server/mods-available/'; if (is_dir($dir)) { diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index 59a07e7d83effcd252fe65025ed0e53124d54554..ec01255eb067a25b697e679efb6aea53e2f2fd41 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -541,7 +541,7 @@ class installer_dist extends installer_base { //copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf'); $content = rf("tpl/apache_ispconfig.conf.master"); $records = $this->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ".$conf["server_id"]." AND virtualhost = 'y'"); - if(count($records) > 0) { + if(is_array($records) && count($records) > 0) { foreach($records as $rec) { $content .= "NameVirtualHost ".$rec["ip_address"].":80\n"; $content .= "NameVirtualHost ".$rec["ip_address"].":443\n"; @@ -591,7 +591,7 @@ class installer_dist extends installer_base { $tcp_public_services = ''; $udp_public_services = ''; - $row = $this->db->queryOneRecord("SELECT * FROM firewall WHERE server_id = ".intval($conf['server_id'])); + $row = $this->db->queryOneRecord('SELECT * FROM '.$conf["mysql"]["database"].'.firewall WHERE server_id = '.intval($conf['server_id'])); if(trim($row["tcp_port"]) != '' || trim($row["udp_port"]) != ''){ $tcp_public_services = trim(str_replace(',',' ',$row["tcp_port"])); @@ -710,6 +710,12 @@ class installer_dist extends installer_base { wf("$install_dir/server/lib/$configfile", $content); + //* Create the config file for remote-actions (but only, if it does not exist, because + // the value is a autoinc-value and so changed by the remoteaction_core_module + if (!file_exists($install_dir.'/server/lib/remote_action.inc.php')) { + $content = ''; + wf($install_dir.'/server/lib/remote_action.inc.php', $content); + } //* Enable the server modules and plugins. // TODO: Implement a selector which modules and plugins shall be enabled. diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php index 997f9a1eeaf3a813e12fbf083a37561f7e2740f6..44b405246542d497c562d105aa386ad16064fef3 100644 --- a/install/lib/install.lib.php +++ b/install/lib/install.lib.php @@ -161,6 +161,12 @@ function get_distname() { $distid = 'centos53'; $distbaseid = 'fedora'; swriteln("Operating System: CentOS 5.3 or compatible\n"); + } elseif(stristr($content,'CentOS release 5')) { + $distname = 'CentOS'; + $distver = 'Unknown'; + $distid = 'centos53'; + $distbaseid = 'fedora'; + swriteln("Operating System: CentOS 5 or compatible\n"); } else { $distname = 'Redhat'; $distver = 'Unknown'; diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index 4626c22a8ea9a716f5d2cc5aa3737bdfdde75b0d..f9c4ba38b3b3a9c2e0ba0a7d3d9bf828a087cea6 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -292,6 +292,8 @@ class installer_base { * 1) it is a single server * 2) it is the MASTER of n clients */ + $hosts = array(); + if($conf['mysql']['master_slave_setup'] == 'y') { /* * it is a master-slave - Setup so the slave has to grant its rights in the master @@ -326,7 +328,7 @@ class installer_base { } } - if(is_array($hosts)) { + if(count($hosts) > 0) { foreach($hosts as $host => $value) { /* * If a pwd exists, this means, we have to add the new user (and his pwd). @@ -711,11 +713,11 @@ class installer_base { $config_dir = $conf['dovecot']['config_dir']; //* Configure master.cf and add a line for deliver - if(is_file($config_dir.'/master.cf')) { - copy($config_dir.'/master.cf', $config_dir.'/master.cf~2'); + if(is_file($conf['postfix']['config_dir'].'/master.cf')) { + copy($conf['postfix']['config_dir'].'/master.cf', $conf['postfix']['config_dir'].'/master.cf~2'); } - if(is_file($config_dir.'/master.cf~')) { - chmod($config_dir.'/master.cf~2', 0400); + if(is_file($conf['postfix']['config_dir'].'/master.cf~')) { + chmod($conf['postfix']['config_dir'].'/master.cf~2', 0400); } $content = rf($conf['postfix']['config_dir'].'/master.cf'); // Only add the content if we had not addded it before @@ -1058,7 +1060,7 @@ class installer_base { $tcp_public_services = ''; $udp_public_services = ''; - $row = $this->db->queryOneRecord('SELECT * FROM firewall WHERE server_id = '.intval($conf['server_id'])); + $row = $this->db->queryOneRecord('SELECT * FROM '.$conf["mysql"]["database"].'.firewall WHERE server_id = '.intval($conf['server_id'])); if(trim($row['tcp_port']) != '' || trim($row['udp_port']) != '') { $tcp_public_services = trim(str_replace(',',' ',$row['tcp_port'])); diff --git a/install/sql/incremental/upd_0002.sql b/install/sql/incremental/upd_0002.sql index bebbcc2cedc1c6ea8351c95b968f25d91099ace9..e71e11182641408728d78c38a27114ae0e794905 100644 --- a/install/sql/incremental/upd_0002.sql +++ b/install/sql/incremental/upd_0002.sql @@ -1,4 +1,4 @@ -CREATE TABLE `sys_session` ( +CREATE TABLE IF NOT EXISTS `sys_session` ( `session_id` varchar(32) NOT NULL default '', `date_created` datetime NOT NULL default '0000-00-00 00:00:00', `last_updated` datetime NOT NULL default '0000-00-00 00:00:00', diff --git a/install/tpl/debian6_dovecot.conf.master b/install/tpl/debian6_dovecot.conf.master index 51c6910ee5fd41318519f198cf05f7bee7a72c62..b94e4470e81968a289b42dd99617d3b2b2876a98 100644 --- a/install/tpl/debian6_dovecot.conf.master +++ b/install/tpl/debian6_dovecot.conf.master @@ -55,8 +55,6 @@ plugin { #auth_executable = /usr/lib/dovecot/dovecot-auth auth default { mechanisms = plain login - passdb pam { - } # SQL database passdb sql { diff --git a/install/tpl/debian_dovecot.conf.master b/install/tpl/debian_dovecot.conf.master index d25798200388efc46777dee1f1d78e861d85ce00..d32537b8a22e2dd9d857357624b83ecc1e210674 100644 --- a/install/tpl/debian_dovecot.conf.master +++ b/install/tpl/debian_dovecot.conf.master @@ -847,7 +847,7 @@ auth default { # database (passwd usually), you can use static userdb. # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM # authentication to actually work. - passdb pam { + # passdb pam { # [blocking=yes] [session=yes] [setcred=yes] # [cache_key=] [] # @@ -880,7 +880,7 @@ auth default { # args = session=yes * # args = cache_key=%u dovecot #args = dovecot - } + # } # System users (NSS, /etc/passwd, or similiar) # In many systems nowadays this uses Name Service Switch, which is diff --git a/install/update.php b/install/update.php index 6f39b23a9d1d0da870ea736592274c1abbedc9cd..ced040b0b56b8b24a7d0d42fc4405fb7deede116 100644 --- a/install/update.php +++ b/install/update.php @@ -198,7 +198,7 @@ updateDbAndIni(); * (if this is done at client side, only this client is updated. * If this is done at server side, all clients are updated. */ -//if($conf['mysql']['master_slave_setup'] == 'y') { +//if($conf_old['dbmaster_user'] != '' or $conf_old['dbmaster_host'] != '') { //** Update master database rights $reconfigure_master_database_rights_answer = $inst->simple_query('Reconfigure Permissions in master database?', array('yes','no'),'no'); diff --git a/interface/lib/classes/db_mysql.inc.php b/interface/lib/classes/db_mysql.inc.php index 585de2ccfb4624e5a46d00d3bbdfedc8b1569bdf..5e38e3b5002b52e0d26eb7f8a03ad3524eac4fd7 100644 --- a/interface/lib/classes/db_mysql.inc.php +++ b/interface/lib/classes/db_mysql.inc.php @@ -483,7 +483,7 @@ class db { public function tableInfo($table_name) { //* Tabellenfelder einlesen ? - if($rows = $this->queryAllRecords('SHOW FIELDS FROM $table_name')){ + if($rows = $this->queryAllRecords('SHOW FIELDS FROM '.$table_name)){ foreach($rows as $row) { $name = $row['Field']; $default = $row['Default']; diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng index 4094c73c0b590672a0aaf180a6dfa477addce9c9..0f7243221ef4484b0e0bcfb634e32a6c95c9cd87 100644 --- a/interface/lib/lang/en.lng +++ b/interface/lib/lang/en.lng @@ -33,6 +33,7 @@ $wb['top_menu_help'] = 'Help'; $wb['top_menu_billing'] = 'Billing'; $wb['top_menu_domain'] = 'Domains'; $wb['top_menu_dashboard'] = 'Home'; +$wb['top_menu_vm'] = 'VM'; $wb['toolsarea_head_txt'] = 'Tools'; $wb['latest_news_txt'] = 'Latest news'; ?> diff --git a/interface/lib/lang/nl.lng b/interface/lib/lang/nl.lng index c210be2bd2c8e5f2925cda63e46c85ac7bf07fe9..66077a4e27e4c503da64f2237f6fb1aa47e3e149 100644 --- a/interface/lib/lang/nl.lng +++ b/interface/lib/lang/nl.lng @@ -1,38 +1,41 @@ - + + + + diff --git a/interface/lib/lang/pl.lng b/interface/lib/lang/pl.lng index 8dd456e92dd17492873fd27e2b835cd98bb1de67..e5e51d692acd396a051d679fcd0013deebbed9fa 100644 --- a/interface/lib/lang/pl.lng +++ b/interface/lib/lang/pl.lng @@ -1,38 +1,39 @@ - + + diff --git a/interface/web/admin/lib/lang/nl.lng b/interface/web/admin/lib/lang/nl.lng index b51d3f4ae8836c5056bc2a270835a5feb118c14e..91791bbcb7b7a7f835328d8ab157253bbd8cda5e 100644 --- a/interface/web/admin/lib/lang/nl.lng +++ b/interface/web/admin/lib/lang/nl.lng @@ -1,43 +1,47 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_firewall.lng b/interface/web/admin/lib/lang/nl_firewall.lng index 26001af2b82926bec187321da2884b93b88c0cc6..1f27d03d240dbda0c8784d541bffb1ff0ac73386 100644 --- a/interface/web/admin/lib/lang/nl_firewall.lng +++ b/interface/web/admin/lib/lang/nl_firewall.lng @@ -1,11 +1,14 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_firewall_list.lng b/interface/web/admin/lib/lang/nl_firewall_list.lng index 37f78048cc22d28bb482afaed1f04989c1851c07..2461506067e86d9158c2014f045d0d0618775414 100644 --- a/interface/web/admin/lib/lang/nl_firewall_list.lng +++ b/interface/web/admin/lib/lang/nl_firewall_list.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_groups.lng b/interface/web/admin/lib/lang/nl_groups.lng index 0454a672e3298ea5ece9962395c08dafc9f9bada..0f624ca131b8d24901b32f2a3d4d4c54ed6ff925 100644 --- a/interface/web/admin/lib/lang/nl_groups.lng +++ b/interface/web/admin/lib/lang/nl_groups.lng @@ -1,5 +1,7 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_groups_list.lng b/interface/web/admin/lib/lang/nl_groups_list.lng index 43e2729a09668bf4ca3599e1d6be4ba81dbe2474..71e230d98ed2f9d6c8f01dd74e60dad95a61e9e6 100644 --- a/interface/web/admin/lib/lang/nl_groups_list.lng +++ b/interface/web/admin/lib/lang/nl_groups_list.lng @@ -1,7 +1,9 @@ -LET OP: Uitgevoerde wijzigingen in deze module kunnen gevolgen hebben voor gebruikers gekoppeld aan deze groepen!'; -?> +WAARSCHUWING: Wijzig hier geen enkele gebruikersinstelling. Voor het aanbrengen van wijzigingen gebruikt u de klanten module. Het hier wijzigen van gebruikers of groepen kan dataverlies tot gevolg hebben!!!'; +?> + + diff --git a/interface/web/admin/lib/lang/nl_language_add.lng b/interface/web/admin/lib/lang/nl_language_add.lng index 8a5c5db5f456c6fd47f1dc7297671f725fe75a8e..5cefedbb9dab917d805710958919bcba7094d476 100644 --- a/interface/web/admin/lib/lang/nl_language_add.lng +++ b/interface/web/admin/lib/lang/nl_language_add.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_language_complete.lng b/interface/web/admin/lib/lang/nl_language_complete.lng index 61163713120d1f7dc1b0ec3337d7b01fd066e4a5..7fef5c3f78dad925f22ffed9ac5c58efe2580e56 100644 --- a/interface/web/admin/lib/lang/nl_language_complete.lng +++ b/interface/web/admin/lib/lang/nl_language_complete.lng @@ -1,7 +1,9 @@ - +Dit voegt de nog missende strings toe van de Engelse master taalbestanden naar de geselecteerde taal.'; +$wb["language_select_txt"] = 'Selecteer taal'; +$wb['btn_save_txt'] = 'Voeg bestanden nu samen'; +$wb['btn_cancel_txt'] = 'Terug'; +?> + + diff --git a/interface/web/admin/lib/lang/nl_language_edit.lng b/interface/web/admin/lib/lang/nl_language_edit.lng index 9656b36a08739c4f6cfad3881034bd050c28ace3..7e9e4ed8424cee31974cb21d1c343662743e732d 100644 --- a/interface/web/admin/lib/lang/nl_language_edit.lng +++ b/interface/web/admin/lib/lang/nl_language_edit.lng @@ -1,8 +1,11 @@ - + + + + diff --git a/interface/web/admin/lib/lang/nl_language_export.lng b/interface/web/admin/lib/lang/nl_language_export.lng index 2c1d78f7d7ce0b3fc066bfd0f805ac73b0d4fc95..dca1869b0ef2f142920b90fda1c59f7570730c84 100644 --- a/interface/web/admin/lib/lang/nl_language_export.lng +++ b/interface/web/admin/lib/lang/nl_language_export.lng @@ -1,6 +1,8 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_language_import.lng b/interface/web/admin/lib/lang/nl_language_import.lng index f1d5fa51acbe22dc3363aa7260a9ab64716c047e..07514c5a10aa7668229de93c68a650486e7b9855 100644 --- a/interface/web/admin/lib/lang/nl_language_import.lng +++ b/interface/web/admin/lib/lang/nl_language_import.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_language_list.lng b/interface/web/admin/lib/lang/nl_language_list.lng index dc5843af24e16fd71245bb36332ad7dfd0eec42e..ede83dc2b6213638f039ebbc40f0eca1e91f2816 100644 --- a/interface/web/admin/lib/lang/nl_language_list.lng +++ b/interface/web/admin/lib/lang/nl_language_list.lng @@ -1,7 +1,10 @@ - + + + + diff --git a/interface/web/admin/lib/lang/nl_package_install.lng b/interface/web/admin/lib/lang/nl_package_install.lng index 574dd1162989badc8499f5af31451a43673bf4da..988918ec91d1c267204235b2088e581721866f28 100644 --- a/interface/web/admin/lib/lang/nl_package_install.lng +++ b/interface/web/admin/lib/lang/nl_package_install.lng @@ -1,7 +1,9 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_remote_action.lng b/interface/web/admin/lib/lang/nl_remote_action.lng index 949f7eb1478acfd5d5ddf79d3c05fc7a9a43095d..cfdd91a738885302cc3860f1256e70d4baedcbb9 100644 --- a/interface/web/admin/lib/lang/nl_remote_action.lng +++ b/interface/web/admin/lib/lang/nl_remote_action.lng @@ -1,10 +1,13 @@ -
USE THIS AT YOUR OWN RISK!'; -$wb['do_ispcupdate_caption'] = 'Do ISPConfig 3 - Update at remote server'; -$wb['do_ispcupdate_desc'] = 'This action does a ISPConfig3 update at your selected server.

USE THIS AT YOUR OWN RISK!'; -$wb['action_scheduled'] = 'The action is scheduled for execution'; -$wb['select_all_server'] = 'All server'; -?> +
GEBRUIK OP EIGEN RISICO!"; +$wb['do_ispcupdate_caption'] = 'Voer een ISPConfig 3 - update uit op de remote server'; +$wb['do_ispcupdate_desc'] = "Deze actie voert een ISPConfig3 update uit op de soor u geselecteerde server.

GEBRUIK OP EIGEN RISICO!"; +$wb['action_scheduled'] = "Deze actie is ingepland om uitgevoerd te worden"; +$wb['select_all_server'] = "Alle servers"; +?> + + + diff --git a/interface/web/admin/lib/lang/nl_remote_user.lng b/interface/web/admin/lib/lang/nl_remote_user.lng index 4f9dc1de3580509c5c8a7fa2de85dcaebf9cc745..12165a392dd1ae1db627e972af4c3f8b7ac9f238 100644 --- a/interface/web/admin/lib/lang/nl_remote_user.lng +++ b/interface/web/admin/lib/lang/nl_remote_user.lng @@ -1,42 +1,45 @@ - + + + + diff --git a/interface/web/admin/lib/lang/nl_remote_user_list.lng b/interface/web/admin/lib/lang/nl_remote_user_list.lng index 664ea756ec78f50e5f993810496190f55a1df038..5d9f8fef39dfba4f742ead3d6b664814d0aaa739 100644 --- a/interface/web/admin/lib/lang/nl_remote_user_list.lng +++ b/interface/web/admin/lib/lang/nl_remote_user_list.lng @@ -1,7 +1,11 @@ - + + + + + diff --git a/interface/web/admin/lib/lang/nl_server.lng b/interface/web/admin/lib/lang/nl_server.lng index f348c7962fc5db5389f5cd537cc374fa573e8de2..097983781b56b1015a343e85f57eb52df5605a59 100644 --- a/interface/web/admin/lib/lang/nl_server.lng +++ b/interface/web/admin/lib/lang/nl_server.lng @@ -1,13 +1,15 @@ -
Wijzigen? Zie: Server configuratie'; -$wb['server_name_txt'] = 'Servernaam'; -$wb['mail_server_txt'] = 'Mailserver'; -$wb['web_server_txt'] = 'Webserver'; -$wb['dns_server_txt'] = 'DNS server'; -$wb['file_server_txt'] = 'Fileserver'; -$wb['db_server_txt'] = 'Database server'; -$wb['vserver_server_txt'] = 'VServer-server'; -$wb['active_txt'] = 'Actief?'; -$wb['mirror_server_id_txt'] = 'Deze server is mirror van server'; -$wb['- None -'] = '- niet van toepassing -'; -?> + + + diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng index d7b6b86e42fb196983807422dba724a4fd03d67c..159ae26b35e9ee3cdb4fafb782c36bcc3a367f90 100644 --- a/interface/web/admin/lib/lang/nl_server_config.lng +++ b/interface/web/admin/lib/lang/nl_server_config.lng @@ -1,77 +1,79 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_server_config_list.lng b/interface/web/admin/lib/lang/nl_server_config_list.lng index 3d376e5f196f8129a7b8bd3bebd4354975997311..656be0706c2cba6b14412dcc9ca332829bd80e8b 100644 --- a/interface/web/admin/lib/lang/nl_server_config_list.lng +++ b/interface/web/admin/lib/lang/nl_server_config_list.lng @@ -1,4 +1,6 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_server_ip.lng b/interface/web/admin/lib/lang/nl_server_ip.lng index ef8079adaa24dfbbc9771d9cb536127a43a7da42..f63c399fbf7202f70817c17dfe0f939959a40792 100644 --- a/interface/web/admin/lib/lang/nl_server_ip.lng +++ b/interface/web/admin/lib/lang/nl_server_ip.lng @@ -1,7 +1,9 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_server_ip_list.lng b/interface/web/admin/lib/lang/nl_server_ip_list.lng index acbd83e294945a9cd7a38d3e8e82446f9e26a9c5..02e043ab48db7be06398be5212c1aadd0bb538ef 100644 --- a/interface/web/admin/lib/lang/nl_server_ip_list.lng +++ b/interface/web/admin/lib/lang/nl_server_ip_list.lng @@ -1,6 +1,8 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_server_list.lng b/interface/web/admin/lib/lang/nl_server_list.lng index 05e7aac6c2c9eb262d023f5afa0a377a022b6989..a28e332f6ed99b42a5c1494dcfc77c84b39e4304 100644 --- a/interface/web/admin/lib/lang/nl_server_list.lng +++ b/interface/web/admin/lib/lang/nl_server_list.lng @@ -1,11 +1,13 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_software_package_install.lng b/interface/web/admin/lib/lang/nl_software_package_install.lng index 5c8b756434ce27d67e479a96383bbee01bce4f1f..bffab594e53d79968386bdeea2093b5cdc936608 100644 --- a/interface/web/admin/lib/lang/nl_software_package_install.lng +++ b/interface/web/admin/lib/lang/nl_software_package_install.lng @@ -1,6 +1,8 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_software_package_list.lng b/interface/web/admin/lib/lang/nl_software_package_list.lng index 326a15a65046608959b1d019a3d7eedeeb17ab7a..dd375c3db8f2b8a5f008bd68e4e05a081b0e925a 100644 --- a/interface/web/admin/lib/lang/nl_software_package_list.lng +++ b/interface/web/admin/lib/lang/nl_software_package_list.lng @@ -1,10 +1,13 @@ - + + + + diff --git a/interface/web/admin/lib/lang/nl_software_repo.lng b/interface/web/admin/lib/lang/nl_software_repo.lng index bd4c93119290603c313cf804cdf3290d7bce83e2..2448e2a38bccc6e889a1a22aa0900135a043a601 100644 --- a/interface/web/admin/lib/lang/nl_software_repo.lng +++ b/interface/web/admin/lib/lang/nl_software_repo.lng @@ -1,7 +1,9 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_software_repo_list.lng b/interface/web/admin/lib/lang/nl_software_repo_list.lng index 737e5cf4358548f6fea319c8b2d9e91cb1b50376..bf318f507887fcd33df5856300c1557965c9e706 100644 --- a/interface/web/admin/lib/lang/nl_software_repo_list.lng +++ b/interface/web/admin/lib/lang/nl_software_repo_list.lng @@ -1,6 +1,8 @@ - + + + diff --git a/interface/web/admin/lib/lang/nl_software_update_list.lng b/interface/web/admin/lib/lang/nl_software_update_list.lng index 7c8dc76232a412ea3206f13ca7f1bce0e8374fa0..9472a7eeb824f36cf472463ca77739de65417ef6 100644 --- a/interface/web/admin/lib/lang/nl_software_update_list.lng +++ b/interface/web/admin/lib/lang/nl_software_update_list.lng @@ -1,8 +1,11 @@ - + + + + diff --git a/interface/web/admin/lib/lang/nl_system_config.lng b/interface/web/admin/lib/lang/nl_system_config.lng index dcb2bcd3c362b6e561f4b47556e66a0f841e7263..8105a427b6543b7043335c1e3005e238397f73cc 100644 --- a/interface/web/admin/lib/lang/nl_system_config.lng +++ b/interface/web/admin/lib/lang/nl_system_config.lng @@ -1,22 +1,25 @@ - + + + + diff --git a/interface/web/admin/lib/lang/nl_users.lng b/interface/web/admin/lib/lang/nl_users.lng index 4ab27372c78100ce84bc0db8bb7b1fa5e6e465fc..91a77a14e6a3bb0e9862734c1497a4a96304ba46 100644 --- a/interface/web/admin/lib/lang/nl_users.lng +++ b/interface/web/admin/lib/lang/nl_users.lng @@ -1,28 +1,31 @@ - + + + + diff --git a/interface/web/admin/lib/lang/nl_users_list.lng b/interface/web/admin/lib/lang/nl_users_list.lng index 1435934003feff8c163b7ca5bc3ac64853ba746f..6733111725004c18efb42b55e8da6e16811ef860 100644 --- a/interface/web/admin/lib/lang/nl_users_list.lng +++ b/interface/web/admin/lib/lang/nl_users_list.lng @@ -1,9 +1,11 @@ -LET OP: Verander hier geen gegevens. Gebruik daarvoor de functie Wijzig klant/Wijzig reseller onder de Klanten-module van ISPConfig. Het veranderen van gebruikers in deze module kan dataverlies opleveren!'; -?> +WAARSCHUWING: Wijzig hier geen enkele gebruikersinstelling. Voor het aanbrengen van wijzigingen gebruikt u de klanten module. Het hier wijzigen van gebruikers of groepen kan dataverlies tot gevolg hebben!!!'; +?> + + diff --git a/interface/web/admin/lib/lang/pl.lng b/interface/web/admin/lib/lang/pl.lng index 12cc46c4c182568f533110139cf4e8f46ac7efd8..a159636acc9bf9adfacd43eacc31de474d499397 100644 --- a/interface/web/admin/lib/lang/pl.lng +++ b/interface/web/admin/lib/lang/pl.lng @@ -1,43 +1,44 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_firewall.lng b/interface/web/admin/lib/lang/pl_firewall.lng index a216af6b1c0839e45c8e97eb089d668fc8225203..31ec1e698ad600799ee5f0f5e7ea2b539fdc0509 100644 --- a/interface/web/admin/lib/lang/pl_firewall.lng +++ b/interface/web/admin/lib/lang/pl_firewall.lng @@ -1,11 +1,12 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_firewall_list.lng b/interface/web/admin/lib/lang/pl_firewall_list.lng index f7e1640404ac610157313081934dc4286b4c9717..61b9198d2f934aee5a57809a2e74bb46e16e1134 100644 --- a/interface/web/admin/lib/lang/pl_firewall_list.lng +++ b/interface/web/admin/lib/lang/pl_firewall_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_groups.lng b/interface/web/admin/lib/lang/pl_groups.lng index b3c8b9ca777f58387a7713ceb9e0170b03b39f77..3e548ba888c1b83311e35f64cf421d21dbc4acbe 100644 --- a/interface/web/admin/lib/lang/pl_groups.lng +++ b/interface/web/admin/lib/lang/pl_groups.lng @@ -1,5 +1,6 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_groups_list.lng b/interface/web/admin/lib/lang/pl_groups_list.lng index 14565b0c76f282ab531e730127f7066ed41c30c7..64117d5681029fe3d9b498d0c968dd0b40267ff9 100644 --- a/interface/web/admin/lib/lang/pl_groups_list.lng +++ b/interface/web/admin/lib/lang/pl_groups_list.lng @@ -1,7 +1,8 @@ -WARNING: Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!'; -?> +OSTRZEŻENIE: Nie modyfikuj żadnych ustawień użytkownika w tym miejscu. Użyj ustawień Klienta lub Resellera w module Klient. Modyfikacja ustawień użytkownika lub grupy tutaj grozi utratą danych!"; +?> + diff --git a/interface/web/admin/lib/lang/pl_language_add.lng b/interface/web/admin/lib/lang/pl_language_add.lng index 82e42ef720eea1c0c5e7387249693933b41b68bc..7a475deb2778a65aada256d902019a2bc9ec4699 100644 --- a/interface/web/admin/lib/lang/pl_language_add.lng +++ b/interface/web/admin/lib/lang/pl_language_add.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_language_complete.lng b/interface/web/admin/lib/lang/pl_language_complete.lng index 0096c69efabccd5775ca0bc4e739e21156cae4c4..f824a51eff81b55f11958ccb8be264f304cb49f6 100644 --- a/interface/web/admin/lib/lang/pl_language_complete.lng +++ b/interface/web/admin/lib/lang/pl_language_complete.lng @@ -1,7 +1,8 @@ -Ta opcja dodaje do wybranego języka brakujące zmienne językowe z plików języka angielskiego.'; -$wb['language_select_txt'] = 'Wybierz język'; -$wb['btn_save_txt'] = 'Połącz pliki teraz'; -$wb['btn_cancel_txt'] = 'Wróć'; -?> +Ta opcja dodaje do wybranego języka brakujące zmienne językowe z plików języka angielskiego.'; +$wb['language_select_txt'] = 'Wybierz język'; +$wb['btn_save_txt'] = 'Połącz pliki teraz'; +$wb['btn_cancel_txt'] = 'Wróć'; +?> + diff --git a/interface/web/admin/lib/lang/pl_language_export.lng b/interface/web/admin/lib/lang/pl_language_export.lng index 82666fcb7802901bf00fb9dd1a94c233a7192ed7..8ef6cde0a05a8d05be2406353042f152c0aa1be4 100644 --- a/interface/web/admin/lib/lang/pl_language_export.lng +++ b/interface/web/admin/lib/lang/pl_language_export.lng @@ -1,6 +1,7 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_language_import.lng b/interface/web/admin/lib/lang/pl_language_import.lng index 83e988116581ad59fd7e55e00033a2ada7345481..3dd0740eb2226925b869750281f475fd15149fbe 100644 --- a/interface/web/admin/lib/lang/pl_language_import.lng +++ b/interface/web/admin/lib/lang/pl_language_import.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_language_list.lng b/interface/web/admin/lib/lang/pl_language_list.lng index 68f710be04737d4f2c44388b8a0ca08c6c55873d..e06544a5fada1d400d90e1a4aef92fa99ba59a92 100644 --- a/interface/web/admin/lib/lang/pl_language_list.lng +++ b/interface/web/admin/lib/lang/pl_language_list.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_package_install.lng b/interface/web/admin/lib/lang/pl_package_install.lng index 574dd1162989badc8499f5af31451a43673bf4da..86c19d1829d5c829a3ffb0a42dff202727329bb0 100644 --- a/interface/web/admin/lib/lang/pl_package_install.lng +++ b/interface/web/admin/lib/lang/pl_package_install.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_remote_action.lng b/interface/web/admin/lib/lang/pl_remote_action.lng index 949f7eb1478acfd5d5ddf79d3c05fc7a9a43095d..80550b89d4acfa9a23285faeb846104ea4fe7c34 100644 --- a/interface/web/admin/lib/lang/pl_remote_action.lng +++ b/interface/web/admin/lib/lang/pl_remote_action.lng @@ -1,10 +1,11 @@ -
USE THIS AT YOUR OWN RISK!'; -$wb['do_ispcupdate_caption'] = 'Do ISPConfig 3 - Update at remote server'; -$wb['do_ispcupdate_desc'] = 'This action does a ISPConfig3 update at your selected server.

USE THIS AT YOUR OWN RISK!'; -$wb['action_scheduled'] = 'The action is scheduled for execution'; -$wb['select_all_server'] = 'All server'; -?> +aptitude -y upgrade na wybranym serwerze.

UŻYWASZ JEJ NA WŁASNĄ ODPOWIEDZIALNOŚĆ!"; +$wb['do_ispcupdate_caption'] = "Wykonaj zdalną aktualizację ISPConfig 3 na serwerze"; +$wb['do_ispcupdate_desc'] = "Ta akcja przeprowadzi aktualizację ISPConfig3 na wybranym serwerze.

UŻYWASZ JEJ NA WŁASNĄ ODPOWIEDZIALNOŚĆ!"; +$wb['action_scheduled'] = "Akcja zaplanowana do wykonania"; +$wb['select_all_server'] = "Wszystkie serwery"; +?> + diff --git a/interface/web/admin/lib/lang/pl_remote_user.lng b/interface/web/admin/lib/lang/pl_remote_user.lng index cc9335bc52638b05b2a4419cbb6415daebbca52e..95575e0f35fa3a4ede0a9622019d4017002370e0 100644 --- a/interface/web/admin/lib/lang/pl_remote_user.lng +++ b/interface/web/admin/lib/lang/pl_remote_user.lng @@ -1,42 +1,43 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_remote_user_list.lng b/interface/web/admin/lib/lang/pl_remote_user_list.lng index 152a75fba4c8917a1829b6960df7291e583d34a7..46b48b1755529c8010d9d3c6d61323e1ae9c8684 100644 --- a/interface/web/admin/lib/lang/pl_remote_user_list.lng +++ b/interface/web/admin/lib/lang/pl_remote_user_list.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_server.lng b/interface/web/admin/lib/lang/pl_server.lng index c027c0b31fa7deeed75cd3c45367c07e9f93b6c3..8cddefbbd544f1f424f123f3532c7225baa769ea 100644 --- a/interface/web/admin/lib/lang/pl_server.lng +++ b/interface/web/admin/lib/lang/pl_server.lng @@ -1,13 +1,14 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng index cd14bcdd5b7f172fcc3ba05e238fb0b97ac05dfc..8e737684b28799820b79bd3ff1ffde37f4653a26 100644 --- a/interface/web/admin/lib/lang/pl_server_config.lng +++ b/interface/web/admin/lib/lang/pl_server_config.lng @@ -1,77 +1,78 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_server_config_list.lng b/interface/web/admin/lib/lang/pl_server_config_list.lng index f9e8dcf1b559349ac491040e4920bec5fa38a7e6..f49cfad338d0c997001f52e861c70ce4e07dc23f 100644 --- a/interface/web/admin/lib/lang/pl_server_config_list.lng +++ b/interface/web/admin/lib/lang/pl_server_config_list.lng @@ -1,4 +1,5 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_server_ip.lng b/interface/web/admin/lib/lang/pl_server_ip.lng index 41e0b941625c1320d64818764e13227351804d8e..b25dd1fdb80b0752198083f8c5b04bf8c7a1d303 100644 --- a/interface/web/admin/lib/lang/pl_server_ip.lng +++ b/interface/web/admin/lib/lang/pl_server_ip.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_server_ip_list.lng b/interface/web/admin/lib/lang/pl_server_ip_list.lng index 6ab81c1e5b408915764d4c25f69d4f30d5029305..dfd0613078ce7e3fc8ec1b5b18b8514970cd0460 100644 --- a/interface/web/admin/lib/lang/pl_server_ip_list.lng +++ b/interface/web/admin/lib/lang/pl_server_ip_list.lng @@ -1,6 +1,7 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_server_list.lng b/interface/web/admin/lib/lang/pl_server_list.lng index f61ba5fc8764d1e275290810d2a8907be7e93892..212dcffddd3f59304965977c6ee49fd46bc5338c 100644 --- a/interface/web/admin/lib/lang/pl_server_list.lng +++ b/interface/web/admin/lib/lang/pl_server_list.lng @@ -1,11 +1,12 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_software_package_install.lng b/interface/web/admin/lib/lang/pl_software_package_install.lng index 5c8b756434ce27d67e479a96383bbee01bce4f1f..12f025e669c271d1be68f4a7298479ca24109244 100644 --- a/interface/web/admin/lib/lang/pl_software_package_install.lng +++ b/interface/web/admin/lib/lang/pl_software_package_install.lng @@ -1,6 +1,7 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_software_package_list.lng b/interface/web/admin/lib/lang/pl_software_package_list.lng index 82991fa09f343087909ebb799fb76264283facb1..4e73cd77f1cce78df389c1b928c5580ecba0a23a 100644 --- a/interface/web/admin/lib/lang/pl_software_package_list.lng +++ b/interface/web/admin/lib/lang/pl_software_package_list.lng @@ -1,10 +1,11 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_software_repo.lng b/interface/web/admin/lib/lang/pl_software_repo.lng index d11a1b3b330d331c507e129f195f3f6ada2874f5..491865565eca84a742609c00c65a09d3b95efdfb 100644 --- a/interface/web/admin/lib/lang/pl_software_repo.lng +++ b/interface/web/admin/lib/lang/pl_software_repo.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_software_repo_list.lng b/interface/web/admin/lib/lang/pl_software_repo_list.lng index 7ca6af9f9f43559891103a0c50ebd189da3f795b..abf93b8db32ffc8c7316e2550dc9bc7fa06c5ba8 100644 --- a/interface/web/admin/lib/lang/pl_software_repo_list.lng +++ b/interface/web/admin/lib/lang/pl_software_repo_list.lng @@ -1,6 +1,7 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_software_update_list.lng b/interface/web/admin/lib/lang/pl_software_update_list.lng index e38bdf8a317456ce5e84b4e8ff6f689094ae8161..97a952c459bf19ff4fc276028bdd0e35ccff0200 100644 --- a/interface/web/admin/lib/lang/pl_software_update_list.lng +++ b/interface/web/admin/lib/lang/pl_software_update_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_system_config.lng b/interface/web/admin/lib/lang/pl_system_config.lng index 929c649e65c9a565635800ac93af16356038840e..ff90828b1051d840af14d1e6c1a84a1d8bdfde01 100644 --- a/interface/web/admin/lib/lang/pl_system_config.lng +++ b/interface/web/admin/lib/lang/pl_system_config.lng @@ -1,22 +1,23 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_users.lng b/interface/web/admin/lib/lang/pl_users.lng index 3b2472dfeb005bd15a2650b19eb788d999c8102a..683760ca87ff075b64ce6baa5df2b6aaab086fa7 100644 --- a/interface/web/admin/lib/lang/pl_users.lng +++ b/interface/web/admin/lib/lang/pl_users.lng @@ -1,28 +1,29 @@ - + + diff --git a/interface/web/admin/lib/lang/pl_users_list.lng b/interface/web/admin/lib/lang/pl_users_list.lng index b628eae876f0c45379c0f99b1dc642c009f7ac31..f74bfb29527c7d11116e9a3c69a254046090da16 100644 --- a/interface/web/admin/lib/lang/pl_users_list.lng +++ b/interface/web/admin/lib/lang/pl_users_list.lng @@ -1,9 +1,10 @@ -WARNING: Do not edit or modify any user settings here. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!'; -?> +OSTRZEŻENIE: Nie edytuj żadnych ustawień tutaj. Użyj do tego celu ustawień Klienta i Resellera w module Klienta. Zmiana użytkowników i grup w tym miejscu może spowodować utratę danych!"; +?> + diff --git a/interface/web/client/client_del.php b/interface/web/client/client_del.php index 184b8f2488069a352067f1729dacbc8109c94ff9..ffb858b3793aebd284ee7d9910f6db68d7c78977 100644 --- a/interface/web/client/client_del.php +++ b/interface/web/client/client_del.php @@ -54,6 +54,9 @@ class page_action extends tform_actions { function onDelete() { global $app, $conf,$list_def_file,$tform_def_file; + // Loading tform framework + if(!is_object($app->tform)) $app->uses('tform'); + if($_POST["confirm"] == 'yes') { parent::onDelete(); } else { @@ -63,17 +66,16 @@ class page_action extends tform_actions { $app->tpl->setInclude('content_tpl', 'templates/client_del.htm'); include_once($list_def_file); - - // Loading tform framework - if(!is_object($app->tform)) $app->uses('tform'); - - // Load table definition from file + + // Load table definition from file $app->tform->loadFormDef($tform_def_file); $this->id = intval($_REQUEST["id"]); $this->dataRecord = $app->tform->getDataRecord($this->id); $client_id = intval($this->dataRecord['client_id']); + + //$parent_client_id = intval($this->dataRecord['parent_client_id']); //$parent_user = $app->db->queryOneRecord("SELECT userid FROM sys_user WHERE client_id = $parent_client_id"); $client_group = $app->db->queryOneRecord("SELECT groupid FROM sys_group WHERE client_id = $client_id"); @@ -82,6 +84,7 @@ class page_action extends tform_actions { $tables = 'client,dns_rr,dns_soa,dns_slave,ftp_user,mail_access,mail_content_filter,mail_domain,mail_forwarding,mail_get,mail_user,mail_user_filter,shell_user,spamfilter_users,support_message,web_database,web_domain,web_traffic'; $tables_array = explode(',',$tables); $client_group_id = intval($client_group['groupid']); + $table_list = array(); if($client_group_id > 1) { foreach($tables_array as $table) { diff --git a/interface/web/client/lib/lang/nl.lng b/interface/web/client/lib/lang/nl.lng index 0071fa28f75b5e2c324dc261c56c9cf19fb2b8dc..1c76b4134715ef038cc7f102908c4975978666d3 100644 --- a/interface/web/client/lib/lang/nl.lng +++ b/interface/web/client/lib/lang/nl.lng @@ -1,13 +1,16 @@ - + + + diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng index 8010aa0bff36b41b54afe4da4613028107cba6c9..d9a50600efd4ea98bd5e020418ec9507a8db819f 100644 --- a/interface/web/client/lib/lang/nl_client.lng +++ b/interface/web/client/lib/lang/nl_client.lng @@ -1,101 +1,107 @@ - + + + + diff --git a/interface/web/client/lib/lang/nl_client_del.lng b/interface/web/client/lib/lang/nl_client_del.lng index a896cbd3cde99f261d9f9b970d69553e011b11ca..919366455151cd422aff27bb41ad26a4082b40fc 100644 --- a/interface/web/client/lib/lang/nl_client_del.lng +++ b/interface/web/client/lib/lang/nl_client_del.lng @@ -1,6 +1,9 @@ - + + + + diff --git a/interface/web/client/lib/lang/nl_client_template.lng b/interface/web/client/lib/lang/nl_client_template.lng index de6681d4ff80c9e1e1267c2ec9fbd93951294500..bc753c93fe28bfbffde311094ff34daf95f1717e 100644 --- a/interface/web/client/lib/lang/nl_client_template.lng +++ b/interface/web/client/lib/lang/nl_client_template.lng @@ -1,63 +1,67 @@ - + + + diff --git a/interface/web/client/lib/lang/nl_client_template_list.lng b/interface/web/client/lib/lang/nl_client_template_list.lng index 333aeb5bb5fec5a685d5c2b69d9378faa786bffc..44d9d26770ad019f0a14af45639de9a56f993588 100644 --- a/interface/web/client/lib/lang/nl_client_template_list.lng +++ b/interface/web/client/lib/lang/nl_client_template_list.lng @@ -1,5 +1,8 @@ - + + + + diff --git a/interface/web/client/lib/lang/nl_clients_list.lng b/interface/web/client/lib/lang/nl_clients_list.lng index 0309a475ddbe2ea06b09c4f754e5ee9db606ac0a..d0ffbd570576ec4a2c97ee50bc17c5da99e84462 100644 --- a/interface/web/client/lib/lang/nl_clients_list.lng +++ b/interface/web/client/lib/lang/nl_clients_list.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/client/lib/lang/nl_reseller.lng b/interface/web/client/lib/lang/nl_reseller.lng index c4089ae383e59bd5c1f3c7c73e97ec232124f1d9..74084150cca1ad995da7168ab691f9280a2760cd 100644 --- a/interface/web/client/lib/lang/nl_reseller.lng +++ b/interface/web/client/lib/lang/nl_reseller.lng @@ -1,99 +1,104 @@ - + 0'; +$wb["limit_web_quota_txt"] = 'Web Quota'; +$wb["limit_traffic_quota_txt"] = 'Traffic Quota'; +$wb["limit_trafficquota_error_notint"] = 'Traffic Quota moet een numerieke waarde zijn.'; +$wb["customer_no_txt"] = 'Klant nr.'; +$wb["vat_id_txt"] = 'BTW ID'; +$wb["required_fields_txt"] = '* Verplichte velden'; +?> + + + diff --git a/interface/web/client/lib/lang/nl_resellers_list.lng b/interface/web/client/lib/lang/nl_resellers_list.lng index dd5fd53db06a1b7de19e75fa2d9de10c0f8d4065..a2c9e342014afa9f77a3a388a5597dd26ddc1ac7 100644 --- a/interface/web/client/lib/lang/nl_resellers_list.lng +++ b/interface/web/client/lib/lang/nl_resellers_list.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/client/lib/lang/pl.lng b/interface/web/client/lib/lang/pl.lng index 771c3b2c20863a8a1ccc6c26015e59f929789b6a..f94b0bdc63e4565f9c5519f00993bd370d61be91 100644 --- a/interface/web/client/lib/lang/pl.lng +++ b/interface/web/client/lib/lang/pl.lng @@ -1,13 +1,14 @@ - + + diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng index 88315498ded459f86a2c3eb79c4f4930e5f26fa5..f65a5f6999339e4eb74a7b50ee080f18500ea7d9 100644 --- a/interface/web/client/lib/lang/pl_client.lng +++ b/interface/web/client/lib/lang/pl_client.lng @@ -1,101 +1,102 @@ - + + diff --git a/interface/web/client/lib/lang/pl_client_del.lng b/interface/web/client/lib/lang/pl_client_del.lng index a826d64e146cd9085debb382f71c3357966bb1f6..e36fd8e78aac3f3a559cf205d3621f10d73d10bc 100644 --- a/interface/web/client/lib/lang/pl_client_del.lng +++ b/interface/web/client/lib/lang/pl_client_del.lng @@ -1,6 +1,7 @@ - + + diff --git a/interface/web/client/lib/lang/pl_client_template.lng b/interface/web/client/lib/lang/pl_client_template.lng index 7899ba008921256c21f8f0ab9a525c8a816cf52c..7252107ac0f8340fbf28503ea86b720236c4facc 100644 --- a/interface/web/client/lib/lang/pl_client_template.lng +++ b/interface/web/client/lib/lang/pl_client_template.lng @@ -1,63 +1,64 @@ - + + diff --git a/interface/web/client/lib/lang/pl_client_template_list.lng b/interface/web/client/lib/lang/pl_client_template_list.lng index 06a39761f9af7d4a0191b4ed73b0b3a22b0d5541..761257dd570ecd78cdf1059d716364466ef01bf3 100644 --- a/interface/web/client/lib/lang/pl_client_template_list.lng +++ b/interface/web/client/lib/lang/pl_client_template_list.lng @@ -1,5 +1,6 @@ - + + diff --git a/interface/web/client/lib/lang/pl_clients_list.lng b/interface/web/client/lib/lang/pl_clients_list.lng index 81f0bd8552b0cee801c453d67b0ead9ff15d49e1..cb110d5ba8ff2a6d6ae803f7cd9bebb0f01fd608 100644 --- a/interface/web/client/lib/lang/pl_clients_list.lng +++ b/interface/web/client/lib/lang/pl_clients_list.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/client/lib/lang/pl_reseller.lng b/interface/web/client/lib/lang/pl_reseller.lng index 1cb16721a9d9d147da9e4b4e2717cfefd860aac2..c62a84a9b084b65386af20f1bf192a2957f97afe 100644 --- a/interface/web/client/lib/lang/pl_reseller.lng +++ b/interface/web/client/lib/lang/pl_reseller.lng @@ -1,99 +1,100 @@ - 0'; -$wb['limit_web_quota_txt'] = 'Web Quota'; -$wb['limit_traffic_quota_txt'] = 'Traffic Quota'; -$wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.'; -$wb['customer_no_txt'] = 'Customer No.'; -$wb['vat_id_txt'] = 'VAT ID'; -$wb['required_fields_txt'] = '* Required fields'; -?> + 0"; +$wb['limit_web_quota_txt'] = "Limit przestrzeni"; +$wb['limit_traffic_quota_txt'] = "Limit transferu"; +$wb['limit_trafficquota_error_notint'] = "Limit transferu musi być liczbą"; +$wb['customer_no_txt'] = "Klient nr"; +$wb['vat_id_txt'] = "NIP"; +$wb['required_fields_txt'] = "* Wymagane pola"; +?> + diff --git a/interface/web/client/lib/lang/pl_resellers_list.lng b/interface/web/client/lib/lang/pl_resellers_list.lng index 51abc411a5f00ee3d8ad1ebe98679235e1dfcd32..e8efd25316fd9f9e377d4da1fc19058507c17ae9 100644 --- a/interface/web/client/lib/lang/pl_resellers_list.lng +++ b/interface/web/client/lib/lang/pl_resellers_list.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/client/lib/module.conf.php b/interface/web/client/lib/module.conf.php index c6fea586e0f2d4aa30526bcfb46d6189dde34ed8..f37461d0d9740fe6ded82fad3b8200d5caf15aa7 100644 --- a/interface/web/client/lib/module.conf.php +++ b/interface/web/client/lib/module.conf.php @@ -11,17 +11,19 @@ $module["tab_width"] = ''; */ -$items[] = array( 'title' => "Add Client", - 'target' => 'content', - 'link' => 'client/client_edit.php', - 'html_id' => 'client_add'); + $items[] = array( 'title' => "Edit Client", 'target' => 'content', 'link' => 'client/client_list.php', 'html_id' => 'client_list'); -if($_SESSION["s"]["user"]["typ"] == 'admin'){ +$items[] = array( 'title' => "Add Client", + 'target' => 'content', + 'link' => 'client/client_edit.php', + 'html_id' => 'client_add'); + + if($_SESSION["s"]["user"]["typ"] == 'admin'){ $items[] = array( 'title' => "Edit Client-Templates", 'target' => 'content', 'link' => 'client/client_template_list.php', @@ -37,16 +39,16 @@ unset($items); if($_SESSION["s"]["user"]["typ"] == 'admin'){ -$items[] = array( 'title' => "Add Reseller", - 'target' => 'content', - 'link' => 'client/reseller_edit.php', - 'html_id' => 'reseller_add'); - $items[] = array( 'title' => "Edit Reseller", 'target' => 'content', 'link' => 'client/reseller_list.php', 'html_id' => 'reseller_list'); +$items[] = array( 'title' => "Add Reseller", + 'target' => 'content', + 'link' => 'client/reseller_edit.php', + 'html_id' => 'reseller_add'); + $module["nav"][] = array( 'title' => 'Resellers', 'open' => 1, 'items' => $items); diff --git a/interface/web/dashboard/dashboard.php b/interface/web/dashboard/dashboard.php index a874affb1c73c95c46df543474785a017db007d3..02770587487aff067d944db3ed2b060508d1fe99 100644 --- a/interface/web/dashboard/dashboard.php +++ b/interface/web/dashboard/dashboard.php @@ -92,7 +92,19 @@ $info = array(); if($_SESSION["s"]["user"]["typ"] == 'admin') { $new_version = @file_get_contents('http://www.ispconfig.org/downloads/ispconfig3_version.txt'); $new_version = trim($new_version); - if($new_version != ISPC_APP_VERSION) { + $this_version = explode(".",ISPC_APP_VERSION); + $this_fullversion = (($this_version[0] < 10) ? '0'.$this_version[0] : $this_version[0]) . + (($this_version[1] < 10) ? '0'.$this_version[1] : $this_version[1]) . + (($this_version[2] < 10) ? '0'.$this_version[2] : $this_version[2]) . + (($this_version[3] < 10) ? (($this_version[3] < 1) ? '00' : '0'.$this_version[3]) : $this_version[3]); + + + $new_version = explode(".",$new_version); + $new_fullversion = (($new_version[0] < 10) ? '0'.$new_version[0] : $new_version[0]) . + (($new_version[1] < 10) ? '0'.$new_version[1] : $new_version[1]) . + (($new_version[2] < 10) ? '0'.$new_version[2] : $new_version[2]) . + (($new_version[3] < 10) ? (($new_version[3] < 1) ? '00' : '0'.$new_version[3]) : $new_version[3]); + if($new_fullversion > $this_fullversion) { $info[] = array('info_msg' => 'There is a new Version of ISPConfig 3 available! See more...'); } } diff --git a/interface/web/dashboard/lib/lang/nl.lng b/interface/web/dashboard/lib/lang/nl.lng index 246054599fc1e41cbac86df2f063020ae5299c81..72fd5b56565114d336aa53f44d50273367ea1543 100644 --- a/interface/web/dashboard/lib/lang/nl.lng +++ b/interface/web/dashboard/lib/lang/nl.lng @@ -1,4 +1,7 @@ - + + + + diff --git a/interface/web/dashboard/lib/lang/nl_dashlet_limits.lng b/interface/web/dashboard/lib/lang/nl_dashlet_limits.lng index 9b65b6c1af2508d713a67627ed9469fc46d7a355..3ef33ca64fcfffa3821a7850173d48b06f0945dc 100644 --- a/interface/web/dashboard/lib/lang/nl_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/nl_dashlet_limits.lng @@ -1,29 +1,32 @@ - + + + + diff --git a/interface/web/dashboard/lib/lang/nl_dashlet_modules.lng b/interface/web/dashboard/lib/lang/nl_dashlet_modules.lng index 6a02127a06c631b8a9ff25a2b5b7be86e08beb8b..dc5ce84e7b3eda707cd079a90dcd00178840ef7c 100644 --- a/interface/web/dashboard/lib/lang/nl_dashlet_modules.lng +++ b/interface/web/dashboard/lib/lang/nl_dashlet_modules.lng @@ -1,3 +1,6 @@ - + + + + diff --git a/interface/web/dashboard/lib/lang/pl.lng b/interface/web/dashboard/lib/lang/pl.lng index 246054599fc1e41cbac86df2f063020ae5299c81..a7566933adaf205872ee53aaa821d9dbddd14f5b 100644 --- a/interface/web/dashboard/lib/lang/pl.lng +++ b/interface/web/dashboard/lib/lang/pl.lng @@ -1,4 +1,5 @@ - + + diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng b/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng index 9b65b6c1af2508d713a67627ed9469fc46d7a355..e7472b079cb90938e5c87b26c7878192dbc6213a 100644 --- a/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng +++ b/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng @@ -1,29 +1,30 @@ - + + diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng b/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng index 6a02127a06c631b8a9ff25a2b5b7be86e08beb8b..ab24d80c0b6e0b6c8961f2838364c31edaa5a74c 100644 --- a/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng +++ b/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng @@ -1,3 +1,4 @@ - + + diff --git a/interface/web/designer/lib/lang/nl.lng b/interface/web/designer/lib/lang/nl.lng index acb6c3546c6150b4edbafb782d3ed85c499210b5..5493b5d2d8d6ef242852835e482d7b23823c321e 100644 --- a/interface/web/designer/lib/lang/nl.lng +++ b/interface/web/designer/lib/lang/nl.lng @@ -1,2 +1,5 @@ - + + + diff --git a/interface/web/designer/lib/lang/nl_form_edit.lng b/interface/web/designer/lib/lang/nl_form_edit.lng index bdc7642379edf376f4ccb94b7e687ee0ad3e0f68..140a3a7844d5f88f170da5fa61af0a8f286c76be 100644 --- a/interface/web/designer/lib/lang/nl_form_edit.lng +++ b/interface/web/designer/lib/lang/nl_form_edit.lng @@ -1,24 +1,28 @@ - + + + diff --git a/interface/web/designer/lib/lang/nl_form_list.lng b/interface/web/designer/lib/lang/nl_form_list.lng index 2da97250464f17f7f6a30d7942704569bd7b494c..5e4ef81d19feaa89379d889824f40df4d8f4d3b6 100644 --- a/interface/web/designer/lib/lang/nl_form_list.lng +++ b/interface/web/designer/lib/lang/nl_form_list.lng @@ -1,7 +1,9 @@ - + + + diff --git a/interface/web/designer/lib/lang/nl_form_show.lng b/interface/web/designer/lib/lang/nl_form_show.lng index 1c82ea156116f2d479e4476e467a3d2b02bb820e..7414f5fef3de3bf2ebb2d0d29894ce879504a7bc 100644 --- a/interface/web/designer/lib/lang/nl_form_show.lng +++ b/interface/web/designer/lib/lang/nl_form_show.lng @@ -1,18 +1,20 @@ - + + + diff --git a/interface/web/designer/lib/lang/nl_module_edit.lng b/interface/web/designer/lib/lang/nl_module_edit.lng index f4234dc28b098c405053f8eb65a2aa67e89534c0..f56a82a61f5d89edbc5aac4aef1380a9a0a996bf 100644 --- a/interface/web/designer/lib/lang/nl_module_edit.lng +++ b/interface/web/designer/lib/lang/nl_module_edit.lng @@ -1,22 +1,25 @@ -Description

-Modulename: Naam van de module directory. Alleen cijfers, letters en underscore zijn toegestaan.
-Moduletitle: Zal worden getoond in de hoofdnavigatie (bovenaan).
-Template file: Template bestand van de module. Momenteel beschikbaar: module.tpl.htm en module_tree.tpl.htm. Standaard is de module.tpl.htm.
-NaviFrame: Als de module_tree.tpl.htm geselecteerd is als template bestand, geef het pad op dat verwijst naar het scriptbestand voor het linker frame.
-Default page: Deze pagina wordt getoont wanneer de module is geopend.
-Tab width: Tabbreedte in de hoofdnavigatie. Het veld is standaard leeg. U kunt absolute waarden opgeven in pixels (bijv. 20) of relatieve (bijv. 20%).
-Hint: Alle paden zijn relatief aan de directorie web. -'; -?> +Modulename: Naam van de module directory. Alleen numerieke waarden, karakters en underscore zijn toegestaan.
+Moduletitle: Worden weergegeven in de (bovenste) hoofd navigatiebalk.
+Template file: Template bestand van de module. Momenteel beschikbaar: module.tpl.htm and module_tree.tpl.htm. Standaard is module.tpl.htm.
+NaviFrame: Als module_tree.tpl.htm is geselecteerd als template bestand, geef hier dan het pad op naar het script bestand voor het linker frame.
+Default page: Deze pagina wordt weergegeven wanneer de module is geopened.
+Tab width: Breedte van de tabs in de hoofdnavigatiebalk. Dit veld is standaard leeg. U kunt hier absulute pixel waarden invoeren (bijv. 20) of relatief (bijv. 20%).
+Hint: Alle paden zijn relatief tot de directory "web". +'; + +?> + + diff --git a/interface/web/designer/lib/lang/nl_module_list.lng b/interface/web/designer/lib/lang/nl_module_list.lng index 19ea5e94412eda34aca475d8a7b2a88ab34e7c83..c2b9989ab9be25fe96abe0d0166debda587fe255 100644 --- a/interface/web/designer/lib/lang/nl_module_list.lng +++ b/interface/web/designer/lib/lang/nl_module_list.lng @@ -1,5 +1,7 @@ - + + + diff --git a/interface/web/designer/lib/lang/nl_module_nav_edit.lng b/interface/web/designer/lib/lang/nl_module_nav_edit.lng index 504b7f754b7cb0e436093c54c837174719c03f7b..6187b34caf4961b72a7127b017dcb8ff0b92b8d9 100644 --- a/interface/web/designer/lib/lang/nl_module_nav_edit.lng +++ b/interface/web/designer/lib/lang/nl_module_nav_edit.lng @@ -1,6 +1,8 @@ - + + + diff --git a/interface/web/designer/lib/lang/nl_module_nav_item_edit.lng b/interface/web/designer/lib/lang/nl_module_nav_item_edit.lng index 4c2bddd617c493b2e8f118ad6d132a17903b58d8..122273850a26464b07d7008d18f0ce4f8995627b 100644 --- a/interface/web/designer/lib/lang/nl_module_nav_item_edit.lng +++ b/interface/web/designer/lib/lang/nl_module_nav_item_edit.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/designer/lib/lang/nl_module_show.lng b/interface/web/designer/lib/lang/nl_module_show.lng index 8f605e40fd526a318dbddd4fd75f7d92b6524e02..ceed1c15d3cba794b9b1d273c624b54805742f94 100644 --- a/interface/web/designer/lib/lang/nl_module_show.lng +++ b/interface/web/designer/lib/lang/nl_module_show.lng @@ -1,16 +1,19 @@ - + + + diff --git a/interface/web/designer/lib/lang/pl.lng b/interface/web/designer/lib/lang/pl.lng index acb6c3546c6150b4edbafb782d3ed85c499210b5..75c42c807a4b617b8fe9048defb206bc87ec8acf 100644 --- a/interface/web/designer/lib/lang/pl.lng +++ b/interface/web/designer/lib/lang/pl.lng @@ -1,2 +1,3 @@ - + + diff --git a/interface/web/designer/lib/lang/pl_form_edit.lng b/interface/web/designer/lib/lang/pl_form_edit.lng index ee4f4c4100e9e738dc9b2f5c7f5594484ee56437..5a09bf23ff7d4cb418089a60d40071746abe1f81 100644 --- a/interface/web/designer/lib/lang/pl_form_edit.lng +++ b/interface/web/designer/lib/lang/pl_form_edit.lng @@ -1,24 +1,25 @@ - + + diff --git a/interface/web/designer/lib/lang/pl_form_list.lng b/interface/web/designer/lib/lang/pl_form_list.lng index ac8572277cb0fbbd23843e783026585f5e1f2007..e11c1e90be275939947f71935026cee614ef8448 100644 --- a/interface/web/designer/lib/lang/pl_form_list.lng +++ b/interface/web/designer/lib/lang/pl_form_list.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/designer/lib/lang/pl_form_show.lng b/interface/web/designer/lib/lang/pl_form_show.lng index db62af16b9cf666744f2013b0e99fb698e1f62d2..7e690c71f5469dd419bf2799917c63cc06faf728 100644 --- a/interface/web/designer/lib/lang/pl_form_show.lng +++ b/interface/web/designer/lib/lang/pl_form_show.lng @@ -1,18 +1,19 @@ - + + diff --git a/interface/web/designer/lib/lang/pl_module_edit.lng b/interface/web/designer/lib/lang/pl_module_edit.lng index 691e55052ff0394ab589f7f1ed28743d83deb1aa..4ba343b45f526c284fd5ecd1827040c70aa5e68e 100644 --- a/interface/web/designer/lib/lang/pl_module_edit.lng +++ b/interface/web/designer/lib/lang/pl_module_edit.lng @@ -1,13 +1,13 @@ -Opis

@@ -18,5 +18,6 @@ $wb['description_txt'] = ' Strona domyślna: Ta strona będzie otwierana na początku podczas otwarcia modułu.
Szerokość zakładki: Szerokość zakładek w głownym menu nawigacyjnym. To pole jest domyślnie puste. Możesz podać wartość w pikselach (np.: 20) lub procentach (np.: 20%).
Podpowiedź: Wszystkie ścieżki są względne według strony www.. -'; -?> +'; +?> + diff --git a/interface/web/designer/lib/lang/pl_module_list.lng b/interface/web/designer/lib/lang/pl_module_list.lng index 308d1c688bc14a1cf611cb4c876126a5c2e4a43c..fb63f774b8645f330fb201e84a0f7520702ac460 100644 --- a/interface/web/designer/lib/lang/pl_module_list.lng +++ b/interface/web/designer/lib/lang/pl_module_list.lng @@ -1,5 +1,6 @@ - + + diff --git a/interface/web/designer/lib/lang/pl_module_nav_edit.lng b/interface/web/designer/lib/lang/pl_module_nav_edit.lng index 5ace229a908caaabf6496cf3b0e31abf7e5a8a6d..883fe863bc24b4a6dc1b47042b1a9f4df26047e1 100644 --- a/interface/web/designer/lib/lang/pl_module_nav_edit.lng +++ b/interface/web/designer/lib/lang/pl_module_nav_edit.lng @@ -1,6 +1,7 @@ - + + diff --git a/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng b/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng index 779b3b4b3b418efa60072e2a7d9480b68a80606c..8832400eed700bc11cfd1fdccc6b4f5f23fc08e4 100644 --- a/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng +++ b/interface/web/designer/lib/lang/pl_module_nav_item_edit.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/designer/lib/lang/pl_module_show.lng b/interface/web/designer/lib/lang/pl_module_show.lng index 9b98c4948239a2b8d5717ade5e90a2d8e2ca10ec..9f1783e452740a433bfa5c0fa62404c1374bfd4a 100644 --- a/interface/web/designer/lib/lang/pl_module_show.lng +++ b/interface/web/designer/lib/lang/pl_module_show.lng @@ -1,16 +1,17 @@ - + + diff --git a/interface/web/dns/lib/lang/nl.lng b/interface/web/dns/lib/lang/nl.lng index 56e5386c5347d7cb68b087aa59624513fb2be46d..6d0c7e4f0187b1e6650f63e9f49333a83137748d 100644 --- a/interface/web/dns/lib/lang/nl.lng +++ b/interface/web/dns/lib/lang/nl.lng @@ -1,20 +1,24 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_a.lng b/interface/web/dns/lib/lang/nl_dns_a.lng index 32bab7464b27bd1c04e214eee07bededb7413b2d..ac304f89876c3ab8b5e3d631804a3522f362de42 100644 --- a/interface/web/dns/lib/lang/nl_dns_a.lng +++ b/interface/web/dns/lib/lang/nl_dns_a.lng @@ -1,16 +1,18 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_a_list.lng b/interface/web/dns/lib/lang/nl_dns_a_list.lng index 9ffacd242cc258da36334e0c36e4bef2432d0348..b167f1139074271df81703ee6820188e0dc19057 100644 --- a/interface/web/dns/lib/lang/nl_dns_a_list.lng +++ b/interface/web/dns/lib/lang/nl_dns_a_list.lng @@ -1,14 +1,16 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_aaaa.lng b/interface/web/dns/lib/lang/nl_dns_aaaa.lng index c40ae84d93ff60bccdc74e24cf5e4be2d8bc1300..9c7c966826f299373979bfb9776159caaad91fb6 100644 --- a/interface/web/dns/lib/lang/nl_dns_aaaa.lng +++ b/interface/web/dns/lib/lang/nl_dns_aaaa.lng @@ -1,15 +1,17 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_alias.lng b/interface/web/dns/lib/lang/nl_dns_alias.lng index 2f9cccf72da697aadf0c4196edd657fc829a2574..585856fbfd0cd3a0089fb9cf72dffe9bd6c5c871 100644 --- a/interface/web/dns/lib/lang/nl_dns_alias.lng +++ b/interface/web/dns/lib/lang/nl_dns_alias.lng @@ -1,15 +1,17 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_cname.lng b/interface/web/dns/lib/lang/nl_dns_cname.lng index 3ffd246f09423187c394109eb184853da5758106..93e1d4812ac5b7a361ea22392e6b3cae32fd146a 100644 --- a/interface/web/dns/lib/lang/nl_dns_cname.lng +++ b/interface/web/dns/lib/lang/nl_dns_cname.lng @@ -1,16 +1,18 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_hinfo.lng b/interface/web/dns/lib/lang/nl_dns_hinfo.lng index a7287c4236e0bb512076d2b50f946c80219feadb..bc2007ffca14ae41d8456ccd98371e7782a0f58d 100644 --- a/interface/web/dns/lib/lang/nl_dns_hinfo.lng +++ b/interface/web/dns/lib/lang/nl_dns_hinfo.lng @@ -1,15 +1,17 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_mx.lng b/interface/web/dns/lib/lang/nl_dns_mx.lng index f93195c1b997f4bcc606008df44471675448270d..1f91060d0d394c9556ec518530da53a2b0f4dc8c 100644 --- a/interface/web/dns/lib/lang/nl_dns_mx.lng +++ b/interface/web/dns/lib/lang/nl_dns_mx.lng @@ -1,16 +1,18 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_ns.lng b/interface/web/dns/lib/lang/nl_dns_ns.lng index 75a91b41d654faf3dc6231c6a185ae5d2323bb54..26b51efcd39e8a36ffce3b390d4752a79e27d097 100644 --- a/interface/web/dns/lib/lang/nl_dns_ns.lng +++ b/interface/web/dns/lib/lang/nl_dns_ns.lng @@ -1,15 +1,17 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_ptr.lng b/interface/web/dns/lib/lang/nl_dns_ptr.lng index 4bd156388de5c0b04f47213646ee554d6cdcbef5..392f160f45c172a7dcb9b173bdc1cfe131d780fb 100644 --- a/interface/web/dns/lib/lang/nl_dns_ptr.lng +++ b/interface/web/dns/lib/lang/nl_dns_ptr.lng @@ -1,15 +1,17 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_rp.lng b/interface/web/dns/lib/lang/nl_dns_rp.lng index 1195406a1e6eb6f38f1703b725e6a79f3204bd7d..b1f3673dda8d3e19d0b2b3e277d958579c04d2be 100644 --- a/interface/web/dns/lib/lang/nl_dns_rp.lng +++ b/interface/web/dns/lib/lang/nl_dns_rp.lng @@ -1,15 +1,17 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_slave.lng b/interface/web/dns/lib/lang/nl_dns_slave.lng index 469c98be9e03d62197c3906127e0feba256833c5..64ca1a2dd7ea5102256dfb682d5579fa24c2efa4 100644 --- a/interface/web/dns/lib/lang/nl_dns_slave.lng +++ b/interface/web/dns/lib/lang/nl_dns_slave.lng @@ -1,14 +1,17 @@ -these IPs (comma separated list)'; -$wb['server_id_error_empty'] = 'No server selected'; -$wb['origin_error_empty'] = 'Zone empty.'; -$wb['origin_error_unique'] = 'There is already a record for this zone.'; -$wb['origin_error_regex'] = 'Zone has a invalid format.'; -$wb['ns_error_regex'] = 'NS has a invalid format.'; -?> +deze IPs (komma gescheiden waarden)'; +$wb["server_id_error_empty"] = 'Geen server geselecteerd'; +$wb["origin_error_empty"] = 'Zone is niet ingvuld.'; +$wb["origin_error_unique"] = 'Er is al een record for deze zone.'; +$wb["origin_error_regex"] = 'Zone heeft een ongeldig formaat.'; +$wb["ns_error_regex"] = 'NS heeft een ongeldig formaat.'; +?> + + + diff --git a/interface/web/dns/lib/lang/nl_dns_slave_list.lng b/interface/web/dns/lib/lang/nl_dns_slave_list.lng index 788fd5347266627c851a50c6dc1f0f1e564238c1..e15aa9e81d0fbe40adffcbbd8d121566f77722d3 100644 --- a/interface/web/dns/lib/lang/nl_dns_slave_list.lng +++ b/interface/web/dns/lib/lang/nl_dns_slave_list.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_soa.lng b/interface/web/dns/lib/lang/nl_dns_soa.lng index e1d149aec9985385fb3919fb02d789751bcd5813..f9fb92974af32155a0f7f1af18c803c424879544 100644 --- a/interface/web/dns/lib/lang/nl_dns_soa.lng +++ b/interface/web/dns/lib/lang/nl_dns_soa.lng @@ -1,26 +1,28 @@ - +deze IPs (komma gescheiden waarden)'; +$wb["active_txt"] = 'Actief'; +$wb["limit_dns_zone_txt"] = 'Het max. aan DNS records voor uw account is bereikt.'; +$wb["client_txt"] = 'Klant'; +$wb["no_zone_perm"] = 'U heeft geen toestemming om een record toe te voegen aan deze DNS zone.'; +$wb["server_id_error_empty"] = 'Geen server geselecteerd'; +$wb["origin_error_empty"] = 'Zone is niet ingvuld.'; +$wb["origin_error_unique"] = 'Er is al een record voor deze zone.'; +$wb["origin_error_regex"] = 'Zone heeft een ongeldig format.'; +$wb["ns_error_regex"] = 'NS heeft een ongeldig format.'; +$wb["mbox_error_empty"] = 'E-mail is niet ingvuld.'; +$wb["mbox_error_regex"] = 'E-mail formaat ongeldig.'; +$wb["also_notify_txt"] = 'ook notifcatie'; +$wb["update_acl_txt"] = 'Update ACL'; +?> + + diff --git a/interface/web/dns/lib/lang/nl_dns_soa_list.lng b/interface/web/dns/lib/lang/nl_dns_soa_list.lng index 74983da12132e5f8991ff57e5423e682394165a0..56b3061a16c01e4b66f9af9a3605d176686eeeb4 100644 --- a/interface/web/dns/lib/lang/nl_dns_soa_list.lng +++ b/interface/web/dns/lib/lang/nl_dns_soa_list.lng @@ -1,10 +1,12 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_srv.lng b/interface/web/dns/lib/lang/nl_dns_srv.lng index bb6ed102ff282f1d065de4d61cfa5e0da3f19cd3..68e3b3bc8909608dccb61550024d8602636059ea 100644 --- a/interface/web/dns/lib/lang/nl_dns_srv.lng +++ b/interface/web/dns/lib/lang/nl_dns_srv.lng @@ -1,17 +1,19 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_template.lng b/interface/web/dns/lib/lang/nl_dns_template.lng index a6f8e0e9b15450ff5ce9e789b995d8e52fd3680b..fdaad7f6892150e9682b1ab7ba07a06ca947bb2a 100644 --- a/interface/web/dns/lib/lang/nl_dns_template.lng +++ b/interface/web/dns/lib/lang/nl_dns_template.lng @@ -1,6 +1,8 @@ -
Voorbeeld (in nieuw venster)'; -$wb['visible_txt'] = 'Geactiveerd voor DNS wizard?'; -?> + + + diff --git a/interface/web/dns/lib/lang/nl_dns_template_list.lng b/interface/web/dns/lib/lang/nl_dns_template_list.lng index 6ca214c55dcf6a7fe59cd2ab1676de4df12ce735..ea7ba2bc8be4f689f42cd9b8f7250e124b5188b6 100644 --- a/interface/web/dns/lib/lang/nl_dns_template_list.lng +++ b/interface/web/dns/lib/lang/nl_dns_template_list.lng @@ -1,6 +1,8 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_txt.lng b/interface/web/dns/lib/lang/nl_dns_txt.lng index 94dbb3f474a89000daa3ed1db183eede633ca004..550985b8bf1fe800e12dd845fb1381f28aacdd65 100644 --- a/interface/web/dns/lib/lang/nl_dns_txt.lng +++ b/interface/web/dns/lib/lang/nl_dns_txt.lng @@ -1,15 +1,17 @@ - + + + diff --git a/interface/web/dns/lib/lang/nl_dns_wizard.lng b/interface/web/dns/lib/lang/nl_dns_wizard.lng index e7093f01e9a6ae6bf8c2ffea458998cf95c8e41f..a406bddffd55625655cb721fe9086c7e07f76fd1 100644 --- a/interface/web/dns/lib/lang/nl_dns_wizard.lng +++ b/interface/web/dns/lib/lang/nl_dns_wizard.lng @@ -1,29 +1,32 @@ - + + + diff --git a/interface/web/dns/lib/lang/pl.lng b/interface/web/dns/lib/lang/pl.lng index 0a3f1a9fbe22fd7fc42ab2879016ebf2c2598e8f..a467ab6a8f0edbae2a87ff0ed4b3c3c59a9714a0 100644 --- a/interface/web/dns/lib/lang/pl.lng +++ b/interface/web/dns/lib/lang/pl.lng @@ -1,20 +1,21 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_a.lng b/interface/web/dns/lib/lang/pl_dns_a.lng index 4ad0a7c41a003c124a7db4c2bb7f45acc309a1e1..b612fff5cacff7ed2ff18972e482eec1c0ef1aad 100644 --- a/interface/web/dns/lib/lang/pl_dns_a.lng +++ b/interface/web/dns/lib/lang/pl_dns_a.lng @@ -1,16 +1,17 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_a_list.lng b/interface/web/dns/lib/lang/pl_dns_a_list.lng index 3d0db059b0f9945f7270daad3661ec34f0fce134..90ddca5e2a309e35df870fa86efac1b839679998 100644 --- a/interface/web/dns/lib/lang/pl_dns_a_list.lng +++ b/interface/web/dns/lib/lang/pl_dns_a_list.lng @@ -1,14 +1,15 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_aaaa.lng b/interface/web/dns/lib/lang/pl_dns_aaaa.lng index 983fae1a8c68172cd0126fad52d69ae066b0e1f3..6d3a3e7775b9477626d686b6af4fa0ca6959049b 100644 --- a/interface/web/dns/lib/lang/pl_dns_aaaa.lng +++ b/interface/web/dns/lib/lang/pl_dns_aaaa.lng @@ -1,15 +1,16 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_alias.lng b/interface/web/dns/lib/lang/pl_dns_alias.lng index a950805e3b4378caa7b4d4162242f4580ace4909..5e1b745bbf7b47fc4a0bdea797add488f6776d4b 100644 --- a/interface/web/dns/lib/lang/pl_dns_alias.lng +++ b/interface/web/dns/lib/lang/pl_dns_alias.lng @@ -1,15 +1,16 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_cname.lng b/interface/web/dns/lib/lang/pl_dns_cname.lng index 361c8e41b8f9f7535e5d614226c6ee39a6abd88e..1ec711bdb0ff578781a8960e62fd59b454cb3c43 100644 --- a/interface/web/dns/lib/lang/pl_dns_cname.lng +++ b/interface/web/dns/lib/lang/pl_dns_cname.lng @@ -1,16 +1,17 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_hinfo.lng b/interface/web/dns/lib/lang/pl_dns_hinfo.lng index 53b6da2265ca00e50f987b646e556435b8de04a5..1fcda15c132d8a66a25c3397840d6cedfde89d15 100644 --- a/interface/web/dns/lib/lang/pl_dns_hinfo.lng +++ b/interface/web/dns/lib/lang/pl_dns_hinfo.lng @@ -1,15 +1,16 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_mx.lng b/interface/web/dns/lib/lang/pl_dns_mx.lng index 4a3936a1b4a03a728d9d5fa2a37ad49cea18ba80..292f52fddf07a96eb2c3f96030f704d3e72fe3c5 100644 --- a/interface/web/dns/lib/lang/pl_dns_mx.lng +++ b/interface/web/dns/lib/lang/pl_dns_mx.lng @@ -1,16 +1,17 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_ns.lng b/interface/web/dns/lib/lang/pl_dns_ns.lng index 18d7efd6cd3d6310b129234e6e2152d24b540602..5f24910c3a30ddf6a482c3af0fe259887363f556 100644 --- a/interface/web/dns/lib/lang/pl_dns_ns.lng +++ b/interface/web/dns/lib/lang/pl_dns_ns.lng @@ -1,15 +1,16 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_ptr.lng b/interface/web/dns/lib/lang/pl_dns_ptr.lng index eae39817a0b36242ea5805da88414b963054eb7d..bc4486b2590da462d2ba7a2c30f1400f28e0891e 100644 --- a/interface/web/dns/lib/lang/pl_dns_ptr.lng +++ b/interface/web/dns/lib/lang/pl_dns_ptr.lng @@ -1,15 +1,16 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_rp.lng b/interface/web/dns/lib/lang/pl_dns_rp.lng index ece9346e32e6d704726fc4c9d528a73cd40bee19..c7917a80e7481d8d781370ce25c31da18a29b778 100644 --- a/interface/web/dns/lib/lang/pl_dns_rp.lng +++ b/interface/web/dns/lib/lang/pl_dns_rp.lng @@ -1,15 +1,16 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_slave.lng b/interface/web/dns/lib/lang/pl_dns_slave.lng index 469c98be9e03d62197c3906127e0feba256833c5..fe8bfe7c8bd82170e0951b0bdc352a54ad8b1d6f 100644 --- a/interface/web/dns/lib/lang/pl_dns_slave.lng +++ b/interface/web/dns/lib/lang/pl_dns_slave.lng @@ -1,14 +1,15 @@ -these IPs (comma separated list)'; -$wb['server_id_error_empty'] = 'No server selected'; -$wb['origin_error_empty'] = 'Zone empty.'; -$wb['origin_error_unique'] = 'There is already a record for this zone.'; -$wb['origin_error_regex'] = 'Zone has a invalid format.'; -$wb['ns_error_regex'] = 'NS has a invalid format.'; -?> +tych adresów IP (adresy rozdzielaj przecinkiem)"; +$wb['server_id_error_empty'] = "Nazwa serwera jest pusta."; +$wb['origin_error_empty'] = "Strefa jest pusta"; +$wb['origin_error_unique'] = "Jest już rekord w tej strefie."; +$wb['origin_error_regex'] = "Strefa ma niepoprawny format."; +$wb['ns_error_regex'] = "NS ma niepoprawny format."; +?> + diff --git a/interface/web/dns/lib/lang/pl_dns_slave_list.lng b/interface/web/dns/lib/lang/pl_dns_slave_list.lng index 788fd5347266627c851a50c6dc1f0f1e564238c1..5261e6492c061d0be45b6175c37f223bf8b3e2d3 100644 --- a/interface/web/dns/lib/lang/pl_dns_slave_list.lng +++ b/interface/web/dns/lib/lang/pl_dns_slave_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_soa.lng b/interface/web/dns/lib/lang/pl_dns_soa.lng index 868615e081ee625e332c7e7123ac2a371f0bc42b..feb18367f9f339e3825d7c55b9a762be01368cc1 100644 --- a/interface/web/dns/lib/lang/pl_dns_soa.lng +++ b/interface/web/dns/lib/lang/pl_dns_soa.lng @@ -1,26 +1,27 @@ -tych adresów IP (adresy rozdzielaj przecinkiem)'; -$wb['active_txt'] = 'Aktywny'; -$wb['limit_dns_zone_txt'] = 'Maksymalna ilość stref DNS dla Twojego konta została przekroczona.'; -$wb['client_txt'] = 'Klient'; -$wb['no_zone_perm'] = 'Nie masz uprawnień, aby dodać nowy wpis dla tej strefy DNS.'; -$wb['server_id_error_empty'] = 'Nie wybrano serwera'; -$wb['origin_error_empty'] = 'Strefa jest pusta.'; -$wb['origin_error_unique'] = 'Istnieje już wpis dla tej strefy.'; -$wb['origin_error_regex'] = 'Strefa ma niepoprawny format.'; -$wb['ns_error_regex'] = 'NS ma niepoprawny format.'; -$wb['mbox_error_empty'] = 'E-mail jest pusty.'; -$wb['mbox_error_regex'] = 'E-mail ma niepoprawny format.'; -$wb['also_notify_txt'] = 'Also Notify'; -$wb['update_acl_txt'] = 'Update ACL'; -?> +tych adresów IP (adresy rozdzielaj przecinkiem)"; +$wb['active_txt'] = "Aktywny"; +$wb['limit_dns_zone_txt'] = "Maksymalna ilość stref DNS dla Twojego konta została przekroczona."; +$wb['client_txt'] = "Klient"; +$wb['no_zone_perm'] = "Nie masz uprawnień, aby dodać nowy wpis dla tej strefy DNS."; +$wb['server_id_error_empty'] = "Nie wybrano serwera."; +$wb['origin_error_empty'] = "Strefa jest pusta."; +$wb['origin_error_unique'] = "Istnieje już wpis dla tej strefy."; +$wb['origin_error_regex'] = "Strefa ma niepoprawny format."; +$wb['ns_error_regex'] = "NS ma niepoprawny format."; +$wb['mbox_error_empty'] = "E-mail jest pusty."; +$wb['mbox_error_regex'] = "E-mail ma niepoprawny format."; +$wb['also_notify_txt'] = "Także powiadom"; +$wb['update_acl_txt'] = "Zaktualizuj ACL"; +?> + diff --git a/interface/web/dns/lib/lang/pl_dns_soa_list.lng b/interface/web/dns/lib/lang/pl_dns_soa_list.lng index 1841bca17d42c6c2877a66fc78b9baccdd0a9939..b99db5919c188d3adb16c298ab0854326a8ec7e3 100644 --- a/interface/web/dns/lib/lang/pl_dns_soa_list.lng +++ b/interface/web/dns/lib/lang/pl_dns_soa_list.lng @@ -1,10 +1,11 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_srv.lng b/interface/web/dns/lib/lang/pl_dns_srv.lng index 5c2a58403a198386c923aa0e32a47da2be7e8154..89434ab4779b5128e9f6e134bce55e9b61054103 100644 --- a/interface/web/dns/lib/lang/pl_dns_srv.lng +++ b/interface/web/dns/lib/lang/pl_dns_srv.lng @@ -1,17 +1,18 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_template.lng b/interface/web/dns/lib/lang/pl_dns_template.lng index f3e756357728ab5538d7c01600bc25c23439c1bc..49cc2c72012d445bd6ea71b428c8d24d155e253b 100644 --- a/interface/web/dns/lib/lang/pl_dns_template.lng +++ b/interface/web/dns/lib/lang/pl_dns_template.lng @@ -1,6 +1,7 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_template_list.lng b/interface/web/dns/lib/lang/pl_dns_template_list.lng index 7deac3b2fa01cc7f62d7b9865abe0b969912a5d0..a95d2328bdc94444f600dcccd1db79dc88acba21 100644 --- a/interface/web/dns/lib/lang/pl_dns_template_list.lng +++ b/interface/web/dns/lib/lang/pl_dns_template_list.lng @@ -1,6 +1,7 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_txt.lng b/interface/web/dns/lib/lang/pl_dns_txt.lng index 628d5c047edd2cf74335530a1704eeca49b3936f..82fda7369418cffe37b2804158cb7842bd607bbc 100644 --- a/interface/web/dns/lib/lang/pl_dns_txt.lng +++ b/interface/web/dns/lib/lang/pl_dns_txt.lng @@ -1,15 +1,16 @@ - + + diff --git a/interface/web/dns/lib/lang/pl_dns_wizard.lng b/interface/web/dns/lib/lang/pl_dns_wizard.lng index a5d6a90997b9b3b30433bff90dcbfc75e35fc056..f9bf276455b94407e97bc782661b4bdfa49a1672 100644 --- a/interface/web/dns/lib/lang/pl_dns_wizard.lng +++ b/interface/web/dns/lib/lang/pl_dns_wizard.lng @@ -1,29 +1,30 @@ - + + diff --git a/interface/web/domain/lib/lang/nl.lng b/interface/web/domain/lib/lang/nl.lng index d7d7dcf15e51721ac0a35ab3fe2d06e17a686eff..ecd41d7740041c93a3a278ce0e70cee1bb993ac9 100644 --- a/interface/web/domain/lib/lang/nl.lng +++ b/interface/web/domain/lib/lang/nl.lng @@ -1,9 +1,13 @@ -'; -?> +'; +?> + + + diff --git a/interface/web/domain/lib/lang/nl_domain.lng b/interface/web/domain/lib/lang/nl_domain.lng index a66a2258af7043759fcaec32ead09d70273191b6..5c9585ac9145936693e3d45eb7618b65e2e0c811 100644 --- a/interface/web/domain/lib/lang/nl_domain.lng +++ b/interface/web/domain/lib/lang/nl_domain.lng @@ -1,6 +1,9 @@ - + + + + diff --git a/interface/web/domain/lib/lang/nl_domain_list.lng b/interface/web/domain/lib/lang/nl_domain_list.lng index 331075936224d7b37c63355c4662bad510862e36..650aa63c7413556f4a98db2a52d783a82e3890fe 100644 --- a/interface/web/domain/lib/lang/nl_domain_list.lng +++ b/interface/web/domain/lib/lang/nl_domain_list.lng @@ -1,5 +1,7 @@ - + + + diff --git a/interface/web/domain/lib/lang/pl.lng b/interface/web/domain/lib/lang/pl.lng index d7d7dcf15e51721ac0a35ab3fe2d06e17a686eff..73bf675e11a83d8136e82b8d6804d2068bb0f674 100644 --- a/interface/web/domain/lib/lang/pl.lng +++ b/interface/web/domain/lib/lang/pl.lng @@ -1,9 +1,10 @@ -'; -?> +"; +?> + diff --git a/interface/web/domain/lib/lang/pl_domain.lng b/interface/web/domain/lib/lang/pl_domain.lng index a66a2258af7043759fcaec32ead09d70273191b6..6f3723d646195ddcee74864c95d00d1a281b6281 100644 --- a/interface/web/domain/lib/lang/pl_domain.lng +++ b/interface/web/domain/lib/lang/pl_domain.lng @@ -1,6 +1,7 @@ - + + diff --git a/interface/web/domain/lib/lang/pl_domain_list.lng b/interface/web/domain/lib/lang/pl_domain_list.lng index 331075936224d7b37c63355c4662bad510862e36..9e109e0c5585175b42854cd1b08fb8f18b83a538 100644 --- a/interface/web/domain/lib/lang/pl_domain_list.lng +++ b/interface/web/domain/lib/lang/pl_domain_list.lng @@ -1,5 +1,6 @@ - + + diff --git a/interface/web/help/lib/lang/nl.lng b/interface/web/help/lib/lang/nl.lng index 170c3d6ad361484d429941b8c9e0fc8d7f589242..6b3991df6b7cb672958e98e474c060458f56b1e2 100644 --- a/interface/web/help/lib/lang/nl.lng +++ b/interface/web/help/lib/lang/nl.lng @@ -1,9 +1,13 @@ - + + + + diff --git a/interface/web/help/lib/lang/nl_support_message.lng b/interface/web/help/lib/lang/nl_support_message.lng index d2aed4cb6c636e44011295924b612b0d3be4c0cd..59a0cc5137b0c1e9298dff980c33df1956a2bd3e 100644 --- a/interface/web/help/lib/lang/nl_support_message.lng +++ b/interface/web/help/lib/lang/nl_support_message.lng @@ -1,7 +1,10 @@ - + + + + diff --git a/interface/web/help/lib/lang/nl_support_message_list.lng b/interface/web/help/lib/lang/nl_support_message_list.lng index 0d7b2cb74bd9516378777100312970f2c209665c..3d1b6b7dd8de74026b67c9db3e8f14d510dee5f0 100644 --- a/interface/web/help/lib/lang/nl_support_message_list.lng +++ b/interface/web/help/lib/lang/nl_support_message_list.lng @@ -1,6 +1,8 @@ - + + + diff --git a/interface/web/help/lib/lang/pl.lng b/interface/web/help/lib/lang/pl.lng index 51ca7ccc8c93d24d6cb5184335cf915cb4957037..05fa558757b79beb7288ffe6fa9e2d2ec68fb3c4 100644 --- a/interface/web/help/lib/lang/pl.lng +++ b/interface/web/help/lib/lang/pl.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/help/lib/lang/pl_support_message.lng b/interface/web/help/lib/lang/pl_support_message.lng index b21539af2f907e15354f0344a9aa334ca7d5ac3c..7007f4aa006a66560909bd730f142655ebaf9cc4 100644 --- a/interface/web/help/lib/lang/pl_support_message.lng +++ b/interface/web/help/lib/lang/pl_support_message.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/help/lib/lang/pl_support_message_list.lng b/interface/web/help/lib/lang/pl_support_message_list.lng index bc3285694b816cdfd17997548828a5f1c9225b8a..f347d9a7c27bdfcd3e5cf85f897d830ced734e49 100644 --- a/interface/web/help/lib/lang/pl_support_message_list.lng +++ b/interface/web/help/lib/lang/pl_support_message_list.lng @@ -1,6 +1,7 @@ - + + diff --git a/interface/web/login/lib/lang/nl.lng b/interface/web/login/lib/lang/nl.lng index 46e1175c8ac1ece33e4b6dc7ef7a10a5139ff476..3e676a2325f24e4c60977063729cdc00300cf29a 100644 --- a/interface/web/login/lib/lang/nl.lng +++ b/interface/web/login/lib/lang/nl.lng @@ -1,17 +1,24 @@ - + 64 karakters.'; + +$wb['username_txt'] = "Gebruikersnaam"; +$wb['password_txt'] = "Wachtwoord"; +$wb['login_button_txt'] = "Login"; + +?> + + diff --git a/interface/web/login/lib/lang/pl.lng b/interface/web/login/lib/lang/pl.lng index 52f31b61b28f8107bc8bc6681fb0329ad25ea142..bbff64f328169bd8f1420e9739858bda49f962cf 100644 --- a/interface/web/login/lib/lang/pl.lng +++ b/interface/web/login/lib/lang/pl.lng @@ -1,17 +1,18 @@ - 64 znaki.'; -$wb['error_user_password_empty'] = 'Username or Password empty.'; -$wb['error_user_password_incorrect'] = 'Username or Password wrong.'; -$wb['error_user_blocked'] = 'User is blocked.'; -$wb['error_user_too_many_logins'] = 'To many wrong logins, Please retry it after 15 minutes'; -$wb['username_txt'] = 'Username'; -$wb['password_txt'] = 'Password'; -$wb['login_button_txt'] = 'Login'; -?> + 64 znaki."; +$wb['error_user_password_empty'] = "Pusta nazwa użytkownika lub hasło."; +$wb['error_user_password_incorrect'] = "Niepoprawna nazwa użytownika lub hasło."; +$wb['error_user_blocked'] = "Konto użytkownika zostało zablokowane."; +$wb['error_user_too_many_logins'] = "Zbyt dużo niepoprawnych logowań. Prosimy spróbować ponownie za 15 minut."; +$wb['username_txt'] = "Nazwa użytkownika"; +$wb['password_txt'] = "Hasło"; +$wb['login_button_txt'] = "Zaloguj"; +?> + diff --git a/interface/web/mail/lib/lang/de_mail_user.lng b/interface/web/mail/lib/lang/de_mail_user.lng index cfcac5e76d734a3463a0e9666faeabe14b0b3d82..7308396ff10142954475f27ef383d8cb4ee6e8bd 100644 --- a/interface/web/mail/lib/lang/de_mail_user.lng +++ b/interface/web/mail/lib/lang/de_mail_user.lng @@ -26,7 +26,7 @@ $wb['disableimap_txt'] = 'IMAP deaktivieren'; $wb['disablepop3_txt'] = 'POP3 deaktivieren'; $wb['password_strength_txt'] = 'Passwortkomplexität'; $wb['welcome_mail_fromname_txt'] = 'Support'; -$wb['welcome_mail_fromemail_txt'] = 'suppoert@localhost'; +$wb['welcome_mail_fromemail_txt'] = 'root@localhost'; $wb['duplicate_alias_or_forward_txt'] = 'Es existiert bereits ein Alias oder eine Weiterleitung mit dieser E-Mail Adresse.'; $wb['quota_error_value'] = 'Ungültige Quota Eingabe. Erlaubte Größen sind: 0 für unlimitiert oder Nummern > 1'; $wb['autoresponder_start_date_txt'] = 'Startet am'; diff --git a/interface/web/mail/lib/lang/nl.lng b/interface/web/mail/lib/lang/nl.lng index b903ae51c56392825d3688184ba33b805607ada1..3513a241ca4be570eae5ebc43594eb72008ea8ee 100644 --- a/interface/web/mail/lib/lang/nl.lng +++ b/interface/web/mail/lib/lang/nl.lng @@ -1,47 +1,53 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_alias.lng b/interface/web/mail/lib/lang/nl_mail_alias.lng index 5ee32421de8556722438d1de0dfca83ade48e369..a56cdb1890df666373b0e7290017fdac82cc572c 100644 --- a/interface/web/mail/lib/lang/nl_mail_alias.lng +++ b/interface/web/mail/lib/lang/nl_mail_alias.lng @@ -1,11 +1,13 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_alias_list.lng b/interface/web/mail/lib/lang/nl_mail_alias_list.lng index 28fe08fb00285ce6acf7566857755dabd81059e2..844e7f1505e74300cb50d0f2a9c31287c7bf7eec 100644 --- a/interface/web/mail/lib/lang/nl_mail_alias_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_alias_list.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_aliasdomain.lng b/interface/web/mail/lib/lang/nl_mail_aliasdomain.lng index c6d8352dc1333b38c5cbd4baf067faf3f76a9091..727a1367a3c419aa5721273cc9e0e66a1905eea1 100644 --- a/interface/web/mail/lib/lang/nl_mail_aliasdomain.lng +++ b/interface/web/mail/lib/lang/nl_mail_aliasdomain.lng @@ -1,11 +1,13 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/nl_mail_aliasdomain_list.lng index 860e583ae4347725e43b5db0292ee7a64160c37c..e2538961de878f7364a9f1703844b7bf42a7ef47 100644 --- a/interface/web/mail/lib/lang/nl_mail_aliasdomain_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_aliasdomain_list.lng @@ -1,7 +1,10 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_blacklist.lng b/interface/web/mail/lib/lang/nl_mail_blacklist.lng index f3dd2f4871bb0f3c2d7d89abaca44be92551c6cb..16dcb77c1c48ca88f394d0a183caa5b52e45a29e 100644 --- a/interface/web/mail/lib/lang/nl_mail_blacklist.lng +++ b/interface/web/mail/lib/lang/nl_mail_blacklist.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_blacklist_list.lng b/interface/web/mail/lib/lang/nl_mail_blacklist_list.lng index a44f067d055cf93529b8b65f814b1dc71636ccee..11e48b6ed8650cf17d34cfa66be9eb3e9ba022f3 100644 --- a/interface/web/mail/lib/lang/nl_mail_blacklist_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_blacklist_list.lng @@ -1,10 +1,12 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_content_filter.lng b/interface/web/mail/lib/lang/nl_mail_content_filter.lng index 97f102ad7f1920580b1e1d24c44adaffddaca971..067e4834480e2d4a328ee6de4cdbefed0aef7e15 100644 --- a/interface/web/mail/lib/lang/nl_mail_content_filter.lng +++ b/interface/web/mail/lib/lang/nl_mail_content_filter.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_content_filter_list.lng b/interface/web/mail/lib/lang/nl_mail_content_filter_list.lng index bb92651dcc455cd009e94d122ffdd0bfa7a9a750..fd9489cc31596b90fc18fd609dfadf3b84691a33 100644 --- a/interface/web/mail/lib/lang/nl_mail_content_filter_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_content_filter_list.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_domain.lng b/interface/web/mail/lib/lang/nl_mail_domain.lng index 5fbdeac2738653202c81578fd67b247a31042b88..cdc1f8ff9069637b2d191be3dc12cab467c9b5ff 100644 --- a/interface/web/mail/lib/lang/nl_mail_domain.lng +++ b/interface/web/mail/lib/lang/nl_mail_domain.lng @@ -1,13 +1,15 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/nl_mail_domain_admin_list.lng index aaab4b433e0605ab76cc288a46a340b2fad5377b..57d1b748f9f28a0608f4961177770ef7a16293d7 100644 --- a/interface/web/mail/lib/lang/nl_mail_domain_admin_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_domain_admin_list.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_domain_catchall.lng b/interface/web/mail/lib/lang/nl_mail_domain_catchall.lng index d68f7d821d8c241766ce1f884bfd4a185a59cebe..f4d79a91235fc7a36814f05d8912405e5180d46d 100644 --- a/interface/web/mail/lib/lang/nl_mail_domain_catchall.lng +++ b/interface/web/mail/lib/lang/nl_mail_domain_catchall.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/nl_mail_domain_catchall_list.lng index 379f879aa06dd7d26bde69bb5ffa158b2db9e0af..445135cf23c65eea27b2f19eac3e9d9084c1b378 100644 --- a/interface/web/mail/lib/lang/nl_mail_domain_catchall_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_domain_catchall_list.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_domain_list.lng b/interface/web/mail/lib/lang/nl_mail_domain_list.lng index 0218e9c59f4b149e38e52f57bd6eb0673eae439a..0a6711e5907182692c9c5b4728907d8c1a25dff3 100644 --- a/interface/web/mail/lib/lang/nl_mail_domain_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_domain_list.lng @@ -1,7 +1,9 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_forward.lng b/interface/web/mail/lib/lang/nl_mail_forward.lng index 180a13846b5177132b1b94fcd53b9aeed9d7b09f..58348d86307753af22e611fb3f5470807d5c9cff 100644 --- a/interface/web/mail/lib/lang/nl_mail_forward.lng +++ b/interface/web/mail/lib/lang/nl_mail_forward.lng @@ -1,7 +1,9 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_forward_list.lng b/interface/web/mail/lib/lang/nl_mail_forward_list.lng index 88cf50b91a05d17b4a0e3f6c61e2f461b5e7acfd..fc24d8daccd85bf95a5f1c51a7d8299065b817c7 100644 --- a/interface/web/mail/lib/lang/nl_mail_forward_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_forward_list.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_get.lng b/interface/web/mail/lib/lang/nl_mail_get.lng index f5097afadaa70cdd435827e2647911774dea2bde..c3abb4e033db025b3186e6442e1e7d1b71d64413 100644 --- a/interface/web/mail/lib/lang/nl_mail_get.lng +++ b/interface/web/mail/lib/lang/nl_mail_get.lng @@ -1,16 +1,18 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_get_list.lng b/interface/web/mail/lib/lang/nl_mail_get_list.lng index e680ab12ce2bcd5cef52e51849f0588daf0a039b..70df6ab76998ea1d8506bc2083afe5ad4b30cb0b 100644 --- a/interface/web/mail/lib/lang/nl_mail_get_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_get_list.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_relay_recipient.lng b/interface/web/mail/lib/lang/nl_mail_relay_recipient.lng index 68e0739e54f076cd3da537e8c1e94ea49e3d8678..ca392fd64dd48ce988b3cafa2021ae5635a3e1fa 100644 --- a/interface/web/mail/lib/lang/nl_mail_relay_recipient.lng +++ b/interface/web/mail/lib/lang/nl_mail_relay_recipient.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/nl_mail_relay_recipient_list.lng index 57e83235472045a2a044927f289fc93efadbe7d4..3d0f032ee0abe481a05c9715d58bf478f7b434f6 100644 --- a/interface/web/mail/lib/lang/nl_mail_relay_recipient_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_relay_recipient_list.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_spamfilter.lng b/interface/web/mail/lib/lang/nl_mail_spamfilter.lng index 707c6f7d3a07748b887a33d5ebf69d270ae69969..cb47e7e097b53487085ca86c6e2426d998e599a4 100644 --- a/interface/web/mail/lib/lang/nl_mail_spamfilter.lng +++ b/interface/web/mail/lib/lang/nl_mail_spamfilter.lng @@ -1,17 +1,19 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/nl_mail_spamfilter_list.lng index 556cb5da29561c23e36895830ba1921a79fac022..acd0db21fdbef211c41e8d657fc830406b72c675 100644 --- a/interface/web/mail/lib/lang/nl_mail_spamfilter_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_spamfilter_list.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_transport.lng b/interface/web/mail/lib/lang/nl_mail_transport.lng index 447fde8479f67a1793b62cedc2de9f8f5674eee5..36dfaedb9be4255164d279505b33296bb831f609 100644 --- a/interface/web/mail/lib/lang/nl_mail_transport.lng +++ b/interface/web/mail/lib/lang/nl_mail_transport.lng @@ -1,10 +1,12 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_transport_list.lng b/interface/web/mail/lib/lang/nl_mail_transport_list.lng index 99f3d4175e2261d351d2b8a8ec781d7cd433ea5c..201bf63148404fff7868e853ce85f26d42aef7da 100644 --- a/interface/web/mail/lib/lang/nl_mail_transport_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_transport_list.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_user.lng b/interface/web/mail/lib/lang/nl_mail_user.lng index bb134926725cc0f5668da8496753c53c109ad347..6f4ae7b899e4e8f5d0788d623cfc6c7d2ca2c920 100644 --- a/interface/web/mail/lib/lang/nl_mail_user.lng +++ b/interface/web/mail/lib/lang/nl_mail_user.lng @@ -1,42 +1,45 @@ -1)'; -$wb['autoresponder_start_date_txt'] = 'Begin'; -$wb['autoresponder_start_date_isfuture'] = 'Begin-datum kan niet in het verleden liggen.'; -$wb['autoresponder_end_date_txt'] = 'Einde'; -$wb['autoresponder_end_date_isgreater'] = 'Eind-datum mag niet eerder zijn dan de begin-datum.'; -$wb['move_junk_txt'] = 'Verplaats SPAM naar map Ongewenste e-mail'; -$wb['name_txt'] = 'Realname'; -$wb['name_optional_txt'] = '(Optional)'; -$wb['autoresponder_active'] = 'Enable the autoresponder'; -$wb['cc_txt'] = 'Send copy to'; -$wb['cc_error_isemail'] = 'The Send copy to field does not conatin a valid email address'; -?> + 1'; +$wb["move_junk_txt"] = 'Verplaats Spam e-mails naar junk directory'; +$wb["name_txt"] = 'Echte naam'; +$wb["name_optional_txt"] = '(Optioneel)'; +$wb['autoresponder_active'] = 'Inschakelen autoresponder'; +$wb['cc_txt'] = 'Stuur kopie naar'; +$wb['cc_error_isemail'] = 'Het "Stuur kopie naar" veld bevat geen geldig e-mailadres'; +?> + + + diff --git a/interface/web/mail/lib/lang/nl_mail_user_filter.lng b/interface/web/mail/lib/lang/nl_mail_user_filter.lng index 1a89f900988857c0d4e731919fd747cfcc7d5927..7dea60deac15162474616ced1724061cccadb981 100644 --- a/interface/web/mail/lib/lang/nl_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/nl_mail_user_filter.lng @@ -1,10 +1,13 @@ - + + + + diff --git a/interface/web/mail/lib/lang/nl_mail_user_filter_list.lng b/interface/web/mail/lib/lang/nl_mail_user_filter_list.lng index fc0af5b2f7b3aba070401efbd4ef02a692ccc875..8c09b729e083c8f83b4c79b6dd0cb234ee750222 100644 --- a/interface/web/mail/lib/lang/nl_mail_user_filter_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_user_filter_list.lng @@ -1,7 +1,9 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_user_list.lng b/interface/web/mail/lib/lang/nl_mail_user_list.lng index efd76bf795fb5aa8ccd113b5df1d16c95459b160..16d9e94ac6b847ada7ae28575c688262f18594cf 100644 --- a/interface/web/mail/lib/lang/nl_mail_user_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_user_list.lng @@ -1,7 +1,9 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_user_stats_list.lng b/interface/web/mail/lib/lang/nl_mail_user_stats_list.lng index 7d9406b49b6fd5f3a69ba7043ec1360349b32760..ca2773a5c4ca5dc8b739ed4014070084c5a0a18a 100644 --- a/interface/web/mail/lib/lang/nl_mail_user_stats_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_user_stats_list.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_whitelist.lng b/interface/web/mail/lib/lang/nl_mail_whitelist.lng index 8bdc7a744ea47f1bafb895c83ed5d89df5bc47a7..8afc3226d6b1419a1ecd61c48ce644cf2fbc1baf 100644 --- a/interface/web/mail/lib/lang/nl_mail_whitelist.lng +++ b/interface/web/mail/lib/lang/nl_mail_whitelist.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_mail_whitelist_list.lng b/interface/web/mail/lib/lang/nl_mail_whitelist_list.lng index e9ed520fb918d72647b7e8dc292761ade8b38691..d7987e3d45e9a58d55fe0fa2edebc3a19fbc4861 100644 --- a/interface/web/mail/lib/lang/nl_mail_whitelist_list.lng +++ b/interface/web/mail/lib/lang/nl_mail_whitelist_list.lng @@ -1,10 +1,12 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/nl_spamfilter_blacklist.lng index 7c3d30c9497d3c9fba6aab2b9b72d0abbc2ea99c..1fa0d2788fb1fc0a21cd1038115cbf3a989d995e 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_blacklist.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_blacklist.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/nl_spamfilter_blacklist_list.lng index adf40b954e4a7a6b50f555d5eb8cc93e7e81c603..9a2698d3bb907522c29fd35209ba0cec87da3013 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_blacklist_list.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_blacklist_list.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_config.lng b/interface/web/mail/lib/lang/nl_spamfilter_config.lng index 7e487c94bbf11f60520e17e3d28c23bf3b99e782..7ab6bc16ca67b63bc3977aa584ed33ec2e1607bf 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_config.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_config.lng @@ -1,20 +1,22 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_config_list.lng b/interface/web/mail/lib/lang/nl_spamfilter_config_list.lng index cbae14cde5f6b75b792176557993b8153f56138e..18e8e4d63859921433fddc30d029263eba902e2f 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_config_list.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_config_list.lng @@ -1,5 +1,7 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_policy.lng b/interface/web/mail/lib/lang/nl_spamfilter_policy.lng index d2ea79df23772efa5ed5206255f51cc6c8e0971a..ece037e6efefeee4fd40569b8c5d80efc565cacf 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_policy.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_policy.lng @@ -1,38 +1,41 @@ - + + + + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/nl_spamfilter_policy_list.lng index 139e395f8a2b6a98beb87d88d5b3fe718edab3e9..e3bce031d77cc6bbae1b78d86239ca68c185d5a5 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_policy_list.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_policy_list.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_users.lng b/interface/web/mail/lib/lang/nl_spamfilter_users.lng index acf65d6ab4b2ff1260ec845dc897aaa4a6573333..686781b8861ea5e708d6392cd3a9bd8af7242605 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_users.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_users.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_users_list.lng b/interface/web/mail/lib/lang/nl_spamfilter_users_list.lng index 51f63097ecf2e2507aa851fb7d2575888f7e20b7..3ecbf61776123987ca55cac8d99d15a8f10d5b37 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_users_list.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_users_list.lng @@ -1,10 +1,12 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/nl_spamfilter_whitelist.lng index 7c3d30c9497d3c9fba6aab2b9b72d0abbc2ea99c..321db82f7b426d45a1545b360bf05e5c38fe11ef 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_whitelist.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_whitelist.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/mail/lib/lang/nl_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/nl_spamfilter_whitelist_list.lng index aa4fe00b348587aa14a5b27e16da4a339da3fc9c..e414c7f0dfef566755b46836580e3e6c87dfb243 100644 --- a/interface/web/mail/lib/lang/nl_spamfilter_whitelist_list.lng +++ b/interface/web/mail/lib/lang/nl_spamfilter_whitelist_list.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/mail/lib/lang/pl.lng b/interface/web/mail/lib/lang/pl.lng index 2e9f8d975f226179814b078a6eb73f0dc7e9b8c7..507354708d84dff8ec66910c18906f6e9e75bf72 100644 --- a/interface/web/mail/lib/lang/pl.lng +++ b/interface/web/mail/lib/lang/pl.lng @@ -1,47 +1,48 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_alias.lng b/interface/web/mail/lib/lang/pl_mail_alias.lng index 8556be818f5a0918074369d760c7a97738531fe4..a937620fb956b8a66f2902582b63f9583647547b 100644 --- a/interface/web/mail/lib/lang/pl_mail_alias.lng +++ b/interface/web/mail/lib/lang/pl_mail_alias.lng @@ -1,11 +1,12 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_alias_list.lng b/interface/web/mail/lib/lang/pl_mail_alias_list.lng index b6ce95d0c77a8a73e4ba729f13dd0f105a1c85f4..26622bc10dbe50df4c0581058fa66531d8be4ff2 100644 --- a/interface/web/mail/lib/lang/pl_mail_alias_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_alias_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng b/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng index 5815d1e6099a56a7282966cef5c88f89fad9a321..ca1a605a5e6eaea81971cb3ad32f4c64f826dbf3 100644 --- a/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng +++ b/interface/web/mail/lib/lang/pl_mail_aliasdomain.lng @@ -1,11 +1,12 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng index d96a63e2a4db69d1cc277febcdc1e21afe3f8366..2f400019f022d6a74c9b45e8c3602a55f1cc9b1f 100644 --- a/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_aliasdomain_list.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_blacklist.lng b/interface/web/mail/lib/lang/pl_mail_blacklist.lng index 528f2f741aee3944e1f99f015010dee5fc0a140a..2fccce9cdccbbd57795d7cffcc1988d8cfebdeab 100644 --- a/interface/web/mail/lib/lang/pl_mail_blacklist.lng +++ b/interface/web/mail/lib/lang/pl_mail_blacklist.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng b/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng index ebef66657b51451a74459325416366ceaec7e4e6..bc0556c05c13074b7e7771dfa810000de9139ecd 100644 --- a/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_blacklist_list.lng @@ -1,10 +1,11 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_content_filter.lng b/interface/web/mail/lib/lang/pl_mail_content_filter.lng index 54efa4fed020b24309cff19e25bde14247741d56..b93d11466068a74d88bb58a8d33a704ca1a28f0f 100644 --- a/interface/web/mail/lib/lang/pl_mail_content_filter.lng +++ b/interface/web/mail/lib/lang/pl_mail_content_filter.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng b/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng index 6b0dd9bb8e8b580905cbe9f175a6b7e35bdc74ff..732fe9a4d5eb1aeebdec69af597afce29dca4aef 100644 --- a/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_content_filter_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_domain.lng b/interface/web/mail/lib/lang/pl_mail_domain.lng index 6f9c68cdc64ba0a55299d1c645e395bc4ef41557..4111148bb392b95ff65b81880a64d06f65cd922e 100644 --- a/interface/web/mail/lib/lang/pl_mail_domain.lng +++ b/interface/web/mail/lib/lang/pl_mail_domain.lng @@ -1,13 +1,14 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng index aaab4b433e0605ab76cc288a46a340b2fad5377b..765c2be41e4d56376bebf98cdf265980a0ee5caf 100644 --- a/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_domain_admin_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng b/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng index c77cc73ba247c42a44d82b37a22d88484d92752f..22c7edf8b8bcd44d57bf569ad22e80c0d5502b71 100644 --- a/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng +++ b/interface/web/mail/lib/lang/pl_mail_domain_catchall.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng index 1f0aad197d337e0f1f57cc44fa09336cd3e5d687..8494e20e64514b8a7171ea51db29c587b50e0089 100644 --- a/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_domain_catchall_list.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_domain_list.lng b/interface/web/mail/lib/lang/pl_mail_domain_list.lng index ec51e2cdb569c89bdac5328c67bea293e847194f..77cffc3a76b2bbfdb0ec2c463d8f04262005a416 100644 --- a/interface/web/mail/lib/lang/pl_mail_domain_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_domain_list.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_forward.lng b/interface/web/mail/lib/lang/pl_mail_forward.lng index 4e100d6150de6a94ba4fa88f400aca7cac0fe1af..f1ec993d2e90882319db8b6c6a82e7f36c7042f2 100644 --- a/interface/web/mail/lib/lang/pl_mail_forward.lng +++ b/interface/web/mail/lib/lang/pl_mail_forward.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_forward_list.lng b/interface/web/mail/lib/lang/pl_mail_forward_list.lng index 1044bd51210f9056a1c7f41ccde185fa4df35ed5..3a8b35f60552b5bbd176d1f911b65b228cd70afb 100644 --- a/interface/web/mail/lib/lang/pl_mail_forward_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_forward_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_get.lng b/interface/web/mail/lib/lang/pl_mail_get.lng index 66fe5a1f8fba5ec0989f2781e5d7da22e380dd18..ff4685f1bd30e1d973f840b10ef70ab76f2083c8 100644 --- a/interface/web/mail/lib/lang/pl_mail_get.lng +++ b/interface/web/mail/lib/lang/pl_mail_get.lng @@ -1,16 +1,17 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_get_list.lng b/interface/web/mail/lib/lang/pl_mail_get_list.lng index cd473d9ded2ecbd9802e267807e96fea4498aea9..a5c6988ca2acd3a05041fc3ab03175b6037b348e 100644 --- a/interface/web/mail/lib/lang/pl_mail_get_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_get_list.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng b/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng index b5c8724da3a5c1f264ff46ee92bec05b2cd223d0..4fab544c14b83e7978c1798fd779889736658183 100644 --- a/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng +++ b/interface/web/mail/lib/lang/pl_mail_relay_recipient.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng index 36045f4e35d3674336045b6b272ff31c571772c4..1f4352312cfc26087d16076840a0279dac8af432 100644 --- a/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_relay_recipient_list.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_spamfilter.lng b/interface/web/mail/lib/lang/pl_mail_spamfilter.lng index 3879f24247c4576d814349c4b6de7c58bbb5fa57..6792767f14bbe6f6d02cfbf420439e629ebab0fa 100644 --- a/interface/web/mail/lib/lang/pl_mail_spamfilter.lng +++ b/interface/web/mail/lib/lang/pl_mail_spamfilter.lng @@ -1,17 +1,18 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng index d6097bb3365c2352e7b55185c6f9235f4354e516..dac6ec41d4feba62d62ea8493883fdcf6cfea738 100644 --- a/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_spamfilter_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_transport.lng b/interface/web/mail/lib/lang/pl_mail_transport.lng index 035a5b0499519d0d327b929526d9b44503dbc0bf..613665483802a2ef0ce195ecac43c6cc932f3153 100644 --- a/interface/web/mail/lib/lang/pl_mail_transport.lng +++ b/interface/web/mail/lib/lang/pl_mail_transport.lng @@ -1,10 +1,11 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_transport_list.lng b/interface/web/mail/lib/lang/pl_mail_transport_list.lng index fa5c584318b4d5a0588b7c8046102bb5e2ee3a31..94500581fcf845690f6783f2e956183b08fc90d8 100644 --- a/interface/web/mail/lib/lang/pl_mail_transport_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_transport_list.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_user.lng b/interface/web/mail/lib/lang/pl_mail_user.lng index d317f24030c442d54da45f28f2f703ecc530c257..5d6b8edf3d3138da44fbeefb9423e506eae75cc0 100644 --- a/interface/web/mail/lib/lang/pl_mail_user.lng +++ b/interface/web/mail/lib/lang/pl_mail_user.lng @@ -1,42 +1,43 @@ - 1'; -$wb['autoresponder_start_date_txt'] = 'Start on'; -$wb['autoresponder_start_date_isfuture'] = 'Start date cannot be in the past.'; -$wb['autoresponder_end_date_txt'] = 'End by'; -$wb['autoresponder_end_date_isgreater'] = 'End date must be set and be later than start date.'; -$wb['move_junk_txt'] = 'Move Spam Emails to Junk directory'; -$wb['name_txt'] = 'Realname'; -$wb['name_optional_txt'] = '(Optional)'; -$wb['autoresponder_active'] = 'Enable the autoresponder'; -$wb['cc_txt'] = 'Send copy to'; -$wb['cc_error_isemail'] = 'The Send copy to field does not conatin a valid email address'; -?> + 1"; +$wb['autoresponder_start_date_txt'] = "Uruchom od"; +$wb['autoresponder_start_date_isfuture'] = "Data uruchomienia nie może być w przeszłości."; +$wb['autoresponder_end_date_txt'] = "Zakończ do"; +$wb['autoresponder_end_date_isgreater'] = "Data zakończenia musi być późniejsza od daty rozpoczęcia"; +$wb['move_junk_txt'] = "Przenoś SPAM do folderu Junk"; +$wb['name_txt'] = "Nazwa rzeczywista"; +$wb['name_optional_txt'] = "(Opcjonalnie)"; +$wb['autoresponder_active'] = "Uruchom autorespondera"; +$wb['cc_txt'] = "Wyślij kopię do"; +$wb['cc_error_isemail'] = "Pole wysyłania kopii nie zawiera poprawnego adresu e-mail"; +?> + diff --git a/interface/web/mail/lib/lang/pl_mail_user_filter.lng b/interface/web/mail/lib/lang/pl_mail_user_filter.lng index 129fdae9dfefe967c69d23ba753c5d41c1b55f18..a3a451024b09aa46c47af904400087493719ccca 100644 --- a/interface/web/mail/lib/lang/pl_mail_user_filter.lng +++ b/interface/web/mail/lib/lang/pl_mail_user_filter.lng @@ -1,10 +1,11 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng b/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng index cea7c44db5a56384bd763d3fd9c57cfa5c578119..1ea1e977b602a10a06257075ea26b12e0fd3c99c 100644 --- a/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_user_filter_list.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_user_list.lng b/interface/web/mail/lib/lang/pl_mail_user_list.lng index 287f520f6359b442f97b745e90699e687bd185d0..758d3311b68a1c5069c03b75db3bbca993032639 100644 --- a/interface/web/mail/lib/lang/pl_mail_user_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_user_list.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng b/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng index b9780687d79ba053a6e07842b3079e35716b4002..062107a889be51c1e4af97e4502bb1118d34540a 100644 --- a/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_user_stats_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_whitelist.lng b/interface/web/mail/lib/lang/pl_mail_whitelist.lng index 203c5bae73b49489f47af28011cae1646f4880fd..de43dd7d1ee5d7bd058826979b872e1ea226926b 100644 --- a/interface/web/mail/lib/lang/pl_mail_whitelist.lng +++ b/interface/web/mail/lib/lang/pl_mail_whitelist.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng b/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng index 10e6dfcf0bb03424f92c145e3582481e6bc8e2a9..5eb94a23b3199b395b897347922d28b9dd8c73d1 100644 --- a/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng +++ b/interface/web/mail/lib/lang/pl_mail_whitelist_list.lng @@ -1,10 +1,11 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng index 6da8ddc9d97080df44893b5c4d23aadb859215b5..a46788c7c2fd4f507e15b51f190980905f9fdcba 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_blacklist.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng index c237a7a778821b6d5b19a3669848325bef0ca392..f9e14eb02ac1ee0ea0b3a51e5aadb628467b36ba 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_blacklist_list.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_config.lng b/interface/web/mail/lib/lang/pl_spamfilter_config.lng index c750d9593773b8362f19dd6ab18885a76516acc9..6370c15e2d2249038f528d0e1790411ac6217101 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_config.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_config.lng @@ -1,20 +1,21 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng index 45b3f315cdf378a9bfffb77c7b64fd031de9bd90..e7df02fd3ae7ccdee23a848f5c5412529be06524 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_config_list.lng @@ -1,5 +1,6 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_policy.lng b/interface/web/mail/lib/lang/pl_spamfilter_policy.lng index 0e4df55a37777c3e43dcdb4b0416075bdeedfd80..5fcd414cb4c2628dd3d6762af442ca0c404d99ab 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_policy.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_policy.lng @@ -1,38 +1,39 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng index 43d9d414d6d48636df7802aebcfed05e6469c69e..f1c335c967fdacffd563ccf1a607f5e8a5f3d227 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_policy_list.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_users.lng b/interface/web/mail/lib/lang/pl_spamfilter_users.lng index 573f9bec08f37a2775f4097cd5da9b6b9e5eb4fc..8eb0463f181de89ea4264fe247a7ef68675d1757 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_users.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_users.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng index dde2a62c6ae1ca99ed1b7ae9a49d28989a82644b..4909170c67270541ecb1557a91d31ad224fe5815 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_users_list.lng @@ -1,10 +1,11 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng index be836015dbccef70847b84d7199f6e7d7ad55fc4..228345134dc9dd8f84f83e85db27f545297ee52d 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_whitelist.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng index 6517cf41a1e86272d49ab38f544fa4975d78f280..2b109f646890e7840eabd2032bb6589eb34216c8 100644 --- a/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng +++ b/interface/web/mail/lib/lang/pl_spamfilter_whitelist_list.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/mail/mail_domain_edit.php b/interface/web/mail/mail_domain_edit.php index 6df171e2c8730d977d211bb27108be02099d11fa..f44348bcfd6d32a08be35eb550ff3903bea7388e 100644 --- a/interface/web/mail/mail_domain_edit.php +++ b/interface/web/mail/mail_domain_edit.php @@ -75,7 +75,7 @@ class page_action extends tform_actions { $sql = "SELECT groupid, name FROM sys_group WHERE client_id > 0 ORDER BY name"; } else { $client_group_id = $_SESSION["s"]["user"]["default_group"]; - $sql = "SELECT client.client_id, limit_web_domain, default_webserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"; + $sql = "SELECT client.client_id, limit_web_domain, default_mailserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id"; } $clients = $app->db->queryAllRecords($sql); $client_select = ''; @@ -93,11 +93,11 @@ class page_action extends tform_actions { // Get the limits of the client $client_group_id = $_SESSION["s"]["user"]["default_group"]; - $client = $app->db->queryOneRecord("SELECT client.client_id, contact_name FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id order by contact_name"); + $client = $app->db->queryOneRecord("SELECT client.client_id, contact_name, default_mailserver FROM sys_group, client WHERE sys_group.client_id = client.client_id and sys_group.groupid = $client_group_id order by contact_name"); - // Set the webserver to the default server of the client - $tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_webserver]"); - $app->tpl->setVar("server_id",""); + // Set the mailserver to the default server of the client + $tmp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = $client[default_mailserver]"); + $app->tpl->setVar("server_id",""); unset($tmp); // Fill the client select field diff --git a/interface/web/monitor/lib/lang/nl.lng b/interface/web/monitor/lib/lang/nl.lng index abd6a19d6178a6c3a80e74630a2f54410810f67f..87938f750ac5a4bd610ed15f9da7742bd1587ded 100644 --- a/interface/web/monitor/lib/lang/nl.lng +++ b/interface/web/monitor/lib/lang/nl.lng @@ -1,145 +1,148 @@ -We cant find any of them at your server.

This means we can not support your RAID yet.'; -$wb['monitor_serverstate_beancounterok_txt'] = 'The beancounter is ok'; -$wb['monitor_serverstate_beancounterinfo_txt'] = 'There are vew failure in the beancounter'; -$wb['monitor_serverstate_beancounterwarning_txt'] = 'There are some failure in the beancounter'; -$wb['monitor_serverstate_beancountercritical_txt'] = 'There are many failure in the beancounter'; -$wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in the beancounter'; -$wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; -$wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; -?> +Dit type kan niet op uw server worden gevonden.

Dit betekend dat uw RAID nog niet wordt ondersteund.'; +$wb['monitor_serverstate_beancounterok_txt'] = 'The beancounter is ok'; +$wb['monitor_serverstate_beancounterinfo_txt'] = 'In de beancounter bevindt zich een foutmelding'; +$wb['monitor_serverstate_beancounterwarning_txt'] = 'In de beancounter bevinden zich foutmeldingen'; +$wb['monitor_serverstate_beancountercritical_txt'] = 'In de beancounter bevinden zich veel foutmeldingen'; +$wb['monitor_serverstate_beancountererror_txt'] = 'In de beancounter bevinden zich te veel foutmeldingen'; +$wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; +$wb['monitor_beancounter_nosupport_txt'] = 'Deze server is geen OpenVz VE en heeft daarom geen beancounter informatie'; +?> + + + diff --git a/interface/web/monitor/lib/lang/nl_syslog_list.lng b/interface/web/monitor/lib/lang/nl_syslog_list.lng index 90a685f68bda0a5235598cc00ed78c811e951674..5b271ed4a487569cb6983ceebb1b111437063b17 100644 --- a/interface/web/monitor/lib/lang/nl_syslog_list.lng +++ b/interface/web/monitor/lib/lang/nl_syslog_list.lng @@ -1,7 +1,9 @@ - + + + diff --git a/interface/web/monitor/lib/lang/pl.lng b/interface/web/monitor/lib/lang/pl.lng index 44af71bd1d82107d49aef5edb21ad65244c10f06..f65bba831d1690a40b9cbd24955cf8e743e76127 100644 --- a/interface/web/monitor/lib/lang/pl.lng +++ b/interface/web/monitor/lib/lang/pl.lng @@ -1,145 +1,146 @@ -We cant find any of them at your server.

This means we can not support your RAID yet.'; -$wb['monitor_serverstate_beancounterok_txt'] = 'The beancounter is ok'; -$wb['monitor_serverstate_beancounterinfo_txt'] = 'There are vew failure in the beancounter'; -$wb['monitor_serverstate_beancounterwarning_txt'] = 'There are some failure in the beancounter'; -$wb['monitor_serverstate_beancountercritical_txt'] = 'There are many failure in the beancounter'; -$wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in the beancounter'; -$wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter'; -$wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information'; -?> +Nie możemy znaleźć żadnego z nich na serwerze.

Oznacza to, że nie możemy wyświetlić informacji o konfiguracji RAID."; +$wb['monitor_serverstate_beancounterok_txt'] = "Beancounter jest w porządku"; +$wb['monitor_serverstate_beancounterinfo_txt'] = "Jest kilka problemów w beancounterze"; +$wb['monitor_serverstate_beancounterwarning_txt'] = "Są jakieś problemy w beancounterze"; +$wb['monitor_serverstate_beancountercritical_txt'] = "Jest wiele problemów w beancounterze"; +$wb['monitor_serverstate_beancountererror_txt'] = "Jest za dużo problemów w beancounterze"; +$wb['monitor_title_beancounter_txt'] = "OpenVz VE BeanCounter"; +$wb['monitor_beancounter_nosupport_txt'] = "Ten serwer nie jest serwerem OpenVz VE i nie posiada informacji o beancounterach"; +?> + diff --git a/interface/web/monitor/lib/lang/pl_datalog_list.lng b/interface/web/monitor/lib/lang/pl_datalog_list.lng index 398ca51eddc2d3e6b5f98259a57a6f0f315f4dd7..b3f1d6865c9ff3ab5d99e4d61be33f4ef435137e 100644 --- a/interface/web/monitor/lib/lang/pl_datalog_list.lng +++ b/interface/web/monitor/lib/lang/pl_datalog_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/monitor/lib/lang/pl_syslog_list.lng b/interface/web/monitor/lib/lang/pl_syslog_list.lng index 125494bf8c60c592c6c5e2b4692138e3e4e0383c..071ee3abe22b0e483fbe466a14f8076d7973c315 100644 --- a/interface/web/monitor/lib/lang/pl_syslog_list.lng +++ b/interface/web/monitor/lib/lang/pl_syslog_list.lng @@ -1,7 +1,8 @@ - + + diff --git a/interface/web/sites/database_edit.php b/interface/web/sites/database_edit.php index 58fd924777c46d804ad6eee25e7aa34d4c19556e..baedd98166f38d385feddf4efe8117fda3376e8d 100644 --- a/interface/web/sites/database_edit.php +++ b/interface/web/sites/database_edit.php @@ -261,7 +261,18 @@ class page_action extends tform_actions { if(strlen($dbname_prefix . $this->dataRecord['database_name']) > 64) $app->tform->errorMessage .= str_replace('{db}',$dbname_prefix . $this->dataRecord['database_name'],$app->tform->wordbook["database_name_error_len"]).'
'; if(strlen($dbuser_prefix . $this->dataRecord['database_user']) > 16) $app->tform->errorMessage .= str_replace('{user}',$dbuser_prefix . $this->dataRecord['database_user'],$app->tform->wordbook["database_user_error_len"]).'
'; - + + //* Check database name and user against blacklist + $dbname_blacklist = array($conf['db_database'],'mysql'); + if(in_array($dbname_prefix . $this->dataRecord['database_name'],$dbname_blacklist)) { + $app->tform->errorMessage .= $app->lng('Database name not allowed.').'
'; + } + + $dbuser_blacklist = array($conf['db_user'],'mysql','root'); + if(in_array($dbname_prefix . $this->dataRecord['database_user'],$dbname_blacklist)) { + $app->tform->errorMessage .= $app->lng('Database user not allowed.').'
'; + } + if ($app->tform->errorMessage == ''){ /* restrict the names if there is no error */ /* crop user and db names if they are too long -> mysql: user: 16 chars / db: 64 chars */ @@ -287,7 +298,17 @@ class page_action extends tform_actions { if(strlen($dbname_prefix . $this->dataRecord['database_name']) > 64) $app->tform->errorMessage .= str_replace('{db}',$dbname_prefix . $this->dataRecord['database_name'],$app->tform->wordbook["database_name_error_len"]).'
'; if(strlen($dbuser_prefix . $this->dataRecord['database_user']) > 16) $app->tform->errorMessage .= str_replace('{user}',$dbuser_prefix . $this->dataRecord['database_user'],$app->tform->wordbook["database_user_error_len"]).'
'; - + + //* Check database name and user against blacklist + $dbname_blacklist = array($conf['db_database'],'mysql'); + if(in_array($dbname_prefix . $this->dataRecord['database_name'],$dbname_blacklist)) { + $app->tform->errorMessage .= $app->lng('Database name not allowed.').'
'; + } + + $dbuser_blacklist = array($conf['db_user'],'mysql','root'); + if(in_array($dbname_prefix . $this->dataRecord['database_user'],$dbname_blacklist)) { + $app->tform->errorMessage .= $app->lng('Database user not allowed.').'
'; + } /* restrict the names */ /* crop user and db names if they are too long -> mysql: user: 16 chars / db: 64 chars */ diff --git a/interface/web/sites/lib/lang/nl.lng b/interface/web/sites/lib/lang/nl.lng index 54fd28a6c7b2416e47ff4b2f839bbb9ca8fb3281..6581195984044b0ad05cda001fcaba6db8e2e748 100644 --- a/interface/web/sites/lib/lang/nl.lng +++ b/interface/web/sites/lib/lang/nl.lng @@ -1,24 +1,26 @@ - + + + diff --git a/interface/web/sites/lib/lang/nl_cron.lng b/interface/web/sites/lib/lang/nl_cron.lng index f85eca22729432ac6ba579b6f194a6ab7a11a51c..d77aed4e2ce393b81714db6ce31cb754be021b81 100644 --- a/interface/web/sites/lib/lang/nl_cron.lng +++ b/interface/web/sites/lib/lang/nl_cron.lng @@ -1,21 +1,23 @@ -(Shell-commando -> sh, URL -> wget)'; -$wb['limit_cron_txt'] = 'Het max. aantal toegestane Cron taken is bereikt.'; -$wb['limit_cron_frequency_txt'] = 'De cronjob frequentie overschrijdt de toegestaande limiet.'; -$wb['run_min_error_format'] = 'Ongeldige indeling voor minuten.'; -$wb['run_hour_error_format'] = 'Ongeldige indeling voor uren.'; -$wb['run_mday_error_format'] = 'Ongeldige indeling voor dagen van maand.'; -$wb['run_month_error_format'] = 'Ongeldige indeling maand.'; -$wb['run_wday_error_format'] = 'Ongeldige indeling voor dagen van week.'; -$wb['command_error_format'] = 'Ongeldige commando indeling. In geval van een URL, alleen http/https wordt ondersteund.'; -$wb['unknown_fieldtype_error'] = 'Een onbekend veld-type wordt gebruikt.'; -?> + + + diff --git a/interface/web/sites/lib/lang/nl_cron_list.lng b/interface/web/sites/lib/lang/nl_cron_list.lng index 1785ec191c47d5980c7d9c2b851323c6ba6b0bbc..e1eaa3073183bb8b44bff708629d51457321c8b6 100644 --- a/interface/web/sites/lib/lang/nl_cron_list.lng +++ b/interface/web/sites/lib/lang/nl_cron_list.lng @@ -1,12 +1,14 @@ - + + + diff --git a/interface/web/sites/lib/lang/nl_database.lng b/interface/web/sites/lib/lang/nl_database.lng index d4dfbf69e6f9c56ba289bdfe1103fae2720e2fef..72ff077efd9250928d382c2b222dc359bb583257 100644 --- a/interface/web/sites/lib/lang/nl_database.lng +++ b/interface/web/sites/lib/lang/nl_database.lng @@ -1,25 +1,28 @@ -(Komma-gescheiden, lege waarden = iedereen accepteren)'; -$wb['database_remote_error_ips'] = 'Tenminste 1 IP-adres is ongeldig.'; -$wb['database_name_error_len'] = 'Databasenaam - {db} - is te lang. De maximale lengte is 64 tekens.'; -$wb['database_user_error_len'] = 'Database gebruikersnaam - {user} - is te lang. De maximale lengte inclusief prefix is 16 tekens.'; -?> +elk IP-adres)'; +$wb["database_remote_error_ips"] = 'Ten minste één van de ingevulde IP-adressen is ongeldig.'; +$wb["client_txt"] = 'Klant'; +$wb["active_txt"] = 'Actief'; +$wb["database_name_error_empty"] = 'Databasenaam is niet ingvuld.'; +$wb["database_name_error_unique"] = 'Er is al een database met deze naam op de server. Om een unieke naam te verkrijgen, kunt u bijv. uw domeinnaam in de databasenaam opnemen.'; +$wb["database_name_error_regex"] = 'Ongeldige databasenaame. De databasenaam mag deze karakters bevatten: a-z, A-Z, 0-9 en de underscore. Lengte: 2 - 64 karakters.'; +$wb["database_user_error_empty"] = 'Database gebruiker is niet ingvuld.'; +$wb["database_user_error_unique"] = 'Er is al een database gebruiker met deze naam op de server. Om een unieke naam te verkrijgen, kunt u bijv. uw domeinnaam in de gebruikersnaam opnemen.'; +$wb["database_user_error_regex"] = 'Ongeldige database gebruikersnaam. De gebruikersnaam mag deze karakters bevatten: a-z, A-Z, 0-9 en de underscore. Lengte: 2 - 64 karakters.'; +$wb["limit_database_txt"] = 'Het max. aantal databases is bereikt.'; +$wb["database_name_change_txt"] = 'De databasenaam kan niet worden gewijzigd'; +$wb["database_charset_change_txt"] = 'De database karakterset kan niet worden gewijzigd'; +$wb["database_name_error_len"] = 'Databasenaam - {db} - is te lang. De max. lengte van de databasenaam incl. voorvoegsel is 64 karakters.'; +$wb["database_user_error_len"] = 'Databasenaam - {user}- is te lang. De max. lengte van de database gebruikersnaam incl. voorvoegsel is 16 karakters.'; +?> + + + diff --git a/interface/web/sites/lib/lang/nl_database_admin_list.lng b/interface/web/sites/lib/lang/nl_database_admin_list.lng index 3f05f65e629d07383ca16240e6ae6b862a30658d..88dd5b97d969232967cd81a05ce1688a10712009 100644 --- a/interface/web/sites/lib/lang/nl_database_admin_list.lng +++ b/interface/web/sites/lib/lang/nl_database_admin_list.lng @@ -1,10 +1,12 @@ - + + + diff --git a/interface/web/sites/lib/lang/nl_database_list.lng b/interface/web/sites/lib/lang/nl_database_list.lng index 6d9862ce9ef41fc743507eb91ada246bada70073..0f1857ed062cfc5060ef6909f41b3a1753de0e63 100644 --- a/interface/web/sites/lib/lang/nl_database_list.lng +++ b/interface/web/sites/lib/lang/nl_database_list.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/sites/lib/lang/nl_ftp_user.lng b/interface/web/sites/lib/lang/nl_ftp_user.lng index ebf411d4539780c1fd58c58e8aede03d8536d2ac..1c453f9f7299b89e5d4149ca2fde5de2772cd479 100644 --- a/interface/web/sites/lib/lang/nl_ftp_user.lng +++ b/interface/web/sites/lib/lang/nl_ftp_user.lng @@ -1,27 +1,31 @@ - + + + + diff --git a/interface/web/sites/lib/lang/nl_ftp_user_list.lng b/interface/web/sites/lib/lang/nl_ftp_user_list.lng index 449092fca1f8ed69858b310f2b473f509f5bbf90..ebe1dfc82da51e08fab8445bc48a08e53bba3b89 100644 --- a/interface/web/sites/lib/lang/nl_ftp_user_list.lng +++ b/interface/web/sites/lib/lang/nl_ftp_user_list.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/sites/lib/lang/nl_shell_user.lng b/interface/web/sites/lib/lang/nl_shell_user.lng index c76ea35d887781f0012a0d6f3270ea1681be49b3..7207352b77fbe03d9c3096f65a1034653953b160 100644 --- a/interface/web/sites/lib/lang/nl_shell_user.lng +++ b/interface/web/sites/lib/lang/nl_shell_user.lng @@ -1,22 +1,26 @@ - + + + + diff --git a/interface/web/sites/lib/lang/nl_shell_user_list.lng b/interface/web/sites/lib/lang/nl_shell_user_list.lng index 33568635f8363a8251093f633ea944c118f6c88c..7976881c772f68eb550c889ad0e614bb6e984109 100644 --- a/interface/web/sites/lib/lang/nl_shell_user_list.lng +++ b/interface/web/sites/lib/lang/nl_shell_user_list.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/sites/lib/lang/nl_user_quota_stats_list.lng b/interface/web/sites/lib/lang/nl_user_quota_stats_list.lng index 716760b172ac099ac46c3d8f853eb281ec3f895c..e78d8310811a39ab5f6b7733d4531833906adba5 100644 --- a/interface/web/sites/lib/lang/nl_user_quota_stats_list.lng +++ b/interface/web/sites/lib/lang/nl_user_quota_stats_list.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng index a698fad62dc4965fcf77713c2add94d90758ec60..ace808bf0f0e24f12fff7828f2faf7e5b0d9b65d 100644 --- a/interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng +++ b/interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng @@ -1,11 +1,13 @@ - + + + diff --git a/interface/web/sites/lib/lang/nl_web_domain.lng b/interface/web/sites/lib/lang/nl_web_domain.lng index 87c0138457af2ac361730b078e1b2c73645d5003..c9457a119eeb0bf201303545dd08bc05a4a730f6 100644 --- a/interface/web/sites/lib/lang/nl_web_domain.lng +++ b/interface/web/sites/lib/lang/nl_web_domain.lng @@ -1,67 +1,69 @@ -zie codes)'; -$wb['ssl_request_txt'] = 'SSL verzoek'; -$wb['ssl_cert_txt'] = 'SSL certificaat'; -$wb['ssl_bundle_txt'] = 'SSL bundel'; -$wb['ssl_action_txt'] = 'SSL actie'; -$wb['server_id_txt'] = 'Server'; -$wb['domain_txt'] = 'Domeinnaam'; -$wb['type_txt'] = 'Type'; -$wb['parent_domain_id_txt'] = 'Koppelen aan website'; -$wb['redirect_type_txt'] = 'Redirect type'; -$wb['redirect_path_txt'] = 'Redirect pad'; -$wb['active_txt'] = 'Actief?'; -$wb['document_root_txt'] = 'Documentroot'; -$wb['system_user_txt'] = 'Linux gebruiker'; -$wb['system_group_txt'] = 'Linux groep'; -$wb['ip_address_txt'] = 'IP-adres'; -$wb['vhost_type_txt'] = 'VHost type'; -$wb['hd_quota_txt'] = 'Schijfruimte limiet'; -$wb['traffic_quota_txt'] = 'Dataverkeer limiet'; -$wb['cgi_txt'] = 'CGI scripts'; -$wb['ssi_txt'] = 'SSI (CGI)'; -$wb['ssl_txt'] = 'SSL'; -$wb['suexec_txt'] = 'SuEXEC'; -$wb['php_txt'] = 'PHP5 module'; -$wb['client_txt'] = 'Klant'; -$wb['limit_web_domain_txt'] = 'Het max. aantal web domeinen voor uw account is bereikt.'; -$wb['limit_web_aliasdomain_txt'] = 'Het max. aantal domeinaliassen voor uw account is bereikt.'; -$wb['limit_web_subdomain_txt'] = 'Het max. aantal web subdomeinen voor uw account is bereikt.'; -$wb['apache_directives_txt'] = 'Apache richtlijnen'; -$wb['domain_error_empty'] = 'Domeinnaam is leeg.'; -$wb['domain_error_unique'] = 'Domein moet uniek zijn.'; -$wb['domain_error_regex'] = 'Domeinnaam is ongeldig.'; -$wb['hd_quota_error_empty'] = 'Schijfruimte limiet is leeg.'; -$wb['traffic_quota_error_empty'] = 'Dataverkeer limiet is leeg.'; -$wb['errordocs_txt'] = 'Eigen fout-paginas'; -$wb['error_ssl_state_empty'] = 'SSL: provincie is leeg.'; -$wb['error_ssl_locality_empty'] = 'SSL: plaats is leeg.'; -$wb['error_ssl_organisation_empty'] = 'SSL: organisatie is leeg.'; -$wb['error_ssl_organisation_unit_empty'] = 'SSL: organsatie afdeling is leeg.'; -$wb['error_ssl_country_empty'] = 'SSL: Land is leeg.'; -$wb['subdomain_txt'] = 'Automatische subdomeinen'; -$wb['client_group_id_txt'] = 'Klant'; -$wb['stats_password_txt'] = 'Website statistieken wachtwoord'; -$wb['ssl_domain_txt'] = 'SSL Domein'; -$wb['allow_override_txt'] = 'Optie: Allow Override'; -$wb['limit_web_quota_free_txt'] = 'Maximale beschikbare schijfruimte-gebruik'; -$wb['ssl_state_error_regex'] = 'Ongeldige SSL Provincie. Geldige tekens zijn: a-z, 0-9 en .,-_'; -$wb['ssl_locality_error_regex'] = 'Ongeldige SSL Plaats. Geldige tekens zijn: a-z, 0-9 en .,-_'; -$wb['ssl_organisation_error_regex'] = 'Ongeldige SSL Organisatie. Geldige tekens zijn: a-z, 0-9 en .,-_'; -$wb['ssl_organistaion_unit_error_regex'] = 'Ongeldige SSL Organisatie afdeling. Geldige tekens zijn: a-z, 0-9 en .,-_'; -$wb['ssl_country_error_regex'] = 'Ongeldige SSL Landcode. Geldige tekens zijn: A-Z'; -$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota'; -$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/'; -$wb['php_open_basedir_txt'] = 'PHP open_basedir'; -$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded'; -$wb['backup_interval_txt'] = 'Backup interval'; -$wb['backup_copies_txt'] = 'Number of backup copies'; -$wb['ruby_txt'] = 'Ruby'; -$wb['stats_user_txt'] = 'Webstatistics username'; -$wb['stats_type_txt'] = 'Webstatistics program'; -$wb['custom_php_ini_txt'] = 'Custom php.ini settings'; -?> + + + diff --git a/interface/web/sites/lib/lang/nl_web_domain_admin_list.lng b/interface/web/sites/lib/lang/nl_web_domain_admin_list.lng index b460e27100ae66c0b242dc9d544f9712d26464d1..778fe890bd8cad99a1565aab7da1dc55990b46b7 100644 --- a/interface/web/sites/lib/lang/nl_web_domain_admin_list.lng +++ b/interface/web/sites/lib/lang/nl_web_domain_admin_list.lng @@ -1,9 +1,11 @@ - + + + diff --git a/interface/web/sites/lib/lang/nl_web_domain_list.lng b/interface/web/sites/lib/lang/nl_web_domain_list.lng index 1158d6dd2bf89833fa1d1eaf4e1aceffb4806716..dd3066ef38b563bdd0181b895b0556377669e31e 100644 --- a/interface/web/sites/lib/lang/nl_web_domain_list.lng +++ b/interface/web/sites/lib/lang/nl_web_domain_list.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng b/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng index 67ce6f4bf1b0d7ebb0bfea76796c469423c53b26..3d4dd67a1091ea099a1029878da1146e0a51b12e 100644 --- a/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/nl_web_sites_stats_list.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/sites/lib/lang/nl_web_subdomain.lng b/interface/web/sites/lib/lang/nl_web_subdomain.lng index 58f5be41fe92260a94060f53bc59f9f23a1d8003..fac758a21d46f1820cc600f50105ca90c6950e9a 100644 --- a/interface/web/sites/lib/lang/nl_web_subdomain.lng +++ b/interface/web/sites/lib/lang/nl_web_subdomain.lng @@ -1,40 +1,42 @@ - + + + diff --git a/interface/web/sites/lib/lang/nl_web_subdomain_list.lng b/interface/web/sites/lib/lang/nl_web_subdomain_list.lng index db8db09468d5870e594ccedace071ba70601afc3..c86d541625be5d459dbbb0d8e025f9a8a1a8e322 100644 --- a/interface/web/sites/lib/lang/nl_web_subdomain_list.lng +++ b/interface/web/sites/lib/lang/nl_web_subdomain_list.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/sites/lib/lang/nl_webdav_user.lng b/interface/web/sites/lib/lang/nl_webdav_user.lng index 05c9892a7a412b3b473fd7eb8ff9362cbe58c330..4f3c624b09c6f13f0e1b97d231e9b5c7bc92debd 100644 --- a/interface/web/sites/lib/lang/nl_webdav_user.lng +++ b/interface/web/sites/lib/lang/nl_webdav_user.lng @@ -1,15 +1,19 @@ - + + + + diff --git a/interface/web/sites/lib/lang/nl_webdav_user_list.lng b/interface/web/sites/lib/lang/nl_webdav_user_list.lng index bac283b0a71feeab0f190d3fc15be8c6e9f809ed..aabbe0b39bff9a8369a76b4c1e507ff5e514192a 100644 --- a/interface/web/sites/lib/lang/nl_webdav_user_list.lng +++ b/interface/web/sites/lib/lang/nl_webdav_user_list.lng @@ -1,8 +1,10 @@ - + + + diff --git a/interface/web/sites/lib/lang/pl.lng b/interface/web/sites/lib/lang/pl.lng index d4aa913d5a0083cbc080d8f3fdbba79000dca037..49cf22b5dc043f80c03b9d018ca75f6c2a2e9386 100644 --- a/interface/web/sites/lib/lang/pl.lng +++ b/interface/web/sites/lib/lang/pl.lng @@ -1,24 +1,25 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_cron.lng b/interface/web/sites/lib/lang/pl_cron.lng index 7771708bec9d9548cfaa7f1454a9afbcdfd68ffc..439f004f0078e4adc9be9a19eb450e7197075bf9 100644 --- a/interface/web/sites/lib/lang/pl_cron.lng +++ b/interface/web/sites/lib/lang/pl_cron.lng @@ -1,21 +1,22 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_cron_list.lng b/interface/web/sites/lib/lang/pl_cron_list.lng index 3c1d83636cad877348f83123ad92dd158f814f3c..3e104ce1246823a9ffdf0fa51dcdbe26cc4d79b5 100644 --- a/interface/web/sites/lib/lang/pl_cron_list.lng +++ b/interface/web/sites/lib/lang/pl_cron_list.lng @@ -1,12 +1,13 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_database.lng b/interface/web/sites/lib/lang/pl_database.lng index 75b44c43919cff1a19cf5292184c0ab1f47d263a..60924a37eff063ed066736a0b5be4579be33e080 100644 --- a/interface/web/sites/lib/lang/pl_database.lng +++ b/interface/web/sites/lib/lang/pl_database.lng @@ -1,25 +1,26 @@ -każdego)'; -$wb['database_remote_error_ips'] = 'Jeden z podanych adresów IP ma niepoprawny format.'; -$wb['client_txt'] = 'Klient'; -$wb['active_txt'] = 'Aktywny'; -$wb['database_name_error_empty'] = 'Nazwa bazy danych jest pusta.'; -$wb['database_name_error_unique'] = 'Istnieje już baza danych o takiej nazwie na serwerze. Aby mieć unikatową nazwę, np.: nazwij bazę danych tak samo jak domenę.'; -$wb['database_name_error_regex'] = 'Nieprawidłowa nazwa bazy danych. Nazwa bazy danych może zawierać znaki takie jak: a-z, A-Z, 0-9 oraz podkreślenie. Długość: 2 - 64 znaków.'; -$wb['database_user_error_empty'] = 'Nazwa użytkownika bazy danych jest pusta.'; -$wb['database_user_error_unique'] = 'Jest już użytkownik bazy danych o takiej nazwie. Aby mieć unikatową nazwę, np.: nazwij użytkownika tak samo jak domenę.'; -$wb['database_user_error_regex'] = 'Nieprawidłowa nazwa użytkownika bazy danych. Nazwa użytkownika bazy danych może zawierać znaki takie jak: a-z, A-Z, 0-9 oraz podkreślenie. Długość: 2 - 64 znaków.'; -$wb['limit_database_txt'] = 'Maksymalna liczba baz danych została przekroczona.'; -$wb['database_name_change_txt'] = 'Nie można zmienić nazwy bazy danych'; -$wb['database_charset_change_txt'] = 'Nie można zmienić kodowania bazy danych'; -$wb['database_name_error_len'] = 'Database name - {db} - too long. The max. database name length incl. prefix is 64 chars.'; -$wb['database_user_error_len'] = 'Database username - {user}- too long. The max. database username length incl. prefix is 16 chars.'; -?> +każdego)"; +$wb['database_remote_error_ips'] = "Jeden z podanych adresów IP ma niepoprawny format."; +$wb['client_txt'] = "Klient"; +$wb['active_txt'] = "Aktywny"; +$wb['database_name_error_empty'] = "Nazwa bazy danych jest pusta."; +$wb['database_name_error_unique'] = "Istnieje już baza danych o takiej nazwie na serwerze. Aby mieć unikatową nazwę, np.: nazwij bazę danych tak samo jak domenę."; +$wb['database_name_error_regex'] = "Nieprawidłowa nazwa bazy danych. Nazwa bazy danych może zawierać znaki takie jak: a-z, A-Z, 0-9 oraz podkreślenie. Długość: 2 - 64 znaków."; +$wb['database_user_error_empty'] = "Nazwa użytkownika bazy danych jest pusta."; +$wb['database_user_error_unique'] = "Jest już użytkownik bazy danych o takiej nazwie. Aby mieć unikatową nazwę, np.: nazwij użytkownika tak samo jak domenę."; +$wb['database_user_error_regex'] = "Nieprawidłowa nazwa użytkownika bazy danych. Nazwa użytkownika bazy danych może zawierać znaki takie jak: a-z, A-Z, 0-9 oraz podkreślenie. Długość: 2 - 64 znaków."; +$wb['limit_database_txt'] = "Maksymalna liczba baz danych została przekroczona."; +$wb['database_name_change_txt'] = "Nie można zmienić nazwy bazy danych."; +$wb['database_charset_change_txt'] = "Nie można zmienić kodowania bazy danych."; +$wb['database_name_error_len'] = "Nazwa bazy danych - {db} - za długa. Maksymalna długość wynosi 64 znaki łącznie z prefiksem."; +$wb['database_user_error_len'] = "Nazwa użytkownika bazy - {user}- za długa. Maksymalna długość wynosi 16 znaków łącznie z prefiksem."; +?> + diff --git a/interface/web/sites/lib/lang/pl_database_admin_list.lng b/interface/web/sites/lib/lang/pl_database_admin_list.lng index 3f05f65e629d07383ca16240e6ae6b862a30658d..342de213c942d488d963c839eeb1d755256f1657 100644 --- a/interface/web/sites/lib/lang/pl_database_admin_list.lng +++ b/interface/web/sites/lib/lang/pl_database_admin_list.lng @@ -1,10 +1,11 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_database_list.lng b/interface/web/sites/lib/lang/pl_database_list.lng index 4bd22e3b9fed5b89bc761977f368377fe94c812d..0759b79176360c1ae3ee7f72a8736e45e69371f2 100644 --- a/interface/web/sites/lib/lang/pl_database_list.lng +++ b/interface/web/sites/lib/lang/pl_database_list.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_ftp_user.lng b/interface/web/sites/lib/lang/pl_ftp_user.lng index 0c49209b21dc92dc2540a422afe0b3ce2b82b56d..8860b92e9d26b2a69ad38e14857df8158142f347 100644 --- a/interface/web/sites/lib/lang/pl_ftp_user.lng +++ b/interface/web/sites/lib/lang/pl_ftp_user.lng @@ -1,27 +1,28 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_ftp_user_list.lng b/interface/web/sites/lib/lang/pl_ftp_user_list.lng index fecbba355ad91ada06ff4867b8cdf1e45a5a3875..58b2b76597f41dc108f540b84677f1d1c47b3542 100644 --- a/interface/web/sites/lib/lang/pl_ftp_user_list.lng +++ b/interface/web/sites/lib/lang/pl_ftp_user_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_shell_user.lng b/interface/web/sites/lib/lang/pl_shell_user.lng index d5dd7231dd87392d91c54a460a945b27655f5430..1331f4d50af23884c0a42e2dedd295ef53832a83 100644 --- a/interface/web/sites/lib/lang/pl_shell_user.lng +++ b/interface/web/sites/lib/lang/pl_shell_user.lng @@ -1,22 +1,23 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_shell_user_list.lng b/interface/web/sites/lib/lang/pl_shell_user_list.lng index 850c0eb91209eb4e2adaabbf66129d3f0312a651..5e9501b39ceccccf93bd4b619d8d51ef2379c9f3 100644 --- a/interface/web/sites/lib/lang/pl_shell_user_list.lng +++ b/interface/web/sites/lib/lang/pl_shell_user_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng b/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng index 716760b172ac099ac46c3d8f853eb281ec3f895c..60a0222eb72ace8628ea0304b5443ae00e75e2a8 100644 --- a/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng +++ b/interface/web/sites/lib/lang/pl_user_quota_stats_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng index 6dd8022e938521ff8c7290579fa827cfd6d9e9b0..b3aed2661e762b3674c5e29178a2949cc15fc0e4 100644 --- a/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng +++ b/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng @@ -1,11 +1,12 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_web_domain.lng b/interface/web/sites/lib/lang/pl_web_domain.lng index b345a02d2f3ce56f1bcf0243a813284ca6dbca2b..869bef17d9e8f83e77e6c0b1d7de7e2035205525 100644 --- a/interface/web/sites/lib/lang/pl_web_domain.lng +++ b/interface/web/sites/lib/lang/pl_web_domain.lng @@ -1,67 +1,68 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng b/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng index b460e27100ae66c0b242dc9d544f9712d26464d1..0b88cb6ea111fcec251b360065a0b1f74bb6f458 100644 --- a/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng +++ b/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng @@ -1,9 +1,10 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_web_domain_list.lng b/interface/web/sites/lib/lang/pl_web_domain_list.lng index 62b7455ff349875cffd586aac2a615bfccc288af..69276848a5c7cd16c38a6466fa2f474b88178276 100644 --- a/interface/web/sites/lib/lang/pl_web_domain_list.lng +++ b/interface/web/sites/lib/lang/pl_web_domain_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng b/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng index e7b96d715147f0440799042c5176a6ae9e0871c8..e5ba58cdeb658f17b3ccb72ca2d1c75819e838d2 100644 --- a/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng +++ b/interface/web/sites/lib/lang/pl_web_sites_stats_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_web_subdomain.lng b/interface/web/sites/lib/lang/pl_web_subdomain.lng index 18e5a936c1689584845de9ff619dbdf336910d53..f5854c8d54086b3d399eb47bdc8044e80e0d15c9 100644 --- a/interface/web/sites/lib/lang/pl_web_subdomain.lng +++ b/interface/web/sites/lib/lang/pl_web_subdomain.lng @@ -1,40 +1,41 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_web_subdomain_list.lng b/interface/web/sites/lib/lang/pl_web_subdomain_list.lng index 9ccb0a3c770dfe17c6d55f427577e50e87d0b215..49f50c9e8fcf6c6667e4eff32acb62c7770e6f4f 100644 --- a/interface/web/sites/lib/lang/pl_web_subdomain_list.lng +++ b/interface/web/sites/lib/lang/pl_web_subdomain_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_webdav_user.lng b/interface/web/sites/lib/lang/pl_webdav_user.lng index 05c9892a7a412b3b473fd7eb8ff9362cbe58c330..8034ef183c544b696e0aecf7b02c0f5e3f1ce22f 100644 --- a/interface/web/sites/lib/lang/pl_webdav_user.lng +++ b/interface/web/sites/lib/lang/pl_webdav_user.lng @@ -1,15 +1,16 @@ - + + diff --git a/interface/web/sites/lib/lang/pl_webdav_user_list.lng b/interface/web/sites/lib/lang/pl_webdav_user_list.lng index bac283b0a71feeab0f190d3fc15be8c6e9f809ed..5690a6399ffee55feb4a9c5ecfd4ed53690f01e5 100644 --- a/interface/web/sites/lib/lang/pl_webdav_user_list.lng +++ b/interface/web/sites/lib/lang/pl_webdav_user_list.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/sites/user_quota_stats.php b/interface/web/sites/user_quota_stats.php index ce2c3bc37c9369c26d1f57261fac9dd0e7345197..2e28d0d62179b78c835ea6dd909a44e33fb0a6cc 100644 --- a/interface/web/sites/user_quota_stats.php +++ b/interface/web/sites/user_quota_stats.php @@ -33,9 +33,9 @@ class list_action extends listform_actions { $rec['bgcolor'] = $this->DataRowColor; $username = $rec['system_user']; - $rec['used'] = $monitor_data['user'][$username]['used']; - $rec['soft'] = $monitor_data['user'][$username]['soft']; - $rec['hard'] = $monitor_data['user'][$username]['hard']; + $rec['used'] = (is_numeric($monitor_data['user'][$username]['used'])) ? round($monitor_data['user'][$username]['used']/1024) .'MB' : $monitor_data['user'][$username]['used'].'B'; + $rec['soft'] = $monitor_data['user'][$username]['soft'].'B'; + $rec['hard'] = $monitor_data['user'][$username]['hard'].'B'; if($rec['soft'] == '0K') $rec['soft'] = $app->lng('unlimited'); if($rec['hard'] == '0K') $rec['hard'] = $app->lng('unlimited'); diff --git a/interface/web/strengthmeter/lib/lang/nl_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/nl_strengthmeter.lng index 57e86ca70cf7dd77d3eb314e27d5dd2de6e8ced6..0aacc6073a48e4f88b1d62e9a9ba5cd9e6fe6c8d 100644 --- a/interface/web/strengthmeter/lib/lang/nl_strengthmeter.lng +++ b/interface/web/strengthmeter/lib/lang/nl_strengthmeter.lng @@ -1,8 +1,11 @@ - + + + + diff --git a/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng index df85c9712415acaa8c7d6fc19ad6700c23420566..b5941054246ce57f7d88ce9834db67915392e427 100644 --- a/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng +++ b/interface/web/strengthmeter/lib/lang/pl_strengthmeter.lng @@ -1,8 +1,9 @@ - + + diff --git a/interface/web/themes/default/css/navigation/nav_top.css b/interface/web/themes/default/css/navigation/nav_top.css index e2f7b82ec761a4d652e451df8585f269b59575d0..13b37f1f469dc4f3b63071996af47c36148fb358 100644 --- a/interface/web/themes/default/css/navigation/nav_top.css +++ b/interface/web/themes/default/css/navigation/nav_top.css @@ -98,5 +98,9 @@ .topnav-dashboard { background-image: url('../../icons/x32/dashboard.png') !important; } + + .topnav-vm{ + background-image: url('../../icons/x32/drawer.png') !important; + } } \ No newline at end of file diff --git a/interface/web/tools/lib/lang/nl.lng b/interface/web/tools/lib/lang/nl.lng index 5bf2ae7a7b662a795e4e9e6ffde4d748b9f569f3..70dd45b69563e2cc5b01a0f20e81ce1d60330dfa 100644 --- a/interface/web/tools/lib/lang/nl.lng +++ b/interface/web/tools/lib/lang/nl.lng @@ -1,6 +1,8 @@ - + + + diff --git a/interface/web/tools/lib/lang/nl_usersettings.lng b/interface/web/tools/lib/lang/nl_usersettings.lng index cf0fc71602d26cc9ca05a1d673082bf498b9ab65..dfdfc943c2ed841888b27abb50a5dbcc98858c8b 100644 --- a/interface/web/tools/lib/lang/nl_usersettings.lng +++ b/interface/web/tools/lib/lang/nl_usersettings.lng @@ -1,8 +1,11 @@ - + + + + diff --git a/interface/web/tools/lib/lang/pl.lng b/interface/web/tools/lib/lang/pl.lng index adc0178fefd07152b3167fed38aa3f87b95614f0..4b8a44835e3b0f44405b2e1e3e765e9c895045c5 100644 --- a/interface/web/tools/lib/lang/pl.lng +++ b/interface/web/tools/lib/lang/pl.lng @@ -1,6 +1,7 @@ - + + diff --git a/interface/web/tools/lib/lang/pl_usersettings.lng b/interface/web/tools/lib/lang/pl_usersettings.lng index f8d76658a79920f9571fe69ce7a6822120b9bd87..426b2cfedba5fc26ac914a5ab5e73e33e97057d9 100644 --- a/interface/web/tools/lib/lang/pl_usersettings.lng +++ b/interface/web/tools/lib/lang/pl_usersettings.lng @@ -1,8 +1,9 @@ - + + diff --git a/server/cron_daily.php b/server/cron_daily.php index 05df3d3e921a93b69ab323dcd3445e6ff5cab5ef..e9aedac20abe86323b0abe961267eac6334c71fd 100644 --- a/server/cron_daily.php +++ b/server/cron_daily.php @@ -170,6 +170,17 @@ foreach($records as $rec) { $awstats_pl = $web_config['awstats_pl']; $awstats_buildstaticpages_pl = $web_config['awstats_buildstaticpages_pl']; + $awstats_conf_dir = $web_config['awstats_conf_dir']; + $awstats_website_conf_file = $web_config['awstats_conf_dir'].'/awstats.'.$domain.'.conf'; + + if(!is_file($awstats_website_conf_file)) { + $awstats_conf_file_content = 'Include "'.$awstats_conf_dir.'/awstats.conf" +LogFile="/var/log/ispconfig/httpd/'.$domain.'/access.log" +SiteDomain="'.$domain.'" +HostAliases="www.'.$domain.' localhost 127.0.0.1"'; + file_put_contents($awstats_website_conf_file,$awstats_conf_file_content); + } + if(!@is_dir($statsdir)) mkdir($statsdir); diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php index 0a6778ea26f59b030916cfbcc218f0f21fe34909..fc2397cbfcc7665ad03d32e3d96e944d4588d821 100644 --- a/server/lib/app.inc.php +++ b/server/lib/app.inc.php @@ -127,10 +127,10 @@ class app { break; } - if (!fwrite($fp, date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\r\n")) { + if (!fwrite($fp, @date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\r\n")) { die('Unable to write to logfile.'); } - echo date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\n"; + echo @date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\n"; fclose($fp); // Log to database diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php index bd4290308d3fed42f530622dd59846c9b0937859..1d5579ece0502fd98c4b782537d4db2fa9157863 100644 --- a/server/lib/classes/system.inc.php +++ b/server/lib/classes/system.inc.php @@ -1191,6 +1191,8 @@ class system{ } else { $dir = escapeshellcmd($maildir_path); } + + if(!is_dir($dir)) mkdir($dir, 0700, true); if($user != '' && $user != 'root' && $this->is_user($user)) { $user = escapeshellcmd($user); diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php index c6879980e3733762e68f0e8208d0a7d991de21a5..4555387d868959ee0c4206180ec05132e4ef34ce 100644 --- a/server/mods-available/monitor_core_module.inc.php +++ b/server/mods-available/monitor_core_module.inc.php @@ -53,7 +53,7 @@ class monitor_core_module { /* * Do the monitor every n minutes and write the result to the db */ - $min = date('i'); + $min = @date('i'); if (($min % $this->interval) == 0) { $this->doMonitor(); } @@ -1082,49 +1082,51 @@ class monitor_core_module { /* * Check, if we have mpt-status installed (LSIsoftware-raid) */ - system('which mpt-status', $retval); - if($retval === 0) { - /* - * Fetch the output - */ - $data['output'] = shell_exec('mpt-status --autoload -n'); + if(file_exists('/proc/mpt/summary')) { + system('which mpt-status', $retval); + if($retval === 0) { + /* + * Fetch the output + */ + $data['output'] = shell_exec('mpt-status --autoload -n'); - /* - * Then calc the state. - */ - $state = 'ok'; - foreach ($data['output'] as $item) { /* - * The output contains information for every RAID and every HDD. - * We only need the state of the RAID + * Then calc the state. */ - if (strpos($item, 'raidlevel:') !== false) { + $state = 'ok'; + foreach ($data['output'] as $item) { /* - * We found a raid, process the state of it + * The output contains information for every RAID and every HDD. + * We only need the state of the RAID */ - if (strpos($item, ' ONLINE ') !== false) { - $this->_setState($state, 'ok'); - } - elseif (strpos($item, ' OPTIMAL ') !== false) { - $this->_setState($state, 'ok'); - } - elseif (strpos($item, ' INITIAL ') !== false) { - $this->_setState($state, 'info'); - } - elseif (strpos($item, ' INACTIVE ') !== false) { - $this->_setState($state, 'critical'); - } - elseif (strpos($item, ' RESYNC ') !== false) { - $this->_setState($state, 'info'); - } - elseif (strpos($item, ' DEGRADED ') !== false) { - $this->_setState($state, 'critical'); - } - else { - /* we don't know the state. so we set the state to critical, that the - * admin is warned, that something is wrong + if (strpos($item, 'raidlevel:') !== false) { + /* + * We found a raid, process the state of it */ - $this->_setState($state, 'critical'); + if (strpos($item, ' ONLINE ') !== false) { + $this->_setState($state, 'ok'); + } + elseif (strpos($item, ' OPTIMAL ') !== false) { + $this->_setState($state, 'ok'); + } + elseif (strpos($item, ' INITIAL ') !== false) { + $this->_setState($state, 'info'); + } + elseif (strpos($item, ' INACTIVE ') !== false) { + $this->_setState($state, 'critical'); + } + elseif (strpos($item, ' RESYNC ') !== false) { + $this->_setState($state, 'info'); + } + elseif (strpos($item, ' DEGRADED ') !== false) { + $this->_setState($state, 'critical'); + } + else { + /* we don't know the state. so we set the state to critical, that the + * admin is warned, that something is wrong + */ + $this->_setState($state, 'critical'); + } } } } diff --git a/server/mods-available/remoteaction_core_module.inc.php b/server/mods-available/remoteaction_core_module.inc.php index 7d9bf5127218dc45a159270d74456e67ef6ce55d..7d1f800a423d11ae49bd59a7ddefffaeaebaf0fd 100644 --- a/server/mods-available/remoteaction_core_module.inc.php +++ b/server/mods-available/remoteaction_core_module.inc.php @@ -110,20 +110,22 @@ class remoteaction_core_module extends modules_base { /* * process all actions */ - foreach ($actions as $action) { - if ($action['action_type'] == 'os_update') { - /* do the update */ - $this->_doOsUpdate($action); - /* this action takes so much time, - * we stop executing the actions not to waste more time */ - return; - } - if ($action['action_type'] == 'ispc_update') { - /* do the update */ - $this->_doIspCUpdate($action); - /* this action takes so much time, - * we stop executing the actions not to waste more time */ - return; + if(is_array($actions)) { + foreach ($actions as $action) { + if ($action['action_type'] == 'os_update') { + /* do the update */ + $this->_doOsUpdate($action); + /* this action takes so much time, + * we stop executing the actions not to waste more time */ + return; + } + if ($action['action_type'] == 'ispc_update') { + /* do the update */ + $this->_doIspCUpdate($action); + /* this action takes so much time, + * we stop executing the actions not to waste more time */ + return; + } } } } diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index e117d13f52a2223dbc46d16ee3efb0a3a1dc0a2e..d8941a8eb6d2f94483b3b161b5e9f99c5b9600e3 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -1246,7 +1246,8 @@ class apache2_plugin { /* * add all the webdav-dirs to the webdav-section */ - $files = scandir($webdavRoot); + $files = @scandir($webdavRoot); + if(is_array($files)) { foreach($files as $file) { if (substr($file, strlen($file) - strlen('.htdigest')) == '.htdigest') { /* @@ -1267,6 +1268,7 @@ class apache2_plugin { $output .= " \n"; } } + } } /* * is the "replace-comment-end" found... diff --git a/server/plugins-available/network_settings_plugin.inc.php b/server/plugins-available/network_settings_plugin.inc.php index 4b060065599a4a28b7e33bff70753a72ec590a60..f9c01dabd8a8a1ae489fb95804c49d7539cd4084 100644 --- a/server/plugins-available/network_settings_plugin.inc.php +++ b/server/plugins-available/network_settings_plugin.inc.php @@ -97,7 +97,7 @@ class network_settings_plugin { $network_tpl->setVar('broadcast',$this->broadcast($server_config['ip_address'],$server_config['netmask'])); $network_tpl->setVar('network',$this->network($server_config['ip_address'],$server_config['netmask'])); - $records = $app->db->queryAllRecords("SELECT ip_address FROM server_ip WHERE server_id = ".intval($conf['server_id']) . ' order by ip_address'); + $records = $app->db->queryAllRecords("SELECT ip_address FROM server_ip WHERE server_id = ".intval($conf['server_id']) . ' ORDER BY server_ip_id ASC'); $ip_records = array(); $additionl_ip_records = 0; $n = 0; @@ -129,6 +129,8 @@ class network_settings_plugin { * main-server) because the LAST IP in the list is the IP mysql uses * to determine the host, the user is logging in from. */ + /* + // Disabled this part as it causes problems on multiserver setups if ($additionl_ip_records != 0) { $swap['ip_address'] = $ip_records[$n-1]['ip_address']; @@ -149,6 +151,7 @@ class network_settings_plugin { $network_tpl->setVar('broadcast',$this->broadcast($swap['ip_address'],$swap['netmask'])); $network_tpl->setVar('network',$this->network($swap['ip_address'],$swap['netmask'])); } + */ $network_tpl->setVar('additionl_ip_records',$additionl_ip_records); $network_tpl->setLoop('interfaces',$ip_records);