From 31230cb7cda673db7a96fb14d93dfaf9262c74cf Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 13 Aug 2014 07:09:06 -0400
Subject: [PATCH] Merge remote-tracking branch 'ispc/stable-3.0.5' into stable-3.0.5

---
 interface/web/help/lib/lang/se_support_message.lng                |   17 
 interface/web/monitor/lib/lang/se.lng                             |  237 +-
 interface/web/dns/lib/lang/se_dns_template_list.lng               |    1 
 interface/web/admin/lib/lang/se_language_edit.lng                 |   13 
 interface/web/client/lib/lang/se_client_message_template.lng      |   19 
 interface/web/sites/lib/lang/se_ftp_user.lng                      |   53 
 interface/web/sites/lib/lang/se_web_backup_list.lng               |   17 
 interface/web/sites/lib/lang/se_web_domain.lng                    |   49 
 interface/web/tools/lib/lang/se_tpl_default.lng                   |   11 
 interface/web/mail/lib/lang/se_mail_user_filter.lng               |   37 
 interface/web/mailuser/lib/lang/se.lng                            |   13 
 interface/web/mailuser/lib/lang/se_mail_user_cc.lng               |   15 
 interface/web/tools/lib/lang/se_import_ispconfig.lng              |   41 
 interface/web/designer/lib/lang/se_form_show.lng                  |    5 
 interface/web/admin/lib/lang/se_software_repo.lng                 |   11 
 interface/web/vm/lib/lang/se_openvz_ostemplate.lng                |    1 
 interface/web/sites/lib/lang/se_web_sites_stats_list.lng          |   15 
 interface/web/admin/lib/lang/se_software_package_list.lng         |   21 
 interface/web/sites/lib/lang/se_database_list.lng                 |   15 
 interface/web/admin/lib/lang/se_remote_user_list.lng              |    1 
 interface/web/mail/lib/lang/se_mail_spamfilter_list.lng           |    9 
 interface/web/admin/lib/lang/se_groups.lng                        |    3 
 interface/web/help/lib/lang/se.lng                                |   21 
 interface/web/admin/lib/lang/se_language_list.lng                 |   11 
 interface/web/designer/lib/lang/se.lng                            |    1 
 interface/web/sites/lib/lang/se_webdav_user_list.lng              |   11 
 install/sql/incremental/upd_0076.sql                              |    1 
 interface/web/client/lib/lang/se_client_message.lng               |   37 
 interface/web/sites/lib/lang/se_ftp_user_list.lng                 |   11 
 interface/web/vm/lib/lang/se_openvz_vm.lng                        |    1 
 interface/web/admin/lib/lang/se_directive_snippets.lng            |    1 
 interface/web/admin/lib/lang/se_server_php_list.lng               |    9 
 interface/web/designer/lib/lang/se_module_show.lng                |    7 
 interface/web/mail/lib/lang/se_mail_content_filter_list.lng       |   11 
 interface/web/mailuser/lib/lang/se_mail_user_autoresponder.lng    |   21 
 interface/web/sites/lib/lang/se_aps_instances_list.lng            |   19 
 interface/web/client/lib/lang/se_client_template.lng              |    1 
 interface/web/designer/lib/lang/se_module_nav_edit.lng            |    3 
 interface/web/dns/lib/lang/se_dns_ns.lng                          |   19 
 interface/web/client/lib/lang/se_client.lng                       |  131 
 interface/web/help/lib/lang/se_faq_sections_form.lng              |    3 
 interface/web/mailuser/lib/lang/se_index.lng                      |   19 
 interface/web/admin/lib/lang/se_system_config.lng                 |  105 
 interface/web/mail/lib/lang/se_user_quota_stats_list.lng          |   13 
 interface/web/sites/lib/lang/se_web_folder.lng                    |   11 
 server/plugins-available/shelluser_jailkit_plugin.inc.php         |  125 +
 interface/web/sites/lib/lang/se_cron.lng                          |   23 
 interface/web/dns/lib/lang/se_dns_soa.lng                         |   39 
 install/install.php                                               |    4 
 interface/web/admin/lib/lang/se_server_ip_list.lng                |   13 
 interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng      |   11 
 interface/web/mail/lib/lang/se_mail_alias.lng                     |   15 
 interface/web/dns/lib/lang/se_dns_txt.lng                         |    1 
 interface/web/mail/lib/lang/se_mail_get_list.lng                  |   11 
 interface/web/mailuser/lib/lang/se_mail_user_spamfilter.lng       |    5 
 interface/web/dashboard/lib/lang/se_dashlet_modules.lng           |    3 
 interface/web/sites/lib/lang/se_webdav_user.lng                   |   29 
 interface/web/strengthmeter/lib/lang/se_strengthmeter.lng         |   13 
 interface/web/vm/lib/lang/se.lng                                  |    1 
 interface/web/admin/lib/lang/se_software_package.lng              |    9 
 interface/web/sites/lib/lang/se_web_aliasdomain.lng               |    1 
 install/sql/ispconfig3.sql                                        |    3 
 interface/web/mail/lib/lang/se_mail_domain_catchall_list.lng      |   11 
 interface/web/mail/lib/lang/se_mail_user.lng                      |   59 
 interface/web/client/lib/lang/se_reseller.lng                     |    1 
 interface/web/tools/lib/lang/se_index.lng                         |    5 
 interface/web/help/lib/lang/se_faq_form.lng                       |    9 
 interface/web/dns/lib/lang/se_dns_import.lng                      |   21 
 interface/web/mail/lib/lang/se_mail_forward.lng                   |   11 
 interface/web/js/scrigo.js.php                                    |  101 +
 interface/web/vm/lib/lang/se_openvz_vm_list.lng                   |    1 
 interface/web/sites/lib/lang/se_database_admin_list.lng           |   17 
 interface/web/mail/lib/lang/se_mail_domain_catchall.lng           |   13 
 interface/web/admin/lib/lang/de_system_config.lng                 |    2 
 interface/web/admin/lib/lang/se_server_list.lng                   |    5 
 interface/web/login/templates/index.htm                           |    5 
 interface/web/sites/lib/lang/se_database_user.lng                 |   37 
 install/autoupdate.php                                            |    6 
 interface/web/mail/lib/lang/se_mail_aliasdomain.lng               |   17 
 interface/web/admin/lib/lang/se_server_php.lng                    |    1 
 interface/web/mail/lib/lang/se_mail_mailinglist_list.lng          |    7 
 interface/web/mail/lib/lang/se_mail_transport.lng                 |   13 
 interface/web/admin/templates/directive_snippets_edit.htm         |    2 
 interface/web/dns/lib/lang/se_dns_a_list.lng                      |    1 
 interface/web/sites/lib/lang/se_web_subdomain_list.lng            |    1 
 interface/web/tools/lib/lang/se_interface.lng                     |    9 
 server/conf/nginx_apps.vhost.master                               |    2 
 interface/web/dns/lib/lang/se_dns_slave.lng                       |    1 
 interface/web/mail/lib/lang/se_mail_user_filter_list.lng          |   11 
 interface/web/designer/lib/lang/se_module_nav_item_edit.lng       |    3 
 interface/web/admin/lib/lang/se_software_update_list.lng          |   13 
 interface/web/dns/lib/lang/se_dns_cname.lng                       |    7 
 interface/web/help/lib/lang/se_faq_manage_questions_list.lng      |   15 
 interface/web/mail/lib/lang/se_mail_blacklist.lng                 |   11 
 interface/web/sites/lib/lang/se_web_vhost_subdomain.lng           |    1 
 interface/web/admin/lib/lang/se.lng                               |   85 
 interface/web/index.php                                           |   16 
 install/sql/incremental/upd_0077.sql                              |    1 
 interface/web/sites/lib/lang/se_cron_list.lng                     |   21 
 interface/web/sites/lib/lang/se_web_aliasdomain_list.lng          |    1 
 interface/web/monitor/lib/lang/se_syslog_list.lng                 |    9 
 interface/web/designer/lib/lang/se_form_list.lng                  |    3 
 interface/web/dns/lib/lang/se_dns_mx.lng                          |    7 
 interface/web/designer/lib/lang/se_module_edit.lng                |   21 
 interface/web/admin/lib/lang/se_remote_user.lng                   |   25 
 interface/web/themes/default/templates/main.tpl.htm               |    5 
 server/plugins-available/cron_plugin.inc.php                      |    2 
 interface/web/dns/lib/lang/se_dns_hinfo.lng                       |    1 
 interface/web/admin/lib/lang/se_firewall_list.lng                 |   11 
 interface/web/mailuser/lib/lang/se_mail_user_filter.lng           |   37 
 interface/web/sites/lib/lang/se_aps_update_packagelist.lng        |    9 
 interface/lib/classes/validate_password.inc.php                   |   10 
 interface/web/sites/lib/lang/se_shell_user_list.lng               |    1 
 server/mods-available/web_module.inc.php                          |    5 
 interface/web/client/lib/lang/se.lng                              |   47 
 interface/web/help/lib/lang/se_help_faq_sections_list.lng         |   13 
 interface/web/mail/lib/lang/se_mail_get.lng                       |   29 
 interface/web/vm/lib/lang/se_openvz_template.lng                  |    1 
 interface/web/client/lib/lang/se_client_del.lng                   |    9 
 interface/web/mail/lib/lang/se_spamfilter_blacklist.lng           |   13 
 interface/web/sites/lib/lang/se_web_folder_user.lng               |   25 
 interface/web/monitor/lib/lang/se_datalog_list.lng                |    9 
 interface/web/sites/lib/lang/se_user_quota_stats_list.lng         |    1 
 server/conf/vhost.conf.master                                     |    4 
 interface/web/sites/lib/lang/se_aps.lng                           |   89 
 interface/web/tools/lib/lang/se.lng                               |   17 
 interface/web/sites/lib/lang/se_web_subdomain.lng                 |   49 
 interface/web/dns/lib/lang/se_dns_alias.lng                       |    1 
 interface/web/mail/lib/lang/se_mail_whitelist.lng                 |   11 
 interface/web/admin/lib/lang/se_login_as.lng                      |   12 
 interface/web/dns/lib/lang/se_dns_slave_list.lng                  |    1 
 interface/web/admin/lib/lang/se_server_config_list.lng            |    3 
 interface/web/help/lib/lang/se_support_message_list.lng           |   11 
 interface/web/admin/lib/lang/se_server_config.lng                 |    1 
 interface/web/dashboard/lib/lang/se_dashlet_mailquota.lng         |   13 
 interface/web/mail/lib/lang/se_spamfilter_users.lng               |   17 
 interface/web/mail/lib/lang/se_spamfilter_config_list.lng         |    3 
 interface/web/admin/form/system_config.tform.php                  |   10 
 interface/web/admin/lib/lang/se_package_install.lng               |    9 
 interface/web/admin/lib/lang/se_iptables.lng                      |   21 
 interface/web/mail/lib/lang/se_mail_relay_recipient.lng           |   13 
 interface/lib/classes/ispconfig_request.inc.php                   |  263 +++
 interface/web/client/lib/lang/se_clients_list.lng                 |   17 
 server/conf/php_fpm_pool.conf.master                              |    2 
 interface/web/mail/lib/lang/se_spamfilter_whitelist_list.lng      |   13 
 interface/web/client/lib/lang/se_client_template_list.lng         |    9 
 interface/web/mail/lib/lang/se_spamfilter_whitelist.lng           |   13 
 interface/web/sites/lib/lang/se_database_user_admin_list.lng      |    9 
 interface/web/dashboard/lib/lang/se_dashlet_limits.lng            |   45 
 interface/web/dns/lib/lang/se_dns_soa_list.lng                    |    1 
 interface/web/mail/lib/lang/se_mail_mailinglist.lng               |   37 
 interface/web/dashboard/lib/lang/se_dashlet_quota.lng             |   13 
 interface/web/sites/lib/lang/se_web_domain_admin_list.lng         |    1 
 interface/web/mail/lib/lang/se_mail_domain_admin_list.lng         |   11 
 interface/web/admin/lib/lang/se_language_complete.lng             |   11 
 interface/web/admin/lib/lang/se_software_repo_list.lng            |    1 
 interface/web/vm/lib/lang/se_openvz_action.lng                    |    1 
 interface/web/mail/lib/lang/se_mail_domain.lng                    |   13 
 interface/web/admin/lib/lang/se_language_export.lng               |    9 
 interface/web/mail/lib/lang/se_spamfilter_config.lng              |    9 
 interface/web/sites/lib/lang/se_web_folder_user_list.lng          |    1 
 interface/web/mail/lib/lang/se_spamfilter_policy_list.lng         |    1 
 interface/web/designer/lib/lang/se_form_edit.lng                  |    3 
 interface/web/tools/lib/lang/se_usersettings.lng                  |   19 
 interface/web/dns/lib/lang/se_dns_wizard.lng                      |    1 
 interface/web/mail/lib/lang/se_mail_domain_list.lng               |    7 
 interface/web/mail/lib/lang/se_mail_user_stats_list.lng           |   13 
 install/dist/lib/opensuse.lib.php                                 |    6 
 interface/web/admin/lib/lang/se_tpl_default_admin.lng             |   15 
 interface/web/dns/lib/lang/se_dns_template.lng                    |    9 
 interface/web/sites/lib/lang/se.lng                               |   57 
 interface/web/mail/lib/lang/se_mail_alias_list.lng                |   11 
 interface/web/vm/lib/lang/se_openvz_template_list.lng             |    1 
 interface/web/sites/lib/lang/se_shell_user.lng                    |    1 
 interface/web/vm/lib/lang/se_openvz_ip_list.lng                   |    1 
 interface/web/vm/lib/lang/se_openvz_ostemplate_list.lng           |    1 
 install/dist/lib/fedora.lib.php                                   |    8 
 interface/web/vm/lib/lang/se_openvz_ip.lng                        |    1 
 interface/web/dns/lib/lang/se_dns_a.lng                           |    1 
 interface/web/admin/lib/lang/se_users_list.lng                    |   11 
 install/update.php                                                |    6 
 interface/web/client/lib/lang/se_resellers_list.lng               |   17 
 interface/web/sites/lib/lang/se_database_user_list.lng            |    7 
 install/lib/installer_base.lib.php                                |    5 
 interface/web/sites/lib/lang/se_web_domain_list.lng               |    1 
 interface/web/mail/lib/lang/se_mail_content_filter.lng            |    9 
 server/plugins-available/bind_plugin.inc.php                      |    1 
 interface/web/mail/lib/lang/se_spamfilter_policy.lng              |    1 
 interface/web/client/lib/lang/se_domain_list.lng                  |    9 
 interface/web/sites/lib/lang/se_aps_packages_list.lng             |   11 
 server/mods-available/rescue_core_module.inc.php                  |    2 
 interface/web/mail/lib/lang/se_spamfilter_blacklist_list.lng      |   13 
 interface/web/mail/lib/lang/se_mail_blacklist_list.lng            |   15 
 interface/web/client/lib/lang/se_domain.lng                       |    9 
 interface/lib/lang/se.lng                                         |  211 +-
 interface/web/dns/lib/lang/se.lng                                 |   13 
 interface/web/admin/lib/lang/se_software_package_install.lng      |    9 
 interface/web/dns/lib/lang/se_dns_srv.lng                         |    1 
 install/tpl/nginx_apps.vhost.master                               |    2 
 interface/web/dashboard/lib/lang/se.lng                           |    5 
 interface/web/mail/lib/lang/se_mail_forward_list.lng              |    7 
 interface/web/mailuser/lib/lang/se_mail_user_password.lng         |   17 
 interface/web/client/lib/lang/se_client_message_template_list.lng |    7 
 interface/web/designer/lib/lang/se_module_list.lng                |    3 
 interface/web/dns/lib/lang/se_dns_ptr.lng                         |   13 
 interface/web/admin/lib/lang/se_firewall.lng                      |   13 
 interface/web/admin/lib/lang/se_language_import.lng               |   15 
 interface/web/mail/lib/lang/se.lng                                |   35 
 interface/web/admin/lib/lang/se_iptables_list.lng                 |   23 
 interface/web/mail/lib/lang/se_spamfilter_users_list.lng          |   13 
 interface/web/admin/lib/lang/se_remote_action.lng                 |   17 
 interface/web/mailuser/lib/lang/se_mail_user_filter_list.lng      |   13 
 interface/web/mail/lib/lang/se_mail_aliasdomain_list.lng          |    9 
 interface/web/login/lib/lang/se.lng                               |   39 
 interface/web/admin/lib/lang/se_language_add.lng                  |   11 
 install/sql/incremental/upd_0074.sql                              |    2 
 interface/web/dns/lib/lang/se_dns_aaaa.lng                        |    1 
 interface/web/admin/lib/lang/se_server_ip.lng                     |   13 
 interface/web/help/lib/lang/se_help_faq_list.lng                  |    3 
 interface/web/sites/lib/lang/se_web_folder_list.lng               |    9 
 interface/web/mail/lib/lang/se_mail_relay_recipient_list.lng      |   13 
 interface/web/admin/lib/lang/se_server.lng                        |   11 
 interface/web/login/lib/lang/se_login_as.lng                      |   17 
 interface/web/mail/lib/lang/se_mail_transport_list.lng            |   11 
 interface/web/sites/lib/lang/se_database.lng                      |   63 
 interface/web/dns/lib/lang/se_dns_rp.lng                          |    9 
 install/dist/lib/gentoo.lib.php                                   |    3 
 interface/web/admin/lib/lang/se_groups_list.lng                   |    7 
 interface/web/themes/blue/templates/main.tpl.htm                  |    2 
 interface/web/admin/lib/lang/se_directive_snippets_list.lng       |    1 
 interface/web/client/lib/lang/se_client_circle.lng                |   15 
 interface/web/admin/lib/lang/se_users.lng                         |   23 
 interface/web/mail/lib/lang/se_mail_user_list.lng                 |   13 
 interface/web/client/lib/lang/se_client_circle_list.lng           |   15 
 interface/web/mail/lib/lang/se_mail_spamfilter.lng                |   31 
 interface/web/mail/lib/lang/se_mail_whitelist_list.lng            |   15 
 236 files changed, 2,299 insertions(+), 1,704 deletions(-)

diff --git a/install/autoupdate.php b/install/autoupdate.php
index f9d0e62..8960e13 100644
--- a/install/autoupdate.php
+++ b/install/autoupdate.php
@@ -198,8 +198,10 @@
 	$inst->configure_postfix('dont-create-certs');
 
 	//** Configure mailman
-	swriteln('Configuring Mailman');
-	$inst->configure_mailman('update');
+	if($conf['mailman']['installed'] == true) {
+		swriteln('Configuring Mailman');
+		$inst->configure_mailman('update');
+	}
 
 	//* Configure Jailkit
 	swriteln('Configuring Jailkit');
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 95f3fec..87fadb0 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -392,7 +392,6 @@
 			'virtual_transport = dovecot',
 			'smtpd_sasl_type = dovecot',
 			'smtpd_sasl_path = private/auth',
-			'receive_override_options = no_address_mappings'
 		);
 
 		// Make a backup copy of the main.cf file
@@ -438,6 +437,8 @@
 			copy("$config_dir/$configfile", "$config_dir/$configfile~");
 			exec("chmod 400 $config_dir/$configfile~");
 		}
+		
+		if(!@file_exists('/etc/dovecot-sql.conf')) exec('ln -s /etc/dovecot/dovecot-sql.conf /etc/dovecot-sql.conf');
 
 		$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/fedora_dovecot-sql.conf.master', "tpl/fedora_dovecot-sql.conf.master");
 		$content = str_replace('{mysql_server_ispconfig_user}', $conf['mysql']['ispconfig_user'], $content);
@@ -450,7 +451,7 @@
 		exec("chown root:root $config_dir/$configfile");
 		
 		// Dovecot shall ignore mounts in website directory
-		exec("doveadm mount add '/var/www/*' ignore");
+		if(is_installed('doveadm')) exec("doveadm mount add '/var/www/*' ignore > /dev/null 2> /dev/null");
 
 	}
 
@@ -1202,6 +1203,9 @@
 
 		//* Remove Domain module as its functions are available in the client module now
 		if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
+		
+		// Add symlink for patch tool
+		if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
 
 	}
 
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index d4e5bee..b14cffe 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -1079,6 +1079,9 @@
 
 		//* Remove Domain module as its functions are available in the client module now
 		if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
+		
+		// Add symlink for patch tool
+		if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
 
 	}
 
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 35f60db..6e6a618 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -443,7 +443,6 @@
 			'virtual_transport = dovecot',
 			'smtpd_sasl_type = dovecot',
 			'smtpd_sasl_path = private/auth',
-			'receive_override_options = no_address_mappings'
 		);
 
 		// Make a backup copy of the main.cf file
@@ -501,7 +500,7 @@
 		exec("chown root:root $config_dir/$configfile");
 		
 		// Dovecot shall ignore mounts in website directory
-		exec("doveadm mount add '/srv/www/*' ignore");
+		if(is_installed('doveadm')) exec("doveadm mount add '/srv/www/*' ignore > /dev/null 2> /dev/null");
 
 	}
 
@@ -1274,6 +1273,9 @@
 
 		//* Remove Domain module as its functions are available in the client module now
 		if(@is_dir('/usr/local/ispconfig/interface/web/domain')) exec('rm -rf /usr/local/ispconfig/interface/web/domain');
+		
+		// Add symlink for patch tool
+		if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
 
 
 	}
diff --git a/install/install.php b/install/install.php
index 847c2fd..796b027 100644
--- a/install/install.php
+++ b/install/install.php
@@ -191,7 +191,9 @@
 	$inst->configure_postfix();
 
 	//* Configure Mailman
-	$inst->configure_mailman('install');
+	if($conf['mailman']['installed'] == true) {
+		$inst->configure_mailman('install');
+	}
 
 	//* Configure jailkit
 	swriteln('Configuring Jailkit');
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 97e2fce..7d6348b 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -690,7 +690,7 @@
 		if(!is_user($cf['vmail_username'])) caselog("$command &> /dev/null", __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command");
 
 		//* These postconf commands will be executed on installation and update
-		$server_ini_rec = $this->db->queryOneRecord("SELECT config FROM server WHERE server_id = ".$conf['server_id']);
+		$server_ini_rec = $this->db->queryOneRecord("SELECT config FROM `" . $this->db->quote($conf["mysql"]["database"]) . "`.`server` WHERE server_id = ".$conf['server_id']);
 		$server_ini_array = ini_to_array(stripslashes($server_ini_rec['config']));
 		unset($server_ini_rec);
 
@@ -2112,7 +2112,8 @@
 			replaceLine('/etc/default/rkhunter', 'CRON_DB_UPDATE="yes"', 'CRON_DB_UPDATE="no"', 1, 0);
 		}
 		
-
+		// Add symlink for patch tool
+		if(!is_link('/usr/local/bin/ispconfig_patch')) exec('ln -s /usr/local/ispconfig/server/scripts/ispconfig_patch /usr/local/bin/ispconfig_patch');
 
 	}
 
diff --git a/install/sql/incremental/upd_0074.sql b/install/sql/incremental/upd_0074.sql
index 21aba81..05c33a3 100644
--- a/install/sql/incremental/upd_0074.sql
+++ b/install/sql/incremental/upd_0074.sql
@@ -49,7 +49,7 @@
 	CHANGE `sys_perm_group` `sys_perm_group` varchar(5) NOT NULL DEFAULT '',
 	CHANGE `sys_perm_other` `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
 	CHANGE `zone` `zone` int(11) unsigned NOT NULL DEFAULT '0',
-	CHANGE `name` `name` varchar(64) NOT NULL DEFAULT '',
+	CHANGE `name` `name` varchar(255) NOT NULL DEFAULT '',
 	CHANGE `data` `data` varchar(255) NOT NULL DEFAULT '';
 
 ALTER TABLE `dns_slave`
diff --git a/install/sql/incremental/upd_0076.sql b/install/sql/incremental/upd_0076.sql
new file mode 100644
index 0000000..ce595a8
--- /dev/null
+++ b/install/sql/incremental/upd_0076.sql
@@ -0,0 +1 @@
+ALTER TABLE `dns_rr` CHANGE `name` `name` varchar(255) NOT NULL DEFAULT '';
\ No newline at end of file
diff --git a/install/sql/incremental/upd_0077.sql b/install/sql/incremental/upd_0077.sql
new file mode 100644
index 0000000..143511c
--- /dev/null
+++ b/install/sql/incremental/upd_0077.sql
@@ -0,0 +1 @@
+ALTER TABLE `ftp_user` ADD `expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `dl_bandwidth` ;
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 42b310b..21c0644 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -447,7 +447,7 @@
   `sys_perm_other` varchar(5) NOT NULL DEFAULT '',
   `server_id` int(11) NOT NULL default '1',
   `zone` int(11) unsigned NOT NULL DEFAULT '0',
-  `name` varchar(64) NOT NULL DEFAULT '',
+  `name` varchar(255) NOT NULL DEFAULT '',
   `type` enum('A','AAAA','ALIAS','CNAME','HINFO','MX','NAPTR','NS','PTR','RP','SRV','TXT') default NULL,
   `data` varchar(255) NOT NULL DEFAULT '',
   `aux` int(11) unsigned NOT NULL default '0',
@@ -598,6 +598,7 @@
   `dl_ratio` int(11) NOT NULL default '-1',
   `ul_bandwidth` int(11) NOT NULL default '-1',
   `dl_bandwidth` int(11) NOT NULL default '-1',
+  `expires` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   PRIMARY KEY  (`ftp_user_id`),
   KEY `active` (`active`),
   KEY `server_id` (`server_id`),
diff --git a/install/tpl/nginx_apps.vhost.master b/install/tpl/nginx_apps.vhost.master
index a8fe664..2c720b5 100644
--- a/install/tpl/nginx_apps.vhost.master
+++ b/install/tpl/nginx_apps.vhost.master
@@ -5,7 +5,7 @@
 
         root   {apps_vhost_dir};
 
-        client_max_body_size 20M;
+        client_max_body_size 100M;
 
         location / {
                index index.php index.html;
diff --git a/install/update.php b/install/update.php
index 08ffcc8..6a1b9d1 100644
--- a/install/update.php
+++ b/install/update.php
@@ -262,8 +262,10 @@
 		$inst->configure_postfix('dont-create-certs');
 
 		//** Configure mailman
-		swriteln('Configuring Mailman');
-		$inst->configure_mailman('update');
+		if($conf['mailman']['installed'] == true) {
+			swriteln('Configuring Mailman');
+			$inst->configure_mailman('update');
+		}
 
 		//* Configure Jailkit
 		swriteln('Configuring Jailkit');
diff --git a/interface/lib/classes/ispconfig_request.inc.php b/interface/lib/classes/ispconfig_request.inc.php
new file mode 100644
index 0000000..b29ae23
--- /dev/null
+++ b/interface/lib/classes/ispconfig_request.inc.php
@@ -0,0 +1,263 @@
+<?php
+
+/*
+Copyright (c) 2013, Marius Cramer, pixcept KG
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of ISPConfig nor the names of its contributors
+      may be used to endorse or promote products derived from this software without
+      specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+//* The purpose of this library is to provide some general functions.
+//* This class is loaded automatically by the ispconfig framework.
+
+abstract class ISPConfigRequest {
+	/**
+	 * Get header data and contents from an url
+	 *
+	 * Calls an url and returns an array containing the http header and the page content
+	 *
+	 * @access public
+	 * @param string $url the url to call
+	 * @param string $store_in the file to store the data in instead of returning them
+	 * @return array The array with header data at index 0 and page content at index 1, returns boolean false on error. If $store_in is set only the headers are returned
+	 */
+
+
+	public static function get_with_headers($url, $store_in = null, $follow_redirects = false, $user_agent = false) {
+		if($follow_redirects === true) $follow_redirects = 5;
+		elseif($follow_redirects !== false) $follow_redirects--;
+
+		if(!$user_agent) $user_agent = 'pxFW GET proxy';
+
+		$url_info = parse_url($url);
+		if(isset($url_info['scheme']) && $url_info['scheme'] == 'https') {
+			$port = isset($url_info['port']) ? $url_info['port'] : 443;
+			//@$fp = stream_socket_client('ssl://' . $url_info['host'] . ':' . $port, $errno, $errstr, 10, STREAM_CLIENT_CONNECT, stream_context_create(array('ssl' => array('ciphers' => 'ALL:!AES:!3DES:!RC4:@STRENGTH'))));
+			@$fp = fsockopen('sslv3://' . $url_info['host'], $port, $errno, $errstr, 10);
+		} else {
+			$port = isset($url_info['port']) ? $url_info['port'] : 80;
+			@$fp = fsockopen($url_info['host'], $port, $errno, $errstr, 10);
+		}
+
+		if($store_in) {
+			$outfp = fopen($store_in, 'w');
+			if(!$outfp) return false;
+		}
+		if($fp) {
+			stream_set_timeout($fp, 10);
+			$head = 'GET ' . (isset($url_info['path']) ? $url_info['path'] : '/') . (isset($url_info['query']) ? '?' . $url_info['query'] : '');
+			$head .= " HTTP/1.0\r\nHost: " . (isset($url_info['host']) ? $url_info['host'] : '') . "\r\n";
+			$head .= "User-Agent: " . $user_agent . "\r\n";
+			if(isset($url_info['user'])) {
+				if(!array_key_exists('pass', $url_info)) $url_info['pass'] = '';
+				$head .= "Authorization: basic " . base64_encode($url_info['user'] . ':' . $url_info['pass']) . "\r\n";
+			}
+			$head .= "Connection: Close\r\n";
+			$head .= "Accept: */*\r\n\r\n";
+
+			$data = '';
+			$eoheader = false;
+			fputs($fp, $head);
+			while(!feof($fp)) {
+				if($header = fgets($fp, 1024)) {
+					if($eoheader == true) {
+						if($store_in) fputs($outfp, $header);
+						else $data .= $header;
+						continue;
+					}
+
+					if ($header == "\r\n") {
+						$eoheader = true;
+						continue;
+					} else {
+						$header = trim($header);
+					}
+					$sc_pos = strpos($header, ':');
+					if($sc_pos === false) {
+						$headers['status'] = $header;
+						$headers['http_code'] = intval(preg_replace('/^HTTP\/\d+\.\d+\s+(\d+)\s+.*$/', '$1', $header));
+					} else {
+						$label = substr($header, 0, $sc_pos);
+						$value = substr($header, $sc_pos + 1);
+						$headers[strtolower($label)] = trim($value);
+					}
+				}
+			}
+			fclose($fp);
+			if(isset($headers['http_code']) && isset($headers['location']) && ($headers['http_code'] == 301 || $headers['http_code'] == 302) && $follow_redirects > 0) {
+				if($store_in) fclose($outfp);
+				return $self::get_with_headers($headers['location'], $store_in, $follow_redirects);
+			}
+			if($store_in) {
+				fclose($outfp);
+
+				$code = intval(preg_replace('/^HTTP\/\d+\.\d+\s+(\d+)\s+.*$/', '$1', $headers['status']));
+				if($code != 200) {
+					return false;
+				}
+				return $headers;
+			} else {
+				return array($headers, $data);
+			}
+		} else {
+			if($store_in) {
+				fclose($outfp);
+				@unlink($store_in);
+			}
+			return false;
+		}
+	}
+
+	/**
+	 * Gets the content of an url
+	 *
+	 * Checks for the php function file_get_contents and uses an alternative if not found
+	 *
+	 * @access public
+	 * @param string $url url to get
+	 * @return string url data including headers
+	 * @see file_get_contents
+	 */
+	public static function get($url) {
+		if(function_exists('file_get_contents')) return file_get_contents($url);
+
+		$fp = fopen($url, 'r');
+		$data = '';
+		while(!feof($fp)) {
+			$data .= fgets($fp, 8192);
+		}
+		fclose($fp);
+
+		return $data;
+	}
+
+
+	/**
+	 * Make a post request and get data
+	 *
+	 * Calls an url with a post request and returns the data - and optionally the header content
+	 *
+	 * @access public
+	 * @param string $url the url to call
+	 * @param string $data the post data to send
+	 * @param bool $get_headers if true, the function will return an array like PXUrl::get_with_headers(), otherwise the content is returned as a string
+	 * @return mixed Content data as string or - if get_headers is true - the array with header data at index 0 and page content at index 1
+	 * @see get_url_and_headers
+	 */
+	public static function post($url, $data, $get_headers = false, $user_agent = false) {
+		$url_info = parse_url($url);
+		if((isset($url_info['scheme']) && $url_info['scheme'] == 'https') || $url_info['port'] == 443) {
+			$port = (!isset($url_info['port']) || !$url_info['port'] || $url_info['port'] == 443 || $url_info['port'] == 80) ? 443 : $url_info['port'];
+			//@$fp = stream_socket_client('ssl://' . $url_info['host'] . ':' . $port, $errno, $errstr, 10, STREAM_CLIENT_CONNECT, stream_context_create(array('ssl' => array('ciphers' => 'ALL:!AES:!3DES:!RC4:@STRENGTH'))));
+			@$fp = fsockopen('sslv3://' . $url_info['host'], $port, $errno, $errstr, 10);
+		} else {
+			$port = isset($url_info['port']) ? $url_info['port'] : 80;
+			@$fp = fsockopen($url_info['host'], $port, $errno, $errstr, 10);
+		}
+
+		if(!$fp) return '';
+
+		if(!$user_agent) $user_agent = 'pxFW GET proxy';
+
+		$header = 'POST ' . (isset($url_info['path']) ? $url_info['path'] : '/') . (isset($url_info['query']) ? '?' . @$url_info['query'] : '') . " HTTP/1.1\r\n";
+		$header .= "Host: " . @$url_info['host'] . "\r\n";
+		$header .= "User-Agent: " . $user_agent . "\r\n";
+		if(isset($url_info['user'])) {
+			if(!array_key_exists('pass', $url_info)) $url_info['pass'] = '';
+			$header .= "Authorization: basic " . base64_encode($url_info['user'] . ':' . $url_info['pass']) . "\r\n";
+		}
+		$header .= "Content-Type: application/x-www-form-urlencoded\r\n";
+		$header .= "Content-Length: " . strlen($data) . "\r\n";
+		$header .= "Connection: close\r\n\r\n";
+		$header .= $data . "\r\n\r\n";
+
+		fwrite($fp, $header);
+
+		$response = '';
+		$eoheader = false;
+		$header = '';
+		$tmpdata = '';
+		$chunked = false;
+		$chunklen = 0;
+
+		while(!feof($fp)) {
+			if($header = @fgets($fp, 1024)) {
+				if($eoheader == true) {
+					$response .= $header;
+					continue;
+				}
+
+				if ($header == "\r\n") {
+					$eoheader = true;
+					continue;
+				} else {
+					$tmpdata .= $header;
+					if(preg_match('/Transfer-Encoding:\s+chunked/i', $tmpdata)) $chunked = true;
+				}
+			}
+		}
+		//var_dump($response, $chunked, $header);
+		if($chunked == true) {
+			$lines = explode("\n", $response);
+			$response = '';
+			$chunklen = 0;
+			foreach($lines as $line) {
+				$line .= "\n";
+				if($chunklen <= 0) {
+					if(preg_match('/^([0-9a-f]+)\s*$/is', $line, $matches)) {
+						$chunklen = hexdec($matches[1]);
+					}
+					continue;
+				}
+
+				if(strlen($line) > $chunklen) {
+					//echo "Warnung: " . strlen($line) . " > " . $chunklen . "\n";
+					$line = substr($line, 0, $chunklen);
+				}
+				$response .= $line;
+				$chunklen -= strlen($line);
+			}
+
+			$start = strpos($response, '<?xml');
+			$end = strrpos($response, '>');
+			if($start !== false && $end !== false) $response = substr($response, $start, $end - $start + 1);
+		}
+
+		fclose($fp);
+
+		if($get_headers == true) {
+			$tmpheaders = explode("\n", $tmpdata);
+			$headers = array();
+			foreach($tmpheaders as $cur) {
+				if(preg_match('/^(\w+)\:\s*(.*)$/is', $cur, $matches)) {
+					$headers["$matches[1]"] = trim($matches[2]);
+				}
+			}
+			return array($headers, $response);
+		} else return $response;
+	}
+
+}
+
+?>
diff --git a/interface/lib/classes/validate_password.inc.php b/interface/lib/classes/validate_password.inc.php
index 543a90e..998c37c 100644
--- a/interface/lib/classes/validate_password.inc.php
+++ b/interface/lib/classes/validate_password.inc.php
@@ -38,19 +38,27 @@
 			return 1;
 		}
 
+		$different = 0;
+		if (preg_match('/[abcdefghijklnmopqrstuvwxyz]/', $password)) {
+			$different += 1;
+		}
+
 		if (preg_match('/[ABCDEFGHIJKLNMOPQRSTUVWXYZ]/', $password)) {
 			$points += 1;
+			$different += 1;
 		}
 
 		if (preg_match('/[0123456789]/', $password)) {
 			$points += 1;
+			$different += 1;
 		}
 
 		if (preg_match('/[`~!@#$%^&*()_+|\\=-[]}{\';:\/?.>,<" ]/', $password)) {
 			$points += 1;
+			$different += 1;
 		}
 
-		if ($points == 0) {
+		if ($points == 0 || $different < 3) {
 			if ($length >= 5 && $length <= 6) {
 				return 1;
 			} else if ($length >= 7 && $length <= 8) {
diff --git a/interface/lib/lang/se.lng b/interface/lib/lang/se.lng
index 930fe82..5f49333 100644
--- a/interface/lib/lang/se.lng
+++ b/interface/lib/lang/se.lng
@@ -16,135 +16,136 @@
 $wb['delete_confirmation'] = 'Vill du verkligen ta bort detta inlägg?';
 $wb['error_no_view_permission'] = 'Du har ej behörighet att se detta inlägg eller så existerar den ej!';
 $wb['error_no_delete_permission'] = 'Du har ej behörighet att ta bort detta inlägg!';
-$wb['page_txt'] = 'Page';
-$wb['page_of_txt'] = 'of';
-$wb['page_next_txt'] = 'Next';
-$wb['page_back_txt'] = 'Back';
-$wb['delete_txt'] = 'Delete';
+$wb['page_txt'] = 'Sida';
+$wb['page_of_txt'] = 'av';
+$wb['page_next_txt'] = 'Nästa';
+$wb['page_back_txt'] = 'Tillbaka';
+$wb['delete_txt'] = 'Radera';
 $wb['filter_txt'] = 'Filter';
-$wb['add_new_record_txt'] = 'Add new record';
-$wb['btn_save_txt'] = 'Save';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['toolsarea_head_txt'] = 'Tools';
-$wb['page_and_txt'] = 'and';
+$wb['add_new_record_txt'] = 'Lägg till nytt inlägg';
+$wb['btn_save_txt'] = 'Spara';
+$wb['btn_cancel_txt'] = 'Avbryt';
+$wb['toolsarea_head_txt'] = 'Verktyg';
+$wb['page_and_txt'] = 'och';
 $wb['top_menu_system'] = 'System';
-$wb['top_menu_client'] = 'Client';
-$wb['top_menu_email'] = 'Email';
-$wb['top_menu_monitor'] = 'Monitor';
-$wb['top_menu_sites'] = 'Sites';
+$wb['top_menu_client'] = 'Kund';
+$wb['top_menu_email'] = 'Epost';
+$wb['top_menu_monitor'] = 'Övervakning';
+$wb['top_menu_sites'] = 'Sajter';
 $wb['top_menu_dns'] = 'DNS';
-$wb['top_menu_tools'] = 'Tools';
-$wb['top_menu_help'] = 'Help';
-$wb['top_menu_billing'] = 'Billing';
-$wb['top_menu_domain'] = 'Domains';
-$wb['top_menu_dashboard'] = 'Home';
-$wb['latest_news_txt'] = 'Latest news';
+$wb['top_menu_tools'] = 'Verktyg';
+$wb['top_menu_help'] = 'Hjälp';
+$wb['top_menu_billing'] = 'Fakturering';
+$wb['top_menu_domain'] = 'Domäner';
+$wb['top_menu_dashboard'] = 'Hem';
+$wb['latest_news_txt'] = 'Senaste nytt';
 $wb['top_menu_vm'] = 'VServer';
-$wb['daynamesmin_su'] = 'Su';
-$wb['daynamesmin_mo'] = 'Mo';
-$wb['daynamesmin_tu'] = 'Tu';
-$wb['daynamesmin_we'] = 'We';
-$wb['daynamesmin_th'] = 'Th';
+$wb['daynamesmin_su'] = 'Sö';
+$wb['daynamesmin_mo'] = 'Må';
+$wb['daynamesmin_tu'] = 'Ti';
+$wb['daynamesmin_we'] = 'On';
+$wb['daynamesmin_th'] = 'To';
 $wb['daynamesmin_fr'] = 'Fr';
-$wb['daynamesmin_sa'] = 'Sa';
-$wb['daynames_sunday'] = 'Sunday';
-$wb['daynames_monday'] = 'Monday';
-$wb['daynames_tuesday'] = 'Tuesday';
-$wb['daynames_wednesday'] = 'Wednesday';
-$wb['daynames_thursday'] = 'Thursday';
-$wb['daynames_friday'] = 'Friday';
-$wb['daynames_saturday'] = 'Saturday';
+$wb['daynamesmin_sa'] = 'Lö';
+$wb['daynames_sunday'] = 'Söndag';
+$wb['daynames_monday'] = 'Måndag';
+$wb['daynames_tuesday'] = 'Tisdag';
+$wb['daynames_wednesday'] = 'Onsdag';
+$wb['daynames_thursday'] = 'Torsdag';
+$wb['daynames_friday'] = 'Fredag';
+$wb['daynames_saturday'] = 'Lördag';
 $wb['monthnamesshort_jan'] = 'Jan';
 $wb['monthnamesshort_feb'] = 'Feb';
 $wb['monthnamesshort_mar'] = 'Mar';
 $wb['monthnamesshort_apr'] = 'Apr';
-$wb['monthnamesshort_may'] = 'May';
+$wb['monthnamesshort_may'] = 'Maj';
 $wb['monthnamesshort_jun'] = 'Jun';
 $wb['monthnamesshort_jul'] = 'Jul';
 $wb['monthnamesshort_aug'] = 'Aug';
 $wb['monthnamesshort_sep'] = 'Sep';
-$wb['monthnamesshort_oct'] = 'Oct';
+$wb['monthnamesshort_oct'] = 'Okt';
 $wb['monthnamesshort_nov'] = 'Nov';
 $wb['monthnamesshort_dec'] = 'Dec';
-$wb['datepicker_nextText'] = 'Next';
-$wb['datepicker_prevText'] = 'Prev';
-$wb['logout_txt'] = 'Logout';
+$wb['datepicker_nextText'] = 'Nästa';
+$wb['datepicker_prevText'] = 'Föreg.';
+$wb['logout_txt'] = 'Logga ut';
 $wb['conf_format_dateshort_human_readable'] = 'yyyy-mm-dd';
-$wb['submit_confirmation'] = 'Do you really want to perform this action?';
-$wb['top_menu_mailuser'] = 'Mailuser';
-$wb['globalsearch_resultslimit_of_txt'] = 'of';
-$wb['globalsearch_resultslimit_results_txt'] = 'results';
-$wb['globalsearch_noresults_text_txt'] = 'No results.';
-$wb['globalsearch_noresults_limit_txt'] = '0 results';
-$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
-$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['submit_confirmation'] = 'Är du säker på att du vill utföra detta?';
+$wb['top_menu_mailuser'] = 'Epostanvändare';
+$wb['globalsearch_resultslimit_of_txt'] = 'av';
+$wb['globalsearch_resultslimit_results_txt'] = 'resultat';
+$wb['globalsearch_noresults_text_txt'] = 'Inga resultat.';
+$wb['globalsearch_noresults_limit_txt'] = '0 resultat';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Sök';
+$wb['globalsearch_suggestions_text_txt'] = 'Förslag';
 $wb['global_tabchange_warning_txt'] = 'Changed data in this tab will be changed if you press OK. On cancel they will be discarded.';
 $wb['global_tabchange_discard_txt'] = 'You have unsaved changes in this tab. Changes will be discarded if you continue.';
 $wb['datalog_changes_txt'] = 'The following changes are not yet populated to all servers:';
 $wb['datalog_changes_end_txt'] = 'Storing updates can take up to one minute. Please be patient.';
-$wb['datalog_status_i_web_database'] = 'Create new database';
-$wb['datalog_status_u_web_database'] = 'Update database';
-$wb['datalog_status_d_web_database'] = 'Delete database';
-$wb['datalog_status_i_web_database_user'] = 'Create database user for database';
-$wb['datalog_status_u_web_database_user'] = 'Update database user';
-$wb['datalog_status_d_web_database_user'] = 'Delete database user';
-$wb['datalog_status_i_web_domain'] = 'Create new website';
-$wb['datalog_status_u_web_domain'] = 'Update website settings';
-$wb['datalog_status_d_web_domain'] = 'Delete website';
-$wb['datalog_status_i_ftp_user'] = 'Create FTP user';
-$wb['datalog_status_u_ftp_user'] = 'Update FTP user';
-$wb['datalog_status_d_ftp_user'] = 'Delete FTP user';
-$wb['datalog_status_i_mail_domain'] = 'Create email domain';
-$wb['datalog_status_u_mail_domain'] = 'Update email domain';
-$wb['datalog_status_d_mail_domain'] = 'Delete email domain';
-$wb['datalog_status_i_mail_user'] = 'Create email user';
-$wb['datalog_status_u_mail_user'] = 'Update email user';
-$wb['datalog_status_d_mail_user'] = 'Delete email user';
-$wb['datalog_status_i_mail_forwarding'] = 'Create email address';
-$wb['datalog_status_u_mail_forwarding'] = 'Update email address';
-$wb['datalog_status_d_mail_forwarding'] = 'Delete email address';
-$wb['datalog_status_i_dns_rr'] = 'Create DNS record';
-$wb['datalog_status_u_dns_rr'] = 'Update DNS record';
-$wb['datalog_status_d_dns_rr'] = 'Delete DNS record';
-$wb['datalog_status_i_dns_soa'] = 'Create DNS zone';
-$wb['datalog_status_u_dns_soa'] = 'Update DNS zone';
-$wb['datalog_status_d_dns_soa'] = 'Delete DNS zone';
-$wb['datalog_status_i_cron'] = 'Create cron job';
-$wb['datalog_status_u_cron'] = 'Update cron job';
-$wb['datalog_status_d_cron'] = 'Delete cron job';
-$wb['datalog_status_i_mail_get'] = 'Create mail fetcher account';
-$wb['datalog_status_u_mail_get'] = 'Update mail fetcher account';
-$wb['datalog_status_d_mail_get'] = 'Delete mail fetcher account';
-$wb['datalog_status_i_mail_mailinglist'] = 'Create mailing list';
-$wb['datalog_status_u_mail_mailinglist'] = 'Update mailing list';
-$wb['datalog_status_d_mail_mailinglist'] = 'Delete mailing list';
-$wb['datalog_status_i_shell_user'] = 'Create shell user';
-$wb['datalog_status_u_shell_user'] = 'Update shell user';
-$wb['datalog_status_d_shell_user'] = 'Delete shell user';
-$wb['datalog_status_i_web_folder'] = 'Create folder protection';
-$wb['datalog_status_u_web_folder'] = 'Update folder protection';
-$wb['datalog_status_d_web_folder'] = 'Delete folder protection';
+$wb['datalog_status_i_web_database'] = 'Skapa ny databas';
+$wb['datalog_status_u_web_database'] = 'Uppdatera databas';
+$wb['datalog_status_d_web_database'] = 'Radera databas';
+$wb['datalog_status_i_web_database_user'] = 'Skapa databasanvändare för databas';
+$wb['datalog_status_u_web_database_user'] = 'Uppdatera databasanvändare';
+$wb['datalog_status_d_web_database_user'] = 'Radera databasanvändare';
+$wb['datalog_status_i_web_domain'] = 'Skapa ny webbsida';
+$wb['datalog_status_u_web_domain'] = 'Uppdatera webbsideinställningar';
+$wb['datalog_status_d_web_domain'] = 'Radera webbsida';
+$wb['datalog_status_i_ftp_user'] = 'Skapa FTP-användare';
+$wb['datalog_status_u_ftp_user'] = 'Uppdatera FTP-användare';
+$wb['datalog_status_d_ftp_user'] = 'Radera FTP-användare';
+$wb['datalog_status_i_mail_domain'] = 'Skapa epostdomän';
+$wb['datalog_status_u_mail_domain'] = 'Uppdatera epostdomän';
+$wb['datalog_status_d_mail_domain'] = 'Radera epostdomän';
+$wb['datalog_status_i_mail_user'] = 'Skapa epostanvändare';
+$wb['datalog_status_u_mail_user'] = 'Uppdatera epostanvändare';
+$wb['datalog_status_d_mail_user'] = 'Radera epostanvändare';
+$wb['datalog_status_i_mail_forwarding'] = 'Skapa epostadress';
+$wb['datalog_status_u_mail_forwarding'] = 'Uppdatera epostadress';
+$wb['datalog_status_d_mail_forwarding'] = 'Radera epostadress';
+$wb['datalog_status_i_dns_rr'] = 'Skapa DNS-inlägg';
+$wb['datalog_status_u_dns_rr'] = 'Radera DNS-inlägg';
+$wb['datalog_status_d_dns_rr'] = 'Radera DNS-inlägg';
+$wb['datalog_status_i_dns_soa'] = 'Skapa DNS-zon';
+$wb['datalog_status_u_dns_soa'] = 'Uppdatera DNS-zon';
+$wb['datalog_status_d_dns_soa'] = 'Radera DNS-zon';
+$wb['datalog_status_i_cron'] = 'Skapa cron-jobb';
+$wb['datalog_status_u_cron'] = 'Uppdatera cron-jobb';
+$wb['datalog_status_d_cron'] = 'Radera cron-jobb';
+$wb['datalog_status_i_mail_get'] = 'Skapa eposthämtarkonto';
+$wb['datalog_status_u_mail_get'] = 'Uppdatera eposthämtarkonto';
+$wb['datalog_status_d_mail_get'] = 'Rarera eposthämtarkonto';
+$wb['datalog_status_i_mail_mailinglist'] = 'Skapa mailinglista';
+$wb['datalog_status_u_mail_mailinglist'] = 'Uppdatera mailinglista';
+$wb['datalog_status_d_mail_mailinglist'] = 'Radera mailinglista';
+$wb['datalog_status_i_shell_user'] = 'Skapa shell-användare';
+$wb['datalog_status_u_shell_user'] = 'Uppdatera shell-användare';
+$wb['datalog_status_d_shell_user'] = 'Radera shell-användare';
+$wb['datalog_status_i_web_folder'] = 'Skapp katalogskydd';
+$wb['datalog_status_u_web_folder'] = 'Uppdatera katalogskydd';
+$wb['datalog_status_d_web_folder'] = 'Radera katalogskydd';
 $wb['datalog_status_i_web_folder_user'] = 'Create folder protection user';
 $wb['datalog_status_u_web_folder_user'] = 'Update folder protection user';
 $wb['datalog_status_d_web_folder_user'] = 'Delete folder protection user';
-$wb['datalog_status_i_spamfilter_users'] = 'Create spam filter settings';
-$wb['datalog_status_u_spamfilter_users'] = 'Update spam filter settings';
-$wb['datalog_status_d_spamfilter_users'] = 'Delete spam filter settings';
-$wb['login_as_txt'] = 'Log in as';
-$wb['no_domain_perm'] = 'You have no permission for this domain.';
+$wb['datalog_status_i_spamfilter_users'] = 'Skapa spamfilterinställningar';
+$wb['datalog_status_u_spamfilter_users'] = 'Uppdatera spamfilterinställningar';
+$wb['datalog_status_d_spamfilter_users'] = 'Radera spamfilterinställningar';
+$wb['login_as_txt'] = 'Logga in som';
+$wb['no_domain_perm'] = 'Du har ingen behörighet för denna domän';
 $wb['no_destination_perm'] = 'You have no permission for this destination.';
-$wb['client_you_are_locked'] = 'You have no permission to change any settings.';
-$wb['gender_m_txt'] = 'Mr.';
-$wb['gender_f_txt'] = 'Ms.';
+$wb['client_you_are_locked'] = 'Du har inte behörighet att ändra inställningar.';
+$wb['gender_m_txt'] = 'Herr';
+$wb['gender_f_txt'] = 'Fru';
 $wb['client_cannot_be_deleted_because_of_billing_module_txt'] = 'This client has records in the billing module, therefore he cannot be deleted.';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['None'] = 'None';
-$wb['strength_1'] = 'Weak';
-$wb['strength_2'] = 'Fair';
-$wb['strength_3'] = 'Good';
-$wb['strength_4'] = 'Strong';
-$wb['strength_5'] = 'Very Strong';
-$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of \\"{strength}\\".';
+$wb['yes_txt'] = 'Ja';
+$wb['no_txt'] = 'Nej';
+$wb['None'] = 'Ingen';
+$wb['strength_1'] = 'Svag';
+$wb['strength_2'] = 'Sådär';
+$wb['strength_3'] = 'Bra';
+$wb['strength_4'] = 'Starkt';
+$wb['strength_5'] = 'Väldigt starkt';
+$wb['weak_password_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length and have a strength of "{strength}".';
 $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
 ?>
+
diff --git a/interface/web/admin/form/system_config.tform.php b/interface/web/admin/form/system_config.tform.php
index 6054534..ce4a0cb 100644
--- a/interface/web/admin/form/system_config.tform.php
+++ b/interface/web/admin/form/system_config.tform.php
@@ -62,7 +62,7 @@
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
 			'validators' => array ( 0 => array ( 'type' => 'REGEX',
-					'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
+					'regex' => '/^[a-zA-Z0-9\-\_\[\]]{0,50}$/',
 					'errmsg'=> 'dbname_prefix_error_regex'),
 			),
 			'default' => '',
@@ -74,7 +74,7 @@
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
 			'validators' => array ( 0 => array ( 'type' => 'REGEX',
-					'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
+					'regex' => '/^[a-zA-Z0-9\-\_\[\]]{0,50}$/',
 					'errmsg'=> 'dbuser_prefix_error_regex'),
 			),
 			'default' => '',
@@ -86,7 +86,7 @@
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
 			'validators' => array ( 0 => array ( 'type' => 'REGEX',
-					'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
+					'regex' => '/^[a-zA-Z0-9\-\_\[\]]{0,50}$/',
 					'errmsg'=> 'ftpuser_prefix_error_regex'),
 			),
 			'default' => '',
@@ -98,7 +98,7 @@
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
 			'validators' => array ( 0 => array ( 'type' => 'REGEX',
-					'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
+					'regex' => '/^[a-zA-Z0-9\-\_\[\]]{0,50}$/',
 					'errmsg'=> 'shelluser_prefix_error_regex'),
 			),
 			'default' => '',
@@ -110,7 +110,7 @@
 			'datatype' => 'VARCHAR',
 			'formtype' => 'TEXT',
 			'validators' => array ( 0 => array ( 'type' => 'REGEX',
-					'regex' => '/^[a-zA-Z0-0\-\_\[\]]{0,50}$/',
+					'regex' => '/^[a-zA-Z0-9\-\_\[\]]{0,50}$/',
 					'errmsg'=> 'webdavuser_prefix_error_regex'),
 			),
 			'default' => '',
diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng
index 272d312..ab73983 100644
--- a/interface/web/admin/lib/lang/de_system_config.lng
+++ b/interface/web/admin/lib/lang/de_system_config.lng
@@ -64,7 +64,7 @@
 $wb['customer_no_start_txt'] = 'Kundennummer Startwert';
 $wb['customer_no_counter_txt'] = 'Kundennummer Zähler';
 $wb['session_timeout_txt'] = 'Session-Timeout (Minuten)';
-$wb['session_allow_endless_txt'] = '\\"Eingeloggt bleiben\\" aktivieren';
+$wb['session_allow_endless_txt'] = '&quot;Eingeloggt bleiben&quot; aktivieren';
 $wb['No'] = 'Nein';
 $wb['min_password_length_txt'] = 'Minimale Passwortlänge';
 $wb['min_password_strength_txt'] = 'Minimale Passwortstärke';
diff --git a/interface/web/admin/lib/lang/se.lng b/interface/web/admin/lib/lang/se.lng
index 5c84d33..5101192 100644
--- a/interface/web/admin/lib/lang/se.lng
+++ b/interface/web/admin/lib/lang/se.lng
@@ -1,50 +1,51 @@
 <?php
-$wb['1001'] = 'Username or password is empty.';
-$wb['1002'] = 'Username or password is wrong.';
-$wb['Groups'] = 'Groups';
-$wb['groups_description'] = 'Form to edit systemuser groups.';
-$wb['Servers'] = 'Servers';
-$wb['Config'] = 'Config';
-$wb['Add user'] = 'Add user';
-$wb['Edit user'] = 'Edit user';
-$wb['Add group'] = 'Add group';
-$wb['Edit group'] = 'Edit group';
-$wb['Edit server'] = 'Edit server';
-$wb['Sync. Now'] = 'Sync. Now';
-$wb['DB Sync.'] = 'DB Sync.';
-$wb['User Management'] = 'User Management';
-$wb['CP Users'] = 'CP Users';
-$wb['Remote Users'] = 'Remote Users';
+$wb['1001'] = 'Användarnamn eller lösenord är fel.';
+$wb['1002'] = 'Användarnamn eller lösenord är fel.';
+$wb['Groups'] = 'Grupper';
+$wb['groups_description'] = 'Formulär för att redigera systemanvändargrupper.';
+$wb['Servers'] = 'Servrar';
+$wb['Config'] = 'Konfiguration';
+$wb['Add user'] = 'Lägg till användare';
+$wb['Edit user'] = 'Redigera användare';
+$wb['Add group'] = 'Lägg till grupp';
+$wb['Edit group'] = 'Redigera grupp';
+$wb['Edit server'] = 'Redigera server';
+$wb['Sync. Now'] = 'Synka nu';
+$wb['DB Sync.'] = 'DB-synk.';
+$wb['User Management'] = 'Användarhantering';
+$wb['CP Users'] = 'Kontrollpanelanvändare';
+$wb['Remote Users'] = 'Fjärranvändare';
 $wb['System'] = 'System';
-$wb['Server Services'] = 'Server Services';
-$wb['Services'] = 'Services';
-$wb['Server Config'] = 'Server Config';
+$wb['Server Services'] = 'Servertjänster';
+$wb['Services'] = 'Tjänster';
+$wb['Server Config'] = 'Serverkonfiguration';
 $wb['Server'] = 'Server';
-$wb['Mail'] = 'Mail';
+$wb['Mail'] = 'Epost';
 $wb['Getmail'] = 'Getmail';
-$wb['Web'] = 'Web';
+$wb['Web'] = 'Webb';
 $wb['FastCGI'] = 'FastCGI';
 $wb['Jailkit'] = 'Jailkit';
-$wb['Rescue'] = 'Rescue';
-$wb['Server IP addresses'] = 'Server IP addresses';
-$wb['Additional PHP Versions'] = 'Additional PHP Versions';
-$wb['Firewall'] = 'Firewall';
-$wb['Interface'] = 'Interface';
-$wb['Interface Config'] = 'Main Config';
-$wb['Domains'] = 'Domains';
-$wb['Misc'] = 'Misc';
-$wb['Software'] = 'Apps & Addons';
-$wb['Repositories'] = 'Repositories';
-$wb['Packages'] = 'Packages';
-$wb['Updates'] = 'Updates';
-$wb['Language Editor'] = 'Language Editor';
-$wb['Languages'] = 'Languages';
-$wb['New Language'] = 'New Language';
-$wb['Merge'] = 'Merge';
-$wb['Export'] = 'Export';
-$wb['Import'] = 'Import';
-$wb['Remote Actions'] = 'Remote Actions';
-$wb['Do OS-Update'] = 'Do OS-Update';
-$wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
+$wb['Rescue'] = 'Bevakning';
+$wb['Server IP addresses'] = 'Server IP-adresser';
+$wb['Additional PHP Versions'] = 'Ytterligare PHP-versioner';
+$wb['Firewall'] = 'Brandvägg';
+$wb['Interface'] = 'Gränssnitt';
+$wb['Interface Config'] = 'Huvudkonfiguration';
+$wb['Domains'] = 'Domäner';
+$wb['Misc'] = 'Blandat';
+$wb['Software'] = 'Appar och tillägg';
+$wb['Repositories'] = 'Bibliotek';
+$wb['Packages'] = 'Paket';
+$wb['Updates'] = 'Uppdateringar';
+$wb['Language Editor'] = 'Språkredigerare';
+$wb['Languages'] = 'Språk';
+$wb['New Language'] = 'Nytt språk';
+$wb['Merge'] = 'Slå ihop';
+$wb['Export'] = 'Exportera';
+$wb['Import'] = 'Importera';
+$wb['Remote Actions'] = 'Fjärrhandlingar';
+$wb['Do OS-Update'] = 'Utför OS-uppdatering';
+$wb['Do ISPConfig-Update'] = 'Utför ISPConfig-uppdatering';
 $wb['Directive Snippets'] = 'Directive Snippets';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_directive_snippets.lng b/interface/web/admin/lib/lang/se_directive_snippets.lng
index 0f09c12..5366bf1 100644
--- a/interface/web/admin/lib/lang/se_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/se_directive_snippets.lng
@@ -8,3 +8,4 @@
 $wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
 $wb['variables_txt'] = 'Variables';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_directive_snippets_list.lng b/interface/web/admin/lib/lang/se_directive_snippets_list.lng
index 4124ea3..3eac528 100644
--- a/interface/web/admin/lib/lang/se_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/se_directive_snippets_list.lng
@@ -5,3 +5,4 @@
 $wb['type_txt'] = 'Type';
 $wb['add_new_record_txt'] = 'Add Directive Snippet';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_firewall.lng b/interface/web/admin/lib/lang/se_firewall.lng
index e626345..4ae1ed6 100644
--- a/interface/web/admin/lib/lang/se_firewall.lng
+++ b/interface/web/admin/lib/lang/se_firewall.lng
@@ -1,11 +1,12 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['tcp_port_txt'] = 'Open TCP ports';
-$wb['udp_port_txt'] = 'Open UDP ports';
-$wb['tcp_port_help_txt'] = 'Separated by comma';
-$wb['udp_port_help_txt'] = 'Separated by comma';
-$wb['active_txt'] = 'Active';
-$wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
+$wb['tcp_port_txt'] = 'Öppna TCP-portar';
+$wb['udp_port_txt'] = 'Öppna UDP-portar';
+$wb['tcp_port_help_txt'] = 'Kommaseparerade';
+$wb['udp_port_help_txt'] = 'Kommaseparerade';
+$wb['active_txt'] = 'Aktiv';
+$wb['firewall_error_unique'] = 'Det finns redan ett brandväggsinlägg för den här servern';
 $wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, : and ,.';
 $wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, : and ,.';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_firewall_list.lng b/interface/web/admin/lib/lang/se_firewall_list.lng
index 24a34be..eff32d3 100644
--- a/interface/web/admin/lib/lang/se_firewall_list.lng
+++ b/interface/web/admin/lib/lang/se_firewall_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Firewall';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Brandvägg';
+$wb['active_txt'] = 'Aktiv';
 $wb['server_id_txt'] = 'Server';
-$wb['tcp_port_txt'] = 'Open TCP ports';
-$wb['udp_port_txt'] = 'Open UDP ports';
-$wb['add_new_record_txt'] = 'Add Firewall record';
+$wb['tcp_port_txt'] = 'Öppna TCP-portar';
+$wb['udp_port_txt'] = 'Öppna UDP-portar';
+$wb['add_new_record_txt'] = 'Lägg till brandväggsinlägg';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_groups.lng b/interface/web/admin/lib/lang/se_groups.lng
index 25d6b08..175a422 100644
--- a/interface/web/admin/lib/lang/se_groups.lng
+++ b/interface/web/admin/lib/lang/se_groups.lng
@@ -1,5 +1,6 @@
 <?php
 $wb['description_txt'] = 'Beskrivning';
 $wb['name_txt'] = 'Grupp';
-$wb['name_err'] = 'Gruppnamn måste ha min 1, max 30 Tecken.';
+$wb['name_err'] = 'Gruppnamnet måste ha minst 1 och max 30 tecken.';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_groups_list.lng b/interface/web/admin/lib/lang/se_groups_list.lng
index f3b089b..b5486da 100644
--- a/interface/web/admin/lib/lang/se_groups_list.lng
+++ b/interface/web/admin/lib/lang/se_groups_list.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Systemanvändar grupper';
+$wb['list_head_txt'] = 'Systemanvändargrupper';
 $wb['description_txt'] = 'Beskrivning';
 $wb['name_txt'] = 'Grupp';
-$wb['add_new_record_txt'] = 'Add new Group';
-$wb['warning_txt'] = '<b>WARNING:</b> 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!';
+$wb['add_new_record_txt'] = 'Lägg till ny grupp';
+$wb['warning_txt'] = '<b>VARNING:</b> Ändra inte några användarinställningar här. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_iptables.lng b/interface/web/admin/lib/lang/se_iptables.lng
index 40760b9..7c7dbfd 100644
--- a/interface/web/admin/lib/lang/se_iptables.lng
+++ b/interface/web/admin/lib/lang/se_iptables.lng
@@ -1,13 +1,14 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['multiport_txt'] = 'Multi Port';
-$wb['singleport_txt'] = 'Single Port';
-$wb['protocol_txt'] = 'Protocol';
-$wb['table_txt'] = 'Table';
-$wb['target_txt'] = 'Target';
-$wb['state_txt'] = 'State';
-$wb['destination_ip_txt'] = 'Destination Address';
-$wb['source_ip_txt'] = 'Source Address';
-$wb['active_txt'] = 'Active';
-$wb['iptables_error_unique'] = 'There is already a firewall record for this server.';
+$wb['multiport_txt'] = 'Multiport';
+$wb['singleport_txt'] = 'Singleport';
+$wb['protocol_txt'] = 'Protokoll';
+$wb['table_txt'] = 'Tabell';
+$wb['target_txt'] = 'Mål';
+$wb['state_txt'] = 'Status';
+$wb['destination_ip_txt'] = 'Destinationsadress';
+$wb['source_ip_txt'] = 'Källadress';
+$wb['active_txt'] = 'Aktiv';
+$wb['iptables_error_unique'] = 'Det finns redan brandväggsinlägg för den här servern';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_iptables_list.lng b/interface/web/admin/lib/lang/se_iptables_list.lng
index 15c8bad..3d400b4 100644
--- a/interface/web/admin/lib/lang/se_iptables_list.lng
+++ b/interface/web/admin/lib/lang/se_iptables_list.lng
@@ -1,15 +1,16 @@
 <?php
 $wb['list_head_txt'] = 'IPTables';
-$wb['add_new_rule_txt'] = 'Add IPTables Rule';
+$wb['add_new_rule_txt'] = 'Lägg till IPTables-regel';
 $wb['server_id_txt'] = 'Server';
-$wb['multiport_txt'] = 'Multi Port';
-$wb['singleport_txt'] = 'Single Port';
-$wb['protocol_txt'] = 'Protocol';
-$wb['table_txt'] = 'Table';
-$wb['target_txt'] = 'Target';
-$wb['state_txt'] = 'State';
-$wb['destination_ip_txt'] = 'Destination Address';
-$wb['source_ip_txt'] = 'Source Address';
-$wb['active_txt'] = 'Active';
-$wb['iptables_error_unique'] = 'There is already a firewall record for this server.';
+$wb['multiport_txt'] = 'Multiport';
+$wb['singleport_txt'] = 'Singleport';
+$wb['protocol_txt'] = 'Protokoll';
+$wb['table_txt'] = 'Tabell';
+$wb['target_txt'] = 'Mål';
+$wb['state_txt'] = 'Status';
+$wb['destination_ip_txt'] = 'Destinationadress';
+$wb['source_ip_txt'] = 'Källadress';
+$wb['active_txt'] = 'Aktiv';
+$wb['iptables_error_unique'] = 'Det finns redan ett brandväggsinlägg för den här servern';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_language_add.lng b/interface/web/admin/lib/lang/se_language_add.lng
index 27bb0ee..a0607f2 100644
--- a/interface/web/admin/lib/lang/se_language_add.lng
+++ b/interface/web/admin/lib/lang/se_language_add.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Add new language';
-$wb['language_select_txt'] = 'Select language basis';
-$wb['language_new_txt'] = 'New language';
-$wb['btn_save_txt'] = 'Create new language file set';
-$wb['btn_cancel_txt'] = 'Back';
+$wb['list_head_txt'] = 'Lägg till nytt språk';
+$wb['language_select_txt'] = 'Välj språkbas';
+$wb['language_new_txt'] = 'Nytt språk';
+$wb['btn_save_txt'] = 'Skapa nya språkfiler';
+$wb['btn_cancel_txt'] = 'Tillbaka';
 $wb['language_new_hint_txt'] = '2 characters ISO 639-1 language-code (See http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_language_complete.lng b/interface/web/admin/lib/lang/se_language_complete.lng
index b5200ff..9fc8458 100644
--- a/interface/web/admin/lib/lang/se_language_complete.lng
+++ b/interface/web/admin/lib/lang/se_language_complete.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Merge the selected language file with the english master language file. <br />This adds missing strings from the english master language files to the selected language.';
-$wb['language_select_txt'] = 'Select language';
-$wb['btn_save_txt'] = 'Merge files now';
-$wb['btn_cancel_txt'] = 'Back';
-$wb['list_desc_txt'] = 'Merge the selected language file with the english master language file. <br />This adds missing strings from the english master language files to the selected language.';
+$wb['list_head_txt'] = 'Slå ihop språkfilen med den engelska huvudfilen. <br />Detta lägger till saknade fraser från den engelska språkfilen till den valda språkfilen';
+$wb['language_select_txt'] = 'Välj språk';
+$wb['btn_save_txt'] = 'Slå ihop filer nu';
+$wb['btn_cancel_txt'] = 'Tillbaka';
+$wb['list_desc_txt'] = 'Slå ihop språkfilen med den engelska huvudfilen. <br />Detta lägger till saknade fraser från den engelska språkfilen till den valda språkfilen';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_language_edit.lng b/interface/web/admin/lib/lang/se_language_edit.lng
index 4c50e88..e02c9a9 100644
--- a/interface/web/admin/lib/lang/se_language_edit.lng
+++ b/interface/web/admin/lib/lang/se_language_edit.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Language file editor';
-$wb['language_select_txt'] = 'Select language';
-$wb['module_txt'] = 'Module';
-$wb['lang_file_txt'] = 'Language file';
-$wb['btn_save_txt'] = 'Save';
-$wb['btn_cancel_txt'] = 'Back';
+$wb['list_head_txt'] = 'Språkfilredigering';
+$wb['language_select_txt'] = 'Välj språk';
+$wb['module_txt'] = 'Modul';
+$wb['lang_file_txt'] = 'Språkfil';
+$wb['btn_save_txt'] = 'Spara';
+$wb['btn_cancel_txt'] = 'Tillbaka';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_language_export.lng b/interface/web/admin/lib/lang/se_language_export.lng
index f45d47b..a4d7147 100644
--- a/interface/web/admin/lib/lang/se_language_export.lng
+++ b/interface/web/admin/lib/lang/se_language_export.lng
@@ -1,6 +1,7 @@
 <?php
-$wb['list_head_txt'] = 'Export language files';
-$wb['language_select_txt'] = 'Select language';
-$wb['btn_save_txt'] = 'Export the selected language file set';
-$wb['btn_cancel_txt'] = 'Back';
+$wb['list_head_txt'] = 'Exportera språkfiler';
+$wb['language_select_txt'] = 'Välj språk';
+$wb['btn_save_txt'] = 'Exportera de valda språkfilerna';
+$wb['btn_cancel_txt'] = 'Tillbaka';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_language_import.lng b/interface/web/admin/lib/lang/se_language_import.lng
index a5831fc..8ecca37 100644
--- a/interface/web/admin/lib/lang/se_language_import.lng
+++ b/interface/web/admin/lib/lang/se_language_import.lng
@@ -1,9 +1,10 @@
 <?php
-$wb['list_head_txt'] = 'Import language file';
-$wb['language_import_txt'] = 'Select language file';
-$wb['btn_save_txt'] = 'Import the selected language file';
-$wb['language_overwrite_txt'] = 'Overwrite file, if exists.';
-$wb['btn_cancel_txt'] = 'Back';
-$wb['ignore_version_txt'] = 'Skip ISPConfig version check';
-$wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.';
+$wb['list_head_txt'] = 'Importera språkfil';
+$wb['language_import_txt'] = 'Välj språkfil';
+$wb['btn_save_txt'] = 'Importera den valda språkfilen';
+$wb['language_overwrite_txt'] = 'Skriv över fil om den existerar';
+$wb['btn_cancel_txt'] = 'Tillbaka';
+$wb['ignore_version_txt'] = 'Hoppa över ISPConfig versionskontroll';
+$wb['list_desc_txt'] = 'VARNING: Importera inte språkfiler från opålitliga källor!';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_language_list.lng b/interface/web/admin/lib/lang/se_language_list.lng
index 1c784ed..b23024d 100644
--- a/interface/web/admin/lib/lang/se_language_list.lng
+++ b/interface/web/admin/lib/lang/se_language_list.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Language file editor';
-$wb['language_select_txt'] = 'Select language';
-$wb['module_txt'] = 'Module';
-$wb['lang_file_txt'] = 'Language file';
-$wb['lang_file_date_txt'] = 'Last modify';
+$wb['list_head_txt'] = 'Språkfilsredigering';
+$wb['language_select_txt'] = 'Välj språk';
+$wb['module_txt'] = 'Modul';
+$wb['lang_file_txt'] = 'Språkfil';
+$wb['lang_file_date_txt'] = 'Senast ändrad';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_login_as.lng b/interface/web/admin/lib/lang/se_login_as.lng
new file mode 100644
index 0000000..284a75b
--- /dev/null
+++ b/interface/web/admin/lib/lang/se_login_as.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['login_1_txt'] = 'Vill du logga in som användare';
+$wb['login_2_txt'] = 'Om du gör det kan du klicka på  "gå tillbaka" genom att först klicka på logga ut.';
+$wb['btn_yes_txt'] = 'Ja, logga in som kund';
+$wb['btn_back_txt'] = 'Nej, tillbaka till listan';
+$wb['udp_port_help_txt'] = 'Kommaseparerade';
+$wb['active_txt'] = 'Aktiv';
+$wb['firewall_error_unique'] = 'Det finns redan ett brandväggsinlägg för den här servern.';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, ":" and ",".';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, ":" and ",".';
+?>
+
diff --git a/interface/web/admin/lib/lang/se_package_install.lng b/interface/web/admin/lib/lang/se_package_install.lng
index 574dd11..438f1d8 100644
--- a/interface/web/admin/lib/lang/se_package_install.lng
+++ b/interface/web/admin/lib/lang/se_package_install.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['repo_name_txt'] = 'Repository';
+$wb['repo_name_txt'] = 'Bibliotek';
 $wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'User (optional)';
-$wb['repo_password_txt'] = 'Password (optional)';
-$wb['active_txt'] = 'Active';
+$wb['repo_username_txt'] = 'Användare (Frivilligt)';
+$wb['repo_password_txt'] = 'Lösenord (Frivilligt)';
+$wb['active_txt'] = 'Aktiv';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_remote_action.lng b/interface/web/admin/lib/lang/se_remote_action.lng
index f268527..99d9e2c 100644
--- a/interface/web/admin/lib/lang/se_remote_action.lng
+++ b/interface/web/admin/lib/lang/se_remote_action.lng
@@ -1,12 +1,13 @@
 <?php
-$wb['select_server_txt'] = 'Select Server';
-$wb['btn_do_txt'] = 'Execute action';
-$wb['do_osupdate_caption'] = 'Do OS-Update at remote server';
+$wb['select_server_txt'] = 'Välj server';
+$wb['btn_do_txt'] = 'Utför handling';
+$wb['do_osupdate_caption'] = 'Utför OS-uppdatering på fjärrserver';
 $wb['do_osupdate_desc'] = 'This Action does a aptitude -y upgrade at your selected server.<br><br><strong>USE THIS AT YOUR OWN RISK!</strong>';
-$wb['do_ispcupdate_caption'] = 'Do ISPConfig 3 - Update at remote server';
+$wb['do_ispcupdate_caption'] = 'Utför ISPConfig 3 -uppdatering på fjärrserver';
 $wb['do_ispcupdate_desc'] = 'This action does a ISPConfig3 update at your selected server.<br><br><strong>USE THIS AT YOUR OWN RISK!</strong>';
-$wb['action_scheduled'] = 'The action is scheduled for execution';
-$wb['select_all_server'] = 'All server';
-$wb['ispconfig_update_title'] = 'ISPConfig update instructions';
-$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructins</a>';
+$wb['action_scheduled'] = 'Handlingen är schemalagd att utföras';
+$wb['select_all_server'] = 'Alla servrar';
+$wb['ispconfig_update_title'] = 'ISPConfig uppdateringsinstruktioner';
+$wb['ispconfig_update_text'] = 'Logga in som root på din server och kör kommandot<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />för att påbörja ISPConfig-uppdateringen.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Klicka här för detaljerade instruktioner</a>';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_remote_user.lng b/interface/web/admin/lib/lang/se_remote_user.lng
index 65b3cfd..5fedddc 100644
--- a/interface/web/admin/lib/lang/se_remote_user.lng
+++ b/interface/web/admin/lib/lang/se_remote_user.lng
@@ -1,12 +1,12 @@
 <?php
-$wb['username_txt'] = 'Username:';
-$wb['password_txt'] = 'Password:';
-$wb['function_txt'] = 'Functions:';
-$wb['username_error_unique'] = 'Username must be unique';
-$wb['username_error_empty'] = 'Username cannot be empty';
-$wb['password_error_empty'] = 'Password cannot be empty';
-$wb['password_strength_txt'] = 'Password Strength:';
-$wb['Mail domain functions'] = 'Mail domain functions';
+$wb['username_txt'] = 'Användarnamn:';
+$wb['password_txt'] = 'Lösenord:';
+$wb['function_txt'] = 'Funktioner:';
+$wb['username_error_unique'] = 'Användarnamnet måste vara unikt';
+$wb['username_error_empty'] = 'Användarnamnet kan inte vara tomt';
+$wb['password_error_empty'] = 'Löenordet kan inte vara tomt';
+$wb['password_strength_txt'] = 'Lösenordsstyrka:';
+$wb['Mail domain functions'] = 'Epostdomänfunktioner';
 $wb['Mail user functions'] = 'Mail user functions';
 $wb['Mail alias functions'] = 'Mail alias functions';
 $wb['Mail forward functions'] = 'Mail forward functions';
@@ -40,8 +40,9 @@
 $wb['DNS srv functions'] = 'DNS srv functions';
 $wb['DNS txt functions'] = 'DNS txt functions';
 $wb['Mail mailing list functions'] = 'Mail mailinglist functions';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['generate_password_txt'] = 'Generera lösenord';
+$wb['repeat_password_txt'] = 'Upprepa lösenord';
+$wb['password_mismatch_txt'] = 'Lösenorden matchar inte';
+$wb['password_match_txt'] = 'Lösenorden matchar';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_remote_user_list.lng b/interface/web/admin/lib/lang/se_remote_user_list.lng
index 152a75f..9f49023 100644
--- a/interface/web/admin/lib/lang/se_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/se_remote_user_list.lng
@@ -5,3 +5,4 @@
 $wb['parent_remote_userid_txt'] = 'ID';
 $wb['username_txt'] = 'Username';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_server.lng b/interface/web/admin/lib/lang/se_server.lng
index abc0649..29f32a7 100644
--- a/interface/web/admin/lib/lang/se_server.lng
+++ b/interface/web/admin/lib/lang/se_server.lng
@@ -5,11 +5,12 @@
 $wb['dns_server_txt'] = 'DNS-Server';
 $wb['file_server_txt'] = 'Filserver';
 $wb['active_txt'] = 'Aktiv';
-$wb['config_txt'] = 'config';
+$wb['config_txt'] = 'konfiguration';
 $wb['db_server_txt'] = 'DB-Server';
 $wb['vserver_server_txt'] = 'VServer-Server';
-$wb['mirror_server_id_txt'] = 'Is mirror of Server';
-$wb['- None -'] = '- None -';
-$wb['proxy_server_txt'] = 'Proxy-Server';
-$wb['firewall_server_txt'] = 'Firewall-Server';
+$wb['mirror_server_id_txt'] = 'Är spegling av server';
+$wb['- None -'] = '- Ingen';
+$wb['proxy_server_txt'] = 'Proxy-server';
+$wb['firewall_server_txt'] = 'Brandväggsserver';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng
index d510b59..565659e 100644
--- a/interface/web/admin/lib/lang/se_server_config.lng
+++ b/interface/web/admin/lib/lang/se_server_config.lng
@@ -192,3 +192,4 @@
 $wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
 $wb['monitor_system_updates_txt'] = 'Check for Linux updates';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_server_config_list.lng b/interface/web/admin/lib/lang/se_server_config_list.lng
index 636c2e0..9ff7f9b 100644
--- a/interface/web/admin/lib/lang/se_server_config_list.lng
+++ b/interface/web/admin/lib/lang/se_server_config_list.lng
@@ -1,4 +1,5 @@
 <?php
-$wb['list_head_txt'] = 'Server Configuration';
+$wb['list_head_txt'] = 'Serverkonfiguration';
 $wb['server_name_txt'] = 'Server';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_server_ip.lng b/interface/web/admin/lib/lang/se_server_ip.lng
index 88d8a2f..ad887bb 100644
--- a/interface/web/admin/lib/lang/se_server_ip.lng
+++ b/interface/web/admin/lib/lang/se_server_ip.lng
@@ -1,11 +1,12 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['ip_address_txt'] = 'IP Address';
+$wb['ip_address_txt'] = 'IP-adress';
 $wb['virtualhost_txt'] = 'HTTP NameVirtualHost';
-$wb['ip_error_wrong'] = 'The IP address is invalid';
-$wb['ip_error_unique'] = 'The IP address must be unique';
-$wb['client_id_txt'] = 'Client';
-$wb['ip_type_txt'] = 'Type';
-$wb['virtualhost_port_txt'] = 'HTTP Ports';
+$wb['ip_error_wrong'] = 'IP_adressen är ogiltig';
+$wb['ip_error_unique'] = 'IP-adressen måste vara unik';
+$wb['client_id_txt'] = 'Kund';
+$wb['ip_type_txt'] = 'Typ';
+$wb['virtualhost_port_txt'] = 'HTTP-portar';
 $wb['error_port_syntax'] = 'Invalid chars in port field, please enter only comma separated numbers. Example: 80,443';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_server_ip_list.lng b/interface/web/admin/lib/lang/se_server_ip_list.lng
index ea40668..67884b3 100644
--- a/interface/web/admin/lib/lang/se_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/se_server_ip_list.lng
@@ -1,10 +1,11 @@
 <?php
-$wb['list_head_txt'] = 'IP Addresses';
+$wb['list_head_txt'] = 'IP-adresser';
 $wb['server_id_txt'] = 'Server';
-$wb['ip_address_txt'] = 'IP Address';
-$wb['add_new_record_txt'] = 'Add new IP Address';
-$wb['client_id_txt'] = 'Client';
+$wb['ip_address_txt'] = 'IP-adresser';
+$wb['add_new_record_txt'] = 'Lägg till ny IP-adress';
+$wb['client_id_txt'] = 'Kund';
 $wb['virtualhost_txt'] = 'HTTP Vhost';
-$wb['virtualhost_port_txt'] = 'HTTP Ports';
-$wb['ip_type_txt'] = 'Type';
+$wb['virtualhost_port_txt'] = 'HTTP-portar';
+$wb['ip_type_txt'] = 'Typ';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_server_list.lng b/interface/web/admin/lib/lang/se_server_list.lng
index d1c13fe..23d6940 100644
--- a/interface/web/admin/lib/lang/se_server_list.lng
+++ b/interface/web/admin/lib/lang/se_server_list.lng
@@ -7,7 +7,8 @@
 $wb['file_server_txt'] = 'Fil';
 $wb['db_server_txt'] = 'DB';
 $wb['vserver_server_txt'] = 'VServer';
-$wb['add_new_record_txt'] = 'Add new Server';
+$wb['add_new_record_txt'] = 'Lägg till ny server';
 $wb['proxy_server_txt'] = 'Proxy';
-$wb['firewall_server_txt'] = 'Firewall';
+$wb['firewall_server_txt'] = 'Brandvägg';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_server_php.lng b/interface/web/admin/lib/lang/se_server_php.lng
index addbfa4..3b6096e 100644
--- a/interface/web/admin/lib/lang/se_server_php.lng
+++ b/interface/web/admin/lib/lang/se_server_php.lng
@@ -14,3 +14,4 @@
 $wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory';
 $wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_server_php_list.lng b/interface/web/admin/lib/lang/se_server_php_list.lng
index b402fd1..353e156 100644
--- a/interface/web/admin/lib/lang/se_server_php_list.lng
+++ b/interface/web/admin/lib/lang/se_server_php_list.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Additional PHP Versions';
+$wb['list_head_txt'] = 'Ytterligare PHP-versioner';
 $wb['server_id_txt'] = 'Server';
-$wb['add_new_record_txt'] = 'Add new PHP version';
-$wb['client_id_txt'] = 'Client';
-$wb['name_txt'] = 'PHP Name';
+$wb['add_new_record_txt'] = 'Lägg till ny PHP-version';
+$wb['client_id_txt'] = 'Kund';
+$wb['name_txt'] = 'PHP-namn';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_software_package.lng b/interface/web/admin/lib/lang/se_software_package.lng
index faffe38..f06ca05 100644
--- a/interface/web/admin/lib/lang/se_software_package.lng
+++ b/interface/web/admin/lib/lang/se_software_package.lng
@@ -1,6 +1,7 @@
 <?php
-$wb['package_title_txt'] = 'Package Title';
-$wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
+$wb['package_title_txt'] = 'Pakettitel';
+$wb['package_key_txt'] = 'Packetnyckel';
+$wb['Software Package'] = 'Mjukvarupaket';
+$wb['Modify software package details'] = 'Redigera mjukvarupaketets uppgifter';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_software_package_install.lng b/interface/web/admin/lib/lang/se_software_package_install.lng
index 5c8b756..7b0b28b 100644
--- a/interface/web/admin/lib/lang/se_software_package_install.lng
+++ b/interface/web/admin/lib/lang/se_software_package_install.lng
@@ -1,6 +1,7 @@
 <?php
-$wb['head_txt'] = 'Install software package';
-$wb['install_key_txt'] = 'Enter install key';
-$wb['btn_save_txt'] = 'Start Installation';
-$wb['btn_cancel_txt'] = 'Cancel';
+$wb['head_txt'] = 'Installera mjukvarupaket';
+$wb['install_key_txt'] = 'Fyll i installationsnyckel';
+$wb['btn_save_txt'] = 'Påbörja installation';
+$wb['btn_cancel_txt'] = 'Avbryt';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_software_package_list.lng b/interface/web/admin/lib/lang/se_software_package_list.lng
index 9fa5386..7762e62 100644
--- a/interface/web/admin/lib/lang/se_software_package_list.lng
+++ b/interface/web/admin/lib/lang/se_software_package_list.lng
@@ -1,13 +1,14 @@
 <?php
-$wb['list_head_txt'] = 'Software packages';
+$wb['list_head_txt'] = 'Mjukvarupaket';
 $wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Package';
-$wb['package_description_txt'] = 'Description';
-$wb['action_txt'] = 'Action';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Update package list';
-$wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
+$wb['package_title_txt'] = 'Paket';
+$wb['package_description_txt'] = 'Beskrivning';
+$wb['action_txt'] = 'Händelse';
+$wb['toolsarea_head_txt'] = 'Paket';
+$wb['repoupdate_txt'] = 'Uppdatera paketlista';
+$wb['package_id_txt'] = 'lokalt App-ID';
+$wb['no_packages_txt'] = 'Inga paket tillgängliga';
+$wb['edit_txt'] = 'Redigera';
+$wb['delete_txt'] = 'Radera';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_software_repo.lng b/interface/web/admin/lib/lang/se_software_repo.lng
index f2cbbb2..db59a1b 100644
--- a/interface/web/admin/lib/lang/se_software_repo.lng
+++ b/interface/web/admin/lib/lang/se_software_repo.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['repo_name_txt'] = 'Repository';
+$wb['repo_name_txt'] = 'Bibliotek';
 $wb['repo_url_txt'] = 'URL';
-$wb['repo_username_txt'] = 'User (optional)';
-$wb['repo_password_txt'] = 'Password (optional)';
-$wb['active_txt'] = 'Active';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
+$wb['repo_username_txt'] = 'Användare (Frivilligt)';
+$wb['repo_password_txt'] = 'Lösenord (Frivilligt)';
+$wb['active_txt'] = 'Aktiv';
+$wb['Software Repository which may contain addons or updates'] = 'Pragarmvarubibliotek som kan innehålla uppdateringar eller tillägg';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_software_repo_list.lng b/interface/web/admin/lib/lang/se_software_repo_list.lng
index b7a219f..d997091 100644
--- a/interface/web/admin/lib/lang/se_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/se_software_repo_list.lng
@@ -4,3 +4,4 @@
 $wb['repo_name_txt'] = 'Repository';
 $wb['repo_url_txt'] = 'URL';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_software_update_list.lng b/interface/web/admin/lib/lang/se_software_update_list.lng
index ce766ef..41728b2 100644
--- a/interface/web/admin/lib/lang/se_software_update_list.lng
+++ b/interface/web/admin/lib/lang/se_software_update_list.lng
@@ -1,9 +1,10 @@
 <?php
-$wb['list_head_txt'] = 'Software updates';
-$wb['installed_txt'] = 'Action';
-$wb['update_title_txt'] = 'Update';
+$wb['list_head_txt'] = 'Programvaruuppdateringar';
+$wb['installed_txt'] = 'Händelse';
+$wb['update_title_txt'] = 'Uppdatera';
 $wb['version_txt'] = 'Version';
-$wb['action_txt'] = 'Action';
-$wb['server_select_txt'] = 'Select server';
-$wb['no_updates_txt'] = 'No updates available';
+$wb['action_txt'] = 'Händelse';
+$wb['server_select_txt'] = 'Välj server';
+$wb['no_updates_txt'] = 'Inga tillgängliga uppdateringar';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_system_config.lng b/interface/web/admin/lib/lang/se_system_config.lng
index b3806b2..25b3593 100644
--- a/interface/web/admin/lib/lang/se_system_config.lng
+++ b/interface/web/admin/lib/lang/se_system_config.lng
@@ -1,53 +1,53 @@
 <?php
 $wb['system_config_desc_txt'] = '';
-$wb['warning'] = 'Edit these values carefully! Do not remove the prefixes on a systems with more then one client.';
-$wb['dbname_prefix_txt'] = 'Database name prefix';
-$wb['dbuser_prefix_txt'] = 'Database user prefix';
-$wb['shelluser_prefix_txt'] = 'Shell user prefix';
-$wb['ftpuser_prefix_txt'] = 'FTP user prefix';
-$wb['dbname_prefix_error_regex'] = 'Char not allowed in database name prefix.';
-$wb['dbuser_prefix_error_regex'] = 'Char not allowed in database user prefix.';
-$wb['ftpuser_prefix_error_regex'] = 'Char not allowed in ftp user prefix.';
-$wb['shelluser_prefix_error_regex'] = 'Char not allowed in shell user prefix.';
-$wb['dblist_phpmyadmin_link_txt'] = 'Link to phpmyadmin in DB list';
-$wb['mailboxlist_webmail_link_txt'] = 'Link to webmail in Mailbox list';
-$wb['webmail_url_txt'] = 'Webmail URL';
+$wb['warning'] = 'Redigera dess värden försiktigt! Ta inte bort prefix på system med mer än en kund.';
+$wb['dbname_prefix_txt'] = 'Prefix för databasnamn';
+$wb['dbuser_prefix_txt'] = 'Prefix för databasanvändare';
+$wb['shelluser_prefix_txt'] = 'Prefix för shell-användare';
+$wb['ftpuser_prefix_txt'] = 'Prefix för FTP-användare';
+$wb['dbname_prefix_error_regex'] = 'Otillåtet tecken i prefix för databasnamn.';
+$wb['dbuser_prefix_error_regex'] = 'Otillåtet tecken i prefix för databasanvändare.';
+$wb['ftpuser_prefix_error_regex'] = 'Otillåtet tecken i prefix för FTP-användare.';
+$wb['shelluser_prefix_error_regex'] = 'Otillåtet tecken i prefix för shell-användare.';
+$wb['dblist_phpmyadmin_link_txt'] = 'Länka till PHPMyAdmin i databaslista';
+$wb['mailboxlist_webmail_link_txt'] = 'Länka till webbmail i epostkontolista';
+$wb['webmail_url_txt'] = 'Webbmail URL';
 $wb['phpmyadmin_url_txt'] = 'PHPMyAdmin URL';
-$wb['use_domain_module_txt'] = 'Use the domain-module to add new domains';
-$wb['use_domain_module_hint'] = 'If you use this module, your customers can only select one of the domains the admin creates for them. They can not free edit the domain-field.You have to re-login after changing this value, to make the changes visible.';
-$wb['new_domain_txt'] = 'HTML to create a new domain';
-$wb['dashboard_atom_url_admin_txt'] = 'Dashboard atom feed URL (admin)';
-$wb['dashboard_atom_url_reseller_txt'] = 'Dashboard atom feed URL (reseller)';
-$wb['dashboard_atom_url_client_txt'] = 'Dashboard atom feed URL (client)';
-$wb['webdavuser_prefix_txt'] = 'Webdav user prefix';
-$wb['webdavuser_prefix_error_regex'] = 'Char not allowed in webdav user prefix.';
-$wb['webftp_url_txt'] = 'WebFTP URL';
-$wb['enable_custom_login_txt'] = 'Allow custom login name';
-$wb['mailmailinglist_link_txt'] = 'Link to mailing list in Mailing list list';
-$wb['mailmailinglist_url_txt'] = 'Mailing list URL';
-$wb['admin_mail_txt'] = 'Administrators e-mail';
-$wb['monitor_key_txt'] = 'Monitor keyword';
-$wb['admin_name_txt'] = 'Administrators name';
-$wb['maintenance_mode_txt'] = 'Maintenance Mode';
-$wb['smtp_enabled_txt'] = 'Use SMTP to send system mails';
-$wb['smtp_host_txt'] = 'SMTP host';
-$wb['smtp_port_txt'] = 'SMTP port';
-$wb['smtp_user_txt'] = 'SMTP user';
-$wb['smtp_pass_txt'] = 'SMTP password';
-$wb['smtp_crypt_txt'] = 'Use SSL/TLS encrypted connection for SMTP';
+$wb['use_domain_module_txt'] = 'Används domänmodul för att lägga till nya domäner';
+$wb['use_domain_module_hint'] = 'Om du använder denna modul kommer kunder endast kunna välja bland de domäner administratören har tilldelat dem, de kan alltså inte lägga till vilken domän som helst. Du måste logga in på nytt innan dessa ändringar blir synliga.';
+$wb['new_domain_txt'] = 'HTML vid skapande av nya domäner';
+$wb['dashboard_atom_url_admin_txt'] = 'Kontrolpanelens nyhetsflöde URL (admin)';
+$wb['dashboard_atom_url_reseller_txt'] = 'Kontrolpanelens nyhetsflöde URL (återförsäljare)';
+$wb['dashboard_atom_url_client_txt'] = 'Kontrolpanelens nyhetsflöde URL (kund)';
+$wb['webdavuser_prefix_txt'] = 'Prefix för WebDAV-användare';
+$wb['webdavuser_prefix_error_regex'] = 'Otillåtet tecken i prefix för WebDAV-användare';
+$wb['webftp_url_txt'] = 'WebbFTP URL';
+$wb['enable_custom_login_txt'] = 'Tillåt valfritt inloggningsnamn';
+$wb['mailmailinglist_link_txt'] = 'Länka till epostlista i listan över epostlistor';
+$wb['mailmailinglist_url_txt'] = 'Adress till epostlista';
+$wb['admin_mail_txt'] = 'Administratörens epostadress';
+$wb['monitor_key_txt'] = 'Bevakning nyckelord';
+$wb['admin_name_txt'] = 'Administratörens namn';
+$wb['maintenance_mode_txt'] = 'Underhållsläge';
+$wb['smtp_enabled_txt'] = 'Använd SMTP för att skicka systemmail';
+$wb['smtp_host_txt'] = 'SMTP-värd';
+$wb['smtp_port_txt'] = 'SMTP-port';
+$wb['smtp_user_txt'] = 'SMTP-användare';
+$wb['smtp_pass_txt'] = 'SMTP-lösenord';
+$wb['smtp_crypt_txt'] = 'Använd SSL/TLS-krypterad anslutning för SMTP';
 $wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail address if you want to use smtp mail sending.';
-$wb['tab_change_discard_txt'] = 'Discard changes on tab change';
-$wb['tab_change_warning_txt'] = 'Tab change warning';
+$wb['tab_change_discard_txt'] = 'Kasta ändringar vid byte av flik';
+$wb['tab_change_warning_txt'] = 'Varning vid byte av flik';
 $wb['tab_change_warning_note_txt'] = 'Show a warning on tab change in edit forms if any data has been altered by the user.';
-$wb['vhost_subdomains_txt'] = 'Create Subdomains as web site';
+$wb['vhost_subdomains_txt'] = 'Skapa underdomäner som en egen sajt';
 $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
-$wb['phpmyadmin_url_error_regex'] = 'Invalid phpmyadmin URL';
-$wb['use_combobox_txt'] = 'Use jQuery UI Combobox';
-$wb['use_loadindicator_txt'] = 'Use Load Indicator';
-$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.';
+$wb['phpmyadmin_url_error_regex'] = 'Ogiltig adress till PHPMyAdmin';
+$wb['use_combobox_txt'] = 'Använd jQuery UI Combobox';
+$wb['use_loadindicator_txt'] = 'Använd laddningsindikator';
+$wb['f5_to_reload_js_txt'] = 'Om du ändrar detta kan du behöva trycka F5 för att ladda om javascript, eller rensa din webbläsarcache.';
 $wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
-$wb['mailbox_show_autoresponder_tab_txt'] = 'Show autoresponder tab in mail account details';
-$wb['mailbox_show_mail_filter_tab_txt'] = 'Show mail filter tab in mail account details';
+$wb['mailbox_show_autoresponder_tab_txt'] = 'Visa autosvarsfliken vid detaljerna för epostkonto';
+$wb['mailbox_show_mail_filter_tab_txt'] = 'Visa epostfilterfliken vid detaljerna för epostkonto';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
 $wb['webmail_url_error_regex'] = 'Invalid webmail URL';
 $wb['phpmyadmin_url_note_txt'] = 'Placeholder:';
@@ -59,13 +59,14 @@
 $wb['reseller_dashlets_right_txt'] = 'Right Reseller Dashlets';
 $wb['client_dashlets_left_txt'] = 'Left Client Dashlets';
 $wb['client_dashlets_right_txt'] = 'Right Client Dashlets';
-$wb['customer_no_template_txt'] = 'Customer No. template';
-$wb['customer_no_template_error_regex_txt'] = 'The customer No. template contains invalid characters';
-$wb['customer_no_start_txt'] = 'Customer No. start value';
-$wb['customer_no_counter_txt'] = 'Customer No. counter';
-$wb['session_timeout_txt'] = 'Session timeout (minutes)';
-$wb['session_allow_endless_txt'] = 'Enable \\"stay logged in\\"';
-$wb['No'] = 'No';
-$wb['min_password_length_txt'] = 'Minimum password length';
-$wb['min_password_strength_txt'] = 'Minimum password strength';
+$wb['customer_no_template_txt'] = 'Kundnummermall';
+$wb['customer_no_template_error_regex_txt'] = 'Kundnummermallen innehåller otillåtna tecken';
+$wb['customer_no_start_txt'] = 'Kundnummer startvärde';
+$wb['customer_no_counter_txt'] = 'Kundnummer räknare';
+$wb['session_timeout_txt'] = 'Session timeout (minuter)';
+$wb['session_allow_endless_txt'] = 'Aktivera "håll mig inloggad"';
+$wb['No'] = 'Nej';
+$wb['min_password_length_txt'] = 'Minsta lösenordslängd';
+$wb['min_password_strength_txt'] = 'Minsta lösenordsstyrka';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_tpl_default_admin.lng b/interface/web/admin/lib/lang/se_tpl_default_admin.lng
index eee3af5..d8989ed 100644
--- a/interface/web/admin/lib/lang/se_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/se_tpl_default_admin.lng
@@ -1,13 +1,13 @@
 <?php
-$wb['tpl_default_admin_head_txt'] = 'Global Default-Theme Settings';
+$wb['tpl_default_admin_head_txt'] = 'Global inställning standardtema';
 $wb['tpl_default_admin_desc_txt'] = '';
 $wb['server_id_txt'] = 'Server';
-$wb['client_id_txt'] = 'Client';
-$wb['name_txt'] = 'PHP Name';
-$wb['Name'] = 'Name';
-$wb['FastCGI Settings'] = 'FastCGI Settings';
-$wb['PHP-FPM Settings'] = 'PHP-FPM Settings';
-$wb['Additional PHP Versions'] = 'Additional PHP Versions';
+$wb['client_id_txt'] = 'Kund';
+$wb['name_txt'] = 'PHP-namn';
+$wb['Name'] = 'Namn';
+$wb['FastCGI Settings'] = 'FastCGI-inställningar';
+$wb['PHP-FPM Settings'] = 'PHP-FPM-inställningar';
+$wb['Additional PHP Versions'] = 'Ytterligare PHP-versioner';
 $wb['Form to edit additional PHP versions'] = 'Form to edit additional PHP versions';
 $wb['server_php_name_error_empty'] = 'The Name field must not be empty.';
 $wb['php_fastcgi_binary_txt'] = 'Path to the PHP FastCGI binary';
@@ -16,3 +16,4 @@
 $wb['php_fpm_ini_dir_txt'] = 'Path to the php.ini directory';
 $wb['php_fpm_pool_dir_txt'] = 'Path to the PHP-FPM pool directory';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_users.lng b/interface/web/admin/lib/lang/se_users.lng
index 86dc816..3acec53 100644
--- a/interface/web/admin/lib/lang/se_users.lng
+++ b/interface/web/admin/lib/lang/se_users.lng
@@ -20,15 +20,16 @@
 $wb['telefon_txt'] = 'Telefon';
 $wb['fax_txt'] = 'Fax';
 $wb['groups_txt'] = 'Grupp';
-$wb['default_group_txt'] = 'Standard Grupp';
-$wb['username_empty'] = 'The username is empty.';
-$wb['username_unique'] = 'There is already a user with this username.';
-$wb['password_strength_txt'] = 'Password strength';
-$wb['startmodule_err'] = 'Start module is not within modules.';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['username_error_collision'] = 'The username may not be web or web plus a number.\\"';
-$wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin';
+$wb['default_group_txt'] = 'Standardgrupp';
+$wb['username_empty'] = 'Användarnamnet är tomt';
+$wb['username_unique'] = 'Det finns redan en användare med detta användarnamn';
+$wb['password_strength_txt'] = 'Lösenordsstyrka';
+$wb['startmodule_err'] = 'Startmodulen finns inte balnd modulerna';
+$wb['generate_password_txt'] = 'Generera lösenord';
+$wb['repeat_password_txt'] = 'Upprepa lösenord';
+$wb['password_mismatch_txt'] = 'Lösenorden matchar inte';
+$wb['password_match_txt'] = 'Lösenorden matchar';
+$wb['username_error_collision'] = 'Användarnamnet får inte vara web  eller web och ett nummer';
+$wb['client_not_admin_err'] = 'En användare som tillhör en kund kan inte sättas som admin';
 ?>
+
diff --git a/interface/web/admin/lib/lang/se_users_list.lng b/interface/web/admin/lib/lang/se_users_list.lng
index edd0572..f9ea803 100644
--- a/interface/web/admin/lib/lang/se_users_list.lng
+++ b/interface/web/admin/lib/lang/se_users_list.lng
@@ -1,9 +1,10 @@
 <?php
 $wb['list_head_txt'] = 'Användare';
 $wb['username_txt'] = 'Användarnamn';
-$wb['client_id_txt'] = 'Client ID';
-$wb['active_txt'] = 'Active';
-$wb['add_new_record_txt'] = 'Add new user';
-$wb['warning_txt'] = '<b>WARNING:</b> 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!';
-$wb['groups_txt'] = 'Groups';
+$wb['client_id_txt'] = 'Kund-ID';
+$wb['active_txt'] = 'Aktiv';
+$wb['add_new_record_txt'] = 'Lägg till ny användare';
+$wb['warning_txt'] = '<b>VARNING:</b> Ändra inte några användarinställningar här. Use the Client- and Reseller settings in the Client module instead. Modifying or changing Users or groups here may cause data loss!';
+$wb['groups_txt'] = 'Grupper';
 ?>
+
diff --git a/interface/web/admin/templates/directive_snippets_edit.htm b/interface/web/admin/templates/directive_snippets_edit.htm
index 6522eb1..7a17cb6 100644
--- a/interface/web/admin/templates/directive_snippets_edit.htm
+++ b/interface/web/admin/templates/directive_snippets_edit.htm
@@ -17,7 +17,7 @@
             </div>
 			<div class="ctrlHolder">
                 <label for="snippet">{tmpl_var name='snippet_txt'}</label>
-                <textarea name="snippet" id="snippet" rows='10' cols='50' style="width:400px;">{tmpl_var name='snippet'}</textarea><div class="nginx"> &nbsp; {tmpl_var name='variables_txt'}: <a href="javascript:void(0);" class="addPlaceholder">{DOCROOT}</a>, <a href="javascript:void(0);" class="addPlaceholder">{FASTCGIPASS}</a></div>
+                <textarea name="snippet" id="snippet" rows='10' cols='50' style="width:400px;">{tmpl_var name='snippet'}</textarea><span class="nginx"> &nbsp; {tmpl_var name='variables_txt'}: </span><a href="javascript:void(0);" class="addPlaceholder nginx">{DOCROOT}</a><span class="nginx">, </span><a href="javascript:void(0);" class="addPlaceholder nginx">{FASTCGIPASS}</a>
             </div>
             <div class="ctrlHolder">
                 <p class="label">{tmpl_var name='active_txt'}</p>
diff --git a/interface/web/client/lib/lang/se.lng b/interface/web/client/lib/lang/se.lng
index bb03af8..271f69d 100644
--- a/interface/web/client/lib/lang/se.lng
+++ b/interface/web/client/lib/lang/se.lng
@@ -1,26 +1,27 @@
 <?php
-$wb['Client'] = 'Client';
-$wb['Address'] = 'Address';
-$wb['Limits'] = 'Limits';
-$wb['Add Client'] = 'Add Client';
-$wb['Edit Client'] = 'Edit Client';
-$wb['Clients'] = 'Clients';
-$wb['Templates'] = 'Templates';
-$wb['Limit-Templates'] = 'Limit-Templates';
-$wb['Add Reseller'] = 'Add Reseller';
-$wb['Edit Reseller'] = 'Edit Reseller';
-$wb['Resellers'] = 'Resellers';
+$wb['Client'] = 'Kund';
+$wb['Address'] = 'Adress';
+$wb['Limits'] = 'Gränser';
+$wb['Add Client'] = 'Lägg till kund';
+$wb['Edit Client'] = 'Redigera kund';
+$wb['Clients'] = 'Kunder';
+$wb['Templates'] = 'Mallar';
+$wb['Limit-Templates'] = 'Gränsmallar';
+$wb['Add Reseller'] = 'Lägg till återförsäljare';
+$wb['Edit Reseller'] = 'Redigera återförsäljare';
+$wb['Resellers'] = 'Återförsäljare';
 $wb['error_has_clients'] = 'This reseller has clients. Delete the clients of the reseller first.';
-$wb['add_additional_template_txt'] = 'Add additional template';
-$wb['delete_additional_template_txt'] = 'Delete additional template';
-$wb['Messaging'] = 'Messaging';
-$wb['Send email'] = 'Send Email';
-$wb['Edit Client Circle'] = 'Edit Client Circle';
-$wb['Domains'] = 'Domains';
-$wb['domain_txt'] = 'Domain';
-$wb['client_txt'] = 'Client';
-$wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is in use as mail-domain';
-$wb['error_domain_in webuse'] = 'This domain cannot be deleted, because it is in use as web-domain';
-$wb['error_client_can_not_add_domain'] = 'You cannot add a new domain';
-$wb['error_client_group_id_empty'] = 'You have to select a customer<br>';
+$wb['add_additional_template_txt'] = 'Lägg till ytterligare mallar';
+$wb['delete_additional_template_txt'] = 'Radera mallar';
+$wb['Messaging'] = 'Meddelanden';
+$wb['Send email'] = 'Skicka epost';
+$wb['Edit Client Circle'] = 'Redigera kundcirkel';
+$wb['Domains'] = 'Domäner';
+$wb['domain_txt'] = 'Domän';
+$wb['client_txt'] = 'Kund';
+$wb['error_domain_in mailuse'] = 'Den här domänen kan inte tas bort då den används som epostdomän';
+$wb['error_domain_in webuse'] = 'Den här domänen kan inte tas bort då den används som webbsidesdomän';
+$wb['error_client_can_not_add_domain'] = 'Du kan inte lägga till en ny domän';
+$wb['error_client_group_id_empty'] = 'Du måste välja en kund<br>';
 ?>
+
diff --git a/interface/web/client/lib/lang/se_client.lng b/interface/web/client/lib/lang/se_client.lng
index feb8a9f..c8540a6 100644
--- a/interface/web/client/lib/lang/se_client.lng
+++ b/interface/web/client/lib/lang/se_client.lng
@@ -1,46 +1,46 @@
 <?php
-$wb['limit_maildomain_txt'] = 'Max. number of email domains';
-$wb['limit_mailbox_txt'] = 'Max. number of mailboxes';
-$wb['limit_mailalias_txt'] = 'Max. number of email aliases';
-$wb['limit_mailforward_txt'] = 'Max. number of email forwarders';
+$wb['limit_maildomain_txt'] = 'Max antal epostdomäner';
+$wb['limit_mailbox_txt'] = 'Max antal epostkonton';
+$wb['limit_mailalias_txt'] = 'Max antal epostalias';
+$wb['limit_mailforward_txt'] = 'Max antal vidarebefordringar';
 $wb['limit_mailcatchall_txt'] = 'Max. number of email catchall accounts';
-$wb['limit_mailrouting_txt'] = 'Max. number of email routes';
-$wb['limit_mailfilter_txt'] = 'Max. number of email filters';
+$wb['limit_mailrouting_txt'] = 'Max antal epostrutter';
+$wb['limit_mailfilter_txt'] = 'Max antal epostfilter';
 $wb['limit_fetchmail_txt'] = 'Max. number of fetchmail accounts';
-$wb['limit_mailquota_txt'] = 'Mailbox quota';
+$wb['limit_mailquota_txt'] = 'Kvot för epostkonton';
 $wb['limit_spamfilter_wblist_txt'] = 'Max. number of spamfilter white / blacklist filters';
-$wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
+$wb['limit_spamfilter_user_txt'] = 'Max antal spamfilteranvändare';
 $wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
-$wb['default_mailserver_txt'] = 'Default Mailserver';
-$wb['company_name_txt'] = 'Company name';
-$wb['contact_name_txt'] = 'Contact name';
-$wb['username_txt'] = 'Username';
-$wb['password_txt'] = 'Password';
-$wb['password_strength_txt'] = 'Password strength';
-$wb['language_txt'] = 'Language';
-$wb['usertheme_txt'] = 'Theme';
-$wb['street_txt'] = 'Street';
-$wb['zip_txt'] = 'ZIP';
-$wb['city_txt'] = 'City';
-$wb['state_txt'] = 'State';
-$wb['country_txt'] = 'Country';
-$wb['telephone_txt'] = 'Telephone';
-$wb['mobile_txt'] = 'Mobile';
+$wb['default_mailserver_txt'] = 'Förvald epostserver';
+$wb['company_name_txt'] = 'Företagsnamn';
+$wb['contact_name_txt'] = 'Kontaktnamn';
+$wb['username_txt'] = 'Användarnamn';
+$wb['password_txt'] = 'Lösenord';
+$wb['password_strength_txt'] = 'Lösenordsstyrka';
+$wb['language_txt'] = 'Språk';
+$wb['usertheme_txt'] = 'Tema';
+$wb['street_txt'] = 'Gata';
+$wb['zip_txt'] = 'Postnummer';
+$wb['city_txt'] = 'Stad';
+$wb['state_txt'] = 'Län';
+$wb['country_txt'] = 'Land';
+$wb['telephone_txt'] = 'Telefon';
+$wb['mobile_txt'] = 'Mobil';
 $wb['fax_txt'] = 'Fax';
-$wb['email_txt'] = 'Email';
+$wb['email_txt'] = 'Epost';
 $wb['internet_txt'] = 'Internet';
 $wb['icq_txt'] = 'ICQ';
-$wb['notes_txt'] = 'Notes';
-$wb['company_txt'] = 'Company';
-$wb['title_txt'] = 'Title';
-$wb['firstname_txt'] = 'Firstname';
-$wb['surname_txt'] = 'Surname';
-$wb['limit_client_txt'] = 'Max. number of Clients';
-$wb['limit_domain_txt'] = 'limit_domain';
-$wb['limit_subdomain_txt'] = 'limit_subdomain';
-$wb['limit_webquota_txt'] = 'limit_webquota';
-$wb['limit_database_txt'] = 'Max. number of Databases';
-$wb['ip_address_txt'] = 'ip_address';
+$wb['notes_txt'] = 'Anteckningar';
+$wb['company_txt'] = 'Företag';
+$wb['title_txt'] = 'Titel';
+$wb['firstname_txt'] = 'Förnamn';
+$wb['surname_txt'] = 'Efternamn';
+$wb['limit_client_txt'] = 'Max antal kunder';
+$wb['limit_domain_txt'] = 'domängräns';
+$wb['limit_subdomain_txt'] = 'underdomängräns';
+$wb['limit_webquota_txt'] = 'webbsideskvot';
+$wb['limit_database_txt'] = 'Max antal databaser';
+$wb['ip_address_txt'] = 'ip-adress';
 $wb['limit_client_error_notint'] = 'The sub client limit must be a number.';
 $wb['firstname_error_empty'] = 'Firstname is empty.';
 $wb['contact_error_empty'] = 'Contact name is empty.';
@@ -109,48 +109,49 @@
 $wb['username_error_collision'] = 'The username may not start with the word -web- or -web- followed by a number.';
 $wb['add_additional_template_txt'] = 'Add additional template';
 $wb['delete_additional_template_txt'] = 'Delete additional template';
-$wb['limit_cgi_txt'] = 'CGI available';
-$wb['limit_ssi_txt'] = 'SSI available';
-$wb['limit_perl_txt'] = 'Perl available';
-$wb['limit_ruby_txt'] = 'Ruby available';
-$wb['limit_python_txt'] = 'Python available';
-$wb['force_suexec_txt'] = 'SuEXEC forced';
+$wb['limit_cgi_txt'] = 'CGI tillgängligt';
+$wb['limit_ssi_txt'] = 'SSI tillgängligt';
+$wb['limit_perl_txt'] = 'Perl tillgängligt';
+$wb['limit_ruby_txt'] = 'Ruby tillgängligt';
+$wb['limit_python_txt'] = 'Python tillgängligt';
+$wb['force_suexec_txt'] = 'SuEXEC tvingad';
 $wb['limit_hterror_txt'] = 'Custom error docs available';
 $wb['limit_wildcard_txt'] = 'Wildcard subdomain available';
-$wb['limit_ssl_txt'] = 'SSL available';
+$wb['limit_ssl_txt'] = 'SSL tillgängligt';
 $wb['bank_account_number_txt'] = 'Bank account no.';
 $wb['bank_code_txt'] = 'Bank code';
 $wb['bank_name_txt'] = 'Bank name';
 $wb['bank_account_iban_txt'] = 'IBAN';
 $wb['bank_account_swift_txt'] = 'BIC / Swift';
-$wb['web_limits_txt'] = 'Web Limits';
-$wb['email_limits_txt'] = 'Email Limits';
-$wb['database_limits_txt'] = 'Database Limits';
-$wb['cron_job_limits_txt'] = 'Cron Job Limits';
-$wb['dns_limits_txt'] = 'DNS Limits';
+$wb['web_limits_txt'] = 'Webbgränser';
+$wb['email_limits_txt'] = 'Epostgränser';
+$wb['database_limits_txt'] = 'Databasgränser';
+$wb['cron_job_limits_txt'] = 'Cron-jobbgränser';
+$wb['dns_limits_txt'] = 'DNS-gränser';
 $wb['virtualization_limits_txt'] = 'Virtualization Limits';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['active_template_additional_txt'] = 'Active Addons';
+$wb['generate_password_txt'] = 'Generera lösenord';
+$wb['repeat_password_txt'] = 'Upprepa lösenord';
+$wb['password_mismatch_txt'] = 'Lösenroden matchar inte';
+$wb['password_match_txt'] = 'Lösenorde matchar';
+$wb['active_template_additional_txt'] = 'Aktiva tillägg';
 $wb['bank_account_owner_txt'] = 'Bank account owner';
-$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['email_error_isemail'] = 'Vänligen ange en giltig epostadress';
 $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
 $wb['paypal_email_error_isemail'] = 'Please enter a valid PayPal email address.';
-$wb['paypal_email_txt'] = 'PayPal Email';
-$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
+$wb['paypal_email_txt'] = 'PayPal epostadress';
+$wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than "custom" is selected.';
 $wb['aps_limits_txt'] = 'APS Installer Limits';
 $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
-$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
-$wb['locked_txt'] = 'Locked (disables all webs etc.)';
-$wb['canceled_txt'] = 'Canceled (disables client login)';
-$wb['gender_txt'] = 'Title';
-$wb['gender_m_txt'] = 'Mr.';
-$wb['gender_f_txt'] = 'Ms.';
-$wb['added_by_txt'] = 'Added by';
-$wb['added_date_txt'] = 'Added date';
-$wb['parent_client_id_txt'] = 'Client of reseller';
-$wb['none_txt'] = 'none';
+$wb['default_slave_dnsserver_txt'] = 'Förvald sekundär DNS-server';
+$wb['locked_txt'] = 'Låst (disables all webs etc.)';
+$wb['canceled_txt'] = 'Uppsagd (disables client login)';
+$wb['gender_txt'] = 'Titel';
+$wb['gender_m_txt'] = 'Herr';
+$wb['gender_f_txt'] = 'Fru';
+$wb['added_by_txt'] = 'Tillagd av';
+$wb['added_date_txt'] = 'Tillagd datum';
+$wb['parent_client_id_txt'] = 'Kund till återförsäljare';
+$wb['none_txt'] = 'ingen';
 ?>
+
diff --git a/interface/web/client/lib/lang/se_client_circle.lng b/interface/web/client/lib/lang/se_client_circle.lng
index f98a144..f30732e 100644
--- a/interface/web/client/lib/lang/se_client_circle.lng
+++ b/interface/web/client/lib/lang/se_client_circle.lng
@@ -1,9 +1,10 @@
 <?php
-$wb['Client Circle'] = 'Client Circle';
-$wb['Circle'] = 'Circle';
-$wb['circle_txt'] = 'Circle';
-$wb['circle_name_txt'] = 'Circle Name';
-$wb['client_ids_txt'] = 'Clients/Resellers';
-$wb['description_txt'] = 'Description';
-$wb['active_txt'] = 'Active';
+$wb['Client Circle'] = 'Kundring';
+$wb['Circle'] = 'Ring';
+$wb['circle_txt'] = 'CircleRing';
+$wb['circle_name_txt'] = 'Ringnamn';
+$wb['client_ids_txt'] = 'Kunder/Återförsäljare';
+$wb['description_txt'] = 'BEskrivning';
+$wb['active_txt'] = 'Aktiv';
 ?>
+
diff --git a/interface/web/client/lib/lang/se_client_circle_list.lng b/interface/web/client/lib/lang/se_client_circle_list.lng
index 00fd0b3..21ae4d6 100644
--- a/interface/web/client/lib/lang/se_client_circle_list.lng
+++ b/interface/web/client/lib/lang/se_client_circle_list.lng
@@ -1,10 +1,11 @@
 <?php
-$wb['list_head_txt'] = 'Client Circles';
-$wb['circle_id_txt'] = 'Circle ID';
-$wb['circle_name_txt'] = 'Circle Name';
-$wb['description_txt'] = 'Description';
-$wb['add_new_record_txt'] = 'Add new circle';
+$wb['list_head_txt'] = 'Kundring';
+$wb['circle_id_txt'] = 'Ring-ID';
+$wb['circle_name_txt'] = 'Ringnamn';
+$wb['description_txt'] = 'Beskrivning';
+$wb['add_new_record_txt'] = 'Lägg till ny ring';
 $wb['filter_txt'] = 'Filter';
-$wb['delete_txt'] = 'Delete';
-$wb['active_txt'] = 'Active';
+$wb['delete_txt'] = 'Radera';
+$wb['active_txt'] = 'Aktiv';
 ?>
+
diff --git a/interface/web/client/lib/lang/se_client_del.lng b/interface/web/client/lib/lang/se_client_del.lng
index 0932e95..9cf44fc 100644
--- a/interface/web/client/lib/lang/se_client_del.lng
+++ b/interface/web/client/lib/lang/se_client_del.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['confirm_action_txt'] = 'Confirm action';
+$wb['confirm_action_txt'] = 'Bekräfta';
 $wb['delete_explanation'] = 'This action will delete the following number of records associated with this client';
-$wb['btn_save_txt'] = 'Delete the client';
-$wb['btn_cancel_txt'] = 'Cancel without deleting the client';
-$wb['confirm_client_delete_txt'] = 'Are you sure you want to delete this client?';
+$wb['btn_save_txt'] = 'Radera kunden';
+$wb['btn_cancel_txt'] = 'Avbryt utan att radera kunden';
+$wb['confirm_client_delete_txt'] = 'Är du säker på att du vill radera den här kunden?';
 ?>
+
diff --git a/interface/web/client/lib/lang/se_client_message.lng b/interface/web/client/lib/lang/se_client_message.lng
index 6b2a872..625b0db 100644
--- a/interface/web/client/lib/lang/se_client_message.lng
+++ b/interface/web/client/lib/lang/se_client_message.lng
@@ -1,20 +1,21 @@
 <?php
-$wb['btn_send_txt'] = 'Send email';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['sender_txt'] = 'Sender email address';
-$wb['subject_txt'] = 'Subject';
-$wb['message_txt'] = 'Message';
-$wb['form_legend_client_txt'] = 'Send email message to all clients.';
-$wb['form_legend_admin_txt'] = 'Send email message to all clients and resellers.';
-$wb['sender_invalid_error'] = 'Sender email invalid.';
-$wb['subject_invalid_error'] = 'Subject is empty.';
-$wb['message_invalid_error'] = 'Message is empty.';
-$wb['email_sent_to_txt'] = 'Email sent to:';
-$wb['page_head_txt'] = 'Send customer information';
-$wb['recipient_txt'] = 'Recipient';
-$wb['all_clients_resellers_txt'] = 'All clients and resellers';
-$wb['all_clients_txt'] = 'All clients';
-$wb['variables_txt'] = 'Variables:';
-$wb['gender_m_txt'] = 'Mr.';
-$wb['gender_f_txt'] = 'Ms.';
+$wb['btn_send_txt'] = 'Skicka epost';
+$wb['btn_cancel_txt'] = 'Avbryt';
+$wb['sender_txt'] = 'Avsändares epostadress';
+$wb['subject_txt'] = 'Ämne';
+$wb['message_txt'] = 'Meddelande';
+$wb['form_legend_client_txt'] = 'Skicke epostmeddelande till alla kunder';
+$wb['form_legend_admin_txt'] = 'Skicka meddelande till alla kunder och återförsäljare';
+$wb['sender_invalid_error'] = 'Avsändarepost är ogiltig';
+$wb['subject_invalid_error'] = 'Ämnesraden är tom.';
+$wb['message_invalid_error'] = 'Meddelandet är tomt.';
+$wb['email_sent_to_txt'] = 'Epost skickat till:';
+$wb['page_head_txt'] = 'Skicka kundinformation';
+$wb['recipient_txt'] = 'Mottagare';
+$wb['all_clients_resellers_txt'] = 'Alla kunder och återförsäljare';
+$wb['all_clients_txt'] = 'Alla kunder';
+$wb['variables_txt'] = 'Variabler:';
+$wb['gender_m_txt'] = 'Herr';
+$wb['gender_f_txt'] = 'Fru';
 ?>
+
diff --git a/interface/web/client/lib/lang/se_client_message_template.lng b/interface/web/client/lib/lang/se_client_message_template.lng
index 65e5fbf..3ff9480 100644
--- a/interface/web/client/lib/lang/se_client_message_template.lng
+++ b/interface/web/client/lib/lang/se_client_message_template.lng
@@ -1,11 +1,12 @@
 <?php
-$wb['template_type_txt'] = 'Email type';
-$wb['template_name_txt'] = 'Template name';
-$wb['subject_txt'] = 'Subject';
-$wb['message_txt'] = 'Message';
-$wb['Email template'] = 'Email template';
-$wb['Settings'] = 'Setting';
-$wb['variables_txt'] = 'Variables';
-$wb['variables_description_txt'] = '(The username and password variables are only available in welcome emails.)';
-$wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.';
+$wb['template_type_txt'] = 'Eposttyp';
+$wb['template_name_txt'] = 'Mallnamn';
+$wb['subject_txt'] = 'Ämne';
+$wb['message_txt'] = 'Meddelande';
+$wb['Email template'] = 'Epostmall';
+$wb['Settings'] = 'Inställningar';
+$wb['variables_txt'] = 'Variabler';
+$wb['variables_description_txt'] = '(Användarnamn- och lösenordsvariablerna är endast tillgängliga i välkomstmail.)';
+$wb['duplicate_welcome_error'] = 'Det kan bara finnas en standardmall för välkomstmail. Vänligen redigera den existerande mallen istället för att lägga till en ny.';
 ?>
+
diff --git a/interface/web/client/lib/lang/se_client_message_template_list.lng b/interface/web/client/lib/lang/se_client_message_template_list.lng
index d9c307e..f94a106 100644
--- a/interface/web/client/lib/lang/se_client_message_template_list.lng
+++ b/interface/web/client/lib/lang/se_client_message_template_list.lng
@@ -1,5 +1,6 @@
 <?php
-$wb['list_head_txt'] = 'Email templates';
-$wb['template_type_txt'] = 'Message for';
-$wb['template_name_txt'] = 'Template name';
+$wb['list_head_txt'] = 'Epostmallar';
+$wb['template_type_txt'] = 'Meddelande till';
+$wb['template_name_txt'] = 'Mallnamn';
 ?>
+
diff --git a/interface/web/client/lib/lang/se_client_template.lng b/interface/web/client/lib/lang/se_client_template.lng
index 353960c..12e4355 100644
--- a/interface/web/client/lib/lang/se_client_template.lng
+++ b/interface/web/client/lib/lang/se_client_template.lng
@@ -90,3 +90,4 @@
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
 ?>
+
diff --git a/interface/web/client/lib/lang/se_client_template_list.lng b/interface/web/client/lib/lang/se_client_template_list.lng
index 0840184..cc9d5d5 100644
--- a/interface/web/client/lib/lang/se_client_template_list.lng
+++ b/interface/web/client/lib/lang/se_client_template_list.lng
@@ -1,6 +1,7 @@
 <?php
-$wb['list_head_txt'] = 'Client-Templates';
-$wb['template_type_txt'] = 'Type';
-$wb['template_name_txt'] = 'Template name';
-$wb['template_id_txt'] = 'Template ID';
+$wb['list_head_txt'] = 'Kundmallar';
+$wb['template_type_txt'] = 'Typ';
+$wb['template_name_txt'] = 'Mallnamn';
+$wb['template_id_txt'] = 'Mall-ID';
 ?>
+
diff --git a/interface/web/client/lib/lang/se_clients_list.lng b/interface/web/client/lib/lang/se_clients_list.lng
index f2c22fb..89fe0ed 100644
--- a/interface/web/client/lib/lang/se_clients_list.lng
+++ b/interface/web/client/lib/lang/se_clients_list.lng
@@ -1,11 +1,12 @@
 <?php
-$wb['list_head_txt'] = 'Clients';
+$wb['list_head_txt'] = 'Kunder';
 $wb['client_id_txt'] = 'ID';
-$wb['company_name_txt'] = 'Company name';
-$wb['contact_name_txt'] = 'Contact name';
-$wb['city_txt'] = 'City';
-$wb['country_txt'] = 'Country';
-$wb['add_new_record_txt'] = 'Add new client';
-$wb['username_txt'] = 'Username';
-$wb['customer_no_txt'] = 'Customer No.';
+$wb['company_name_txt'] = 'Företagsnamn';
+$wb['contact_name_txt'] = 'Kontaktnamn';
+$wb['city_txt'] = 'Stad';
+$wb['country_txt'] = 'Land';
+$wb['add_new_record_txt'] = 'Lägg till ny kund';
+$wb['username_txt'] = 'Användarnamn';
+$wb['customer_no_txt'] = 'Kundnummer';
 ?>
+
diff --git a/interface/web/client/lib/lang/se_domain.lng b/interface/web/client/lib/lang/se_domain.lng
index a66a225..7d648de 100644
--- a/interface/web/client/lib/lang/se_domain.lng
+++ b/interface/web/client/lib/lang/se_domain.lng
@@ -1,6 +1,7 @@
 <?php
-$wb['domain_error_empty'] = 'The domain-name is empty';
-$wb['domain_error_unique'] = 'The domain already exists';
-$wb['domain_error_regex'] = 'This domain-name is not allowed';
-$wb['Domain'] = 'Domain';
+$wb['domain_error_empty'] = 'Domännamnet är tomt';
+$wb['domain_error_unique'] = 'Domänen finns redan';
+$wb['domain_error_regex'] = 'Denna domän är ogiltig';
+$wb['Domain'] = 'Domän';
 ?>
+
diff --git a/interface/web/client/lib/lang/se_domain_list.lng b/interface/web/client/lib/lang/se_domain_list.lng
index d2262b6..da7504f 100644
--- a/interface/web/client/lib/lang/se_domain_list.lng
+++ b/interface/web/client/lib/lang/se_domain_list.lng
@@ -1,6 +1,7 @@
 <?php
-$wb['list_head_txt'] = 'Domains';
-$wb['add_new_record_txt'] = 'Add new Domain';
-$wb['domain_txt'] = 'Domain';
-$wb['user_txt'] = 'Client';
+$wb['list_head_txt'] = 'Domäner';
+$wb['add_new_record_txt'] = 'Lägg till ny domän';
+$wb['domain_txt'] = 'Domän';
+$wb['user_txt'] = 'Kund';
 ?>
+
diff --git a/interface/web/client/lib/lang/se_reseller.lng b/interface/web/client/lib/lang/se_reseller.lng
index 7fab36d..de8f504 100644
--- a/interface/web/client/lib/lang/se_reseller.lng
+++ b/interface/web/client/lib/lang/se_reseller.lng
@@ -159,3 +159,4 @@
 $wb['client_limits_txt'] = 'Client Limits';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
 ?>
+
diff --git a/interface/web/client/lib/lang/se_resellers_list.lng b/interface/web/client/lib/lang/se_resellers_list.lng
index 598342b..3448e5c 100644
--- a/interface/web/client/lib/lang/se_resellers_list.lng
+++ b/interface/web/client/lib/lang/se_resellers_list.lng
@@ -1,11 +1,12 @@
 <?php
-$wb['list_head_txt'] = 'Resellers';
+$wb['list_head_txt'] = 'Återförsäljare';
 $wb['client_id_txt'] = 'ID';
-$wb['company_name_txt'] = 'Company name';
-$wb['contact_name_txt'] = 'Contact name';
-$wb['city_txt'] = 'City';
-$wb['country_txt'] = 'Country';
-$wb['add_new_record_txt'] = 'Add new reseller';
-$wb['customer_no_txt'] = 'Customer No.';
-$wb['username_txt'] = 'Username';
+$wb['company_name_txt'] = 'Företagsnamn';
+$wb['contact_name_txt'] = 'Kontaktnamn';
+$wb['city_txt'] = 'Stad';
+$wb['country_txt'] = 'Land';
+$wb['add_new_record_txt'] = 'Lägg till ny återförsäljare';
+$wb['customer_no_txt'] = 'Kundnummer';
+$wb['username_txt'] = 'Användarnamn';
 ?>
+
diff --git a/interface/web/dashboard/lib/lang/se.lng b/interface/web/dashboard/lib/lang/se.lng
index 2460545..11700f0 100644
--- a/interface/web/dashboard/lib/lang/se.lng
+++ b/interface/web/dashboard/lib/lang/se.lng
@@ -1,4 +1,5 @@
 <?php
-$wb['welcome_user_txt'] = 'Welcome %s';
-$wb['available_modules_txt'] = 'Available Modules';
+$wb['welcome_user_txt'] = 'Välkommen %s';
+$wb['available_modules_txt'] = 'Tillgängliga moduler';
 ?>
+
diff --git a/interface/web/dashboard/lib/lang/se_dashlet_limits.lng b/interface/web/dashboard/lib/lang/se_dashlet_limits.lng
index adc5ac1..49473b7 100644
--- a/interface/web/dashboard/lib/lang/se_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/se_dashlet_limits.lng
@@ -1,30 +1,31 @@
 <?php
-$wb['limits_txt'] = 'Account limits';
-$wb['of_txt'] = 'of';
-$wb['unlimited_txt'] = 'Unlimited';
-$wb['limit_maildomain_txt'] = 'Number of email domains';
-$wb['limit_mailbox_txt'] = 'Number of mailboxes';
-$wb['limit_mailalias_txt'] = 'Number of email aliases';
-$wb['limit_mailaliasdomain_txt'] = 'Number of domain aliases';
-$wb['limit_mailforward_txt'] = 'Number of email forwarders';
+$wb['limits_txt'] = 'Kontogränser';
+$wb['of_txt'] = 'av';
+$wb['unlimited_txt'] = 'Obegränsat';
+$wb['limit_maildomain_txt'] = 'Antal epostdomäner';
+$wb['limit_mailbox_txt'] = 'Antal epostkonton';
+$wb['limit_mailalias_txt'] = 'Antal epostalias';
+$wb['limit_mailaliasdomain_txt'] = 'Antal domänalias';
+$wb['limit_mailforward_txt'] = 'Antal vidarebefordringar epost';
 $wb['limit_mailcatchall_txt'] = 'Number of email catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Number of email routes';
-$wb['limit_mailfilter_txt'] = 'Number of email filters';
+$wb['limit_mailfilter_txt'] = 'Antal epostfilter';
 $wb['limit_fetchmail_txt'] = 'Number of fetchmail accounts';
 $wb['limit_spamfilter_wblist_txt'] = 'Number of spamfilter white / blacklist filters';
 $wb['limit_spamfilter_user_txt'] = 'Number of spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Number of spamfilter policies';
-$wb['limit_cron_txt'] = 'Number of cron jobs';
-$wb['limit_web_domain_txt'] = 'Number of web domains';
-$wb['limit_web_aliasdomain_txt'] = 'Number of web aliasdomains';
-$wb['limit_web_subdomain_txt'] = 'Number of web subdomains';
-$wb['limit_ftp_user_txt'] = 'Number of FTP users';
-$wb['limit_dns_zone_txt'] = 'Number of DNS zones';
-$wb['limit_dns_slave_zone_txt'] = 'Number of DNS slave zones';
-$wb['limit_dns_record_txt'] = 'Number DNS records';
-$wb['limit_shell_user_txt'] = 'Number of Shell users';
-$wb['limit_webdav_user_txt'] = 'Number of Webdav users';
-$wb['limit_client_txt'] = 'Number of Clients';
-$wb['limit_database_txt'] = 'Number of Databases';
-$wb['limit_mailmailinglist_txt'] = 'Number of mailing lists';
+$wb['limit_cron_txt'] = 'Antal cron-jobb';
+$wb['limit_web_domain_txt'] = 'Antal domäner';
+$wb['limit_web_aliasdomain_txt'] = 'Antal aliasdomäner';
+$wb['limit_web_subdomain_txt'] = 'Antal underdomäner';
+$wb['limit_ftp_user_txt'] = 'Antal FTP-användare';
+$wb['limit_dns_zone_txt'] = 'Antal DNS-zoner';
+$wb['limit_dns_slave_zone_txt'] = 'Antal DNS-slavzoner';
+$wb['limit_dns_record_txt'] = 'Antal DNS-inlägg';
+$wb['limit_shell_user_txt'] = 'Antal shell-användare';
+$wb['limit_webdav_user_txt'] = 'Antal WebDAV-användare';
+$wb['limit_client_txt'] = 'Antal kunder';
+$wb['limit_database_txt'] = 'Antal databaser';
+$wb['limit_mailmailinglist_txt'] = 'Antal mailinglistor';
 ?>
+
diff --git a/interface/web/dashboard/lib/lang/se_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/se_dashlet_mailquota.lng
index 1ab1e66..883b2a5 100644
--- a/interface/web/dashboard/lib/lang/se_dashlet_mailquota.lng
+++ b/interface/web/dashboard/lib/lang/se_dashlet_mailquota.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['mailquota_txt'] = 'Mailbox Quota';
-$wb['email_txt'] = 'Email Address';
-$wb['name_txt'] = 'Name';
-$wb['used_txt'] = 'Used Space';
-$wb['quota_txt'] = 'Quota';
-$wb['no_email_accounts_txt'] = 'No email accounts found.';
+$wb['mailquota_txt'] = 'Epostkontonas kvota';
+$wb['email_txt'] = 'Epostadress';
+$wb['name_txt'] = 'Namn';
+$wb['used_txt'] = 'Använt utrymme';
+$wb['quota_txt'] = 'Kvot';
+$wb['no_email_accounts_txt'] = 'Inga epostkonton hittades';
 ?>
+
diff --git a/interface/web/dashboard/lib/lang/se_dashlet_modules.lng b/interface/web/dashboard/lib/lang/se_dashlet_modules.lng
index 6a02127..4dff679 100644
--- a/interface/web/dashboard/lib/lang/se_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/se_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
-$wb['available_modules_txt'] = 'Available Modules';
+$wb['available_modules_txt'] = 'Tillgängliga moduler';
 ?>
+
diff --git a/interface/web/dashboard/lib/lang/se_dashlet_quota.lng b/interface/web/dashboard/lib/lang/se_dashlet_quota.lng
index de7b5a8..325b04d 100644
--- a/interface/web/dashboard/lib/lang/se_dashlet_quota.lng
+++ b/interface/web/dashboard/lib/lang/se_dashlet_quota.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['quota_txt'] = 'Website Harddisk Quota';
-$wb['domain_txt'] = 'Domain / Website';
-$wb['used_txt'] = 'Used space';
-$wb['hard_txt'] = 'Hard limit';
-$wb['soft_txt'] = 'Soft limit';
-$wb['no_sites_txt'] = 'No web sites found.';
+$wb['quota_txt'] = 'Webbsidornas hårddiskkvot';
+$wb['domain_txt'] = 'Domän / Webbsida';
+$wb['used_txt'] = 'Använt utrymme';
+$wb['hard_txt'] = 'Hård gräns';
+$wb['soft_txt'] = 'Mjuk gräns';
+$wb['no_sites_txt'] = 'Ingen webbsida hittades.';
 ?>
+
diff --git a/interface/web/designer/lib/lang/se.lng b/interface/web/designer/lib/lang/se.lng
index acb6c35..29f4a51 100644
--- a/interface/web/designer/lib/lang/se.lng
+++ b/interface/web/designer/lib/lang/se.lng
@@ -1,2 +1,3 @@
 <?php
 ?>
+
diff --git a/interface/web/designer/lib/lang/se_form_edit.lng b/interface/web/designer/lib/lang/se_form_edit.lng
index 7fe5df1..72d80e5 100644
--- a/interface/web/designer/lib/lang/se_form_edit.lng
+++ b/interface/web/designer/lib/lang/se_form_edit.lng
@@ -2,7 +2,7 @@
 $wb['name_txt'] = 'Formulärnamn';
 $wb['title_txt'] = 'Formulärtitel';
 $wb['template_txt'] = 'Mall';
-$wb['navframe_txt'] = 'Nav.Ram';
+$wb['navframe_txt'] = 'Nav.ram';
 $wb['startpage_txt'] = 'Startsida';
 $wb['tab_width_txt'] = 'Flik bredd';
 $wb['save_txt'] = 'Spara';
@@ -22,3 +22,4 @@
 $wb['auth_preset_perm_group_txt'] = 'Beh. Grupp';
 $wb['auth_preset_perm_other_txt'] = 'Beh. Andra';
 ?>
+
diff --git a/interface/web/designer/lib/lang/se_form_list.lng b/interface/web/designer/lib/lang/se_form_list.lng
index 5f7f600..7951bb7 100644
--- a/interface/web/designer/lib/lang/se_form_list.lng
+++ b/interface/web/designer/lib/lang/se_form_list.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Huvud Formulär';
+$wb['list_head_txt'] = 'Huvudformulär';
 $wb['form_txt'] = 'Formulär';
 $wb['module_txt'] = 'Modul';
 $wb['title_txt'] = 'Titel';
 $wb['description_txt'] = 'Beskrivning';
 ?>
+
diff --git a/interface/web/designer/lib/lang/se_form_show.lng b/interface/web/designer/lib/lang/se_form_show.lng
index 5818efb..1d5de49 100644
--- a/interface/web/designer/lib/lang/se_form_show.lng
+++ b/interface/web/designer/lib/lang/se_form_show.lng
@@ -1,11 +1,11 @@
 <?php
-$wb['header_txt'] = 'Formulär redigerare';
+$wb['header_txt'] = 'Formulärredigerare';
 $wb['title_txt'] = 'Formulärtitel';
 $wb['name_txt'] = 'Formulärnamn';
 $wb['delete_txt'] = 'X';
 $wb['properties_txt'] = 'Inställningar';
 $wb['new_tab_txt'] = 'Ny flik';
-$wb['edit_txt'] = 'Editera';
+$wb['edit_txt'] = 'Redigera';
 $wb['new_txt'] = 'Ny';
 $wb['up_txt'] = '^';
 $wb['down_txt'] = 'v';
@@ -16,3 +16,4 @@
 $wb['menu_del_txt'] = 'Ta bort meny och allt menyinnehåll?';
 $wb['item_del_txt'] = 'Ta bort menyinnehåll?';
 ?>
+
diff --git a/interface/web/designer/lib/lang/se_module_edit.lng b/interface/web/designer/lib/lang/se_module_edit.lng
index 982010b..992a074 100644
--- a/interface/web/designer/lib/lang/se_module_edit.lng
+++ b/interface/web/designer/lib/lang/se_module_edit.lng
@@ -1,22 +1,13 @@
 <?php
 $wb['name_txt'] = 'Modulnamn';
 $wb['title_txt'] = 'Modultitel';
-$wb['template_txt'] = 'Mall fil';
+$wb['template_txt'] = 'Mallfil';
 $wb['navframe_txt'] = 'Nav.Ram';
-$wb['startpage_txt'] = 'Standard sida';
-$wb['tab_width_txt'] = 'Flik bredd';
+$wb['startpage_txt'] = 'Standardsida';
+$wb['tab_width_txt'] = 'Flikbredd';
 $wb['save_txt'] = 'Spara';
 $wb['cancel_txt'] = 'Avbryt';
-$wb['header_txt'] = 'Modul inställningar';
-$wb['description_txt'] = '
-<b>Description</b>
-<br><br>
-<b>Modulename:</b> Namn på modul mappen. Endast siffror, bokstäver och understreck är tillåtna.<br>
-<b>Moduletitle:</b> Kommer att visas i (övre) huvud navigerigsramen.<br>
-<b>Template file:</b> Mall fil för modulen. Just nu finns: module.tpl.htm och module_tree.tpl.htm. Standard är module.tpl.htm.<br>
-<b>NaviFrame:</b> Om module module_tree.tpl.htm väljs som mall file, skriv här sökvägen till skriptfilen för den vänstra ramen.<br>
-<b>Default page:</b> Dessa sidor kommer att visas när modulen öppnas.<br>
-<b>Tab width:</b> Bredd på Flikarna i huvud navigerings ramen. Detta fält är tomt som standard. Du kan skriva in ett absolutvärde i pixlar (ex. 20) eller relativt värde (ex. 20%).<br>
-<b>Hint:</b> Alla sökvägar är relativa till mappen web.
-';
+$wb['header_txt'] = 'Modulinställningar';
+$wb['description_txt'] = '<b>Description</b><br><br><b>Modulename:</b> Namn på modul mappen. Endast siffror, bokstäver och understreck är tillåtna.<br><b>Moduletitle:</b> Kommer att visas i (övre) huvud navigerigsramen.<br><b>Template file:</b> Mall fil för modulen. Just nu finns: module.tpl.htm och module_tree.tpl.htm. Standard är module.tpl.htm.<br><b>NaviFrame:</b> Om module module_tree.tpl.htm väljs som mall file, skriv här sökvägen till skriptfilen för den vänstra ramen.<br><b>Default page:</b> Dessa sidor kommer att visas när modulen öppnas.<br><b>Tab width:</b> Bredd på Flikarna i huvud navigerings ramen. Detta fält är tomt som standard. Du kan skriva in ett absolutvärde i pixlar (ex. 20) eller relativt värde (ex. 20%).<br><b>Hint:</b> Alla sökvägar är relativa till mappen web.';
 ?>
+
diff --git a/interface/web/designer/lib/lang/se_module_list.lng b/interface/web/designer/lib/lang/se_module_list.lng
index 0fe0187..d8408e2 100644
--- a/interface/web/designer/lib/lang/se_module_list.lng
+++ b/interface/web/designer/lib/lang/se_module_list.lng
@@ -1,5 +1,6 @@
 <?php
-$wb['list_head_txt'] = 'Huvud Modul';
+$wb['list_head_txt'] = 'Huvudmodul';
 $wb['module_txt'] = 'Modul';
 $wb['title_txt'] = 'Titel';
 ?>
+
diff --git a/interface/web/designer/lib/lang/se_module_nav_edit.lng b/interface/web/designer/lib/lang/se_module_nav_edit.lng
index 17e1563..28bf0ac 100644
--- a/interface/web/designer/lib/lang/se_module_nav_edit.lng
+++ b/interface/web/designer/lib/lang/se_module_nav_edit.lng
@@ -1,6 +1,7 @@
 <?php
 $wb['title_txt'] = 'Titel';
-$wb['header_txt'] = 'Nav egenskaper';
+$wb['header_txt'] = 'Nav-egenskaper';
 $wb['save_txt'] = 'Spara';
 $wb['cancel_txt'] = 'Avbryt';
 ?>
+
diff --git a/interface/web/designer/lib/lang/se_module_nav_item_edit.lng b/interface/web/designer/lib/lang/se_module_nav_item_edit.lng
index c1fe5fa..b9f8639 100644
--- a/interface/web/designer/lib/lang/se_module_nav_item_edit.lng
+++ b/interface/web/designer/lib/lang/se_module_nav_item_edit.lng
@@ -2,7 +2,8 @@
 $wb['title_txt'] = 'Titel';
 $wb['target_txt'] = 'Mål';
 $wb['link_txt'] = 'Länk';
-$wb['header_txt'] = 'Nav egenskaper';
+$wb['header_txt'] = 'Nav. egenskaper';
 $wb['save_txt'] = 'Spara';
 $wb['cancel_txt'] = 'Avbryt';
 ?>
+
diff --git a/interface/web/designer/lib/lang/se_module_show.lng b/interface/web/designer/lib/lang/se_module_show.lng
index c13e5f8..497a62d 100644
--- a/interface/web/designer/lib/lang/se_module_show.lng
+++ b/interface/web/designer/lib/lang/se_module_show.lng
@@ -1,11 +1,11 @@
 <?php
-$wb['header_txt'] = 'Meny redigerare';
+$wb['header_txt'] = 'Menyredigerare';
 $wb['title_txt'] = 'Titel';
 $wb['name_txt'] = 'Modul';
 $wb['delete_txt'] = 'Ta bort';
 $wb['properties_txt'] = 'Egenskaper';
-$wb['new_menu_txt'] = 'Ny Meny';
-$wb['edit_txt'] = 'Editera';
+$wb['new_menu_txt'] = 'Ny meny';
+$wb['edit_txt'] = 'Redigera';
 $wb['new_txt'] = 'Ny';
 $wb['up_txt'] = 'Upp';
 $wb['down_txt'] = 'Ner';
@@ -14,3 +14,4 @@
 $wb['menu_del_txt'] = 'Ta bort meny och allt menyinnehåll?';
 $wb['item_del_txt'] = 'Ta bort menyinnehåll?';
 ?>
+
diff --git a/interface/web/dns/lib/lang/se.lng b/interface/web/dns/lib/lang/se.lng
index d01b6b3..80c3918 100644
--- a/interface/web/dns/lib/lang/se.lng
+++ b/interface/web/dns/lib/lang/se.lng
@@ -1,6 +1,6 @@
 <?php
 $wb['DNS'] = 'DNS';
-$wb['Zones'] = 'Zones';
+$wb['Zones'] = 'Zoner';
 $wb['DNS A'] = 'DNS A';
 $wb['DNS ALIAS'] = 'DNS ALIAS';
 $wb['DNS CNAME'] = 'DNS CNAME';
@@ -14,9 +14,10 @@
 $wb['DNS SRV'] = 'DNS SRV';
 $wb['DNS TXT Record'] = 'DNS TXT Record';
 $wb['DNS TXT'] = 'DNS TXT';
-$wb['DNS Wizard'] = 'DNS Wizard';
-$wb['Add DNS Zone'] = 'Add DNS Zone';
-$wb['Templates'] = 'Templates';
-$wb['Secondary Zones'] = 'Secondary Zones';
-$wb['Import Zone File'] = 'Import Zone File';
+$wb['DNS Wizard'] = 'DNS-hjälp';
+$wb['Add DNS Zone'] = 'Lägg till DNS-zon';
+$wb['Templates'] = 'Mallar';
+$wb['Secondary Zones'] = 'Sekundära zoner';
+$wb['Import Zone File'] = 'Importera  zonfiler';
 ?>
+
diff --git a/interface/web/dns/lib/lang/se_dns_a.lng b/interface/web/dns/lib/lang/se_dns_a.lng
index 7dcfc37..a69314d 100644
--- a/interface/web/dns/lib/lang/se_dns_a.lng
+++ b/interface/web/dns/lib/lang/se_dns_a.lng
@@ -15,3 +15,4 @@
 $wb['data_error_duplicate'] = 'Duplicate A-Record';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/se_dns_a_list.lng b/interface/web/dns/lib/lang/se_dns_a_list.lng
index 3fa1e7f..b92f4c0 100644
--- a/interface/web/dns/lib/lang/se_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/se_dns_a_list.lng
@@ -13,3 +13,4 @@
 $wb['page_of_txt'] = 'of';
 $wb['delete_confirmation'] = 'Do you really want to delete this record?';
 ?>
+
diff --git a/interface/web/dns/lib/lang/se_dns_aaaa.lng b/interface/web/dns/lib/lang/se_dns_aaaa.lng
index b4c5b27..a8cfbf1 100644
--- a/interface/web/dns/lib/lang/se_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/se_dns_aaaa.lng
@@ -14,3 +14,4 @@
 $wb['data_error_regex'] = 'IP-Address format invalid';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/se_dns_alias.lng b/interface/web/dns/lib/lang/se_dns_alias.lng
index bd4be9f..05c3f62 100644
--- a/interface/web/dns/lib/lang/se_dns_alias.lng
+++ b/interface/web/dns/lib/lang/se_dns_alias.lng
@@ -14,3 +14,4 @@
 $wb['data_error_regex'] = 'Target hostname format invalid';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/se_dns_cname.lng b/interface/web/dns/lib/lang/se_dns_cname.lng
index 5f8363a..b4e8ae1 100644
--- a/interface/web/dns/lib/lang/se_dns_cname.lng
+++ b/interface/web/dns/lib/lang/se_dns_cname.lng
@@ -1,11 +1,11 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
+$wb['zone_txt'] = 'Zon';
 $wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'type';
+$wb['type_txt'] = 'typ';
 $wb['data_txt'] = 'Target Hostname';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktiv';
 $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
 $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
 $wb['name_error_empty'] = 'The hostname is empty.';
@@ -15,3 +15,4 @@
 $wb['data_error_duplicate'] = 'Duplicate A-Record or CNAME-Record';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/se_dns_hinfo.lng b/interface/web/dns/lib/lang/se_dns_hinfo.lng
index 937bd9b..df19a84 100644
--- a/interface/web/dns/lib/lang/se_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/se_dns_hinfo.lng
@@ -14,3 +14,4 @@
 $wb['data_error_regex'] = 'Host Information format invalid';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/se_dns_import.lng b/interface/web/dns/lib/lang/se_dns_import.lng
index 2d1fe08..aea47ba 100644
--- a/interface/web/dns/lib/lang/se_dns_import.lng
+++ b/interface/web/dns/lib/lang/se_dns_import.lng
@@ -1,14 +1,15 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['client_txt'] = 'Client';
-$wb['btn_save_txt'] = 'Import Zonefile';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['domain_txt'] = 'Domain';
-$wb['zone_file_successfully_imported_txt'] = 'The zone file has successfully been imported!';
-$wb['error_no_valid_zone_file_txt'] = 'This appears to be no valid zone file!';
-$wb['zonefile_to_import_txt'] = 'Zone File';
+$wb['client_txt'] = 'Kund';
+$wb['btn_save_txt'] = 'Importera zonfil';
+$wb['btn_cancel_txt'] = 'Avbryt';
+$wb['domain_txt'] = 'Domän';
+$wb['zone_file_successfully_imported_txt'] = 'Zonfilimporten har lyckats!';
+$wb['error_no_valid_zone_file_txt'] = 'Detta verkar inte vara en giltig zonfil';
+$wb['zonefile_to_import_txt'] = 'Zonfil';
 $wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filename or the zone-file content.';
-$wb['title'] = 'Import Zone Files';
-$wb['no_file_uploaded_error'] = 'No zonefile uploaded';
-$wb['zone_file_import_txt'] = 'Zone File Import';
+$wb['title'] = 'Importera zonfiler';
+$wb['no_file_uploaded_error'] = 'Ingen zonfil uppladdad';
+$wb['zone_file_import_txt'] = 'Zonfilsimport';
 ?>
+
diff --git a/interface/web/dns/lib/lang/se_dns_mx.lng b/interface/web/dns/lib/lang/se_dns_mx.lng
index e95fa84..0bfc234 100644
--- a/interface/web/dns/lib/lang/se_dns_mx.lng
+++ b/interface/web/dns/lib/lang/se_dns_mx.lng
@@ -1,12 +1,12 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
+$wb['zone_txt'] = 'Zon';
 $wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'type';
+$wb['type_txt'] = 'typ';
 $wb['data_txt'] = 'Mailserver hostname';
 $wb['aux_txt'] = 'Priority';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktiv';
 $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
 $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
 $wb['name_error_empty'] = 'The hostname is empty.';
@@ -16,3 +16,4 @@
 $wb['duplicate_mx_record_txt'] = 'Duplicate MX record.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/se_dns_ns.lng b/interface/web/dns/lib/lang/se_dns_ns.lng
index d0cc4b0..2ce51da 100644
--- a/interface/web/dns/lib/lang/se_dns_ns.lng
+++ b/interface/web/dns/lib/lang/se_dns_ns.lng
@@ -1,16 +1,17 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Zone';
-$wb['type_txt'] = 'type';
-$wb['data_txt'] = 'Nameserver Hostname';
+$wb['zone_txt'] = 'Zon';
+$wb['name_txt'] = 'Zon';
+$wb['type_txt'] = 'typ';
+$wb['data_txt'] = 'Namnserver Hostname';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktiv';
 $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
 $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
-$wb['name_error_empty'] = 'The zone is empty.';
-$wb['name_error_regex'] = 'The zone has the wrong format.';
-$wb['data_error_empty'] = 'Nameserver empty';
-$wb['data_error_regex'] = 'Nameserver format invalid';
+$wb['name_error_empty'] = 'Zonen är tom.';
+$wb['name_error_regex'] = 'Zonen har fel format.';
+$wb['data_error_empty'] = 'Namnserver tom';
+$wb['data_error_regex'] = 'Namnserverformatet är ogiltigt';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/se_dns_ptr.lng b/interface/web/dns/lib/lang/se_dns_ptr.lng
index 8ed2dba..6c42a8f 100644
--- a/interface/web/dns/lib/lang/se_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/se_dns_ptr.lng
@@ -1,16 +1,17 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Name';
-$wb['type_txt'] = 'type';
+$wb['zone_txt'] = 'Zon';
+$wb['name_txt'] = 'Namn';
+$wb['type_txt'] = 'typ';
 $wb['data_txt'] = 'Canonical Hostname';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktiv';
 $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
 $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
-$wb['name_error_empty'] = 'The name is empty.';
-$wb['name_error_regex'] = 'The name has the wrong format.';
+$wb['name_error_empty'] = 'Namnfältet är tomt.';
+$wb['name_error_regex'] = 'Namnfältet har fel format.';
 $wb['data_error_empty'] = 'Canonical hostname empty';
 $wb['data_error_regex'] = 'Canonical hostname format invalid';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/se_dns_rp.lng b/interface/web/dns/lib/lang/se_dns_rp.lng
index 2669b1b..e37bc8f 100644
--- a/interface/web/dns/lib/lang/se_dns_rp.lng
+++ b/interface/web/dns/lib/lang/se_dns_rp.lng
@@ -1,11 +1,11 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
+$wb['zone_txt'] = 'Zon';
 $wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'type';
-$wb['data_txt'] = 'Responsible Person';
+$wb['type_txt'] = 'typ';
+$wb['data_txt'] = 'Ansvarig person';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktiv';
 $wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
 $wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
 $wb['name_error_empty'] = 'The hostname is empty.';
@@ -14,3 +14,4 @@
 $wb['data_error_regex'] = 'Responsible person field format invalid';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/se_dns_slave.lng b/interface/web/dns/lib/lang/se_dns_slave.lng
index c426df7..254f360 100644
--- a/interface/web/dns/lib/lang/se_dns_slave.lng
+++ b/interface/web/dns/lib/lang/se_dns_slave.lng
@@ -15,3 +15,4 @@
 $wb['ipv4_form_txt'] = 'IPv4 form - e.g. 1.2.3.4';
 $wb['secondary_zone_txt'] = 'Secondary DNS Zone';
 ?>
+
diff --git a/interface/web/dns/lib/lang/se_dns_slave_list.lng b/interface/web/dns/lib/lang/se_dns_slave_list.lng
index 4ced2dd..6e7951d 100644
--- a/interface/web/dns/lib/lang/se_dns_slave_list.lng
+++ b/interface/web/dns/lib/lang/se_dns_slave_list.lng
@@ -7,3 +7,4 @@
 $wb['add_new_record_txt'] = 'Add new secondary DNS Zone';
 $wb['eg_domain_tld'] = 'e.g. domain.tld.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/se_dns_soa.lng b/interface/web/dns/lib/lang/se_dns_soa.lng
index 87de926..4f2eefa 100644
--- a/interface/web/dns/lib/lang/se_dns_soa.lng
+++ b/interface/web/dns/lib/lang/se_dns_soa.lng
@@ -1,33 +1,33 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['origin_txt'] = 'Zone (SOA)';
+$wb['origin_txt'] = 'Zon (SOA)';
 $wb['ns_txt'] = 'NS';
-$wb['mbox_txt'] = 'Email';
-$wb['serial_txt'] = 'Serial';
+$wb['mbox_txt'] = 'Epost';
+$wb['serial_txt'] = 'Serienummer';
 $wb['refresh_txt'] = 'Refresh';
 $wb['retry_txt'] = 'Retry';
 $wb['expire_txt'] = 'Expire';
 $wb['minimum_txt'] = 'Minimum';
 $wb['ttl_txt'] = 'TTL';
 $wb['xfer_txt'] = 'Allow zone transfers to <br />these IPs (comma separated list)';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktiv';
 $wb['limit_dns_zone_txt'] = 'The max. number of DNS zones for your account is reached.';
-$wb['client_txt'] = 'Client';
-$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
-$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.';
-$wb['mbox_error_empty'] = 'Email is empty.';
-$wb['mbox_error_regex'] = 'Email format invalid.';
+$wb['client_txt'] = 'Kund';
+$wb['no_zone_perm'] = 'Du har inte behörighet att lägga till inlägg i denna zon.';
+$wb['server_id_error_empty'] = 'Ingen server vald';
+$wb['origin_error_empty'] = 'Zonen är tom.';
+$wb['origin_error_unique'] = 'Det finns redan ett inlägg för den här zonen.';
+$wb['origin_error_regex'] = 'Zonen har ett ogiltigt format.';
+$wb['ns_error_regex'] = 'NS har ett ogiltigt format.';
+$wb['mbox_error_empty'] = 'Epostfältet är tomt.';
+$wb['mbox_error_regex'] = 'Ogiltigt epostformat.';
 $wb['also_notify_txt'] = 'Also Notify';
-$wb['also_notify_error_regex'] = 'Please use an IP address.';
-$wb['update_acl_txt'] = 'Update ACL';
-$wb['seconds_txt'] = 'Seconds';
-$wb['eg_domain_tld'] = 'e.g. domain.tld';
-$wb['eg_ns1_domain_tld'] = 'e.g. ns1.domain.tld';
-$wb['eg_webmaster_domain_tld'] = 'e.g. webmaster@domain.tld';
+$wb['also_notify_error_regex'] = 'Vänligen ange en IP-adress.';
+$wb['update_acl_txt'] = 'Uppdatera ACL';
+$wb['seconds_txt'] = 'Sekunder';
+$wb['eg_domain_tld'] = 'ex. domain.tld';
+$wb['eg_ns1_domain_tld'] = 'ex. ns1.domain.tld';
+$wb['eg_webmaster_domain_tld'] = 'ex. webmaster@domain.tld';
 $wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'The Domain can not be changed. Please ask your Administrator if you want to change the domain name.';
 $wb['refresh_range_error'] = 'Min. Refresh time is 60 seconds.';
 $wb['retry_range_error'] = 'Min. Retry time is 60 seconds.';
@@ -36,3 +36,4 @@
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 $wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/se_dns_soa_list.lng b/interface/web/dns/lib/lang/se_dns_soa_list.lng
index da7b8e2..b534641 100644
--- a/interface/web/dns/lib/lang/se_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/se_dns_soa_list.lng
@@ -8,3 +8,4 @@
 $wb['add_new_record_txt'] = 'Add new DNS Zone (SOA)';
 $wb['add_new_record_wizard_txt'] = 'Add new DNS Zone with Wizard';
 ?>
+
diff --git a/interface/web/dns/lib/lang/se_dns_srv.lng b/interface/web/dns/lib/lang/se_dns_srv.lng
index 866f44d..fae1b70 100644
--- a/interface/web/dns/lib/lang/se_dns_srv.lng
+++ b/interface/web/dns/lib/lang/se_dns_srv.lng
@@ -18,3 +18,4 @@
 $wb['aux_txt'] = 'Priority';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/se_dns_template.lng b/interface/web/dns/lib/lang/se_dns_template.lng
index 3a09e3b..6fd5b5c 100644
--- a/interface/web/dns/lib/lang/se_dns_template.lng
+++ b/interface/web/dns/lib/lang/se_dns_template.lng
@@ -1,6 +1,7 @@
 <?php
-$wb['name_txt'] = 'Name';
-$wb['fields_txt'] = 'Fields';
-$wb['template_txt'] = 'Template';
-$wb['visible_txt'] = 'Visible';
+$wb['name_txt'] = 'Namn';
+$wb['fields_txt'] = 'Fält';
+$wb['template_txt'] = 'Mall';
+$wb['visible_txt'] = 'Synlig';
 ?>
+
diff --git a/interface/web/dns/lib/lang/se_dns_template_list.lng b/interface/web/dns/lib/lang/se_dns_template_list.lng
index 8d9d730..120335f 100644
--- a/interface/web/dns/lib/lang/se_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/se_dns_template_list.lng
@@ -4,3 +4,4 @@
 $wb['name_txt'] = 'Name';
 $wb['add_new_record_txt'] = 'Add new record';
 ?>
+
diff --git a/interface/web/dns/lib/lang/se_dns_txt.lng b/interface/web/dns/lib/lang/se_dns_txt.lng
index 31da6eb..0fc9b25 100644
--- a/interface/web/dns/lib/lang/se_dns_txt.lng
+++ b/interface/web/dns/lib/lang/se_dns_txt.lng
@@ -14,3 +14,4 @@
 $wb['data_error_regex'] = 'Text format invalid';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
+
diff --git a/interface/web/dns/lib/lang/se_dns_wizard.lng b/interface/web/dns/lib/lang/se_dns_wizard.lng
index 52955fd..3bb0a63 100644
--- a/interface/web/dns/lib/lang/se_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/se_dns_wizard.lng
@@ -36,3 +36,4 @@
 $wb['list_head_txt'] = 'DNS Zone Wizard';
 $wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
 ?>
+
diff --git a/interface/web/help/lib/lang/se.lng b/interface/web/help/lib/lang/se.lng
index 897898b..e096257 100644
--- a/interface/web/help/lib/lang/se.lng
+++ b/interface/web/help/lib/lang/se.lng
@@ -1,14 +1,15 @@
 <?php
-$wb['Support Message'] = 'Support Message';
-$wb['Message'] = 'Message';
-$wb['Send message'] = 'Send message';
-$wb['View messages'] = 'View messages';
+$wb['Support Message'] = 'Supportmeddelande';
+$wb['Message'] = 'Meddelande';
+$wb['Send message'] = 'Skicka meddelande';
+$wb['View messages'] = 'Visa meddelande';
 $wb['Support'] = 'Support';
-$wb['About ISPConfig'] = 'About ISPConfig';
+$wb['About ISPConfig'] = 'OmISPConfig';
 $wb['Version'] = 'Version';
-$wb['Frequently Asked Questions'] = 'Frequently Asked Questions';
-$wb['FAQ Sections'] = 'FAQ Sections';
-$wb['Manage Sections'] = 'Manage Sections';
-$wb['Add a Question & Answer Pair'] = 'Add a Question & Answer Pair';
-$wb['Manage Questions'] = 'Manage Questions';
+$wb['Frequently Asked Questions'] = 'Vanliga frågor och svar';
+$wb['FAQ Sections'] = 'FAQ-kategorier';
+$wb['Manage Sections'] = 'Hantera kategorier';
+$wb['Add a Question & Answer Pair'] = 'Lägg till fråga och svar';
+$wb['Manage Questions'] = 'Hantera frågor';
 ?>
+
diff --git a/interface/web/help/lib/lang/se_faq_form.lng b/interface/web/help/lib/lang/se_faq_form.lng
index dfc4e87..743e02d 100644
--- a/interface/web/help/lib/lang/se_faq_form.lng
+++ b/interface/web/help/lib/lang/se_faq_form.lng
@@ -1,6 +1,7 @@
 <?php
-$wb['faq_faq_txt'] = 'Frequently Asked Questions';
-$wb['faq_question_txt'] = 'Question';
-$wb['faq_answer_txt'] = 'Answer';
-$wb['faq_section_txt'] = 'Section';
+$wb['faq_faq_txt'] = 'Vanliga frågor';
+$wb['faq_question_txt'] = 'Fråga';
+$wb['faq_answer_txt'] = 'Svar';
+$wb['faq_section_txt'] = 'Kategori';
 ?>
+
diff --git a/interface/web/help/lib/lang/se_faq_manage_questions_list.lng b/interface/web/help/lib/lang/se_faq_manage_questions_list.lng
index 54e727d..c802176 100644
--- a/interface/web/help/lib/lang/se_faq_manage_questions_list.lng
+++ b/interface/web/help/lib/lang/se_faq_manage_questions_list.lng
@@ -1,9 +1,10 @@
 <?php
-$wb['faq_question_txt'] = 'Question';
-$wb['faq_section_name_txt'] = 'Section';
-$wb['faq_delete_txt'] = 'Delete';
-$wb['faq_edit_txt'] = 'Edit';
-$wb['faq_sections_txt'] = 'Section';
-$wb['faq_faq_questions_txt'] = 'Frequently Asked Questions';
-$wb['faq_new_question_txt'] = 'Add a new question & answer pair';
+$wb['faq_question_txt'] = 'Frågor';
+$wb['faq_section_name_txt'] = 'Kategori';
+$wb['faq_delete_txt'] = 'Radera';
+$wb['faq_edit_txt'] = 'Redigera';
+$wb['faq_sections_txt'] = 'Kategori';
+$wb['faq_faq_questions_txt'] = 'Vanliga frågor';
+$wb['faq_new_question_txt'] = 'Lägg till ny fråga och svar';
 ?>
+
diff --git a/interface/web/help/lib/lang/se_faq_sections_form.lng b/interface/web/help/lib/lang/se_faq_sections_form.lng
index dab0863..9367eeb 100644
--- a/interface/web/help/lib/lang/se_faq_sections_form.lng
+++ b/interface/web/help/lib/lang/se_faq_sections_form.lng
@@ -1,3 +1,4 @@
 <?php
-$wb['faq_section_name_txt'] = 'Section Name';
+$wb['faq_section_name_txt'] = 'Kategorinamn';
 ?>
+
diff --git a/interface/web/help/lib/lang/se_help_faq_list.lng b/interface/web/help/lib/lang/se_help_faq_list.lng
index b6c7b46..c8aebaf 100644
--- a/interface/web/help/lib/lang/se_help_faq_list.lng
+++ b/interface/web/help/lib/lang/se_help_faq_list.lng
@@ -1,3 +1,4 @@
 <?php
-$wb['edit_txt'] = 'Edit';
+$wb['edit_txt'] = 'Redigera';
 ?>
+
diff --git a/interface/web/help/lib/lang/se_help_faq_sections_list.lng b/interface/web/help/lib/lang/se_help_faq_sections_list.lng
index cb6ce84..021feb3 100644
--- a/interface/web/help/lib/lang/se_help_faq_sections_list.lng
+++ b/interface/web/help/lib/lang/se_help_faq_sections_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['faq_section_name_txt'] = 'Section Name';
-$wb['faq_delete_txt'] = 'Delete';
-$wb['faq_edit_txt'] = 'Edit';
-$wb['faq_sections_txt'] = 'Sections';
-$wb['faq_faq_sections_txt'] = 'FAQ Sections';
-$wb['faq_new_section_txt'] = 'Add a new section';
+$wb['faq_section_name_txt'] = 'Kategorinamn';
+$wb['faq_delete_txt'] = 'Radera';
+$wb['faq_edit_txt'] = 'Redigera';
+$wb['faq_sections_txt'] = 'Kategori';
+$wb['faq_faq_sections_txt'] = 'FAQ-kategorier';
+$wb['faq_new_section_txt'] = 'Lägg till ny kategori';
 ?>
+
diff --git a/interface/web/help/lib/lang/se_support_message.lng b/interface/web/help/lib/lang/se_support_message.lng
index bcc50ac..0de8420 100644
--- a/interface/web/help/lib/lang/se_support_message.lng
+++ b/interface/web/help/lib/lang/se_support_message.lng
@@ -1,15 +1,16 @@
 <?php
-$wb['recipient_id_txt'] = 'Recipient ID';
-$wb['sender_id_txt'] = 'Sender ID';
-$wb['subject_txt'] = 'Subject';
-$wb['message_txt'] = 'Message';
-$wb['tstamp_txt'] = 'Timestamp';
-$wb['reply_txt'] = 'Reply';
-$wb['date_txt'] = 'Date';
-$wb['support_request_subject_txt'] = 'Support Request';
+$wb['recipient_id_txt'] = 'Mottagar-ID';
+$wb['sender_id_txt'] = 'Avsändar-ID';
+$wb['subject_txt'] = 'Ämne';
+$wb['message_txt'] = 'Meddelande';
+$wb['tstamp_txt'] = 'Tidsangivelse';
+$wb['reply_txt'] = 'Svar';
+$wb['date_txt'] = 'Datum';
+$wb['support_request_subject_txt'] = 'Supportförfrågan';
 $wb['support_request_txt'] = 'You have got a support request. Please don\'t reply to this email, but process the support request inside ISPConfig.';
 $wb['answer_to_support_request_txt'] = 'You have got a reply to your support request. Please don\'t reply to this email, but process the message inside ISPConfig.';
 $wb['answer_to_support_request_sent_txt'] = 'Your reply to the support request has been sent. Please don\'t reply to this email.';
 $wb['support_request_sent_txt'] = 'Your support request has been sent. Please don\'t reply to this email.';
 $wb['recipient_or_sender_email_address_not_valid_txt'] = 'The message could not be sent because the recipient and/or the sender email address is not valid.';
 ?>
+
diff --git a/interface/web/help/lib/lang/se_support_message_list.lng b/interface/web/help/lib/lang/se_support_message_list.lng
index 719f4b0..f68bb58 100644
--- a/interface/web/help/lib/lang/se_support_message_list.lng
+++ b/interface/web/help/lib/lang/se_support_message_list.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Support Messages';
-$wb['sender_id_txt'] = 'Sender';
-$wb['subject_txt'] = 'Subject';
-$wb['add_new_record_txt'] = 'Create new support message';
-$wb['date_txt'] = 'Date';
+$wb['list_head_txt'] = 'Supportmeddelanden';
+$wb['sender_id_txt'] = 'Avsändare';
+$wb['subject_txt'] = 'Ämne';
+$wb['add_new_record_txt'] = 'Skapa nyttt supportmeddelande';
+$wb['date_txt'] = 'Datum';
 ?>
+
diff --git a/interface/web/index.php b/interface/web/index.php
index c6f0ff3..80eab11 100644
--- a/interface/web/index.php
+++ b/interface/web/index.php
@@ -60,6 +60,22 @@
 	unset($_SESSION['show_error_msg']);
 }
 
+// read js.d files
+$js_d = ISPC_WEB_PATH . '/js/js.d';
+$js_d_files = array();
+if(@is_dir($js_d)) {
+	$dir = opendir($js_d);
+	while($file = readdir($dir)) {
+		$filename = $js_d . '/' . $file;
+		if($file === '.' || $file === '..' || !is_file($filename)) continue;
+		if(substr($file, -3) !== '.js') continue;
+		$js_d_files[] = array('file' => $file);
+	}
+	closedir($dir);
+}
+
+if (!empty($js_d_files)) $app->tpl->setLoop('js_d_includes', $js_d_files);
+unset($js_d_files);
 
 $app->tpl_defaults();
 $app->tpl->pparse();
diff --git a/interface/web/js/scrigo.js.php b/interface/web/js/scrigo.js.php
index 7d15e30..4e51cd5 100644
--- a/interface/web/js/scrigo.js.php
+++ b/interface/web/js/scrigo.js.php
@@ -18,6 +18,7 @@
 var indicatorPaddingH = -1;
 var indicatorPaddingW = -1;
 var indicatorCompleted = false;
+var registeredHooks = new Array();
 redirect = '';
 
 function reportError(request) {
@@ -26,6 +27,20 @@
 	   ajax request worked. */
 
 	/*alert(request);*/
+}
+
+function registerHook(name, callback) {
+    if(!registeredHooks[name]) registeredHooks[name] = new Array();
+    var newindex = registeredHooks[name].length;
+    registeredHooks[name][newindex] = callback;
+}
+
+function callHook(name, params) {
+    if(!registeredHooks[name]) return;
+    for(var i = 0; i < registeredHooks[name].length; i++) {
+        var callback = registeredHooks[name][i];
+        callback(name, params);
+    }
 }
 
 function resetFormChanged() {
@@ -73,7 +88,9 @@
     }
 }
 
-function onAfterContentLoad() {
+function onAfterContentLoad(url, data) {
+    if(!data) data = '';
+    else data = '&' + data;
 <?php
 if($server_config_array['misc']['use_combobox'] == 'y'){
 ?>
@@ -81,6 +98,7 @@
 <?php
 }
 ?>
+    callHook('onAfterContentLoad', {'url': url, 'data': data });
 }
 
 function loadContentRefresh(pagename) {
@@ -96,7 +114,7 @@
 											success: function(data, textStatus, jqXHR) {
                                                 hideLoadIndicator();
 												jQuery('#pageContent').html(jqXHR.responseText);
-                                                onAfterContentLoad();
+                                                onAfterContentLoad(pagename, "refresh="+document.getElementById('refreshinterval').value);
                                                 pageFormChanged = false;
 											},
 											error: function() {
@@ -175,7 +193,7 @@
 													document.location.href = 'index.php';
 												} else {
 													jQuery('#pageContent').html(jqXHR.responseText);
-                                                    onAfterContentLoad();
+                                                    onAfterContentLoad('content.php', jQuery('#'+formname).serialize());
                                                     pageFormChanged = false;
 												}
 												loadMenus();
@@ -213,7 +231,7 @@
 													//window.setTimeout('loadContent(redirect)', 1000);
 												} else {
 													jQuery('#pageContent').html(jqXHR.responseText);
-                                                    onAfterContentLoad();
+                                                    onAfterContentLoad(target, jQuery('#'+formname).serialize());
                                                     pageFormChanged = false;
 												}
                                                 hideLoadIndicator();
@@ -252,7 +270,7 @@
 													//window.setTimeout('loadContent(redirect)', 1000);
 												} else {
 													jQuery('#pageContent').html(jqXHR.responseText);
-                                                    onAfterContentLoad();
+                                                    onAfterContentLoad(target, jQuery('#'+formname).serialize());
                                                     pageFormChanged = false;
 												}
                                                 hideLoadIndicator();
@@ -330,7 +348,7 @@
 													//jQuery.each(reponseScript, function(idx, val) { eval(val.text); } );
 
 													jQuery('#pageContent').html(jqXHR.responseText);
-                                                    onAfterContentLoad();
+                                                    onAfterContentLoad(pagename, (params ? params : null));
                                                     pageFormChanged = false;
 												}
                                                 hideLoadIndicator();
@@ -357,7 +375,7 @@
 													loadContent(parts[1]);
 												} else {
 													jQuery('#pageContent').html(jqXHR.responseText);
-                                                    onAfterContentLoad();
+                                                    onAfterContentLoad('content.php', "s_mod=login&s_pg=index");
                                                     pageFormChanged = false;
 												}
                                                 hideLoadIndicator();
@@ -561,6 +579,8 @@
 pass_message['color'] = "green";
 pass_messages[5] = pass_message;
 
+var special_chars = "`~!@#$%^&*()_+|\=-[]}{';:/?.>,<\" ";
+
 function pass_check(password) {
 	var length = password.length;
 	var points = 0;
@@ -573,20 +593,29 @@
 		pass_result(1);
 		return;
 	}
-
+	
+	var different = 0;
+	
+	if (pass_contains(password, "abcdefghijklnmopqrstuvwxyz")) {
+		different += 1;
+	}
+	
 	if (pass_contains(password, "ABCDEFGHIJKLNMOPQRSTUVWXYZ")) {
 		points += 1;
+		different += 1;
 	}
 
 	if (pass_contains(password, "0123456789")) {
 		points += 1;
+		different += 1;
 	}
 
-	if (pass_contains(password, "`~!@#$%^&*()_+|\=-[]}{';:/?.>,<\" ")) {
+	if (pass_contains(password, special_chars)) {
 		points += 1;
+		different += 1;
 	}
 
-	if (points == 0) {
+	if (points == 0 || different < 3) {
 		if (length >= 5 && length <=6) {
 			pass_result(1);
 		} else if (length >= 7 && length <=8) {
@@ -724,27 +753,45 @@
     return rv;
 }
 
-function password(minLength, special){
-	var iteration = 0;
-	var password = "";
-	var randomNumber;
+function password(minLength, special, num_special){
 	minLength = minLength || 10;
+	if(minLength < 8) minLength = 8;
 	var maxLength = minLength + 5;
 	var length = getRandomInt(minLength, maxLength);
-	if(special == undefined){
-		var special = false;
+	
+	var alphachars = "abcdefghijklmnopqrstuvwxyz";
+	var upperchars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    var numchars = "1234567890";
+    var specialchars = "!@#_";
+	
+	if(num_special == undefined) num_special = 0;
+	if(special != undefined && special == true) {
+		num_special = Math.floor(Math.random() * (length / 4)) + 1;
 	}
-	while(iteration < length){
-		randomNumber = (Math.floor((Math.random() * 100)) % 94) + 33;
-		if(!special){
-			if ((randomNumber >=33) && (randomNumber <=47)) { continue; }
-			if ((randomNumber >=58) && (randomNumber <=64)) { continue; }
-			if ((randomNumber >=91) && (randomNumber <=96)) { continue; }
-			if ((randomNumber >=123) && (randomNumber <=126)) { continue; }
-		}
-		iteration++;
-		password += String.fromCharCode(randomNumber);
+	var numericlen = getRandomInt(1, 2);
+	var alphalen = length - num_special - numericlen;
+	var upperlen = Math.floor(alphalen / 2);
+	alphalen = alphalen - upperlen;
+	var password = "";
+	
+	for(i = 0; i < alphalen; i++) {
+		password += alphachars.charAt(Math.floor(Math.random() * alphachars.length));
 	}
+	
+	for(i = 0; i < upperlen; i++) {
+		password += upperchars.charAt(Math.floor(Math.random() * upperchars.length));
+	}
+	
+	for(i = 0; i < num_special; i++) {
+		password += specialchars.charAt(Math.floor(Math.random() * specialchars.length));
+	}
+	
+	for(i = 0; i < numericlen; i++) {
+		password += numchars.charAt(Math.floor(Math.random() * numchars.length));
+	}
+	
+	password = password.split('').sort(function() { return 0.5 - Math.random(); }).join('');
+	
 	return password;
 }
 
@@ -760,7 +807,7 @@
 	var newPWField = oldPWField.clone();
 	newPWField.attr('type', 'text').attr('id', 'tmp'+passwordFieldID).insertBefore(oldPWField);
 	oldPWField.remove();
-	var pword = password(<?php echo $min_password_length ?>, false);
+	var pword = password(<?php echo $min_password_length; ?>, false, 1);
 	jQuery('#'+repeatPasswordFieldID).val(pword);
 	newPWField.attr('id', passwordFieldID).val(pword).trigger('keyup');
 }
diff --git a/interface/web/login/lib/lang/se.lng b/interface/web/login/lib/lang/se.lng
index be9cb3e..e3301e0 100644
--- a/interface/web/login/lib/lang/se.lng
+++ b/interface/web/login/lib/lang/se.lng
@@ -1,27 +1,28 @@
 <?php
-$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['error_user_password_empty'] = 'Användarnamn eller lösenord tomt.';
+$wb['error_user_password_incorrect'] = 'Fel användarnamn eller lösenord.';
+$wb['error_user_blocked'] = 'Användaren är blockerad.';
+$wb['error_user_too_many_logins'] = 'För många felaktiga försök, var god vänta 15 minuter innan nästa försök.';
 $wb['pass_reset_txt'] = 'A new password will be generated and send to your email address if the email address entered below matches the email address in your client settings.';
-$wb['pw_reset'] = 'The password has been reset and send to your email address.';
-$wb['pw_error'] = 'Username or email address does not match.';
-$wb['pw_error_noinput'] = 'Please enter email address and username.';
+$wb['pw_reset'] = 'Lösenordet har återställts och skickats till din epostadress.';
+$wb['pw_error'] = 'Användarenmn eller lösenord matchar inte.';
+$wb['pw_error_noinput'] = 'Vänligen fyll i epostadress och användarnamn.';
 $wb['pw_reset_mail_msg'] = 'The password to your ISPConfig 3 control panel account has been reset. The new password is: ';
 $wb['pw_reset_mail_title'] = 'ISPConfig 3 Control panel password has been reset.';
 $wb['user_regex_error'] = 'Username contains unallowed characters or is longer then 64 characters.';
-$wb['pw_error_length'] = 'The password length is > 64 characters.';
-$wb['username_txt'] = 'Username';
-$wb['password_txt'] = 'Password';
-$wb['login_button_txt'] = 'Login';
-$wb['pw_lost_txt'] = 'Password lost';
+$wb['pw_error_length'] = 'Lösenrodslängden är > 64 tecken.';
+$wb['username_txt'] = 'Användarnamn';
+$wb['password_txt'] = 'Lösenord';
+$wb['login_button_txt'] = 'Logga in';
+$wb['pw_lost_txt'] = 'Glömt lösenord';
 $wb['error_maintenance_mode'] = 'This ISPConfig installation is currently under maintenance. We should be back shortly. Thank you for your patience.';
-$wb['login_txt'] = 'Login';
-$wb['pw_reset_txt'] = 'Password reset';
-$wb['pw_button_txt'] = 'Resend password';
-$wb['email_txt'] = 'Email';
+$wb['login_txt'] = 'Logga in';
+$wb['pw_reset_txt'] = 'Återställ lösenord';
+$wb['pw_button_txt'] = 'Skicka lösenord';
+$wb['email_txt'] = 'Epost';
 $wb['theme_not_compatible'] = 'The chosen theme is not compatible with the current ISPConfig version. Please check for a new version of the theme.<br />The default theme as been activated automatically.';
-$wb['back_txt'] = 'Back';
-$wb['email_error'] = 'Email contains unallowed characters or has a invalid format.';
-$wb['stay_logged_in_txt'] = 'Keep me logged in';
+$wb['back_txt'] = 'Tillbaka';
+$wb['email_error'] = 'Epostadressen innehåller otillåtna tecken eller är felformatterad.';
+$wb['stay_logged_in_txt'] = 'Håll mig inloggad';
 ?>
+
diff --git a/interface/web/login/lib/lang/se_login_as.lng b/interface/web/login/lib/lang/se_login_as.lng
index c660ff1..e831784 100644
--- a/interface/web/login/lib/lang/se_login_as.lng
+++ b/interface/web/login/lib/lang/se_login_as.lng
@@ -1,11 +1,12 @@
 <?php
-$wb['login_1_txt'] = 'Do you want to login as user';
-$wb['login_2_txt'] = 'If you do so, you can \\"go back\\" by clicking at logout.';
-$wb['btn_yes_txt'] = 'Yes, login as Client';
-$wb['btn_back_txt'] = 'No, back to list';
-$wb['udp_port_help_txt'] = 'Separated by comma';
-$wb['active_txt'] = 'Active';
+$wb['login_1_txt'] = 'Vill du loggga in som användare';
+$wb['login_2_txt'] = 'If you do so, you can "go back" by clicking at logout.';
+$wb['btn_yes_txt'] = 'Ja, logga in som kund';
+$wb['btn_back_txt'] = 'Nej, tillbaka till listan';
+$wb['udp_port_help_txt'] = 'Avdelade med kommatecken';
+$wb['active_txt'] = 'Aktiv';
 $wb['firewall_error_unique'] = 'There is already a firewall record for this server.';
-$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
-$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, \\":\\" and \\",\\".';
+$wb['tcp_ports_error_regex'] = 'Character not allowed in tcp port definition. Allowed characters are numbers, ":" and ",".';
+$wb['udp_ports_error_regex'] = 'Character not allowed in udp port definition. Allowed characters are numbers, ":" and ",".';
 ?>
+
diff --git a/interface/web/login/templates/index.htm b/interface/web/login/templates/index.htm
index eaf9e08..3fbd278 100644
--- a/interface/web/login/templates/index.htm
+++ b/interface/web/login/templates/index.htm
@@ -39,4 +39,7 @@
         </div>
     </div>
 
-</div>
\ No newline at end of file
+</div>
+<script language="JavaScript" type="text/javascript">
+	$('#username').closest('form').attr('autocomplete','on');
+</script>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/se.lng b/interface/web/mail/lib/lang/se.lng
index e12b05e..6542378 100644
--- a/interface/web/mail/lib/lang/se.lng
+++ b/interface/web/mail/lib/lang/se.lng
@@ -1,24 +1,24 @@
 <?php
-$wb['Email Alias'] = 'Email Alias';
-$wb['Email Blacklist'] = 'Email Blacklist';
-$wb['Blacklist'] = 'Blacklist';
-$wb['Mail Content Filter'] = 'Mail Content Filter';
+$wb['Email Alias'] = 'Epostalias';
+$wb['Email Blacklist'] = 'Svartlistning epost';
+$wb['Blacklist'] = 'Svartlista';
+$wb['Mail Content Filter'] = 'Innehållsfilter epost';
 $wb['Filter'] = 'Filter';
-$wb['Mail Domain'] = 'Mail Domain';
-$wb['Domain'] = 'Domain';
-$wb['Email Catchall'] = 'Email Catchall';
-$wb['Email Forward'] = 'Email Forward';
-$wb['Get Email'] = 'Get Email';
+$wb['Mail Domain'] = 'Epostdomän';
+$wb['Domain'] = 'Domän';
+$wb['Email Catchall'] = 'Standardadress';
+$wb['Email Forward'] = 'Vidarebefordran';
+$wb['Get Email'] = 'Hämta epost';
 $wb['Spamfilter'] = 'Spamfilter';
-$wb['Email Routing'] = 'Email Routing';
-$wb['Email transport'] = 'Email transport';
-$wb['Mailbox'] = 'Mailbox';
-$wb['Autoresponder'] = 'Autoresponder';
-$wb['Mail Filter'] = 'Mail Filter';
+$wb['Email Routing'] = 'Epostrouting';
+$wb['Email transport'] = 'Eposttransport';
+$wb['Mailbox'] = 'Epostadress';
+$wb['Autoresponder'] = 'Autosvar';
+$wb['Mail Filter'] = 'Epostfilter';
 $wb['Custom Rules'] = 'Custom Rules';
-$wb['Email filter'] = 'Email filter';
-$wb['Email Whitelist'] = 'Email Whitelist';
-$wb['Whitelist'] = 'Whitelist';
+$wb['Email filter'] = 'Epostfilter';
+$wb['Email Whitelist'] = 'Vistlistning epost';
+$wb['Whitelist'] = 'Vitlista';
 $wb['Spamfilter blacklist'] = 'Spamfilter blacklist';
 $wb['Spamfilter Config'] = 'Spamfilter Config';
 $wb['Server'] = 'Server';
@@ -46,3 +46,4 @@
 $wb['Relay Recipients'] = 'Relay Recipients';
 $wb['Mailbox quota'] = 'Mailbox quota';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_alias.lng b/interface/web/mail/lib/lang/se_mail_alias.lng
index 0cb02a7..4dc4e25 100644
--- a/interface/web/mail/lib/lang/se_mail_alias.lng
+++ b/interface/web/mail/lib/lang/se_mail_alias.lng
@@ -3,12 +3,13 @@
 $wb['destination_txt'] = 'Mål';
 $wb['active_txt'] = 'Aktiv';
 $wb['email_error_isemail'] = 'Epostadressen är tom.';
-$wb['email_error_unique'] = 'Dubbla Epostadresser.';
-$wb['no_domain_perm'] = 'Du har ingen behörighet för denna domänen.';
-$wb['destination_error_isemail'] = 'Destination Emailaddress is invalid.';
-$wb['limit_mailalias_txt'] = 'The max. number of email aliases for your account is reached.';
-$wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email address';
-$wb['domain_txt'] = 'Domain';
-$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
+$wb['email_error_unique'] = 'Epostadressen finns redan.';
+$wb['no_domain_perm'] = 'Du har ingen behörighet för denna domän.';
+$wb['destination_error_isemail'] = 'Epostadressen för destination är ogiltig.';
+$wb['limit_mailalias_txt'] = 'det maximala antalet alias för ditt konto är uppnått.';
+$wb['duplicate_mailbox_txt'] = 'Det finns redan ett epostkonto med denna adress';
+$wb['domain_txt'] = 'Domän';
+$wb['duplicate_email_alias_txt'] = 'Detta epostalias finns redan';
 $wb['source_txt'] = 'Alias';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_alias_list.lng b/interface/web/mail/lib/lang/se_mail_alias_list.lng
index 42b026f..e72d91b 100644
--- a/interface/web/mail/lib/lang/se_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/se_mail_alias_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'epost_alias';
+$wb['list_head_txt'] = 'epostalias';
 $wb['email_txt'] = 'epost';
-$wb['destination_txt'] = 'mål';
-$wb['active_txt'] = 'Active';
-$wb['source_txt'] = 'source';
-$wb['add_new_record_txt'] = 'Add new Email alias';
+$wb['destination_txt'] = 'Mål';
+$wb['active_txt'] = 'Aktiv';
+$wb['source_txt'] = 'Källa';
+$wb['add_new_record_txt'] = 'Lägg till nytt epostalias';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_aliasdomain.lng b/interface/web/mail/lib/lang/se_mail_aliasdomain.lng
index 5815d1e..9a2c5c3 100644
--- a/interface/web/mail/lib/lang/se_mail_aliasdomain.lng
+++ b/interface/web/mail/lib/lang/se_mail_aliasdomain.lng
@@ -1,11 +1,12 @@
 <?php
-$wb['source_txt'] = 'Source';
+$wb['source_txt'] = 'Källa';
 $wb['destination_txt'] = 'Destination';
-$wb['active_txt'] = 'Active';
-$wb['no_domain_perm'] = 'You have no permission for this domain.';
-$wb['limit_mailaliasdomain_txt'] = 'The max. number of email alias domains for your account is reached.';
-$wb['source_destination_identical_txt'] = 'Source and target Domain are the same.';
-$wb['source_error_empty'] = 'Source Domain is empty.';
-$wb['source_error_unique'] = 'Duplicate source Domain.';
-$wb['source_error_regex'] = 'Invalid source domain name.';
+$wb['active_txt'] = 'Aktiv';
+$wb['no_domain_perm'] = 'Du har ingen behörighet för denna domän.';
+$wb['limit_mailaliasdomain_txt'] = 'Det maximala antalet aliasdomäner för ditt konto är uppnått.';
+$wb['source_destination_identical_txt'] = 'Källa och mål är samma adress.';
+$wb['source_error_empty'] = 'Källdomän är tomt.';
+$wb['source_error_unique'] = 'Källdomänen finns redan.';
+$wb['source_error_regex'] = 'Ogiltig källdomän..';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/se_mail_aliasdomain_list.lng
index d96a63e..d04d8cd 100644
--- a/interface/web/mail/lib/lang/se_mail_aliasdomain_list.lng
+++ b/interface/web/mail/lib/lang/se_mail_aliasdomain_list.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Domain alias';
-$wb['active_txt'] = 'Active';
-$wb['source_txt'] = 'Source';
+$wb['list_head_txt'] = 'Domänalias';
+$wb['active_txt'] = 'Aktiv';
+$wb['source_txt'] = 'Källa';
 $wb['destination_txt'] = 'Destination';
-$wb['add_new_record_txt'] = 'Add new Domain alias';
+$wb['add_new_record_txt'] = 'Lägg till nytt domänalias';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_blacklist.lng b/interface/web/mail/lib/lang/se_mail_blacklist.lng
index a158141..70b1be5 100644
--- a/interface/web/mail/lib/lang/se_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/se_mail_blacklist.lng
@@ -1,9 +1,10 @@
 <?php
 $wb['server_id_txt'] = 'Server';
 $wb['active_txt'] = 'Aktiv';
-$wb['source_txt'] = 'Blacklist Address';
-$wb['recipient_txt'] = 'Recipient';
-$wb['source_error_notempty'] = 'Address is empty.';
-$wb['type_txt'] = 'Type';
-$wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.';
+$wb['source_txt'] = 'Svartlistad adress';
+$wb['recipient_txt'] = 'Mottagare';
+$wb['source_error_notempty'] = 'Adressfältet är tomt.';
+$wb['type_txt'] = 'Typ';
+$wb['limit_mailfilter_txt'] = 'Det maximala antalet epostfilter för ditt konto är uppnått.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_blacklist_list.lng b/interface/web/mail/lib/lang/se_mail_blacklist_list.lng
index eeba545..d3da0de 100644
--- a/interface/web/mail/lib/lang/se_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/se_mail_blacklist_list.lng
@@ -1,10 +1,11 @@
 <?php
-$wb['list_head_txt'] = 'Epost Svartlista';
+$wb['list_head_txt'] = 'Epost svartlista';
 $wb['server_id_txt'] = 'Server';
-$wb['add_new_record_txt'] = 'Lägga till ny Svartlistad epostadress';
-$wb['active_txt'] = 'Active';
-$wb['source_txt'] = 'Blacklisted address';
-$wb['type_txt'] = 'Type';
-$wb['recipient_txt'] = 'Recipient';
-$wb['access_txt'] = 'access';
+$wb['add_new_record_txt'] = 'Lägg till ny svartlistad epostadress';
+$wb['active_txt'] = 'Aktiv';
+$wb['source_txt'] = 'Svartlistad adress';
+$wb['type_txt'] = 'Typ';
+$wb['recipient_txt'] = 'Mottagare';
+$wb['access_txt'] = 'åtkomst';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_content_filter.lng b/interface/web/mail/lib/lang/se_mail_content_filter.lng
index 9d5e5f9..c7fb595 100644
--- a/interface/web/mail/lib/lang/se_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/se_mail_content_filter.lng
@@ -1,9 +1,10 @@
 <?php
 $wb['server_id_txt'] = 'Server';
 $wb['type_txt'] = 'Filter';
-$wb['pattern_txt'] = 'Regexp. Pattern';
+$wb['pattern_txt'] = 'Regexp.-matchning';
 $wb['data_txt'] = 'Data';
-$wb['action_txt'] = 'Action';
-$wb['active_txt'] = 'Active';
-$wb['pattern_error_empty'] = 'Pattern is empty.';
+$wb['action_txt'] = 'Händelse';
+$wb['active_txt'] = 'Aktiv';
+$wb['pattern_error_empty'] = 'Matchningsfältet är tomt.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_content_filter_list.lng b/interface/web/mail/lib/lang/se_mail_content_filter_list.lng
index 8c1e5e2..c612f9b 100644
--- a/interface/web/mail/lib/lang/se_mail_content_filter_list.lng
+++ b/interface/web/mail/lib/lang/se_mail_content_filter_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Postfix Header and Body Checks';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Postfix huvud- och innehållskontroll';
+$wb['active_txt'] = 'Aktiv';
 $wb['server_id_txt'] = 'Server';
-$wb['pattern_txt'] = 'Pattern';
-$wb['action_txt'] = 'Action';
-$wb['add_new_record_txt'] = 'Add new Content Filter';
+$wb['pattern_txt'] = 'Mönster';
+$wb['action_txt'] = 'Händelse';
+$wb['add_new_record_txt'] = 'Lägg till nytt innehållsfilter';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_domain.lng b/interface/web/mail/lib/lang/se_mail_domain.lng
index 926d21a..e07dd25 100644
--- a/interface/web/mail/lib/lang/se_mail_domain.lng
+++ b/interface/web/mail/lib/lang/se_mail_domain.lng
@@ -3,11 +3,12 @@
 $wb['domain_txt'] = 'Domän';
 $wb['type_txt'] = 'Typ';
 $wb['active_txt'] = 'Aktiv';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'Duplicate Domain.';
-$wb['domain_error_regex'] = 'Invalid domain name.';
-$wb['client_txt'] = 'Client';
-$wb['limit_maildomain_txt'] = 'The max. number of email domains for your account is reached.';
+$wb['domain_error_empty'] = 'Domänfältet är tomt.';
+$wb['domain_error_unique'] = 'Domänen finns redan.';
+$wb['domain_error_regex'] = 'Ogiltigt domännamn.';
+$wb['client_txt'] = 'Kund';
+$wb['limit_maildomain_txt'] = 'Det maximala antalet epostdomäner för ditt konto är uppnått.';
 $wb['policy_txt'] = 'Spamfilter';
-$wb['no_policy'] = '- not enabled -';
+$wb['no_policy'] = '- ej aktiverat -';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/se_mail_domain_admin_list.lng
index aaab4b4..bf8cd12 100644
--- a/interface/web/mail/lib/lang/se_mail_domain_admin_list.lng
+++ b/interface/web/mail/lib/lang/se_mail_domain_admin_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Email Domain';
+$wb['list_head_txt'] = 'Epostdomän';
 $wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['add_new_record_txt'] = 'Add new Domain';
-$wb['active_txt'] = 'Active';
-$wb['sys_groupid_txt'] = 'Client';
+$wb['domain_txt'] = 'Domän';
+$wb['add_new_record_txt'] = 'Lägg till ny domän';
+$wb['active_txt'] = 'Aktiv';
+$wb['sys_groupid_txt'] = 'Kund';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_domain_catchall.lng b/interface/web/mail/lib/lang/se_mail_domain_catchall.lng
index 071c119..9e03e69 100644
--- a/interface/web/mail/lib/lang/se_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/se_mail_domain_catchall.lng
@@ -2,10 +2,11 @@
 $wb['domain_txt'] = 'Domän';
 $wb['destination_txt'] = 'Mål';
 $wb['active_txt'] = 'Aktiv';
-$wb['domain_error_unique'] = 'Det finns alla redan en Catchall för denna domänen.';
-$wb['no_domain_perm'] = 'Du har inga rättigheter för denna domänen.';
-$wb['domain_error_regex'] = 'Invalid domain name od domain contains invalid characters.';
-$wb['limit_mailcatchall_txt'] = 'The max. number of email catchall accounts for your account is reached.';
-$wb['source_txt'] = 'Source';
-$wb['destination_error_isemail'] = 'Destination is no valid email address.';
+$wb['domain_error_unique'] = 'Det finns redan en catchall för denna domän.';
+$wb['no_domain_perm'] = 'Du har inga rättigheter för denna domän.';
+$wb['domain_error_regex'] = 'Ogiltig domän eller domänen innehåller ogiltiga tecken.';
+$wb['limit_mailcatchall_txt'] = 'Det maximala antalet catchall-adresser för ditt konto är uppnått.';
+$wb['source_txt'] = 'Källa';
+$wb['destination_error_isemail'] = 'Destinationen när inte en giltig epostadress.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/se_mail_domain_catchall_list.lng
index 5833c27..0e6958e 100644
--- a/interface/web/mail/lib/lang/se_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/se_mail_domain_catchall_list.lng
@@ -1,9 +1,10 @@
 <?php
-$wb['list_head_txt'] = 'Epost Catchall';
+$wb['list_head_txt'] = 'Epost catchall';
 $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domän';
-$wb['destination_txt'] = 'Mottagande epost adress';
-$wb['add_new_record_txt'] = 'Lägg till ny Catchall';
-$wb['active_txt'] = 'Active';
-$wb['source_txt'] = 'source';
+$wb['destination_txt'] = 'Mottagande epostadress';
+$wb['add_new_record_txt'] = 'Lägg till ny catchall';
+$wb['active_txt'] = 'Aktiv';
+$wb['source_txt'] = 'källa';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_domain_list.lng b/interface/web/mail/lib/lang/se_mail_domain_list.lng
index c6074c5..96120f5 100644
--- a/interface/web/mail/lib/lang/se_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/se_mail_domain_list.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Epost Domäner';
+$wb['list_head_txt'] = 'Epostdomäner';
 $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domän';
-$wb['add_new_record_txt'] = 'Add new Domain';
-$wb['active_txt'] = 'Active';
+$wb['add_new_record_txt'] = 'Lägg till ny domän';
+$wb['active_txt'] = 'Aktiv';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_forward.lng b/interface/web/mail/lib/lang/se_mail_forward.lng
index a6fb4ee..511e0b6 100644
--- a/interface/web/mail/lib/lang/se_mail_forward.lng
+++ b/interface/web/mail/lib/lang/se_mail_forward.lng
@@ -1,9 +1,10 @@
 <?php
 $wb['email_txt'] = 'Epost';
-$wb['destination_txt'] = 'Mottagande Epost';
+$wb['destination_txt'] = 'Mottagande epost';
 $wb['active_txt'] = 'Aktiv';
-$wb['limit_mailforward_txt'] = 'The max. number of email forwarders for your account is reached.';
-$wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email address';
-$wb['domain_txt'] = 'Domain';
-$wb['source_txt'] = 'Source Email';
+$wb['limit_mailforward_txt'] = 'Det maximala antalet vidarebefordringar för ditt konto är uppnått.';
+$wb['duplicate_mailbox_txt'] = 'Det finns redan ett epostkonto med denna adress';
+$wb['domain_txt'] = 'Domän';
+$wb['source_txt'] = 'Källadress';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_forward_list.lng b/interface/web/mail/lib/lang/se_mail_forward_list.lng
index aafd4e4..f271306 100644
--- a/interface/web/mail/lib/lang/se_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/se_mail_forward_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Epost Skicka vidare';
+$wb['list_head_txt'] = 'Epost vidarebefordran';
 $wb['active_txt'] = 'Aktiv';
 $wb['email_txt'] = 'Epost';
 $wb['destination_txt'] = 'Mottagare';
-$wb['add_new_record_txt'] = 'Lägg till ny Skicka vidare';
-$wb['source_txt'] = 'source';
+$wb['add_new_record_txt'] = 'Lägg till ny vidarebefordran';
+$wb['source_txt'] = 'källa';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_get.lng b/interface/web/mail/lib/lang/se_mail_get.lng
index 8ae7712..f15208c 100644
--- a/interface/web/mail/lib/lang/se_mail_get.lng
+++ b/interface/web/mail/lib/lang/se_mail_get.lng
@@ -1,19 +1,20 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['type_txt'] = 'Type';
-$wb['source_server_txt'] = 'Pop3/Imap Server';
-$wb['source_username_txt'] = 'Username';
-$wb['source_password_txt'] = 'Password';
-$wb['source_delete_txt'] = 'Delete emails after retrieval';
+$wb['type_txt'] = 'Typ';
+$wb['source_server_txt'] = 'POP3-/Imapserver';
+$wb['source_username_txt'] = 'Användarnamn';
+$wb['source_password_txt'] = 'Lösenord';
+$wb['source_delete_txt'] = 'Radera epost efter hämtning';
 $wb['destination_txt'] = 'Destination';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktiv';
 $wb['limit_fetchmail_txt'] = 'The max. number of Fetchmail records for your account is reached.';
-$wb['source_server_error_isempty'] = 'Server is empty.';
-$wb['source_username_error_isempty'] = 'Username is empty.';
-$wb['source_password_error_isempty'] = 'Password is empty.';
-$wb['destination_error_isemail'] = 'No destination selected.';
-$wb['source_server_error_regex'] = 'Pop3/Imap Server is not a valid domain name.';
-$wb['source_read_all_txt'] = 'Retrieve all emails (incl. read mails)';
-$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use \\"Delete emails after retrieval\\" = no together with \\"Retrieve all emails\\" = yes';
-$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
+$wb['source_server_error_isempty'] = 'Serverfältet är tomt.';
+$wb['source_username_error_isempty'] = 'Användarnamn är tomt.';
+$wb['source_password_error_isempty'] = 'Lösenord är tomt.';
+$wb['destination_error_isemail'] = 'Ingen destination vald.';
+$wb['source_server_error_regex'] = 'POP3-/Imapserver är inte ett giltigt domännamn.';
+$wb['source_read_all_txt'] = 'Hämta all epost (även läst epost)';
+$wb['error_delete_read_all_combination'] = 'Illegal combination of options. You can not use "Delete emails after retrieval" = no together with "Retrieve all emails" = yes';
+$wb['source_delete_note_txt'] = 'Vänligen kontrollera först om eposthämtning fungerar innan du aktiverar detta val..';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_get_list.lng b/interface/web/mail/lib/lang/se_mail_get_list.lng
index 4baf67e..0d06cad 100644
--- a/interface/web/mail/lib/lang/se_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/se_mail_get_list.lng
@@ -1,9 +1,10 @@
 <?php
-$wb['list_head_txt'] = 'Fetch emails from external POP3 / IMAP servers';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Hämta epost från externa POP3- / IMAP-servrar';
+$wb['active_txt'] = 'Aktiv';
 $wb['server_id_txt'] = 'Server';
-$wb['source_server_txt'] = 'External Server';
-$wb['source_username_txt'] = 'Username';
+$wb['source_server_txt'] = 'Extern server';
+$wb['source_username_txt'] = 'Användarnamn';
 $wb['destination_txt'] = 'Destination';
-$wb['add_new_record_txt'] = 'Add new Account';
+$wb['add_new_record_txt'] = 'Lägg till nytt konto';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_mailinglist.lng b/interface/web/mail/lib/lang/se_mail_mailinglist.lng
index b4570ef..68a7130 100644
--- a/interface/web/mail/lib/lang/se_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/se_mail_mailinglist.lng
@@ -1,22 +1,23 @@
 <?php
-$wb['limit_mailmailinglist_txt'] = 'Limit reached';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['listname_error_empty'] = 'Listname is empty.';
-$wb['domain_error_regex'] = 'Invalid domain name.';
-$wb['email_in_use_txt'] = 'Email is in use';
-$wb['no_domain_perm'] = 'You have no permission for this domain.';
-$wb['password_strength_txt'] = 'Password strength';
+$wb['limit_mailmailinglist_txt'] = 'Gränsen nådd';
+$wb['domain_error_empty'] = 'Domänfältet är tomt.';
+$wb['listname_error_empty'] = 'Listnamnfältet är tomt.';
+$wb['domain_error_regex'] = 'Ogiltigt domännamn.';
+$wb['email_in_use_txt'] = 'Epostadressen används redan';
+$wb['no_domain_perm'] = 'Du har inte rättigheter för denna domän.';
+$wb['password_strength_txt'] = 'Lösenordsstyrka';
 $wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['listname_txt'] = 'Listname';
-$wb['client_txt'] = 'Client';
-$wb['email_txt'] = 'Email';
-$wb['password_txt'] = 'Password';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['domain_txt'] = 'Domän';
+$wb['listname_txt'] = 'Listnamn';
+$wb['client_txt'] = 'Kund';
+$wb['email_txt'] = 'Epost';
+$wb['password_txt'] = 'Lösenord';
+$wb['generate_password_txt'] = 'Generera lösenord';
+$wb['repeat_password_txt'] = 'Upprepa lösenord';
+$wb['password_mismatch_txt'] = 'Lösenorden matchar inte';
+$wb['password_match_txt'] = 'Lösenorden matchar';
 $wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.';
-$wb['email_error_isemail'] = 'Email address is invalid.';
-$wb['mailinglist_txt'] = 'Mailing list';
+$wb['email_error_isemail'] = 'Epostadressen är ogiltig';
+$wb['mailinglist_txt'] = 'Epostlista';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/se_mail_mailinglist_list.lng
index dac225a..11a82be 100644
--- a/interface/web/mail/lib/lang/se_mail_mailinglist_list.lng
+++ b/interface/web/mail/lib/lang/se_mail_mailinglist_list.lng
@@ -1,5 +1,6 @@
 <?php
-$wb['list_head_txt'] = 'Mailing List';
-$wb['domain_txt'] = 'Domain';
-$wb['listname_txt'] = 'Listname';
+$wb['list_head_txt'] = 'Epostlista';
+$wb['domain_txt'] = 'Domän';
+$wb['listname_txt'] = 'Listnamn';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_relay_recipient.lng b/interface/web/mail/lib/lang/se_mail_relay_recipient.lng
index b5c8724..ffb64ad 100644
--- a/interface/web/mail/lib/lang/se_mail_relay_recipient.lng
+++ b/interface/web/mail/lib/lang/se_mail_relay_recipient.lng
@@ -1,9 +1,10 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['source_txt'] = 'Relay recipient';
-$wb['recipient_txt'] = 'Recipient';
-$wb['active_txt'] = 'Active';
-$wb['source_error_notempty'] = 'Address is empty.';
-$wb['type_txt'] = 'Type';
-$wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.';
+$wb['source_txt'] = 'Relämottagare';
+$wb['recipient_txt'] = 'Mottagare';
+$wb['active_txt'] = 'Aktiv';
+$wb['source_error_notempty'] = 'Adressfältet är tomt.';
+$wb['type_txt'] = 'Typ';
+$wb['limit_mailfilter_txt'] = 'Det maximala antalet epostfilter för ditt konto är uppnått.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/se_mail_relay_recipient_list.lng
index 36045f4..4c34ebf 100644
--- a/interface/web/mail/lib/lang/se_mail_relay_recipient_list.lng
+++ b/interface/web/mail/lib/lang/se_mail_relay_recipient_list.lng
@@ -1,9 +1,10 @@
 <?php
-$wb['list_head_txt'] = 'Relay recipients';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Relämottagare';
+$wb['active_txt'] = 'Aktiv';
 $wb['server_id_txt'] = 'Server';
-$wb['source_txt'] = 'Recipient address';
-$wb['recipient_txt'] = 'Recipient';
-$wb['add_new_record_txt'] = 'Add new relay recipient';
-$wb['access_txt'] = 'access';
+$wb['source_txt'] = 'Mottagaradress';
+$wb['recipient_txt'] = 'Mottagare';
+$wb['add_new_record_txt'] = 'Lägg till ny relämottagare';
+$wb['access_txt'] = 'åtkomst';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_spamfilter.lng b/interface/web/mail/lib/lang/se_mail_spamfilter.lng
index e0a2a2f..3080425 100644
--- a/interface/web/mail/lib/lang/se_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/se_mail_spamfilter.lng
@@ -1,17 +1,18 @@
 <?php
-$wb['email_txt'] = 'Email';
-$wb['spam_rewrite_score_int_txt'] = 'Rewrite score';
-$wb['spam_redirect_score_int_txt'] = 'Redirect score';
-$wb['spam_delete_score_int_txt'] = 'Delete score';
-$wb['spam_rewrite_subject_txt'] = 'Rewrite subject';
-$wb['spam_redirect_maildir_txt'] = 'Redirect mailbox';
-$wb['active_txt'] = 'Active';
-$wb['spam_rewrite_txt'] = 'Rewrite email subject above this score.';
-$wb['spam_redirect_txt'] = 'Redirect email above this score to the selected mailbox.';
-$wb['spam_delete_txt'] = 'Delete email above this score.';
-$wb['disable_txt'] = 'Hint: To disable a filtering option, set the score to 0.00.';
-$wb['email_error_isemail'] = 'Email address is invalid.';
-$wb['email_error_unique'] = 'There is already an spamfilter record for this email address.';
-$wb['spam_redirect_maildir_purge_txt'] = 'Purge Maildir after';
-$wb['days_txt'] = 'Days.';
+$wb['email_txt'] = 'Epost';
+$wb['spam_rewrite_score_int_txt'] = 'Poäng för omskrivning';
+$wb['spam_redirect_score_int_txt'] = 'Poäng för omdirigering';
+$wb['spam_delete_score_int_txt'] = 'Poäng för radering';
+$wb['spam_rewrite_subject_txt'] = 'Omskrivningsämne';
+$wb['spam_redirect_maildir_txt'] = 'Omdirigeringskatalog';
+$wb['active_txt'] = 'Aktiv';
+$wb['spam_rewrite_txt'] = 'Skriv om ämnesraden om högre än denna poäng';
+$wb['spam_redirect_txt'] = 'Leverera till katalog om högre än denna poäng';
+$wb['spam_delete_txt'] = 'Radera epost om högre än denna poäng';
+$wb['disable_txt'] = 'Tips: För att avaktivera ett filteralternativ, sätt poängen till 0.00';
+$wb['email_error_isemail'] = 'Epostadressen är ogiltig';
+$wb['email_error_unique'] = 'Det finns redan ett spamfilterinlägg för den här domänen';
+$wb['spam_redirect_maildir_purge_txt'] = 'Töm mappen efter';
+$wb['days_txt'] = 'Dagar';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/se_mail_spamfilter_list.lng
index 728f3d3..407d516 100644
--- a/interface/web/mail/lib/lang/se_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/se_mail_spamfilter_list.lng
@@ -1,8 +1,9 @@
 <?php
 $wb['list_head_txt'] = 'Spamfilter';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Aktiv';
 $wb['server_id_txt'] = 'Server';
-$wb['server_name_txt'] = 'server_name';
-$wb['email_txt'] = 'Email';
-$wb['add_new_record_txt'] = 'Add new Spamfilter record';
+$wb['server_name_txt'] = 'servernamn';
+$wb['email_txt'] = 'Epost';
+$wb['add_new_record_txt'] = 'Lägg till nytt spamfilter';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_transport.lng b/interface/web/mail/lib/lang/se_mail_transport.lng
index c249863..198f807 100644
--- a/interface/web/mail/lib/lang/se_mail_transport.lng
+++ b/interface/web/mail/lib/lang/se_mail_transport.lng
@@ -1,11 +1,12 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
+$wb['domain_txt'] = 'Domän';
 $wb['destination_txt'] = 'Destination';
-$wb['type_txt'] = 'Type';
-$wb['mx_txt'] = 'No MX lookup';
-$wb['sort_order_txt'] = 'Sort by';
-$wb['active_txt'] = 'Active';
-$wb['limit_mailrouting_txt'] = 'The max. number of routes for your account is reached.';
+$wb['type_txt'] = 'Typ';
+$wb['mx_txt'] = 'Inget MX-uppslag';
+$wb['sort_order_txt'] = 'Sortera på';
+$wb['active_txt'] = 'Aktiv';
+$wb['limit_mailrouting_txt'] = 'Det maximala antalet epostrutter för ditt konto är uppnått.';
 $wb['transport_txt'] = 'Transport';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_transport_list.lng b/interface/web/mail/lib/lang/se_mail_transport_list.lng
index a96c081..63474a8 100644
--- a/interface/web/mail/lib/lang/se_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/se_mail_transport_list.lng
@@ -1,9 +1,10 @@
 <?php
-$wb['list_head_txt'] = 'Advanced Email Routing';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Avancerad epostroutning';
+$wb['active_txt'] = 'Aktiv';
 $wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
+$wb['domain_txt'] = 'Domän';
 $wb['transport_txt'] = 'Transport';
-$wb['sort_order_txt'] = 'Sort by';
-$wb['add_new_record_txt'] = 'Add new transport';
+$wb['sort_order_txt'] = 'Sortera på';
+$wb['add_new_record_txt'] = 'Lägg till ny transport';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_user.lng b/interface/web/mail/lib/lang/se_mail_user.lng
index b6c5391..62be339 100644
--- a/interface/web/mail/lib/lang/se_mail_user.lng
+++ b/interface/web/mail/lib/lang/se_mail_user.lng
@@ -1,42 +1,42 @@
 <?php
 $wb['custom_mailfilter_txt'] = 'Custom mail filter recipe';
-$wb['email_txt'] = 'Email';
-$wb['cryptpwd_txt'] = 'Password';
-$wb['password_strength_txt'] = 'Password strength';
-$wb['active_txt'] = 'Active';
-$wb['email_error_isemail'] = 'Email address is invalid.';
-$wb['email_error_unique'] = 'Duplicate Email address.';
+$wb['email_txt'] = 'Epost';
+$wb['cryptpwd_txt'] = 'Lösenord';
+$wb['password_strength_txt'] = 'Lösenordsstyrka';
+$wb['active_txt'] = 'Aktiv';
+$wb['email_error_isemail'] = 'Epostadressen är ogiltig';
+$wb['email_error_unique'] = 'Epostadressen finns redan';
 $wb['autoresponder_text_txt'] = 'Text';
-$wb['autoresponder_txt'] = 'Autoresponder';
-$wb['no_domain_perm'] = 'You have no permission for this domain.';
-$wb['error_no_pwd'] = 'Password is empty.';
-$wb['quota_error_isint'] = 'Mailbox size must be a number.';
-$wb['quota_txt'] = 'quota in MB';
-$wb['server_id_txt'] = 'server_id';
-$wb['password_txt'] = 'password';
+$wb['autoresponder_txt'] = 'Autosvar';
+$wb['no_domain_perm'] = 'Du har inga rättigheter för denna domän.';
+$wb['error_no_pwd'] = 'Lösenordet är tomt.';
+$wb['quota_error_isint'] = 'Epostkontots kvot måste vara en siffra.';
+$wb['quota_txt'] = 'kvot i MB';
+$wb['server_id_txt'] = 'server-id';
+$wb['password_txt'] = 'lösenord';
 $wb['maildir_txt'] = 'maildir';
-$wb['postfix_txt'] = 'Enable Receiving';
-$wb['access_txt'] = 'Enable Access';
+$wb['postfix_txt'] = 'Aktivera mottagning';
+$wb['access_txt'] = 'Aktivera åtkomst';
 $wb['policy_txt'] = 'Spamfilter';
-$wb['no_policy'] = '- not enabled -';
+$wb['no_policy'] = '- ej aktiverat -';
 $wb['limit_mailbox_txt'] = 'The max. number of mailboxes for your account is reached.';
 $wb['limit_mailquota_txt'] = 'The max space for mailboxes is reached. The max. available space in MB is';
-$wb['disableimap_txt'] = 'Disable IMAP';
-$wb['disablepop3_txt'] = 'Disable POP3';
-$wb['duplicate_alias_or_forward_txt'] = 'There is already an alias or forwrd with this email address.';
+$wb['disableimap_txt'] = 'Avaktivera IMAP';
+$wb['disablepop3_txt'] = 'Avaktivera POP3';
+$wb['duplicate_alias_or_forward_txt'] = 'There is already an alias or forward with this email address.';
 $wb['quota_error_value'] = 'Invalid quota value. Allowed values are: 0 for unlimited or numbers > 1';
-$wb['autoresponder_start_date_txt'] = 'Start on';
-$wb['autoresponder_start_date_ispast'] = 'Start date cannot be in the past.';
-$wb['autoresponder_end_date_txt'] = 'End by';
+$wb['autoresponder_start_date_txt'] = 'Starta den';
+$wb['autoresponder_start_date_ispast'] = 'Startdatum kan inte vara i det förflutna.';
+$wb['autoresponder_end_date_txt'] = 'Sluta den';
 $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['move_junk_txt'] = 'FLytta spamepost till spammappen';
+$wb['name_txt'] = 'Riktigt namn';
+$wb['name_optional_txt'] = '(Frivilligt)';
+$wb['autoresponder_active'] = 'Aktivera autosvaret';
+$wb['cc_txt'] = 'Skicka kopia till';
 $wb['cc_error_isemail'] = 'The Send copy to field does not conatin a valid email address';
-$wb['domain_txt'] = 'Domain';
-$wb['now_txt'] = 'Now';
+$wb['domain_txt'] = 'Domän';
+$wb['now_txt'] = 'Nu';
 $wb['login_error_unique'] = 'Login is already taken.';
 $wb['login_error_regex'] = 'Valid characters are A-Z, a-z, 0-9, ., _ and -.';
 $wb['login_txt'] = 'Login (optional)';
@@ -51,3 +51,4 @@
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
 $wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_user_filter.lng b/interface/web/mail/lib/lang/se_mail_user_filter.lng
index 2e74ffd..ed9574f 100644
--- a/interface/web/mail/lib/lang/se_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/se_mail_user_filter.lng
@@ -1,20 +1,21 @@
 <?php
-$wb['rulename_txt'] = 'Name';
-$wb['action_txt'] = 'Action';
-$wb['target_txt'] = 'Folder';
-$wb['active_txt'] = 'Active';
-$wb['rulename_error_empty'] = 'Name is empty.';
-$wb['searchterm_is_empty'] = 'Search term is empty.';
-$wb['source_txt'] = 'Source';
-$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
-$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
-$wb['subject_txt'] = 'Subject';
-$wb['from_txt'] = 'From';
-$wb['to_txt'] = 'To';
-$wb['contains_txt'] = 'Contains';
-$wb['is_txt'] = 'Is';
-$wb['begins_with_txt'] = 'Begins with';
-$wb['ends_with_txt'] = 'Ends with';
-$wb['move_to_txt'] = 'Move to';
-$wb['delete_txt'] = 'Delete';
+$wb['rulename_txt'] = 'Namn';
+$wb['action_txt'] = 'Händelse';
+$wb['target_txt'] = 'Katalog';
+$wb['active_txt'] = 'Aktiv';
+$wb['rulename_error_empty'] = 'Namnfältet är tomt.';
+$wb['searchterm_is_empty'] = 'Söktermen är tomt.';
+$wb['source_txt'] = 'Källa';
+$wb['target_error_regex'] = 'Målet får endast innehålla dessa tecken: a-z, 0-9, -, ., _, och {mellanslag}';
+$wb['limit_mailfilter_txt'] = 'Det maximala antalet epostfilter är uppnått.';
+$wb['subject_txt'] = 'Ämne';
+$wb['from_txt'] = 'Från';
+$wb['to_txt'] = 'Till';
+$wb['contains_txt'] = 'Innehåller';
+$wb['is_txt'] = 'Är';
+$wb['begins_with_txt'] = 'Börjar med';
+$wb['ends_with_txt'] = 'Slutar med';
+$wb['move_to_txt'] = 'Flytta till';
+$wb['delete_txt'] = 'Radera';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_user_filter_list.lng b/interface/web/mail/lib/lang/se_mail_user_filter_list.lng
index 2754259..7825393 100644
--- a/interface/web/mail/lib/lang/se_mail_user_filter_list.lng
+++ b/interface/web/mail/lib/lang/se_mail_user_filter_list.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['rulename_txt'] = 'Name';
-$wb['add_new_record_txt'] = 'Add new Filter';
-$wb['page_txt'] = 'Page';
-$wb['page_of_txt'] = 'of';
-$wb['delete_confirmation'] = 'Do you really want to Delete the mailfilter?';
+$wb['rulename_txt'] = 'Namn';
+$wb['add_new_record_txt'] = 'Lägg till nytt filter';
+$wb['page_txt'] = 'Sida';
+$wb['page_of_txt'] = 'av';
+$wb['delete_confirmation'] = 'Vill du verkligen radera epostfiltret?';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_user_list.lng b/interface/web/mail/lib/lang/se_mail_user_list.lng
index 3417eaa..f18bc71 100644
--- a/interface/web/mail/lib/lang/se_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/se_mail_user_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Mailbox';
-$wb['email_txt'] = 'Email';
-$wb['autoresponder_txt'] = 'Autoresponder';
-$wb['add_new_record_txt'] = 'Add new Mailbox';
-$wb['name_txt'] = 'Realname';
-$wb['login_txt'] = 'Login';
+$wb['list_head_txt'] = 'Epostkonto';
+$wb['email_txt'] = 'Epost';
+$wb['autoresponder_txt'] = 'Autosvar';
+$wb['add_new_record_txt'] = 'Lägg till nytt epostkonto';
+$wb['name_txt'] = 'Riktigt namn';
+$wb['login_txt'] = 'Logga in';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_user_stats_list.lng b/interface/web/mail/lib/lang/se_mail_user_stats_list.lng
index edde65b..1bec4d4 100644
--- a/interface/web/mail/lib/lang/se_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/se_mail_user_stats_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Mail traffic';
-$wb['email_txt'] = 'Email';
-$wb['this_month_txt'] = 'This month';
-$wb['last_month_txt'] = 'Last month';
-$wb['this_year_txt'] = 'This year';
-$wb['last_year_txt'] = 'Last year';
+$wb['list_head_txt'] = 'Eposttrafik';
+$wb['email_txt'] = 'Epost';
+$wb['this_month_txt'] = 'Denna månad';
+$wb['last_month_txt'] = 'Föregående månad';
+$wb['this_year_txt'] = 'I år';
+$wb['last_year_txt'] = 'Föregående år';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_whitelist.lng b/interface/web/mail/lib/lang/se_mail_whitelist.lng
index 355f8be..40eaf86 100644
--- a/interface/web/mail/lib/lang/se_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/se_mail_whitelist.lng
@@ -1,9 +1,10 @@
 <?php
 $wb['server_id_txt'] = 'Server';
 $wb['active_txt'] = 'Aktiv';
-$wb['source_txt'] = 'Witelist Address';
-$wb['recipient_txt'] = 'Recipient';
-$wb['source_error_notempty'] = 'Address is empty.';
-$wb['type_txt'] = 'Type';
-$wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.';
+$wb['source_txt'] = 'Vitlista adress';
+$wb['recipient_txt'] = 'Mottagare';
+$wb['source_error_notempty'] = 'Adressen är tom.';
+$wb['type_txt'] = 'Typ';
+$wb['limit_mailfilter_txt'] = 'Maximala antalet epostfilter för ditt konto är uppnått.';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_mail_whitelist_list.lng b/interface/web/mail/lib/lang/se_mail_whitelist_list.lng
index 5e5cca7..a9f52a8 100644
--- a/interface/web/mail/lib/lang/se_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/se_mail_whitelist_list.lng
@@ -1,10 +1,11 @@
 <?php
-$wb['list_head_txt'] = 'Epost Whitelist';
+$wb['list_head_txt'] = 'Vitlistning epost';
 $wb['server_id_txt'] = 'Server';
-$wb['add_new_record_txt'] = 'Lägg till ny Whitelist epostadress';
-$wb['active_txt'] = 'Active';
-$wb['source_txt'] = 'Whitelisted address';
-$wb['type_txt'] = 'Type';
-$wb['recipient_txt'] = 'Recipient';
-$wb['access_txt'] = 'access';
+$wb['add_new_record_txt'] = 'Lägg till ny vitlistad epostadress';
+$wb['active_txt'] = 'Aktiv';
+$wb['source_txt'] = 'Vitlistad adress';
+$wb['type_txt'] = 'Typ';
+$wb['recipient_txt'] = 'Mottagare';
+$wb['access_txt'] = 'åtkomst';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/se_spamfilter_blacklist.lng
index 908b95f..2839c6c 100644
--- a/interface/web/mail/lib/lang/se_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/se_spamfilter_blacklist.lng
@@ -1,12 +1,13 @@
 <?php
 $wb['server_id_txt'] = 'Server';
 $wb['wb_txt'] = 'wb';
-$wb['rid_txt'] = 'User';
-$wb['email_txt'] = 'Email';
-$wb['priority_txt'] = 'Priority';
-$wb['active_txt'] = 'Active';
+$wb['rid_txt'] = 'Användare';
+$wb['email_txt'] = 'Epost';
+$wb['priority_txt'] = 'Prioritet';
+$wb['active_txt'] = 'Aktiv';
 $wb['limit_spamfilter_wblist_txt'] = 'The max. number of White- or Blacklist records for your account is reached.';
-$wb['10 - highest'] = '10 - highest';
+$wb['10 - highest'] = '10 - högsta';
 $wb['5 - medium'] = '5 - medium';
-$wb['1 - lowest'] = '1 - lowest';
+$wb['1 - lowest'] = '1 - lägsta';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/se_spamfilter_blacklist_list.lng
index 1b17e64..edf0842 100644
--- a/interface/web/mail/lib/lang/se_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/se_spamfilter_blacklist_list.lng
@@ -1,9 +1,10 @@
 <?php
-$wb['list_head_txt'] = 'Spamfilter Blacklist';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Spamfilter svartlistning';
+$wb['active_txt'] = 'Aktiv';
 $wb['server_id_txt'] = 'Server';
-$wb['priority_txt'] = 'Priority';
-$wb['rid_txt'] = 'User';
-$wb['email_txt'] = 'Whitelisted Email';
-$wb['add_new_record_txt'] = 'Add Blacklist record';
+$wb['priority_txt'] = 'Prioritet';
+$wb['rid_txt'] = 'Användare';
+$wb['email_txt'] = 'Vitlistad epostadress';
+$wb['add_new_record_txt'] = 'Lägg till svartlistning';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_spamfilter_config.lng b/interface/web/mail/lib/lang/se_spamfilter_config.lng
index 2843133..ebfedb3 100644
--- a/interface/web/mail/lib/lang/se_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/se_spamfilter_config.lng
@@ -1,11 +1,11 @@
 <?php
 $wb['getmail_config_dir_txt'] = 'Getmail Config Path';
-$wb['ip_address_txt'] = 'IP Address';
-$wb['netmask_txt'] = 'Netmask';
+$wb['ip_address_txt'] = 'IP A-a';
+$wb['netmask_txt'] = 'Nätmask';
 $wb['gateway_txt'] = 'Gateway';
 $wb['hostname_txt'] = 'Hostname';
-$wb['nameservers_txt'] = 'Nameservers';
-$wb['module_txt'] = 'Server Module';
+$wb['nameservers_txt'] = 'Namnservrar';
+$wb['module_txt'] = 'Servermodul';
 $wb['maildir_path_txt'] = 'Maildir Path';
 $wb['homedir_path_txt'] = 'Homedir Path';
 $wb['mailuser_uid_txt'] = 'Mailuser UID';
@@ -18,3 +18,4 @@
 $wb['mailbox_size_limit_txt'] = 'Mailbox Size Limit';
 $wb['message_size_limit_txt'] = 'Message Size Limit';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_spamfilter_config_list.lng b/interface/web/mail/lib/lang/se_spamfilter_config_list.lng
index 70e49e2..52b398b 100644
--- a/interface/web/mail/lib/lang/se_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/se_spamfilter_config_list.lng
@@ -1,5 +1,6 @@
 <?php
-$wb['list_head_txt'] = 'Server Configuration';
+$wb['list_head_txt'] = 'Serverkonfiguration';
 $wb['server_name_txt'] = 'Server';
 $wb['server_id_txt'] = 'server_id';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_spamfilter_policy.lng b/interface/web/mail/lib/lang/se_spamfilter_policy.lng
index e876330..d5a429b 100644
--- a/interface/web/mail/lib/lang/se_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/se_spamfilter_policy.lng
@@ -36,3 +36,4 @@
 $wb['message_size_limit_txt'] = 'Message size limit';
 $wb['banned_rulenames_txt'] = 'Banned rulenames';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/se_spamfilter_policy_list.lng
index 04491ae..da678a4 100644
--- a/interface/web/mail/lib/lang/se_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/se_spamfilter_policy_list.lng
@@ -7,3 +7,4 @@
 $wb['bad_header_lover_txt'] = 'Bad Header lover';
 $wb['add_new_record_txt'] = 'Add Policy record';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_spamfilter_users.lng b/interface/web/mail/lib/lang/se_spamfilter_users.lng
index efe95b5..babb304 100644
--- a/interface/web/mail/lib/lang/se_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/se_spamfilter_users.lng
@@ -1,13 +1,14 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['priority_txt'] = 'Priority';
+$wb['priority_txt'] = 'Prioritet';
 $wb['policy_id_txt'] = 'Policy';
-$wb['email_txt'] = 'Email (Pattern)';
-$wb['fullname_txt'] = 'Name';
-$wb['local_txt'] = 'Local';
-$wb['email_error_notempty'] = 'The email address must not be empty.';
-$wb['fullname_error_notempty'] = 'The name must not be empty.';
-$wb['10 - highest'] = '10 - highest';
+$wb['email_txt'] = 'Epost (Mönster)';
+$wb['fullname_txt'] = 'Namn';
+$wb['local_txt'] = 'Lokal';
+$wb['email_error_notempty'] = 'Fältet för epostadress kan inte vara tomt..';
+$wb['fullname_error_notempty'] = 'Fältet för namn kan inte vara tomt.';
+$wb['10 - highest'] = '10 - högsta';
 $wb['5 - medium'] = '5 - medium';
-$wb['1 - lowest'] = '1 - lowest';
+$wb['1 - lowest'] = '1 - lägsta';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_spamfilter_users_list.lng b/interface/web/mail/lib/lang/se_spamfilter_users_list.lng
index ed3d7a3..830ac39 100644
--- a/interface/web/mail/lib/lang/se_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/se_spamfilter_users_list.lng
@@ -1,10 +1,11 @@
 <?php
-$wb['list_head_txt'] = 'Spamfilter Users';
-$wb['local_txt'] = 'Local';
+$wb['list_head_txt'] = 'Spamfilteranvändare';
+$wb['local_txt'] = 'Lokal';
 $wb['server_id_txt'] = 'Server';
-$wb['priority_txt'] = 'Priority';
+$wb['priority_txt'] = 'Prioritet';
 $wb['policy_id_txt'] = 'Policy';
-$wb['fullname_txt'] = 'Name';
-$wb['email_txt'] = 'Email';
-$wb['add_new_record_txt'] = 'Add Spamfilter User';
+$wb['fullname_txt'] = 'Namn';
+$wb['email_txt'] = 'Epost';
+$wb['add_new_record_txt'] = 'Lägg till spamfilteranvändare';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/se_spamfilter_whitelist.lng
index 908b95f..2839c6c 100644
--- a/interface/web/mail/lib/lang/se_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/se_spamfilter_whitelist.lng
@@ -1,12 +1,13 @@
 <?php
 $wb['server_id_txt'] = 'Server';
 $wb['wb_txt'] = 'wb';
-$wb['rid_txt'] = 'User';
-$wb['email_txt'] = 'Email';
-$wb['priority_txt'] = 'Priority';
-$wb['active_txt'] = 'Active';
+$wb['rid_txt'] = 'Användare';
+$wb['email_txt'] = 'Epost';
+$wb['priority_txt'] = 'Prioritet';
+$wb['active_txt'] = 'Aktiv';
 $wb['limit_spamfilter_wblist_txt'] = 'The max. number of White- or Blacklist records for your account is reached.';
-$wb['10 - highest'] = '10 - highest';
+$wb['10 - highest'] = '10 - högsta';
 $wb['5 - medium'] = '5 - medium';
-$wb['1 - lowest'] = '1 - lowest';
+$wb['1 - lowest'] = '1 - lägsta';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/se_spamfilter_whitelist_list.lng
index d209d17..00185a0 100644
--- a/interface/web/mail/lib/lang/se_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/se_spamfilter_whitelist_list.lng
@@ -1,9 +1,10 @@
 <?php
-$wb['list_head_txt'] = 'Spamfilter Whitelist';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Spamfilter vitlistning';
+$wb['active_txt'] = 'Aktiv';
 $wb['server_id_txt'] = 'Server';
-$wb['priority_txt'] = 'Priority';
-$wb['rid_txt'] = 'User';
-$wb['email_txt'] = 'Whitelisted Email';
-$wb['add_new_record_txt'] = 'Add Whitelist record';
+$wb['priority_txt'] = 'Prioritet';
+$wb['rid_txt'] = 'Användare';
+$wb['email_txt'] = 'Vitlistad epostadress';
+$wb['add_new_record_txt'] = 'Lägg till vitlistning';
 ?>
+
diff --git a/interface/web/mail/lib/lang/se_user_quota_stats_list.lng b/interface/web/mail/lib/lang/se_user_quota_stats_list.lng
index 394e97c..380cf5b 100755
--- a/interface/web/mail/lib/lang/se_user_quota_stats_list.lng
+++ b/interface/web/mail/lib/lang/se_user_quota_stats_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Mailbox quota';
-$wb['quota_txt'] = 'Quota';
-$wb['name_txt'] = 'Name';
-$wb['email_txt'] = 'Email Address';
-$wb['used_txt'] = 'Used space';
-$wb['percentage_txt'] = 'Used %';
+$wb['list_head_txt'] = 'Epostkontots kvot';
+$wb['quota_txt'] = 'Kvot';
+$wb['name_txt'] = 'Namn';
+$wb['email_txt'] = 'Epostadress';
+$wb['used_txt'] = 'Använt utrymme';
+$wb['percentage_txt'] = 'Använt %';
 ?>
+
diff --git a/interface/web/mailuser/lib/lang/se.lng b/interface/web/mailuser/lib/lang/se.lng
index 114dec9..f9e6f5b 100644
--- a/interface/web/mailuser/lib/lang/se.lng
+++ b/interface/web/mailuser/lib/lang/se.lng
@@ -1,9 +1,10 @@
 <?php
-$wb['Email Account'] = 'Email Account';
-$wb['Overview'] = 'Overview';
-$wb['Password'] = 'Password';
-$wb['Autoresponder'] = 'Autoresponder';
-$wb['Send copy'] = 'Send copy';
+$wb['Email Account'] = 'Epostkonto';
+$wb['Overview'] = 'Översikt';
+$wb['Password'] = 'Lösenord';
+$wb['Autoresponder'] = 'Autosvar';
+$wb['Send copy'] = 'Skicka kopia';
 $wb['Spamfilter'] = 'Spamfilter';
-$wb['Email Filters'] = 'Email Filters';
+$wb['Email Filters'] = 'Epostfilter';
 ?>
+
diff --git a/interface/web/mailuser/lib/lang/se_index.lng b/interface/web/mailuser/lib/lang/se_index.lng
index 29fe9ea..a23c6a6 100644
--- a/interface/web/mailuser/lib/lang/se_index.lng
+++ b/interface/web/mailuser/lib/lang/se_index.lng
@@ -1,12 +1,13 @@
 <?php
-$wb['page_head_txt'] = 'Mailbox settings';
-$wb['page_desc_txt'] = 'Here you can edit the settings for the email account.';
-$wb['email_txt'] = 'Email address';
-$wb['login_txt'] = 'Login';
-$wb['server_address_txt'] = 'Mailserver address';
-$wb['cc_txt'] = 'Send copy to (CC)';
-$wb['quota_txt'] = 'Mailbox size';
-$wb['unlimited_txt'] = 'Unlimited';
+$wb['page_head_txt'] = 'Inställningar epostkonto';
+$wb['page_desc_txt'] = 'Här kan du redigera inställningar för epostkontot.';
+$wb['email_txt'] = 'Epostadress';
+$wb['login_txt'] = 'Logga in';
+$wb['server_address_txt'] = 'Epostserverns adress';
+$wb['cc_txt'] = 'Skicka kopia till (CC)';
+$wb['quota_txt'] = 'Epostkontots strlek';
+$wb['unlimited_txt'] = 'Obegränsat';
 $wb['mb_txt'] = 'MB';
-$wb['none_txt'] = 'None';
+$wb['none_txt'] = 'Inget';
 ?>
+
diff --git a/interface/web/mailuser/lib/lang/se_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/se_mail_user_autoresponder.lng
index 79f386a..9429978 100644
--- a/interface/web/mailuser/lib/lang/se_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/se_mail_user_autoresponder.lng
@@ -1,13 +1,14 @@
 <?php
-$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
-$wb['autoresponder_subject'] = 'Out of office reply';
+$wb['mailbox_autoresponder_txt'] = 'Autosvar';
+$wb['autoresponder_subject'] = 'Out of office-svar';
 $wb['autoresponder_text_txt'] = 'Text';
-$wb['autoresponder_txt'] = 'Active';
-$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['autoresponder_active'] = 'Enable the autoresponder';
-$wb['now_txt'] = 'Now';
-$wb['autoresponder_subject_txt'] = 'Betreff';
+$wb['autoresponder_txt'] = 'Aktiv';
+$wb['autoresponder_start_date_txt'] = 'Starta den';
+$wb['autoresponder_start_date_isfuture'] = 'Startdatum kan inte vara i det förflutna.';
+$wb['autoresponder_end_date_txt'] = 'Sluta den';
+$wb['autoresponder_end_date_isgreater'] = 'Slutdatum måste vara efter startdatum';
+$wb['autoresponder_active'] = 'Aktivera autosvaret';
+$wb['now_txt'] = 'Nu';
+$wb['autoresponder_subject_txt'] = 'Ämnesrad';
 ?>
+
diff --git a/interface/web/mailuser/lib/lang/se_mail_user_cc.lng b/interface/web/mailuser/lib/lang/se_mail_user_cc.lng
index 8187788..203a928 100644
--- a/interface/web/mailuser/lib/lang/se_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/se_mail_user_cc.lng
@@ -1,9 +1,10 @@
 <?php
-$wb['mailbox_cc_txt'] = 'Send copy to email address';
-$wb['cc_txt'] = 'Send copy to';
-$wb['email_txt'] = 'Email';
-$wb['cc_error_isemail'] = 'Email address invalid in -Send copy to- field';
-$wb['email_is_cc_error'] = 'Email address and send copy to address can not be the same.';
-$wb['name_optional_txt'] = '(Optional)';
-$wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
+$wb['mailbox_cc_txt'] = 'Skicka kopia till epostadress';
+$wb['cc_txt'] = 'Skicka kopia till';
+$wb['email_txt'] = 'Epost';
+$wb['cc_error_isemail'] = 'Epostadressen i  -Skicka kopia till-fältet är ogiltig';
+$wb['email_is_cc_error'] = 'Epostadress och -Skicka kopia till- kan inte vara samma adress.';
+$wb['name_optional_txt'] = '(Frivilligt)';
+$wb['cc_note_txt'] = '(Separera flera epostadresser med kommatecken)';
 ?>
+
diff --git a/interface/web/mailuser/lib/lang/se_mail_user_filter.lng b/interface/web/mailuser/lib/lang/se_mail_user_filter.lng
index 2e74ffd..17da57a 100644
--- a/interface/web/mailuser/lib/lang/se_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/se_mail_user_filter.lng
@@ -1,20 +1,21 @@
 <?php
-$wb['rulename_txt'] = 'Name';
-$wb['action_txt'] = 'Action';
-$wb['target_txt'] = 'Folder';
-$wb['active_txt'] = 'Active';
-$wb['rulename_error_empty'] = 'Name is empty.';
-$wb['searchterm_is_empty'] = 'Search term is empty.';
-$wb['source_txt'] = 'Source';
-$wb['target_error_regex'] = 'The target may only contain these characters: a-z, 0-9, -, ., _, and {space}';
-$wb['limit_mailfilter_txt'] = 'The max. number of mailfilters is reached.';
-$wb['subject_txt'] = 'Subject';
-$wb['from_txt'] = 'From';
-$wb['to_txt'] = 'To';
-$wb['contains_txt'] = 'Contains';
-$wb['is_txt'] = 'Is';
-$wb['begins_with_txt'] = 'Begins with';
-$wb['ends_with_txt'] = 'Ends with';
-$wb['move_to_txt'] = 'Move to';
-$wb['delete_txt'] = 'Delete';
+$wb['rulename_txt'] = 'Namn';
+$wb['action_txt'] = 'Händelse';
+$wb['target_txt'] = 'Katalog';
+$wb['active_txt'] = 'Aktiv';
+$wb['rulename_error_empty'] = 'Namnfältet är tomt.';
+$wb['searchterm_is_empty'] = 'Sökfältet är tomt.';
+$wb['source_txt'] = 'Källa';
+$wb['target_error_regex'] = 'Målet får endast innehålla dessa tecken: a-z, 0-9, -, ., _,och {mellanslag}';
+$wb['limit_mailfilter_txt'] = 'Det maximala antalet epostfilter är uppnått.';
+$wb['subject_txt'] = 'Ämne';
+$wb['from_txt'] = 'Från';
+$wb['to_txt'] = 'Till';
+$wb['contains_txt'] = 'Innehåller';
+$wb['is_txt'] = 'Är';
+$wb['begins_with_txt'] = 'Börjar med';
+$wb['ends_with_txt'] = 'Slutar med';
+$wb['move_to_txt'] = 'Flytta till';
+$wb['delete_txt'] = 'Radera';
 ?>
+
diff --git a/interface/web/mailuser/lib/lang/se_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/se_mail_user_filter_list.lng
index fb6b9df..f4f757d 100644
--- a/interface/web/mailuser/lib/lang/se_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/se_mail_user_filter_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Email filter rules';
-$wb['rulename_txt'] = 'Name';
-$wb['add_new_record_txt'] = 'Add new Filter';
-$wb['page_txt'] = 'Page';
-$wb['page_of_txt'] = 'of';
-$wb['delete_confirmation'] = 'Do you really want to delete the mailfilter?';
+$wb['list_head_txt'] = 'Epost filtreringsregler';
+$wb['rulename_txt'] = 'Namn';
+$wb['add_new_record_txt'] = 'Lägg till nytt filter';
+$wb['page_txt'] = 'Sida';
+$wb['page_of_txt'] = 'av';
+$wb['delete_confirmation'] = 'Vill du verkligen radera epostfiltret?';
 ?>
+
diff --git a/interface/web/mailuser/lib/lang/se_mail_user_password.lng b/interface/web/mailuser/lib/lang/se_mail_user_password.lng
index cdf9674..27ebb37 100644
--- a/interface/web/mailuser/lib/lang/se_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/se_mail_user_password.lng
@@ -1,10 +1,11 @@
 <?php
-$wb['mailbox_password_txt'] = 'Mailbox password';
-$wb['password_txt'] = 'Password';
-$wb['password_strength_txt'] = 'Password strength';
-$wb['email_txt'] = 'Email';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['mailbox_password_txt'] = 'Lösenord epostkonto';
+$wb['password_txt'] = 'Lösenord';
+$wb['password_strength_txt'] = 'Lösenordsstyrka';
+$wb['email_txt'] = 'Epost';
+$wb['generate_password_txt'] = 'Skapa lösenord';
+$wb['repeat_password_txt'] = 'Upprepa lösenord';
+$wb['password_mismatch_txt'] = 'Lösenorden matchar inte';
+$wb['password_match_txt'] = 'Lösenorden matchar';
 ?>
+
diff --git a/interface/web/mailuser/lib/lang/se_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/se_mail_user_spamfilter.lng
index be4bad9..e457b5a 100644
--- a/interface/web/mailuser/lib/lang/se_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/se_mail_user_spamfilter.lng
@@ -1,7 +1,8 @@
 <?php
 $wb['mailbox_spamfilter_txt'] = 'Spamfilter';
 $wb['spamfilter_txt'] = 'Spamfilter';
-$wb['email_txt'] = 'Email';
-$wb['no_policy'] = '- not enabled -';
+$wb['email_txt'] = 'Epost';
+$wb['no_policy'] = '- ej aktiverat -';
 $wb['policy_txt'] = 'Policy';
 ?>
+
diff --git a/interface/web/monitor/lib/lang/se.lng b/interface/web/monitor/lib/lang/se.lng
index 65c57ae..0df6528 100644
--- a/interface/web/monitor/lib/lang/se.lng
+++ b/interface/web/monitor/lib/lang/se.lng
@@ -1,139 +1,139 @@
 <?php
-$wb['Server online since'] = 'Server online since';
-$wb['Users online'] = 'Users Online';
-$wb['System load 1 minute'] = 'System load 1 minute';
-$wb['System load 5 minutes'] = 'System load 5 minutes';
-$wb['System load 15 minutes'] = 'System load 15 minutes';
-$wb['Server Load'] = 'Server Load';
-$wb['Disk usage'] = 'Disk usage';
-$wb['Memory usage'] = 'Memory usage';
+$wb['Server online since'] = 'Server online sedan';
+$wb['Users online'] = 'Användare online';
+$wb['System load 1 minute'] = 'Systembelastning 1 minut';
+$wb['System load 5 minutes'] = 'Systembelastning 5 minut';
+$wb['System load 15 minutes'] = 'Systembelastning 15 minut';
+$wb['Server Load'] = 'Systembelastning';
+$wb['Disk usage'] = 'Diskanvändning';
+$wb['Memory usage'] = 'Minnesanvändning';
 $wb['no_data_serverload_txt'] = 'No data about the server load available at the moment. Please check again later.';
 $wb['no_data_memusage_txt'] = 'No data about the memory usage available at the moment. Please check again later.';
 $wb['no_data_diskusage_txt'] = 'No data about the disk usage available at the moment. Please check again later.';
 $wb['no_data_cpuinfo_txt'] = 'No data about the CPU available at the moment. Please check again later.';
 $wb['no_data_services_txt'] = 'No data about the services available at the moment. Please check again later.';
 $wb['no_logdata_txt'] = 'No log data available at the moment. Please check again later.';
-$wb['Monitoring'] = 'Monitoring';
-$wb['Server to Monitor'] = 'Server to Monitor';
-$wb['Logfiles'] = 'Logfiles';
-$wb['Status of services'] = 'Status of services';
-$wb['No Refresh'] = 'No Refresh';
-$wb['minutes'] = 'minutes';
-$wb['Show Overview'] = 'Show Overview';
-$wb['System State (All Servers)'] = 'System State (All Servers)';
-$wb['Hardware-Information'] = 'Hardware-Information';
-$wb['Show CPU info'] = 'Show CPU info';
-$wb['Server State'] = 'Server State';
-$wb['Show Update State'] = 'Show Update State';
-$wb['Show RAID state'] = 'Show RAID state';
-$wb['Show Server load'] = 'Show Server load';
-$wb['Show Disk usage'] = 'Show Disk usage';
-$wb['Show Memory usage'] = 'Show Memory usage';
-$wb['Show Services'] = 'Show Services';
-$wb['Show Mail-Queue'] = 'Show Mail-Queue';
-$wb['Show Mail-Log'] = 'Show Mail-Log';
-$wb['Show Mail warn-Log'] = 'Show Mail warn-Log';
-$wb['Show Mail err-Log'] = 'Show Mail err-Log';
-$wb['Show System-Log'] = 'Show System-Log';
-$wb['Show Freshclam-Log'] = 'Show Freshclam-Log';
-$wb['Show Clamav-Log'] = 'Show Clamav-Log';
-$wb['Show ISPConfig-Log'] = 'Show ISPConfig-Log';
-$wb['Show RKHunter-Log'] = 'Show RKHunter-Log';
-$wb['Show Jobqueue'] = 'Show Jobqueue';
-$wb['Show ISPC Cron-Log'] = 'Show ISPC Cron-Log';
-$wb['no_data_updates_txt'] = 'No data about updates available at the moment. Please check again later.';
+$wb['Monitoring'] = 'Övervakning';
+$wb['Server to Monitor'] = 'Server att övervaka';
+$wb['Logfiles'] = 'Loggfiler';
+$wb['Status of services'] = 'Status på tjänster';
+$wb['No Refresh'] = 'Ladda inte om';
+$wb['minutes'] = 'minuter';
+$wb['Show Overview'] = 'Visa översikt';
+$wb['System State (All Servers)'] = 'Systemstatus (Alla servrar)';
+$wb['Hardware-Information'] = 'Hårdvaruinformation';
+$wb['Show CPU info'] = 'Visa CPU-info';
+$wb['Server State'] = 'Serverstatus';
+$wb['Show Update State'] = 'Visa uppdateringsstatus';
+$wb['Show RAID state'] = 'Visa RAID-status';
+$wb['Show Server load'] = 'Visa serverbelastning';
+$wb['Show Disk usage'] = 'Visa diskanvändning';
+$wb['Show Memory usage'] = 'Visa minnesanvändning';
+$wb['Show Services'] = 'Visa tjänster';
+$wb['Show Mail-Queue'] = 'Visa epostkö';
+$wb['Show Mail-Log'] = 'Visa epostlogg';
+$wb['Show Mail warn-Log'] = 'Visa varningslogg epost';
+$wb['Show Mail err-Log'] = 'Visa felloggg epost';
+$wb['Show System-Log'] = 'Visa systemlogg';
+$wb['Show Freshclam-Log'] = 'Visa Freshclam-logg';
+$wb['Show Clamav-Log'] = 'Visa Clamav-logg';
+$wb['Show ISPConfig-Log'] = 'Visa ISPConfig-logg';
+$wb['Show RKHunter-Log'] = 'Visa RKHunter-logg';
+$wb['Show Jobqueue'] = 'Visa jobbkö';
+$wb['Show ISPC Cron-Log'] = 'Visa ISPC Cron-logg';
+$wb['no_data_updates_txt'] = 'Ingen data om tillgångliga uppdateringar för tillfället. Vänligen kontrollera igen vid ett senare tillfälle.';
 $wb['no_data_raid_txt'] = 'No data about RAID available at the moment. Please check again later.';
 $wb['no_data_rkhunter_txt'] = 'No data about RKHunter available at the moment. Please check again later.';
 $wb['no_data_mailq_txt'] = 'No data Mailqueue available at the moment. Please check again later.';
-$wb['monitor_general_serverstate_txt'] = 'Server State';
-$wb['monitor_general_systemstate_txt'] = 'System State';
-$wb['monitor_diskusage_filesystem_txt'] = 'Filesystem';
-$wb['monitor_diskusage_type_txt'] = 'Type';
-$wb['monitor_diskusage_size_txt'] = 'Size';
-$wb['monitor_diskusage_used_txt'] = 'Used';
-$wb['monitor_diskusage_available_txt'] = 'Available';
-$wb['monitor_diskusage_usage_txt'] = 'Use%';
-$wb['monitor_diskusage_mounted_txt'] = 'Mounted on';
-$wb['monitor_logs_mail_txt'] = 'Mail - Log';
-$wb['monitor_logs_mailwarn_txt'] = 'Mail-Warn - Log';
-$wb['monitor_logs_mailerr_txt'] = 'Mail-Error - Log';
-$wb['monitor_logs_messages_txt'] = 'System Messages - Log';
-$wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - Log';
-$wb['monitor_logs_freshclam_txt'] = 'Freshclam - Log';
-$wb['monitor_logs_clamav_txt'] = 'Clamav - Log';
-$wb['monitor_logs_ispc_txt'] = 'ISPConfig - Log';
-$wb['monitor_norkhunter_txt'] = 'RKHunter is not installed, so there is no log data';
+$wb['monitor_general_serverstate_txt'] = 'Serverstatus';
+$wb['monitor_general_systemstate_txt'] = 'Systemstatus';
+$wb['monitor_diskusage_filesystem_txt'] = 'Filsystem';
+$wb['monitor_diskusage_type_txt'] = 'Typ';
+$wb['monitor_diskusage_size_txt'] = 'Storlek';
+$wb['monitor_diskusage_used_txt'] = 'Använt';
+$wb['monitor_diskusage_available_txt'] = 'Tillgängligt';
+$wb['monitor_diskusage_usage_txt'] = 'Användning%';
+$wb['monitor_diskusage_mounted_txt'] = 'Monterad på';
+$wb['monitor_logs_mail_txt'] = 'Epostlogg';
+$wb['monitor_logs_mailwarn_txt'] = 'Varningslogg epost';
+$wb['monitor_logs_mailerr_txt'] = 'Fellogg epost';
+$wb['monitor_logs_messages_txt'] = 'Systemmeddelandelogg';
+$wb['monitor_logs_ispccron_txt'] = 'ISPConfig Cron - logg';
+$wb['monitor_logs_freshclam_txt'] = 'Freshclam -logg';
+$wb['monitor_logs_clamav_txt'] = 'Clamav - logg';
+$wb['monitor_logs_ispc_txt'] = 'ISPConfig - logg';
+$wb['monitor_norkhunter_txt'] = 'RKHunter är inte installerat så det finns ingen loggdata';
 $wb['monitor_serverstate_server_txt'] = 'Server';
-$wb['monitor_serverstate_state_txt'] = 'State';
-$wb['monitor_serverstate_unknown_txt'] = 'unknown';
+$wb['monitor_serverstate_state_txt'] = 'Status';
+$wb['monitor_serverstate_unknown_txt'] = 'okänd';
 $wb['monitor_serverstate_info_txt'] = 'info';
-$wb['monitor_serverstate_warning_txt'] = 'warning';
-$wb['monitor_serverstate_critical_txt'] = 'critical';
-$wb['monitor_serverstate_error_txt'] = 'error';
-$wb['monitor_serverstate_moreinfo_txt'] = 'More information...';
-$wb['monitor_serverstate_more_txt'] = 'More...';
-$wb['monitor_serverstate_fclamok_txt'] = 'Your Virus-protection is ok';
-$wb['monitor_serverstate_fclamoutdated_txt'] = 'Your Virus-protection is OUTDATED!';
+$wb['monitor_serverstate_warning_txt'] = 'varning';
+$wb['monitor_serverstate_critical_txt'] = 'kritisk';
+$wb['monitor_serverstate_error_txt'] = 'fel';
+$wb['monitor_serverstate_moreinfo_txt'] = 'Mer information...';
+$wb['monitor_serverstate_more_txt'] = 'Mer...';
+$wb['monitor_serverstate_fclamok_txt'] = 'Ditt virusskydd är ok';
+$wb['monitor_serverstate_fclamoutdated_txt'] = 'Ditt virusskydd är utdaterat!';
 $wb['monitor_serverstate_fclamunknown_txt'] = 'Freshclam: ???!';
-$wb['monitor_serverstate_hdok_txt'] = 'The state of your Hard-Disk space is ok';
-$wb['monitor_serverstate_hdgoingfull_txt'] = 'Your Hard-Disk space is going full';
-$wb['monitor_serverstate_hdnearlyfull_txt'] = 'Your Hard-Disk is nearly full';
-$wb['monitor_serverstate_hdveryfull_txt'] = 'Your Hard-Disk is very full';
-$wb['monitor_serverstate_hdfull_txt'] = 'Your Hard-Disk has no more space left';
-$wb['monitor_serverstate_hdunknown_txt'] = 'Hard-Disk: ???';
+$wb['monitor_serverstate_hdok_txt'] = 'Ditt hårddiskutrymme är ok';
+$wb['monitor_serverstate_hdgoingfull_txt'] = 'Din hårddisk är på väg att bli full';
+$wb['monitor_serverstate_hdnearlyfull_txt'] = 'Din hårddisk är nästan full';
+$wb['monitor_serverstate_hdveryfull_txt'] = 'Din hårddisk är väldigt nära full';
+$wb['monitor_serverstate_hdfull_txt'] = 'Din hårddisk har inget ledigt utrymme kvar';
+$wb['monitor_serverstate_hdunknown_txt'] = 'Hårddisk: ???';
 $wb['monitor_serverstate_listok_txt'] = 'ok';
 $wb['monitor_serverstate_listinfo_txt'] = 'info';
-$wb['monitor_serverstate_listwarning_txt'] = 'warning';
-$wb['monitor_serverstate_listcritical_txt'] = 'critical';
-$wb['monitor_serverstate_listerror_txt'] = 'error';
-$wb['monitor_serverstate_listunknown_txt'] = 'unknown';
-$wb['monitor_serverstate_loadok_txt'] = 'Your Server load is ok';
-$wb['monitor_serverstate_loadheavy_txt'] = 'Your Server in under heavy load';
-$wb['monitor_serverstate_loadhigh_txt'] = 'Your Server in under high load';
-$wb['monitor_serverstate_loaghigher_txt'] = 'Your Server in under higher load';
-$wb['monitor_serverstate_loadhighest_txt'] = 'Your Server in under highest load';
-$wb['monitor_serverstate_loadunknown_txt'] = 'Server Load: ???';
-$wb['monitor_serverstate_mailqok_txt'] = 'Your Mailq load is ok';
-$wb['monitor_serverstate_mailqheavy_txt'] = 'Your Mailq in under heavy load';
-$wb['monitor_serverstate_mailqhigh_txt'] = 'Your Mailq in under high load';
-$wb['monitor_serverstate_mailqhigher_txt'] = 'Your Mailq in under higher load';
-$wb['monitor_serverstate_mailqhighest_txt'] = 'Your Mailq in under highest load';
-$wb['monitor_serverstate_mailqunknown_txt'] = 'Mailq: ???';
-$wb['monitor_serverstate_raidok_txt'] = 'Your RAID is ok';
-$wb['monitor_serverstate_raidresync_txt'] = 'Your RAID is in RESYNC mode';
+$wb['monitor_serverstate_listwarning_txt'] = 'varning';
+$wb['monitor_serverstate_listcritical_txt'] = 'kritisk';
+$wb['monitor_serverstate_listerror_txt'] = 'fel';
+$wb['monitor_serverstate_listunknown_txt'] = 'okänd';
+$wb['monitor_serverstate_loadok_txt'] = 'Din serverbelastning är ok';
+$wb['monitor_serverstate_loadheavy_txt'] = 'Din server är ganska hårt belastad';
+$wb['monitor_serverstate_loadhigh_txt'] = 'Din server är hårt belastad';
+$wb['monitor_serverstate_loaghigher_txt'] = 'Din server är mycket hårt belastad';
+$wb['monitor_serverstate_loadhighest_txt'] = 'Din server är extremt hårt belastad';
+$wb['monitor_serverstate_loadunknown_txt'] = 'Serverbelastning: ???';
+$wb['monitor_serverstate_mailqok_txt'] = 'Din epostkö är ok';
+$wb['monitor_serverstate_mailqheavy_txt'] = 'Du har mail i kön';
+$wb['monitor_serverstate_mailqhigh_txt'] = 'Du har många mail i kön';
+$wb['monitor_serverstate_mailqhigher_txt'] = 'Du har väldigt många mail i kön';
+$wb['monitor_serverstate_mailqhighest_txt'] = 'Du har extremt många mail i kön';
+$wb['monitor_serverstate_mailqunknown_txt'] = 'Epostkö: ???';
+$wb['monitor_serverstate_raidok_txt'] = 'Din RAID är OK';
+$wb['monitor_serverstate_raidresync_txt'] = 'Din RAID håller på med RESYNC';
 $wb['monitor_serverstate_raidfault_txt'] = 'Your RAID has one FAULT disk. Replace as soon as possible!';
-$wb['monitor_serverstate_raiderror_txt'] = 'Your RAID is not working anymore';
-$wb['monitor_serverstate_raidunknown_txt'] = 'RAID state: ???';
-$wb['monitor_serverstate_servicesonline_txt'] = 'All needed Services are online';
-$wb['monitor_serverstate_servicesoffline_txt'] = 'One or more needed Services are offline';
-$wb['monitor_serverstate_servicesunknown_txt'] = 'Services:???';
-$wb['monitor_serverstate_syslogok_txt'] = 'The System-Log is O.K.';
-$wb['monitor_serverstate_syslogwarning_txt'] = 'There are some warnings in your System-Log';
-$wb['monitor_serverstate_syslogerror_txt'] = 'There are errors in your System-Log';
-$wb['monitor_serverstate_syslogunknown_txt'] = 'sys-log:???';
-$wb['monitor_serverstate_updatesok_txt'] = 'Your System is up to date.';
-$wb['monitor_serverstate_updatesneeded_txt'] = 'One or more Components needs a update';
-$wb['monitor_serverstate_updatesunknown_txt'] = 'System-Update:???';
+$wb['monitor_serverstate_raiderror_txt'] = 'Din RAID fungerar inte längre';
+$wb['monitor_serverstate_raidunknown_txt'] = 'RAID-status: ???';
+$wb['monitor_serverstate_servicesonline_txt'] = 'Alla tjänster är online';
+$wb['monitor_serverstate_servicesoffline_txt'] = 'En eller flera tjänster är offline';
+$wb['monitor_serverstate_servicesunknown_txt'] = 'Tjänster:???';
+$wb['monitor_serverstate_syslogok_txt'] = 'Systemloggen är OK';
+$wb['monitor_serverstate_syslogwarning_txt'] = 'Det finns varningar i din systemlogg';
+$wb['monitor_serverstate_syslogerror_txt'] = 'Det finns felmeddelanden i din systemlogg';
+$wb['monitor_serverstate_syslogunknown_txt'] = 'systemlogg:???';
+$wb['monitor_serverstate_updatesok_txt'] = 'Ditt system är uppdaterat.';
+$wb['monitor_serverstate_updatesneeded_txt'] = 'En eller flera komponenter behöver uppgraderas';
+$wb['monitor_serverstate_updatesunknown_txt'] = 'Systemuppgradering:???';
 $wb['monitor_services_online_txt'] = 'Online';
 $wb['monitor_services_offline_txt'] = 'Offline';
-$wb['monitor_services_web_txt'] = 'Web-Server:';
+$wb['monitor_services_web_txt'] = 'Webb-Server:';
 $wb['monitor_services_ftp_txt'] = 'FTP-Server:';
 $wb['monitor_services_smtp_txt'] = 'SMTP-Server:';
 $wb['monitor_services_pop_txt'] = 'POP3-Server:';
 $wb['monitor_services_imap_txt'] = 'IMAP-Server:';
 $wb['monitor_services_mydns_txt'] = 'DNS-Server:';
-$wb['monitor_services_mysql_txt'] = 'mySQL-Server:';
-$wb['monitor_settings_datafromdate_txt'] = 'Data from: ';
+$wb['monitor_services_mysql_txt'] = 'MySQL-Server:';
+$wb['monitor_settings_datafromdate_txt'] = 'Data från: ';
 $wb['monitor_settings_datetimeformat_txt'] = 'Y-m-d H:i';
-$wb['monitor_settings_refreshsq_txt'] = 'Refresh sequence:';
+$wb['monitor_settings_refreshsq_txt'] = 'Omladdning:';
 $wb['monitor_settings_server_txt'] = 'Server';
 $wb['monitor_title_cpuinfo_txt'] = 'CPU Info';
-$wb['monitor_title_updatestate_txt'] = 'Update State';
-$wb['monitor_title_mailq_txt'] = 'Mailqueue';
-$wb['monitor_title_raidstate_txt'] = 'RAID-State';
-$wb['monitor_title_rkhunterlog_txt'] = 'RKHunter-Log';
+$wb['monitor_title_updatestate_txt'] = 'Uppdateringsstatus';
+$wb['monitor_title_mailq_txt'] = 'Epostkö';
+$wb['monitor_title_raidstate_txt'] = 'RAID-status';
+$wb['monitor_title_rkhunterlog_txt'] = 'RKHunter-logg';
 $wb['monitor_updates_nosupport_txt'] = 'Your distribution is not supported for this monitoring';
-$wb['monitor_title_fail2ban_txt'] = 'Fail2Ban Log';
+$wb['monitor_title_fail2ban_txt'] = 'Fail2Ban-logg';
 $wb['monitor_nosupportedraid1_txt'] = 'At the moment, we support mdadm or mpt-status for monitoring the RAID.<br>We cant find any of them at your server.<br><br>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';
@@ -142,14 +142,15 @@
 $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';
-$wb['monitor_title_iptables_txt'] = 'IPTables Rules';
-$wb['Show fail2ban-Log'] = 'Show fail2ban-Log';
-$wb['Show IPTables'] = 'Show IPTables';
+$wb['monitor_title_iptables_txt'] = 'IPTables-regler';
+$wb['Show fail2ban-Log'] = 'Visa fail2ban-logg';
+$wb['Show IPTables'] = 'Visa IPTables';
 $wb['Show OpenVz VE BeanCounter'] = 'Show OpenVz VE BeanCounter';
-$wb['Show Monit'] = 'Show Monit';
-$wb['no_monit_url_defined_txt'] = 'No Monit URL defined.';
-$wb['no_permissions_to_view_monit_txt'] = 'You are not allowed to access Monit.';
-$wb['Show Munin'] = 'Show Munin';
-$wb['no_munin_url_defined_txt'] = 'No Munin URL defined.';
-$wb['no_permissions_to_view_munin_txt'] = 'You are not allowed to access Munin.';
+$wb['Show Monit'] = 'Visa Monit';
+$wb['no_monit_url_defined_txt'] = 'Ingen Monit-URL definierad';
+$wb['no_permissions_to_view_monit_txt'] = 'Du har inte behörighet att visa  Monit.';
+$wb['Show Munin'] = 'Visa Munin';
+$wb['no_munin_url_defined_txt'] = 'Ingen Munin-URL definierad.';
+$wb['no_permissions_to_view_munin_txt'] = 'Du har inte behörighet att visa Munin.';
 ?>
+
diff --git a/interface/web/monitor/lib/lang/se_datalog_list.lng b/interface/web/monitor/lib/lang/se_datalog_list.lng
index 8ad63ff..527b149 100644
--- a/interface/web/monitor/lib/lang/se_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/se_datalog_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Jobqueue';
-$wb['tstamp_txt'] = 'Date';
+$wb['list_head_txt'] = 'Jobbkö';
+$wb['tstamp_txt'] = 'Datum';
 $wb['server_id_txt'] = 'Server';
-$wb['dbtable_txt'] = 'DB Table';
-$wb['action_txt'] = 'Action';
+$wb['dbtable_txt'] = 'Databastabell';
+$wb['action_txt'] = 'Händelse';
 $wb['status_txt'] = 'Status';
 ?>
+
diff --git a/interface/web/monitor/lib/lang/se_syslog_list.lng b/interface/web/monitor/lib/lang/se_syslog_list.lng
index 00da5ab..f3194b6 100644
--- a/interface/web/monitor/lib/lang/se_syslog_list.lng
+++ b/interface/web/monitor/lib/lang/se_syslog_list.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'ISPConfig Log';
-$wb['tstamp_txt'] = 'Date';
+$wb['list_head_txt'] = 'ISPConfig-logg';
+$wb['tstamp_txt'] = 'Datum';
 $wb['server_id_txt'] = 'Server';
-$wb['loglevel_txt'] = 'Loglevel';
-$wb['message_txt'] = 'Message';
+$wb['loglevel_txt'] = 'Loggnivå';
+$wb['message_txt'] = 'Meddelande';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se.lng b/interface/web/sites/lib/lang/se.lng
index 6ca61af..780195f 100644
--- a/interface/web/sites/lib/lang/se.lng
+++ b/interface/web/sites/lib/lang/se.lng
@@ -1,35 +1,36 @@
 <?php
-$wb['Websites'] = 'Websites';
-$wb['Website'] = 'Website';
-$wb['Subdomain'] = 'Subdomain for website';
-$wb['Aliasdomain'] = 'Aliasdomain for website';
-$wb['Database'] = 'Databases';
-$wb['Web Access'] = 'Web Access';
-$wb['FTP-User'] = 'FTP-Accounts';
-$wb['Webdav-User'] = 'WebDAV-Users';
-$wb['Folder'] = 'Protected Folders';
-$wb['Folder users'] = 'Protected Folder Users';
-$wb['Command Line'] = 'Command Line';
-$wb['Shell-User'] = 'Shell-User';
-$wb['Cron Jobs'] = 'Cron Jobs';
-$wb['Statistics'] = 'Statistics';
-$wb['Web traffic'] = 'Web Traffic';
-$wb['Website quota (Harddisk)'] = 'Website quota (Harddisk)';
+$wb['Websites'] = 'Webbsidor';
+$wb['Website'] = 'Webbsida';
+$wb['Subdomain'] = 'Subdomain for websiteUnderdomäner för webbsida';
+$wb['Aliasdomain'] = 'Aliasdomän för webbsida';
+$wb['Database'] = 'Databaser';
+$wb['Web Access'] = 'Webbåtkomst';
+$wb['FTP-User'] = 'FTP-konton';
+$wb['Webdav-User'] = 'WebDAV-användare';
+$wb['Folder'] = 'Skyddade kataloger';
+$wb['Folder users'] = 'Användare skyddade kataloger';
+$wb['Command Line'] = 'Terminal';
+$wb['Shell-User'] = 'Shell-användare';
+$wb['Cron Jobs'] = 'Cron-jobb';
+$wb['Statistics'] = 'Statistik';
+$wb['Web traffic'] = 'Webbtrafik';
+$wb['Website quota (Harddisk)'] = 'Webbsidekvot (Hårddiskutrymme)';
 $wb['Cron'] = 'Cron';
-$wb['Stats'] = 'Statistics';
+$wb['Stats'] = 'Statistik';
 $wb['Shell'] = 'Shell';
 $wb['Webdav'] = 'WebDAV';
 $wb['FTP'] = 'FTP';
-$wb['Options'] = 'Options';
-$wb['Domain'] = 'Domain';
-$wb['Redirect'] = 'Redirect';
+$wb['Options'] = 'Val';
+$wb['Domain'] = 'Domän';
+$wb['Redirect'] = 'Vidarebefordran';
 $wb['SSL'] = 'SSL';
-$wb['Sites'] = 'Sites';
-$wb['Database User'] = 'Database Users';
-$wb['APS Installer'] = 'APS Installer';
-$wb['Available packages'] = 'Available packages';
-$wb['Installed packages'] = 'Installed packages';
-$wb['Update Packagelist'] = 'Update Packagelist';
-$wb['Subdomain (Vhost)'] = 'Subdomain (Vhost)';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
+$wb['Sites'] = 'Webbsidor';
+$wb['Database User'] = 'Databasanvändare';
+$wb['APS Installer'] = 'APS-installerare';
+$wb['Available packages'] = 'Tillgängliga paket';
+$wb['Installed packages'] = 'Installerade paket';
+$wb['Update Packagelist'] = 'Uppdatera paketlista';
+$wb['Subdomain (Vhost)'] = 'Underdomän (Vhost)';
+$wb['error_proxy_requires_url'] = 'Redirect Type "proxy" requires a URL as the redirect path.';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_aps.lng b/interface/web/sites/lib/lang/se_aps.lng
index 29fb7b6..315b03c 100644
--- a/interface/web/sites/lib/lang/se_aps.lng
+++ b/interface/web/sites/lib/lang/se_aps.lng
@@ -1,58 +1,59 @@
 <?php
-$wb['overview_txt'] = 'Overview';
+$wb['overview_txt'] = 'Översikt';
 $wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
-$wb['yes_txt'] = 'Yes';
-$wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
-$wb['details_txt'] = 'Details';
+$wb['available_packages_txt'] = 'Tillgängliga paket';
+$wb['installed_packages_txt'] = 'Installerade paket';
+$wb['yes_txt'] = 'Ja';
+$wb['no_txt'] = 'Nej';
+$wb['invalid_id_txt'] = 'Inget giltigt ID har angivits';
+$wb['details_txt'] = 'Detaljer';
 $wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['homepage_txt'] = 'Homepage';
-$wb['supported_languages_txt'] = 'Supported languages';
-$wb['description_txt'] = 'Description';
-$wb['config_script_txt'] = 'Configuration script';
-$wb['installed_size_txt'] = 'Size after installation';
-$wb['license_txt'] = 'License';
-$wb['screenshots_txt'] = 'Screenshots';
-$wb['changelog_txt'] = 'Changelog';
-$wb['server_requirements_txt'] = 'Server requirements';
-$wb['php_extensions_txt'] = 'PHP extensions';
-$wb['php_settings_txt'] = 'PHP settings';
-$wb['supported_php_versions_txt'] = 'Supported PHP versions';
-$wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
+$wb['category_txt'] = 'Kategori';
+$wb['homepage_txt'] = 'Hemsida';
+$wb['supported_languages_txt'] = 'Språkstöd';
+$wb['description_txt'] = 'Beskrivning';
+$wb['config_script_txt'] = 'Konfigurationssskript';
+$wb['installed_size_txt'] = 'Utrymme efter installation';
+$wb['license_txt'] = 'Licens';
+$wb['screenshots_txt'] = 'Skärmbilder';
+$wb['changelog_txt'] = 'Ändringslogg';
+$wb['server_requirements_txt'] = 'Systemkrav';
+$wb['php_extensions_txt'] = 'PHP-tillägg';
+$wb['php_settings_txt'] = 'PHP-inställningar';
+$wb['supported_php_versions_txt'] = 'PHP-versioner som stöds';
+$wb['database_txt'] = 'Databas';
+$wb['settings_txt'] = 'Inställningar';
+$wb['install_package_txt'] = 'Installera detta paket';
 $wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Install location';
-$wb['acceptance_txt'] = 'Acceptance';
-$wb['acceptance_text_txt'] = 'Yes, i\'ve read the license and agree.';
-$wb['install_language_txt'] = 'Interface language';
-$wb['new_database_password_txt'] = 'New database password';
-$wb['basic_settings_txt'] = 'Basic settings';
-$wb['package_settings_txt'] = 'Package settings';
+$wb['install_location_txt'] = 'Installationskatalog';
+$wb['acceptance_txt'] = 'Acceptera';
+$wb['acceptance_text_txt'] = 'Ja, jag har läst liensavtalet och accepterar det.';
+$wb['install_language_txt'] = 'Gränssnittsspråk';
+$wb['new_database_password_txt'] = 'Nytt databaslösenord';
+$wb['basic_settings_txt'] = 'Grundunställningar';
+$wb['package_settings_txt'] = 'Paketinställningar';
 $wb['error_main_domain'] = 'The domain of the installation path is invalid.';
 $wb['error_no_main_location'] = 'You have provided no valid installation path.';
 $wb['error_inv_main_location'] = 'The given install location folder is invalid.';
 $wb['error_license_agreement'] = 'In order to continue you have to accept the license agreement.';
 $wb['error_no_database_pw'] = 'You have provided no valid database password.';
 $wb['error_short_database_pw'] = 'Please choose a longer database password.';
-$wb['error_no_value_for'] = 'The field \\"%s\\" must not be empty.';
-$wb['error_short_value_for'] = 'The field \\"%s\\" requires a longer input value.';
-$wb['error_long_value_for'] = 'The field \\"%s\\" requires a shorter input value.';
-$wb['error_inv_value_for'] = 'You have entered an invalid value for the field \\"%s\\".';
-$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field \\"%s\\".';
-$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field \\"%s\\".';
-$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field \\"%s\\".';
-$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field \\"%s\\".';
+$wb['error_no_value_for'] = 'The field "%s" must not be empty.';
+$wb['error_short_value_for'] = 'The field "%s" requires a longer input value.';
+$wb['error_long_value_for'] = 'The field "%s" requires a shorter input value.';
+$wb['error_inv_value_for'] = 'You have entered an invalid value for the field "%s".';
+$wb['error_inv_email_for'] = 'You have entered an invalid mail address for the field "%s".';
+$wb['error_inv_domain_for'] = 'You have entered an invalid domain for the field "%s".';
+$wb['error_inv_integer_for'] = 'You have entered an invalid number for the field "%s".';
+$wb['error_inv_float_for'] = 'You have entered an invalid floating point number for the field "%s".';
 $wb['error_used_location'] = 'The installation path already contains a package installation.';
-$wb['installation_task_txt'] = 'Install planned';
-$wb['installation_error_txt'] = 'Install error';
-$wb['installation_success_txt'] = 'Installed';
-$wb['installation_remove_txt'] = 'Removal planned';
+$wb['installation_task_txt'] = 'Installation planerad';
+$wb['installation_error_txt'] = 'Installationsfel';
+$wb['installation_success_txt'] = 'Installerad';
+$wb['installation_remove_txt'] = 'Borttagning planerad';
 $wb['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-$wb['btn_install_txt'] = 'Install';
-$wb['btn_cancel_txt'] = 'Cancel';
+$wb['btn_install_txt'] = 'Installera';
+$wb['btn_cancel_txt'] = 'Avbryt';
 $wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_aps_instances_list.lng b/interface/web/sites/lib/lang/se_aps_instances_list.lng
index 052d834..81cda2a 100644
--- a/interface/web/sites/lib/lang/se_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/se_aps_instances_list.lng
@@ -1,13 +1,14 @@
 <?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
+$wb['list_head_txt'] = 'Installerade paket';
+$wb['name_txt'] = 'Namn';
 $wb['version_txt'] = 'Version';
-$wb['customer_txt'] = 'Client';
+$wb['customer_txt'] = 'Kund';
 $wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['pkg_reinstall_confirmation'] = 'Do you really want to reinstall this package with the same settings?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
-$wb['reinstall_txt'] = 'Reinstall';
+$wb['install_location_txt'] = 'Installationsplats';
+$wb['pkg_delete_confirmation'] = 'Vill du verkligen radera denna installation?';
+$wb['pkg_reinstall_confirmation'] = 'Vill du verkligen installera om det här paketet med samma inställningar?';
+$wb['filter_txt'] = 'Sök';
+$wb['delete_txt'] = 'Radera';
+$wb['reinstall_txt'] = 'Ominstallera';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_aps_packages_list.lng b/interface/web/sites/lib/lang/se_aps_packages_list.lng
index 68c3780..1746bfd 100644
--- a/interface/web/sites/lib/lang/se_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/se_aps_packages_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
+$wb['list_head_txt'] = 'Tillgängliga paket';
+$wb['name_txt'] = 'Namn';
 $wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
+$wb['category_txt'] = 'Kategori';
+$wb['status_txt'] = 'Olåst';
+$wb['filter_txt'] = 'Sök';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_aps_update_packagelist.lng b/interface/web/sites/lib/lang/se_aps_update_packagelist.lng
index ce9fcf6..8d84c05 100644
--- a/interface/web/sites/lib/lang/se_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/se_aps_update_packagelist.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['head_txt'] = 'Update Packagelist';
-$wb['list_desc_txt'] = '';
-$wb['btn_start_txt'] = 'Update Packagelist';
-$wb['btn_cancel_txt'] = 'Cancel';
+$wb['head_txt'] = 'Uppdatera paketlista';
+$wb['list_desc_txt'] = 'Listbeskrivning';
+$wb['btn_start_txt'] = 'Uppdatera paketlista';
+$wb['btn_cancel_txt'] = 'Avbryt';
 $wb['legend_txt'] = 'Here you can update the list of available packages. Please note that this can take up to five minutes. You can leave this page if you like; the process will continue in the background.';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_cron.lng b/interface/web/sites/lib/lang/se_cron.lng
index 369c3b8..bc89db2 100644
--- a/interface/web/sites/lib/lang/se_cron.lng
+++ b/interface/web/sites/lib/lang/se_cron.lng
@@ -1,14 +1,14 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Parent website';
-$wb['active_txt'] = 'Active';
-$wb['client_txt'] = 'Client';
-$wb['run_min_txt'] = 'Minutes';
-$wb['run_hour_txt'] = 'Hours';
-$wb['run_mday_txt'] = 'Days of month';
-$wb['run_month_txt'] = 'Months';
-$wb['run_wday_txt'] = 'Days of week';
-$wb['command_txt'] = 'Command to run (commands are executed via sh, urls via wget)';
+$wb['parent_domain_id_txt'] = 'Föräldrawebbsida';
+$wb['active_txt'] = 'Aktiv';
+$wb['client_txt'] = 'Kund';
+$wb['run_min_txt'] = 'Minuter';
+$wb['run_hour_txt'] = 'Timmar';
+$wb['run_mday_txt'] = 'Dagar i månaden';
+$wb['run_month_txt'] = 'Månader';
+$wb['run_wday_txt'] = 'Dagar i veckan';
+$wb['command_txt'] = 'Kommando att köra (kommandon körs via sh, URL:er via wget)';
 $wb['limit_cron_txt'] = 'The maximum number of allowed cron jobs was reached.';
 $wb['limit_cron_frequency_txt'] = 'The cron job frequency exceeds the allowed limit.';
 $wb['run_min_error_format'] = 'Invalid format for minutes.';
@@ -18,7 +18,8 @@
 $wb['run_wday_error_format'] = 'Invalid format for days of the week.';
 $wb['command_error_format'] = 'Invalid command format. Please note that in case of an url call only http/https is allowed.';
 $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
-$wb['server_id_error_empty'] = 'The server ID is empty.';
+$wb['server_id_error_empty'] = 'Fältet för  server-ID är tomt.';
 $wb['limit_cron_url_txt'] = 'URL cron only. Please enter a URL starting with http:// as cron command.';
-$wb['command_error_empty'] = 'Command is empty.';
+$wb['command_error_empty'] = 'Kommandofältet är tomt.';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_cron_list.lng b/interface/web/sites/lib/lang/se_cron_list.lng
index 308024d..b17951c 100644
--- a/interface/web/sites/lib/lang/se_cron_list.lng
+++ b/interface/web/sites/lib/lang/se_cron_list.lng
@@ -1,13 +1,14 @@
 <?php
-$wb['list_head_txt'] = 'Cron Jobs';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Cron-jobb';
+$wb['active_txt'] = 'Aktiv';
 $wb['server_id_txt'] = 'Server';
-$wb['run_min_txt'] = 'Minute';
-$wb['run_hour_txt'] = 'Hour';
-$wb['run_mday_txt'] = 'Day of month';
-$wb['run_month_txt'] = 'Month';
-$wb['run_wday_txt'] = 'Day of week';
-$wb['command_txt'] = 'Command';
-$wb['add_new_cron_txt'] = 'Add new Cron job';
-$wb['parent_domain_id_txt'] = 'Website';
+$wb['run_min_txt'] = 'Minut';
+$wb['run_hour_txt'] = 'Timma';
+$wb['run_mday_txt'] = 'Dag i månad';
+$wb['run_month_txt'] = 'Månad';
+$wb['run_wday_txt'] = 'Day i vecka';
+$wb['command_txt'] = 'Kommando';
+$wb['add_new_cron_txt'] = 'Lägg till nytt cron-jobb';
+$wb['parent_domain_id_txt'] = 'Webbsida';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_database.lng b/interface/web/sites/lib/lang/se_database.lng
index 28d4ae7..03eac08 100644
--- a/interface/web/sites/lib/lang/se_database.lng
+++ b/interface/web/sites/lib/lang/se_database.lng
@@ -1,18 +1,18 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['type_txt'] = 'Type';
-$wb['database_name_txt'] = 'Database name';
-$wb['database_user_txt'] = 'Database user';
-$wb['database_password_txt'] = 'Database password';
-$wb['password_strength_txt'] = 'Password strength';
-$wb['database_charset_txt'] = 'Database charset';
-$wb['remote_access_txt'] = 'Remote Access';
-$wb['client_txt'] = 'Client';
-$wb['active_txt'] = 'Active';
-$wb['database_name_error_empty'] = 'Database name is empty.';
+$wb['type_txt'] = 'Typ';
+$wb['database_name_txt'] = 'Databasnamn';
+$wb['database_user_txt'] = 'Databasanvändare';
+$wb['database_password_txt'] = 'Databaslösenord';
+$wb['password_strength_txt'] = 'Lösenordsstyrka';
+$wb['database_charset_txt'] = 'Databas teckenuppsättning';
+$wb['remote_access_txt'] = 'Fjärråtkomst';
+$wb['client_txt'] = 'Kund';
+$wb['active_txt'] = 'Aktiv';
+$wb['database_name_error_empty'] = 'Databasnamnet är tomt';
 $wb['database_name_error_unique'] = 'There is already a database with this name on the server. To get a unique name, e.g. prepend your domain name to the database name.';
 $wb['database_name_error_regex'] = 'Invalid database name. The database name may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
-$wb['database_user_error_empty'] = 'Database user is empty.';
+$wb['database_user_error_empty'] = 'Databasanvändaren är tomt';
 $wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
 $wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
 $wb['limit_database_txt'] = 'The max. number of databases is reached.';
@@ -22,25 +22,26 @@
 $wb['database_remote_error_ips'] = 'At least one of the entered ip addresses is invalid.';
 $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.';
-$wb['parent_domain_id_txt'] = 'Site';
-$wb['database_site_error_empty'] = 'Select the site to which the database belongs.';
-$wb['select_site_txt'] = '- Select Site -';
-$wb['btn_save_txt'] = 'Save';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['globalsearch_resultslimit_of_txt'] = 'of';
-$wb['globalsearch_resultslimit_results_txt'] = 'results';
-$wb['globalsearch_noresults_text_txt'] = 'No results.';
-$wb['globalsearch_noresults_limit_txt'] = '0 results';
-$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
-$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
-$wb['database_ro_user_txt'] = 'Read-only database user';
-$wb['optional_txt'] = 'optional';
-$wb['select_dbuser_txt'] = 'Select database user';
-$wb['no_dbuser_txt'] = 'None';
+$wb['parent_domain_id_txt'] = 'Domän';
+$wb['database_site_error_empty'] = 'Välj vilken domän databasen tillhör';
+$wb['select_site_txt'] = '- Välj domän -';
+$wb['btn_save_txt'] = 'Spara';
+$wb['btn_cancel_txt'] = 'Avbryt';
+$wb['generate_password_txt'] = 'Generera lösenord';
+$wb['repeat_password_txt'] = 'Upprepa lösenord';
+$wb['password_mismatch_txt'] = 'Lösenorden matchar inte';
+$wb['password_match_txt'] = 'Lösenorden matchar';
+$wb['globalsearch_resultslimit_of_txt'] = 'av';
+$wb['globalsearch_resultslimit_results_txt'] = 'resultat';
+$wb['globalsearch_noresults_text_txt'] = 'Inga resultat';
+$wb['globalsearch_noresults_limit_txt'] = '0 resultat';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Sök';
+$wb['globalsearch_suggestions_text_txt'] = 'Förslag';
+$wb['database_ro_user_txt'] = 'Databasanvändare med enbart läsrättigheter';
+$wb['optional_txt'] = 'valfritt';
+$wb['select_dbuser_txt'] = 'Välj databasanvändare';
+$wb['no_dbuser_txt'] = 'Ingen';
 $wb['database_client_differs_txt'] = 'The client of the parent web and the database do not match.';
-$wb['database_user_missing_txt'] = 'Please select a database user for this database.';
+$wb['database_user_missing_txt'] = 'Vänligen välj en databasanvändare för den här databasen.';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_database_admin_list.lng b/interface/web/sites/lib/lang/se_database_admin_list.lng
index 27e62b9..fe415d3 100644
--- a/interface/web/sites/lib/lang/se_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/se_database_admin_list.lng
@@ -1,11 +1,12 @@
 <?php
-$wb['list_head_txt'] = 'Database';
-$wb['active_txt'] = 'Active';
-$wb['remote_access_txt'] = 'Remote Access';
+$wb['list_head_txt'] = 'Databas';
+$wb['active_txt'] = 'Aktiv';
+$wb['remote_access_txt'] = 'Fjärråtkomst';
 $wb['server_id_txt'] = 'Server';
-$wb['database_user_txt'] = 'Database user';
-$wb['database_name_txt'] = 'Database name';
-$wb['add_new_record_txt'] = 'Add new Database';
-$wb['sys_groupid_txt'] = 'Client';
-$wb['parent_domain_id_txt'] = 'Website';
+$wb['database_user_txt'] = 'Databasanvändare';
+$wb['database_name_txt'] = 'Databasnamn';
+$wb['add_new_record_txt'] = 'Lägg till ny databas';
+$wb['sys_groupid_txt'] = 'Kund';
+$wb['parent_domain_id_txt'] = 'Webbsida';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_database_list.lng b/interface/web/sites/lib/lang/se_database_list.lng
index b05ba12..3909b37 100644
--- a/interface/web/sites/lib/lang/se_database_list.lng
+++ b/interface/web/sites/lib/lang/se_database_list.lng
@@ -1,10 +1,11 @@
 <?php
-$wb['list_head_txt'] = 'Database';
-$wb['active_txt'] = 'Active';
-$wb['remote_access_txt'] = 'Remote Access';
+$wb['list_head_txt'] = 'Databas';
+$wb['active_txt'] = 'Aktiv';
+$wb['remote_access_txt'] = 'Fjärråtkomst';
 $wb['server_id_txt'] = 'Server';
-$wb['database_name_txt'] = 'Database name';
-$wb['add_new_record_txt'] = 'Add new Database';
-$wb['database_user_txt'] = 'Database user';
-$wb['parent_domain_id_txt'] = 'Website';
+$wb['database_name_txt'] = 'Databasnamn';
+$wb['add_new_record_txt'] = 'Lägg till ny databas';
+$wb['database_user_txt'] = 'Databasanvändare';
+$wb['parent_domain_id_txt'] = 'Webbsida';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_database_user.lng b/interface/web/sites/lib/lang/se_database_user.lng
index 66a0718..c707175 100644
--- a/interface/web/sites/lib/lang/se_database_user.lng
+++ b/interface/web/sites/lib/lang/se_database_user.lng
@@ -1,23 +1,24 @@
 <?php
-$wb['database_user_txt'] = 'Database user';
-$wb['database_password_txt'] = 'Database password';
-$wb['password_strength_txt'] = 'Password strength';
-$wb['client_txt'] = 'Client';
-$wb['active_txt'] = 'Active';
-$wb['database_user_error_empty'] = 'Database user is empty.';
+$wb['database_user_txt'] = 'Databasanvändare';
+$wb['database_password_txt'] = 'Databaslösenord';
+$wb['password_strength_txt'] = 'Lösenordsstyrka';
+$wb['client_txt'] = 'Kund';
+$wb['active_txt'] = 'Aktiv';
+$wb['database_user_error_empty'] = 'Databasanvändare är tomt';
 $wb['database_user_error_unique'] = 'There is already a database user with this name on the server. To get a unique name, e.g. prepend your domain name to the username.';
 $wb['database_user_error_regex'] = 'Invalid database user name. The username may contain these characters: a-z, A-Z, 0-9 and the underscore. Length: 2 - 64 characters.';
 $wb['database_user_error_len'] = 'Database username - {user} - too long. The max. database username length incl. prefix is 16 chars.';
-$wb['btn_save_txt'] = 'Save';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['globalsearch_resultslimit_of_txt'] = 'of';
-$wb['globalsearch_resultslimit_results_txt'] = 'results';
-$wb['globalsearch_noresults_text_txt'] = 'No results.';
-$wb['globalsearch_noresults_limit_txt'] = '0 results';
-$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
-$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['btn_save_txt'] = 'Spara';
+$wb['btn_cancel_txt'] = 'Avbryt';
+$wb['generate_password_txt'] = 'Generera lösenord';
+$wb['repeat_password_txt'] = 'Upprepa lösenord';
+$wb['password_mismatch_txt'] = 'Lösenorden matchar inte';
+$wb['password_match_txt'] = 'Lösenorden matchar';
+$wb['globalsearch_resultslimit_of_txt'] = 'av';
+$wb['globalsearch_resultslimit_results_txt'] = 'resultat';
+$wb['globalsearch_noresults_text_txt'] = 'Inga resultat';
+$wb['globalsearch_noresults_limit_txt'] = '0 resultat';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Sök';
+$wb['globalsearch_suggestions_text_txt'] = 'Förslag';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_database_user_admin_list.lng b/interface/web/sites/lib/lang/se_database_user_admin_list.lng
index d7f88c4..6eca0b7 100644
--- a/interface/web/sites/lib/lang/se_database_user_admin_list.lng
+++ b/interface/web/sites/lib/lang/se_database_user_admin_list.lng
@@ -1,6 +1,7 @@
 <?php
-$wb['list_head_txt'] = 'Database User';
-$wb['database_user_txt'] = 'Database user';
-$wb['add_new_record_txt'] = 'Add new User';
-$wb['sys_groupid_txt'] = 'Client';
+$wb['list_head_txt'] = 'Databasanvändare';
+$wb['database_user_txt'] = 'Databasanvändare';
+$wb['add_new_record_txt'] = 'Lägg till ny användare';
+$wb['sys_groupid_txt'] = 'Kund';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_database_user_list.lng b/interface/web/sites/lib/lang/se_database_user_list.lng
index 8c22649..cb62444 100644
--- a/interface/web/sites/lib/lang/se_database_user_list.lng
+++ b/interface/web/sites/lib/lang/se_database_user_list.lng
@@ -1,5 +1,6 @@
 <?php
-$wb['list_head_txt'] = 'Database user';
-$wb['database_user_txt'] = 'Database user';
-$wb['add_new_record_txt'] = 'Add new user';
+$wb['list_head_txt'] = 'Databasanvändare';
+$wb['database_user_txt'] = 'Databasanvändare';
+$wb['add_new_record_txt'] = 'Lägg till ny användare';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_ftp_user.lng b/interface/web/sites/lib/lang/se_ftp_user.lng
index 7177b50..50d9031 100644
--- a/interface/web/sites/lib/lang/se_ftp_user.lng
+++ b/interface/web/sites/lib/lang/se_ftp_user.lng
@@ -1,34 +1,35 @@
 <?php
 $wb['uid_txt'] = 'UID';
 $wb['gid_txt'] = 'GID';
-$wb['dir_txt'] = 'Directory';
-$wb['quota_files_txt'] = 'Filequota';
-$wb['ul_ratio_txt'] = 'Uploadratio';
-$wb['dl_ratio_txt'] = 'Downloadratio';
-$wb['ul_bandwidth_txt'] = 'Uploadbandwidth';
-$wb['dl_bandwidth_txt'] = 'Downloadbandwidth';
+$wb['dir_txt'] = 'Katalog';
+$wb['quota_files_txt'] = 'Filkvot';
+$wb['ul_ratio_txt'] = 'Uppladdningsratio';
+$wb['dl_ratio_txt'] = 'Nerladdningsratio';
+$wb['ul_bandwidth_txt'] = 'Uppladdningsbandbredd';
+$wb['dl_bandwidth_txt'] = 'Nedladdningsbandbredd';
 $wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['username_txt'] = 'Username';
-$wb['password_txt'] = 'Password';
-$wb['password_strength_txt'] = 'Password strength';
-$wb['quota_size_txt'] = 'Harddisk-Quota';
-$wb['active_txt'] = 'Active';
+$wb['parent_domain_id_txt'] = 'Webbsida';
+$wb['username_txt'] = 'Användarnamn';
+$wb['password_txt'] = 'Lösenord';
+$wb['password_strength_txt'] = 'Lösenordsstyrka';
+$wb['quota_size_txt'] = 'Lagringskvot';
+$wb['active_txt'] = 'Aktiv';
 $wb['limit_ftp_user_txt'] = 'The max. number of FTP users for your account is reached.';
-$wb['username_error_empty'] = 'Username is empty.';
-$wb['username_error_unique'] = 'The username must be unique.';
+$wb['username_error_empty'] = 'Användarnamnet är tomt';
+$wb['username_error_unique'] = 'Användarnamnet måste vara unikt.';
 $wb['username_error_regex'] = 'The username contains characters that are not allowed.';
-$wb['quota_size_error_empty'] = 'Quota is empty.';
-$wb['uid_error_empty'] = 'GID empty.';
-$wb['directory_error_empty'] = 'Directory empty.';
-$wb['quota_files_unity_txt'] = 'Files';
-$wb['directory_error_notinweb'] = 'Directory not inside of web root directory.';
-$wb['parent_domain_id_error_empty'] = 'No website selected.';
+$wb['quota_size_error_empty'] = 'Kvotafältet är tomt.';
+$wb['uid_error_empty'] = 'GID-fältet är tomt.';
+$wb['directory_error_empty'] = 'Katalogfältet empty.';
+$wb['quota_files_unity_txt'] = 'Filer';
+$wb['directory_error_notinweb'] = 'Katalogen ligger utanför webbisdans root-katalog.';
+$wb['parent_domain_id_error_empty'] = 'Ingen webbsida vald.';
 $wb['quota_size_error_regex'] = 'Quota: enter a -1 for unlimited or a number > 0';
-$wb['dir_dot_error'] = 'No .. in path allowed.';
-$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['dir_dot_error'] = 'Tecknet .. tillåts inte i sökvägen.';
+$wb['dir_slashdot_error'] = 'Tecknet ./ tillåts inte i sökvägen';
+$wb['generate_password_txt'] = 'Generera lösenord';
+$wb['repeat_password_txt'] = 'Upprepa lösenord';
+$wb['password_mismatch_txt'] = 'Lösenorden matchar inte';
+$wb['password_match_txt'] = 'Lösenorden matchar';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_ftp_user_list.lng b/interface/web/sites/lib/lang/se_ftp_user_list.lng
index 6ef3e37..c833d1a 100644
--- a/interface/web/sites/lib/lang/se_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/se_ftp_user_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'FTP-User';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'FTP-användare';
+$wb['active_txt'] = 'Aktiv';
 $wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['username_txt'] = 'Username';
-$wb['add_new_record_txt'] = 'Add new FTP-User';
+$wb['parent_domain_id_txt'] = 'Webbsida';
+$wb['username_txt'] = 'Användarnamn';
+$wb['add_new_record_txt'] = 'Lägg till ny FTP-användare';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_shell_user.lng b/interface/web/sites/lib/lang/se_shell_user.lng
index 8460d4e..b2d0083 100644
--- a/interface/web/sites/lib/lang/se_shell_user.lng
+++ b/interface/web/sites/lib/lang/se_shell_user.lng
@@ -29,3 +29,4 @@
 $wb['username_must_not_exceed_32_chars_txt'] = 'The username must not exceed 32 characters.';
 $wb['username_not_allowed_txt'] = 'The username is not allowed.';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_shell_user_list.lng b/interface/web/sites/lib/lang/se_shell_user_list.lng
index 4a9d7cb..3389173 100644
--- a/interface/web/sites/lib/lang/se_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/se_shell_user_list.lng
@@ -6,3 +6,4 @@
 $wb['username_txt'] = 'Username';
 $wb['add_new_record_txt'] = 'Add new Shell-User';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_user_quota_stats_list.lng b/interface/web/sites/lib/lang/se_user_quota_stats_list.lng
index 7fe4791..2084a49 100644
--- a/interface/web/sites/lib/lang/se_user_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/se_user_quota_stats_list.lng
@@ -7,3 +7,4 @@
 $wb['soft_txt'] = 'Soft limit';
 $wb['files_txt'] = 'Single files';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_web_aliasdomain.lng b/interface/web/sites/lib/lang/se_web_aliasdomain.lng
index 4149c71..ecbc150 100644
--- a/interface/web/sites/lib/lang/se_web_aliasdomain.lng
+++ b/interface/web/sites/lib/lang/se_web_aliasdomain.lng
@@ -113,3 +113,4 @@
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/se_web_aliasdomain_list.lng
index 8ea34c4..4860654 100644
--- a/interface/web/sites/lib/lang/se_web_aliasdomain_list.lng
+++ b/interface/web/sites/lib/lang/se_web_aliasdomain_list.lng
@@ -12,3 +12,4 @@
 $wb['no_flag_txt'] = 'No flag';
 $wb['none_txt'] = 'None';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_web_backup_list.lng b/interface/web/sites/lib/lang/se_web_backup_list.lng
index 9a10ca6..261304d 100644
--- a/interface/web/sites/lib/lang/se_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/se_web_backup_list.lng
@@ -1,15 +1,16 @@
 <?php
-$wb['list_head_txt'] = 'Existing backups';
-$wb['date_txt'] = 'Date';
-$wb['backup_type_txt'] = 'Type';
-$wb['filename_txt'] = 'Backup file';
-$wb['restore_backup_txt'] = 'Restore backup';
-$wb['download_backup_txt'] = 'Download backup';
+$wb['list_head_txt'] = 'Existerande backuper';
+$wb['date_txt'] = 'Datum';
+$wb['backup_type_txt'] = 'Typ';
+$wb['filename_txt'] = 'Backupfil';
+$wb['restore_backup_txt'] = 'Återställ backup';
+$wb['download_backup_txt'] = 'Ladda ner backup';
 $wb['download_info_txt'] = 'The backup file will be available for download in the backup folder of the website in a few minutes.';
 $wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
 $wb['restore_confirm_txt'] = 'Restoring will overwrite existing files in your website. Do you really want to restore this backup?';
 $wb['download_pending_txt'] = 'There is already a pending backup download job.';
 $wb['restore_pending_txt'] = 'There is already a pending backup restore job.';
-$wb['backup_type_mysql'] = 'MySQL Database';
-$wb['backup_type_web'] = 'Website files';
+$wb['backup_type_mysql'] = 'MySQL-databaser';
+$wb['backup_type_web'] = 'Webbsidefiler';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_web_domain.lng b/interface/web/sites/lib/lang/se_web_domain.lng
index 6c9ff3e..e281579 100644
--- a/interface/web/sites/lib/lang/se_web_domain.lng
+++ b/interface/web/sites/lib/lang/se_web_domain.lng
@@ -1,22 +1,22 @@
 <?php
-$wb['ssl_state_txt'] = 'State';
+$wb['ssl_state_txt'] = 'Status';
 $wb['ssl_locality_txt'] = 'Locality';
 $wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_organisation_unit_txt'] = 'Organisationsenhet';
+$wb['ssl_country_txt'] = 'Land';
+$wb['ssl_request_txt'] = 'SSL-förfrågan';
+$wb['ssl_cert_txt'] = 'SSL-certifikat';
 $wb['ssl_bundle_txt'] = 'SSL Bundle';
 $wb['ssl_action_txt'] = 'SSL Action';
 $wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
+$wb['domain_txt'] = 'Domän';
+$wb['type_txt'] = 'Typ';
+$wb['parent_domain_id_txt'] = 'Föräldrawebbsida';
+$wb['redirect_type_txt'] = 'Omdirigeringstyp';
+$wb['redirect_path_txt'] = 'Omdirigeringssökväg';
+$wb['active_txt'] = 'Aktiv';
+$wb['document_root_txt'] = 'Dokumentroot';
+$wb['system_user_txt'] = 'Linuxanvändare';
 $wb['system_group_txt'] = 'Linux Group';
 $wb['ip_address_txt'] = 'IP-Address';
 $wb['vhost_type_txt'] = 'VHost Type';
@@ -111,20 +111,21 @@
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['no_server_error'] = 'No server selected.';
-$wb['no_backup_txt'] = 'No backup';
-$wb['daily_backup_txt'] = 'Daily';
-$wb['weekly_backup_txt'] = 'Weekly';
-$wb['monthly_backup_txt'] = 'Monthly';
-$wb['rewrite_rules_txt'] = 'Rewrite Rules';
-$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['no_server_error'] = 'Ingen server vald';
+$wb['no_backup_txt'] = 'Ingen backup';
+$wb['daily_backup_txt'] = 'Daglig';
+$wb['weekly_backup_txt'] = 'Veckovis';
+$wb['monthly_backup_txt'] = 'Månatlig';
+$wb['rewrite_rules_txt'] = 'Omskrivningsregler';
+$wb['invalid_rewrite_rules_txt'] = 'Ogiltiga omskrivningsregler';
 $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
 $wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
-$wb['variables_txt'] = 'Variables';
-$wb['added_by_txt'] = 'Added by';
-$wb['added_date_txt'] = 'Added date';
+$wb['variables_txt'] = 'Variabler';
+$wb['added_by_txt'] = 'Tillagd av';
+$wb['added_date_txt'] = 'Tillagd datum';
 $wb['backup_excludes_txt'] = 'Excluded Directories';
 $wb['backup_excludes_note_txt'] = '(Separate multiple directories with commas. Example: web/cache/*,web/backup)';
 $wb['backup_excludes_error_regex'] = 'The excluded directories contain invalid characters.';
-$wb['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings';
+$wb['invalid_custom_php_ini_settings_txt'] = 'Ogiltiga php.ini-inställningar';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_web_domain_admin_list.lng b/interface/web/sites/lib/lang/se_web_domain_admin_list.lng
index b460e27..0737245 100644
--- a/interface/web/sites/lib/lang/se_web_domain_admin_list.lng
+++ b/interface/web/sites/lib/lang/se_web_domain_admin_list.lng
@@ -7,3 +7,4 @@
 $wb['domain_txt'] = 'Domain';
 $wb['add_new_record_txt'] = 'Add new website';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_web_domain_list.lng b/interface/web/sites/lib/lang/se_web_domain_list.lng
index 88ec412..eabd544 100644
--- a/interface/web/sites/lib/lang/se_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/se_web_domain_list.lng
@@ -6,3 +6,4 @@
 $wb['domain_txt'] = 'Domain';
 $wb['add_new_record_txt'] = 'Add new website';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_web_folder.lng b/interface/web/sites/lib/lang/se_web_folder.lng
index 2f06a70..96553c5 100644
--- a/interface/web/sites/lib/lang/se_web_folder.lng
+++ b/interface/web/sites/lib/lang/se_web_folder.lng
@@ -1,8 +1,9 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['path_txt'] = 'Path';
-$wb['active_txt'] = 'Active';
-$wb['path_error_regex'] = 'Invalid folder path.';
-$wb['error_folder_already_protected_txt'] = 'There is already a record for this folder.';
+$wb['parent_domain_id_txt'] = 'Webbsida';
+$wb['path_txt'] = 'Sökväg';
+$wb['active_txt'] = 'Aktiv';
+$wb['path_error_regex'] = 'Ogiltig katalogsökväg';
+$wb['error_folder_already_protected_txt'] = 'Det finns redan ett inlägg för den här mappen.';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_web_folder_list.lng b/interface/web/sites/lib/lang/se_web_folder_list.lng
index 76d9702..194e744 100644
--- a/interface/web/sites/lib/lang/se_web_folder_list.lng
+++ b/interface/web/sites/lib/lang/se_web_folder_list.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Folder';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Katalog';
+$wb['active_txt'] = 'Aktiv';
 $wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['path_txt'] = 'Path';
+$wb['parent_domain_id_txt'] = 'Webbsida';
+$wb['path_txt'] = 'Sökväg';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_web_folder_user.lng b/interface/web/sites/lib/lang/se_web_folder_user.lng
index 1dbc905..0c52cfa 100644
--- a/interface/web/sites/lib/lang/se_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/se_web_folder_user.lng
@@ -1,14 +1,15 @@
 <?php
-$wb['web_folder_id_txt'] = 'Folder';
-$wb['username_txt'] = 'Username';
-$wb['password_txt'] = 'Password';
-$wb['active_txt'] = 'Active';
-$wb['folder_error_empty'] = 'No web folder selecetd.';
-$wb['password_strength_txt'] = 'Password strength';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
-$wb['no_folder_perm'] = 'You have no permission for this folder.';
-$wb['error_user_exists_already_txt'] = 'There is already a record for this user.';
+$wb['web_folder_id_txt'] = 'Katalog';
+$wb['username_txt'] = 'Användarnamn';
+$wb['password_txt'] = 'Lösenord';
+$wb['active_txt'] = 'Aktiv';
+$wb['folder_error_empty'] = 'Ingen webbkatalog vald';
+$wb['password_strength_txt'] = 'Lösenordsstyrka:';
+$wb['generate_password_txt'] = 'Generera lösenord';
+$wb['repeat_password_txt'] = 'Upprepa lösenord';
+$wb['password_mismatch_txt'] = 'Lösenorden matchar inte';
+$wb['password_match_txt'] = 'Lösenorden matchar';
+$wb['no_folder_perm'] = 'Du har inga rättigheter för denna katalog';
+$wb['error_user_exists_already_txt'] = 'Det finns redan ett inlägg för denna användare';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_web_folder_user_list.lng b/interface/web/sites/lib/lang/se_web_folder_user_list.lng
index 9a7286a..3af6f70 100644
--- a/interface/web/sites/lib/lang/se_web_folder_user_list.lng
+++ b/interface/web/sites/lib/lang/se_web_folder_user_list.lng
@@ -4,3 +4,4 @@
 $wb['web_folder_id_txt'] = 'Folder';
 $wb['username_txt'] = 'Username';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_web_sites_stats_list.lng b/interface/web/sites/lib/lang/se_web_sites_stats_list.lng
index 28d4e1f..66137dc 100644
--- a/interface/web/sites/lib/lang/se_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/se_web_sites_stats_list.lng
@@ -1,9 +1,10 @@
 <?php
-$wb['list_head_txt'] = 'Web traffic';
-$wb['domain_txt'] = 'Domain';
-$wb['this_month_txt'] = 'This month';
-$wb['last_month_txt'] = 'Last month';
-$wb['this_year_txt'] = 'This year';
-$wb['last_year_txt'] = 'Last year';
-$wb['sum_txt'] = 'Sum';
+$wb['list_head_txt'] = 'Webbtrafik';
+$wb['domain_txt'] = 'Domän';
+$wb['this_month_txt'] = 'Denna månad';
+$wb['last_month_txt'] = 'Föregående månad';
+$wb['this_year_txt'] = 'I år';
+$wb['last_year_txt'] = 'Förra året';
+$wb['sum_txt'] = 'Total';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_web_subdomain.lng b/interface/web/sites/lib/lang/se_web_subdomain.lng
index d86c166..8955209 100644
--- a/interface/web/sites/lib/lang/se_web_subdomain.lng
+++ b/interface/web/sites/lib/lang/se_web_subdomain.lng
@@ -1,46 +1,47 @@
 <?php
-$wb['ssl_state_txt'] = 'State';
+$wb['ssl_state_txt'] = 'Status';
 $wb['ssl_locality_txt'] = 'Locality';
 $wb['ssl_organisation_txt'] = 'Organisation';
-$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
-$wb['ssl_country_txt'] = 'Country';
-$wb['ssl_request_txt'] = 'SSL Request';
-$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_organisation_unit_txt'] = 'Organisationseneht';
+$wb['ssl_country_txt'] = 'Land';
+$wb['ssl_request_txt'] = 'SSL-förfrågan';
+$wb['ssl_cert_txt'] = 'SSL Certifikat';
 $wb['ssl_bundle_txt'] = 'SSL Bundle';
 $wb['ssl_action_txt'] = 'SSL Action';
 $wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['type_txt'] = 'Type';
-$wb['parent_domain_id_txt'] = 'Parent Website';
-$wb['redirect_type_txt'] = 'Redirect Type';
-$wb['redirect_path_txt'] = 'Redirect Path';
-$wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
-$wb['system_user_txt'] = 'Linux User';
-$wb['system_group_txt'] = 'Linux Group';
-$wb['ip_address_txt'] = 'IP-Address';
+$wb['domain_txt'] = 'Domän';
+$wb['type_txt'] = 'Typ';
+$wb['parent_domain_id_txt'] = 'Föräldrawebbsida';
+$wb['redirect_type_txt'] = 'Omdirigeringstyp';
+$wb['redirect_path_txt'] = 'Omdirigeringssökväg';
+$wb['active_txt'] = 'Aktiv';
+$wb['document_root_txt'] = 'Dokumentroot';
+$wb['system_user_txt'] = 'Linuxanvändare';
+$wb['system_group_txt'] = 'Linuxgrupp';
+$wb['ip_address_txt'] = 'IP-adress';
 $wb['vhost_type_txt'] = 'VHost Type';
-$wb['hd_quota_txt'] = 'Harddisk Quota';
-$wb['traffic_quota_txt'] = 'Traffic Quaota';
+$wb['hd_quota_txt'] = 'Hårddiskkvota';
+$wb['traffic_quota_txt'] = 'Trafikkvota';
 $wb['cgi_txt'] = 'CGI';
 $wb['ssi_txt'] = 'SSI';
 $wb['ssl_txt'] = 'SSL';
 $wb['suexec_txt'] = 'SuEXEC';
 $wb['php_txt'] = 'PHP';
-$wb['client_txt'] = 'Client';
+$wb['client_txt'] = 'Kund';
 $wb['limit_web_domain_txt'] = 'The max. number of web domains for your account is reached.';
 $wb['limit_web_aliasdomain_txt'] = 'The max. number of aliasdomains for your account is reached.';
 $wb['limit_web_subdomain_txt'] = 'The max. number of web subdomains for your account is reached.';
 $wb['apache_directives_txt'] = 'Apache directives';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['domain_error_unique'] = 'Domain must be unique.';
-$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_empty'] = 'Domänfältet är tomt';
+$wb['domain_error_unique'] = 'Domännamnet måste vara unikt';
+$wb['domain_error_regex'] = 'Domännamnet är ogiltigt';
 $wb['host_txt'] = 'Host';
 $wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
+$wb['no_redirect_txt'] = 'Ingen omdirigering';
+$wb['no_flag_txt'] = 'Ingan flagga';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
+$wb['error_proxy_requires_url'] = 'Redirect Type "proxy" requires a URL as the redirect path.';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_web_subdomain_list.lng b/interface/web/sites/lib/lang/se_web_subdomain_list.lng
index 1c16bcd..58084a6 100644
--- a/interface/web/sites/lib/lang/se_web_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/se_web_subdomain_list.lng
@@ -6,3 +6,4 @@
 $wb['domain_txt'] = 'Subdomain';
 $wb['add_new_record_txt'] = 'Add new subdomain';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/se_web_vhost_subdomain.lng
index c0ca93b..409c830 100644
--- a/interface/web/sites/lib/lang/se_web_vhost_subdomain.lng
+++ b/interface/web/sites/lib/lang/se_web_vhost_subdomain.lng
@@ -125,3 +125,4 @@
 $wb['backup_excludes_error_regex'] = 'The excluded directories contain invalid characters.';
 $wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng
index 1c16bcd..9604437 100644
--- a/interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng
+++ b/interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Subdomains';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Underdomäner';
+$wb['active_txt'] = 'Aktiv';
 $wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
+$wb['parent_domain_id_txt'] = 'Webbsida';
+$wb['domain_txt'] = 'Underdomän';
+$wb['add_new_record_txt'] = 'Lägg till ny underdomän';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_webdav_user.lng b/interface/web/sites/lib/lang/se_webdav_user.lng
index 329eb60..4c3fe5e 100644
--- a/interface/web/sites/lib/lang/se_webdav_user.lng
+++ b/interface/web/sites/lib/lang/se_webdav_user.lng
@@ -1,21 +1,22 @@
 <?php
-$wb['dir_txt'] = 'Directory';
+$wb['dir_txt'] = 'Katalog';
 $wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['username_txt'] = 'Username';
-$wb['password_txt'] = 'Password';
-$wb['password_strength_txt'] = 'Password strength';
-$wb['active_txt'] = 'Active';
+$wb['parent_domain_id_txt'] = 'Webbsida';
+$wb['username_txt'] = 'Användarnamn';
+$wb['password_txt'] = 'Lösenord';
+$wb['password_strength_txt'] = 'Lösenordsstyrka';
+$wb['active_txt'] = 'Aktiv';
 $wb['limit_webdav_user_txt'] = 'The max. number of webdav users for your account is reached.';
-$wb['username_error_empty'] = 'Username is empty.';
+$wb['username_error_empty'] = 'Användarnamn är tomt';
 $wb['username_error_unique'] = 'The username must be unique.';
 $wb['username_error_regex'] = 'The username contains characters that are not allowed.';
 $wb['directory_error_empty'] = 'Directory empty.';
-$wb['parent_domain_id_error_empty'] = 'No website selected.';
-$wb['dir_dot_error'] = 'No .. in path allowed.';
-$wb['dir_slashdot_error'] = 'No ./ in path allowed.';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['parent_domain_id_error_empty'] = 'Ingen webbsida vald';
+$wb['dir_dot_error'] = 'Tecknen .. i sökvägen är inte tillåtet';
+$wb['dir_slashdot_error'] = 'Tecknen ./ i sökvägen är inte tiillåtet';
+$wb['generate_password_txt'] = 'Generera lösenord';
+$wb['repeat_password_txt'] = 'Repetera lösenord';
+$wb['password_mismatch_txt'] = 'Lösenorden matchar inte';
+$wb['password_match_txt'] = 'Lösenorden matchar';
 ?>
+
diff --git a/interface/web/sites/lib/lang/se_webdav_user_list.lng b/interface/web/sites/lib/lang/se_webdav_user_list.lng
index bac283b..96bd318 100644
--- a/interface/web/sites/lib/lang/se_webdav_user_list.lng
+++ b/interface/web/sites/lib/lang/se_webdav_user_list.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Webdav-User';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Webdav-användare';
+$wb['active_txt'] = 'Aktiv';
 $wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['username_txt'] = 'Username';
-$wb['add_new_record_txt'] = 'Add new Webdav-User';
+$wb['parent_domain_id_txt'] = 'Webbsida';
+$wb['username_txt'] = 'Användarnamn';
+$wb['add_new_record_txt'] = 'Lägg till ny WebDAV-användare';
 ?>
+
diff --git a/interface/web/strengthmeter/lib/lang/se_strengthmeter.lng b/interface/web/strengthmeter/lib/lang/se_strengthmeter.lng
index 2a6de41..16dcfff 100644
--- a/interface/web/strengthmeter/lib/lang/se_strengthmeter.lng
+++ b/interface/web/strengthmeter/lib/lang/se_strengthmeter.lng
@@ -1,8 +1,9 @@
 <?php
-$wb['password_strength_0_txt'] = 'Too short';
-$wb['password_strength_1_txt'] = 'Weak';
-$wb['password_strength_2_txt'] = 'Fair';
-$wb['password_strength_3_txt'] = 'Good';
-$wb['password_strength_4_txt'] = 'Strong';
-$wb['password_strength_5_txt'] = 'Very strong';
+$wb['password_strength_0_txt'] = 'För kort';
+$wb['password_strength_1_txt'] = 'Svagt';
+$wb['password_strength_2_txt'] = 'Sådär';
+$wb['password_strength_3_txt'] = 'Bra';
+$wb['password_strength_4_txt'] = 'Starkt';
+$wb['password_strength_5_txt'] = 'Mycket starkt';
 ?>
+
diff --git a/interface/web/themes/blue/templates/main.tpl.htm b/interface/web/themes/blue/templates/main.tpl.htm
index 8d6ffde..70c4f26 100644
--- a/interface/web/themes/blue/templates/main.tpl.htm
+++ b/interface/web/themes/blue/templates/main.tpl.htm
@@ -22,7 +22,7 @@
             jQuery(document).ready(function() {
                 loadInitContent();
 				
-				$('form').attr('autocomplete','off');
+				$('form').not('#dummy_login_form').attr('autocomplete','off');
                 
                 $("#pageForm").submit(function(e){
                     //Prevent form submit: e.preventDefault() in lists
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index dee8117..9146291 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -18,11 +18,14 @@
         <script type="text/javascript" src="js/uni-form/uni-form.jquery.js"></script>
         <script type="text/javascript" src="js/jquery.ispconfigsearch.js"></script>
         <script type="text/javascript" src="js/jquery.tipsy.js"></script>
+        <tmpl_loop name="js_d_includes">
+            <script type="text/javascript" src="js/js.d/<tmpl_var name='file'>"></script>
+        </tmpl_loop>
         <script language="JavaScript" type="text/javascript">
             jQuery(document).ready(function() {
                 loadInitContent();
 				
-				$('form').attr('autocomplete','off');
+				$('form').not('#dummy_login_form').attr('autocomplete','off');
                 
                 $("#pageForm").submit(function(e){
                     //Prevent form submit: e.preventDefault() in lists
diff --git a/interface/web/tools/lib/lang/se.lng b/interface/web/tools/lib/lang/se.lng
index 5809d72..5c93f2b 100644
--- a/interface/web/tools/lib/lang/se.lng
+++ b/interface/web/tools/lib/lang/se.lng
@@ -1,13 +1,14 @@
 <?php
-$wb['User Settings'] = 'User Settings';
-$wb['Settings'] = 'Settings';
-$wb['ISPConfig Tools'] = 'ISPConfig Tools';
-$wb['Password and Language'] = 'Password and Language';
+$wb['User Settings'] = 'Användarinstälningar';
+$wb['Settings'] = 'Inställnignar';
+$wb['ISPConfig Tools'] = 'ISPConfig Verktyg';
+$wb['Password and Language'] = 'Lösenord och språk';
 $wb['ispconfig_tools_note'] = 'This module allows you to change the password and language and to start a resync of the DNS records.';
-$wb['Resync'] = 'Resync';
-$wb['Sync Tools'] = 'Sync Tools';
-$wb['Import'] = 'Import';
-$wb['ISPConfig 3 mail'] = 'ISPConfig 3 mail';
+$wb['Resync'] = 'Synka';
+$wb['Sync Tools'] = 'Synkverktyg';
+$wb['Import'] = 'Importera';
+$wb['ISPConfig 3 mail'] = 'ISPConfig 3 epost';
 $wb['PDNS Tupa'] = 'PowerDNS Tupa';
 $wb['Interface'] = 'Interface';
 ?>
+
diff --git a/interface/web/tools/lib/lang/se_import_ispconfig.lng b/interface/web/tools/lib/lang/se_import_ispconfig.lng
index ce47c4d..0aad8ad 100644
--- a/interface/web/tools/lib/lang/se_import_ispconfig.lng
+++ b/interface/web/tools/lib/lang/se_import_ispconfig.lng
@@ -1,23 +1,24 @@
 <?php
-$wb['head_txt'] = 'Import email configuration from ISPConfig 3';
-$wb['legend_txt'] = 'Remote server connection details';
-$wb['legend2_txt'] = 'Import email domain';
-$wb['resync_sites_txt'] = 'Resync Websites';
-$wb['resync_ftp_txt'] = 'Resync FTP users';
-$wb['resync_shell_txt'] = 'Resync shell users';
-$wb['resync_cron_txt'] = 'Resync cronjobs';
+$wb['head_txt'] = 'Importera epostkonfiguration från ISPConfig 3';
+$wb['legend_txt'] = 'Fjärrserverns anslutningsuppgifter';
+$wb['legend2_txt'] = 'Import era epostdomän';
+$wb['resync_sites_txt'] = 'Synka webbsidor';
+$wb['resync_ftp_txt'] = 'Synka FTP-användare';
+$wb['resync_shell_txt'] = 'Synka shell-användare';
+$wb['resync_cron_txt'] = 'Synka cron-jobb';
 $wb['resync_db_txt'] = 'Resync clientdb config';
-$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
-$wb['resync_dns_txt'] = 'Resync DNS records';
-$wb['btn_start_txt'] = 'Start Import';
-$wb['btn_connect_txt'] = 'Connect to remote server';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['client_group_id_txt'] = 'Local client';
-$wb['mail_domain_txt'] = 'Remote email domain';
-$wb['import_mailbox_txt'] = 'Import mailbox';
-$wb['import_aliasdomain_txt'] = 'Import alias domain';
-$wb['import_alias_txt'] = 'Import email alias';
-$wb['import_forward_txt'] = 'Import forward';
-$wb['import_user_filter_txt'] = 'Import user filter';
-$wb['import_spamfilter_txt'] = 'Import spamfilter';
+$wb['resync_mailbox_txt'] = 'Synka epostkonton';
+$wb['resync_dns_txt'] = 'Synka DNS-inlägg';
+$wb['btn_start_txt'] = 'Starta import';
+$wb['btn_connect_txt'] = 'Anslut till fjärrserver';
+$wb['btn_cancel_txt'] = 'Avbryt';
+$wb['client_group_id_txt'] = 'Lokal kund';
+$wb['mail_domain_txt'] = 'Fjärrepostdomän';
+$wb['import_mailbox_txt'] = 'Imporera epostkonto';
+$wb['import_aliasdomain_txt'] = 'Importera aliasdomän';
+$wb['import_alias_txt'] = 'Importera epostalias';
+$wb['import_forward_txt'] = 'Importera vidarebefordring';
+$wb['import_user_filter_txt'] = 'Importera användarfilter';
+$wb['import_spamfilter_txt'] = 'Importera spamfilter';
 ?>
+
diff --git a/interface/web/tools/lib/lang/se_index.lng b/interface/web/tools/lib/lang/se_index.lng
index a3ef38f..cf5012f 100644
--- a/interface/web/tools/lib/lang/se_index.lng
+++ b/interface/web/tools/lib/lang/se_index.lng
@@ -1,4 +1,5 @@
 <?php
-$wb['page_head_txt'] = 'ISPConfig Tools';
-$wb['page_desc_txt'] = 'Change user settings';
+$wb['page_head_txt'] = 'ISPConfig verktyg';
+$wb['page_desc_txt'] = 'Ändra användarinställningar';
 ?>
+
diff --git a/interface/web/tools/lib/lang/se_interface.lng b/interface/web/tools/lib/lang/se_interface.lng
index aab4fc8..8336796 100644
--- a/interface/web/tools/lib/lang/se_interface.lng
+++ b/interface/web/tools/lib/lang/se_interface.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['interface_head_txt'] = 'Interface Settings';
-$wb['interface_desc_txt'] = 'Modify your interface';
-$wb['language_txt'] = 'Language';
-$wb['startmodule_txt'] = 'Startmodule';
+$wb['interface_head_txt'] = 'Gränssnittsinställnignar';
+$wb['interface_desc_txt'] = 'Ändra ditt gränssnitt';
+$wb['language_txt'] = 'Språk';
+$wb['startmodule_txt'] = 'Startmodul';
 $wb['app_theme_txt'] = 'Design';
 ?>
+
diff --git a/interface/web/tools/lib/lang/se_tpl_default.lng b/interface/web/tools/lib/lang/se_tpl_default.lng
index c062463..4c0fd71 100644
--- a/interface/web/tools/lib/lang/se_tpl_default.lng
+++ b/interface/web/tools/lib/lang/se_tpl_default.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Default Theme settings';
-$wb['list_desc_txt'] = 'Modify default-theme specific options';
-$wb['no_settings_txt'] = 'There are no settings for the default theme.';
-$wb['btn_start_txt'] = 'Save';
-$wb['btn_cancel_txt'] = 'Back';
+$wb['list_head_txt'] = 'Förinställda temainställningar';
+$wb['list_desc_txt'] = 'Redigera val specifikt för det förvada temat';
+$wb['no_settings_txt'] = 'Det finns inga instälningar för det förvalda temat';
+$wb['btn_start_txt'] = 'Spara';
+$wb['btn_cancel_txt'] = 'Tillbaka';
 ?>
+
diff --git a/interface/web/tools/lib/lang/se_usersettings.lng b/interface/web/tools/lib/lang/se_usersettings.lng
index a1f3bd2..85176ac 100644
--- a/interface/web/tools/lib/lang/se_usersettings.lng
+++ b/interface/web/tools/lib/lang/se_usersettings.lng
@@ -1,12 +1,13 @@
 <?php
-$wb['passwort_txt'] = 'Password';
-$wb['password_strength_txt'] = 'Password strength';
-$wb['language_txt'] = 'Language';
+$wb['passwort_txt'] = 'Lösenord';
+$wb['password_strength_txt'] = 'Lösenordsstyrka';
+$wb['language_txt'] = 'Språk';
 $wb['password_mismatch'] = 'The password in the second password field does not match the first password.';
-$wb['Form to edit the user password and language.'] = 'Form to edit the user password and language.';
-$wb['Settings'] = 'Settings';
-$wb['generate_password_txt'] = 'Generate Password';
-$wb['repeat_password_txt'] = 'Repeat Password';
-$wb['password_mismatch_txt'] = 'The passwords do not match.';
-$wb['password_match_txt'] = 'The passwords do match.';
+$wb['Form to edit the user password and language.'] = 'Formulär för att redigera lösenord och språk.';
+$wb['Settings'] = 'Inställningar';
+$wb['generate_password_txt'] = 'Generera lösenord';
+$wb['repeat_password_txt'] = 'Upprepa lösenord';
+$wb['password_mismatch_txt'] = 'Lösenorden matchar inte';
+$wb['password_match_txt'] = 'Lösenorden matchar';
 ?>
+
diff --git a/interface/web/vm/lib/lang/se.lng b/interface/web/vm/lib/lang/se.lng
index 4167e14..5c1ab58 100644
--- a/interface/web/vm/lib/lang/se.lng
+++ b/interface/web/vm/lib/lang/se.lng
@@ -5,3 +5,4 @@
 $wb['IP addresses'] = 'IP addresses';
 $wb['OpenVZ'] = 'OpenVZ';
 ?>
+
diff --git a/interface/web/vm/lib/lang/se_openvz_action.lng b/interface/web/vm/lib/lang/se_openvz_action.lng
index 52f7328..71e7263 100644
--- a/interface/web/vm/lib/lang/se_openvz_action.lng
+++ b/interface/web/vm/lib/lang/se_openvz_action.lng
@@ -14,3 +14,4 @@
 $wb['ostemplate_name_unique_error'] = 'There is already a OSTemplate with that name.';
 $wb['ostemplate_exec_txt'] = 'The command to create a OSTemplate has been sent to the host server. It will take several minutes until the OSTemplate has been created.';
 ?>
+
diff --git a/interface/web/vm/lib/lang/se_openvz_ip.lng b/interface/web/vm/lib/lang/se_openvz_ip.lng
index 6016681..67f6885 100644
--- a/interface/web/vm/lib/lang/se_openvz_ip.lng
+++ b/interface/web/vm/lib/lang/se_openvz_ip.lng
@@ -7,3 +7,4 @@
 $wb['ip_error_unique'] = 'This IP address does already exist.';
 $wb['IP address'] = 'IP address';
 ?>
+
diff --git a/interface/web/vm/lib/lang/se_openvz_ip_list.lng b/interface/web/vm/lib/lang/se_openvz_ip_list.lng
index e6a3a68..37c1d62e 100644
--- a/interface/web/vm/lib/lang/se_openvz_ip_list.lng
+++ b/interface/web/vm/lib/lang/se_openvz_ip_list.lng
@@ -5,3 +5,4 @@
 $wb['reserved_txt'] = 'Reserved';
 $wb['vm_id_txt'] = 'VM';
 ?>
+
diff --git a/interface/web/vm/lib/lang/se_openvz_ostemplate.lng b/interface/web/vm/lib/lang/se_openvz_ostemplate.lng
index 256750f..bfeb299 100644
--- a/interface/web/vm/lib/lang/se_openvz_ostemplate.lng
+++ b/interface/web/vm/lib/lang/se_openvz_ostemplate.lng
@@ -9,3 +9,4 @@
 $wb['template_file_error_empty'] = 'Template filename is empty.';
 $wb['Template'] = 'Template';
 ?>
+
diff --git a/interface/web/vm/lib/lang/se_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/se_openvz_ostemplate_list.lng
index 6471ec0..df01680 100644
--- a/interface/web/vm/lib/lang/se_openvz_ostemplate_list.lng
+++ b/interface/web/vm/lib/lang/se_openvz_ostemplate_list.lng
@@ -6,3 +6,4 @@
 $wb['allservers_txt'] = 'Exists on all servers';
 $wb['ostemplate_id_txt'] = 'ID';
 ?>
+
diff --git a/interface/web/vm/lib/lang/se_openvz_template.lng b/interface/web/vm/lib/lang/se_openvz_template.lng
index d285512..0887164 100644
--- a/interface/web/vm/lib/lang/se_openvz_template.lng
+++ b/interface/web/vm/lib/lang/se_openvz_template.lng
@@ -91,3 +91,4 @@
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
 ?>
+
diff --git a/interface/web/vm/lib/lang/se_openvz_template_list.lng b/interface/web/vm/lib/lang/se_openvz_template_list.lng
index de4045c..6e4d911 100644
--- a/interface/web/vm/lib/lang/se_openvz_template_list.lng
+++ b/interface/web/vm/lib/lang/se_openvz_template_list.lng
@@ -3,3 +3,4 @@
 $wb['active_txt'] = 'Active';
 $wb['template_name_txt'] = 'Template name';
 ?>
+
diff --git a/interface/web/vm/lib/lang/se_openvz_vm.lng b/interface/web/vm/lib/lang/se_openvz_vm.lng
index f2be022..4698fe6 100644
--- a/interface/web/vm/lib/lang/se_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/se_openvz_vm.lng
@@ -38,3 +38,4 @@
 $wb['Virtual server'] = 'Virtual server';
 $wb['Advanced'] = 'Advanced';
 ?>
+
diff --git a/interface/web/vm/lib/lang/se_openvz_vm_list.lng b/interface/web/vm/lib/lang/se_openvz_vm_list.lng
index 2238e2b..a534a65 100644
--- a/interface/web/vm/lib/lang/se_openvz_vm_list.lng
+++ b/interface/web/vm/lib/lang/se_openvz_vm_list.lng
@@ -8,3 +8,4 @@
 $wb['ip_address_txt'] = 'IP address';
 $wb['veid_txt'] = 'VEID';
 ?>
+
diff --git a/server/conf/nginx_apps.vhost.master b/server/conf/nginx_apps.vhost.master
index a8fe664..2c720b5 100644
--- a/server/conf/nginx_apps.vhost.master
+++ b/server/conf/nginx_apps.vhost.master
@@ -5,7 +5,7 @@
 
         root   {apps_vhost_dir};
 
-        client_max_body_size 20M;
+        client_max_body_size 100M;
 
         location / {
                index index.php index.html;
diff --git a/server/conf/php_fpm_pool.conf.master b/server/conf/php_fpm_pool.conf.master
index a7a4c64..7f5c8e1 100644
--- a/server/conf/php_fpm_pool.conf.master
+++ b/server/conf/php_fpm_pool.conf.master
@@ -8,7 +8,7 @@
 listen = <tmpl_var name='fpm_socket'>
 listen.owner = <tmpl_var name='fpm_user'>
 listen.group = <tmpl_var name='fpm_group'>
-listen.mode = <tmpl_vare name='fpm_listen_mode'>
+listen.mode = <tmpl_var name='fpm_listen_mode'>
 </tmpl_if>
 
 user = <tmpl_var name='fpm_user'>
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index f78efe5..5a110cc 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -335,7 +335,9 @@
 		RewriteCond %{REQUEST_URI} !^/php5-fcgi/
 		RewriteCond %{REQUEST_URI} !^<tmpl_var name='rewrite_target'>
 </tmpl_if>
-		RewriteRule   ^/(.*)$ <tmpl_var name='rewrite_target'><tmpl_if name="rewrite_add_path" op="==" value="y">$1</tmpl_if>  <tmpl_var name='rewrite_type'>
+		
+		RewriteRule   ^/(.*)$ <tmpl_var name='rewrite_target'><tmpl_if name="rewrite_add_path" op="==" value="y">$1</tmpl_if>  <tmpl_if name='rewrite_type' value=''><tmpl_if name="rewrite_is_url" op="==" value="n">[PT]</tmpl_if></tmpl_else><tmpl_var name='rewrite_type'></tmpl_if>
+	
 </tmpl_loop>
 </tmpl_if>
 
diff --git a/server/mods-available/rescue_core_module.inc.php b/server/mods-available/rescue_core_module.inc.php
index ca69a91..2f905d9 100644
--- a/server/mods-available/rescue_core_module.inc.php
+++ b/server/mods-available/rescue_core_module.inc.php
@@ -382,7 +382,7 @@
 	 * @param type $daemon the name of the daemon
 	 */
 	private function _rescueDaemon($daemon){
-		global $conf;
+		global $conf, $app;
 
 		$app->uses('system');
 		// if you need to find all restarts search for "['init_scripts']"
diff --git a/server/mods-available/web_module.inc.php b/server/mods-available/web_module.inc.php
index c31aa67..666e845 100644
--- a/server/mods-available/web_module.inc.php
+++ b/server/mods-available/web_module.inc.php
@@ -217,6 +217,11 @@
 		} else {
 			exec($app->system->getinitcommand($daemon, 'reload').' 2>&1', $retval['output'], $retval['retval']);
 		}
+		
+		// nginx: do a syntax check because on some distributions, the init script always returns 0 - even if the syntax is not ok (how stupid is that?)
+		if($web_config['server_type'] == 'nginx' && $retval['retval'] == 0){
+			exec('nginx -t 2>&1', $retval['output'], $retval['retval']);
+		}
 		return $retval;
 	}
 
diff --git a/server/plugins-available/bind_plugin.inc.php b/server/plugins-available/bind_plugin.inc.php
index dd7021c..2f7f932 100644
--- a/server/plugins-available/bind_plugin.inc.php
+++ b/server/plugins-available/bind_plugin.inc.php
@@ -106,6 +106,7 @@
 			if(is_array($records) && !empty($records)){
 				for($i=0;$i<sizeof($records);$i++){
 					if($records[$i]['ttl'] == 0) $records[$i]['ttl'] = '';
+					if($records[$i]['name'] == '') $records[$i]['name'] = '@';
 					//* Split TXT records, if nescessary
 					if($records[$i]['type'] == 'TXT' && strlen($records[$i]['data']) > 255) {
 						$records[$i]['data'] = implode('" "',str_split( $records[$i]['data'], 255));
diff --git a/server/plugins-available/cron_plugin.inc.php b/server/plugins-available/cron_plugin.inc.php
index 8ea86c3..fe00713 100644
--- a/server/plugins-available/cron_plugin.inc.php
+++ b/server/plugins-available/cron_plugin.inc.php
@@ -213,7 +213,7 @@
 					}
 
 					$command .= "\t";
-					if($job['type'] != 'chrooted' && substr($job['command'], 0, 1) != "/") $command .= $this->parent_domain['document_root'].'/';
+					//if($job['type'] != 'chrooted' && substr($job['command'], 0, 1) != "/") $command .= $this->parent_domain['document_root'].'/';
 					$command .= $job['command'];
 				}
 
diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php
index 9816b70..90ed677 100755
--- a/server/plugins-available/shelluser_jailkit_plugin.inc.php
+++ b/server/plugins-available/shelluser_jailkit_plugin.inc.php
@@ -33,6 +33,7 @@
 	//* $plugin_name and $class_name have to be the same then the name of this class
 	var $plugin_name = 'shelluser_jailkit_plugin';
 	var $class_name = 'shelluser_jailkit_plugin';
+	var $min_uid = 499;
 
 	//* This function is called during ispconfig installation to determine
 	//  if a symlink shall be created for this plugin.
@@ -73,50 +74,60 @@
 		$app->uses('system');
 		$web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$data['new']['parent_domain_id']);
 
-		if($app->system->is_user($data['new']['username'])) {
+		if($app->system->is_user($data['new']['puser'])) {
+			// Get the UID of the parent user
+			$uid = intval($app->system->getuid($data['new']['puser']));
+			if($uid > $this->min_uid) {
+			
+				if($app->system->is_user($data['new']['username'])) {
 
-			/**
-			 * Setup Jailkit Chroot System If Enabled
-			 */
+					/**
+					* Setup Jailkit Chroot System If Enabled
+					*/
+
+					if ($data['new']['chroot'] == "jailkit")
+					{
 
 
-			if ($data['new']['chroot'] == "jailkit")
-			{
+						// load the server configuration options
+						$app->uses("getconf");
+						$this->data = $data;
+						$this->app = $app;
+						$this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit');
 
+						$this->_update_website_security_level();
 
-				// load the server configuration options
-				$app->uses("getconf");
-				$this->data = $data;
-				$this->app = $app;
-				$this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit');
+						$app->system->web_folder_protection($web['document_root'], false);
 
-				$this->_update_website_security_level();
+						$this->_setup_jailkit_chroot();
 
-				$app->system->web_folder_protection($web['document_root'], false);
+						$this->_add_jailkit_user();
 
-				$this->_setup_jailkit_chroot();
+						//* call the ssh-rsa update function
+						$this->_setup_ssh_rsa();
 
-				$this->_add_jailkit_user();
+						//$command .= 'usermod -s /usr/sbin/jk_chrootsh -U '.escapeshellcmd($data['new']['username']);
+						//exec($command);
+						$app->system->usermod($data['new']['username'], 0, 0, '', '/usr/sbin/jk_chrootsh', '', '');
 
-				//* call the ssh-rsa update function
-				$this->_setup_ssh_rsa();
+						//* Unlock user
+						$command = 'usermod -U '.escapeshellcmd($data['new']['username']).' 2>/dev/null';
+						exec($command);
 
-				//$command .= 'usermod -s /usr/sbin/jk_chrootsh -U '.escapeshellcmd($data['new']['username']);
-				//exec($command);
-				$app->system->usermod($data['new']['username'], 0, 0, '', '/usr/sbin/jk_chrootsh', '', '');
+						$this->_update_website_security_level();
+						$app->system->web_folder_protection($web['document_root'], true);
+					}
 
-				//* Unlock user
-				$command = 'usermod -U '.escapeshellcmd($data['new']['username']).' 2>/dev/null';
-				exec($command);
+					$app->log("Jailkit Plugin -> insert username:".$data['new']['username'], LOGLEVEL_DEBUG);
 
-				$this->_update_website_security_level();
-				$app->system->web_folder_protection($web['document_root'], true);
+				} else {
+					$app->log("Jailkit Plugin -> insert username:".$data['new']['username']." skipped, the user does not exist.", LOGLEVEL_WARN);
+				}
+			} else {
+				$app->log("UID = $uid for shelluser:".$data['new']['username']." not allowed.", LOGLEVEL_ERROR);
 			}
-
-			$app->log("Jailkit Plugin -> insert username:".$data['new']['username'], LOGLEVEL_DEBUG);
-
 		} else {
-			$app->log("Jailkit Plugin -> insert username:".$data['new']['username']." skipped, the user does not exist.", LOGLEVEL_WARN);
+			$app->log("Skipping insertion of user:".$data['new']['username'].", parent user ".$data['new']['puser']." does not exist.", LOGLEVEL_WARN);
 		}
 
 	}
@@ -128,41 +139,51 @@
 		$app->uses('system');
 		$web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$data['new']['parent_domain_id']);
 
-		if($app->system->is_user($data['new']['username'])) {
+		if($app->system->is_user($data['new']['puser'])) {
+			// Get the UID of the parent user
+			$uid = intval($app->system->getuid($data['new']['puser']));
+			if($uid > $this->min_uid) {
+			
+			
+				if($app->system->is_user($data['new']['username'])) {
 
+					/**
+					* Setup Jailkit Chroot System If Enabled
+					*/
+					if ($data['new']['chroot'] == "jailkit")
+					{
 
+						// load the server configuration options
+						$app->uses("getconf");
+						$this->data = $data;
+						$this->app = $app;
+						$this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit');
 
-			/**
-			 * Setup Jailkit Chroot System If Enabled
-			 */
-			if ($data['new']['chroot'] == "jailkit")
-			{
+						$this->_update_website_security_level();
 
-				// load the server configuration options
-				$app->uses("getconf");
-				$this->data = $data;
-				$this->app = $app;
-				$this->jailkit_config = $app->getconf->get_server_config($conf["server_id"], 'jailkit');
+						$app->system->web_folder_protection($web['document_root'], false);
 
-				$this->_update_website_security_level();
+						$this->_setup_jailkit_chroot();
+						$this->_add_jailkit_user();
 
-				$app->system->web_folder_protection($web['document_root'], false);
+						//* call the ssh-rsa update function
+						$this->_setup_ssh_rsa();
 
-				$this->_setup_jailkit_chroot();
-				$this->_add_jailkit_user();
+						$this->_update_website_security_level();
 
-				//* call the ssh-rsa update function
-				$this->_setup_ssh_rsa();
+						$app->system->web_folder_protection($web['document_root'], true);
+					}
 
-				$this->_update_website_security_level();
+					$app->log("Jailkit Plugin -> update username:".$data['new']['username'], LOGLEVEL_DEBUG);
 
-				$app->system->web_folder_protection($web['document_root'], true);
+				} else {
+					$app->log("Jailkit Plugin -> update username:".$data['new']['username']." skipped, the user does not exist.", LOGLEVEL_WARN);
+				}
+			} else {
+				$app->log("UID = $uid for shelluser:".$data['new']['username']." not allowed.", LOGLEVEL_ERROR);
 			}
-
-			$app->log("Jailkit Plugin -> update username:".$data['new']['username'], LOGLEVEL_DEBUG);
-
 		} else {
-			$app->log("Jailkit Plugin -> update username:".$data['new']['username']." skipped, the user does not exist.", LOGLEVEL_WARN);
+			$app->log("Skipping update for user:".$data['new']['username'].", parent user ".$data['new']['puser']." does not exist.", LOGLEVEL_WARN);
 		}
 
 	}

--
Gitblit v1.9.1