ISPConfig3 devel
parent: e00471 | patch | commitdiff
Marius Burkard
2016-04-06 df8e42319fc83110bd2db2b96b97367f42c71c6c
refs
author Marius Burkard <m.burkard@pixcept.de>
Wednesday, April 6, 2016 02:32 -0400
committer Marius Burkard <m.burkard@pixcept.de>
Wednesday, April 6, 2016 02:32 -0400
commitdf8e42319fc83110bd2db2b96b97367f42c71c6c
tree 76f2abd3887fc379b8be9b6a667033060f37e8f9 tree | zip | gz
parent e004715f9a4eea0eeb7eb5c620ff3e973696d5e7 view | diff
9e1a303da6fdffacd059d7fffea557c0ceb56864 view | diff 
Merge branch 'stable-3.1'
8 files added
188 files modified
5493 ■■■■■ changed files
install/install.php 1 ●●●●● diff | view | raw | blame | history
install/lib/installer_base.lib.php 6 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tform_actions.inc.php 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_server_config.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_server_list.lng 14 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es.lng 96 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_directive_snippets.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_directive_snippets_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_firewall.lng 18 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_firewall_list.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_groups.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_groups_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_iptables.lng 16 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_iptables_list.lng 18 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_language_add.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_language_complete.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_language_edit.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_language_export.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_language_import.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_language_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_package_install.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_remote_action.lng 18 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_remote_user.lng 80 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_remote_user_list.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_server.lng 20 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_server_config.lng 528 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_server_config_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_server_ip.lng 14 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_server_ip_list.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_server_ip_map.lng 22 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_server_ip_map_list.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_server_list.lng 18 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_server_php.lng 20 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_server_php_list.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_software_package.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_software_package_install.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_software_package_list.lng 20 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_software_repo.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_software_repo_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_software_update_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_system_config.lng 154 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_tpl_default_admin.lng 30 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_users.lng 64 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/es_users_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/server_list.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_resellers_list.lng 16 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/es.lng 40 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/es_client.lng 376 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/es_client_circle.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/es_client_circle_list.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/es_client_del.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/es_client_message.lng 32 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/es_client_message_template.lng 18 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/es_client_message_template_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/es_client_template.lng 220 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/es_client_template_list.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/es_clients_list.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/es_domain.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/es_domain_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/es_reseller.lng 396 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/es.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/es_dashlet_customer.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/es_dashlet_invoice_client_settings.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/es_dashlet_invoices.lng 32 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/es_dashlet_limits.lng 54 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/es_dashlet_mailquota.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/es_dashlet_modules.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/es_dashlet_products.lng 16 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/es_dashlet_quota.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/es_dashlet_shop.lng 14 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/de_dns_wizard.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/en_dns_wizard.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es.lng 26 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_a.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_a_list.lng 20 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_aaaa.lng 20 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_alias.lng 22 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_cname.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_dkim.lng 18 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_dmarc.lng 96 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_ds.lng 33 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_hinfo.lng 22 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_import.lng 26 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_loc.lng 30 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_mx.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_ns.lng 22 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_ptr.lng 22 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_rp.lng 22 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_slave.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_slave_admin_list.lng 16 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_slave_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_soa.lng 72 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_soa_admin_list.lng 18 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_soa_list.lng 16 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_spf.lng 46 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_srv.lng 28 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_template.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_template_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_tlsa.lng 28 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_txt.lng 28 ●●●●● diff | view | raw | blame | history
interface/web/dns/lib/lang/es_dns_wizard.lng 68 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_dmarc_edit.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_wizard.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/help/lib/lang/es.lng 18 ●●●●● diff | view | raw | blame | history
interface/web/help/lib/lang/es_faq_form.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/help/lib/lang/es_faq_manage_questions_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/help/lib/lang/es_faq_sections_form.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/help/lib/lang/es_help_faq_list.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/help/lib/lang/es_help_faq_sections_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/help/lib/lang/es_support_message.lng 20 ●●●●● diff | view | raw | blame | history
interface/web/help/lib/lang/es_support_message_list.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/login/lib/lang/es.lng 48 ●●●●● diff | view | raw | blame | history
interface/web/login/lib/lang/es_login_as.lng 16 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es.lng 70 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_backup_stats_list.lng 14 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_alias.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_alias_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_aliasdomain.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_aliasdomain_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_backup_list.lng 30 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_blacklist.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_blacklist_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_content_filter.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_content_filter_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_domain.lng 32 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_domain_admin_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_domain_catchall.lng 16 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_domain_catchall_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_domain_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_forward.lng 18 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_forward_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_get.lng 30 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_get_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_mailinglist.lng 38 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_mailinglist_list.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_relay_recipient.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_relay_recipient_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_spamfilter.lng 22 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_spamfilter_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_transport.lng 18 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_transport_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_user.lng 110 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_user_filter.lng 44 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_user_filter_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_user_list.lng 14 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_user_stats_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_mail_whitelist_list.lng 14 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_spamfilter_blacklist.lng 18 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_spamfilter_blacklist_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_spamfilter_config.lng 28 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_spamfilter_config_list.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_spamfilter_policy.lng 70 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_spamfilter_policy_list.lng 14 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_spamfilter_users.lng 18 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_spamfilter_users_list.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_spamfilter_whitelist.lng 18 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_spamfilter_whitelist_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_user_quota_stats_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_xmpp_domain.lng 120 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_xmpp_domain_admin_list.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_xmpp_domain_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_xmpp_user.lng 26 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/es_xmpp_user_list.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/es.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/es_index.lng 14 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/es_mail_user_autoresponder.lng 18 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/es_mail_user_cc.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/es_mail_user_filter.lng 24 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/es_mail_user_filter_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/es_mail_user_password.lng 12 ●●●●● diff | view | raw | blame | history
interface/web/mailuser/lib/lang/es_mail_user_spamfilter.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/es.lng 232 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/es_datalog_list.lng 10 ●●●●● diff | view | raw | blame | history
interface/web/monitor/lib/lang/es_syslog_list.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/nav.php 6 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/es.lng 60 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/es_aps.lng 100 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/es_aps_instances_list.lng 14 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/es_aps_packages_list.lng 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/es_aps_update_packagelist.lng 4 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/es_backup_stats_list.lng 16 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/es_cron.lng 44 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/es_cron_list.lng 14 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/es_database.lng 78 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_domain_edit.php 26 ●●●●● diff | view | raw | blame | history
server/conf/mail/db_quota_notification_de.txt 2 ●●●●● diff | view | raw | blame | history
server/conf/mail/db_quota_notification_en.txt 2 ●●●●● diff | view | raw | blame | history
server/conf/mail/db_quota_notification_es.txt 13 ●●●●● diff | view | raw | blame | history
server/conf/mail/db_quota_ok_notification_es.txt 13 ●●●●● diff | view | raw | blame | history
server/conf/mail/mail_quota_notification_es.txt 14 ●●●●● diff | view | raw | blame | history
server/conf/mail/mail_quota_ok_notification_es.txt 14 ●●●●● diff | view | raw | blame | history
server/conf/mail/web_quota_notification_es.txt 14 ●●●●● diff | view | raw | blame | history
server/conf/mail/web_quota_ok_notification_es.txt 14 ●●●●● diff | view | raw | blame | history
server/conf/mail/web_traffic_notification_es.txt 8 ●●●●● diff | view | raw | blame | history
server/conf/mail/welcome_email_es.txt 4 ●●●●● diff | view | raw | blame | history
server/mods-available/web_module.inc.php 8 ●●●●● diff | view | raw | blame | history