From ddb086444da4d110437d30134b3fff7243cff801 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 31 Jan 2016 16:32:36 +0100
Subject: [PATCH 1/6] Updated version number to 3.1a1.

---
 install/sql/ispconfig3.sql        | 2 +-
 install/tpl/config.inc.php.master | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index fedb106bd3..68cf272f08 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -2468,7 +2468,7 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
 -- Dumping data for table `sys_config`
 --
 
-INSERT INTO sys_config VALUES ('db','db_version','3.1dev');
+INSERT INTO sys_config VALUES ('db','db_version','3.1a1');
 INSERT INTO sys_config VALUES ('interface','session_timeout','0');
 
 SET FOREIGN_KEY_CHECKS = 1;
diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 02a7b2f65c..3521173689 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);
 
 //** Application
 define('ISPC_APP_TITLE', 'ISPConfig');
-define('ISPC_APP_VERSION', '3.1dev');
+define('ISPC_APP_VERSION', '3.1a1');
 define('DEVSYSTEM', 0);
 
 
-- 
GitLab


From d82de9c3b06b3b4e845330be57f7f69ce06bef0a Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 31 Jan 2016 16:51:25 +0100
Subject: [PATCH 2/6] - fixed upload form problem (CSRF and message)

---
 .../default/assets/javascripts/ispconfig.js     | 17 +++++++++++++----
 .../default/assets/javascripts/ispconfig.min.js |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/interface/web/themes/default/assets/javascripts/ispconfig.js b/interface/web/themes/default/assets/javascripts/ispconfig.js
index 3c72f846fc..b369b5345f 100644
--- a/interface/web/themes/default/assets/javascripts/ispconfig.js
+++ b/interface/web/themes/default/assets/javascripts/ispconfig.js
@@ -237,29 +237,38 @@ var ISPConfig = {
 			} catch(e) {
 				response = responseStr;
 			}
+			var $response = $('<div></div>').html(response);
 			var msg = '';
-			var okmsg = $('#OKMsg',response).html();
+			var okmsg = $response.find('#OKMsg').html();
 			if(okmsg){
 				msg = '<div id="OKMsg">'+okmsg+'</div>';
 			}
-			var errormsg = $('#errorMsg',response).html();
+			var errormsg = $response.find('#errorMsg').html();
 			if(errormsg){
 				msg = msg+'<div id="errorMsg">'+errormsg+'</div>';
 			}
+			
+			var csrf_key = $response.find('input[name="_csrf_key"]').val();
+			var csrf_id = $response.find('input[name="_csrf_id"]').val();
+			
+			msg = msg + '<input type="hidden" name="_csrf_id" value="' + csrf_id + '" /><input type="hidden" name="_csrf_key" value="' + csrf_key + '" />';
+			
 			return msg;
 
 		};
 
 		var frame_id = 'ajaxUploader-iframe-' + Math.round(new Date().getTime() / 1000);
-		$('body').after('<iframe width="0" height="0" style="display:none;" name="'+frame_id+'" id="'+frame_id+'"/>');
-		$('input[type="file"]').closest("form").attr({target: frame_id, action: target}).submit();
+		$('body').append('<iframe width="0" height="0" style="display:none;" name="'+frame_id+'" id="'+frame_id+'"/>');
 		$('#'+frame_id).load(function() {
 			var msg = handleResponse(this);
 			$('#errorMsg').remove();
 			$('#OKMsg').remove();
+			$('input[name="_csrf_key"]').remove();
+			$('input[name="_csrf_id"]').remove();
 			$('input[name="id"]').before(msg);
 			$(this).remove();
 		  });
+		$('input[type="file"]').closest("form").attr({target: frame_id, action: target}).submit();
 	},
 
 	capp: function(module, redirect) {
diff --git a/interface/web/themes/default/assets/javascripts/ispconfig.min.js b/interface/web/themes/default/assets/javascripts/ispconfig.min.js
index 27a9f6d389..2bd12342c9 100644
--- a/interface/web/themes/default/assets/javascripts/ispconfig.min.js
+++ b/interface/web/themes/default/assets/javascripts/ispconfig.min.js
@@ -1 +1 @@
-var ISPConfig={pageFormChanged:false,tabChangeWarningTxt:"",tabChangeDiscardTxt:"",tabChangeWarning:false,tabChangeDiscard:false,requestsRunning:0,indicatorCompleted:false,registeredHooks:new Array(),new_tpl_add_id:0,options:{useLoadIndicator:false,useComboBox:false},setOption:function(a,b){ISPConfig.options[a]=b},setOptions:function(a){$.extend(ISPConfig.options,a)},reportError:function(a){},registerHook:function(a,c){if(!ISPConfig.registeredHooks[a]){ISPConfig.registeredHooks[a]=new Array()}var b=ISPConfig.registeredHooks[a].length;ISPConfig.registeredHooks[a][b]=c},callHook:function(a,c){if(!ISPConfig.registeredHooks[a]){return}for(var b=0;b<ISPConfig.registeredHooks[a].length;b++){var d=ISPConfig.registeredHooks[a][b];d(a,c)}},resetFormChanged:function(){ISPConfig.pageFormChanged=false},showLoadIndicator:function(){document.body.style.cursor="wait";if(ISPConfig.options.useLoadIndicator==true){ISPConfig.requestsRunning+=1;if(ISPConfig.requestsRunning<2){var a=$("#ajaxloader");if(a.length<1){a=$('<div id="ajaxloader" style="display: none;"></div>');a.appendTo("body")}var b=$("#content");if(b.length<1){return}ISPConfig.indicatorCompleted=false;var d=b.offset().left+150;var c=b.offset().top+150;a.css({left:d,top:c}).fadeIn("fast",function(){ISPConfig.indicatorCompleted=true;if(ISPConfig.requestsRunning<1){$(this).fadeOut("fast",function(){$(this).hide()})}})}}},hideLoadIndicator:function(){document.body.style.cursor="";ISPConfig.requestsRunning-=1;if(ISPConfig.requestsRunning<1){ISPConfig.requestsRunning=0;if(ISPConfig.indicatorCompleted==true){$("#ajaxloader").fadeOut("fast",function(){$("#ajaxloader").hide()})}}},onAfterSideNavLoaded:function(){if(ISPConfig.options.useComboBox==true){$("#sidebar").find("select:not(.chosen-select)").select2({placeholder:"",width:"element",selectOnBlur:true,allowClear:true})}},onAfterContentLoad:function(a,b){if(!b){b=""}else{b="&"+b}if(ISPConfig.options.useComboBox==true){$("#pageContent").find("select:not(.chosen-select)").select2({placeholder:"",width:"element",selectOnBlur:true,allowClear:true,formatResult:function(c){if(c.id&&$(c.element).parent().hasClass("flags")){return'<span class="flags flag-'+c.id.toLowerCase()+'">'+c.text+"</span>"}else{return c.text}},formatSelection:function(c){if(c.id&&$(c.element).parent().hasClass("flags")){return'<span class="flags flag-'+c.id.toLowerCase()+'">'+c.text+"</span>"}else{return c.text}}}).on("change",function(c){if($("#pageForm .table #Filter").length>0){$("#pageForm .table #Filter").trigger("click")}})}$('input[data-input-element="date"]').datetimepicker({language:"en",todayHighlight:true,todayBtn:"linked",bootcssVer:3,fontAwesome:true,autoclose:true,minView:"month"});$('input[data-input-element="datetime"]').datetimepicker({language:"en",todayHighlight:true,todayBtn:"linked",bootcssVer:3,fontAwesome:true,autoclose:true});ISPConfig.callHook("onAfterContentLoad",{url:a,data:b})},submitForm:function(d,e,c){var b=arguments[3];if(!c){c=false}if(!c||window.confirm(c)){var a=$.ajax({type:"POST",url:e,data:$("#"+d).serialize(),dataType:"html",beforeSend:function(){ISPConfig.showLoadIndicator()},success:function(g,i,f){if(b){alert(b)}if(f.responseText.indexOf("HEADER_REDIRECT:")>-1){var h=f.responseText.split(":");ISPConfig.loadContent(h[1])}else{if(f.responseText.indexOf("LOGIN_REDIRECT:")>-1){document.location.href="/index.php"}else{$("#pageContent").html(f.responseText);ISPConfig.onAfterContentLoad(e,$("#"+d).serialize());ISPConfig.pageFormChanged=false}}ISPConfig.hideLoadIndicator()},error:function(f,i,h){ISPConfig.hideLoadIndicator();var g=f.responseText.split(":");ISPConfig.reportError("Ajax Request was not successful. 111")}})}},submitUploadForm:function(c,d){var b=function(l){var g,h=l.contentWindow.document.body.innerHTML;try{g=JSON.parse(h)}catch(i){g=h}var j="";var f=$("#OKMsg",g).html();if(f){j='<div id="OKMsg">'+f+"</div>"}var k=$("#errorMsg",g).html();if(k){j=j+'<div id="errorMsg">'+k+"</div>"}return j};var a="ajaxUploader-iframe-"+Math.round(new Date().getTime()/1000);$("body").after('<iframe width="0" height="0" style="display:none;" name="'+a+'" id="'+a+'"/>');$('input[type="file"]').closest("form").attr({target:a,action:d}).submit();$("#"+a).load(function(){var e=b(this);$("#errorMsg").remove();$("#OKMsg").remove();$('input[name="id"]').before(e);$(this).remove()})},capp:function(b,c){var a=$.ajax({type:"GET",url:"capp.php",data:"mod="+b+((c!=undefined)?"&redirect="+c:""),dataType:"html",beforeSend:function(){ISPConfig.showLoadIndicator()},success:function(e,h,d){if(d.responseText!=""){if(d.responseText.indexOf("HEADER_REDIRECT:")>-1){var g=d.responseText.split(":");ISPConfig.loadContent(g[1])}else{if(d.responseText.indexOf("URL_REDIRECT:")>-1){var f=d.responseText.substr(d.responseText.indexOf("URL_REDIRECT:")+"URL_REDIRECT:".length);document.location.href=f}else{}}}ISPConfig.loadMenus();ISPConfig.hideLoadIndicator()},error:function(){ISPConfig.hideLoadIndicator();ISPConfig.reportError("Ajax Request was not successful."+b)}})},loadContent:function(b){var c=arguments[1];var a=$.ajax({type:"GET",url:b,data:(c?c:null),dataType:"html",beforeSend:function(){ISPConfig.showLoadIndicator()},success:function(e,h,d){if(d.responseText.indexOf("HEADER_REDIRECT:")>-1){var g=d.responseText.split(":");ISPConfig.loadContent(g[1])}else{if(d.responseText.indexOf("URL_REDIRECT:")>-1){var f=d.responseText.substr(d.responseText.indexOf("URL_REDIRECT:")+"URL_REDIRECT:".length);document.location.href=f}else{$("#pageContent").html(d.responseText);ISPConfig.onAfterContentLoad(b,(c?c:null));ISPConfig.pageFormChanged=false}}ISPConfig.hideLoadIndicator()},error:function(){ISPConfig.hideLoadIndicator();ISPConfig.reportError("Ajax Request was not successful. 113")}})},loadContentRefresh:function(b){if($("#refreshinterval").val()>0){var a=$.ajax({type:"GET",url:b,data:"refresh="+document.getElementById("refreshinterval").value,dataType:"html",beforeSend:function(){ISPConfig.showLoadIndicator()},success:function(d,e,c){ISPConfig.hideLoadIndicator();$("#pageContent").html(c.responseText);ISPConfig.onAfterContentLoad(b,"refresh="+document.getElementById("refreshinterval").value);ISPConfig.pageFormChanged=false},error:function(){ISPConfig.hideLoadIndicator();ISPConfig.reportError("Ajax Request was not successful."+b)}});setTimeout("ISPConfig.loadContentRefresh('"+b+"&refresh="+document.getElementById("refreshinterval").value+"')",document.getElementById("refreshinterval").value*1000*60)}},loadInitContent:function(){var a=$.ajax({type:"GET",url:"dashboard/dashboard.php",data:"",dataType:"html",beforeSend:function(){ISPConfig.showLoadIndicator()},success:function(c,e,b){if(b.responseText.indexOf("HEADER_REDIRECT:")>-1){var d=b.responseText.split(":");ISPConfig.loadContent(d[1])}else{$("#pageContent").html(b.responseText);ISPConfig.onAfterContentLoad("dashboard/dashboard.php","");ISPConfig.pageFormChanged=false}ISPConfig.hideLoadIndicator()},error:function(){ISPConfig.hideLoadIndicator();ISPConfig.reportError("Ajax Request was not successful. 114")}});ISPConfig.loadMenus();ISPConfig.keepalive();setTimeout(function(){try{$("form#pageForm").find('input[name="username"]').focus()}catch(b){}},1000)},loadMenus:function(){var b=$.ajax({type:"GET",url:"nav.php",data:"nav=side",dataType:"html",beforeSend:function(){ISPConfig.showLoadIndicator()},success:function(d,e,c){ISPConfig.hideLoadIndicator();$("#sidebar").html(c.responseText);ISPConfig.onAfterSideNavLoaded();ISPConfig.loadPushyMenu()},error:function(){ISPConfig.hideLoadIndicator();ISPConfig.reportError("Ajax Request was not successful. 115")}});var a=$.ajax({type:"GET",url:"nav.php",data:"nav=top",dataType:"html",beforeSend:function(){ISPConfig.showLoadIndicator()},success:function(d,e,c){ISPConfig.hideLoadIndicator();$("#topnav-container").html(c.responseText);ISPConfig.loadPushyMenu()},error:function(c){ISPConfig.hideLoadIndicator();ISPConfig.reportError("Ajax Request was not successful. 116")}})},changeTab:function(c,e,d){if(ISPConfig.requestsRunning>0){return false}document.pageForm.next_tab.value=c;var b=$("form#pageForm").find('[name="id"]');var f=null;if(b.length>0){f=b.val()}if(ISPConfig.tabChangeDiscard=="y"&&!d){if((b.length<1||f)&&(ISPConfig.pageFormChanged==false||window.confirm(ISPConfig.tabChangeDiscardTxt))){var a=c;if(f){ISPConfig.loadContent(e,{next_tab:a,id:f})}else{ISPConfig.loadContent(e,{next_tab:a})}}else{return false}}else{if(f&&ISPConfig.tabChangeWarning=="y"&&ISPConfig.pageFormChanged==true){if(window.confirm(ISPConfig.tabChangeWarningTxt)){ISPConfig.submitForm("pageForm",e)}else{var a=c;if(f){ISPConfig.loadContent(e,{next_tab:a,id:f})}else{ISPConfig.loadContent(e,{next_tab:a})}}}else{ISPConfig.submitForm("pageForm",e)}}},confirm_action:function(b,a){if(window.confirm(a)){ISPConfig.loadContent(b)}},loadContentInto:function(b,c){var a=$.ajax({type:"GET",url:c,dataType:"html",beforeSend:function(){},success:function(e,f,d){$("#"+b).html(d.responseText)},error:function(){ISPConfig.reportError("Ajax Request was not successful. 118")}})},loadOptionInto:function(b,c,d){var a=$.ajax({type:"GET",url:c,dataType:"html",beforeSend:function(){},success:function(h,l,g){var j=g.responseText;var k=j.split("#");el=document.getElementById(b);el.innerHTML="";for(var f=0;f<k.length;++f){var e=document.createElement("option");e.appendChild(document.createTextNode(k[f]));e.value=k[f];el.appendChild(e)}if(typeof(d)!="undefined"){d(b,c)}},error:function(){ISPConfig.reportError("Ajax Request was not successful. 119")}})},keepalive:function(){var a=$.ajax({type:"GET",url:"keepalive.php",dataType:"html",success:function(c,d,b){setTimeout(function(){ISPConfig.keepalive()},1000000)},error:function(){ISPConfig.reportError("Session expired. Please login again.")}})},addAdditionalTemplate:function(){var e=$("#template_additional").val();var a=$("#tpl_add_select").val().split("|",2);var d=a[0];var f=a[1];if(d>0){var c=e.split("/");ISPConfig.new_tpl_add_id+=1;var b=$('<a href="#"></a>').attr("class","button icons16 icoDelete").click(function(g){g.preventDefault();ISPConfig.delAdditionalTemplate($(this).parent().attr("rel"))});c[c.length]="n"+ISPConfig.new_tpl_add_id+":"+d;$("<li>"+f+"</li>").attr("rel","n"+new_tpl_add_id).append(b).appendTo("#template_additional_list ul");$("#template_additional").val(c.join("/"));alert("additional template "+f+" added to customer")}else{alert("no additional template selcted")}},delAdditionalTemplate:function(d){var a=$("#template_additional").val();if(d){var l=$("#template_additional_list ul").find('li[rel="'+d+'"]').eq(0);var k=l.text();l.remove();var j=a.split("/");var b=new Array();for(var e=0;e<j.length;e++){var f=j[e].split(":",2);if(f.length==2&&f[0]==d){continue}b[b.length]=j[e]}$("#template_additional").val(b.join("/"));alert("additional template "+k+" deleted from customer")}else{if(a!=""){var c=document.getElementById("tpl_add_select").value.split("|",2);var h=c[0];var k=c[1];$("#template_additional_list ul").find("li:not([rel])").each(function(){var i=$(this).text();if(i==k){$(this).remove();return false}return this});var b=a;var g=new RegExp("(^|/)"+h+"(/|$)");b=b.replace(g,"");b=b.replace("//","/");$("#template_additional").val(b);alert("additional template "+k+" deleted from customer")}else{alert("no additional template selcted")}}}};$(document).on("change",function(a){var b=a.target.localName;if($("#pageForm .table #Filter").length>0&&b=="select"){a.preventDefault();$("#pageForm .table #Filter").trigger("click")}if(b=="select"||b=="input"||b=="textarea"){if($(a.target).hasClass("no-page-form-change")==false){ISPConfig.pageFormChanged=true}}});$(document).on("click","a[data-load-content],button[data-load-content]",function(b){b.preventDefault();$("html, body").animate({scrollTop:0},1000);var a=$(this).attr("data-load-content");if(!a){return this}ISPConfig.loadContent(a)});$(document).on("click","a[data-capp],button[data-capp]",function(b){b.preventDefault();$("html, body").animate({scrollTop:0},1000);var a=$(this).attr("data-capp");if(!a){return this}ISPConfig.capp(a)});$(document).on("click","a[data-submit-form],button[data-submit-form]",function(d){d.preventDefault();$("html, body").animate({scrollTop:0},1000);var b=$(this);var a=b.attr("data-form-action");var c=b.attr("data-submit-form");if(b.attr("data-form-upload")=="true"){ISPConfig.submitUploadForm(c,a)}else{ISPConfig.submitForm(c,a)}});$(document).bind("keypress",function(a){if(a.which=="13"&&$("#pageForm .table #Filter").length>0&&$(a.target).hasClass("ui-autocomplete-input")==false){a.preventDefault();$("#pageForm .table #Filter").trigger("click")}if(a.which=="13"&&$(".pnl_formsarea button.positive").length>0&&a.target.localName!="textarea"&&$(a.target).is(":input")){a.preventDefault();$(".pnl_formsarea button.positive:first").not("[disabled='disabled']").trigger("click")}});$(document).on("click","th[data-column]",function(h){var i=$(this);var d=i.attr("data-column");if(!d){return this}if($("#pageForm .table #Filter").length>0&&i.attr("data-sortable")!="false"){var c=$("#Filter");var a=c.attr("data-form-action");var f=c.attr("data-submit-form");var b=i.attr("data-ordered");var g="?";if(a.indexOf("?")>=0){g="&"}a=a+g+"orderby="+d;ISPConfig.submitForm(f,a);$(document).ajaxComplete(function(){var e=$('#pageForm .table th[data-column="'+d+'"]');e.parent().children("th[data-column]").removeAttr("data-ordered");if(b&&b=="asc"){e.attr("data-ordered","desc")}else{e.attr("data-ordered","asc")}})}});$(document).on("click",".addPlaceholder",function(){var a=$(this).text();var b=$(this).siblings(":input");b.insertAtCaret(a)});$(document).on("click",".addPlaceholderContent",function(){var b=$(this).find(".addPlaceholderContent").text();var a=$(this).siblings(":input");a.insertAtCaret(b)});$(document).on("ready",function(){$.fn.extend({insertAtCaret:function(a){return this.each(function(d){if(document.selection){this.focus();sel=document.selection.createRange();sel.text=a;this.focus()}else{if(this.selectionStart||this.selectionStart=="0"){var c=this.selectionStart;var b=this.selectionEnd;var e=this.scrollTop;this.value=this.value.substring(0,c)+a+this.value.substring(b,this.value.length);this.focus();this.selectionStart=c+a.length;this.selectionEnd=c+a.length;this.scrollTop=e}else{this.value+=a;this.focus()}}})}});$(".progress .progress-bar").css("width",function(){return $(this).attr("aria-valuenow")+"%"});ISPConfig.loadInitContent();$("#searchform").submit(function(a){a.preventDefault()});$("#pageForm").submit(function(a){if($("#pageForm .table #Filter").length>0){a.preventDefault()}})});
\ No newline at end of file
+var ISPConfig={pageFormChanged:false,tabChangeWarningTxt:"",tabChangeDiscardTxt:"",tabChangeWarning:false,tabChangeDiscard:false,requestsRunning:0,indicatorCompleted:false,registeredHooks:new Array(),new_tpl_add_id:0,options:{useLoadIndicator:false,useComboBox:false},setOption:function(a,b){ISPConfig.options[a]=b},setOptions:function(a){$.extend(ISPConfig.options,a)},reportError:function(a){},registerHook:function(a,c){if(!ISPConfig.registeredHooks[a]){ISPConfig.registeredHooks[a]=new Array()}var b=ISPConfig.registeredHooks[a].length;ISPConfig.registeredHooks[a][b]=c},callHook:function(a,c){if(!ISPConfig.registeredHooks[a]){return}for(var b=0;b<ISPConfig.registeredHooks[a].length;b++){var d=ISPConfig.registeredHooks[a][b];d(a,c)}},resetFormChanged:function(){ISPConfig.pageFormChanged=false},showLoadIndicator:function(){document.body.style.cursor="wait";if(ISPConfig.options.useLoadIndicator==true){ISPConfig.requestsRunning+=1;if(ISPConfig.requestsRunning<2){var a=$("#ajaxloader");if(a.length<1){a=$('<div id="ajaxloader" style="display: none;"></div>');a.appendTo("body")}var b=$("#content");if(b.length<1){return}ISPConfig.indicatorCompleted=false;var d=b.offset().left+150;var c=b.offset().top+150;a.css({left:d,top:c}).fadeIn("fast",function(){ISPConfig.indicatorCompleted=true;if(ISPConfig.requestsRunning<1){$(this).fadeOut("fast",function(){$(this).hide()})}})}}},hideLoadIndicator:function(){document.body.style.cursor="";ISPConfig.requestsRunning-=1;if(ISPConfig.requestsRunning<1){ISPConfig.requestsRunning=0;if(ISPConfig.indicatorCompleted==true){$("#ajaxloader").fadeOut("fast",function(){$("#ajaxloader").hide()})}}},onAfterSideNavLoaded:function(){if(ISPConfig.options.useComboBox==true){$("#sidebar").find("select:not(.chosen-select)").select2({placeholder:"",width:"element",selectOnBlur:true,allowClear:true})}},onAfterContentLoad:function(a,b){if(!b){b=""}else{b="&"+b}if(ISPConfig.options.useComboBox==true){$("#pageContent").find("select:not(.chosen-select)").select2({placeholder:"",width:"element",selectOnBlur:true,allowClear:true,formatResult:function(c){if(c.id&&$(c.element).parent().hasClass("flags")){return'<span class="flags flag-'+c.id.toLowerCase()+'">'+c.text+"</span>"}else{return c.text}},formatSelection:function(c){if(c.id&&$(c.element).parent().hasClass("flags")){return'<span class="flags flag-'+c.id.toLowerCase()+'">'+c.text+"</span>"}else{return c.text}}}).on("change",function(c){if($("#pageForm .table #Filter").length>0){$("#pageForm .table #Filter").trigger("click")}})}$('input[data-input-element="date"]').datetimepicker({language:"en",todayHighlight:true,todayBtn:"linked",bootcssVer:3,fontAwesome:true,autoclose:true,minView:"month"});$('input[data-input-element="datetime"]').datetimepicker({language:"en",todayHighlight:true,todayBtn:"linked",bootcssVer:3,fontAwesome:true,autoclose:true});ISPConfig.callHook("onAfterContentLoad",{url:a,data:b})},submitForm:function(d,e,c){var b=arguments[3];if(!c){c=false}if(!c||window.confirm(c)){var a=$.ajax({type:"POST",url:e,data:$("#"+d).serialize(),dataType:"html",beforeSend:function(){ISPConfig.showLoadIndicator()},success:function(g,i,f){if(b){alert(b)}if(f.responseText.indexOf("HEADER_REDIRECT:")>-1){var h=f.responseText.split(":");ISPConfig.loadContent(h[1])}else{if(f.responseText.indexOf("LOGIN_REDIRECT:")>-1){document.location.href="/index.php"}else{$("#pageContent").html(f.responseText);ISPConfig.onAfterContentLoad(e,$("#"+d).serialize());ISPConfig.pageFormChanged=false}}ISPConfig.hideLoadIndicator()},error:function(f,i,h){ISPConfig.hideLoadIndicator();var g=f.responseText.split(":");ISPConfig.reportError("Ajax Request was not successful. 111")}})}},submitUploadForm:function(c,d){var b=function(n){var h,j=n.contentWindow.document.body.innerHTML;try{h=JSON.parse(j)}catch(k){h=j}var o=$("<div></div>").html(h);var f="";var l=o.find("#OKMsg").html();if(l){f='<div id="OKMsg">'+l+"</div>"}var i=o.find("#errorMsg").html();if(i){f=f+'<div id="errorMsg">'+i+"</div>"}var m=o.find('input[name="_csrf_key"]').val();var g=o.find('input[name="_csrf_id"]').val();f=f+'<input type="hidden" name="_csrf_id" value="'+g+'" /><input type="hidden" name="_csrf_key" value="'+m+'" />';return f};var a="ajaxUploader-iframe-"+Math.round(new Date().getTime()/1000);$("body").append('<iframe width="0" height="0" style="display:none;" name="'+a+'" id="'+a+'"/>');$("#"+a).load(function(){var e=b(this);$("#errorMsg").remove();$("#OKMsg").remove();$('input[name="_csrf_key"]').remove();$('input[name="_csrf_id"]').remove();$('input[name="id"]').before(e);$(this).remove()});$('input[type="file"]').closest("form").attr({target:a,action:d}).submit()},capp:function(b,c){var a=$.ajax({type:"GET",url:"capp.php",data:"mod="+b+((c!=undefined)?"&redirect="+c:""),dataType:"html",beforeSend:function(){ISPConfig.showLoadIndicator()},success:function(e,h,d){if(d.responseText!=""){if(d.responseText.indexOf("HEADER_REDIRECT:")>-1){var g=d.responseText.split(":");ISPConfig.loadContent(g[1])}else{if(d.responseText.indexOf("URL_REDIRECT:")>-1){var f=d.responseText.substr(d.responseText.indexOf("URL_REDIRECT:")+"URL_REDIRECT:".length);document.location.href=f}else{}}}ISPConfig.loadMenus();ISPConfig.hideLoadIndicator()},error:function(){ISPConfig.hideLoadIndicator();ISPConfig.reportError("Ajax Request was not successful."+b)}})},loadContent:function(b){var c=arguments[1];var a=$.ajax({type:"GET",url:b,data:(c?c:null),dataType:"html",beforeSend:function(){ISPConfig.showLoadIndicator()},success:function(e,h,d){if(d.responseText.indexOf("HEADER_REDIRECT:")>-1){var g=d.responseText.split(":");ISPConfig.loadContent(g[1])}else{if(d.responseText.indexOf("URL_REDIRECT:")>-1){var f=d.responseText.substr(d.responseText.indexOf("URL_REDIRECT:")+"URL_REDIRECT:".length);document.location.href=f}else{$("#pageContent").html(d.responseText);ISPConfig.onAfterContentLoad(b,(c?c:null));ISPConfig.pageFormChanged=false}}ISPConfig.hideLoadIndicator()},error:function(){ISPConfig.hideLoadIndicator();ISPConfig.reportError("Ajax Request was not successful. 113")}})},loadContentRefresh:function(b){if($("#refreshinterval").val()>0){var a=$.ajax({type:"GET",url:b,data:"refresh="+document.getElementById("refreshinterval").value,dataType:"html",beforeSend:function(){ISPConfig.showLoadIndicator()},success:function(d,e,c){ISPConfig.hideLoadIndicator();$("#pageContent").html(c.responseText);ISPConfig.onAfterContentLoad(b,"refresh="+document.getElementById("refreshinterval").value);ISPConfig.pageFormChanged=false},error:function(){ISPConfig.hideLoadIndicator();ISPConfig.reportError("Ajax Request was not successful."+b)}});setTimeout("ISPConfig.loadContentRefresh('"+b+"&refresh="+document.getElementById("refreshinterval").value+"')",document.getElementById("refreshinterval").value*1000*60)}},loadInitContent:function(){var a=$.ajax({type:"GET",url:"dashboard/dashboard.php",data:"",dataType:"html",beforeSend:function(){ISPConfig.showLoadIndicator()},success:function(c,e,b){if(b.responseText.indexOf("HEADER_REDIRECT:")>-1){var d=b.responseText.split(":");ISPConfig.loadContent(d[1])}else{$("#pageContent").html(b.responseText);ISPConfig.onAfterContentLoad("dashboard/dashboard.php","");ISPConfig.pageFormChanged=false}ISPConfig.hideLoadIndicator()},error:function(){ISPConfig.hideLoadIndicator();ISPConfig.reportError("Ajax Request was not successful. 114")}});ISPConfig.loadMenus();ISPConfig.keepalive();setTimeout(function(){try{$("form#pageForm").find('input[name="username"]').focus()}catch(b){}},1000)},loadMenus:function(){var b=$.ajax({type:"GET",url:"nav.php",data:"nav=side",dataType:"html",beforeSend:function(){ISPConfig.showLoadIndicator()},success:function(d,e,c){ISPConfig.hideLoadIndicator();$("#sidebar").html(c.responseText);ISPConfig.onAfterSideNavLoaded();ISPConfig.loadPushyMenu()},error:function(){ISPConfig.hideLoadIndicator();ISPConfig.reportError("Ajax Request was not successful. 115")}});var a=$.ajax({type:"GET",url:"nav.php",data:"nav=top",dataType:"html",beforeSend:function(){ISPConfig.showLoadIndicator()},success:function(d,e,c){ISPConfig.hideLoadIndicator();$("#topnav-container").html(c.responseText);ISPConfig.loadPushyMenu()},error:function(c){ISPConfig.hideLoadIndicator();ISPConfig.reportError("Ajax Request was not successful. 116")}})},changeTab:function(c,e,d){if(ISPConfig.requestsRunning>0){return false}document.pageForm.next_tab.value=c;var b=$("form#pageForm").find('[name="id"]');var f=null;if(b.length>0){f=b.val()}if(ISPConfig.tabChangeDiscard=="y"&&!d){if((b.length<1||f)&&(ISPConfig.pageFormChanged==false||window.confirm(ISPConfig.tabChangeDiscardTxt))){var a=c;if(f){ISPConfig.loadContent(e,{next_tab:a,id:f})}else{ISPConfig.loadContent(e,{next_tab:a})}}else{return false}}else{if(f&&ISPConfig.tabChangeWarning=="y"&&ISPConfig.pageFormChanged==true){if(window.confirm(ISPConfig.tabChangeWarningTxt)){ISPConfig.submitForm("pageForm",e)}else{var a=c;if(f){ISPConfig.loadContent(e,{next_tab:a,id:f})}else{ISPConfig.loadContent(e,{next_tab:a})}}}else{ISPConfig.submitForm("pageForm",e)}}},confirm_action:function(b,a){if(window.confirm(a)){ISPConfig.loadContent(b)}},loadContentInto:function(b,c){var a=$.ajax({type:"GET",url:c,dataType:"html",beforeSend:function(){},success:function(e,f,d){$("#"+b).html(d.responseText)},error:function(){ISPConfig.reportError("Ajax Request was not successful. 118")}})},loadOptionInto:function(b,c,d){var a=$.ajax({type:"GET",url:c,dataType:"html",beforeSend:function(){},success:function(h,l,g){var j=g.responseText;var k=j.split("#");el=document.getElementById(b);el.innerHTML="";for(var f=0;f<k.length;++f){var e=document.createElement("option");e.appendChild(document.createTextNode(k[f]));e.value=k[f];el.appendChild(e)}if(typeof(d)!="undefined"){d(b,c)}},error:function(){ISPConfig.reportError("Ajax Request was not successful. 119")}})},keepalive:function(){var a=$.ajax({type:"GET",url:"keepalive.php",dataType:"html",success:function(c,d,b){setTimeout(function(){ISPConfig.keepalive()},1000000)},error:function(){ISPConfig.reportError("Session expired. Please login again.")}})},addAdditionalTemplate:function(){var e=$("#template_additional").val();var a=$("#tpl_add_select").val().split("|",2);var d=a[0];var f=a[1];if(d>0){var c=e.split("/");ISPConfig.new_tpl_add_id+=1;var b=$('<a href="#"></a>').attr("class","button icons16 icoDelete").click(function(g){g.preventDefault();ISPConfig.delAdditionalTemplate($(this).parent().attr("rel"))});c[c.length]="n"+ISPConfig.new_tpl_add_id+":"+d;$("<li>"+f+"</li>").attr("rel","n"+new_tpl_add_id).append(b).appendTo("#template_additional_list ul");$("#template_additional").val(c.join("/"));alert("additional template "+f+" added to customer")}else{alert("no additional template selcted")}},delAdditionalTemplate:function(d){var a=$("#template_additional").val();if(d){var l=$("#template_additional_list ul").find('li[rel="'+d+'"]').eq(0);var k=l.text();l.remove();var j=a.split("/");var b=new Array();for(var e=0;e<j.length;e++){var f=j[e].split(":",2);if(f.length==2&&f[0]==d){continue}b[b.length]=j[e]}$("#template_additional").val(b.join("/"));alert("additional template "+k+" deleted from customer")}else{if(a!=""){var c=document.getElementById("tpl_add_select").value.split("|",2);var h=c[0];var k=c[1];$("#template_additional_list ul").find("li:not([rel])").each(function(){var i=$(this).text();if(i==k){$(this).remove();return false}return this});var b=a;var g=new RegExp("(^|/)"+h+"(/|$)");b=b.replace(g,"");b=b.replace("//","/");$("#template_additional").val(b);alert("additional template "+k+" deleted from customer")}else{alert("no additional template selcted")}}}};$(document).on("change",function(a){var b=a.target.localName;if($("#pageForm .table #Filter").length>0&&b=="select"){a.preventDefault();$("#pageForm .table #Filter").trigger("click")}if(b=="select"||b=="input"||b=="textarea"){if($(a.target).hasClass("no-page-form-change")==false){ISPConfig.pageFormChanged=true}}});$(document).on("click","a[data-load-content],button[data-load-content]",function(b){b.preventDefault();$("html, body").animate({scrollTop:0},1000);var a=$(this).attr("data-load-content");if(!a){return this}ISPConfig.loadContent(a)});$(document).on("click","a[data-capp],button[data-capp]",function(b){b.preventDefault();$("html, body").animate({scrollTop:0},1000);var a=$(this).attr("data-capp");if(!a){return this}ISPConfig.capp(a)});$(document).on("click","a[data-submit-form],button[data-submit-form]",function(d){d.preventDefault();$("html, body").animate({scrollTop:0},1000);var b=$(this);var a=b.attr("data-form-action");var c=b.attr("data-submit-form");if(b.attr("data-form-upload")=="true"){ISPConfig.submitUploadForm(c,a)}else{ISPConfig.submitForm(c,a)}});$(document).bind("keypress",function(a){if(a.which=="13"&&$("#pageForm .table #Filter").length>0&&$(a.target).hasClass("ui-autocomplete-input")==false){a.preventDefault();$("#pageForm .table #Filter").trigger("click")}if(a.which=="13"&&$(".pnl_formsarea button.positive").length>0&&a.target.localName!="textarea"&&$(a.target).is(":input")){a.preventDefault();$(".pnl_formsarea button.positive:first").not("[disabled='disabled']").trigger("click")}});$(document).on("click","th[data-column]",function(h){var i=$(this);var d=i.attr("data-column");if(!d){return this}if($("#pageForm .table #Filter").length>0&&i.attr("data-sortable")!="false"){var c=$("#Filter");var a=c.attr("data-form-action");var f=c.attr("data-submit-form");var b=i.attr("data-ordered");var g="?";if(a.indexOf("?")>=0){g="&"}a=a+g+"orderby="+d;ISPConfig.submitForm(f,a);$(document).ajaxComplete(function(){var e=$('#pageForm .table th[data-column="'+d+'"]');e.parent().children("th[data-column]").removeAttr("data-ordered");if(b&&b=="asc"){e.attr("data-ordered","desc")}else{e.attr("data-ordered","asc")}})}});$(document).on("click",".addPlaceholder",function(){var a=$(this).text();var b=$(this).siblings(":input");b.insertAtCaret(a)});$(document).on("click",".addPlaceholderContent",function(){var b=$(this).find(".addPlaceholderContent").text();var a=$(this).siblings(":input");a.insertAtCaret(b)});$(document).on("ready",function(){$.fn.extend({insertAtCaret:function(a){return this.each(function(d){if(document.selection){this.focus();sel=document.selection.createRange();sel.text=a;this.focus()}else{if(this.selectionStart||this.selectionStart=="0"){var c=this.selectionStart;var b=this.selectionEnd;var e=this.scrollTop;this.value=this.value.substring(0,c)+a+this.value.substring(b,this.value.length);this.focus();this.selectionStart=c+a.length;this.selectionEnd=c+a.length;this.scrollTop=e}else{this.value+=a;this.focus()}}})}});$(".progress .progress-bar").css("width",function(){return $(this).attr("aria-valuenow")+"%"});ISPConfig.loadInitContent();$("#searchform").submit(function(a){a.preventDefault()});$("#pageForm").submit(function(a){if($("#pageForm .table #Filter").length>0){a.preventDefault()}})});
\ No newline at end of file
-- 
GitLab


From 942a6075c5099661987d8431e73557235a40ba0d Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 31 Jan 2016 17:46:15 +0100
Subject: [PATCH 3/6] Fixeed UI issues in Monitor module.

---
 interface/web/monitor/show_data.php           | 12 +++++
 interface/web/monitor/show_sys_state.php      | 51 +++++++++++++++----
 interface/web/monitor/templates/show_log.htm  |  3 +-
 .../web/monitor/templates/show_sys_state.htm  |  3 +-
 4 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/interface/web/monitor/show_data.php b/interface/web/monitor/show_data.php
index c8f46bbb10..f6940cf7c6 100644
--- a/interface/web/monitor/show_data.php
+++ b/interface/web/monitor/show_data.php
@@ -53,6 +53,7 @@ case 'server_load':
 	$time = $app->tools_monitor->getDataTime('server_load');
 	$title = $app->lng("Server Load").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
 	$description = '';
+	$add_padding = true;
 	break;
 case 'disk_usage':
 	$template = 'templates/show_data.htm';
@@ -95,6 +96,7 @@ case 'openvz_beancounter':
 	$time = $app->tools_monitor->getDataTime('openvz_beancounter');
 	$title = $app->lng("monitor_title_beancounter_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
 	$description = '';
+	$add_padding = true;
 	break;
 case 'system_update':
 	$template = 'templates/show_data.htm';
@@ -102,6 +104,7 @@ case 'system_update':
 	$time = $app->tools_monitor->getDataTime('system_update');
 	$title = $app->lng("monitor_title_updatestate_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
 	$description = '';
+	$add_padding = true;
 	break;
 case 'mailq':
 	$template = 'templates/show_data.htm';
@@ -109,6 +112,7 @@ case 'mailq':
 	$time = $app->tools_monitor->getDataTime('mailq');
 	$title = $app->lng("monitor_title_mailq_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
 	$description = '';
+	$add_padding = true;
 	break;
 case 'raid_state':
 	$template = 'templates/show_data.htm';
@@ -116,6 +120,7 @@ case 'raid_state':
 	$time = $app->tools_monitor->getDataTime('raid_state');
 	$title = $app->lng("monitor_title_raidstate_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
 	$description = '';
+	$add_padding = true;
 	break;
 case 'rkhunter':
 	$template = 'templates/show_data.htm';
@@ -123,6 +128,7 @@ case 'rkhunter':
 	$time = $app->tools_monitor->getDataTime('rkhunter');
 	$title = $app->lng("monitor_title_rkhunterlog_txt"). ' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
 	$description = '';
+	$add_padding = true;
 	break;
 case 'fail2ban':
 	$template = 'templates/show_data.htm';
@@ -130,6 +136,7 @@ case 'fail2ban':
 	$time = $app->tools_monitor->getDataTime('log_fail2ban');
 	$title = $app->lng("monitor_title_fail2ban_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
 	$description = '';
+	$add_padding = true;
 	break;
 case 'mongodb':
 	$template = 'templates/show_data.htm';
@@ -144,12 +151,17 @@ case 'iptables':
 	$time = $app->tools_monitor->getDataTime('iptables_rules');
 	$title = $app->lng("monitor_title_iptables_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
 	$description = '';
+	$add_padding = true;
 	break;
 default:
 	$template = '';
 	break;
 }
 
+if($add_padding == true) {
+$output = '<div style="padding:20px;">'.$output.'</div>';
+}
+
 
 // Loading the template
 $app->uses('tpl');
diff --git a/interface/web/monitor/show_sys_state.php b/interface/web/monitor/show_sys_state.php
index 53997bc207..54d2de5ee5 100644
--- a/interface/web/monitor/show_sys_state.php
+++ b/interface/web/monitor/show_sys_state.php
@@ -223,45 +223,76 @@ function _getServerState($serverId, $serverName) {
 	/*
 	 * Info of a VE inside a OpenVz-Host
 	*/
+	
+	$alert_class = 'alert-info';
+	if($serverState == 'ok') $alert_class = 'alert-success';
+	if($serverState == 'warning') $alert_class = 'alert-warning';
+	if($serverState == 'critical' || $serverState == 'error') $alert_class = 'alert-danger';
+	
 	//$html_ve  = '<div class="systemmonitor-ve state-' . $serverState . '-ve os-' . $osData['name'] . '">';
-	$html_ve  = '<div class="systemmonitor state-' . $serverState . ' os-' . $osData['name'] . '">';
+	//$html_ve  = '<div class="systemmonitor state-' . $serverState . ' os-' . $osData['name'] . '">';
+	$html_server = '<div class="alert '.$alert_class.'" role="alert">';
 	if ($osData != null) {
 		$html_ve .= '<div class="icoDevice"><p class="status"></p></div>';
 	}
 	else {
 		$html_ve .= '<div class="icoDevice"><p class="status"></p></div>';
 	}
-	$html_ve .= '<div class="statusDevice"><p>' . $serverName;
+	$html_ve .= '<div class="statusDevice"><h3>' . $serverName;
 	if ($osData != null) {
 		$html_ve .= ' (' . $osData['name'] . ' ' . $osData['version'] . ') ';
 	}
 	if ($ispcData != null) {
-		$html_ve .= $ispcData['name'] . ' ' . $ispcData['version'] . '</p>';
+		$html_ve .= $ispcData['name'] . ' ' . $ispcData['version'] . '</h3>';
 	}
 	else {
-		$html_ve .= '</p>';
+		$html_ve .= '</h3>';
 	}
 	$html_ve .= '<p>' . $app->lng("monitor_serverstate_state_txt") . ': ' . $serverState . '</p>';
 
 	/*
 	 * Info of a "normal" Server or a OpenVz-Host
 	*/
-	$html_server = '<div class="systemmonitor-server state-' . $serverState . ' os-' . $osData['name'] . '">';
+	//$html_server = '<div class="systemmonitor-server state-' . $serverState . ' os-' . $osData['name'] . '">';
+	
+	/*
+	switch ($oldState) {
+	case 'no_state': $oldInt = 0;
+		break;
+	case 'ok': $oldInt = 1;
+		break;
+	case 'unknown': $oldInt = 2;
+		break;
+	case 'info': $oldInt = 3;
+		break;
+	case 'warning': $oldInt = 4;
+		break;
+	case 'critical': $oldInt = 5;
+		break;
+	case 'error': $oldInt = 6;
+		break;
+	*/
+	$alert_class = 'alert-info';
+	if($serverState == 'ok') $alert_class = 'alert-success';
+	if($serverState == 'warning') $alert_class = 'alert-warning';
+	if($serverState == 'critical' || $serverState == 'error') $alert_class = 'alert-danger';
+	
+	$html_server = '<div class="alert '.$alert_class.'" role="alert">';
 	if ($osData != null) {
-		$html_server .= '<div class="icoDevice"><p class="status"></p></div>';
+		//$html_server .= '<div class="icoDevice"><p class="status"></p></div>';
 	}
 	else {
 		$html_server .= '<div class="icoDevice"><p class="status"></p></div>';
 	}
-	$html_server .= '<div class="statusDevice"><p>' . $app->lng("monitor_serverstate_server_txt") . ': ' . $serverName;
+	$html_server .= '<div class="statusDevice"><h3>' . $app->lng("monitor_serverstate_server_txt") . ': ' . $serverName;
 	if ($osData != null) {
 		$html_server .= ' (' . $osData['name'] . ' ' . $osData['version'] . ') ';
 	}
 	if ($ispcData != null) {
-		$html_server .= $ispcData['name'] . ' ' . $ispcData['version'] . '</p>';
+		$html_server .= $ispcData['name'] . ' ' . $ispcData['version'] . '</h3>';
 	}
 	else {
-		$html_server .= '</p>';
+		$html_server .= '</h3>';
 	}
 
 	$html_server .= '<p>' . $app->lng("monitor_serverstate_state_txt") . ': ' . $serverState . ' (';
@@ -277,7 +308,7 @@ function _getServerState($serverId, $serverName) {
 	*/
 	$html_verbose = $html_server;
 	foreach($messages as $key => $state) {
-		$html_verbose .= $key . ':<br />';
+		$html_verbose .= '<strong>'.ucfirst($key) . '</strong><br />';
 		foreach ($state as $msg) {
 			$html_verbose .= $msg . '<br />';
 		}
diff --git a/interface/web/monitor/templates/show_log.htm b/interface/web/monitor/templates/show_log.htm
index dc5792deef..800bfa3ece 100644
--- a/interface/web/monitor/templates/show_log.htm
+++ b/interface/web/monitor/templates/show_log.htm
@@ -7,8 +7,7 @@
         <legend><tmpl_var name="monTransRefreshsq"></legend>
             
                 <div class="form-group">
-                    <label for="refreshinterval" class="col-sm-3 control-label">{tmpl_var name='refreshinterval_txt'}</label>
-                    <div class="col-sm-9"><select name="refreshinterval" id="refreshinterval" class="form-control" onChange="ISPConfig.loadContentRefresh('monitor/show_log.php?log={tmpl_var name="log_id"}')">
+                    <div class="col-sm-12"><select name="refreshinterval" id="refreshinterval" class="form-control" onChange="ISPConfig.loadContentRefresh('monitor/show_log.php?log={tmpl_var name="log_id"}')">
                         {tmpl_var name='refresh'}
                     </select></div>
                 
diff --git a/interface/web/monitor/templates/show_sys_state.htm b/interface/web/monitor/templates/show_sys_state.htm
index 4586fc3c15..9cd51ad9e6 100644
--- a/interface/web/monitor/templates/show_sys_state.htm
+++ b/interface/web/monitor/templates/show_sys_state.htm
@@ -7,8 +7,7 @@
         <legend><tmpl_var name="monTransRefreshsq"></legend>
             
                 <div class="form-group">
-                    <label for="refreshinterval" class="col-sm-3 control-label">&nbsp;</label>
-                    <div class="col-sm-9"><select name="refreshinterval" id="refreshinterval" class="form-control" onChange="ISPConfig.loadContentRefresh('monitor/show_sys_state.php?state={tmpl_var name="state_type"}')">
+                    <div class="col-sm-12"><select name="refreshinterval" id="refreshinterval" class="form-control" onChange="ISPConfig.loadContentRefresh('monitor/show_sys_state.php?state={tmpl_var name="state_type"}')">
                         {tmpl_var name='refresh'}
                     </select></div>
                 
-- 
GitLab


From a8177a49c5de5a8bf3dad975cfa85aa798e203fa Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 31 Jan 2016 18:37:30 +0100
Subject: [PATCH 4/6] Improved Log view in Monitor.

---
 interface/web/monitor/show_log.php           | 5 +++--
 interface/web/monitor/templates/show_log.htm | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/interface/web/monitor/show_log.php b/interface/web/monitor/show_log.php
index e8f3acc735..4889e83dd9 100644
--- a/interface/web/monitor/show_log.php
+++ b/interface/web/monitor/show_log.php
@@ -127,8 +127,9 @@ if(isset($record['data'])) {
 
 	$logData = explode("\n", htmlspecialchars($data));
 	$logDataHtml = '';
+	
 	/* set css class for each line of log, depending on key words in each line */
-	foreach($logData as $val) {
+	foreach($logData as $line => $val) {
 		if (strpos($val, 'ERROR') !== FALSE) {
 			$logDataHtml .= "<div class='logerror'>$val</div>";
 		} elseif (strpos($val, 'WARN') !== FALSE) {
@@ -140,7 +141,7 @@ if(isset($record['data'])) {
 		}
 	}
 
-	$app->tpl->setVar("log_data", $logData);
+	$app->tpl->setVar("log_data", $logDataHtml);
 } else {
 	$app->tpl->setVar("log_data", $app->lng("no_logdata_txt"));
 }
diff --git a/interface/web/monitor/templates/show_log.htm b/interface/web/monitor/templates/show_log.htm
index 800bfa3ece..959f324d7f 100644
--- a/interface/web/monitor/templates/show_log.htm
+++ b/interface/web/monitor/templates/show_log.htm
@@ -16,6 +16,6 @@
   
     <div class="pnl_formarea">
         <p class="fieldset-legend"><tmpl_var name="monTransDate"><tmpl_var name="time"></p>
-            <div class="codeview"><tmpl_var name="log_data"></div>
+            <div class="codeview"><pre><tmpl_var name="log_data"></pre></div>
         
     </div>
\ No newline at end of file
-- 
GitLab


From 4070036454731508a7caa56d19e0d5bc9e64614c Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 31 Jan 2016 18:57:21 +0100
Subject: [PATCH 5/6] Updated and merged language files.

---
 interface/lib/lang/ar.lng                     |   1 +
 interface/lib/lang/bg.lng                     |   1 +
 interface/lib/lang/br.lng                     |   1 +
 interface/lib/lang/ca.lng                     | 153 ++++++++
 interface/lib/lang/cz.lng                     |   2 -
 interface/lib/lang/de.lng                     |   1 -
 interface/lib/lang/el.lng                     |   1 +
 interface/lib/lang/es.lng                     |  11 +-
 interface/lib/lang/fi.lng                     |   1 +
 interface/lib/lang/fr.lng                     |  85 ++--
 interface/lib/lang/hr.lng                     |   3 +-
 interface/lib/lang/hu.lng                     |   1 +
 interface/lib/lang/id.lng                     |   1 +
 interface/lib/lang/it.lng                     | 205 +++++-----
 interface/lib/lang/ja.lng                     |   1 +
 interface/lib/lang/nl.lng                     |   1 +
 interface/lib/lang/pl.lng                     |   1 +
 interface/lib/lang/pt.lng                     |   1 +
 interface/lib/lang/ro.lng                     |   1 +
 interface/lib/lang/ru.lng                     |   1 +
 interface/lib/lang/se.lng                     |   1 +
 interface/lib/lang/sk.lng                     |   1 +
 interface/lib/lang/tr.lng                     |   3 +-
 interface/web/admin/lib/lang/ar.lng           |   2 +
 .../admin/lib/lang/ar_directive_snippets.lng  |   1 +
 .../lib/lang/ar_directive_snippets_list.lng   |   1 +
 interface/web/admin/lib/lang/ar_server.lng    |   1 +
 .../web/admin/lib/lang/ar_server_config.lng   |  36 +-
 .../web/admin/lib/lang/ar_server_ip_map.lng   |  20 +-
 .../admin/lib/lang/ar_server_ip_map_list.lng  |  10 +-
 .../web/admin/lib/lang/ar_server_list.lng     |   1 +
 .../web/admin/lib/lang/ar_system_config.lng   |  15 +-
 interface/web/admin/lib/lang/ar_users.lng     |   1 +
 interface/web/admin/lib/lang/bg.lng           |   2 +
 .../admin/lib/lang/bg_directive_snippets.lng  |   1 +
 .../lib/lang/bg_directive_snippets_list.lng   |   1 +
 interface/web/admin/lib/lang/bg_server.lng    |   1 +
 .../web/admin/lib/lang/bg_server_config.lng   |  36 +-
 .../web/admin/lib/lang/bg_server_ip_map.lng   |  20 +-
 .../admin/lib/lang/bg_server_ip_map_list.lng  |  10 +-
 .../web/admin/lib/lang/bg_server_list.lng     |   1 +
 .../web/admin/lib/lang/bg_system_config.lng   |  15 +-
 interface/web/admin/lib/lang/bg_users.lng     |   1 +
 interface/web/admin/lib/lang/br.lng           |   2 +
 .../admin/lib/lang/br_directive_snippets.lng  |   1 +
 .../lib/lang/br_directive_snippets_list.lng   |   1 +
 interface/web/admin/lib/lang/br_server.lng    |   1 +
 .../web/admin/lib/lang/br_server_config.lng   |  36 +-
 .../web/admin/lib/lang/br_server_ip_map.lng   |  20 +-
 .../admin/lib/lang/br_server_ip_map_list.lng  |  10 +-
 .../web/admin/lib/lang/br_server_list.lng     |   1 +
 .../web/admin/lib/lang/br_system_config.lng   |  15 +-
 interface/web/admin/lib/lang/br_users.lng     |   1 +
 interface/web/admin/lib/lang/cz.lng           |   4 +-
 .../admin/lib/lang/cz_directive_snippets.lng  |   3 +-
 .../lib/lang/cz_directive_snippets_list.lng   |   3 +-
 interface/web/admin/lib/lang/cz_firewall.lng  |   2 -
 .../web/admin/lib/lang/cz_firewall_list.lng   |   2 -
 interface/web/admin/lib/lang/cz_groups.lng    |   2 -
 .../web/admin/lib/lang/cz_groups_list.lng     |   2 -
 interface/web/admin/lib/lang/cz_iptables.lng  |   2 -
 .../web/admin/lib/lang/cz_iptables_list.lng   |   2 -
 .../web/admin/lib/lang/cz_language_add.lng    |   2 -
 .../admin/lib/lang/cz_language_complete.lng   |   2 -
 .../web/admin/lib/lang/cz_language_edit.lng   |   2 -
 .../web/admin/lib/lang/cz_language_export.lng |   2 -
 .../web/admin/lib/lang/cz_language_import.lng |   2 -
 .../web/admin/lib/lang/cz_language_list.lng   |   2 -
 .../web/admin/lib/lang/cz_package_install.lng |   2 -
 .../web/admin/lib/lang/cz_remote_action.lng   |   2 -
 .../web/admin/lib/lang/cz_remote_user.lng     |   2 -
 .../admin/lib/lang/cz_remote_user_list.lng    |   2 -
 interface/web/admin/lib/lang/cz_server.lng    |   3 +-
 .../web/admin/lib/lang/cz_server_config.lng   |  36 +-
 .../admin/lib/lang/cz_server_config_list.lng  |   2 -
 interface/web/admin/lib/lang/cz_server_ip.lng |   2 -
 .../web/admin/lib/lang/cz_server_ip_list.lng  |   2 -
 .../web/admin/lib/lang/cz_server_ip_map.lng   |  20 +-
 .../admin/lib/lang/cz_server_ip_map_list.lng  |  10 +-
 .../web/admin/lib/lang/cz_server_list.lng     |   3 +-
 .../web/admin/lib/lang/cz_server_php.lng      |   2 -
 .../web/admin/lib/lang/cz_server_php_list.lng |   2 -
 .../admin/lib/lang/cz_software_package.lng    |   2 -
 .../lib/lang/cz_software_package_install.lng  |   2 -
 .../lib/lang/cz_software_package_list.lng     |   2 -
 .../web/admin/lib/lang/cz_software_repo.lng   |   2 -
 .../admin/lib/lang/cz_software_repo_list.lng  |   2 -
 .../lib/lang/cz_software_update_list.lng      |   2 -
 .../web/admin/lib/lang/cz_system_config.lng   |  17 +-
 .../admin/lib/lang/cz_tpl_default_admin.lng   |   2 -
 interface/web/admin/lib/lang/cz_users.lng     |   3 +-
 .../web/admin/lib/lang/cz_users_list.lng      |   2 -
 interface/web/admin/lib/lang/de.lng           |   2 +
 interface/web/admin/lib/lang/de_server.lng    |   1 +
 .../web/admin/lib/lang/de_server_config.lng   |  25 +-
 .../web/admin/lib/lang/de_server_ip_map.lng   |  20 +-
 .../admin/lib/lang/de_server_ip_map_list.lng  |  10 +-
 .../web/admin/lib/lang/de_server_list.lng     |   1 +
 .../web/admin/lib/lang/de_system_config.lng   |  13 +-
 interface/web/admin/lib/lang/el.lng           |   2 +
 .../admin/lib/lang/el_directive_snippets.lng  |   1 +
 .../lib/lang/el_directive_snippets_list.lng   |   1 +
 interface/web/admin/lib/lang/el_server.lng    |   1 +
 .../web/admin/lib/lang/el_server_config.lng   |  33 +-
 .../web/admin/lib/lang/el_server_ip_map.lng   |  20 +-
 .../admin/lib/lang/el_server_ip_map_list.lng  |  10 +-
 .../web/admin/lib/lang/el_server_list.lng     |   1 +
 .../web/admin/lib/lang/el_system_config.lng   |  15 +-
 interface/web/admin/lib/lang/el_users.lng     |   1 +
 interface/web/admin/lib/lang/es.lng           |   2 +
 .../admin/lib/lang/es_directive_snippets.lng  |   1 +
 .../lib/lang/es_directive_snippets_list.lng   |   1 +
 interface/web/admin/lib/lang/es_firewall.lng  |   4 +-
 .../web/admin/lib/lang/es_remote_user.lng     |   3 +-
 interface/web/admin/lib/lang/es_server.lng    |   7 +-
 .../web/admin/lib/lang/es_server_config.lng   |  36 +-
 interface/web/admin/lib/lang/es_server_ip.lng |   7 +-
 .../web/admin/lib/lang/es_server_ip_map.lng   |  20 +-
 .../admin/lib/lang/es_server_ip_map_list.lng  |  10 +-
 .../web/admin/lib/lang/es_server_list.lng     |   1 +
 .../web/admin/lib/lang/es_system_config.lng   |  19 +-
 interface/web/admin/lib/lang/es_users.lng     |   1 +
 interface/web/admin/lib/lang/fi.lng           |   2 +
 .../admin/lib/lang/fi_directive_snippets.lng  |   1 +
 .../lib/lang/fi_directive_snippets_list.lng   |   1 +
 interface/web/admin/lib/lang/fi_server.lng    |   1 +
 .../web/admin/lib/lang/fi_server_config.lng   |  36 +-
 .../web/admin/lib/lang/fi_server_ip_map.lng   |  20 +-
 .../admin/lib/lang/fi_server_ip_map_list.lng  |  10 +-
 .../web/admin/lib/lang/fi_server_list.lng     |   1 +
 .../web/admin/lib/lang/fi_system_config.lng   |  15 +-
 interface/web/admin/lib/lang/fi_users.lng     |   1 +
 interface/web/admin/lib/lang/fr.lng           |  22 +-
 .../admin/lib/lang/fr_directive_snippets.lng  |   1 +
 .../lib/lang/fr_directive_snippets_list.lng   |   1 +
 interface/web/admin/lib/lang/fr_firewall.lng  |   4 +-
 .../web/admin/lib/lang/fr_groups_list.lng     |   2 +-
 .../web/admin/lib/lang/fr_language_edit.lng   |   2 +-
 .../web/admin/lib/lang/fr_language_import.lng |   2 +-
 .../web/admin/lib/lang/fr_language_list.lng   |   2 +-
 .../web/admin/lib/lang/fr_remote_action.lng   |  10 +-
 .../web/admin/lib/lang/fr_remote_user.lng     |  32 +-
 .../admin/lib/lang/fr_remote_user_list.lng    |   2 +-
 interface/web/admin/lib/lang/fr_server.lng    |   3 +-
 .../web/admin/lib/lang/fr_server_config.lng   | 338 ++++++++--------
 interface/web/admin/lib/lang/fr_server_ip.lng |   4 +-
 .../web/admin/lib/lang/fr_server_ip_map.lng   |  20 +-
 .../admin/lib/lang/fr_server_ip_map_list.lng  |  10 +-
 .../web/admin/lib/lang/fr_server_list.lng     |   1 +
 .../web/admin/lib/lang/fr_system_config.lng   |  57 +--
 interface/web/admin/lib/lang/fr_users.lng     |  13 +-
 .../web/admin/lib/lang/fr_users_list.lng      |   4 +-
 interface/web/admin/lib/lang/hr.lng           |   4 +-
 .../admin/lib/lang/hr_directive_snippets.lng  |   3 +-
 .../lib/lang/hr_directive_snippets_list.lng   |   3 +-
 interface/web/admin/lib/lang/hr_firewall.lng  |   2 -
 .../web/admin/lib/lang/hr_firewall_list.lng   |   2 -
 interface/web/admin/lib/lang/hr_groups.lng    |   2 -
 .../web/admin/lib/lang/hr_groups_list.lng     |   2 -
 interface/web/admin/lib/lang/hr_iptables.lng  |   2 -
 .../web/admin/lib/lang/hr_iptables_list.lng   |   2 -
 .../web/admin/lib/lang/hr_language_add.lng    |   2 -
 .../admin/lib/lang/hr_language_complete.lng   |   2 -
 .../web/admin/lib/lang/hr_language_edit.lng   |   2 -
 .../web/admin/lib/lang/hr_language_export.lng |   2 -
 .../web/admin/lib/lang/hr_language_import.lng |   2 -
 .../web/admin/lib/lang/hr_language_list.lng   |   2 -
 .../web/admin/lib/lang/hr_package_install.lng |   2 -
 .../web/admin/lib/lang/hr_remote_action.lng   |   2 -
 .../web/admin/lib/lang/hr_remote_user.lng     |   2 -
 .../admin/lib/lang/hr_remote_user_list.lng    |   2 -
 interface/web/admin/lib/lang/hr_server.lng    |   3 +-
 .../web/admin/lib/lang/hr_server_config.lng   |  37 +-
 .../admin/lib/lang/hr_server_config_list.lng  |   2 -
 interface/web/admin/lib/lang/hr_server_ip.lng |   2 -
 .../web/admin/lib/lang/hr_server_ip_list.lng  |   2 -
 .../web/admin/lib/lang/hr_server_ip_map.lng   |  20 +-
 .../admin/lib/lang/hr_server_ip_map_list.lng  |  10 +-
 .../web/admin/lib/lang/hr_server_list.lng     |   3 +-
 .../web/admin/lib/lang/hr_server_php.lng      |   2 -
 .../web/admin/lib/lang/hr_server_php_list.lng |   2 -
 .../admin/lib/lang/hr_software_package.lng    |   2 -
 .../lib/lang/hr_software_package_install.lng  |   2 -
 .../lib/lang/hr_software_package_list.lng     |   2 -
 .../web/admin/lib/lang/hr_software_repo.lng   |   2 -
 .../admin/lib/lang/hr_software_repo_list.lng  |   2 -
 .../lib/lang/hr_software_update_list.lng      |   2 -
 .../web/admin/lib/lang/hr_system_config.lng   |  17 +-
 .../admin/lib/lang/hr_tpl_default_admin.lng   |   2 -
 interface/web/admin/lib/lang/hr_users.lng     |   3 +-
 .../web/admin/lib/lang/hr_users_list.lng      |   2 -
 interface/web/admin/lib/lang/hu.lng           |   2 +
 .../admin/lib/lang/hu_directive_snippets.lng  |   1 +
 .../lib/lang/hu_directive_snippets_list.lng   |   1 +
 interface/web/admin/lib/lang/hu_server.lng    |   1 +
 .../web/admin/lib/lang/hu_server_config.lng   |  36 +-
 .../web/admin/lib/lang/hu_server_ip_map.lng   |  20 +-
 .../admin/lib/lang/hu_server_ip_map_list.lng  |  10 +-
 .../web/admin/lib/lang/hu_server_list.lng     |   1 +
 .../web/admin/lib/lang/hu_system_config.lng   |  15 +-
 interface/web/admin/lib/lang/hu_users.lng     |   1 +
 interface/web/admin/lib/lang/id.lng           |   2 +
 .../admin/lib/lang/id_directive_snippets.lng  |   1 +
 .../lib/lang/id_directive_snippets_list.lng   |   1 +
 interface/web/admin/lib/lang/id_server.lng    |   1 +
 .../web/admin/lib/lang/id_server_config.lng   |  36 +-
 .../web/admin/lib/lang/id_server_ip_map.lng   |  20 +-
 .../admin/lib/lang/id_server_ip_map_list.lng  |  10 +-
 .../web/admin/lib/lang/id_server_list.lng     |   1 +
 .../web/admin/lib/lang/id_system_config.lng   |  15 +-
 interface/web/admin/lib/lang/id_users.lng     |   1 +
 interface/web/admin/lib/lang/it.lng           |  22 +-
 .../admin/lib/lang/it_directive_snippets.lng  |  15 +-
 .../lib/lang/it_directive_snippets_list.lng   |  11 +-
 interface/web/admin/lib/lang/it_firewall.lng  |   6 +-
 interface/web/admin/lib/lang/it_groups.lng    |   6 +-
 .../web/admin/lib/lang/it_groups_list.lng     |   2 +-
 interface/web/admin/lib/lang/it_iptables.lng  |   2 +-
 .../web/admin/lib/lang/it_iptables_list.lng   |   6 +-
 .../web/admin/lib/lang/it_language_edit.lng   |   2 +-
 .../web/admin/lib/lang/it_language_export.lng |   6 +-
 .../web/admin/lib/lang/it_remote_action.lng   |   6 +-
 .../web/admin/lib/lang/it_remote_user.lng     |  38 +-
 interface/web/admin/lib/lang/it_server.lng    |   1 +
 .../web/admin/lib/lang/it_server_config.lng   | 364 ++++++++++--------
 interface/web/admin/lib/lang/it_server_ip.lng |   6 +-
 .../web/admin/lib/lang/it_server_ip_list.lng  |   2 +-
 .../web/admin/lib/lang/it_server_ip_map.lng   |  20 +-
 .../admin/lib/lang/it_server_ip_map_list.lng  |  10 +-
 .../web/admin/lib/lang/it_server_list.lng     |   1 +
 .../web/admin/lib/lang/it_server_php.lng      |  16 +-
 .../web/admin/lib/lang/it_server_php_list.lng |   8 +-
 .../admin/lib/lang/it_software_package.lng    |   6 +-
 .../lib/lang/it_software_package_install.lng  |   8 +-
 .../lib/lang/it_software_package_list.lng     |  18 +-
 .../web/admin/lib/lang/it_software_repo.lng   |   2 +-
 .../lib/lang/it_software_update_list.lng      |   2 +-
 .../web/admin/lib/lang/it_system_config.lng   |  23 +-
 .../admin/lib/lang/it_tpl_default_admin.lng   |  16 +-
 interface/web/admin/lib/lang/it_users.lng     |  11 +-
 .../web/admin/lib/lang/it_users_list.lng      |   4 +-
 interface/web/admin/lib/lang/ja.lng           |   2 +
 .../admin/lib/lang/ja_directive_snippets.lng  |   1 +
 .../lib/lang/ja_directive_snippets_list.lng   |   1 +
 interface/web/admin/lib/lang/ja_server.lng    |   1 +
 .../web/admin/lib/lang/ja_server_config.lng   |  36 +-
 .../web/admin/lib/lang/ja_server_ip_map.lng   |  20 +-
 .../admin/lib/lang/ja_server_ip_map_list.lng  |  10 +-
 .../web/admin/lib/lang/ja_server_list.lng     |   1 +
 .../web/admin/lib/lang/ja_system_config.lng   |  15 +-
 interface/web/admin/lib/lang/ja_users.lng     |   1 +
 interface/web/admin/lib/lang/nl.lng           |   2 +
 .../admin/lib/lang/nl_directive_snippets.lng  |   1 +
 .../lib/lang/nl_directive_snippets_list.lng   |   1 +
 interface/web/admin/lib/lang/nl_server.lng    |   1 +
 .../web/admin/lib/lang/nl_server_config.lng   |  36 +-
 .../web/admin/lib/lang/nl_server_ip_map.lng   |  20 +-
 .../admin/lib/lang/nl_server_ip_map_list.lng  |  10 +-
 .../web/admin/lib/lang/nl_server_list.lng     |   1 +
 .../web/admin/lib/lang/nl_system_config.lng   |  24 +-
 interface/web/admin/lib/lang/nl_users.lng     |   1 +
 interface/web/admin/lib/lang/pl.lng           |   2 +
 .../admin/lib/lang/pl_directive_snippets.lng  |   1 +
 .../lib/lang/pl_directive_snippets_list.lng   |   1 +
 interface/web/admin/lib/lang/pl_server.lng    |   1 +
 .../web/admin/lib/lang/pl_server_config.lng   |  36 +-
 .../web/admin/lib/lang/pl_server_ip_map.lng   |  20 +-
 .../admin/lib/lang/pl_server_ip_map_list.lng  |  10 +-
 .../web/admin/lib/lang/pl_server_list.lng     |   1 +
 .../web/admin/lib/lang/pl_system_config.lng   |  15 +-
 interface/web/admin/lib/lang/pl_users.lng     |   1 +
 interface/web/admin/lib/lang/pt.lng           |   2 +
 .../admin/lib/lang/pt_directive_snippets.lng  |   1 +
 .../lib/lang/pt_directive_snippets_list.lng   |   1 +
 interface/web/admin/lib/lang/pt_server.lng    |   1 +
 .../web/admin/lib/lang/pt_server_config.lng   |  36 +-
 .../web/admin/lib/lang/pt_server_ip_map.lng   |  20 +-
 .../admin/lib/lang/pt_server_ip_map_list.lng  |  10 +-
 .../web/admin/lib/lang/pt_server_list.lng     |   1 +
 .../web/admin/lib/lang/pt_system_config.lng   |  15 +-
 interface/web/admin/lib/lang/pt_users.lng     |   1 +
 interface/web/admin/lib/lang/ro.lng           |   2 +
 .../admin/lib/lang/ro_directive_snippets.lng  |   1 +
 .../lib/lang/ro_directive_snippets_list.lng   |   1 +
 interface/web/admin/lib/lang/ro_server.lng    |   1 +
 .../web/admin/lib/lang/ro_server_config.lng   |  36 +-
 .../web/admin/lib/lang/ro_server_ip_map.lng   |  20 +-
 .../admin/lib/lang/ro_server_ip_map_list.lng  |  10 +-
 .../web/admin/lib/lang/ro_server_list.lng     |   1 +
 .../web/admin/lib/lang/ro_system_config.lng   |  15 +-
 interface/web/admin/lib/lang/ro_users.lng     |   1 +
 interface/web/admin/lib/lang/ru.lng           |   2 +
 .../admin/lib/lang/ru_directive_snippets.lng  |   1 +
 .../lib/lang/ru_directive_snippets_list.lng   |   1 +
 interface/web/admin/lib/lang/ru_server.lng    |   1 +
 .../web/admin/lib/lang/ru_server_config.lng   |  36 +-
 .../web/admin/lib/lang/ru_server_ip_map.lng   |  20 +-
 .../admin/lib/lang/ru_server_ip_map_list.lng  |  10 +-
 .../web/admin/lib/lang/ru_server_list.lng     |   1 +
 .../web/admin/lib/lang/ru_system_config.lng   |  15 +-
 interface/web/admin/lib/lang/ru_users.lng     |   1 +
 interface/web/admin/lib/lang/se.lng           |   2 +
 .../admin/lib/lang/se_directive_snippets.lng  |   1 +
 .../lib/lang/se_directive_snippets_list.lng   |   1 +
 interface/web/admin/lib/lang/se_server.lng    |   1 +
 .../web/admin/lib/lang/se_server_config.lng   |  36 +-
 .../web/admin/lib/lang/se_server_ip_map.lng   |  20 +-
 .../admin/lib/lang/se_server_ip_map_list.lng  |  10 +-
 .../web/admin/lib/lang/se_server_list.lng     |   1 +
 .../web/admin/lib/lang/se_system_config.lng   |  15 +-
 interface/web/admin/lib/lang/se_users.lng     |   1 +
 interface/web/admin/lib/lang/sk.lng           |   2 +
 .../admin/lib/lang/sk_directive_snippets.lng  |   1 +
 .../lib/lang/sk_directive_snippets_list.lng   |   1 +
 interface/web/admin/lib/lang/sk_server.lng    |   1 +
 .../web/admin/lib/lang/sk_server_config.lng   |  36 +-
 .../web/admin/lib/lang/sk_server_ip_map.lng   |  20 +-
 .../admin/lib/lang/sk_server_ip_map_list.lng  |  10 +-
 .../web/admin/lib/lang/sk_server_list.lng     |   1 +
 .../web/admin/lib/lang/sk_system_config.lng   |  15 +-
 interface/web/admin/lib/lang/sk_users.lng     |   1 +
 interface/web/admin/lib/lang/tr.lng           |  12 +-
 .../admin/lib/lang/tr_directive_snippets.lng  |   1 +
 .../lib/lang/tr_directive_snippets_list.lng   |   1 +
 interface/web/admin/lib/lang/tr_firewall.lng  |   5 +-
 interface/web/admin/lib/lang/tr_iptables.lng  |   3 -
 .../web/admin/lib/lang/tr_iptables_list.lng   |   3 -
 .../web/admin/lib/lang/tr_language_edit.lng   |   1 -
 .../web/admin/lib/lang/tr_language_list.lng   |   1 -
 .../web/admin/lib/lang/tr_remote_action.lng   |   5 +-
 .../web/admin/lib/lang/tr_remote_user.lng     |   1 -
 .../admin/lib/lang/tr_remote_user_list.lng    |   2 -
 interface/web/admin/lib/lang/tr_server.lng    |   1 +
 .../web/admin/lib/lang/tr_server_config.lng   |  41 +-
 .../web/admin/lib/lang/tr_server_ip_map.lng   |  20 +-
 .../admin/lib/lang/tr_server_ip_map_list.lng  |  10 +-
 .../web/admin/lib/lang/tr_server_list.lng     |   1 +
 .../web/admin/lib/lang/tr_server_php.lng      |   1 -
 .../web/admin/lib/lang/tr_server_php_list.lng |   1 -
 .../lib/lang/tr_software_package_list.lng     |   1 -
 .../lib/lang/tr_software_update_list.lng      |   1 -
 .../web/admin/lib/lang/tr_system_config.lng   |  21 +-
 .../admin/lib/lang/tr_tpl_default_admin.lng   |   1 -
 interface/web/admin/lib/lang/tr_users.lng     |   4 +-
 interface/web/client/lib/lang/ar.lng          |   2 +
 interface/web/client/lib/lang/ar_client.lng   |  40 +-
 .../client/lib/lang/ar_client_template.lng    |  24 ++
 interface/web/client/lib/lang/ar_reseller.lng |  39 +-
 interface/web/client/lib/lang/bg.lng          |   2 +
 interface/web/client/lib/lang/bg_client.lng   |  40 +-
 .../client/lib/lang/bg_client_template.lng    |  24 ++
 interface/web/client/lib/lang/bg_reseller.lng |  39 +-
 interface/web/client/lib/lang/br.lng          |   2 +
 interface/web/client/lib/lang/br_client.lng   |  40 +-
 .../client/lib/lang/br_client_template.lng    |  24 ++
 interface/web/client/lib/lang/br_reseller.lng |  39 +-
 interface/web/client/lib/lang/ca.lng          |  28 ++
 interface/web/client/lib/lang/ca_client.lng   | 197 ++++++++++
 .../web/client/lib/lang/ca_client_circle.lng  |   9 +
 .../client/lib/lang/ca_client_circle_list.lng |  10 +
 .../web/client/lib/lang/ca_client_del.lng     |   7 +
 .../web/client/lib/lang/ca_client_message.lng |  20 +
 .../lib/lang/ca_client_message_template.lng   |  11 +
 .../lang/ca_client_message_template_list.lng  |   5 +
 .../client/lib/lang/ca_client_template.lng    | 117 ++++++
 .../lib/lang/ca_client_template_list.lng      |   6 +
 .../web/client/lib/lang/ca_clients_list.lng   |  11 +
 interface/web/client/lib/lang/ca_domain.lng   |   6 +
 .../web/client/lib/lang/ca_domain_list.lng    |   6 +
 interface/web/client/lib/lang/ca_reseller.lng | 199 ++++++++++
 .../web/client/lib/lang/ca_resellers_list.lng |  11 +
 interface/web/client/lib/lang/cz.lng          |   4 +-
 interface/web/client/lib/lang/cz_client.lng   |  42 +-
 .../web/client/lib/lang/cz_client_circle.lng  |   2 -
 .../client/lib/lang/cz_client_circle_list.lng |   2 -
 .../web/client/lib/lang/cz_client_del.lng     |   2 -
 .../web/client/lib/lang/cz_client_message.lng |   2 -
 .../lib/lang/cz_client_message_template.lng   |   2 -
 .../lang/cz_client_message_template_list.lng  |   2 -
 .../client/lib/lang/cz_client_template.lng    |  26 +-
 .../lib/lang/cz_client_template_list.lng      |   2 -
 .../web/client/lib/lang/cz_clients_list.lng   |   2 -
 interface/web/client/lib/lang/cz_domain.lng   |   2 -
 .../web/client/lib/lang/cz_domain_list.lng    |   2 -
 interface/web/client/lib/lang/cz_reseller.lng |  41 +-
 .../web/client/lib/lang/cz_resellers_list.lng |   2 -
 interface/web/client/lib/lang/de.lng          |   2 +
 interface/web/client/lib/lang/de_client.lng   |  34 +-
 .../client/lib/lang/de_client_template.lng    |  24 ++
 interface/web/client/lib/lang/de_reseller.lng |  38 +-
 interface/web/client/lib/lang/el.lng          |   2 +
 interface/web/client/lib/lang/el_client.lng   |  40 +-
 .../client/lib/lang/el_client_template.lng    |  24 ++
 interface/web/client/lib/lang/el_reseller.lng |  39 +-
 interface/web/client/lib/lang/es.lng          |   3 +-
 interface/web/client/lib/lang/es_client.lng   | 115 +++---
 .../client/lib/lang/es_client_template.lng    |  24 ++
 interface/web/client/lib/lang/es_reseller.lng |  44 ++-
 interface/web/client/lib/lang/fi.lng          |   2 +
 interface/web/client/lib/lang/fi_client.lng   |  40 +-
 .../client/lib/lang/fi_client_template.lng    |  24 ++
 interface/web/client/lib/lang/fi_reseller.lng |  39 +-
 interface/web/client/lib/lang/fr.lng          |  18 +-
 interface/web/client/lib/lang/fr_client.lng   | 160 ++++----
 .../web/client/lib/lang/fr_client_del.lng     |   6 +-
 .../web/client/lib/lang/fr_client_message.lng |  14 +-
 .../lib/lang/fr_client_message_template.lng   |   2 +-
 .../client/lib/lang/fr_client_template.lng    | 108 ++++--
 .../web/client/lib/lang/fr_clients_list.lng   |   6 +-
 interface/web/client/lib/lang/fr_domain.lng   |   2 +-
 interface/web/client/lib/lang/fr_reseller.lng | 156 ++++----
 .../web/client/lib/lang/fr_resellers_list.lng |   6 +-
 interface/web/client/lib/lang/hr.lng          |   6 +-
 interface/web/client/lib/lang/hr_client.lng   |  42 +-
 .../web/client/lib/lang/hr_client_circle.lng  |   2 -
 .../client/lib/lang/hr_client_circle_list.lng |   2 -
 .../web/client/lib/lang/hr_client_del.lng     |   2 -
 .../web/client/lib/lang/hr_client_message.lng |   2 -
 .../lib/lang/hr_client_message_template.lng   |   2 -
 .../lang/hr_client_message_template_list.lng  |   2 -
 .../client/lib/lang/hr_client_template.lng    |  26 +-
 .../lib/lang/hr_client_template_list.lng      |   2 -
 .../web/client/lib/lang/hr_clients_list.lng   |   2 -
 interface/web/client/lib/lang/hr_domain.lng   |   4 +-
 .../web/client/lib/lang/hr_domain_list.lng    |   2 -
 interface/web/client/lib/lang/hr_reseller.lng |  41 +-
 .../web/client/lib/lang/hr_resellers_list.lng |   2 -
 interface/web/client/lib/lang/hu.lng          |   2 +
 interface/web/client/lib/lang/hu_client.lng   |  40 +-
 .../client/lib/lang/hu_client_template.lng    |  24 ++
 interface/web/client/lib/lang/hu_reseller.lng |  39 +-
 interface/web/client/lib/lang/id.lng          |   2 +
 interface/web/client/lib/lang/id_client.lng   |  40 +-
 .../client/lib/lang/id_client_template.lng    |  24 ++
 interface/web/client/lib/lang/id_reseller.lng |  39 +-
 interface/web/client/lib/lang/it.lng          |   8 +-
 interface/web/client/lib/lang/it_client.lng   | 104 +++--
 .../web/client/lib/lang/it_client_circle.lng  |   4 +-
 .../client/lib/lang/it_client_circle_list.lng |   8 +-
 .../web/client/lib/lang/it_client_message.lng |   6 +-
 .../lib/lang/it_client_message_template.lng   |   2 +-
 .../client/lib/lang/it_client_template.lng    |  28 +-
 .../web/client/lib/lang/it_clients_list.lng   |   2 +-
 .../web/client/lib/lang/it_domain_list.lng    |   2 +-
 interface/web/client/lib/lang/it_reseller.lng |  87 +++--
 .../web/client/lib/lang/it_resellers_list.lng |   2 +-
 interface/web/client/lib/lang/ja.lng          |   2 +
 interface/web/client/lib/lang/ja_client.lng   |  40 +-
 .../client/lib/lang/ja_client_template.lng    |  24 ++
 interface/web/client/lib/lang/ja_reseller.lng |  39 +-
 interface/web/client/lib/lang/nl.lng          |   2 +
 interface/web/client/lib/lang/nl_client.lng   |  40 +-
 .../client/lib/lang/nl_client_template.lng    |  24 ++
 interface/web/client/lib/lang/nl_reseller.lng |  39 +-
 interface/web/client/lib/lang/pl.lng          |   2 +
 interface/web/client/lib/lang/pl_client.lng   |  40 +-
 .../client/lib/lang/pl_client_template.lng    |  24 ++
 interface/web/client/lib/lang/pl_reseller.lng |  39 +-
 interface/web/client/lib/lang/pt.lng          |   2 +
 interface/web/client/lib/lang/pt_client.lng   |  40 +-
 .../client/lib/lang/pt_client_template.lng    |  24 ++
 interface/web/client/lib/lang/pt_reseller.lng |  39 +-
 interface/web/client/lib/lang/ro.lng          |   2 +
 interface/web/client/lib/lang/ro_client.lng   |  40 +-
 .../client/lib/lang/ro_client_template.lng    |  24 ++
 interface/web/client/lib/lang/ro_reseller.lng |  39 +-
 interface/web/client/lib/lang/ru.lng          |   2 +
 interface/web/client/lib/lang/ru_client.lng   |  40 +-
 .../client/lib/lang/ru_client_template.lng    |  24 ++
 interface/web/client/lib/lang/ru_reseller.lng |  39 +-
 interface/web/client/lib/lang/se.lng          |   2 +
 interface/web/client/lib/lang/se_client.lng   |  40 +-
 .../client/lib/lang/se_client_template.lng    |  24 ++
 interface/web/client/lib/lang/se_reseller.lng |  39 +-
 interface/web/client/lib/lang/sk.lng          |   2 +
 interface/web/client/lib/lang/sk_client.lng   |  40 +-
 .../client/lib/lang/sk_client_template.lng    |  24 ++
 interface/web/client/lib/lang/sk_reseller.lng |  41 +-
 interface/web/client/lib/lang/tr.lng          |   3 +-
 interface/web/client/lib/lang/tr_client.lng   |  53 ++-
 .../web/client/lib/lang/tr_client_del.lng     |   1 -
 .../web/client/lib/lang/tr_client_message.lng |   1 -
 .../client/lib/lang/tr_client_template.lng    |  28 +-
 .../lib/lang/tr_client_template_list.lng      |   1 -
 interface/web/client/lib/lang/tr_domain.lng   |   1 -
 interface/web/client/lib/lang/tr_reseller.lng |  49 ++-
 .../lib/lang/ar_dashlet_customer.lng          |   4 +
 .../ar_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/ar_dashlet_invoices.lng          |  18 +
 .../dashboard/lib/lang/ar_dashlet_limits.lng  |   1 +
 .../lib/lang/ar_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/ar_dashlet_shop.lng    |   8 +
 .../lib/lang/bg_dashlet_customer.lng          |   4 +
 .../bg_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/bg_dashlet_invoices.lng          |  18 +
 .../dashboard/lib/lang/bg_dashlet_limits.lng  |   1 +
 .../lib/lang/bg_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/bg_dashlet_shop.lng    |   8 +
 .../lib/lang/br_dashlet_customer.lng          |   4 +
 .../br_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/br_dashlet_invoices.lng          |  18 +
 .../dashboard/lib/lang/br_dashlet_limits.lng  |   1 +
 .../lib/lang/br_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/br_dashlet_shop.lng    |   8 +
 interface/web/dashboard/lib/lang/ca.lng       |   4 +
 .../lib/lang/ca_dashlet_customer.lng          |   4 +
 .../lib/lang/ca_dashlet_databasequota.lng     |   7 +
 .../ca_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/ca_dashlet_invoices.lng          |  18 +
 .../dashboard/lib/lang/ca_dashlet_limits.lng  |  31 ++
 .../lib/lang/ca_dashlet_mailquota.lng         |   8 +
 .../dashboard/lib/lang/ca_dashlet_modules.lng |   3 +
 .../lib/lang/ca_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/ca_dashlet_quota.lng   |   8 +
 .../dashboard/lib/lang/ca_dashlet_shop.lng    |   8 +
 interface/web/dashboard/lib/lang/cz.lng       |   2 -
 .../lib/lang/cz_dashlet_customer.lng          |   4 +
 .../lib/lang/cz_dashlet_databasequota.lng     |   2 +-
 .../cz_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/cz_dashlet_invoices.lng          |  18 +
 .../dashboard/lib/lang/cz_dashlet_limits.lng  |   2 -
 .../lib/lang/cz_dashlet_mailquota.lng         |   2 -
 .../dashboard/lib/lang/cz_dashlet_modules.lng |   2 -
 .../lib/lang/cz_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/cz_dashlet_quota.lng   |   2 -
 .../dashboard/lib/lang/cz_dashlet_shop.lng    |   8 +
 .../lib/lang/de_dashlet_customer.lng          |   4 +
 .../de_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/de_dashlet_invoices.lng          |  18 +
 .../lib/lang/de_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/de_dashlet_shop.lng    |   8 +
 .../lib/lang/el_dashlet_customer.lng          |   4 +
 .../el_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/el_dashlet_invoices.lng          |  18 +
 .../dashboard/lib/lang/el_dashlet_limits.lng  |   1 +
 .../lib/lang/el_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/el_dashlet_shop.lng    |   8 +
 .../lib/lang/en_dashlet_customer.lng          |   4 +
 .../en_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/en_dashlet_invoices.lng          |  18 +
 .../lib/lang/en_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/en_dashlet_shop.lng    |   8 +
 .../lib/lang/es_dashlet_customer.lng          |   4 +
 .../es_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/es_dashlet_invoices.lng          |  18 +
 .../dashboard/lib/lang/es_dashlet_limits.lng  |   1 -
 .../lib/lang/es_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/es_dashlet_shop.lng    |   8 +
 .../lib/lang/fi_dashlet_customer.lng          |   4 +
 .../fi_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/fi_dashlet_invoices.lng          |  18 +
 .../dashboard/lib/lang/fi_dashlet_limits.lng  |   1 +
 .../lib/lang/fi_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/fi_dashlet_shop.lng    |   8 +
 .../lib/lang/fr_dashlet_customer.lng          |   4 +
 .../fr_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/fr_dashlet_invoices.lng          |  18 +
 .../dashboard/lib/lang/fr_dashlet_limits.lng  |  35 +-
 .../lib/lang/fr_dashlet_mailquota.lng         |   6 +-
 .../lib/lang/fr_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/fr_dashlet_shop.lng    |   8 +
 interface/web/dashboard/lib/lang/hr.lng       |   2 -
 .../lib/lang/hr_dashlet_customer.lng          |   4 +
 .../hr_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/hr_dashlet_invoices.lng          |  18 +
 .../dashboard/lib/lang/hr_dashlet_limits.lng  |   3 +-
 .../lib/lang/hr_dashlet_mailquota.lng         |   2 -
 .../dashboard/lib/lang/hr_dashlet_modules.lng |   2 -
 .../lib/lang/hr_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/hr_dashlet_quota.lng   |   2 -
 .../dashboard/lib/lang/hr_dashlet_shop.lng    |   8 +
 .../lib/lang/hu_dashlet_customer.lng          |   4 +
 .../hu_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/hu_dashlet_invoices.lng          |  18 +
 .../dashboard/lib/lang/hu_dashlet_limits.lng  |   1 +
 .../lib/lang/hu_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/hu_dashlet_shop.lng    |   8 +
 .../lib/lang/id_dashlet_customer.lng          |   4 +
 .../id_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/id_dashlet_invoices.lng          |  18 +
 .../dashboard/lib/lang/id_dashlet_limits.lng  |   1 +
 .../lib/lang/id_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/id_dashlet_shop.lng    |   8 +
 .../lib/lang/it_dashlet_customer.lng          |   4 +
 .../it_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/it_dashlet_invoices.lng          |  18 +
 .../dashboard/lib/lang/it_dashlet_limits.lng  |   1 +
 .../lib/lang/it_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/it_dashlet_shop.lng    |   8 +
 .../lib/lang/ja_dashlet_customer.lng          |   4 +
 .../ja_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/ja_dashlet_invoices.lng          |  18 +
 .../dashboard/lib/lang/ja_dashlet_limits.lng  |   1 +
 .../lib/lang/ja_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/ja_dashlet_shop.lng    |   8 +
 .../lib/lang/nl_dashlet_customer.lng          |   4 +
 .../nl_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/nl_dashlet_invoices.lng          |  18 +
 .../dashboard/lib/lang/nl_dashlet_limits.lng  |   1 +
 .../lib/lang/nl_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/nl_dashlet_shop.lng    |   8 +
 .../lib/lang/pl_dashlet_customer.lng          |   4 +
 .../pl_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/pl_dashlet_invoices.lng          |  18 +
 .../dashboard/lib/lang/pl_dashlet_limits.lng  |   1 +
 .../lib/lang/pl_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/pl_dashlet_shop.lng    |   8 +
 .../lib/lang/pt_dashlet_customer.lng          |   4 +
 .../pt_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/pt_dashlet_invoices.lng          |  18 +
 .../dashboard/lib/lang/pt_dashlet_limits.lng  |   1 +
 .../lib/lang/pt_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/pt_dashlet_shop.lng    |   8 +
 .../lib/lang/ro_dashlet_customer.lng          |   4 +
 .../ro_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/ro_dashlet_invoices.lng          |  18 +
 .../dashboard/lib/lang/ro_dashlet_limits.lng  |   1 +
 .../lib/lang/ro_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/ro_dashlet_shop.lng    |   8 +
 .../lib/lang/ru_dashlet_customer.lng          |   4 +
 .../ru_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/ru_dashlet_invoices.lng          |  18 +
 .../dashboard/lib/lang/ru_dashlet_limits.lng  |   1 +
 .../lib/lang/ru_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/ru_dashlet_shop.lng    |   8 +
 .../lib/lang/se_dashlet_customer.lng          |   4 +
 .../se_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/se_dashlet_invoices.lng          |  18 +
 .../dashboard/lib/lang/se_dashlet_limits.lng  |   1 +
 .../lib/lang/se_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/se_dashlet_shop.lng    |   8 +
 .../lib/lang/sk_dashlet_customer.lng          |   4 +
 .../sk_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/sk_dashlet_invoices.lng          |  18 +
 .../dashboard/lib/lang/sk_dashlet_limits.lng  |   1 +
 .../lib/lang/sk_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/sk_dashlet_shop.lng    |   8 +
 interface/web/dashboard/lib/lang/tr.lng       |   1 -
 .../lib/lang/tr_dashlet_customer.lng          |   4 +
 .../tr_dashlet_invoice_client_settings.lng    |   4 +
 .../lib/lang/tr_dashlet_invoices.lng          |  18 +
 .../dashboard/lib/lang/tr_dashlet_limits.lng  |   1 -
 .../dashboard/lib/lang/tr_dashlet_modules.lng |   1 -
 .../lib/lang/tr_dashlet_products.lng          |   9 +
 .../dashboard/lib/lang/tr_dashlet_shop.lng    |   8 +
 interface/web/dns/lib/lang/ar_dns_dmarc.lng   |   8 +-
 interface/web/dns/lib/lang/ar_dns_ds.lng      |  17 +
 interface/web/dns/lib/lang/ar_dns_import.lng  |   2 +
 interface/web/dns/lib/lang/ar_dns_loc.lng     |  16 +
 interface/web/dns/lib/lang/ar_dns_soa.lng     |   5 +
 .../web/dns/lib/lang/ar_dns_soa_list.lng      |   1 +
 interface/web/dns/lib/lang/ar_dns_spf.lng     |  10 +-
 interface/web/dns/lib/lang/ar_dns_tlsa.lng    |  16 +
 interface/web/dns/lib/lang/ar_dns_txt.lng     |  26 +-
 interface/web/dns/lib/lang/ar_dns_wizard.lng  |   2 +
 interface/web/dns/lib/lang/bg_dns_dmarc.lng   |   8 +-
 interface/web/dns/lib/lang/bg_dns_ds.lng      |  18 +
 interface/web/dns/lib/lang/bg_dns_import.lng  |   2 +
 interface/web/dns/lib/lang/bg_dns_loc.lng     |  16 +
 interface/web/dns/lib/lang/bg_dns_soa.lng     |   5 +
 .../web/dns/lib/lang/bg_dns_soa_list.lng      |   1 +
 interface/web/dns/lib/lang/bg_dns_spf.lng     |  10 +-
 interface/web/dns/lib/lang/bg_dns_tlsa.lng    |  16 +
 interface/web/dns/lib/lang/bg_dns_wizard.lng  |   2 +
 interface/web/dns/lib/lang/br_dns_dmarc.lng   |   8 +-
 interface/web/dns/lib/lang/br_dns_ds.lng      |  18 +
 interface/web/dns/lib/lang/br_dns_import.lng  |   2 +
 interface/web/dns/lib/lang/br_dns_loc.lng     |  16 +
 interface/web/dns/lib/lang/br_dns_soa.lng     |   5 +
 .../web/dns/lib/lang/br_dns_soa_list.lng      |   1 +
 interface/web/dns/lib/lang/br_dns_spf.lng     |  10 +-
 interface/web/dns/lib/lang/br_dns_tlsa.lng    |  16 +
 interface/web/dns/lib/lang/br_dns_wizard.lng  |   2 +
 interface/web/dns/lib/lang/ca.lng             |  22 ++
 interface/web/dns/lib/lang/ca_dns_a.lng       |  17 +
 interface/web/dns/lib/lang/ca_dns_a_list.lng  |  15 +
 interface/web/dns/lib/lang/ca_dns_aaaa.lng    |  16 +
 interface/web/dns/lib/lang/ca_dns_alias.lng   |  16 +
 interface/web/dns/lib/lang/ca_dns_cname.lng   |  17 +
 interface/web/dns/lib/lang/ca_dns_dkim.lng    |  11 +
 interface/web/dns/lib/lang/ca_dns_dmarc.lng   |  50 +++
 interface/web/dns/lib/lang/ca_dns_ds.lng      |  17 +
 interface/web/dns/lib/lang/ca_dns_hinfo.lng   |  16 +
 interface/web/dns/lib/lang/ca_dns_import.lng  |  16 +
 interface/web/dns/lib/lang/ca_dns_loc.lng     |  16 +
 interface/web/dns/lib/lang/ca_dns_mx.lng      |  18 +
 interface/web/dns/lib/lang/ca_dns_ns.lng      |  16 +
 interface/web/dns/lib/lang/ca_dns_ptr.lng     |  16 +
 interface/web/dns/lib/lang/ca_dns_rp.lng      |  16 +
 interface/web/dns/lib/lang/ca_dns_slave.lng   |  17 +
 .../dns/lib/lang/ca_dns_slave_admin_list.lng  |  10 +
 .../web/dns/lib/lang/ca_dns_slave_list.lng    |   9 +
 interface/web/dns/lib/lang/ca_dns_soa.lng     |  43 +++
 .../dns/lib/lang/ca_dns_soa_admin_list.lng    |  11 +
 .../web/dns/lib/lang/ca_dns_soa_list.lng      |  11 +
 interface/web/dns/lib/lang/ca_dns_spf.lng     |  25 ++
 interface/web/dns/lib/lang/ca_dns_srv.lng     |  20 +
 .../web/dns/lib/lang/ca_dns_template.lng      |   6 +
 .../web/dns/lib/lang/ca_dns_template_list.lng |   6 +
 interface/web/dns/lib/lang/ca_dns_tlsa.lng    |  16 +
 interface/web/dns/lib/lang/ca_dns_txt.lng     |  19 +
 interface/web/dns/lib/lang/ca_dns_wizard.lng  |  43 +++
 interface/web/dns/lib/lang/cz.lng             |   2 -
 interface/web/dns/lib/lang/cz_dns_a.lng       |   2 -
 interface/web/dns/lib/lang/cz_dns_a_list.lng  |   2 -
 interface/web/dns/lib/lang/cz_dns_aaaa.lng    |   2 -
 interface/web/dns/lib/lang/cz_dns_alias.lng   |   2 -
 interface/web/dns/lib/lang/cz_dns_cname.lng   |   2 -
 interface/web/dns/lib/lang/cz_dns_dmarc.lng   |   8 +-
 interface/web/dns/lib/lang/cz_dns_ds.lng      |  18 +
 interface/web/dns/lib/lang/cz_dns_hinfo.lng   |   2 -
 interface/web/dns/lib/lang/cz_dns_import.lng  |   4 +-
 interface/web/dns/lib/lang/cz_dns_loc.lng     |  16 +
 interface/web/dns/lib/lang/cz_dns_mx.lng      |   2 -
 interface/web/dns/lib/lang/cz_dns_ns.lng      |   2 -
 interface/web/dns/lib/lang/cz_dns_ptr.lng     |   2 -
 interface/web/dns/lib/lang/cz_dns_rp.lng      |   2 -
 interface/web/dns/lib/lang/cz_dns_slave.lng   |   2 -
 .../dns/lib/lang/cz_dns_slave_admin_list.lng  |   2 -
 .../web/dns/lib/lang/cz_dns_slave_list.lng    |   2 -
 interface/web/dns/lib/lang/cz_dns_soa.lng     |   7 +-
 .../dns/lib/lang/cz_dns_soa_admin_list.lng    |   2 -
 .../web/dns/lib/lang/cz_dns_soa_list.lng      |   3 +-
 interface/web/dns/lib/lang/cz_dns_spf.lng     |  10 +-
 interface/web/dns/lib/lang/cz_dns_srv.lng     |   2 -
 .../web/dns/lib/lang/cz_dns_template.lng      |   2 -
 .../web/dns/lib/lang/cz_dns_template_list.lng |   2 -
 interface/web/dns/lib/lang/cz_dns_tlsa.lng    |  16 +
 interface/web/dns/lib/lang/cz_dns_txt.lng     |   2 +-
 interface/web/dns/lib/lang/cz_dns_wizard.lng  |   2 -
 interface/web/dns/lib/lang/de_dns_dkim.lng    |  14 +-
 interface/web/dns/lib/lang/de_dns_dmarc.lng   |  16 +-
 interface/web/dns/lib/lang/de_dns_import.lng  |   2 +
 interface/web/dns/lib/lang/de_dns_soa.lng     |   1 +
 .../web/dns/lib/lang/de_dns_soa_list.lng      |   1 +
 interface/web/dns/lib/lang/de_dns_spf.lng     |   5 +-
 interface/web/dns/lib/lang/de_dns_wizard.lng  |   2 +
 interface/web/dns/lib/lang/el_dns_dkim.lng    |   1 +
 interface/web/dns/lib/lang/el_dns_dmarc.lng   |   8 +-
 interface/web/dns/lib/lang/el_dns_ds.lng      |  18 +
 interface/web/dns/lib/lang/el_dns_import.lng  |   2 +
 interface/web/dns/lib/lang/el_dns_loc.lng     |  16 +
 interface/web/dns/lib/lang/el_dns_soa.lng     |   5 +
 .../web/dns/lib/lang/el_dns_soa_list.lng      |   1 +
 interface/web/dns/lib/lang/el_dns_spf.lng     |  10 +-
 interface/web/dns/lib/lang/el_dns_tlsa.lng    |  16 +
 interface/web/dns/lib/lang/el_dns_wizard.lng  |   3 +
 interface/web/dns/lib/lang/es_dns_dmarc.lng   |   8 +-
 interface/web/dns/lib/lang/es_dns_ds.lng      |  18 +
 interface/web/dns/lib/lang/es_dns_import.lng  |   2 +
 interface/web/dns/lib/lang/es_dns_loc.lng     |  16 +
 interface/web/dns/lib/lang/es_dns_slave.lng   |   1 -
 interface/web/dns/lib/lang/es_dns_soa.lng     |   8 +-
 interface/web/dns/lib/lang/es_dns_spf.lng     |  10 +-
 interface/web/dns/lib/lang/es_dns_tlsa.lng    |  16 +
 interface/web/dns/lib/lang/es_dns_wizard.lng  |  10 +-
 interface/web/dns/lib/lang/fi_dns_dmarc.lng   |   8 +-
 interface/web/dns/lib/lang/fi_dns_ds.lng      |  18 +
 interface/web/dns/lib/lang/fi_dns_import.lng  |   2 +
 interface/web/dns/lib/lang/fi_dns_loc.lng     |  16 +
 interface/web/dns/lib/lang/fi_dns_soa.lng     |   5 +
 .../web/dns/lib/lang/fi_dns_soa_list.lng      |   1 +
 interface/web/dns/lib/lang/fi_dns_spf.lng     |  10 +-
 interface/web/dns/lib/lang/fi_dns_tlsa.lng    |  16 +
 interface/web/dns/lib/lang/fi_dns_wizard.lng  |   2 +
 interface/web/dns/lib/lang/fr_dns_a.lng       |  14 +-
 interface/web/dns/lib/lang/fr_dns_a_list.lng  |   2 +-
 interface/web/dns/lib/lang/fr_dns_aaaa.lng    |  14 +-
 interface/web/dns/lib/lang/fr_dns_alias.lng   |  16 +-
 interface/web/dns/lib/lang/fr_dns_cname.lng   |  16 +-
 interface/web/dns/lib/lang/fr_dns_dkim.lng    |  13 +-
 interface/web/dns/lib/lang/fr_dns_dmarc.lng   |   8 +-
 interface/web/dns/lib/lang/fr_dns_ds.lng      |  17 +
 interface/web/dns/lib/lang/fr_dns_hinfo.lng   |  16 +-
 interface/web/dns/lib/lang/fr_dns_import.lng  |   8 +-
 interface/web/dns/lib/lang/fr_dns_loc.lng     |  16 +
 interface/web/dns/lib/lang/fr_dns_mx.lng      |  16 +-
 interface/web/dns/lib/lang/fr_dns_ns.lng      |   6 +-
 interface/web/dns/lib/lang/fr_dns_ptr.lng     |  10 +-
 interface/web/dns/lib/lang/fr_dns_rp.lng      |  10 +-
 interface/web/dns/lib/lang/fr_dns_slave.lng   |   2 +-
 interface/web/dns/lib/lang/fr_dns_soa.lng     |  18 +-
 .../dns/lib/lang/fr_dns_soa_admin_list.lng    |   2 +-
 .../web/dns/lib/lang/fr_dns_soa_list.lng      |   5 +-
 interface/web/dns/lib/lang/fr_dns_spf.lng     |  10 +-
 interface/web/dns/lib/lang/fr_dns_srv.lng     |  16 +-
 .../web/dns/lib/lang/fr_dns_template_list.lng |   2 +-
 interface/web/dns/lib/lang/fr_dns_tlsa.lng    |  16 +
 interface/web/dns/lib/lang/fr_dns_txt.lng     |  10 +-
 interface/web/dns/lib/lang/fr_dns_wizard.lng  |  37 +-
 interface/web/dns/lib/lang/hr.lng             |   2 -
 interface/web/dns/lib/lang/hr_dns_a.lng       |   2 -
 interface/web/dns/lib/lang/hr_dns_a_list.lng  |   2 -
 interface/web/dns/lib/lang/hr_dns_aaaa.lng    |   2 -
 interface/web/dns/lib/lang/hr_dns_alias.lng   |   2 -
 interface/web/dns/lib/lang/hr_dns_cname.lng   |   2 -
 interface/web/dns/lib/lang/hr_dns_dmarc.lng   |   8 +-
 interface/web/dns/lib/lang/hr_dns_ds.lng      |  17 +
 interface/web/dns/lib/lang/hr_dns_hinfo.lng   |   2 -
 interface/web/dns/lib/lang/hr_dns_import.lng  |   4 +-
 interface/web/dns/lib/lang/hr_dns_loc.lng     |  16 +
 interface/web/dns/lib/lang/hr_dns_mx.lng      |   2 -
 interface/web/dns/lib/lang/hr_dns_ns.lng      |   2 -
 interface/web/dns/lib/lang/hr_dns_ptr.lng     |   2 -
 interface/web/dns/lib/lang/hr_dns_rp.lng      |   2 -
 interface/web/dns/lib/lang/hr_dns_slave.lng   |   2 -
 .../dns/lib/lang/hr_dns_slave_admin_list.lng  |   2 -
 .../web/dns/lib/lang/hr_dns_slave_list.lng    |   2 -
 interface/web/dns/lib/lang/hr_dns_soa.lng     |   7 +-
 .../dns/lib/lang/hr_dns_soa_admin_list.lng    |   2 -
 .../web/dns/lib/lang/hr_dns_soa_list.lng      |   3 +-
 interface/web/dns/lib/lang/hr_dns_spf.lng     |  10 +-
 interface/web/dns/lib/lang/hr_dns_srv.lng     |   2 -
 .../web/dns/lib/lang/hr_dns_template.lng      |   2 -
 .../web/dns/lib/lang/hr_dns_template_list.lng |   2 -
 interface/web/dns/lib/lang/hr_dns_tlsa.lng    |  16 +
 interface/web/dns/lib/lang/hr_dns_wizard.lng  |   4 +-
 interface/web/dns/lib/lang/hu_dns_dmarc.lng   |   8 +-
 interface/web/dns/lib/lang/hu_dns_ds.lng      |  18 +
 interface/web/dns/lib/lang/hu_dns_import.lng  |   2 +
 interface/web/dns/lib/lang/hu_dns_loc.lng     |  16 +
 interface/web/dns/lib/lang/hu_dns_soa.lng     |   5 +
 .../web/dns/lib/lang/hu_dns_soa_list.lng      |   1 +
 interface/web/dns/lib/lang/hu_dns_spf.lng     |  10 +-
 interface/web/dns/lib/lang/hu_dns_tlsa.lng    |  16 +
 interface/web/dns/lib/lang/hu_dns_wizard.lng  |   2 +
 interface/web/dns/lib/lang/id_dns_dmarc.lng   |   8 +-
 interface/web/dns/lib/lang/id_dns_ds.lng      |  18 +
 interface/web/dns/lib/lang/id_dns_import.lng  |   2 +
 interface/web/dns/lib/lang/id_dns_loc.lng     |  16 +
 interface/web/dns/lib/lang/id_dns_soa.lng     |   5 +
 .../web/dns/lib/lang/id_dns_soa_list.lng      |   1 +
 interface/web/dns/lib/lang/id_dns_spf.lng     |  10 +-
 interface/web/dns/lib/lang/id_dns_tlsa.lng    |  16 +
 interface/web/dns/lib/lang/id_dns_wizard.lng  |   2 +
 interface/web/dns/lib/lang/it.lng             |  12 +-
 interface/web/dns/lib/lang/it_dns_a.lng       |   8 +-
 interface/web/dns/lib/lang/it_dns_a_list.lng  |  10 +-
 interface/web/dns/lib/lang/it_dns_aaaa.lng    |  20 +-
 interface/web/dns/lib/lang/it_dns_alias.lng   |   6 +-
 interface/web/dns/lib/lang/it_dns_cname.lng   |  26 +-
 interface/web/dns/lib/lang/it_dns_dmarc.lng   |   8 +-
 interface/web/dns/lib/lang/it_dns_ds.lng      |  18 +
 interface/web/dns/lib/lang/it_dns_hinfo.lng   |   6 +-
 interface/web/dns/lib/lang/it_dns_import.lng  |  24 +-
 interface/web/dns/lib/lang/it_dns_loc.lng     |  16 +
 interface/web/dns/lib/lang/it_dns_mx.lng      |   8 +-
 interface/web/dns/lib/lang/it_dns_ns.lng      |  20 +-
 interface/web/dns/lib/lang/it_dns_ptr.lng     |  10 +-
 interface/web/dns/lib/lang/it_dns_rp.lng      |   6 +-
 interface/web/dns/lib/lang/it_dns_slave.lng   |   8 +-
 .../dns/lib/lang/it_dns_slave_admin_list.lng  |   6 +-
 .../web/dns/lib/lang/it_dns_slave_list.lng    |   8 +-
 interface/web/dns/lib/lang/it_dns_soa.lng     |  51 +--
 .../dns/lib/lang/it_dns_soa_admin_list.lng    |   8 +-
 .../web/dns/lib/lang/it_dns_soa_list.lng      |   7 +-
 interface/web/dns/lib/lang/it_dns_spf.lng     |  10 +-
 interface/web/dns/lib/lang/it_dns_srv.lng     |  16 +-
 .../web/dns/lib/lang/it_dns_template.lng      |   2 +-
 .../web/dns/lib/lang/it_dns_template_list.lng |   8 +-
 interface/web/dns/lib/lang/it_dns_tlsa.lng    |  16 +
 interface/web/dns/lib/lang/it_dns_txt.lng     |   6 +-
 interface/web/dns/lib/lang/it_dns_wizard.lng  |  66 ++--
 interface/web/dns/lib/lang/ja_dns_dmarc.lng   |   8 +-
 interface/web/dns/lib/lang/ja_dns_ds.lng      |  18 +
 interface/web/dns/lib/lang/ja_dns_import.lng  |   2 +
 interface/web/dns/lib/lang/ja_dns_loc.lng     |  16 +
 interface/web/dns/lib/lang/ja_dns_soa.lng     |   5 +
 .../web/dns/lib/lang/ja_dns_soa_list.lng      |   1 +
 interface/web/dns/lib/lang/ja_dns_spf.lng     |  10 +-
 interface/web/dns/lib/lang/ja_dns_tlsa.lng    |  16 +
 interface/web/dns/lib/lang/ja_dns_wizard.lng  |   5 +-
 interface/web/dns/lib/lang/nl_dns_dmarc.lng   |   8 +-
 interface/web/dns/lib/lang/nl_dns_ds.lng      |  18 +
 interface/web/dns/lib/lang/nl_dns_import.lng  |   2 +
 interface/web/dns/lib/lang/nl_dns_loc.lng     |  16 +
 interface/web/dns/lib/lang/nl_dns_soa.lng     |   5 +
 .../web/dns/lib/lang/nl_dns_soa_list.lng      |   1 +
 interface/web/dns/lib/lang/nl_dns_spf.lng     |  10 +-
 interface/web/dns/lib/lang/nl_dns_tlsa.lng    |  16 +
 interface/web/dns/lib/lang/nl_dns_wizard.lng  |   2 +
 interface/web/dns/lib/lang/pl_dns_dkim.lng    |  11 +
 interface/web/dns/lib/lang/pl_dns_dmarc.lng   |   8 +-
 interface/web/dns/lib/lang/pl_dns_ds.lng      |  18 +
 interface/web/dns/lib/lang/pl_dns_import.lng  |   2 +
 interface/web/dns/lib/lang/pl_dns_loc.lng     |  16 +
 interface/web/dns/lib/lang/pl_dns_soa.lng     |   5 +
 .../web/dns/lib/lang/pl_dns_soa_list.lng      |   1 +
 interface/web/dns/lib/lang/pl_dns_spf.lng     |  10 +-
 interface/web/dns/lib/lang/pl_dns_tlsa.lng    |  16 +
 interface/web/dns/lib/lang/pl_dns_wizard.lng  |   2 +
 interface/web/dns/lib/lang/pt_dns_dkim.lng    |  11 +
 interface/web/dns/lib/lang/pt_dns_dmarc.lng   |   8 +-
 interface/web/dns/lib/lang/pt_dns_ds.lng      |  18 +
 interface/web/dns/lib/lang/pt_dns_import.lng  |   2 +
 interface/web/dns/lib/lang/pt_dns_loc.lng     |  16 +
 interface/web/dns/lib/lang/pt_dns_soa.lng     |   5 +
 .../web/dns/lib/lang/pt_dns_soa_list.lng      |   1 +
 interface/web/dns/lib/lang/pt_dns_spf.lng     |  10 +-
 interface/web/dns/lib/lang/pt_dns_tlsa.lng    |  16 +
 interface/web/dns/lib/lang/pt_dns_wizard.lng  |   2 +
 interface/web/dns/lib/lang/ro_dns_dkim.lng    |  11 +
 interface/web/dns/lib/lang/ro_dns_dmarc.lng   |   8 +-
 interface/web/dns/lib/lang/ro_dns_ds.lng      |  17 +
 interface/web/dns/lib/lang/ro_dns_import.lng  |   2 +
 interface/web/dns/lib/lang/ro_dns_loc.lng     |  16 +
 interface/web/dns/lib/lang/ro_dns_soa.lng     |   5 +
 .../web/dns/lib/lang/ro_dns_soa_list.lng      |   1 +
 interface/web/dns/lib/lang/ro_dns_spf.lng     |  10 +-
 interface/web/dns/lib/lang/ro_dns_tlsa.lng    |  16 +
 interface/web/dns/lib/lang/ro_dns_wizard.lng  |   2 +
 interface/web/dns/lib/lang/ru_dns_dmarc.lng   |   8 +-
 interface/web/dns/lib/lang/ru_dns_ds.lng      |  18 +
 interface/web/dns/lib/lang/ru_dns_import.lng  |   2 +
 interface/web/dns/lib/lang/ru_dns_loc.lng     |  16 +
 interface/web/dns/lib/lang/ru_dns_soa.lng     |   5 +
 .../web/dns/lib/lang/ru_dns_soa_list.lng      |   1 +
 interface/web/dns/lib/lang/ru_dns_spf.lng     |  10 +-
 interface/web/dns/lib/lang/ru_dns_tlsa.lng    |  16 +
 interface/web/dns/lib/lang/ru_dns_wizard.lng  |   2 +
 interface/web/dns/lib/lang/se_dns_dmarc.lng   |   8 +-
 interface/web/dns/lib/lang/se_dns_ds.lng      |  18 +
 interface/web/dns/lib/lang/se_dns_import.lng  |   2 +
 interface/web/dns/lib/lang/se_dns_loc.lng     |  16 +
 interface/web/dns/lib/lang/se_dns_soa.lng     |   5 +
 .../web/dns/lib/lang/se_dns_soa_list.lng      |   1 +
 interface/web/dns/lib/lang/se_dns_spf.lng     |  10 +-
 interface/web/dns/lib/lang/se_dns_tlsa.lng    |  16 +
 interface/web/dns/lib/lang/se_dns_wizard.lng  |   2 +
 interface/web/dns/lib/lang/sk_dns_dmarc.lng   |   8 +-
 interface/web/dns/lib/lang/sk_dns_ds.lng      |  18 +
 interface/web/dns/lib/lang/sk_dns_import.lng  |   2 +
 interface/web/dns/lib/lang/sk_dns_loc.lng     |  16 +
 interface/web/dns/lib/lang/sk_dns_soa.lng     |   5 +
 .../web/dns/lib/lang/sk_dns_soa_list.lng      |   1 +
 interface/web/dns/lib/lang/sk_dns_spf.lng     |  10 +-
 interface/web/dns/lib/lang/sk_dns_tlsa.lng    |  16 +
 interface/web/dns/lib/lang/sk_dns_wizard.lng  |   2 +
 interface/web/dns/lib/lang/tr.lng             |   1 -
 interface/web/dns/lib/lang/tr_dns_dmarc.lng   |   8 +-
 interface/web/dns/lib/lang/tr_dns_ds.lng      |  18 +
 interface/web/dns/lib/lang/tr_dns_import.lng  |   2 +
 interface/web/dns/lib/lang/tr_dns_loc.lng     |  16 +
 interface/web/dns/lib/lang/tr_dns_slave.lng   |   1 -
 .../dns/lib/lang/tr_dns_slave_admin_list.lng  |   1 -
 .../web/dns/lib/lang/tr_dns_slave_list.lng    |   1 -
 interface/web/dns/lib/lang/tr_dns_soa.lng     |   6 +-
 .../dns/lib/lang/tr_dns_soa_admin_list.lng    |   1 -
 .../web/dns/lib/lang/tr_dns_soa_list.lng      |   2 +-
 interface/web/dns/lib/lang/tr_dns_spf.lng     |  10 +-
 interface/web/dns/lib/lang/tr_dns_tlsa.lng    |  16 +
 interface/web/dns/lib/lang/tr_dns_wizard.lng  |   5 +
 interface/web/help/lib/lang/ca.lng            |  14 +
 interface/web/help/lib/lang/ca_faq_form.lng   |   6 +
 .../lib/lang/ca_faq_manage_questions_list.lng |   9 +
 .../help/lib/lang/ca_faq_sections_form.lng    |   3 +
 .../web/help/lib/lang/ca_help_faq_list.lng    |   3 +
 .../lib/lang/ca_help_faq_sections_list.lng    |   8 +
 .../web/help/lib/lang/ca_support_message.lng  |  15 +
 .../help/lib/lang/ca_support_message_list.lng |   7 +
 interface/web/help/lib/lang/cz.lng            |   2 -
 interface/web/help/lib/lang/cz_faq_form.lng   |   2 -
 .../lib/lang/cz_faq_manage_questions_list.lng |   2 -
 .../help/lib/lang/cz_faq_sections_form.lng    |   2 -
 .../web/help/lib/lang/cz_help_faq_list.lng    |   2 -
 .../lib/lang/cz_help_faq_sections_list.lng    |   2 -
 .../web/help/lib/lang/cz_support_message.lng  |   2 -
 .../help/lib/lang/cz_support_message_list.lng |   2 -
 interface/web/help/lib/lang/fr.lng            |   2 +-
 .../web/help/lib/lang/fr_support_message.lng  |  12 +-
 interface/web/help/lib/lang/hr.lng            |   2 -
 interface/web/help/lib/lang/hr_faq_form.lng   |   2 -
 .../lib/lang/hr_faq_manage_questions_list.lng |   2 -
 .../help/lib/lang/hr_faq_sections_form.lng    |   2 -
 .../web/help/lib/lang/hr_help_faq_list.lng    |   2 -
 .../lib/lang/hr_help_faq_sections_list.lng    |   2 -
 .../web/help/lib/lang/hr_support_message.lng  |   2 -
 .../help/lib/lang/hr_support_message_list.lng |   2 -
 interface/web/help/lib/lang/it.lng            |   8 +-
 interface/web/help/lib/lang/it_faq_form.lng   |   6 +-
 .../lib/lang/it_faq_manage_questions_list.lng |  12 +-
 .../help/lib/lang/it_faq_sections_form.lng    |   2 +-
 .../web/help/lib/lang/it_help_faq_list.lng    |   2 +-
 .../lib/lang/it_help_faq_sections_list.lng    |  12 +-
 .../web/help/lib/lang/it_support_message.lng  |  16 +-
 interface/web/help/lib/lang/tr.lng            |   2 -
 interface/web/help/lib/lang/tr_faq_form.lng   |   1 -
 .../lib/lang/tr_faq_manage_questions_list.lng |   3 -
 .../help/lib/lang/tr_faq_sections_form.lng    |   1 -
 .../web/help/lib/lang/tr_help_faq_list.lng    |   1 -
 .../lib/lang/tr_help_faq_sections_list.lng    |   2 -
 .../web/help/lib/lang/tr_support_message.lng  |   1 -
 interface/web/login/lib/lang/ar.lng           |   1 +
 interface/web/login/lib/lang/bg.lng           |   1 +
 interface/web/login/lib/lang/br.lng           |   1 +
 interface/web/login/lib/lang/ca.lng           |  28 ++
 interface/web/login/lib/lang/ca_login_as.lng  |  11 +
 interface/web/login/lib/lang/cz.lng           |   3 +-
 interface/web/login/lib/lang/el.lng           |   1 +
 interface/web/login/lib/lang/es.lng           |   1 +
 interface/web/login/lib/lang/es_login_as.lng  |   6 +-
 interface/web/login/lib/lang/fi.lng           |   1 +
 interface/web/login/lib/lang/fr.lng           |  29 +-
 interface/web/login/lib/lang/fr_login_as.lng  |  16 +-
 interface/web/login/lib/lang/hr.lng           |   3 +-
 interface/web/login/lib/lang/hr_login_as.lng  |   2 -
 interface/web/login/lib/lang/hu.lng           |   1 +
 interface/web/login/lib/lang/id.lng           |   1 +
 interface/web/login/lib/lang/it.lng           |  19 +-
 interface/web/login/lib/lang/it_login_as.lng  |  18 +-
 interface/web/login/lib/lang/ja.lng           |   1 +
 interface/web/login/lib/lang/nl.lng           |   1 +
 interface/web/login/lib/lang/pl.lng           |   1 +
 interface/web/login/lib/lang/pt.lng           |   1 +
 interface/web/login/lib/lang/ro.lng           |   1 +
 interface/web/login/lib/lang/ru.lng           |   1 +
 interface/web/login/lib/lang/se.lng           |   1 +
 interface/web/login/lib/lang/sk.lng           |   1 +
 interface/web/login/lib/lang/tr.lng           |   1 +
 interface/web/login/lib/lang/tr_login_as.lng  |   7 +-
 .../mail/lib/lang/ar_backup_stats_list.lng    |  10 +-
 interface/web/mail/lib/lang/ar_mail_alias.lng |   2 +
 .../web/mail/lib/lang/ar_mail_domain.lng      |  15 +-
 .../web/mail/lib/lang/ar_mail_forward.lng     |   3 +
 interface/web/mail/lib/lang/ar_mail_user.lng  |   8 +-
 .../web/mail/lib/lang/ar_mail_user_filter.lng |  10 +-
 .../web/mail/lib/lang/ar_mail_user_list.lng   |   4 +
 .../web/mail/lib/lang/ar_xmpp_domain.lng      |  62 +++
 .../lib/lang/ar_xmpp_domain_admin_list.lng    |   8 +
 .../web/mail/lib/lang/ar_xmpp_domain_list.lng |   7 +
 interface/web/mail/lib/lang/ar_xmpp_user.lng  |  15 +
 .../web/mail/lib/lang/ar_xmpp_user_list.lng   |   8 +
 .../mail/lib/lang/bg_backup_stats_list.lng    |  10 +-
 interface/web/mail/lib/lang/bg_mail_alias.lng |   2 +
 .../web/mail/lib/lang/bg_mail_domain.lng      |  15 +-
 .../web/mail/lib/lang/bg_mail_forward.lng     |   3 +
 interface/web/mail/lib/lang/bg_mail_user.lng  |  10 +
 .../web/mail/lib/lang/bg_mail_user_filter.lng |  10 +-
 .../web/mail/lib/lang/bg_mail_user_list.lng   |   4 +
 .../web/mail/lib/lang/bg_xmpp_domain.lng      |  62 +++
 .../lib/lang/bg_xmpp_domain_admin_list.lng    |   8 +
 .../web/mail/lib/lang/bg_xmpp_domain_list.lng |   7 +
 interface/web/mail/lib/lang/bg_xmpp_user.lng  |  15 +
 .../web/mail/lib/lang/bg_xmpp_user_list.lng   |   8 +
 .../mail/lib/lang/br_backup_stats_list.lng    |  10 +-
 interface/web/mail/lib/lang/br_mail_alias.lng |   2 +
 .../web/mail/lib/lang/br_mail_domain.lng      |  15 +-
 .../web/mail/lib/lang/br_mail_forward.lng     |   3 +
 interface/web/mail/lib/lang/br_mail_user.lng  |  10 +
 .../web/mail/lib/lang/br_mail_user_filter.lng |  10 +-
 .../web/mail/lib/lang/br_mail_user_list.lng   |   4 +
 .../web/mail/lib/lang/br_xmpp_domain.lng      |  62 +++
 .../lib/lang/br_xmpp_domain_admin_list.lng    |   8 +
 .../web/mail/lib/lang/br_xmpp_domain_list.lng |   7 +
 interface/web/mail/lib/lang/br_xmpp_user.lng  |  15 +
 .../web/mail/lib/lang/br_xmpp_user_list.lng   |   8 +
 interface/web/mail/lib/lang/ca.lng            |  48 +++
 .../mail/lib/lang/ca_backup_stats_list.lng    |   9 +
 interface/web/mail/lib/lang/ca_mail_alias.lng |  17 +
 .../web/mail/lib/lang/ca_mail_alias_list.lng  |   8 +
 .../web/mail/lib/lang/ca_mail_aliasdomain.lng |  11 +
 .../lib/lang/ca_mail_aliasdomain_list.lng     |   7 +
 .../web/mail/lib/lang/ca_mail_backup_list.lng |  16 +
 .../web/mail/lib/lang/ca_mail_blacklist.lng   |   9 +
 .../mail/lib/lang/ca_mail_blacklist_list.lng  |  10 +
 .../mail/lib/lang/ca_mail_content_filter.lng  |   9 +
 .../lib/lang/ca_mail_content_filter_list.lng  |   8 +
 .../web/mail/lib/lang/ca_mail_domain.lng      |  23 ++
 .../lib/lang/ca_mail_domain_admin_list.lng    |   8 +
 .../mail/lib/lang/ca_mail_domain_catchall.lng |  11 +
 .../lib/lang/ca_mail_domain_catchall_list.lng |   9 +
 .../web/mail/lib/lang/ca_mail_domain_list.lng |   7 +
 .../web/mail/lib/lang/ca_mail_forward.lng     |  13 +
 .../mail/lib/lang/ca_mail_forward_list.lng    |   8 +
 interface/web/mail/lib/lang/ca_mail_get.lng   |  19 +
 .../web/mail/lib/lang/ca_mail_get_list.lng    |   9 +
 .../web/mail/lib/lang/ca_mail_mailinglist.lng |  22 ++
 .../lib/lang/ca_mail_mailinglist_list.lng     |   5 +
 .../mail/lib/lang/ca_mail_relay_recipient.lng |   9 +
 .../lib/lang/ca_mail_relay_recipient_list.lng |   9 +
 .../web/mail/lib/lang/ca_mail_spamfilter.lng  |  17 +
 .../mail/lib/lang/ca_mail_spamfilter_list.lng |   8 +
 .../web/mail/lib/lang/ca_mail_transport.lng   |  11 +
 .../mail/lib/lang/ca_mail_transport_list.lng  |   9 +
 interface/web/mail/lib/lang/ca_mail_user.lng  |  64 +++
 .../web/mail/lib/lang/ca_mail_user_filter.lng |  28 ++
 .../lib/lang/ca_mail_user_filter_list.lng     |   7 +
 .../web/mail/lib/lang/ca_mail_user_list.lng   |  12 +
 .../mail/lib/lang/ca_mail_user_stats_list.lng |   8 +
 .../web/mail/lib/lang/ca_mail_whitelist.lng   |   9 +
 .../mail/lib/lang/ca_mail_whitelist_list.lng  |  10 +
 .../mail/lib/lang/ca_spamfilter_blacklist.lng |  12 +
 .../lib/lang/ca_spamfilter_blacklist_list.lng |   9 +
 .../mail/lib/lang/ca_spamfilter_config.lng    |  20 +
 .../lib/lang/ca_spamfilter_config_list.lng    |   5 +
 .../mail/lib/lang/ca_spamfilter_policy.lng    |  38 ++
 .../lib/lang/ca_spamfilter_policy_list.lng    |   9 +
 .../web/mail/lib/lang/ca_spamfilter_users.lng |  13 +
 .../lib/lang/ca_spamfilter_users_list.lng     |  10 +
 .../mail/lib/lang/ca_spamfilter_whitelist.lng |  12 +
 .../lib/lang/ca_spamfilter_whitelist_list.lng |   9 +
 .../lib/lang/ca_user_quota_stats_list.lng     |   8 +
 .../web/mail/lib/lang/ca_xmpp_domain.lng      |  62 +++
 .../lib/lang/ca_xmpp_domain_admin_list.lng    |   8 +
 .../web/mail/lib/lang/ca_xmpp_domain_list.lng |   7 +
 interface/web/mail/lib/lang/ca_xmpp_user.lng  |  15 +
 .../web/mail/lib/lang/ca_xmpp_user_list.lng   |   8 +
 interface/web/mail/lib/lang/cz.lng            |   2 -
 .../mail/lib/lang/cz_backup_stats_list.lng    |  10 +-
 interface/web/mail/lib/lang/cz_mail_alias.lng |   4 +-
 .../web/mail/lib/lang/cz_mail_alias_list.lng  |   2 -
 .../web/mail/lib/lang/cz_mail_aliasdomain.lng |   2 -
 .../lib/lang/cz_mail_aliasdomain_list.lng     |   2 -
 .../web/mail/lib/lang/cz_mail_blacklist.lng   |   2 -
 .../mail/lib/lang/cz_mail_blacklist_list.lng  |   2 -
 .../mail/lib/lang/cz_mail_content_filter.lng  |   2 -
 .../lib/lang/cz_mail_content_filter_list.lng  |   2 -
 .../web/mail/lib/lang/cz_mail_domain.lng      |   2 -
 .../lib/lang/cz_mail_domain_admin_list.lng    |   2 -
 .../mail/lib/lang/cz_mail_domain_catchall.lng |   2 -
 .../lib/lang/cz_mail_domain_catchall_list.lng |   2 -
 .../web/mail/lib/lang/cz_mail_domain_list.lng |   2 -
 .../web/mail/lib/lang/cz_mail_forward.lng     |   5 +-
 .../mail/lib/lang/cz_mail_forward_list.lng    |   2 -
 interface/web/mail/lib/lang/cz_mail_get.lng   |   2 -
 .../web/mail/lib/lang/cz_mail_get_list.lng    |   2 -
 .../web/mail/lib/lang/cz_mail_mailinglist.lng |   2 -
 .../lib/lang/cz_mail_mailinglist_list.lng     |   2 -
 .../mail/lib/lang/cz_mail_relay_recipient.lng |   2 -
 .../lib/lang/cz_mail_relay_recipient_list.lng |   2 -
 .../web/mail/lib/lang/cz_mail_spamfilter.lng  |   2 -
 .../mail/lib/lang/cz_mail_spamfilter_list.lng |   2 -
 .../web/mail/lib/lang/cz_mail_transport.lng   |   2 -
 .../mail/lib/lang/cz_mail_transport_list.lng  |   2 -
 interface/web/mail/lib/lang/cz_mail_user.lng  |  10 +-
 .../web/mail/lib/lang/cz_mail_user_filter.lng |  12 +-
 .../lib/lang/cz_mail_user_filter_list.lng     |   2 -
 .../web/mail/lib/lang/cz_mail_user_list.lng   |   6 +-
 .../mail/lib/lang/cz_mail_user_stats_list.lng |   2 -
 .../web/mail/lib/lang/cz_mail_whitelist.lng   |   2 -
 .../mail/lib/lang/cz_mail_whitelist_list.lng  |   2 -
 .../mail/lib/lang/cz_spamfilter_blacklist.lng |   2 -
 .../lib/lang/cz_spamfilter_blacklist_list.lng |   2 -
 .../mail/lib/lang/cz_spamfilter_config.lng    |   2 -
 .../lib/lang/cz_spamfilter_config_list.lng    |   2 -
 .../mail/lib/lang/cz_spamfilter_policy.lng    |   2 -
 .../lib/lang/cz_spamfilter_policy_list.lng    |   2 -
 .../web/mail/lib/lang/cz_spamfilter_users.lng |   2 -
 .../lib/lang/cz_spamfilter_users_list.lng     |   2 -
 .../mail/lib/lang/cz_spamfilter_whitelist.lng |   2 -
 .../lib/lang/cz_spamfilter_whitelist_list.lng |   2 -
 .../lib/lang/cz_user_quota_stats_list.lng     |   2 -
 .../web/mail/lib/lang/cz_xmpp_domain.lng      |  62 +++
 .../lib/lang/cz_xmpp_domain_admin_list.lng    |   8 +
 .../web/mail/lib/lang/cz_xmpp_domain_list.lng |   7 +
 interface/web/mail/lib/lang/cz_xmpp_user.lng  |  15 +
 .../web/mail/lib/lang/cz_xmpp_user_list.lng   |   8 +
 .../mail/lib/lang/de_backup_stats_list.lng    |  10 +-
 .../web/mail/lib/lang/de_mail_domain.lng      |  15 +-
 interface/web/mail/lib/lang/de_mail_user.lng  |   8 +-
 .../web/mail/lib/lang/de_mail_user_list.lng   |   4 +
 .../web/mail/lib/lang/de_xmpp_domain.lng      |  62 +++
 .../lib/lang/de_xmpp_domain_admin_list.lng    |   8 +
 .../web/mail/lib/lang/de_xmpp_domain_list.lng |   7 +
 interface/web/mail/lib/lang/de_xmpp_user.lng  |  15 +
 .../web/mail/lib/lang/de_xmpp_user_list.lng   |   8 +
 .../mail/lib/lang/el_backup_stats_list.lng    |  10 +-
 interface/web/mail/lib/lang/el_mail_alias.lng |   2 +
 .../web/mail/lib/lang/el_mail_domain.lng      |  15 +-
 .../web/mail/lib/lang/el_mail_forward.lng     |   3 +
 interface/web/mail/lib/lang/el_mail_user.lng  |  10 +
 .../web/mail/lib/lang/el_mail_user_filter.lng |  10 +-
 .../web/mail/lib/lang/el_mail_user_list.lng   |   4 +
 .../web/mail/lib/lang/el_xmpp_domain.lng      |  62 +++
 .../lib/lang/el_xmpp_domain_admin_list.lng    |   8 +
 .../web/mail/lib/lang/el_xmpp_domain_list.lng |   7 +
 interface/web/mail/lib/lang/el_xmpp_user.lng  |  15 +
 .../web/mail/lib/lang/el_xmpp_user_list.lng   |   8 +
 interface/web/mail/lib/lang/es.lng            |   1 -
 .../mail/lib/lang/es_backup_stats_list.lng    |  10 +-
 interface/web/mail/lib/lang/es_mail_alias.lng |   2 +
 .../web/mail/lib/lang/es_mail_domain.lng      |  15 +-
 .../web/mail/lib/lang/es_mail_forward.lng     |   3 +
 interface/web/mail/lib/lang/es_mail_get.lng   |   2 +-
 .../web/mail/lib/lang/es_mail_mailinglist.lng |   1 -
 interface/web/mail/lib/lang/es_mail_user.lng  |  11 +
 .../web/mail/lib/lang/es_xmpp_domain.lng      |  62 +++
 .../lib/lang/es_xmpp_domain_admin_list.lng    |   8 +
 .../web/mail/lib/lang/es_xmpp_domain_list.lng |   7 +
 interface/web/mail/lib/lang/es_xmpp_user.lng  |  15 +
 .../web/mail/lib/lang/es_xmpp_user_list.lng   |   8 +
 .../mail/lib/lang/fi_backup_stats_list.lng    |  10 +-
 interface/web/mail/lib/lang/fi_mail_alias.lng |   2 +
 .../web/mail/lib/lang/fi_mail_domain.lng      |  15 +-
 .../web/mail/lib/lang/fi_mail_forward.lng     |   3 +
 interface/web/mail/lib/lang/fi_mail_user.lng  |   8 +-
 .../web/mail/lib/lang/fi_mail_user_filter.lng |  10 +-
 .../web/mail/lib/lang/fi_mail_user_list.lng   |   4 +
 .../web/mail/lib/lang/fi_xmpp_domain.lng      |  62 +++
 .../lib/lang/fi_xmpp_domain_admin_list.lng    |   8 +
 .../web/mail/lib/lang/fi_xmpp_domain_list.lng |   7 +
 interface/web/mail/lib/lang/fi_xmpp_user.lng  |  15 +
 .../web/mail/lib/lang/fi_xmpp_user_list.lng   |   8 +
 interface/web/mail/lib/lang/fr.lng            |  38 +-
 .../mail/lib/lang/fr_backup_stats_list.lng    |  10 +-
 interface/web/mail/lib/lang/fr_mail_alias.lng |  18 +-
 .../web/mail/lib/lang/fr_mail_alias_list.lng  |   6 +-
 .../web/mail/lib/lang/fr_mail_aliasdomain.lng |   4 +-
 .../web/mail/lib/lang/fr_mail_blacklist.lng   |   4 +-
 .../mail/lib/lang/fr_mail_blacklist_list.lng  |   2 +-
 .../web/mail/lib/lang/fr_mail_domain.lng      |  21 +-
 .../lib/lang/fr_mail_domain_admin_list.lng    |   2 +-
 .../mail/lib/lang/fr_mail_domain_catchall.lng |   4 +-
 .../lib/lang/fr_mail_domain_catchall_list.lng |   2 +-
 .../web/mail/lib/lang/fr_mail_domain_list.lng |   2 +-
 .../web/mail/lib/lang/fr_mail_forward.lng     |   9 +-
 .../mail/lib/lang/fr_mail_forward_list.lng    |   6 +-
 interface/web/mail/lib/lang/fr_mail_get.lng   |  10 +-
 .../web/mail/lib/lang/fr_mail_mailinglist.lng |  10 +-
 .../mail/lib/lang/fr_mail_relay_recipient.lng |   2 +-
 .../web/mail/lib/lang/fr_mail_spamfilter.lng  |  14 +-
 .../mail/lib/lang/fr_mail_spamfilter_list.lng |   2 +-
 .../mail/lib/lang/fr_mail_transport_list.lng  |   2 +-
 interface/web/mail/lib/lang/fr_mail_user.lng  |  46 ++-
 .../web/mail/lib/lang/fr_mail_user_filter.lng |  14 +-
 .../web/mail/lib/lang/fr_mail_user_list.lng   |  10 +-
 .../mail/lib/lang/fr_mail_user_stats_list.lng |   8 +-
 .../web/mail/lib/lang/fr_mail_whitelist.lng   |   2 +-
 .../mail/lib/lang/fr_mail_whitelist_list.lng  |   2 +-
 .../mail/lib/lang/fr_spamfilter_blacklist.lng |   4 +-
 .../mail/lib/lang/fr_spamfilter_config.lng    |   4 +-
 .../web/mail/lib/lang/fr_spamfilter_users.lng |   2 +-
 .../lib/lang/fr_spamfilter_users_list.lng     |   6 +-
 .../mail/lib/lang/fr_spamfilter_whitelist.lng |   4 +-
 .../lib/lang/fr_spamfilter_whitelist_list.lng |   2 +-
 .../lib/lang/fr_user_quota_stats_list.lng     |   4 +-
 .../web/mail/lib/lang/fr_xmpp_domain.lng      |  62 +++
 .../lib/lang/fr_xmpp_domain_admin_list.lng    |   8 +
 .../web/mail/lib/lang/fr_xmpp_domain_list.lng |   7 +
 interface/web/mail/lib/lang/fr_xmpp_user.lng  |  15 +
 .../web/mail/lib/lang/fr_xmpp_user_list.lng   |   8 +
 interface/web/mail/lib/lang/hr.lng            |   4 +-
 .../mail/lib/lang/hr_backup_stats_list.lng    |  10 +-
 interface/web/mail/lib/lang/hr_mail_alias.lng |   4 +-
 .../web/mail/lib/lang/hr_mail_alias_list.lng  |   2 -
 .../web/mail/lib/lang/hr_mail_aliasdomain.lng |   2 -
 .../lib/lang/hr_mail_aliasdomain_list.lng     |   2 -
 .../web/mail/lib/lang/hr_mail_blacklist.lng   |   2 -
 .../mail/lib/lang/hr_mail_blacklist_list.lng  |   2 -
 .../mail/lib/lang/hr_mail_content_filter.lng  |   2 -
 .../lib/lang/hr_mail_content_filter_list.lng  |   2 -
 .../web/mail/lib/lang/hr_mail_domain.lng      |  17 +-
 .../lib/lang/hr_mail_domain_admin_list.lng    |   2 -
 .../mail/lib/lang/hr_mail_domain_catchall.lng |   2 -
 .../lib/lang/hr_mail_domain_catchall_list.lng |   2 -
 .../web/mail/lib/lang/hr_mail_domain_list.lng |   2 -
 .../web/mail/lib/lang/hr_mail_forward.lng     |   5 +-
 .../mail/lib/lang/hr_mail_forward_list.lng    |   2 -
 interface/web/mail/lib/lang/hr_mail_get.lng   |   2 -
 .../web/mail/lib/lang/hr_mail_get_list.lng    |   2 -
 .../web/mail/lib/lang/hr_mail_mailinglist.lng |   2 -
 .../lib/lang/hr_mail_mailinglist_list.lng     |   2 -
 .../mail/lib/lang/hr_mail_relay_recipient.lng |   2 -
 .../lib/lang/hr_mail_relay_recipient_list.lng |   2 -
 .../web/mail/lib/lang/hr_mail_spamfilter.lng  |   2 -
 .../mail/lib/lang/hr_mail_spamfilter_list.lng |   2 -
 .../web/mail/lib/lang/hr_mail_transport.lng   |   2 -
 .../mail/lib/lang/hr_mail_transport_list.lng  |   2 -
 interface/web/mail/lib/lang/hr_mail_user.lng  |  14 +-
 .../web/mail/lib/lang/hr_mail_user_filter.lng |  12 +-
 .../lib/lang/hr_mail_user_filter_list.lng     |   2 -
 .../web/mail/lib/lang/hr_mail_user_list.lng   |   6 +-
 .../mail/lib/lang/hr_mail_user_stats_list.lng |   2 -
 .../web/mail/lib/lang/hr_mail_whitelist.lng   |   2 -
 .../mail/lib/lang/hr_spamfilter_blacklist.lng |   2 -
 .../lib/lang/hr_spamfilter_blacklist_list.lng |   2 -
 .../mail/lib/lang/hr_spamfilter_config.lng    |   2 -
 .../lib/lang/hr_spamfilter_config_list.lng    |   2 -
 .../mail/lib/lang/hr_spamfilter_policy.lng    |   2 -
 .../lib/lang/hr_spamfilter_policy_list.lng    |   2 -
 .../web/mail/lib/lang/hr_spamfilter_users.lng |   2 -
 .../lib/lang/hr_spamfilter_users_list.lng     |   2 -
 .../mail/lib/lang/hr_spamfilter_whitelist.lng |   2 -
 .../lib/lang/hr_spamfilter_whitelist_list.lng |   2 -
 .../lib/lang/hr_user_quota_stats_list.lng     |   2 -
 .../web/mail/lib/lang/hr_xmpp_domain.lng      |  62 +++
 .../lib/lang/hr_xmpp_domain_admin_list.lng    |   8 +
 .../web/mail/lib/lang/hr_xmpp_domain_list.lng |   7 +
 interface/web/mail/lib/lang/hr_xmpp_user.lng  |  15 +
 .../web/mail/lib/lang/hr_xmpp_user_list.lng   |   8 +
 .../mail/lib/lang/hu_backup_stats_list.lng    |  10 +-
 interface/web/mail/lib/lang/hu_mail_alias.lng |   2 +
 .../web/mail/lib/lang/hu_mail_domain.lng      |  15 +-
 .../web/mail/lib/lang/hu_mail_forward.lng     |   3 +
 interface/web/mail/lib/lang/hu_mail_user.lng  |   8 +-
 .../web/mail/lib/lang/hu_mail_user_filter.lng |  10 +-
 .../web/mail/lib/lang/hu_mail_user_list.lng   |   4 +
 .../web/mail/lib/lang/hu_xmpp_domain.lng      |  62 +++
 .../lib/lang/hu_xmpp_domain_admin_list.lng    |   8 +
 .../web/mail/lib/lang/hu_xmpp_domain_list.lng |   7 +
 interface/web/mail/lib/lang/hu_xmpp_user.lng  |  15 +
 .../web/mail/lib/lang/hu_xmpp_user_list.lng   |   8 +
 .../mail/lib/lang/id_backup_stats_list.lng    |  10 +-
 interface/web/mail/lib/lang/id_mail_alias.lng |   2 +
 .../web/mail/lib/lang/id_mail_domain.lng      |  15 +-
 .../web/mail/lib/lang/id_mail_forward.lng     |   3 +
 interface/web/mail/lib/lang/id_mail_user.lng  |   8 +-
 .../web/mail/lib/lang/id_mail_user_filter.lng |  10 +-
 .../web/mail/lib/lang/id_mail_user_list.lng   |   4 +
 .../web/mail/lib/lang/id_xmpp_domain.lng      |  62 +++
 .../lib/lang/id_xmpp_domain_admin_list.lng    |   8 +
 .../web/mail/lib/lang/id_xmpp_domain_list.lng |   7 +
 interface/web/mail/lib/lang/id_xmpp_user.lng  |  15 +
 .../web/mail/lib/lang/id_xmpp_user_list.lng   |   8 +
 interface/web/mail/lib/lang/it.lng            |   4 +-
 .../mail/lib/lang/it_backup_stats_list.lng    |  10 +-
 interface/web/mail/lib/lang/it_mail_alias.lng |   4 +-
 .../web/mail/lib/lang/it_mail_alias_list.lng  |   6 +-
 .../web/mail/lib/lang/it_mail_aliasdomain.lng |  10 +-
 .../lib/lang/it_mail_aliasdomain_list.lng     |   6 +-
 .../web/mail/lib/lang/it_mail_blacklist.lng   |   6 +-
 .../mail/lib/lang/it_mail_blacklist_list.lng  |   4 +-
 .../mail/lib/lang/it_mail_content_filter.lng  |   4 +-
 .../lib/lang/it_mail_content_filter_list.lng  |   4 +-
 .../web/mail/lib/lang/it_mail_domain.lng      |  17 +-
 .../mail/lib/lang/it_mail_domain_catchall.lng |  12 +-
 .../lib/lang/it_mail_domain_catchall_list.lng |   6 +-
 .../web/mail/lib/lang/it_mail_domain_list.lng |   8 +-
 .../web/mail/lib/lang/it_mail_forward.lng     |  13 +-
 .../mail/lib/lang/it_mail_forward_list.lng    |   6 +-
 interface/web/mail/lib/lang/it_mail_get.lng   |  24 +-
 .../web/mail/lib/lang/it_mail_get_list.lng    |   8 +-
 .../web/mail/lib/lang/it_mail_mailinglist.lng |  20 +-
 .../lib/lang/it_mail_mailinglist_list.lng     |   2 +-
 .../mail/lib/lang/it_mail_relay_recipient.lng |   8 +-
 .../lib/lang/it_mail_relay_recipient_list.lng |   4 +-
 .../web/mail/lib/lang/it_mail_spamfilter.lng  |  28 +-
 .../mail/lib/lang/it_mail_spamfilter_list.lng |   4 +-
 .../web/mail/lib/lang/it_mail_transport.lng   |  10 +-
 .../mail/lib/lang/it_mail_transport_list.lng  |  10 +-
 interface/web/mail/lib/lang/it_mail_user.lng  |  94 ++---
 .../web/mail/lib/lang/it_mail_user_filter.lng |  40 +-
 .../web/mail/lib/lang/it_mail_user_list.lng   |   6 +-
 .../web/mail/lib/lang/it_mail_whitelist.lng   |   6 +-
 .../mail/lib/lang/it_mail_whitelist_list.lng  |   4 +-
 .../mail/lib/lang/it_spamfilter_blacklist.lng |  14 +-
 .../lib/lang/it_spamfilter_blacklist_list.lng |  10 +-
 .../mail/lib/lang/it_spamfilter_config.lng    |   2 +-
 .../lib/lang/it_spamfilter_policy_list.lng    |   2 +-
 .../web/mail/lib/lang/it_spamfilter_users.lng |  14 +-
 .../lib/lang/it_spamfilter_users_list.lng     |   4 +-
 .../mail/lib/lang/it_spamfilter_whitelist.lng |   6 +-
 .../lib/lang/it_spamfilter_whitelist_list.lng |  12 +-
 .../lib/lang/it_user_quota_stats_list.lng     |  10 +-
 .../web/mail/lib/lang/it_xmpp_domain.lng      |  62 +++
 .../lib/lang/it_xmpp_domain_admin_list.lng    |   8 +
 .../web/mail/lib/lang/it_xmpp_domain_list.lng |   7 +
 interface/web/mail/lib/lang/it_xmpp_user.lng  |  15 +
 .../web/mail/lib/lang/it_xmpp_user_list.lng   |   8 +
 .../mail/lib/lang/ja_backup_stats_list.lng    |  10 +-
 interface/web/mail/lib/lang/ja_mail_alias.lng |   2 +
 .../web/mail/lib/lang/ja_mail_domain.lng      |  17 +-
 .../web/mail/lib/lang/ja_mail_forward.lng     |   3 +
 interface/web/mail/lib/lang/ja_mail_user.lng  |   8 +-
 .../web/mail/lib/lang/ja_mail_user_filter.lng |  10 +-
 .../web/mail/lib/lang/ja_mail_user_list.lng   |   4 +
 .../web/mail/lib/lang/ja_xmpp_domain.lng      |  62 +++
 .../lib/lang/ja_xmpp_domain_admin_list.lng    |   8 +
 .../web/mail/lib/lang/ja_xmpp_domain_list.lng |   7 +
 interface/web/mail/lib/lang/ja_xmpp_user.lng  |  15 +
 .../web/mail/lib/lang/ja_xmpp_user_list.lng   |   8 +
 .../mail/lib/lang/nl_backup_stats_list.lng    |  10 +-
 interface/web/mail/lib/lang/nl_mail_alias.lng |   2 +
 .../web/mail/lib/lang/nl_mail_domain.lng      |  15 +-
 .../web/mail/lib/lang/nl_mail_forward.lng     |   3 +
 interface/web/mail/lib/lang/nl_mail_user.lng  |   8 +-
 .../web/mail/lib/lang/nl_mail_user_filter.lng |  10 +-
 .../web/mail/lib/lang/nl_mail_user_list.lng   |   4 +
 .../web/mail/lib/lang/nl_xmpp_domain.lng      |  62 +++
 .../lib/lang/nl_xmpp_domain_admin_list.lng    |   8 +
 .../web/mail/lib/lang/nl_xmpp_domain_list.lng |   7 +
 interface/web/mail/lib/lang/nl_xmpp_user.lng  |  15 +
 .../web/mail/lib/lang/nl_xmpp_user_list.lng   |   8 +
 .../mail/lib/lang/pl_backup_stats_list.lng    |  10 +-
 interface/web/mail/lib/lang/pl_mail_alias.lng |   2 +
 .../web/mail/lib/lang/pl_mail_backup_list.lng |  16 +
 .../web/mail/lib/lang/pl_mail_domain.lng      |  15 +-
 .../web/mail/lib/lang/pl_mail_forward.lng     |   3 +
 interface/web/mail/lib/lang/pl_mail_user.lng  |   8 +-
 .../web/mail/lib/lang/pl_mail_user_filter.lng |  10 +-
 .../web/mail/lib/lang/pl_mail_user_list.lng   |   4 +
 .../web/mail/lib/lang/pl_xmpp_domain.lng      |  62 +++
 .../lib/lang/pl_xmpp_domain_admin_list.lng    |   8 +
 .../web/mail/lib/lang/pl_xmpp_domain_list.lng |   7 +
 interface/web/mail/lib/lang/pl_xmpp_user.lng  |  15 +
 .../web/mail/lib/lang/pl_xmpp_user_list.lng   |   8 +
 .../mail/lib/lang/pt_backup_stats_list.lng    |  10 +-
 interface/web/mail/lib/lang/pt_mail_alias.lng |   2 +
 .../web/mail/lib/lang/pt_mail_backup_list.lng |  16 +
 .../web/mail/lib/lang/pt_mail_domain.lng      |  15 +-
 .../web/mail/lib/lang/pt_mail_forward.lng     |   3 +
 interface/web/mail/lib/lang/pt_mail_user.lng  |   8 +-
 .../web/mail/lib/lang/pt_mail_user_filter.lng |  10 +-
 .../web/mail/lib/lang/pt_mail_user_list.lng   |   4 +
 .../web/mail/lib/lang/pt_xmpp_domain.lng      |  62 +++
 .../lib/lang/pt_xmpp_domain_admin_list.lng    |   8 +
 .../web/mail/lib/lang/pt_xmpp_domain_list.lng |   7 +
 interface/web/mail/lib/lang/pt_xmpp_user.lng  |  15 +
 .../web/mail/lib/lang/pt_xmpp_user_list.lng   |   8 +
 .../mail/lib/lang/ro_backup_stats_list.lng    |  10 +-
 interface/web/mail/lib/lang/ro_mail_alias.lng |   2 +
 .../web/mail/lib/lang/ro_mail_backup_list.lng |  16 +
 .../web/mail/lib/lang/ro_mail_domain.lng      |  15 +-
 .../web/mail/lib/lang/ro_mail_forward.lng     |   3 +
 interface/web/mail/lib/lang/ro_mail_user.lng  |   8 +-
 .../web/mail/lib/lang/ro_mail_user_filter.lng |  10 +-
 .../web/mail/lib/lang/ro_mail_user_list.lng   |   4 +
 .../web/mail/lib/lang/ro_xmpp_domain.lng      |  62 +++
 .../lib/lang/ro_xmpp_domain_admin_list.lng    |   8 +
 .../web/mail/lib/lang/ro_xmpp_domain_list.lng |   7 +
 interface/web/mail/lib/lang/ro_xmpp_user.lng  |  15 +
 .../web/mail/lib/lang/ro_xmpp_user_list.lng   |   8 +
 .../mail/lib/lang/ru_backup_stats_list.lng    |  10 +-
 interface/web/mail/lib/lang/ru_mail_alias.lng |   2 +
 .../web/mail/lib/lang/ru_mail_domain.lng      |  15 +-
 .../web/mail/lib/lang/ru_mail_forward.lng     |   3 +
 interface/web/mail/lib/lang/ru_mail_user.lng  |   8 +-
 .../web/mail/lib/lang/ru_mail_user_filter.lng |  10 +-
 .../web/mail/lib/lang/ru_mail_user_list.lng   |   4 +
 .../web/mail/lib/lang/ru_xmpp_domain.lng      |  62 +++
 .../lib/lang/ru_xmpp_domain_admin_list.lng    |   8 +
 .../web/mail/lib/lang/ru_xmpp_domain_list.lng |   7 +
 interface/web/mail/lib/lang/ru_xmpp_user.lng  |  15 +
 .../web/mail/lib/lang/ru_xmpp_user_list.lng   |   8 +
 .../mail/lib/lang/se_backup_stats_list.lng    |  10 +-
 interface/web/mail/lib/lang/se_mail_alias.lng |   2 +
 .../web/mail/lib/lang/se_mail_domain.lng      |  15 +-
 .../web/mail/lib/lang/se_mail_forward.lng     |   3 +
 interface/web/mail/lib/lang/se_mail_user.lng  |   8 +-
 .../web/mail/lib/lang/se_mail_user_filter.lng |  10 +-
 .../web/mail/lib/lang/se_mail_user_list.lng   |   4 +
 .../web/mail/lib/lang/se_xmpp_domain.lng      |  62 +++
 .../lib/lang/se_xmpp_domain_admin_list.lng    |   8 +
 .../web/mail/lib/lang/se_xmpp_domain_list.lng |   7 +
 interface/web/mail/lib/lang/se_xmpp_user.lng  |  15 +
 .../web/mail/lib/lang/se_xmpp_user_list.lng   |   8 +
 .../mail/lib/lang/sk_backup_stats_list.lng    |  10 +-
 interface/web/mail/lib/lang/sk_mail_alias.lng |   2 +
 .../web/mail/lib/lang/sk_mail_domain.lng      |  16 +-
 .../web/mail/lib/lang/sk_mail_forward.lng     |   3 +
 interface/web/mail/lib/lang/sk_mail_user.lng  |   8 +-
 .../web/mail/lib/lang/sk_mail_user_filter.lng |  10 +-
 .../web/mail/lib/lang/sk_mail_user_list.lng   |   4 +
 .../web/mail/lib/lang/sk_xmpp_domain.lng      |  62 +++
 .../lib/lang/sk_xmpp_domain_admin_list.lng    |   8 +
 .../web/mail/lib/lang/sk_xmpp_domain_list.lng |   7 +
 interface/web/mail/lib/lang/sk_xmpp_user.lng  |  15 +
 .../web/mail/lib/lang/sk_xmpp_user_list.lng   |   8 +
 interface/web/mail/lib/lang/tr.lng            |   3 -
 .../mail/lib/lang/tr_backup_stats_list.lng    |  10 +-
 interface/web/mail/lib/lang/tr_mail_alias.lng |   3 +-
 .../lib/lang/tr_mail_aliasdomain_list.lng     |   1 -
 .../web/mail/lib/lang/tr_mail_domain.lng      |  15 +-
 .../mail/lib/lang/tr_mail_domain_catchall.lng |   2 -
 .../web/mail/lib/lang/tr_mail_forward.lng     |   4 +-
 interface/web/mail/lib/lang/tr_mail_get.lng   |   2 +-
 interface/web/mail/lib/lang/tr_mail_user.lng  |  41 +-
 .../web/mail/lib/lang/tr_mail_user_filter.lng |  11 +-
 .../web/mail/lib/lang/tr_mail_user_list.lng   |   4 +
 .../mail/lib/lang/tr_spamfilter_policy.lng    |   1 -
 .../lib/lang/tr_user_quota_stats_list.lng     |   1 -
 .../web/mail/lib/lang/tr_xmpp_domain.lng      |  62 +++
 .../lib/lang/tr_xmpp_domain_admin_list.lng    |   8 +
 .../web/mail/lib/lang/tr_xmpp_domain_list.lng |   7 +
 interface/web/mail/lib/lang/tr_xmpp_user.lng  |  15 +
 .../web/mail/lib/lang/tr_xmpp_user_list.lng   |   8 +
 interface/web/mailuser/lib/lang/ca.lng        |   9 +
 interface/web/mailuser/lib/lang/ca_index.lng  |  12 +
 .../lib/lang/ca_mail_user_autoresponder.lng   |  13 +
 .../web/mailuser/lib/lang/ca_mail_user_cc.lng |   9 +
 .../mailuser/lib/lang/ca_mail_user_filter.lng |  20 +
 .../lib/lang/ca_mail_user_filter_list.lng     |   8 +
 .../lib/lang/ca_mail_user_password.lng        |  10 +
 .../lib/lang/ca_mail_user_spamfilter.lng      |   7 +
 interface/web/mailuser/lib/lang/cz.lng        |   2 -
 interface/web/mailuser/lib/lang/cz_index.lng  |   2 -
 .../lib/lang/cz_mail_user_autoresponder.lng   |   2 -
 .../web/mailuser/lib/lang/cz_mail_user_cc.lng |   2 -
 .../mailuser/lib/lang/cz_mail_user_filter.lng |   2 -
 .../lib/lang/cz_mail_user_filter_list.lng     |   2 -
 .../lib/lang/cz_mail_user_password.lng        |   2 -
 .../lib/lang/cz_mail_user_spamfilter.lng      |   2 -
 interface/web/mailuser/lib/lang/fr.lng        |  14 +-
 interface/web/mailuser/lib/lang/fr_index.lng  |  20 +-
 .../lib/lang/fr_mail_user_autoresponder.lng   |  22 +-
 .../web/mailuser/lib/lang/fr_mail_user_cc.lng |  14 +-
 .../mailuser/lib/lang/fr_mail_user_filter.lng |  32 +-
 .../lib/lang/fr_mail_user_filter_list.lng     |  10 +-
 .../lib/lang/fr_mail_user_password.lng        |  16 +-
 .../lib/lang/fr_mail_user_spamfilter.lng      |  10 +-
 interface/web/mailuser/lib/lang/hr.lng        |   2 -
 interface/web/mailuser/lib/lang/hr_index.lng  |   2 -
 .../lib/lang/hr_mail_user_autoresponder.lng   |   2 -
 .../web/mailuser/lib/lang/hr_mail_user_cc.lng |   2 -
 .../mailuser/lib/lang/hr_mail_user_filter.lng |   2 -
 .../lib/lang/hr_mail_user_filter_list.lng     |   2 -
 .../lib/lang/hr_mail_user_password.lng        |   2 -
 .../lib/lang/hr_mail_user_spamfilter.lng      |   2 -
 interface/web/mailuser/lib/lang/it_index.lng  |  18 +-
 .../lib/lang/it_mail_user_autoresponder.lng   |   2 +-
 .../web/mailuser/lib/lang/it_mail_user_cc.lng |   4 +-
 .../mailuser/lib/lang/it_mail_user_filter.lng |  36 +-
 .../lib/lang/it_mail_user_filter_list.lng     |   4 +-
 .../lib/lang/it_mail_user_password.lng        |  12 +-
 .../lib/lang/it_mail_user_spamfilter.lng      |   2 +-
 .../lib/lang/tr_mail_user_autoresponder.lng   |   1 -
 .../mailuser/lib/lang/tr_mail_user_filter.lng |   1 -
 interface/web/monitor/lib/lang/ar.lng         |   3 +
 interface/web/monitor/lib/lang/bg.lng         |   3 +
 interface/web/monitor/lib/lang/br.lng         |   3 +
 interface/web/monitor/lib/lang/ca.lng         | 163 ++++++++
 .../web/monitor/lib/lang/ca_datalog_list.lng  |   8 +
 .../web/monitor/lib/lang/ca_syslog_list.lng   |   7 +
 interface/web/monitor/lib/lang/cz.lng         |   5 +-
 .../web/monitor/lib/lang/cz_datalog_list.lng  |   2 -
 .../web/monitor/lib/lang/cz_syslog_list.lng   |   2 -
 interface/web/monitor/lib/lang/el.lng         |   8 +
 interface/web/monitor/lib/lang/es.lng         |   3 +
 interface/web/monitor/lib/lang/fi.lng         |   3 +
 interface/web/monitor/lib/lang/fr.lng         |  75 ++--
 interface/web/monitor/lib/lang/hr.lng         |  10 +-
 .../web/monitor/lib/lang/hr_datalog_list.lng  |   2 -
 .../web/monitor/lib/lang/hr_syslog_list.lng   |   2 -
 interface/web/monitor/lib/lang/hu.lng         |   3 +
 interface/web/monitor/lib/lang/id.lng         |   3 +
 interface/web/monitor/lib/lang/it.lng         |   5 +-
 interface/web/monitor/lib/lang/ja.lng         |   3 +
 interface/web/monitor/lib/lang/nl.lng         |   3 +
 interface/web/monitor/lib/lang/pl.lng         |   3 +
 interface/web/monitor/lib/lang/pt.lng         |   3 +
 interface/web/monitor/lib/lang/ro.lng         |   3 +
 interface/web/monitor/lib/lang/ru.lng         |   3 +
 interface/web/monitor/lib/lang/se.lng         |   3 +
 interface/web/monitor/lib/lang/sk.lng         |   3 +
 interface/web/monitor/lib/lang/tr.lng         |  11 +-
 .../sites/lib/lang/ar_backup_stats_list.lng   |  12 +-
 interface/web/sites/lib/lang/ar_cron.lng      |   2 +
 interface/web/sites/lib/lang/ar_database.lng  |   3 +
 .../sites/lib/lang/ar_database_admin_list.lng |   1 +
 .../web/sites/lib/lang/ar_database_list.lng   |   1 +
 .../lib/lang/ar_database_quota_stats_list.lng |  12 +-
 .../lib/lang/ar_ftp_sites_stats_list.lng      |  10 +
 interface/web/sites/lib/lang/ar_ftp_user.lng  |   3 +-
 .../web/sites/lib/lang/ar_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/ar_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/ar_web_backup_list.lng |   2 +
 .../web/sites/lib/lang/ar_web_childdomain.lng |   3 +-
 .../lib/lang/ar_web_childdomain_list.lng      |   3 +-
 .../lib/lang/ar_web_directive_snippets.lng    |   3 +
 .../web/sites/lib/lang/ar_web_domain.lng      | 132 +++++++
 .../lib/lang/ar_web_domain_admin_list.lng     |   9 +
 .../web/sites/lib/lang/ar_web_domain_list.lng |   8 +
 .../web/sites/lib/lang/ar_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/ar_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/ar_web_vhost_domain.lng    |  16 +-
 .../sites/lib/lang/ar_web_vhost_subdomain.lng | 127 ++++++
 .../lib/lang/ar_web_vhost_subdomain_list.lng  |   8 +
 .../sites/lib/lang/bg_backup_stats_list.lng   |  12 +-
 interface/web/sites/lib/lang/bg_cron.lng      |   2 +
 interface/web/sites/lib/lang/bg_database.lng  |   3 +
 .../sites/lib/lang/bg_database_admin_list.lng |   1 +
 .../web/sites/lib/lang/bg_database_list.lng   |   1 +
 .../lib/lang/bg_database_quota_stats_list.lng |  12 +-
 .../lib/lang/bg_ftp_sites_stats_list.lng      |  10 +
 interface/web/sites/lib/lang/bg_ftp_user.lng  |   3 +-
 .../web/sites/lib/lang/bg_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/bg_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/bg_web_backup_list.lng |   2 +
 .../web/sites/lib/lang/bg_web_childdomain.lng |   3 +-
 .../lib/lang/bg_web_childdomain_list.lng      |   4 +-
 .../lib/lang/bg_web_directive_snippets.lng    |   3 +
 .../web/sites/lib/lang/bg_web_domain.lng      | 132 +++++++
 .../lib/lang/bg_web_domain_admin_list.lng     |   9 +
 .../web/sites/lib/lang/bg_web_domain_list.lng |   8 +
 .../web/sites/lib/lang/bg_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/bg_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/bg_web_vhost_domain.lng    |  17 +-
 .../lib/lang/bg_web_vhost_domain_list.lng     |   1 -
 .../sites/lib/lang/bg_web_vhost_subdomain.lng | 127 ++++++
 .../lib/lang/bg_web_vhost_subdomain_list.lng  |   8 +
 .../sites/lib/lang/br_backup_stats_list.lng   |  12 +-
 interface/web/sites/lib/lang/br_cron.lng      |   2 +
 interface/web/sites/lib/lang/br_database.lng  |   3 +
 .../sites/lib/lang/br_database_admin_list.lng |   1 +
 .../web/sites/lib/lang/br_database_list.lng   |   1 +
 .../lib/lang/br_database_quota_stats_list.lng |  12 +-
 .../lib/lang/br_ftp_sites_stats_list.lng      |  10 +
 interface/web/sites/lib/lang/br_ftp_user.lng  |   3 +-
 .../web/sites/lib/lang/br_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/br_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/br_web_backup_list.lng |   2 +
 .../web/sites/lib/lang/br_web_childdomain.lng |   3 +-
 .../lib/lang/br_web_childdomain_list.lng      |   4 +-
 .../lib/lang/br_web_directive_snippets.lng    |   3 +
 .../web/sites/lib/lang/br_web_domain.lng      | 132 +++++++
 .../lib/lang/br_web_domain_admin_list.lng     |   9 +
 .../web/sites/lib/lang/br_web_domain_list.lng |   8 +
 .../web/sites/lib/lang/br_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/br_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/br_web_vhost_domain.lng    |  17 +-
 .../lib/lang/br_web_vhost_domain_list.lng     |   1 -
 .../sites/lib/lang/br_web_vhost_subdomain.lng | 127 ++++++
 .../lib/lang/br_web_vhost_subdomain_list.lng  |   8 +
 interface/web/sites/lib/lang/ca.lng           |  35 ++
 interface/web/sites/lib/lang/ca_aps.lng       |  58 +++
 .../sites/lib/lang/ca_aps_instances_list.lng  |  11 +
 .../sites/lib/lang/ca_aps_packages_list.lng   |   8 +
 .../lib/lang/ca_aps_update_packagelist.lng    |   7 +
 .../sites/lib/lang/ca_backup_stats_list.lng   |  10 +
 interface/web/sites/lib/lang/ca_cron.lng      |  26 ++
 interface/web/sites/lib/lang/ca_cron_list.lng |  13 +
 interface/web/sites/lib/lang/ca_database.lng  |  49 +++
 .../sites/lib/lang/ca_database_admin_list.lng |  12 +
 .../web/sites/lib/lang/ca_database_list.lng   |  11 +
 .../lib/lang/ca_database_quota_stats_list.lng |   8 +
 .../web/sites/lib/lang/ca_database_user.lng   |  23 ++
 .../lib/lang/ca_database_user_admin_list.lng  |   6 +
 .../sites/lib/lang/ca_database_user_list.lng  |   5 +
 .../lib/lang/ca_ftp_sites_stats_list.lng      |  10 +
 interface/web/sites/lib/lang/ca_ftp_user.lng  |  35 ++
 .../web/sites/lib/lang/ca_ftp_user_list.lng   |   8 +
 .../web/sites/lib/lang/ca_shell_user.lng      |  36 ++
 .../web/sites/lib/lang/ca_shell_user_list.lng |   8 +
 .../lib/lang/ca_user_quota_stats_list.lng     |   9 +
 .../web/sites/lib/lang/ca_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/ca_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/ca_web_backup_list.lng |  21 +
 .../web/sites/lib/lang/ca_web_childdomain.lng | 118 ++++++
 .../lib/lang/ca_web_childdomain_list.lng      |  15 +
 .../lib/lang/ca_web_directive_snippets.lng    |   3 +
 .../web/sites/lib/lang/ca_web_domain.lng      | 132 +++++++
 .../lib/lang/ca_web_domain_admin_list.lng     |   9 +
 .../web/sites/lib/lang/ca_web_domain_list.lng |   8 +
 .../web/sites/lib/lang/ca_web_folder.lng      |   8 +
 .../web/sites/lib/lang/ca_web_folder_list.lng |   8 +
 .../web/sites/lib/lang/ca_web_folder_user.lng |  14 +
 .../lib/lang/ca_web_folder_user_list.lng      |   7 +
 .../lib/lang/ca_web_sites_stats_list.lng      |   9 +
 .../web/sites/lib/lang/ca_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/ca_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/ca_web_vhost_domain.lng    | 145 +++++++
 .../lang/ca_web_vhost_domain_admin_list.lng   |   9 +
 .../lib/lang/ca_web_vhost_domain_list.lng     |   9 +
 .../sites/lib/lang/ca_web_vhost_subdomain.lng | 127 ++++++
 .../lib/lang/ca_web_vhost_subdomain_list.lng  |   8 +
 .../web/sites/lib/lang/ca_webdav_user.lng     |  21 +
 .../sites/lib/lang/ca_webdav_user_list.lng    |   8 +
 interface/web/sites/lib/lang/cz.lng           |   2 -
 interface/web/sites/lib/lang/cz_aps.lng       |   2 -
 .../sites/lib/lang/cz_aps_instances_list.lng  |   2 -
 .../sites/lib/lang/cz_aps_packages_list.lng   |   2 -
 .../lib/lang/cz_aps_update_packagelist.lng    |   2 -
 .../sites/lib/lang/cz_backup_stats_list.lng   |  12 +-
 interface/web/sites/lib/lang/cz_cron.lng      |   4 +-
 interface/web/sites/lib/lang/cz_cron_list.lng |   2 -
 interface/web/sites/lib/lang/cz_database.lng  |   5 +-
 .../sites/lib/lang/cz_database_admin_list.lng |   3 +-
 .../web/sites/lib/lang/cz_database_list.lng   |   3 +-
 .../lib/lang/cz_database_quota_stats_list.lng |  12 +-
 .../web/sites/lib/lang/cz_database_user.lng   |   2 -
 .../lib/lang/cz_database_user_admin_list.lng  |   2 -
 .../sites/lib/lang/cz_database_user_list.lng  |   2 -
 .../lib/lang/cz_ftp_sites_stats_list.lng      |  10 +
 interface/web/sites/lib/lang/cz_ftp_user.lng  |   5 +-
 .../web/sites/lib/lang/cz_ftp_user_list.lng   |   2 -
 .../web/sites/lib/lang/cz_shell_user.lng      |   2 -
 .../web/sites/lib/lang/cz_shell_user_list.lng |   2 -
 .../lib/lang/cz_user_quota_stats_list.lng     |   2 -
 .../web/sites/lib/lang/cz_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/cz_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/cz_web_backup_list.lng |   4 +-
 .../web/sites/lib/lang/cz_web_childdomain.lng |  21 +-
 .../lib/lang/cz_web_childdomain_list.lng      |   6 +-
 .../lib/lang/cz_web_directive_snippets.lng    |   3 +
 .../web/sites/lib/lang/cz_web_domain.lng      |   3 -
 .../lib/lang/cz_web_domain_admin_list.lng     |   2 -
 .../web/sites/lib/lang/cz_web_domain_list.lng |   2 -
 .../web/sites/lib/lang/cz_web_folder.lng      |   2 -
 .../web/sites/lib/lang/cz_web_folder_list.lng |   2 -
 .../web/sites/lib/lang/cz_web_folder_user.lng |   2 -
 .../lib/lang/cz_web_folder_user_list.lng      |   2 -
 .../lib/lang/cz_web_sites_stats_list.lng      |   2 -
 .../web/sites/lib/lang/cz_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/cz_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/cz_web_vhost_domain.lng    |  36 +-
 .../lang/cz_web_vhost_domain_admin_list.lng   |   9 +
 .../lib/lang/cz_web_vhost_domain_list.lng     |   1 -
 .../sites/lib/lang/cz_web_vhost_subdomain.lng | 127 ++++++
 .../lib/lang/cz_web_vhost_subdomain_list.lng  |   8 +
 .../web/sites/lib/lang/cz_webdav_user.lng     |   2 -
 .../sites/lib/lang/cz_webdav_user_list.lng    |   2 -
 .../sites/lib/lang/de_backup_stats_list.lng   |  12 +-
 interface/web/sites/lib/lang/de_database.lng  |   3 +
 .../sites/lib/lang/de_database_admin_list.lng |   1 +
 .../lib/lang/de_database_quota_stats_list.lng |  12 +-
 .../lib/lang/de_ftp_sites_stats_list.lng      |  10 +
 interface/web/sites/lib/lang/de_ftp_user.lng  |   2 -
 .../web/sites/lib/lang/de_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/de_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/de_web_backup_list.lng |   1 +
 .../web/sites/lib/lang/de_web_childdomain.lng |   3 +-
 .../lib/lang/de_web_childdomain_list.lng      |   4 +-
 .../lib/lang/de_web_directive_snippets.lng    |   6 +-
 .../web/sites/lib/lang/de_web_domain.lng      | 132 +++++++
 .../lib/lang/de_web_domain_admin_list.lng     |   9 +
 .../web/sites/lib/lang/de_web_domain_list.lng |   8 +
 .../web/sites/lib/lang/de_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/de_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/de_web_vhost_domain.lng    |  10 +-
 .../lib/lang/de_web_vhost_domain_list.lng     |   1 -
 .../sites/lib/lang/de_web_vhost_subdomain.lng | 127 ++++++
 .../lib/lang/de_web_vhost_subdomain_list.lng  |   8 +
 .../sites/lib/lang/el_backup_stats_list.lng   |  12 +-
 interface/web/sites/lib/lang/el_cron.lng      |   2 +
 interface/web/sites/lib/lang/el_database.lng  |   3 +
 .../sites/lib/lang/el_database_admin_list.lng |   1 +
 .../web/sites/lib/lang/el_database_list.lng   |   1 +
 .../lib/lang/el_database_quota_stats_list.lng |  12 +-
 .../lib/lang/el_ftp_sites_stats_list.lng      |  10 +
 interface/web/sites/lib/lang/el_ftp_user.lng  |   3 +-
 .../web/sites/lib/lang/el_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/el_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/el_web_backup_list.lng |   2 +
 .../web/sites/lib/lang/el_web_childdomain.lng |  12 +-
 .../lib/lang/el_web_childdomain_list.lng      |   3 +-
 .../lib/lang/el_web_directive_snippets.lng    |   3 +
 .../web/sites/lib/lang/el_web_domain.lng      | 132 +++++++
 .../lib/lang/el_web_domain_admin_list.lng     |   9 +
 .../web/sites/lib/lang/el_web_domain_list.lng |   8 +
 .../web/sites/lib/lang/el_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/el_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/el_web_vhost_domain.lng    |  17 +-
 .../lib/lang/el_web_vhost_domain_list.lng     |   1 -
 .../sites/lib/lang/el_web_vhost_subdomain.lng | 127 ++++++
 .../lib/lang/el_web_vhost_subdomain_list.lng  |   8 +
 .../web/sites/lib/lang/en_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/en_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/en_web_domain.lng      | 132 +++++++
 .../lib/lang/en_web_domain_admin_list.lng     |   9 +
 .../web/sites/lib/lang/en_web_domain_list.lng |   8 +
 .../web/sites/lib/lang/en_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/en_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/en_web_vhost_subdomain.lng | 128 ++++++
 .../lib/lang/en_web_vhost_subdomain_list.lng  |   8 +
 interface/web/sites/lib/lang/es.lng           |   2 +-
 interface/web/sites/lib/lang/es_aps.lng       |  16 +-
 .../sites/lib/lang/es_aps_instances_list.lng  |   2 -
 .../sites/lib/lang/es_backup_stats_list.lng   |  12 +-
 interface/web/sites/lib/lang/es_cron.lng      |   2 +
 interface/web/sites/lib/lang/es_database.lng  |   6 +-
 .../sites/lib/lang/es_database_admin_list.lng |   1 +
 .../web/sites/lib/lang/es_database_list.lng   |   1 +
 .../lib/lang/es_database_quota_stats_list.lng |  12 +-
 .../lib/lang/es_ftp_sites_stats_list.lng      |  10 +
 interface/web/sites/lib/lang/es_ftp_user.lng  |   3 +-
 .../web/sites/lib/lang/es_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/es_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/es_web_backup_list.lng |   2 +
 .../web/sites/lib/lang/es_web_childdomain.lng |   9 +-
 .../lib/lang/es_web_childdomain_list.lng      |   4 +-
 .../lib/lang/es_web_directive_snippets.lng    |   3 +
 .../web/sites/lib/lang/es_web_domain.lng      | 132 +++++++
 .../lib/lang/es_web_domain_admin_list.lng     |   9 +
 .../web/sites/lib/lang/es_web_domain_list.lng |   8 +
 .../web/sites/lib/lang/es_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/es_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/es_web_vhost_domain.lng    |  18 +-
 .../lib/lang/es_web_vhost_domain_list.lng     |   1 +
 .../sites/lib/lang/es_web_vhost_subdomain.lng | 127 ++++++
 .../lib/lang/es_web_vhost_subdomain_list.lng  |   8 +
 .../sites/lib/lang/fi_backup_stats_list.lng   |  12 +-
 interface/web/sites/lib/lang/fi_cron.lng      |   2 +
 interface/web/sites/lib/lang/fi_database.lng  |   3 +
 .../sites/lib/lang/fi_database_admin_list.lng |   1 +
 .../web/sites/lib/lang/fi_database_list.lng   |   1 +
 .../lib/lang/fi_database_quota_stats_list.lng |  12 +-
 .../lib/lang/fi_ftp_sites_stats_list.lng      |  10 +
 interface/web/sites/lib/lang/fi_ftp_user.lng  |   3 +-
 .../web/sites/lib/lang/fi_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/fi_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/fi_web_backup_list.lng |   2 +
 .../web/sites/lib/lang/fi_web_childdomain.lng |   3 +-
 .../lib/lang/fi_web_childdomain_list.lng      |   4 +-
 .../lib/lang/fi_web_directive_snippets.lng    |   3 +
 .../web/sites/lib/lang/fi_web_domain.lng      | 132 +++++++
 .../lib/lang/fi_web_domain_admin_list.lng     |   9 +
 .../web/sites/lib/lang/fi_web_domain_list.lng |   8 +
 .../web/sites/lib/lang/fi_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/fi_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/fi_web_vhost_domain.lng    |  17 +-
 .../lib/lang/fi_web_vhost_domain_list.lng     |   1 -
 .../sites/lib/lang/fi_web_vhost_subdomain.lng | 127 ++++++
 .../lib/lang/fi_web_vhost_subdomain_list.lng  |   8 +
 interface/web/sites/lib/lang/fr_aps.lng       |  34 +-
 .../sites/lib/lang/fr_aps_instances_list.lng  |   4 +-
 .../sites/lib/lang/fr_backup_stats_list.lng   |  12 +-
 interface/web/sites/lib/lang/fr_cron.lng      |   2 +
 interface/web/sites/lib/lang/fr_database.lng  |  15 +-
 .../sites/lib/lang/fr_database_admin_list.lng |   1 +
 .../web/sites/lib/lang/fr_database_list.lng   |   3 +-
 .../lib/lang/fr_database_quota_stats_list.lng |  12 +-
 .../web/sites/lib/lang/fr_database_user.lng   |   2 +-
 .../lib/lang/fr_ftp_sites_stats_list.lng      |  18 +-
 interface/web/sites/lib/lang/fr_ftp_user.lng  |  17 +-
 .../web/sites/lib/lang/fr_ftp_user_list.lng   |   2 +-
 .../web/sites/lib/lang/fr_shell_user.lng      |  14 +-
 .../web/sites/lib/lang/fr_shell_user_list.lng |   2 +-
 .../web/sites/lib/lang/fr_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/fr_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/fr_web_backup_list.lng |   6 +-
 .../web/sites/lib/lang/fr_web_childdomain.lng |   5 +-
 .../lib/lang/fr_web_childdomain_list.lng      |   4 +-
 .../lib/lang/fr_web_directive_snippets.lng    |   3 +
 .../web/sites/lib/lang/fr_web_domain.lng      | 132 +++++++
 .../lib/lang/fr_web_domain_admin_list.lng     |   9 +
 .../web/sites/lib/lang/fr_web_domain_list.lng |   8 +
 .../web/sites/lib/lang/fr_web_folder_user.lng |   4 +-
 .../lib/lang/fr_web_folder_user_list.lng      |   2 +-
 .../lib/lang/fr_web_sites_stats_list.lng      |   4 +-
 .../web/sites/lib/lang/fr_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/fr_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/fr_web_vhost_domain.lng    |  16 +-
 .../lib/lang/fr_web_vhost_domain_list.lng     |   1 -
 .../sites/lib/lang/fr_web_vhost_subdomain.lng | 127 ++++++
 .../lib/lang/fr_web_vhost_subdomain_list.lng  |   8 +
 .../web/sites/lib/lang/fr_webdav_user.lng     |  10 +-
 .../sites/lib/lang/fr_webdav_user_list.lng    |   2 +-
 interface/web/sites/lib/lang/hr.lng           |   4 +-
 interface/web/sites/lib/lang/hr_aps.lng       |   2 -
 .../sites/lib/lang/hr_aps_instances_list.lng  |   2 -
 .../sites/lib/lang/hr_aps_packages_list.lng   |   2 -
 .../lib/lang/hr_aps_update_packagelist.lng    |   2 -
 .../sites/lib/lang/hr_backup_stats_list.lng   |  12 +-
 interface/web/sites/lib/lang/hr_cron.lng      |   4 +-
 interface/web/sites/lib/lang/hr_cron_list.lng |   2 -
 interface/web/sites/lib/lang/hr_database.lng  |   5 +-
 .../sites/lib/lang/hr_database_admin_list.lng |   3 +-
 .../web/sites/lib/lang/hr_database_list.lng   |   3 +-
 .../lib/lang/hr_database_quota_stats_list.lng |  12 +-
 .../web/sites/lib/lang/hr_database_user.lng   |   2 -
 .../lib/lang/hr_database_user_admin_list.lng  |   2 -
 .../sites/lib/lang/hr_database_user_list.lng  |   2 -
 .../lib/lang/hr_ftp_sites_stats_list.lng      |  10 +
 interface/web/sites/lib/lang/hr_ftp_user.lng  |   5 +-
 .../web/sites/lib/lang/hr_ftp_user_list.lng   |   2 -
 .../web/sites/lib/lang/hr_shell_user.lng      |   2 -
 .../web/sites/lib/lang/hr_shell_user_list.lng |   2 -
 .../lib/lang/hr_user_quota_stats_list.lng     |   2 -
 .../web/sites/lib/lang/hr_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/hr_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/hr_web_backup_list.lng |   4 +-
 .../web/sites/lib/lang/hr_web_childdomain.lng |   3 +-
 .../lib/lang/hr_web_childdomain_list.lng      |   6 +-
 .../lib/lang/hr_web_directive_snippets.lng    |   3 +
 .../web/sites/lib/lang/hr_web_domain.lng      | 132 +++++++
 .../lib/lang/hr_web_domain_admin_list.lng     |   9 +
 .../web/sites/lib/lang/hr_web_domain_list.lng |   8 +
 .../web/sites/lib/lang/hr_web_folder.lng      |   2 -
 .../web/sites/lib/lang/hr_web_folder_list.lng |   2 -
 .../web/sites/lib/lang/hr_web_folder_user.lng |   2 -
 .../lib/lang/hr_web_folder_user_list.lng      |   2 -
 .../lib/lang/hr_web_sites_stats_list.lng      |   2 -
 .../web/sites/lib/lang/hr_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/hr_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/hr_web_vhost_domain.lng    |  17 +-
 .../lang/hr_web_vhost_domain_admin_list.lng   |   2 -
 .../lib/lang/hr_web_vhost_domain_list.lng     |   3 -
 .../sites/lib/lang/hr_web_vhost_subdomain.lng | 127 ++++++
 .../lib/lang/hr_web_vhost_subdomain_list.lng  |   8 +
 .../web/sites/lib/lang/hr_webdav_user.lng     |   2 -
 .../sites/lib/lang/hr_webdav_user_list.lng    |   2 -
 .../sites/lib/lang/hu_backup_stats_list.lng   |  12 +-
 interface/web/sites/lib/lang/hu_cron.lng      |   2 +
 interface/web/sites/lib/lang/hu_database.lng  |   3 +
 .../sites/lib/lang/hu_database_admin_list.lng |   1 +
 .../web/sites/lib/lang/hu_database_list.lng   |   1 +
 .../lib/lang/hu_database_quota_stats_list.lng |  12 +-
 .../lib/lang/hu_ftp_sites_stats_list.lng      |  10 +
 interface/web/sites/lib/lang/hu_ftp_user.lng  |   3 +-
 .../web/sites/lib/lang/hu_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/hu_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/hu_web_backup_list.lng |   2 +
 .../web/sites/lib/lang/hu_web_childdomain.lng |   3 +-
 .../lib/lang/hu_web_childdomain_list.lng      |   4 +-
 .../lib/lang/hu_web_directive_snippets.lng    |   3 +
 .../web/sites/lib/lang/hu_web_domain.lng      | 132 +++++++
 .../lib/lang/hu_web_domain_admin_list.lng     |   9 +
 .../web/sites/lib/lang/hu_web_domain_list.lng |   8 +
 .../web/sites/lib/lang/hu_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/hu_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/hu_web_vhost_domain.lng    |  17 +-
 .../lib/lang/hu_web_vhost_domain_list.lng     |   1 -
 .../sites/lib/lang/hu_web_vhost_subdomain.lng | 127 ++++++
 .../lib/lang/hu_web_vhost_subdomain_list.lng  |   8 +
 .../sites/lib/lang/id_backup_stats_list.lng   |  12 +-
 interface/web/sites/lib/lang/id_cron.lng      |   2 +
 interface/web/sites/lib/lang/id_database.lng  |   3 +
 .../sites/lib/lang/id_database_admin_list.lng |   1 +
 .../web/sites/lib/lang/id_database_list.lng   |   1 +
 .../lib/lang/id_database_quota_stats_list.lng |  12 +-
 .../lib/lang/id_ftp_sites_stats_list.lng      |  10 +
 interface/web/sites/lib/lang/id_ftp_user.lng  |   3 +-
 .../web/sites/lib/lang/id_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/id_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/id_web_backup_list.lng |   2 +
 .../web/sites/lib/lang/id_web_childdomain.lng |   3 +-
 .../lib/lang/id_web_childdomain_list.lng      |   4 +-
 .../lib/lang/id_web_directive_snippets.lng    |   3 +
 .../web/sites/lib/lang/id_web_domain.lng      | 132 +++++++
 .../lib/lang/id_web_domain_admin_list.lng     |   9 +
 .../web/sites/lib/lang/id_web_domain_list.lng |   8 +
 .../web/sites/lib/lang/id_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/id_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/id_web_vhost_domain.lng    |  17 +-
 .../lib/lang/id_web_vhost_domain_list.lng     |   1 -
 .../sites/lib/lang/id_web_vhost_subdomain.lng | 127 ++++++
 .../lib/lang/id_web_vhost_subdomain_list.lng  |   8 +
 interface/web/sites/lib/lang/it.lng           |  18 +-
 interface/web/sites/lib/lang/it_aps.lng       | 100 ++---
 .../sites/lib/lang/it_aps_instances_list.lng  |  16 +-
 .../sites/lib/lang/it_aps_packages_list.lng   |  12 +-
 .../lib/lang/it_aps_update_packagelist.lng    |   8 +-
 .../sites/lib/lang/it_backup_stats_list.lng   |  12 +-
 interface/web/sites/lib/lang/it_cron.lng      |  42 +-
 interface/web/sites/lib/lang/it_cron_list.lng |  18 +-
 interface/web/sites/lib/lang/it_database.lng  |  69 ++--
 .../sites/lib/lang/it_database_admin_list.lng |  15 +-
 .../web/sites/lib/lang/it_database_list.lng   |   5 +-
 .../lib/lang/it_database_quota_stats_list.lng |  12 +-
 .../web/sites/lib/lang/it_database_user.lng   |  34 +-
 .../lib/lang/it_database_user_admin_list.lng  |   8 +-
 .../sites/lib/lang/it_database_user_list.lng  |   6 +-
 .../lib/lang/it_ftp_sites_stats_list.lng      |  10 +
 interface/web/sites/lib/lang/it_ftp_user.lng  |  41 +-
 .../web/sites/lib/lang/it_ftp_user_list.lng   |   2 +-
 .../web/sites/lib/lang/it_shell_user.lng      |  54 +--
 .../web/sites/lib/lang/it_shell_user_list.lng |   2 +-
 .../lib/lang/it_user_quota_stats_list.lng     |   4 +-
 .../web/sites/lib/lang/it_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/it_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/it_web_backup_list.lng |  26 +-
 .../web/sites/lib/lang/it_web_childdomain.lng |   3 +-
 .../lib/lang/it_web_childdomain_list.lng      |   4 +-
 .../lib/lang/it_web_directive_snippets.lng    |   3 +
 .../web/sites/lib/lang/it_web_domain.lng      | 132 +++++++
 .../lib/lang/it_web_domain_admin_list.lng     |   9 +
 .../web/sites/lib/lang/it_web_domain_list.lng |   8 +
 .../web/sites/lib/lang/it_web_folder.lng      |   8 +-
 .../web/sites/lib/lang/it_web_folder_list.lng |   8 +-
 .../web/sites/lib/lang/it_web_folder_user.lng |  22 +-
 .../lib/lang/it_web_folder_user_list.lng      |  10 +-
 .../lib/lang/it_web_sites_stats_list.lng      |  14 +-
 .../web/sites/lib/lang/it_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/it_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/it_web_vhost_domain.lng    |  17 +-
 .../lib/lang/it_web_vhost_domain_list.lng     |   1 -
 .../sites/lib/lang/it_web_vhost_subdomain.lng | 127 ++++++
 .../lib/lang/it_web_vhost_subdomain_list.lng  |   8 +
 .../web/sites/lib/lang/it_webdav_user.lng     |  30 +-
 .../sites/lib/lang/it_webdav_user_list.lng    |  10 +-
 .../sites/lib/lang/ja_backup_stats_list.lng   |  12 +-
 interface/web/sites/lib/lang/ja_cron.lng      |   2 +
 interface/web/sites/lib/lang/ja_database.lng  |   3 +
 .../sites/lib/lang/ja_database_admin_list.lng |   1 +
 .../web/sites/lib/lang/ja_database_list.lng   |   1 +
 .../lib/lang/ja_database_quota_stats_list.lng |  12 +-
 .../lib/lang/ja_ftp_sites_stats_list.lng      |  10 +
 interface/web/sites/lib/lang/ja_ftp_user.lng  |   3 +-
 .../web/sites/lib/lang/ja_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/ja_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/ja_web_backup_list.lng |   2 +
 .../web/sites/lib/lang/ja_web_childdomain.lng |   3 +-
 .../lib/lang/ja_web_childdomain_list.lng      |   4 +-
 .../lib/lang/ja_web_directive_snippets.lng    |   3 +
 .../web/sites/lib/lang/ja_web_domain.lng      | 132 +++++++
 .../lib/lang/ja_web_domain_admin_list.lng     |   9 +
 .../web/sites/lib/lang/ja_web_domain_list.lng |   8 +
 .../web/sites/lib/lang/ja_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/ja_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/ja_web_vhost_domain.lng    |  17 +-
 .../lib/lang/ja_web_vhost_domain_list.lng     |   1 -
 .../sites/lib/lang/ja_web_vhost_subdomain.lng | 127 ++++++
 .../lib/lang/ja_web_vhost_subdomain_list.lng  |   8 +
 .../sites/lib/lang/nl_backup_stats_list.lng   |  12 +-
 interface/web/sites/lib/lang/nl_cron.lng      |   2 +
 interface/web/sites/lib/lang/nl_database.lng  |   3 +
 .../sites/lib/lang/nl_database_admin_list.lng |   1 +
 .../web/sites/lib/lang/nl_database_list.lng   |   1 +
 .../lib/lang/nl_database_quota_stats_list.lng |  12 +-
 .../lib/lang/nl_ftp_sites_stats_list.lng      |  10 +
 interface/web/sites/lib/lang/nl_ftp_user.lng  |   3 +-
 .../web/sites/lib/lang/nl_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/nl_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/nl_web_backup_list.lng |   2 +
 .../web/sites/lib/lang/nl_web_childdomain.lng |   3 +-
 .../lib/lang/nl_web_childdomain_list.lng      |   4 +-
 .../lib/lang/nl_web_directive_snippets.lng    |   3 +
 .../web/sites/lib/lang/nl_web_domain.lng      | 132 +++++++
 .../lib/lang/nl_web_domain_admin_list.lng     |   9 +
 .../web/sites/lib/lang/nl_web_domain_list.lng |   8 +
 .../web/sites/lib/lang/nl_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/nl_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/nl_web_vhost_domain.lng    |  17 +-
 .../lib/lang/nl_web_vhost_domain_list.lng     |   1 -
 .../sites/lib/lang/nl_web_vhost_subdomain.lng | 127 ++++++
 .../lib/lang/nl_web_vhost_subdomain_list.lng  |   8 +
 .../sites/lib/lang/pl_backup_stats_list.lng   |  12 +-
 interface/web/sites/lib/lang/pl_cron.lng      |   2 +
 interface/web/sites/lib/lang/pl_database.lng  |   3 +
 .../sites/lib/lang/pl_database_admin_list.lng |   1 +
 .../web/sites/lib/lang/pl_database_list.lng   |   1 +
 .../lib/lang/pl_database_quota_stats_list.lng |  12 +-
 .../lib/lang/pl_ftp_sites_stats_list.lng      |  10 +
 interface/web/sites/lib/lang/pl_ftp_user.lng  |   3 +-
 .../web/sites/lib/lang/pl_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/pl_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/pl_web_backup_list.lng |   2 +
 .../web/sites/lib/lang/pl_web_childdomain.lng |   1 -
 .../lib/lang/pl_web_childdomain_list.lng      |   4 +-
 .../lib/lang/pl_web_directive_snippets.lng    |   3 +
 .../web/sites/lib/lang/pl_web_domain.lng      | 132 +++++++
 .../lib/lang/pl_web_domain_admin_list.lng     |   9 +
 .../web/sites/lib/lang/pl_web_domain_list.lng |   8 +
 .../web/sites/lib/lang/pl_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/pl_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/pl_web_vhost_domain.lng    |  17 +-
 .../lib/lang/pl_web_vhost_domain_list.lng     |   1 -
 .../sites/lib/lang/pl_web_vhost_subdomain.lng | 127 ++++++
 .../lib/lang/pl_web_vhost_subdomain_list.lng  |   8 +
 .../sites/lib/lang/pt_backup_stats_list.lng   |  12 +-
 interface/web/sites/lib/lang/pt_cron.lng      |   2 +
 interface/web/sites/lib/lang/pt_database.lng  |   3 +
 .../sites/lib/lang/pt_database_admin_list.lng |   1 +
 .../web/sites/lib/lang/pt_database_list.lng   |   1 +
 .../lib/lang/pt_database_quota_stats_list.lng |  12 +-
 .../lib/lang/pt_ftp_sites_stats_list.lng      |  10 +
 interface/web/sites/lib/lang/pt_ftp_user.lng  |   3 +-
 .../web/sites/lib/lang/pt_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/pt_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/pt_web_backup_list.lng |   2 +
 .../web/sites/lib/lang/pt_web_childdomain.lng |   3 +-
 .../lib/lang/pt_web_childdomain_list.lng      |   4 +-
 .../lib/lang/pt_web_directive_snippets.lng    |   3 +
 .../web/sites/lib/lang/pt_web_domain.lng      | 132 +++++++
 .../lib/lang/pt_web_domain_admin_list.lng     |   9 +
 .../web/sites/lib/lang/pt_web_domain_list.lng |   8 +
 .../web/sites/lib/lang/pt_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/pt_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/pt_web_vhost_domain.lng    |  17 +-
 .../lib/lang/pt_web_vhost_domain_list.lng     |   1 -
 .../sites/lib/lang/pt_web_vhost_subdomain.lng | 127 ++++++
 .../lib/lang/pt_web_vhost_subdomain_list.lng  |   8 +
 .../sites/lib/lang/ro_backup_stats_list.lng   |  12 +-
 interface/web/sites/lib/lang/ro_cron.lng      |   2 +
 interface/web/sites/lib/lang/ro_database.lng  |   3 +
 .../sites/lib/lang/ro_database_admin_list.lng |   1 +
 .../web/sites/lib/lang/ro_database_list.lng   |   1 +
 .../lib/lang/ro_database_quota_stats_list.lng |  12 +-
 .../lib/lang/ro_ftp_sites_stats_list.lng      |  10 +
 interface/web/sites/lib/lang/ro_ftp_user.lng  |   3 +-
 .../web/sites/lib/lang/ro_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/ro_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/ro_web_backup_list.lng |   2 +
 .../web/sites/lib/lang/ro_web_childdomain.lng |   3 +-
 .../lib/lang/ro_web_childdomain_list.lng      |   4 +-
 .../lib/lang/ro_web_directive_snippets.lng    |   3 +
 .../web/sites/lib/lang/ro_web_domain.lng      | 132 +++++++
 .../lib/lang/ro_web_domain_admin_list.lng     |   9 +
 .../web/sites/lib/lang/ro_web_domain_list.lng |   8 +
 .../web/sites/lib/lang/ro_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/ro_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/ro_web_vhost_domain.lng    |  17 +-
 .../lib/lang/ro_web_vhost_domain_list.lng     |   1 -
 .../sites/lib/lang/ro_web_vhost_subdomain.lng | 127 ++++++
 .../lib/lang/ro_web_vhost_subdomain_list.lng  |   8 +
 .../sites/lib/lang/ru_backup_stats_list.lng   |  12 +-
 interface/web/sites/lib/lang/ru_cron.lng      |   2 +
 interface/web/sites/lib/lang/ru_database.lng  |   3 +
 .../sites/lib/lang/ru_database_admin_list.lng |   1 +
 .../web/sites/lib/lang/ru_database_list.lng   |   1 +
 .../lib/lang/ru_database_quota_stats_list.lng |  12 +-
 .../lib/lang/ru_ftp_sites_stats_list.lng      |  10 +
 interface/web/sites/lib/lang/ru_ftp_user.lng  |   3 +-
 .../web/sites/lib/lang/ru_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/ru_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/ru_web_backup_list.lng |   2 +
 .../web/sites/lib/lang/ru_web_childdomain.lng |   3 +-
 .../lib/lang/ru_web_childdomain_list.lng      |   4 +-
 .../lib/lang/ru_web_directive_snippets.lng    |   3 +
 .../web/sites/lib/lang/ru_web_domain.lng      | 132 +++++++
 .../lib/lang/ru_web_domain_admin_list.lng     |   9 +
 .../web/sites/lib/lang/ru_web_domain_list.lng |   8 +
 .../web/sites/lib/lang/ru_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/ru_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/ru_web_vhost_domain.lng    |  17 +-
 .../lib/lang/ru_web_vhost_domain_list.lng     |   1 -
 .../sites/lib/lang/ru_web_vhost_subdomain.lng | 127 ++++++
 .../lib/lang/ru_web_vhost_subdomain_list.lng  |   8 +
 .../sites/lib/lang/se_backup_stats_list.lng   |  12 +-
 interface/web/sites/lib/lang/se_cron.lng      |   2 +
 interface/web/sites/lib/lang/se_database.lng  |   3 +
 .../sites/lib/lang/se_database_admin_list.lng |   1 +
 .../web/sites/lib/lang/se_database_list.lng   |   1 +
 .../lib/lang/se_database_quota_stats_list.lng |  12 +-
 .../lib/lang/se_ftp_sites_stats_list.lng      |  10 +
 interface/web/sites/lib/lang/se_ftp_user.lng  |   3 +-
 .../web/sites/lib/lang/se_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/se_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/se_web_backup_list.lng |   2 +
 .../web/sites/lib/lang/se_web_childdomain.lng |   3 +-
 .../lib/lang/se_web_childdomain_list.lng      |   4 +-
 .../lib/lang/se_web_directive_snippets.lng    |   3 +
 .../web/sites/lib/lang/se_web_domain.lng      | 132 +++++++
 .../lib/lang/se_web_domain_admin_list.lng     |   9 +
 .../web/sites/lib/lang/se_web_domain_list.lng |   8 +
 .../web/sites/lib/lang/se_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/se_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/se_web_vhost_domain.lng    |  17 +-
 .../lib/lang/se_web_vhost_domain_list.lng     |   1 -
 .../sites/lib/lang/se_web_vhost_subdomain.lng | 127 ++++++
 .../lib/lang/se_web_vhost_subdomain_list.lng  |   8 +
 .../sites/lib/lang/sk_backup_stats_list.lng   |  12 +-
 interface/web/sites/lib/lang/sk_cron.lng      |   2 +
 interface/web/sites/lib/lang/sk_database.lng  |   3 +
 .../sites/lib/lang/sk_database_admin_list.lng |   1 +
 .../web/sites/lib/lang/sk_database_list.lng   |   1 +
 .../lib/lang/sk_database_quota_stats_list.lng |  12 +-
 .../lib/lang/sk_ftp_sites_stats_list.lng      |  10 +
 interface/web/sites/lib/lang/sk_ftp_user.lng  |   3 +-
 .../web/sites/lib/lang/sk_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/sk_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/sk_web_backup_list.lng |   2 +
 .../web/sites/lib/lang/sk_web_childdomain.lng |   3 +-
 .../lib/lang/sk_web_childdomain_list.lng      |   4 +-
 .../lib/lang/sk_web_directive_snippets.lng    |   3 +
 .../web/sites/lib/lang/sk_web_domain.lng      | 132 +++++++
 .../lib/lang/sk_web_domain_admin_list.lng     |   9 +
 .../web/sites/lib/lang/sk_web_domain_list.lng |   8 +
 .../web/sites/lib/lang/sk_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/sk_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/sk_web_vhost_domain.lng    |  17 +-
 .../lib/lang/sk_web_vhost_domain_list.lng     |   1 -
 .../sites/lib/lang/sk_web_vhost_subdomain.lng | 127 ++++++
 .../lib/lang/sk_web_vhost_subdomain_list.lng  |   8 +
 interface/web/sites/lib/lang/tr.lng           |   2 +-
 interface/web/sites/lib/lang/tr_aps.lng       |  16 +-
 .../sites/lib/lang/tr_aps_instances_list.lng  |   2 -
 .../sites/lib/lang/tr_backup_stats_list.lng   |  12 +-
 interface/web/sites/lib/lang/tr_cron.lng      |   2 +
 interface/web/sites/lib/lang/tr_database.lng  |   4 +-
 .../sites/lib/lang/tr_database_admin_list.lng |   1 +
 .../web/sites/lib/lang/tr_database_list.lng   |   1 +
 .../lib/lang/tr_database_quota_stats_list.lng |  12 +-
 .../web/sites/lib/lang/tr_database_user.lng   |   1 -
 .../lib/lang/tr_ftp_sites_stats_list.lng      |  10 +
 interface/web/sites/lib/lang/tr_ftp_user.lng  |   5 +-
 .../web/sites/lib/lang/tr_shell_user.lng      |   1 -
 .../web/sites/lib/lang/tr_web_aliasdomain.lng | 115 ++++++
 .../lib/lang/tr_web_aliasdomain_list.lng      |  14 +
 .../web/sites/lib/lang/tr_web_backup_list.lng |   2 +
 .../web/sites/lib/lang/tr_web_childdomain.lng |   3 +-
 .../lib/lang/tr_web_childdomain_list.lng      |   4 +-
 .../lib/lang/tr_web_directive_snippets.lng    |   3 +
 .../web/sites/lib/lang/tr_web_domain.lng      | 132 +++++++
 .../lib/lang/tr_web_domain_admin_list.lng     |   9 +
 .../web/sites/lib/lang/tr_web_domain_list.lng |   8 +
 .../web/sites/lib/lang/tr_web_subdomain.lng   |  46 +++
 .../sites/lib/lang/tr_web_subdomain_list.lng  |   8 +
 .../sites/lib/lang/tr_web_vhost_domain.lng    |  19 +-
 .../sites/lib/lang/tr_web_vhost_subdomain.lng | 127 ++++++
 .../lib/lang/tr_web_vhost_subdomain_list.lng  |   8 +
 .../web/sites/lib/lang/tr_webdav_user.lng     |   1 -
 .../web/tools/lib/lang/ar_import_vpopmail.lng |   7 +
 interface/web/tools/lib/lang/ar_resync.lng    |   8 +-
 .../web/tools/lib/lang/bg_import_vpopmail.lng |   8 +
 interface/web/tools/lib/lang/bg_resync.lng    |   8 +-
 .../web/tools/lib/lang/br_import_vpopmail.lng |   8 +
 interface/web/tools/lib/lang/br_resync.lng    |   8 +-
 interface/web/tools/lib/lang/ca.lng           |  13 +
 .../tools/lib/lang/ca_import_ispconfig.lng    |  23 ++
 .../web/tools/lib/lang/ca_import_vpopmail.lng |   7 +
 interface/web/tools/lib/lang/ca_index.lng     |   4 +
 interface/web/tools/lib/lang/ca_interface.lng |   7 +
 interface/web/tools/lib/lang/ca_resync.lng    |  49 +++
 .../web/tools/lib/lang/ca_tpl_default.lng     |   7 +
 .../web/tools/lib/lang/ca_usersettings.lng    |  12 +
 interface/web/tools/lib/lang/cz.lng           |   2 -
 .../tools/lib/lang/cz_import_ispconfig.lng    |   2 -
 .../web/tools/lib/lang/cz_import_vpopmail.lng |   8 +
 interface/web/tools/lib/lang/cz_index.lng     |   2 -
 interface/web/tools/lib/lang/cz_interface.lng |   2 -
 interface/web/tools/lib/lang/cz_resync.lng    |  17 +-
 .../web/tools/lib/lang/cz_tpl_default.lng     |   2 -
 .../web/tools/lib/lang/cz_usersettings.lng    |   2 -
 .../web/tools/lib/lang/de_import_vpopmail.lng |   8 +
 interface/web/tools/lib/lang/de_resync.lng    |   8 +-
 .../web/tools/lib/lang/el_import_vpopmail.lng |   8 +
 interface/web/tools/lib/lang/el_resync.lng    |   8 +-
 interface/web/tools/lib/lang/es.lng           |   3 +-
 .../web/tools/lib/lang/es_import_vpopmail.lng |   8 +
 interface/web/tools/lib/lang/es_resync.lng    |  36 +-
 .../web/tools/lib/lang/fi_import_vpopmail.lng |   8 +
 interface/web/tools/lib/lang/fi_resync.lng    |   8 +-
 .../tools/lib/lang/fr_import_ispconfig.lng    |   8 +-
 .../web/tools/lib/lang/fr_import_vpopmail.lng |   7 +
 interface/web/tools/lib/lang/fr_resync.lng    |  28 +-
 .../web/tools/lib/lang/fr_usersettings.lng    |   4 +-
 interface/web/tools/lib/lang/hr.lng           |   2 -
 .../tools/lib/lang/hr_import_ispconfig.lng    |   2 -
 .../web/tools/lib/lang/hr_import_vpopmail.lng |   7 +
 interface/web/tools/lib/lang/hr_index.lng     |   2 -
 interface/web/tools/lib/lang/hr_interface.lng |   2 -
 interface/web/tools/lib/lang/hr_resync.lng    |   8 +-
 .../web/tools/lib/lang/hr_tpl_default.lng     |   2 -
 .../web/tools/lib/lang/hr_usersettings.lng    |   2 -
 .../web/tools/lib/lang/hu_import_vpopmail.lng |   8 +
 interface/web/tools/lib/lang/hu_resync.lng    |   8 +-
 .../web/tools/lib/lang/id_import_vpopmail.lng |   8 +
 interface/web/tools/lib/lang/id_resync.lng    |   8 +-
 .../web/tools/lib/lang/it_import_vpopmail.lng |   8 +
 interface/web/tools/lib/lang/it_resync.lng    |   8 +-
 .../web/tools/lib/lang/ja_import_vpopmail.lng |   8 +
 interface/web/tools/lib/lang/ja_resync.lng    |   8 +-
 .../web/tools/lib/lang/nl_import_vpopmail.lng |   8 +
 interface/web/tools/lib/lang/nl_resync.lng    |   8 +-
 .../web/tools/lib/lang/pl_import_vpopmail.lng |   8 +
 interface/web/tools/lib/lang/pl_resync.lng    |   8 +-
 .../web/tools/lib/lang/pt_import_vpopmail.lng |   8 +
 interface/web/tools/lib/lang/pt_resync.lng    |   8 +-
 .../web/tools/lib/lang/ro_import_vpopmail.lng |   7 +
 interface/web/tools/lib/lang/ro_resync.lng    |   8 +-
 .../web/tools/lib/lang/ru_import_vpopmail.lng |   8 +
 interface/web/tools/lib/lang/ru_resync.lng    |   8 +-
 .../web/tools/lib/lang/se_import_vpopmail.lng |   8 +
 interface/web/tools/lib/lang/se_resync.lng    |   8 +-
 .../web/tools/lib/lang/sk_import_vpopmail.lng |   8 +
 interface/web/tools/lib/lang/sk_resync.lng    |   8 +-
 .../tools/lib/lang/tr_import_ispconfig.lng    |   1 -
 .../web/tools/lib/lang/tr_import_vpopmail.lng |   8 +
 interface/web/tools/lib/lang/tr_resync.lng    |  36 +-
 .../web/tools/lib/lang/tr_usersettings.lng    |   1 -
 .../web/vm/lib/lang/ar_openvz_template.lng    |   6 +-
 interface/web/vm/lib/lang/ar_openvz_vm.lng    |   8 +-
 .../web/vm/lib/lang/bg_openvz_template.lng    |   6 +-
 interface/web/vm/lib/lang/bg_openvz_vm.lng    |   8 +-
 .../web/vm/lib/lang/br_openvz_template.lng    |   6 +-
 interface/web/vm/lib/lang/br_openvz_vm.lng    |   8 +-
 interface/web/vm/lib/lang/ca.lng              |   7 +
 .../web/vm/lib/lang/ca_openvz_action.lng      |  16 +
 interface/web/vm/lib/lang/ca_openvz_ip.lng    |   9 +
 .../web/vm/lib/lang/ca_openvz_ip_list.lng     |   7 +
 .../web/vm/lib/lang/ca_openvz_ostemplate.lng  |  11 +
 .../vm/lib/lang/ca_openvz_ostemplate_list.lng |   8 +
 .../web/vm/lib/lang/ca_openvz_template.lng    |  97 +++++
 .../vm/lib/lang/ca_openvz_template_list.lng   |   5 +
 interface/web/vm/lib/lang/ca_openvz_vm.lng    |  45 +++
 .../web/vm/lib/lang/ca_openvz_vm_list.lng     |  10 +
 interface/web/vm/lib/lang/cz.lng              |   2 -
 .../web/vm/lib/lang/cz_openvz_action.lng      |   2 -
 interface/web/vm/lib/lang/cz_openvz_ip.lng    |   2 -
 .../web/vm/lib/lang/cz_openvz_ip_list.lng     |   2 -
 .../web/vm/lib/lang/cz_openvz_ostemplate.lng  |   2 -
 .../vm/lib/lang/cz_openvz_ostemplate_list.lng |   2 -
 .../web/vm/lib/lang/cz_openvz_template.lng    |   8 +-
 .../vm/lib/lang/cz_openvz_template_list.lng   |   2 -
 interface/web/vm/lib/lang/cz_openvz_vm.lng    |  10 +-
 .../web/vm/lib/lang/cz_openvz_vm_list.lng     |   2 -
 .../web/vm/lib/lang/de_openvz_template.lng    |   6 +-
 interface/web/vm/lib/lang/de_openvz_vm.lng    |   9 +-
 .../web/vm/lib/lang/el_openvz_template.lng    |   6 +-
 interface/web/vm/lib/lang/el_openvz_vm.lng    |   8 +-
 .../web/vm/lib/lang/es_openvz_template.lng    |   8 +-
 interface/web/vm/lib/lang/es_openvz_vm.lng    |   8 +-
 .../web/vm/lib/lang/fi_openvz_template.lng    |   6 +-
 interface/web/vm/lib/lang/fi_openvz_vm.lng    |   8 +-
 interface/web/vm/lib/lang/fr.lng              |   2 +-
 .../web/vm/lib/lang/fr_openvz_action.lng      |   6 +-
 interface/web/vm/lib/lang/fr_openvz_ip.lng    |   2 +-
 .../vm/lib/lang/fr_openvz_ostemplate_list.lng |   2 +-
 .../web/vm/lib/lang/fr_openvz_template.lng    |  18 +-
 interface/web/vm/lib/lang/fr_openvz_vm.lng    |  16 +-
 .../web/vm/lib/lang/fr_openvz_vm_list.lng     |   2 +-
 interface/web/vm/lib/lang/hr.lng              |   2 -
 .../web/vm/lib/lang/hr_openvz_action.lng      |   2 -
 interface/web/vm/lib/lang/hr_openvz_ip.lng    |   2 -
 .../web/vm/lib/lang/hr_openvz_ip_list.lng     |   2 -
 .../web/vm/lib/lang/hr_openvz_ostemplate.lng  |   2 -
 .../vm/lib/lang/hr_openvz_ostemplate_list.lng |   2 -
 .../web/vm/lib/lang/hr_openvz_template.lng    |   6 +-
 .../vm/lib/lang/hr_openvz_template_list.lng   |   2 -
 interface/web/vm/lib/lang/hr_openvz_vm.lng    |  10 +-
 .../web/vm/lib/lang/hr_openvz_vm_list.lng     |   2 -
 .../web/vm/lib/lang/hu_openvz_template.lng    |   6 +-
 interface/web/vm/lib/lang/hu_openvz_vm.lng    |   8 +-
 .../web/vm/lib/lang/id_openvz_template.lng    |   6 +-
 interface/web/vm/lib/lang/id_openvz_vm.lng    |   8 +-
 interface/web/vm/lib/lang/it.lng              |   6 +-
 .../web/vm/lib/lang/it_openvz_action.lng      |  28 +-
 interface/web/vm/lib/lang/it_openvz_ip.lng    |  12 +-
 .../web/vm/lib/lang/it_openvz_ip_list.lng     |   6 +-
 .../web/vm/lib/lang/it_openvz_ostemplate.lng  |  14 +-
 .../vm/lib/lang/it_openvz_ostemplate_list.lng |   6 +-
 .../web/vm/lib/lang/it_openvz_template.lng    | 126 +++---
 .../vm/lib/lang/it_openvz_template_list.lng   |   2 +-
 interface/web/vm/lib/lang/it_openvz_vm.lng    |  66 ++--
 .../web/vm/lib/lang/it_openvz_vm_list.lng     |   6 +-
 .../web/vm/lib/lang/ja_openvz_template.lng    |   6 +-
 interface/web/vm/lib/lang/ja_openvz_vm.lng    |   8 +-
 .../web/vm/lib/lang/nl_openvz_template.lng    |   6 +-
 interface/web/vm/lib/lang/nl_openvz_vm.lng    |   8 +-
 .../web/vm/lib/lang/pl_openvz_template.lng    |   6 +-
 interface/web/vm/lib/lang/pl_openvz_vm.lng    |   8 +-
 .../web/vm/lib/lang/pt_openvz_template.lng    |   6 +-
 interface/web/vm/lib/lang/pt_openvz_vm.lng    |   8 +-
 .../web/vm/lib/lang/ro_openvz_template.lng    |   6 +-
 interface/web/vm/lib/lang/ro_openvz_vm.lng    |   8 +-
 .../web/vm/lib/lang/ru_openvz_template.lng    |   6 +-
 interface/web/vm/lib/lang/ru_openvz_vm.lng    |   8 +-
 .../web/vm/lib/lang/se_openvz_template.lng    |   6 +-
 interface/web/vm/lib/lang/se_openvz_vm.lng    |   8 +-
 .../web/vm/lib/lang/sk_openvz_template.lng    |   6 +-
 interface/web/vm/lib/lang/sk_openvz_vm.lng    |   8 +-
 .../web/vm/lib/lang/tr_openvz_action.lng      |   2 -
 .../web/vm/lib/lang/tr_openvz_template.lng    |   6 +-
 interface/web/vm/lib/lang/tr_openvz_vm.lng    |   8 +-
 2335 files changed, 27887 insertions(+), 5299 deletions(-)
 create mode 100644 interface/lib/lang/ca.lng
 create mode 100644 interface/web/client/lib/lang/ca.lng
 create mode 100644 interface/web/client/lib/lang/ca_client.lng
 create mode 100644 interface/web/client/lib/lang/ca_client_circle.lng
 create mode 100644 interface/web/client/lib/lang/ca_client_circle_list.lng
 create mode 100644 interface/web/client/lib/lang/ca_client_del.lng
 create mode 100644 interface/web/client/lib/lang/ca_client_message.lng
 create mode 100644 interface/web/client/lib/lang/ca_client_message_template.lng
 create mode 100644 interface/web/client/lib/lang/ca_client_message_template_list.lng
 create mode 100644 interface/web/client/lib/lang/ca_client_template.lng
 create mode 100644 interface/web/client/lib/lang/ca_client_template_list.lng
 create mode 100644 interface/web/client/lib/lang/ca_clients_list.lng
 create mode 100644 interface/web/client/lib/lang/ca_domain.lng
 create mode 100644 interface/web/client/lib/lang/ca_domain_list.lng
 create mode 100644 interface/web/client/lib/lang/ca_reseller.lng
 create mode 100644 interface/web/client/lib/lang/ca_resellers_list.lng
 create mode 100644 interface/web/dashboard/lib/lang/ar_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/ar_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/ar_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/ar_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/ar_dashlet_shop.lng
 create mode 100644 interface/web/dashboard/lib/lang/bg_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/bg_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/bg_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/bg_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/bg_dashlet_shop.lng
 create mode 100644 interface/web/dashboard/lib/lang/br_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/br_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/br_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/br_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/br_dashlet_shop.lng
 create mode 100644 interface/web/dashboard/lib/lang/ca.lng
 create mode 100644 interface/web/dashboard/lib/lang/ca_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/ca_dashlet_databasequota.lng
 create mode 100644 interface/web/dashboard/lib/lang/ca_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/ca_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/ca_dashlet_limits.lng
 create mode 100644 interface/web/dashboard/lib/lang/ca_dashlet_mailquota.lng
 create mode 100644 interface/web/dashboard/lib/lang/ca_dashlet_modules.lng
 create mode 100644 interface/web/dashboard/lib/lang/ca_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/ca_dashlet_quota.lng
 create mode 100644 interface/web/dashboard/lib/lang/ca_dashlet_shop.lng
 create mode 100644 interface/web/dashboard/lib/lang/cz_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/cz_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/cz_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/cz_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/cz_dashlet_shop.lng
 create mode 100644 interface/web/dashboard/lib/lang/de_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/de_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/de_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/de_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/de_dashlet_shop.lng
 create mode 100644 interface/web/dashboard/lib/lang/el_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/el_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/el_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/el_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/el_dashlet_shop.lng
 create mode 100644 interface/web/dashboard/lib/lang/en_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/en_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/en_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/en_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/en_dashlet_shop.lng
 create mode 100644 interface/web/dashboard/lib/lang/es_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/es_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/es_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/es_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/es_dashlet_shop.lng
 create mode 100644 interface/web/dashboard/lib/lang/fi_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/fi_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/fi_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/fi_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/fi_dashlet_shop.lng
 create mode 100644 interface/web/dashboard/lib/lang/fr_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/fr_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/fr_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/fr_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/fr_dashlet_shop.lng
 create mode 100644 interface/web/dashboard/lib/lang/hr_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/hr_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/hr_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/hr_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/hr_dashlet_shop.lng
 create mode 100644 interface/web/dashboard/lib/lang/hu_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/hu_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/hu_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/hu_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/hu_dashlet_shop.lng
 create mode 100644 interface/web/dashboard/lib/lang/id_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/id_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/id_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/id_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/id_dashlet_shop.lng
 create mode 100644 interface/web/dashboard/lib/lang/it_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/it_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/it_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/it_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/it_dashlet_shop.lng
 create mode 100644 interface/web/dashboard/lib/lang/ja_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/ja_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/ja_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/ja_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/ja_dashlet_shop.lng
 create mode 100644 interface/web/dashboard/lib/lang/nl_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/nl_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/nl_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/nl_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/nl_dashlet_shop.lng
 create mode 100644 interface/web/dashboard/lib/lang/pl_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/pl_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/pl_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/pl_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/pl_dashlet_shop.lng
 create mode 100644 interface/web/dashboard/lib/lang/pt_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/pt_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/pt_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/pt_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/pt_dashlet_shop.lng
 create mode 100644 interface/web/dashboard/lib/lang/ro_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/ro_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/ro_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/ro_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/ro_dashlet_shop.lng
 create mode 100644 interface/web/dashboard/lib/lang/ru_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/ru_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/ru_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/ru_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/ru_dashlet_shop.lng
 create mode 100644 interface/web/dashboard/lib/lang/se_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/se_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/se_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/se_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/se_dashlet_shop.lng
 create mode 100644 interface/web/dashboard/lib/lang/sk_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/sk_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/sk_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/sk_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/sk_dashlet_shop.lng
 create mode 100644 interface/web/dashboard/lib/lang/tr_dashlet_customer.lng
 create mode 100644 interface/web/dashboard/lib/lang/tr_dashlet_invoice_client_settings.lng
 create mode 100644 interface/web/dashboard/lib/lang/tr_dashlet_invoices.lng
 create mode 100644 interface/web/dashboard/lib/lang/tr_dashlet_products.lng
 create mode 100644 interface/web/dashboard/lib/lang/tr_dashlet_shop.lng
 create mode 100644 interface/web/dns/lib/lang/ar_dns_ds.lng
 create mode 100644 interface/web/dns/lib/lang/ar_dns_loc.lng
 create mode 100644 interface/web/dns/lib/lang/ar_dns_tlsa.lng
 create mode 100644 interface/web/dns/lib/lang/bg_dns_ds.lng
 create mode 100644 interface/web/dns/lib/lang/bg_dns_loc.lng
 create mode 100644 interface/web/dns/lib/lang/bg_dns_tlsa.lng
 create mode 100644 interface/web/dns/lib/lang/br_dns_ds.lng
 create mode 100644 interface/web/dns/lib/lang/br_dns_loc.lng
 create mode 100644 interface/web/dns/lib/lang/br_dns_tlsa.lng
 create mode 100644 interface/web/dns/lib/lang/ca.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_a.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_a_list.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_aaaa.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_alias.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_cname.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_dkim.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_dmarc.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_ds.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_hinfo.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_import.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_loc.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_mx.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_ns.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_ptr.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_rp.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_slave.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_slave_admin_list.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_slave_list.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_soa.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_soa_admin_list.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_soa_list.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_spf.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_srv.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_template.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_template_list.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_tlsa.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_txt.lng
 create mode 100644 interface/web/dns/lib/lang/ca_dns_wizard.lng
 create mode 100644 interface/web/dns/lib/lang/cz_dns_ds.lng
 create mode 100644 interface/web/dns/lib/lang/cz_dns_loc.lng
 create mode 100644 interface/web/dns/lib/lang/cz_dns_tlsa.lng
 create mode 100644 interface/web/dns/lib/lang/el_dns_ds.lng
 create mode 100644 interface/web/dns/lib/lang/el_dns_loc.lng
 create mode 100644 interface/web/dns/lib/lang/el_dns_tlsa.lng
 create mode 100644 interface/web/dns/lib/lang/es_dns_ds.lng
 create mode 100644 interface/web/dns/lib/lang/es_dns_loc.lng
 create mode 100644 interface/web/dns/lib/lang/es_dns_tlsa.lng
 create mode 100644 interface/web/dns/lib/lang/fi_dns_ds.lng
 create mode 100644 interface/web/dns/lib/lang/fi_dns_loc.lng
 create mode 100644 interface/web/dns/lib/lang/fi_dns_tlsa.lng
 create mode 100644 interface/web/dns/lib/lang/fr_dns_ds.lng
 create mode 100644 interface/web/dns/lib/lang/fr_dns_loc.lng
 create mode 100644 interface/web/dns/lib/lang/fr_dns_tlsa.lng
 create mode 100644 interface/web/dns/lib/lang/hr_dns_ds.lng
 create mode 100644 interface/web/dns/lib/lang/hr_dns_loc.lng
 create mode 100644 interface/web/dns/lib/lang/hr_dns_tlsa.lng
 create mode 100644 interface/web/dns/lib/lang/hu_dns_ds.lng
 create mode 100644 interface/web/dns/lib/lang/hu_dns_loc.lng
 create mode 100644 interface/web/dns/lib/lang/hu_dns_tlsa.lng
 create mode 100644 interface/web/dns/lib/lang/id_dns_ds.lng
 create mode 100644 interface/web/dns/lib/lang/id_dns_loc.lng
 create mode 100644 interface/web/dns/lib/lang/id_dns_tlsa.lng
 create mode 100644 interface/web/dns/lib/lang/it_dns_ds.lng
 create mode 100644 interface/web/dns/lib/lang/it_dns_loc.lng
 create mode 100644 interface/web/dns/lib/lang/it_dns_tlsa.lng
 create mode 100644 interface/web/dns/lib/lang/ja_dns_ds.lng
 create mode 100644 interface/web/dns/lib/lang/ja_dns_loc.lng
 create mode 100644 interface/web/dns/lib/lang/ja_dns_tlsa.lng
 create mode 100644 interface/web/dns/lib/lang/nl_dns_ds.lng
 create mode 100644 interface/web/dns/lib/lang/nl_dns_loc.lng
 create mode 100644 interface/web/dns/lib/lang/nl_dns_tlsa.lng
 create mode 100644 interface/web/dns/lib/lang/pl_dns_dkim.lng
 create mode 100644 interface/web/dns/lib/lang/pl_dns_ds.lng
 create mode 100644 interface/web/dns/lib/lang/pl_dns_loc.lng
 create mode 100644 interface/web/dns/lib/lang/pl_dns_tlsa.lng
 create mode 100644 interface/web/dns/lib/lang/pt_dns_dkim.lng
 create mode 100644 interface/web/dns/lib/lang/pt_dns_ds.lng
 create mode 100644 interface/web/dns/lib/lang/pt_dns_loc.lng
 create mode 100644 interface/web/dns/lib/lang/pt_dns_tlsa.lng
 create mode 100644 interface/web/dns/lib/lang/ro_dns_dkim.lng
 create mode 100644 interface/web/dns/lib/lang/ro_dns_ds.lng
 create mode 100644 interface/web/dns/lib/lang/ro_dns_loc.lng
 create mode 100644 interface/web/dns/lib/lang/ro_dns_tlsa.lng
 create mode 100644 interface/web/dns/lib/lang/ru_dns_ds.lng
 create mode 100644 interface/web/dns/lib/lang/ru_dns_loc.lng
 create mode 100644 interface/web/dns/lib/lang/ru_dns_tlsa.lng
 create mode 100644 interface/web/dns/lib/lang/se_dns_ds.lng
 create mode 100644 interface/web/dns/lib/lang/se_dns_loc.lng
 create mode 100644 interface/web/dns/lib/lang/se_dns_tlsa.lng
 create mode 100644 interface/web/dns/lib/lang/sk_dns_ds.lng
 create mode 100644 interface/web/dns/lib/lang/sk_dns_loc.lng
 create mode 100644 interface/web/dns/lib/lang/sk_dns_tlsa.lng
 create mode 100644 interface/web/dns/lib/lang/tr_dns_ds.lng
 create mode 100644 interface/web/dns/lib/lang/tr_dns_loc.lng
 create mode 100644 interface/web/dns/lib/lang/tr_dns_tlsa.lng
 create mode 100644 interface/web/help/lib/lang/ca.lng
 create mode 100644 interface/web/help/lib/lang/ca_faq_form.lng
 create mode 100644 interface/web/help/lib/lang/ca_faq_manage_questions_list.lng
 create mode 100644 interface/web/help/lib/lang/ca_faq_sections_form.lng
 create mode 100644 interface/web/help/lib/lang/ca_help_faq_list.lng
 create mode 100644 interface/web/help/lib/lang/ca_help_faq_sections_list.lng
 create mode 100644 interface/web/help/lib/lang/ca_support_message.lng
 create mode 100644 interface/web/help/lib/lang/ca_support_message_list.lng
 create mode 100644 interface/web/login/lib/lang/ca.lng
 create mode 100644 interface/web/login/lib/lang/ca_login_as.lng
 create mode 100644 interface/web/mail/lib/lang/ar_xmpp_domain.lng
 create mode 100644 interface/web/mail/lib/lang/ar_xmpp_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/ar_xmpp_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/ar_xmpp_user.lng
 create mode 100644 interface/web/mail/lib/lang/ar_xmpp_user_list.lng
 create mode 100644 interface/web/mail/lib/lang/bg_xmpp_domain.lng
 create mode 100644 interface/web/mail/lib/lang/bg_xmpp_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/bg_xmpp_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/bg_xmpp_user.lng
 create mode 100644 interface/web/mail/lib/lang/bg_xmpp_user_list.lng
 create mode 100644 interface/web/mail/lib/lang/br_xmpp_domain.lng
 create mode 100644 interface/web/mail/lib/lang/br_xmpp_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/br_xmpp_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/br_xmpp_user.lng
 create mode 100644 interface/web/mail/lib/lang/br_xmpp_user_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca.lng
 create mode 100644 interface/web/mail/lib/lang/ca_backup_stats_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_alias.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_alias_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_aliasdomain.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_aliasdomain_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_backup_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_blacklist.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_blacklist_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_content_filter.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_content_filter_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_domain.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_domain_catchall.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_domain_catchall_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_forward.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_forward_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_get.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_get_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_mailinglist.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_mailinglist_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_relay_recipient.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_relay_recipient_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_spamfilter.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_spamfilter_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_transport.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_transport_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_user.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_user_filter.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_user_filter_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_user_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_user_stats_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_whitelist.lng
 create mode 100644 interface/web/mail/lib/lang/ca_mail_whitelist_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_spamfilter_blacklist.lng
 create mode 100644 interface/web/mail/lib/lang/ca_spamfilter_blacklist_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_spamfilter_config.lng
 create mode 100644 interface/web/mail/lib/lang/ca_spamfilter_config_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_spamfilter_policy.lng
 create mode 100644 interface/web/mail/lib/lang/ca_spamfilter_policy_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_spamfilter_users.lng
 create mode 100644 interface/web/mail/lib/lang/ca_spamfilter_users_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_spamfilter_whitelist.lng
 create mode 100644 interface/web/mail/lib/lang/ca_spamfilter_whitelist_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_user_quota_stats_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_xmpp_domain.lng
 create mode 100644 interface/web/mail/lib/lang/ca_xmpp_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_xmpp_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/ca_xmpp_user.lng
 create mode 100644 interface/web/mail/lib/lang/ca_xmpp_user_list.lng
 create mode 100644 interface/web/mail/lib/lang/cz_xmpp_domain.lng
 create mode 100644 interface/web/mail/lib/lang/cz_xmpp_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/cz_xmpp_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/cz_xmpp_user.lng
 create mode 100644 interface/web/mail/lib/lang/cz_xmpp_user_list.lng
 create mode 100644 interface/web/mail/lib/lang/de_xmpp_domain.lng
 create mode 100644 interface/web/mail/lib/lang/de_xmpp_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/de_xmpp_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/de_xmpp_user.lng
 create mode 100644 interface/web/mail/lib/lang/de_xmpp_user_list.lng
 create mode 100644 interface/web/mail/lib/lang/el_xmpp_domain.lng
 create mode 100644 interface/web/mail/lib/lang/el_xmpp_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/el_xmpp_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/el_xmpp_user.lng
 create mode 100644 interface/web/mail/lib/lang/el_xmpp_user_list.lng
 create mode 100644 interface/web/mail/lib/lang/es_xmpp_domain.lng
 create mode 100644 interface/web/mail/lib/lang/es_xmpp_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/es_xmpp_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/es_xmpp_user.lng
 create mode 100644 interface/web/mail/lib/lang/es_xmpp_user_list.lng
 create mode 100644 interface/web/mail/lib/lang/fi_xmpp_domain.lng
 create mode 100644 interface/web/mail/lib/lang/fi_xmpp_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/fi_xmpp_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/fi_xmpp_user.lng
 create mode 100644 interface/web/mail/lib/lang/fi_xmpp_user_list.lng
 create mode 100644 interface/web/mail/lib/lang/fr_xmpp_domain.lng
 create mode 100644 interface/web/mail/lib/lang/fr_xmpp_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/fr_xmpp_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/fr_xmpp_user.lng
 create mode 100644 interface/web/mail/lib/lang/fr_xmpp_user_list.lng
 create mode 100644 interface/web/mail/lib/lang/hr_xmpp_domain.lng
 create mode 100644 interface/web/mail/lib/lang/hr_xmpp_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/hr_xmpp_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/hr_xmpp_user.lng
 create mode 100644 interface/web/mail/lib/lang/hr_xmpp_user_list.lng
 create mode 100644 interface/web/mail/lib/lang/hu_xmpp_domain.lng
 create mode 100644 interface/web/mail/lib/lang/hu_xmpp_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/hu_xmpp_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/hu_xmpp_user.lng
 create mode 100644 interface/web/mail/lib/lang/hu_xmpp_user_list.lng
 create mode 100644 interface/web/mail/lib/lang/id_xmpp_domain.lng
 create mode 100644 interface/web/mail/lib/lang/id_xmpp_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/id_xmpp_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/id_xmpp_user.lng
 create mode 100644 interface/web/mail/lib/lang/id_xmpp_user_list.lng
 create mode 100644 interface/web/mail/lib/lang/it_xmpp_domain.lng
 create mode 100644 interface/web/mail/lib/lang/it_xmpp_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/it_xmpp_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/it_xmpp_user.lng
 create mode 100644 interface/web/mail/lib/lang/it_xmpp_user_list.lng
 create mode 100644 interface/web/mail/lib/lang/ja_xmpp_domain.lng
 create mode 100644 interface/web/mail/lib/lang/ja_xmpp_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/ja_xmpp_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/ja_xmpp_user.lng
 create mode 100644 interface/web/mail/lib/lang/ja_xmpp_user_list.lng
 create mode 100644 interface/web/mail/lib/lang/nl_xmpp_domain.lng
 create mode 100644 interface/web/mail/lib/lang/nl_xmpp_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/nl_xmpp_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/nl_xmpp_user.lng
 create mode 100644 interface/web/mail/lib/lang/nl_xmpp_user_list.lng
 create mode 100644 interface/web/mail/lib/lang/pl_mail_backup_list.lng
 create mode 100644 interface/web/mail/lib/lang/pl_xmpp_domain.lng
 create mode 100644 interface/web/mail/lib/lang/pl_xmpp_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/pl_xmpp_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/pl_xmpp_user.lng
 create mode 100644 interface/web/mail/lib/lang/pl_xmpp_user_list.lng
 create mode 100644 interface/web/mail/lib/lang/pt_mail_backup_list.lng
 create mode 100644 interface/web/mail/lib/lang/pt_xmpp_domain.lng
 create mode 100644 interface/web/mail/lib/lang/pt_xmpp_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/pt_xmpp_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/pt_xmpp_user.lng
 create mode 100644 interface/web/mail/lib/lang/pt_xmpp_user_list.lng
 create mode 100644 interface/web/mail/lib/lang/ro_mail_backup_list.lng
 create mode 100644 interface/web/mail/lib/lang/ro_xmpp_domain.lng
 create mode 100644 interface/web/mail/lib/lang/ro_xmpp_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/ro_xmpp_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/ro_xmpp_user.lng
 create mode 100644 interface/web/mail/lib/lang/ro_xmpp_user_list.lng
 create mode 100644 interface/web/mail/lib/lang/ru_xmpp_domain.lng
 create mode 100644 interface/web/mail/lib/lang/ru_xmpp_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/ru_xmpp_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/ru_xmpp_user.lng
 create mode 100644 interface/web/mail/lib/lang/ru_xmpp_user_list.lng
 create mode 100644 interface/web/mail/lib/lang/se_xmpp_domain.lng
 create mode 100644 interface/web/mail/lib/lang/se_xmpp_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/se_xmpp_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/se_xmpp_user.lng
 create mode 100644 interface/web/mail/lib/lang/se_xmpp_user_list.lng
 create mode 100644 interface/web/mail/lib/lang/sk_xmpp_domain.lng
 create mode 100644 interface/web/mail/lib/lang/sk_xmpp_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/sk_xmpp_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/sk_xmpp_user.lng
 create mode 100644 interface/web/mail/lib/lang/sk_xmpp_user_list.lng
 create mode 100644 interface/web/mail/lib/lang/tr_xmpp_domain.lng
 create mode 100644 interface/web/mail/lib/lang/tr_xmpp_domain_admin_list.lng
 create mode 100644 interface/web/mail/lib/lang/tr_xmpp_domain_list.lng
 create mode 100644 interface/web/mail/lib/lang/tr_xmpp_user.lng
 create mode 100644 interface/web/mail/lib/lang/tr_xmpp_user_list.lng
 create mode 100644 interface/web/mailuser/lib/lang/ca.lng
 create mode 100644 interface/web/mailuser/lib/lang/ca_index.lng
 create mode 100644 interface/web/mailuser/lib/lang/ca_mail_user_autoresponder.lng
 create mode 100644 interface/web/mailuser/lib/lang/ca_mail_user_cc.lng
 create mode 100644 interface/web/mailuser/lib/lang/ca_mail_user_filter.lng
 create mode 100644 interface/web/mailuser/lib/lang/ca_mail_user_filter_list.lng
 create mode 100644 interface/web/mailuser/lib/lang/ca_mail_user_password.lng
 create mode 100644 interface/web/mailuser/lib/lang/ca_mail_user_spamfilter.lng
 create mode 100644 interface/web/monitor/lib/lang/ca.lng
 create mode 100644 interface/web/monitor/lib/lang/ca_datalog_list.lng
 create mode 100644 interface/web/monitor/lib/lang/ca_syslog_list.lng
 create mode 100644 interface/web/sites/lib/lang/ar_ftp_sites_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/ar_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/ar_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/ar_web_directive_snippets.lng
 create mode 100644 interface/web/sites/lib/lang/ar_web_domain.lng
 create mode 100644 interface/web/sites/lib/lang/ar_web_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/ar_web_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/ar_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/ar_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/ar_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/ar_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/bg_ftp_sites_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/bg_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/bg_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/bg_web_directive_snippets.lng
 create mode 100644 interface/web/sites/lib/lang/bg_web_domain.lng
 create mode 100644 interface/web/sites/lib/lang/bg_web_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/bg_web_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/bg_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/bg_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/bg_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/bg_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/br_ftp_sites_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/br_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/br_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/br_web_directive_snippets.lng
 create mode 100644 interface/web/sites/lib/lang/br_web_domain.lng
 create mode 100644 interface/web/sites/lib/lang/br_web_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/br_web_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/br_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/br_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/br_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/br_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca.lng
 create mode 100644 interface/web/sites/lib/lang/ca_aps.lng
 create mode 100644 interface/web/sites/lib/lang/ca_aps_instances_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_aps_packages_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_aps_update_packagelist.lng
 create mode 100644 interface/web/sites/lib/lang/ca_backup_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_cron.lng
 create mode 100644 interface/web/sites/lib/lang/ca_cron_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_database.lng
 create mode 100644 interface/web/sites/lib/lang/ca_database_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_database_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_database_quota_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_database_user.lng
 create mode 100644 interface/web/sites/lib/lang/ca_database_user_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_database_user_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_ftp_sites_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_ftp_user.lng
 create mode 100644 interface/web/sites/lib/lang/ca_ftp_user_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_shell_user.lng
 create mode 100644 interface/web/sites/lib/lang/ca_shell_user_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_user_quota_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/ca_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_web_backup_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_web_childdomain.lng
 create mode 100644 interface/web/sites/lib/lang/ca_web_childdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_web_directive_snippets.lng
 create mode 100644 interface/web/sites/lib/lang/ca_web_domain.lng
 create mode 100644 interface/web/sites/lib/lang/ca_web_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_web_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_web_folder.lng
 create mode 100644 interface/web/sites/lib/lang/ca_web_folder_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_web_folder_user.lng
 create mode 100644 interface/web/sites/lib/lang/ca_web_folder_user_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_web_sites_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/ca_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_web_vhost_domain.lng
 create mode 100644 interface/web/sites/lib/lang/ca_web_vhost_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_web_vhost_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/ca_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/ca_webdav_user.lng
 create mode 100644 interface/web/sites/lib/lang/ca_webdav_user_list.lng
 create mode 100644 interface/web/sites/lib/lang/cz_ftp_sites_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/cz_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/cz_web_directive_snippets.lng
 create mode 100644 interface/web/sites/lib/lang/cz_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/cz_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/cz_web_vhost_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/de_ftp_sites_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/de_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/de_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/de_web_domain.lng
 create mode 100644 interface/web/sites/lib/lang/de_web_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/de_web_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/de_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/de_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/de_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/el_ftp_sites_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/el_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/el_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/el_web_directive_snippets.lng
 create mode 100644 interface/web/sites/lib/lang/el_web_domain.lng
 create mode 100644 interface/web/sites/lib/lang/el_web_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/el_web_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/el_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/el_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/el_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/el_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/en_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/en_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/en_web_domain.lng
 create mode 100644 interface/web/sites/lib/lang/en_web_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/en_web_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/en_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/en_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/en_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/en_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/es_ftp_sites_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/es_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/es_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/es_web_directive_snippets.lng
 create mode 100644 interface/web/sites/lib/lang/es_web_domain.lng
 create mode 100644 interface/web/sites/lib/lang/es_web_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/es_web_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/es_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/es_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/es_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/es_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/fi_ftp_sites_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/fi_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/fi_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/fi_web_directive_snippets.lng
 create mode 100644 interface/web/sites/lib/lang/fi_web_domain.lng
 create mode 100644 interface/web/sites/lib/lang/fi_web_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/fi_web_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/fi_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/fi_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/fi_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/fi_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/fr_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/fr_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/fr_web_directive_snippets.lng
 create mode 100644 interface/web/sites/lib/lang/fr_web_domain.lng
 create mode 100644 interface/web/sites/lib/lang/fr_web_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/fr_web_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/fr_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/fr_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/fr_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/fr_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/hr_ftp_sites_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/hr_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/hr_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/hr_web_directive_snippets.lng
 create mode 100644 interface/web/sites/lib/lang/hr_web_domain.lng
 create mode 100644 interface/web/sites/lib/lang/hr_web_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/hr_web_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/hr_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/hr_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/hr_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/hr_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/hu_ftp_sites_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/hu_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/hu_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/hu_web_directive_snippets.lng
 create mode 100644 interface/web/sites/lib/lang/hu_web_domain.lng
 create mode 100644 interface/web/sites/lib/lang/hu_web_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/hu_web_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/hu_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/hu_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/hu_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/hu_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/id_ftp_sites_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/id_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/id_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/id_web_directive_snippets.lng
 create mode 100644 interface/web/sites/lib/lang/id_web_domain.lng
 create mode 100644 interface/web/sites/lib/lang/id_web_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/id_web_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/id_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/id_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/id_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/id_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/it_ftp_sites_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/it_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/it_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/it_web_directive_snippets.lng
 create mode 100644 interface/web/sites/lib/lang/it_web_domain.lng
 create mode 100644 interface/web/sites/lib/lang/it_web_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/it_web_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/it_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/it_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/it_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/it_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/ja_ftp_sites_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/ja_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/ja_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/ja_web_directive_snippets.lng
 create mode 100644 interface/web/sites/lib/lang/ja_web_domain.lng
 create mode 100644 interface/web/sites/lib/lang/ja_web_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/ja_web_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/ja_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/ja_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/ja_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/ja_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/nl_ftp_sites_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/nl_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/nl_web_directive_snippets.lng
 create mode 100644 interface/web/sites/lib/lang/nl_web_domain.lng
 create mode 100644 interface/web/sites/lib/lang/nl_web_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/nl_web_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/nl_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/nl_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/nl_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/nl_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/pl_ftp_sites_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/pl_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/pl_web_directive_snippets.lng
 create mode 100644 interface/web/sites/lib/lang/pl_web_domain.lng
 create mode 100644 interface/web/sites/lib/lang/pl_web_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/pl_web_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/pl_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/pl_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/pt_ftp_sites_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/pt_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/pt_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/pt_web_directive_snippets.lng
 create mode 100644 interface/web/sites/lib/lang/pt_web_domain.lng
 create mode 100644 interface/web/sites/lib/lang/pt_web_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/pt_web_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/pt_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/pt_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/pt_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/pt_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/ro_ftp_sites_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/ro_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/ro_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/ro_web_directive_snippets.lng
 create mode 100644 interface/web/sites/lib/lang/ro_web_domain.lng
 create mode 100644 interface/web/sites/lib/lang/ro_web_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/ro_web_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/ro_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/ro_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/ro_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/ro_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/ru_ftp_sites_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/ru_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/ru_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/ru_web_directive_snippets.lng
 create mode 100644 interface/web/sites/lib/lang/ru_web_domain.lng
 create mode 100644 interface/web/sites/lib/lang/ru_web_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/ru_web_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/ru_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/ru_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/ru_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/ru_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/se_ftp_sites_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/se_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/se_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/se_web_directive_snippets.lng
 create mode 100644 interface/web/sites/lib/lang/se_web_domain.lng
 create mode 100644 interface/web/sites/lib/lang/se_web_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/se_web_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/se_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/se_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/se_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/sk_ftp_sites_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/sk_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/sk_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/sk_web_directive_snippets.lng
 create mode 100644 interface/web/sites/lib/lang/sk_web_domain.lng
 create mode 100644 interface/web/sites/lib/lang/sk_web_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/sk_web_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/sk_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/sk_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/sk_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/sk_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/tr_ftp_sites_stats_list.lng
 create mode 100644 interface/web/sites/lib/lang/tr_web_aliasdomain.lng
 create mode 100644 interface/web/sites/lib/lang/tr_web_aliasdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/tr_web_directive_snippets.lng
 create mode 100644 interface/web/sites/lib/lang/tr_web_domain.lng
 create mode 100644 interface/web/sites/lib/lang/tr_web_domain_admin_list.lng
 create mode 100644 interface/web/sites/lib/lang/tr_web_domain_list.lng
 create mode 100644 interface/web/sites/lib/lang/tr_web_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/tr_web_subdomain_list.lng
 create mode 100644 interface/web/sites/lib/lang/tr_web_vhost_subdomain.lng
 create mode 100644 interface/web/sites/lib/lang/tr_web_vhost_subdomain_list.lng
 create mode 100644 interface/web/tools/lib/lang/ar_import_vpopmail.lng
 create mode 100644 interface/web/tools/lib/lang/bg_import_vpopmail.lng
 create mode 100644 interface/web/tools/lib/lang/br_import_vpopmail.lng
 create mode 100644 interface/web/tools/lib/lang/ca.lng
 create mode 100644 interface/web/tools/lib/lang/ca_import_ispconfig.lng
 create mode 100644 interface/web/tools/lib/lang/ca_import_vpopmail.lng
 create mode 100644 interface/web/tools/lib/lang/ca_index.lng
 create mode 100644 interface/web/tools/lib/lang/ca_interface.lng
 create mode 100644 interface/web/tools/lib/lang/ca_resync.lng
 create mode 100644 interface/web/tools/lib/lang/ca_tpl_default.lng
 create mode 100644 interface/web/tools/lib/lang/ca_usersettings.lng
 create mode 100644 interface/web/tools/lib/lang/cz_import_vpopmail.lng
 create mode 100644 interface/web/tools/lib/lang/de_import_vpopmail.lng
 create mode 100644 interface/web/tools/lib/lang/el_import_vpopmail.lng
 create mode 100644 interface/web/tools/lib/lang/es_import_vpopmail.lng
 create mode 100644 interface/web/tools/lib/lang/fi_import_vpopmail.lng
 create mode 100644 interface/web/tools/lib/lang/fr_import_vpopmail.lng
 create mode 100644 interface/web/tools/lib/lang/hr_import_vpopmail.lng
 create mode 100644 interface/web/tools/lib/lang/hu_import_vpopmail.lng
 create mode 100644 interface/web/tools/lib/lang/id_import_vpopmail.lng
 create mode 100644 interface/web/tools/lib/lang/it_import_vpopmail.lng
 create mode 100644 interface/web/tools/lib/lang/ja_import_vpopmail.lng
 create mode 100644 interface/web/tools/lib/lang/nl_import_vpopmail.lng
 create mode 100644 interface/web/tools/lib/lang/pl_import_vpopmail.lng
 create mode 100644 interface/web/tools/lib/lang/pt_import_vpopmail.lng
 create mode 100644 interface/web/tools/lib/lang/ro_import_vpopmail.lng
 create mode 100644 interface/web/tools/lib/lang/ru_import_vpopmail.lng
 create mode 100644 interface/web/tools/lib/lang/se_import_vpopmail.lng
 create mode 100644 interface/web/tools/lib/lang/sk_import_vpopmail.lng
 create mode 100644 interface/web/tools/lib/lang/tr_import_vpopmail.lng
 create mode 100644 interface/web/vm/lib/lang/ca.lng
 create mode 100644 interface/web/vm/lib/lang/ca_openvz_action.lng
 create mode 100644 interface/web/vm/lib/lang/ca_openvz_ip.lng
 create mode 100644 interface/web/vm/lib/lang/ca_openvz_ip_list.lng
 create mode 100644 interface/web/vm/lib/lang/ca_openvz_ostemplate.lng
 create mode 100644 interface/web/vm/lib/lang/ca_openvz_ostemplate_list.lng
 create mode 100644 interface/web/vm/lib/lang/ca_openvz_template.lng
 create mode 100644 interface/web/vm/lib/lang/ca_openvz_template_list.lng
 create mode 100644 interface/web/vm/lib/lang/ca_openvz_vm.lng
 create mode 100644 interface/web/vm/lib/lang/ca_openvz_vm_list.lng

diff --git a/interface/lib/lang/ar.lng b/interface/lib/lang/ar.lng
index ed4bb29c04..6baf8e1f2e 100644
--- a/interface/lib/lang/ar.lng
+++ b/interface/lib/lang/ar.lng
@@ -149,4 +149,5 @@ $wb['weak_password_txt'] = 'The chosen password does not match the security guid
 $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
 $wb['security_check1_txt'] = 'Check for security permission:';
 $wb['security_check2_txt'] = 'failed.';
+$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
 ?>
diff --git a/interface/lib/lang/bg.lng b/interface/lib/lang/bg.lng
index 04380173ae..af9c398b17 100644
--- a/interface/lib/lang/bg.lng
+++ b/interface/lib/lang/bg.lng
@@ -149,4 +149,5 @@ $wb['weak_password_txt'] = 'The chosen password does not match the security guid
 $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
 $wb['security_check1_txt'] = 'Check for security permission:';
 $wb['security_check2_txt'] = 'failed.';
+$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
 ?>
diff --git a/interface/lib/lang/br.lng b/interface/lib/lang/br.lng
index 275be4d1bd..100bb5ebe7 100644
--- a/interface/lib/lang/br.lng
+++ b/interface/lib/lang/br.lng
@@ -149,4 +149,5 @@ $wb['weak_password_txt'] = 'The chosen password does not match the security guid
 $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
 $wb['security_check1_txt'] = 'Check for security permission:';
 $wb['security_check2_txt'] = 'failed.';
+$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
 ?>
diff --git a/interface/lib/lang/ca.lng b/interface/lib/lang/ca.lng
new file mode 100644
index 0000000000..80b4f91185
--- /dev/null
+++ b/interface/lib/lang/ca.lng
@@ -0,0 +1,153 @@
+<?php
+$wb['conf_format_dateshort'] = 'd-m-Y';
+$wb['conf_format_datelong'] = 'l dS of F Y';
+$wb['conf_format_timeshort'] = 'H:i';
+$wb['conf_format_timelong'] = 'H:i:s';
+$wb['conf_format_datetime'] = 'd-m-Y H:i';
+$wb['number_format_decimals'] = '4';
+$wb['number_format_decimals_client'] = '2';
+$wb['number_format_dec_point'] = ',';
+$wb['number_format_thousands_sep'] = '';
+$wb['error_301'] = 'Vous navez pas accès à ce module';
+$wb['error_302'] = 'Module invalide.';
+$wb['error_1001'] = 'Le nom dutilisateur et/ou le not de passe ne doivent pas être vides !';
+$wb['error_1002'] = 'Le nom dutilisateur et/ou le mot de passe sont faux !';
+$wb['error_1003'] = 'L\'utilisateur est désactivé !';
+$wb['delete_confirmation'] = 'Voulez-vous vraiment supprimer cet enregistrement ?';
+$wb['error_no_view_permission'] = 'Vous n\'avez pas la permission de voir cet enregistrement ou il nexiste pas.';
+$wb['error_no_delete_permission'] = 'Vous n\'avez pas la permission de supprimer cet enregistrement !';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'de';
+$wb['page_and_txt'] = 'et';
+$wb['page_next_txt'] = 'Suivant';
+$wb['page_back_txt'] = 'Précédent';
+$wb['delete_txt'] = 'Supprimer';
+$wb['filter_txt'] = 'Filtrer';
+$wb['add_new_record_txt'] = 'Ajouter une entrée';
+$wb['btn_save_txt'] = 'Enregistrer';
+$wb['btn_cancel_txt'] = 'Retour';
+$wb['top_menu_system'] = 'Système';
+$wb['top_menu_client'] = 'Client';
+$wb['top_menu_email'] = 'Courriel';
+$wb['top_menu_monitor'] = 'Suivi';
+$wb['top_menu_sites'] = 'Sites';
+$wb['top_menu_dns'] = 'DNS';
+$wb['top_menu_tools'] = 'Outils';
+$wb['top_menu_help'] = 'Aide';
+$wb['top_menu_billing'] = 'Facturation';
+$wb['top_menu_domain'] = 'Domaines';
+$wb['top_menu_dashboard'] = 'Accueil';
+$wb['top_menu_vm'] = 'VServer';
+$wb['toolsarea_head_txt'] = 'Outils';
+$wb['latest_news_txt'] = 'Dernières actus';
+$wb['daynamesmin_su'] = 'Di';
+$wb['daynamesmin_mo'] = 'Lu';
+$wb['daynamesmin_tu'] = 'Ma';
+$wb['daynamesmin_we'] = 'Me';
+$wb['daynamesmin_th'] = 'Je';
+$wb['daynamesmin_fr'] = 'Ve';
+$wb['daynamesmin_sa'] = 'Sa';
+$wb['daynames_sunday'] = 'Dimanche';
+$wb['daynames_monday'] = 'Lundi';
+$wb['daynames_tuesday'] = 'Mardi';
+$wb['daynames_wednesday'] = 'Mercredi';
+$wb['daynames_thursday'] = 'Jeudi';
+$wb['daynames_friday'] = 'Vendredi';
+$wb['daynames_saturday'] = 'Samedi';
+$wb['monthnamesshort_jan'] = 'Jan';
+$wb['monthnamesshort_feb'] = 'Fev';
+$wb['monthnamesshort_mar'] = 'Mar';
+$wb['monthnamesshort_apr'] = 'Avr';
+$wb['monthnamesshort_may'] = 'Mai';
+$wb['monthnamesshort_jun'] = 'Juin';
+$wb['monthnamesshort_jul'] = 'Juil';
+$wb['monthnamesshort_aug'] = 'Aout';
+$wb['monthnamesshort_sep'] = 'Sep';
+$wb['monthnamesshort_oct'] = 'Oct';
+$wb['monthnamesshort_nov'] = 'Nov';
+$wb['monthnamesshort_dec'] = 'Dec';
+$wb['datepicker_nextText'] = 'Suivant';
+$wb['datepicker_prevText'] = 'Précédent';
+$wb['logout_txt'] = 'Se déconnecter';
+$wb['conf_format_dateshort_human_readable'] = 'dd-mm-yyyy';
+$wb['submit_confirmation'] = 'Voulez-vous vraiment effectuer cette action ?';
+$wb['top_menu_mailuser'] = 'Mailuser';
+$wb['globalsearch_resultslimit_of_txt'] = 'de';
+$wb['globalsearch_resultslimit_results_txt'] = 'resultats';
+$wb['globalsearch_noresults_text_txt'] = 'Aucun resultat.';
+$wb['globalsearch_noresults_limit_txt'] = '0 resultat';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Rechercher';
+$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['global_tabchange_warning_txt'] = 'Les données seront modifiées si vous cliquez sur OK. Cliquez sur annuler pour ne rien modifier.';
+$wb['global_tabchange_discard_txt'] = 'Vous avez des données modifiées non enregistrées dans cet onglet. Les modifications seront perdues si vous continuez.';
+$wb['datalog_changes_txt'] = 'Les modifications n\'ont pas encore été appliquées à tous les serveurs:';
+$wb['datalog_changes_end_txt'] = 'Les mises à jour peuvent prendre jusqu\'à 1 minute. Merci de patienter.';
+$wb['datalog_status_i_web_database'] = 'Créer une nouvelle base de données';
+$wb['datalog_status_u_web_database'] = 'Modifier une base de données';
+$wb['datalog_status_d_web_database'] = 'Supprimer une base de données';
+$wb['datalog_status_i_web_database_user'] = 'Créer un utilisateur de base de données';
+$wb['datalog_status_u_web_database_user'] = 'Modifier un utilisateur de base de données';
+$wb['datalog_status_d_web_database_user'] = 'Supprimer un utilisateur de base de données';
+$wb['datalog_status_i_web_domain'] = 'Créer un nouveau site';
+$wb['datalog_status_u_web_domain'] = 'Mettre à jour la configuration du site';
+$wb['datalog_status_d_web_domain'] = 'Supprimer le site';
+$wb['datalog_status_i_ftp_user'] = 'Créer un utilisateur FTP';
+$wb['datalog_status_u_ftp_user'] = 'Modifier un utilisateur FTP';
+$wb['datalog_status_d_ftp_user'] = 'Supprimer un utilisateur FTP';
+$wb['datalog_status_i_mail_domain'] = 'Créer un domaine courriel';
+$wb['datalog_status_u_mail_domain'] = 'Modifier un domaine courriel';
+$wb['datalog_status_d_mail_domain'] = 'Supprimer un domaine courriel';
+$wb['datalog_status_i_mail_user'] = 'Créer un utilisateur courriel';
+$wb['datalog_status_u_mail_user'] = 'Modifier un utilisateur courriel';
+$wb['datalog_status_d_mail_user'] = 'Supprimer un utilisateur courriel';
+$wb['datalog_status_i_spamfilter_users'] = 'Créer un filtre anti-spam';
+$wb['datalog_status_u_spamfilter_users'] = 'Modifier un filtre anti-spam';
+$wb['datalog_status_d_spamfilter_users'] = 'Supprimer un filtre anti-spam';
+$wb['datalog_status_i_mail_forwarding'] = 'Créer une adresse courriel';
+$wb['datalog_status_u_mail_forwarding'] = 'Modifier une adresse courriel';
+$wb['datalog_status_d_mail_forwarding'] = 'Supprimer une adresse courriel';
+$wb['datalog_status_i_dns_rr'] = 'Créer un enregistrement DNS';
+$wb['datalog_status_u_dns_rr'] = 'Modifier un enregistrement DNS';
+$wb['datalog_status_d_dns_rr'] = 'Supprimer un enregistrement DNS';
+$wb['datalog_status_i_dns_soa'] = 'Créer une zone DNS';
+$wb['datalog_status_u_dns_soa'] = 'Modifier une zone DNS';
+$wb['datalog_status_d_dns_soa'] = 'Supprimer une zone DNS';
+$wb['datalog_status_i_cron'] = 'Créer une tâche cron';
+$wb['datalog_status_u_cron'] = 'Modifier une tâche cron';
+$wb['datalog_status_d_cron'] = 'Supprimer une tâche cron';
+$wb['datalog_status_i_mail_get'] = 'Créer un compte mail récupérateur';
+$wb['datalog_status_u_mail_get'] = 'Modifier un compte mail récupérateur';
+$wb['datalog_status_d_mail_get'] = 'Supprimer un compte mail récupérateur';
+$wb['datalog_status_i_mail_mailinglist'] = 'Créer une liste d\'envoi';
+$wb['datalog_status_u_mail_mailinglist'] = 'Modifier une liste d\'envoi';
+$wb['datalog_status_d_mail_mailinglist'] = 'Supprimer une liste d\'envoi';
+$wb['datalog_status_i_shell_user'] = 'Créer un utilisateur Shell';
+$wb['datalog_status_u_shell_user'] = 'Modifier un utilisateur Shell';
+$wb['datalog_status_d_shell_user'] = 'Supprimer un utilisateur Shell';
+$wb['datalog_status_i_web_folder'] = 'Créer un dossier protégé';
+$wb['datalog_status_u_web_folder'] = 'Modifier un dossier protégé';
+$wb['datalog_status_d_web_folder'] = 'Supprimer un dossier protégé';
+$wb['datalog_status_i_web_folder_user'] = 'Créer un utilisateur de dossier protégé';
+$wb['datalog_status_u_web_folder_user'] = 'Modifier un utilisateur de dossier protégé';
+$wb['datalog_status_d_web_folder_user'] = 'Supprimer un utilisateur de dossier protégé';
+$wb['login_as_txt'] = 'Connexion en tant que';
+$wb['no_domain_perm'] = 'Vous n\'avez pas de permission pour ce domaine.';
+$wb['no_destination_perm'] = 'Vous n\'avez pas de permission pour cette destination.';
+$wb['client_you_are_locked'] = 'You have no permission to change any settings.';
+$wb['gender_m_txt'] = 'Mr.';
+$wb['gender_f_txt'] = 'Mme.';
+$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'] = 'Oui';
+$wb['no_txt'] = 'Non';
+$wb['None'] = 'None';
+$wb['strength_1'] = 'Faible';
+$wb['strength_2'] = 'Moyen';
+$wb['strength_3'] = 'Bon';
+$wb['strength_4'] = 'Fort';
+$wb['strength_5'] = 'Très fort';
+$wb['weak_password_txt'] = 'Le mot de passe choisi ne rencontre pas les minimas requis : {chars} caractères minimums et une force de \\"{strength}\\".';
+$wb['weak_password_length_txt'] = 'Le mot de passe choisi ne rencontre pas les minimas requis : {chars} caractères minimums.';
+$wb['security_check1_txt'] = 'Vérifier les permissions de sécurité:';
+$wb['security_check2_txt'] = 'Echec';
+$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
+?>
diff --git a/interface/lib/lang/cz.lng b/interface/lib/lang/cz.lng
index 52c06b2c9a..f3439de96c 100644
--- a/interface/lib/lang/cz.lng
+++ b/interface/lib/lang/cz.lng
@@ -151,5 +151,3 @@ $wb['security_check1_txt'] = 'Check for security permission:';
 $wb['security_check2_txt'] = 'failed.';
 $wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
 ?>
-
-
diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng
index fb35c30bda..1fc1152558 100644
--- a/interface/lib/lang/de.lng
+++ b/interface/lib/lang/de.lng
@@ -43,7 +43,6 @@ $wb['top_menu_dashboard'] = 'Übersicht';
 $wb['latest_news_txt'] = 'Neuigkeiten';
 $wb['err_csrf_attempt_blocked'] = 'CSRF-Versuch blockiert.';
 $wb['top_menu_vm'] = 'vServer';
-$wb['err_csrf_attempt_blocked'] = 'CSRF-Versuch blockiert.';
 $wb['daynamesmin_su'] = 'So';
 $wb['daynamesmin_mo'] = 'Mo';
 $wb['daynamesmin_tu'] = 'Di';
diff --git a/interface/lib/lang/el.lng b/interface/lib/lang/el.lng
index d8a2715909..f15525358f 100644
--- a/interface/lib/lang/el.lng
+++ b/interface/lib/lang/el.lng
@@ -149,4 +149,5 @@ $wb['weak_password_txt'] = 'The chosen password does not match the security guid
 $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
 $wb['security_check1_txt'] = 'Check for security permission:';
 $wb['security_check2_txt'] = 'failed.';
+$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
 ?>
diff --git a/interface/lib/lang/es.lng b/interface/lib/lang/es.lng
index f76231088f..7aa6979a11 100644
--- a/interface/lib/lang/es.lng
+++ b/interface/lib/lang/es.lng
@@ -36,13 +36,13 @@ $wb['top_menu_dns'] = 'DNS';
 $wb['top_menu_tools'] = 'Herramientas';
 $wb['top_menu_help'] = 'Ayuda';
 $wb['top_menu_billing'] = 'Pagos';
-$wb['top_menu_mailuser'] = 'Usuario de correo';
+$wb['top_menu_mailuser'] = 'Correo';
 $wb['top_menu_domain'] = 'Dominios';
 $wb['top_menu_dashboard'] = 'Inicio';
 $wb['top_menu_vm'] = 'VServer';
 $wb['toolsarea_head_txt'] = 'Herramientas';
 $wb['latest_news_txt'] = 'Últimas noticias';
-$wb['logout_txt'] = 'Salir -';
+$wb['logout_txt'] = 'SALIR';
 $wb['daynamesmin_su'] = 'Dom';
 $wb['daynamesmin_mo'] = 'Lun';
 $wb['daynamesmin_tu'] = 'Mar';
@@ -71,10 +71,6 @@ $wb['monthnamesshort_nov'] = 'Nov';
 $wb['monthnamesshort_dec'] = 'Dic';
 $wb['datepicker_nextText'] = 'Siguiente';
 $wb['datepicker_prevText'] = 'Anterior';
-$wb['logout_txt'] = 'SALIR';
-$wb['conf_format_dateshort_human_readable'] = 'dd-mm-yyyy';
-$wb['number_format_decimals_client'] = '2';
-$wb['top_menu_mailuser'] = 'Correo';
 $wb['submit_confirmation'] = 'Realmente desea realizar esta acción?';
 $wb['globalsearch_resultslimit_of_txt'] = 'de';
 $wb['globalsearch_resultslimit_results_txt'] = 'resultados';
@@ -146,12 +142,11 @@ $wb['yes_txt'] = 'Sí';
 $wb['no_txt'] = 'No';
 $wb['None'] = 'Ninguno';
 $wb['strength_1'] = 'Débil';
-$wb['Firewall'] = 'Cortafuegos';
 $wb['strength_2'] = 'Aceptable';
 $wb['strength_3'] = 'Buena';
 $wb['strength_4'] = 'Fuerte';
 $wb['strength_5'] = 'Muy fuerte';
-$wb['weak_password_txt'] = 'La contraseña elegida no coincide con las directrices de seguridad. Debe contener al menos {chars} caracteres y tener una fortaleza \"{strength}\".';
+$wb['weak_password_txt'] = 'La contraseña elegida no coincide con las directrices de seguridad. Debe contener al menos {chars} caracteres y tener una fortaleza \\"{strength}\\".';
 $wb['weak_password_length_txt'] = 'La contraseña elegida no coincide con las directrices de seguridad. Debe contener al menos {chars} caracteres.';
 $wb['security_check1_txt'] = 'Verificar permisos de seguridad:';
 $wb['security_check2_txt'] = 'ha fallado.';
diff --git a/interface/lib/lang/fi.lng b/interface/lib/lang/fi.lng
index 059c9b2deb..0ad7c2843b 100755
--- a/interface/lib/lang/fi.lng
+++ b/interface/lib/lang/fi.lng
@@ -149,4 +149,5 @@ $wb['weak_password_txt'] = 'The chosen password does not match the security guid
 $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
 $wb['security_check1_txt'] = 'Check for security permission:';
 $wb['security_check2_txt'] = 'failed.';
+$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
 ?>
diff --git a/interface/lib/lang/fr.lng b/interface/lib/lang/fr.lng
index c59aac41a1..2c2be625e8 100644
--- a/interface/lib/lang/fr.lng
+++ b/interface/lib/lang/fr.lng
@@ -8,14 +8,14 @@ $wb['number_format_decimals'] = '4';
 $wb['number_format_decimals_client'] = '2';
 $wb['number_format_dec_point'] = ',';
 $wb['number_format_thousands_sep'] = '';
-$wb['error_301'] = 'Vous navez pas accès à ce module';
+$wb['error_301'] = 'Vous n’avez pas accès à ce module.';
 $wb['error_302'] = 'Module invalide.';
-$wb['error_1001'] = 'Le nom dutilisateur et/ou le not de passe ne doivent pas être vides !';
-$wb['error_1002'] = 'Le nom dutilisateur et/ou le mot de passe sont faux !';
-$wb['error_1003'] = 'L\'utilisateur est désactivé !';
-$wb['delete_confirmation'] = 'Voulez-vous vraiment supprimer cet enregistrement ?';
-$wb['error_no_view_permission'] = 'Vous n\'avez pas la permission de voir cet enregistrement ou il nexiste pas.';
-$wb['error_no_delete_permission'] = 'Vous n\'avez pas la permission de supprimer cet enregistrement !';
+$wb['error_1001'] = 'Le nom d’utilisateur ou le mot de passe ne doivent pas être vides !';
+$wb['error_1002'] = 'Le nom d’utilisateur ou le mot de passe sont faux !';
+$wb['error_1003'] = 'L’utilisateur est désactivé !';
+$wb['delete_confirmation'] = 'Voulez-vous vraiment supprimer cet enregistrement ?';
+$wb['error_no_view_permission'] = 'Vous n’avez pas la permission de voir cet enregistrement ou il nexiste pas.';
+$wb['error_no_delete_permission'] = 'Vous n’avez pas la permission de supprimer cet enregistrement !';
 $wb['page_txt'] = 'Page';
 $wb['page_of_txt'] = 'de';
 $wb['page_and_txt'] = 'et';
@@ -28,7 +28,7 @@ $wb['btn_save_txt'] = 'Enregistrer';
 $wb['btn_cancel_txt'] = 'Retour';
 $wb['top_menu_system'] = 'Système';
 $wb['top_menu_client'] = 'Client';
-$wb['top_menu_email'] = 'Email';
+$wb['top_menu_email'] = 'E-mail';
 $wb['top_menu_monitor'] = 'Suivi';
 $wb['top_menu_sites'] = 'Sites';
 $wb['top_menu_dns'] = 'DNS';
@@ -70,18 +70,18 @@ $wb['datepicker_nextText'] = 'Suivant';
 $wb['datepicker_prevText'] = 'Précédent';
 $wb['logout_txt'] = 'Se déconnecter';
 $wb['conf_format_dateshort_human_readable'] = 'dd-mm-yyyy';
-$wb['submit_confirmation'] = 'Voulez-vous vraiment effectuer cette action ?';
+$wb['submit_confirmation'] = 'Voulez-vous vraiment effectuer cette action ?';
 $wb['top_menu_mailuser'] = 'Mailuser';
 $wb['globalsearch_resultslimit_of_txt'] = 'de';
 $wb['globalsearch_resultslimit_results_txt'] = 'resultats';
-$wb['globalsearch_noresults_text_txt'] = 'Aucun resultat.';
-$wb['globalsearch_noresults_limit_txt'] = '0 resultat';
+$wb['globalsearch_noresults_text_txt'] = 'Aucun résultat.';
+$wb['globalsearch_noresults_limit_txt'] = '0 résultat.';
 $wb['globalsearch_searchfield_watermark_txt'] = 'Rechercher';
 $wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
 $wb['global_tabchange_warning_txt'] = 'Les données seront modifiées si vous cliquez sur OK. Cliquez sur annuler pour ne rien modifier.';
 $wb['global_tabchange_discard_txt'] = 'Vous avez des données modifiées non enregistrées dans cet onglet. Les modifications seront perdues si vous continuez.';
-$wb['datalog_changes_txt'] = 'Les modifications n\'ont pas encore été appliquées à tous les serveurs:';
-$wb['datalog_changes_end_txt'] = 'Les mises à jour peuvent prendre jusqu\'à 1 minute. Merci de patienter.';
+$wb['datalog_changes_txt'] = 'Les modifications n’ont pas encore été appliquées à tous les serveurs :';
+$wb['datalog_changes_end_txt'] = 'Les mises à jour peuvent prendre jusqu’à 1 minute. Merci de patienter.';
 $wb['datalog_status_i_web_database'] = 'Créer une nouvelle base de données';
 $wb['datalog_status_u_web_database'] = 'Modifier une base de données';
 $wb['datalog_status_d_web_database'] = 'Supprimer une base de données';
@@ -94,18 +94,18 @@ $wb['datalog_status_d_web_domain'] = 'Supprimer le site';
 $wb['datalog_status_i_ftp_user'] = 'Créer un utilisateur FTP';
 $wb['datalog_status_u_ftp_user'] = 'Modifier un utilisateur FTP';
 $wb['datalog_status_d_ftp_user'] = 'Supprimer un utilisateur FTP';
-$wb['datalog_status_i_mail_domain'] = 'Créer un domaine email';
-$wb['datalog_status_u_mail_domain'] = 'Modifier un domaine email';
-$wb['datalog_status_d_mail_domain'] = 'Supprimer un domaine email';
-$wb['datalog_status_i_mail_user'] = 'Créer un utilisateur email';
-$wb['datalog_status_u_mail_user'] = 'Modifier un utilisateur email';
-$wb['datalog_status_d_mail_user'] = 'Supprimer un utilisateur email';
+$wb['datalog_status_i_mail_domain'] = 'Créer un domaine e-mail';
+$wb['datalog_status_u_mail_domain'] = 'Modifier un domaine e-mail';
+$wb['datalog_status_d_mail_domain'] = 'Supprimer un domaine e-mail';
+$wb['datalog_status_i_mail_user'] = 'Créer un utilisateur e-mail';
+$wb['datalog_status_u_mail_user'] = 'Modifier un utilisateur e-mail';
+$wb['datalog_status_d_mail_user'] = 'Supprimer un utilisateur e-mail';
 $wb['datalog_status_i_spamfilter_users'] = 'Créer un filtre anti-spam';
 $wb['datalog_status_u_spamfilter_users'] = 'Modifier un filtre anti-spam';
 $wb['datalog_status_d_spamfilter_users'] = 'Supprimer un filtre anti-spam';
-$wb['datalog_status_i_mail_forwarding'] = 'Créer une adresse email';
-$wb['datalog_status_u_mail_forwarding'] = 'Modifier une adresse email';
-$wb['datalog_status_d_mail_forwarding'] = 'Supprimer une adresse email';
+$wb['datalog_status_i_mail_forwarding'] = 'Créer une adresse e-mail';
+$wb['datalog_status_u_mail_forwarding'] = 'Modifier une adresse e-mail';
+$wb['datalog_status_d_mail_forwarding'] = 'Supprimer une adresse e-mail';
 $wb['datalog_status_i_dns_rr'] = 'Créer un enregistrement DNS';
 $wb['datalog_status_u_dns_rr'] = 'Modifier un enregistrement DNS';
 $wb['datalog_status_d_dns_rr'] = 'Supprimer un enregistrement DNS';
@@ -118,9 +118,9 @@ $wb['datalog_status_d_cron'] = 'Supprimer une tâche cron';
 $wb['datalog_status_i_mail_get'] = 'Créer un compte mail récupérateur';
 $wb['datalog_status_u_mail_get'] = 'Modifier un compte mail récupérateur';
 $wb['datalog_status_d_mail_get'] = 'Supprimer un compte mail récupérateur';
-$wb['datalog_status_i_mail_mailinglist'] = 'Créer une liste d\'envoi';
-$wb['datalog_status_u_mail_mailinglist'] = 'Modifier une liste d\'envoi';
-$wb['datalog_status_d_mail_mailinglist'] = 'Supprimer une liste d\'envoi';
+$wb['datalog_status_i_mail_mailinglist'] = 'Créer une liste d’envoi';
+$wb['datalog_status_u_mail_mailinglist'] = 'Modifier une liste d’envoi';
+$wb['datalog_status_d_mail_mailinglist'] = 'Supprimer une liste d’envoi';
 $wb['datalog_status_i_shell_user'] = 'Créer un utilisateur Shell';
 $wb['datalog_status_u_shell_user'] = 'Modifier un utilisateur Shell';
 $wb['datalog_status_d_shell_user'] = 'Supprimer un utilisateur Shell';
@@ -131,22 +131,23 @@ $wb['datalog_status_i_web_folder_user'] = 'Créer un utilisateur de dossier prot
 $wb['datalog_status_u_web_folder_user'] = 'Modifier un utilisateur de dossier protégé';
 $wb['datalog_status_d_web_folder_user'] = 'Supprimer un utilisateur de dossier protégé';
 $wb['login_as_txt'] = 'Connexion en tant que';
-$wb['no_domain_perm'] = 'Vous n\'avez pas de permission pour ce domaine.';
-$wb['no_destination_perm'] = 'Vous n\'avez pas de permission pour cette 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_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['no_domain_perm'] = 'Vous n’avez pas de permission pour ce domaine.';
+$wb['no_destination_perm'] = 'Vous n’avez pas de permission pour cette destination.';
+$wb['client_you_are_locked'] = 'Vous n’avez pas de permission pour modifier les paramètres.';
+$wb['gender_m_txt'] = 'Mr';
+$wb['gender_f_txt'] = 'Mme';
+$wb['client_cannot_be_deleted_because_of_billing_module_txt'] = 'Ce client à des dossiers en cours dans le module de facturation, par conséquent, il ne peut pas être supprimé.';
+$wb['yes_txt'] = 'Oui';
+$wb['no_txt'] = 'Non';
 $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['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
-$wb['security_check1_txt'] = 'Check for security permission:';
-$wb['security_check2_txt'] = 'failed.';
+$wb['strength_1'] = 'Faible';
+$wb['strength_2'] = 'Moyen';
+$wb['strength_3'] = 'Bon';
+$wb['strength_4'] = 'Fort';
+$wb['strength_5'] = 'Très fort';
+$wb['weak_password_txt'] = 'Le mot de passe choisi ne correspond pas aux éxigences de sécurité. Il doit être au moins contenir {chars} caractères de longueur et avoir une complexité de « {strength} ».';
+$wb['weak_password_length_txt'] = 'Le mot de passe choisi ne correspond pas aux éxigences de sécurité. Il doit être au moins contenir {chars} caractères de longueur.';
+$wb['security_check1_txt'] = 'Contrôle des permissions de sécurité :';
+$wb['security_check2_txt'] = 'échoué.';
+$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
 ?>
diff --git a/interface/lib/lang/hr.lng b/interface/lib/lang/hr.lng
index 8c62161f67..279cc2c5b9 100644
--- a/interface/lib/lang/hr.lng
+++ b/interface/lib/lang/hr.lng
@@ -149,6 +149,5 @@ $wb['weak_password_txt'] = 'Unešena šifra nije dobra. Mora biti dugačka barem
 $wb['weak_password_length_txt'] = 'Unešena šifra nije dobra. Mora biti dugačka barem {chars} znakova.';
 $wb['security_check1_txt'] = 'Provjerite sigurnosne dozvole:';
 $wb['security_check2_txt'] = 'greška.';
+$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
 ?>
-
-
diff --git a/interface/lib/lang/hu.lng b/interface/lib/lang/hu.lng
index f45820ae35..d9f65597f2 100644
--- a/interface/lib/lang/hu.lng
+++ b/interface/lib/lang/hu.lng
@@ -149,4 +149,5 @@ $wb['weak_password_txt'] = 'The chosen password does not match the security guid
 $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
 $wb['security_check1_txt'] = 'Check for security permission:';
 $wb['security_check2_txt'] = 'failed.';
+$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
 ?>
diff --git a/interface/lib/lang/id.lng b/interface/lib/lang/id.lng
index c5759c4ee2..7cc2239068 100644
--- a/interface/lib/lang/id.lng
+++ b/interface/lib/lang/id.lng
@@ -149,4 +149,5 @@ $wb['weak_password_txt'] = 'The chosen password does not match the security guid
 $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
 $wb['security_check1_txt'] = 'Check for security permission:';
 $wb['security_check2_txt'] = 'failed.';
+$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
 ?>
diff --git a/interface/lib/lang/it.lng b/interface/lib/lang/it.lng
index f6c5c2d34a..6f66629267 100644
--- a/interface/lib/lang/it.lng
+++ b/interface/lib/lang/it.lng
@@ -24,7 +24,7 @@ $wb['toolsarea_head_txt'] = 'Strumenti';
 $wb['page_and_txt'] = 'e';
 $wb['top_menu_system'] = 'Sistema';
 $wb['top_menu_client'] = 'Clienti';
-$wb['top_menu_email'] = 'Email';
+$wb['top_menu_email'] = 'Posta';
 $wb['top_menu_monitor'] = 'Monitor';
 $wb['top_menu_sites'] = 'Siti';
 $wb['top_menu_dns'] = 'DNS';
@@ -34,119 +34,120 @@ $wb['top_menu_billing'] = 'Fatture';
 $wb['top_menu_domain'] = 'Domini';
 $wb['top_menu_dashboard'] = 'Home';
 $wb['latest_news_txt'] = 'Ultime notizie';
-$wb['error_301'] = 'Module not permitted for the current user.';
-$wb['error_302'] = 'Module invalid.';
-$wb['error_1001'] = 'The username and password cannot be empty !';
-$wb['error_1002'] = 'The username and/or password are not correct !';
-$wb['error_1003'] = 'The username is deactivated!';
+$wb['error_301'] = 'Modulo non permesso per attuale utente.';
+$wb['error_302'] = 'Module non valido.';
+$wb['error_1001'] = 'Nome Utente e Password non possono essere vuoti!';
+$wb['error_1002'] = 'Nome Utente e/o Password errati!';
+$wb['error_1003'] = 'Nome Utente disattivato!';
 $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_fr'] = 'Fr';
+$wb['daynamesmin_su'] = 'Do';
+$wb['daynamesmin_mo'] = 'Lu';
+$wb['daynamesmin_tu'] = 'Ma';
+$wb['daynamesmin_we'] = 'Me';
+$wb['daynamesmin_th'] = 'Gi';
+$wb['daynamesmin_fr'] = 'Ve';
 $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['monthnamesshort_jan'] = 'Jan';
+$wb['daynames_sunday'] = 'Domenica';
+$wb['daynames_monday'] = 'Lunedì';
+$wb['daynames_tuesday'] = 'Martedì';
+$wb['daynames_wednesday'] = 'Mercoledì';
+$wb['daynames_thursday'] = 'Giovedì';
+$wb['daynames_friday'] = 'Venerdì';
+$wb['daynames_saturday'] = 'Sabato';
+$wb['monthnamesshort_jan'] = 'Gen';
 $wb['monthnamesshort_feb'] = 'Feb';
 $wb['monthnamesshort_mar'] = 'Mar';
 $wb['monthnamesshort_apr'] = 'Apr';
-$wb['monthnamesshort_may'] = 'May';
-$wb['monthnamesshort_jun'] = 'Jun';
-$wb['monthnamesshort_jul'] = 'Jul';
-$wb['monthnamesshort_aug'] = 'Aug';
-$wb['monthnamesshort_sep'] = 'Sep';
-$wb['monthnamesshort_oct'] = 'Oct';
+$wb['monthnamesshort_may'] = 'Mag';
+$wb['monthnamesshort_jun'] = 'Giu';
+$wb['monthnamesshort_jul'] = 'Lug';
+$wb['monthnamesshort_aug'] = 'Ago';
+$wb['monthnamesshort_sep'] = 'Set';
+$wb['monthnamesshort_oct'] = 'Ott';
 $wb['monthnamesshort_nov'] = 'Nov';
-$wb['monthnamesshort_dec'] = 'Dec';
-$wb['datepicker_nextText'] = 'Next';
-$wb['datepicker_prevText'] = 'Prev';
-$wb['logout_txt'] = 'Logout';
+$wb['monthnamesshort_dec'] = 'Dic';
+$wb['datepicker_nextText'] = 'Prossimo';
+$wb['datepicker_prevText'] = 'Precedente';
+$wb['logout_txt'] = 'Disconnetti';
 $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'] = 'Sei sicuro di voler compiere questa operazione?';
+$wb['top_menu_mailuser'] = 'Utente Mail';
+$wb['globalsearch_resultslimit_of_txt'] = 'di';
+$wb['globalsearch_resultslimit_results_txt'] = 'risultati';
+$wb['globalsearch_noresults_text_txt'] = 'Nessun risultato.';
+$wb['globalsearch_noresults_limit_txt'] = '0 risultato';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Cerca';
+$wb['globalsearch_suggestions_text_txt'] = 'Suggerimenti';
+$wb['global_tabchange_discard_txt'] = 'Hai delle modifiche non salvate in questo tab. Se prosegui verranno annullate.';
+$wb['datalog_changes_txt'] = 'Le seguenti modifiche non sono state ancora propagate ai server:';
+$wb['datalog_changes_end_txt'] = 'Eseguire le modifiche richieste può durare alcuni minuti. Per cortesia attendere.';
+$wb['datalog_status_i_web_database'] = 'Crea un nuovo database';
+$wb['datalog_status_u_web_database'] = 'Aggiorna database';
+$wb['datalog_status_d_web_database'] = 'Elimina database';
+$wb['datalog_status_i_web_database_user'] = 'Crea un utente database per il database';
+$wb['datalog_status_u_web_database_user'] = 'Aggiorna utente database';
+$wb['datalog_status_d_web_database_user'] = 'Elimina utente database';
+$wb['datalog_status_i_web_domain'] = 'Crea un nuovo sito';
+$wb['datalog_status_u_web_domain'] = 'Aggiorna impostazioni sito';
+$wb['datalog_status_d_web_domain'] = 'Elimina sito';
+$wb['datalog_status_i_ftp_user'] = 'Crea utente FTP';
+$wb['datalog_status_u_ftp_user'] = 'Aggiorna utente FTP';
+$wb['datalog_status_d_ftp_user'] = 'Elimina utente FTP';
+$wb['datalog_status_i_mail_domain'] = 'Crea dominio email';
+$wb['datalog_status_u_mail_domain'] = 'Aggiorna dominio email';
+$wb['datalog_status_d_mail_domain'] = 'Elimina dominio email';
+$wb['datalog_status_i_mail_user'] = 'Crea utente email';
+$wb['datalog_status_u_mail_user'] = 'Aggorna utente email';
+$wb['datalog_status_d_mail_user'] = 'Elimina utente email';
+$wb['datalog_status_i_mail_forwarding'] = 'Crea indirizzo email';
+$wb['datalog_status_u_mail_forwarding'] = 'Aggiorna indirizzo email';
+$wb['datalog_status_d_mail_forwarding'] = 'Elimina indirizzo email';
+$wb['datalog_status_i_dns_rr'] = 'Crea record DNS';
+$wb['datalog_status_u_dns_rr'] = 'Aggiorna record DNS';
+$wb['datalog_status_d_dns_rr'] = 'Elimina record DNS';
+$wb['datalog_status_i_dns_soa'] = 'Crea zona DNS';
+$wb['datalog_status_u_dns_soa'] = 'Aggiorna zona DNS';
+$wb['datalog_status_d_dns_soa'] = 'Elimina DNS zone';
+$wb['datalog_status_i_cron'] = 'Crea  cron job';
+$wb['datalog_status_u_cron'] = 'Aggiorna   cron job';
+$wb['datalog_status_d_cron'] = 'Elimina cron job';
+$wb['datalog_status_i_mail_mailinglist'] = 'Crea  mailing list';
+$wb['datalog_status_u_mail_mailinglist'] = 'Aggiorna   mailing list';
+$wb['datalog_status_d_mail_mailinglist'] = 'Elimina mailing list';
+$wb['datalog_status_i_shell_user'] = 'Crea  utente shell';
+$wb['datalog_status_u_shell_user'] = 'Aggiorna   utente shell';
+$wb['datalog_status_d_shell_user'] = 'Elimina utente shell';
+$wb['datalog_status_i_web_folder'] = 'Crea protezione cartella';
+$wb['datalog_status_u_web_folder'] = 'Aggiorna protezione cartella';
+$wb['datalog_status_d_web_folder'] = 'Elimina protezione cartella';
+$wb['datalog_status_i_spamfilter_users'] = 'Crea  impostazioni filtro spam';
+$wb['datalog_status_u_spamfilter_users'] = 'Aggiorna   impostazioni filtro spam';
+$wb['datalog_status_d_spamfilter_users'] = 'Elimina impostazioni filtro spam';
+$wb['login_as_txt'] = 'Accedi come';
+$wb['no_domain_perm'] = 'Non hai i diritti per  questo domino.';
+$wb['no_destination_perm'] = 'Non hai i diritti per  questa destinazione.';
+$wb['client_you_are_locked'] = 'Non hai i diritti per modificare  alcuna impostazione.';
+$wb['gender_m_txt'] = 'Sig.';
+$wb['gender_f_txt'] = 'Sig.ra';
+$wb['client_cannot_be_deleted_because_of_billing_module_txt'] = 'Questo cliente ha dei record nel modulo fatturazione, per questo non puo essere modificato.';
+$wb['yes_txt'] = 'Si';
+$wb['no_txt'] = 'No';
+$wb['None'] = 'Nessuno';
+$wb['strength_1'] = 'Debole';
+$wb['strength_2'] = 'Mediocre';
+$wb['strength_3'] = 'Buono';
+$wb['strength_4'] = 'Forte';
+$wb['strength_5'] = 'Molto forte';
+$wb['weak_password_txt'] = 'La password indicata non segue le impostazioni di sicurezza. Deve essere lunga almeno  {chars} caratteri ed avere un livello di sicurezza pari a \\"{strength}\\".';
+$wb['weak_password_length_txt'] = 'La password indicata non segue le impostazioni di sicurezza. Deve essere lunga almeno  {chars} caratteri.';
+$wb['security_check1_txt'] = 'Verifica permessi di sicurezza:';
+$wb['security_check2_txt'] = 'fallito.';
 $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_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['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_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['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
-$wb['security_check1_txt'] = 'Check for security permission:';
-$wb['security_check2_txt'] = 'failed.';
+$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
 ?>
diff --git a/interface/lib/lang/ja.lng b/interface/lib/lang/ja.lng
index 0781f39a94..29d616bcd9 100644
--- a/interface/lib/lang/ja.lng
+++ b/interface/lib/lang/ja.lng
@@ -149,4 +149,5 @@ $wb['weak_password_txt'] = 'The chosen password does not match the security guid
 $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
 $wb['security_check1_txt'] = 'Check for security permission:';
 $wb['security_check2_txt'] = 'failed.';
+$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
 ?>
diff --git a/interface/lib/lang/nl.lng b/interface/lib/lang/nl.lng
index 1fe07082d6..86ab8b7e78 100644
--- a/interface/lib/lang/nl.lng
+++ b/interface/lib/lang/nl.lng
@@ -149,4 +149,5 @@ $wb['weak_password_txt'] = 'The chosen password does not match the security guid
 $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
 $wb['security_check1_txt'] = 'Check for security permission:';
 $wb['security_check2_txt'] = 'failed.';
+$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
 ?>
diff --git a/interface/lib/lang/pl.lng b/interface/lib/lang/pl.lng
index 559302eb29..f4d3445bd2 100644
--- a/interface/lib/lang/pl.lng
+++ b/interface/lib/lang/pl.lng
@@ -149,4 +149,5 @@ $wb['weak_password_txt'] = 'The chosen password does not match the security guid
 $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
 $wb['security_check1_txt'] = 'Check for security permission:';
 $wb['security_check2_txt'] = 'failed.';
+$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
 ?>
diff --git a/interface/lib/lang/pt.lng b/interface/lib/lang/pt.lng
index 14e6d16d48..af2fcf80ac 100644
--- a/interface/lib/lang/pt.lng
+++ b/interface/lib/lang/pt.lng
@@ -149,4 +149,5 @@ $wb['weak_password_txt'] = 'The chosen password does not match the security guid
 $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
 $wb['security_check1_txt'] = 'Check for security permission:';
 $wb['security_check2_txt'] = 'failed.';
+$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
 ?>
diff --git a/interface/lib/lang/ro.lng b/interface/lib/lang/ro.lng
index 7ae78ba6c4..de171ec55d 100644
--- a/interface/lib/lang/ro.lng
+++ b/interface/lib/lang/ro.lng
@@ -149,4 +149,5 @@ $wb['weak_password_txt'] = 'The chosen password does not match the security guid
 $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
 $wb['security_check1_txt'] = 'Check for security permission:';
 $wb['security_check2_txt'] = 'failed.';
+$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
 ?>
diff --git a/interface/lib/lang/ru.lng b/interface/lib/lang/ru.lng
index 3fafcc570a..a2a25fa8b6 100644
--- a/interface/lib/lang/ru.lng
+++ b/interface/lib/lang/ru.lng
@@ -149,4 +149,5 @@ $wb['weak_password_txt'] = 'The chosen password does not match the security guid
 $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
 $wb['security_check1_txt'] = 'Check for security permission:';
 $wb['security_check2_txt'] = 'failed.';
+$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
 ?>
diff --git a/interface/lib/lang/se.lng b/interface/lib/lang/se.lng
index 535e04c623..aca5f3f13a 100644
--- a/interface/lib/lang/se.lng
+++ b/interface/lib/lang/se.lng
@@ -149,4 +149,5 @@ $wb['weak_password_txt'] = 'The chosen password does not match the security guid
 $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
 $wb['security_check1_txt'] = 'Check for security permission:';
 $wb['security_check2_txt'] = 'failed.';
+$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
 ?>
diff --git a/interface/lib/lang/sk.lng b/interface/lib/lang/sk.lng
index 5cd95401f3..a1aa5a3b27 100644
--- a/interface/lib/lang/sk.lng
+++ b/interface/lib/lang/sk.lng
@@ -149,4 +149,5 @@ $wb['weak_password_txt'] = 'The chosen password does not match the security guid
 $wb['weak_password_length_txt'] = 'The chosen password does not match the security guidelines. It has to be at least {chars} chars in length.';
 $wb['security_check1_txt'] = 'Check for security permission:';
 $wb['security_check2_txt'] = 'failed.';
+$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
 ?>
diff --git a/interface/lib/lang/tr.lng b/interface/lib/lang/tr.lng
index 9a2999e0a1..eb5d1a03d8 100644
--- a/interface/lib/lang/tr.lng
+++ b/interface/lib/lang/tr.lng
@@ -80,7 +80,6 @@ $wb['globalsearch_searchfield_watermark_txt'] = 'Arama';
 $wb['globalsearch_suggestions_text_txt'] = 'Öneriler';
 $wb['global_tabchange_warning_txt'] = 'Bu sekmedeki değişiklikler Tamam düğmesine tıklandığında kaydedilir. İptal düğmesine tıklandığında yoksayılır.';
 $wb['global_tabchange_discard_txt'] = 'Bu sekmede kaydedilmemiş değişiklikler var. Devam ederseniz değişiklikler yoksayılacak.';
-
 $wb['datalog_changes_txt'] = 'Şu değişiklikler henüz tüm sunuculara dağıtılmadı:';
 $wb['datalog_changes_end_txt'] = 'Güncellemelerin kaydedilmesi bir dakika kadar sürecek. Lütfen bekleyin.';
 $wb['datalog_status_i_web_database'] = 'Veritabanı ekle';
@@ -147,7 +146,7 @@ $wb['strength_2'] = 'Yeterli';
 $wb['strength_3'] = 'İyi';
 $wb['strength_4'] = 'Güçlü';
 $wb['strength_5'] = 'Çok Güçlü';
-$wb['weak_password_txt'] = 'Yazdığınız parola güvenlik ilkesine uygun değil. Parola en az {chars} karakter uzunluğunda ve "{strength}" güçlüğünde olmalı.';
+$wb['weak_password_txt'] = 'Yazdığınız parola güvenlik ilkesine uygun değil. Parola en az {chars} karakter uzunluğunda ve \"{strength}\" güçlüğünde olmalı.';
 $wb['weak_password_length_txt'] = 'Yazdığınız parola güvenlik ilkesine uygun değil. Parola en az {chars} karakter uzunluğunda olmalı.';
 $wb['security_check1_txt'] = 'Güvenlik iznini denetle:';
 $wb['security_check2_txt'] = 'başarısız.';
diff --git a/interface/web/admin/lib/lang/ar.lng b/interface/web/admin/lib/lang/ar.lng
index 5c84d33bad..ca5ffcc8e7 100644
--- a/interface/web/admin/lib/lang/ar.lng
+++ b/interface/web/admin/lib/lang/ar.lng
@@ -47,4 +47,6 @@ $wb['Remote Actions'] = 'Remote Actions';
 $wb['Do OS-Update'] = 'Do OS-Update';
 $wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
 $wb['Directive Snippets'] = 'Directive Snippets';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
 ?>
diff --git a/interface/web/admin/lib/lang/ar_directive_snippets.lng b/interface/web/admin/lib/lang/ar_directive_snippets.lng
index 0f09c12ee0..21387b31e5 100644
--- a/interface/web/admin/lib/lang/ar_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/ar_directive_snippets.lng
@@ -7,4 +7,5 @@ $wb['active_txt'] = 'Active';
 $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
 $wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
 $wb['variables_txt'] = 'Variables';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/ar_directive_snippets_list.lng b/interface/web/admin/lib/lang/ar_directive_snippets_list.lng
index 4124ea3464..8e189f9f79 100644
--- a/interface/web/admin/lib/lang/ar_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/ar_directive_snippets_list.lng
@@ -4,4 +4,5 @@ $wb['active_txt'] = 'Active';
 $wb['name_txt'] = 'Name of Snippet';
 $wb['type_txt'] = 'Type';
 $wb['add_new_record_txt'] = 'Add Directive Snippet';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/ar_server.lng b/interface/web/admin/lib/lang/ar_server.lng
index 92b6449319..6b63109f98 100644
--- a/interface/web/admin/lib/lang/ar_server.lng
+++ b/interface/web/admin/lib/lang/ar_server.lng
@@ -12,4 +12,5 @@ $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['xmpp_server_txt'] = 'XMPP Server';
 ?>
diff --git a/interface/web/admin/lib/lang/ar_server_config.lng b/interface/web/admin/lib/lang/ar_server_config.lng
index 50000791bd..5660f37479 100644
--- a/interface/web/admin/lib/lang/ar_server_config.lng
+++ b/interface/web/admin/lib/lang/ar_server_config.lng
@@ -195,11 +195,11 @@ $wb['munin_user_txt'] = 'Munin User';
 $wb['munin_password_txt'] = 'Munin Password';
 $wb['munin_url_error_regex'] = 'Invalid Munin URL';
 $wb['munin_url_note_txt'] = 'Placeholder:';
-$wb["dkim_path_txt"] = 'DKIM Path';
+$wb['dkim_path_txt'] = 'DKIM Path';
 $wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
-$wb["v6_prefix_txt"] = 'IPv6 Prefix';
-$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
-$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
+$wb['v6_prefix_txt'] = 'IPv6 Prefix';
+$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
+$wb['v6_prefix_length'] = 'Prefix too long according to defined IPv6 ';
 $wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
 $wb['monitor_system_updates_txt'] = 'Check for Linux updates';
 $wb['hostname_error_regex'] = 'Invalid Hostname.';
@@ -254,6 +254,30 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
-$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
-$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
+$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
+$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
+$wb['do_not_try_rescue_mongodb_txt'] = 'Disable MongoDB monitoring';
+$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
+$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
+$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
+$wb['php_handler_txt'] = 'Default PHP Handler';
+$wb['disabled_txt'] = 'Disabled';
+$wb['dkim_strength_txt'] = 'DKIM strength';
+$wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
+$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
+$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
+$wb['enable_spdy_txt'] = 'Makes SPDY available';
+$wb['web_settings_txt'] = 'Web Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+$wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
+$wb['xmpp_bosh_max_inactivity_txt'] = 'Max. BOSH inactivity time';
+$wb['xmpp_bosh_timeout_range_wrong'] = 'Please enter a bosh timeout range between 15 - 360';
+$wb['xmpp_module_saslauth'] = 'saslauth';
+$wb['xmpp_server_admins_txt'] = 'Server Admins (JIDs)';
+$wb['xmpp_modules_enabled_txt'] = 'Serverwide enabled plugins (one per line)';
+$wb['xmpp_ports_txt'] = 'Component ports';
+$wb['xmpp_port_http_txt'] = 'HTTP';
+$wb['xmpp_port_https_txt'] = 'HTTPS';
+$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
+$wb['xmpp_port_bosh_txt'] = 'BOSH';
 ?>
diff --git a/interface/web/admin/lib/lang/ar_server_ip_map.lng b/interface/web/admin/lib/lang/ar_server_ip_map.lng
index 94508abb79..68b196fb23 100644
--- a/interface/web/admin/lib/lang/ar_server_ip_map.lng
+++ b/interface/web/admin/lib/lang/ar_server_ip_map.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["server_id_txt"] = 'Rewrite on Server';
-$wb["source_txt"] = 'Source IP';
-$wb["destination_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
-$wb["ip_error_wrong"] = 'The Destination IP address is invalid';
-$wb["destination_ip_empty"] = 'The Destination IP is empty.';
-$wb["source_ip_empty"] = 'The Source IP is empty.';
-$wb["server_empty_error"] = 'The Server is empty.';
-$wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb['server_id_txt'] = 'Rewrite on Server';
+$wb['source_txt'] = 'Source IP';
+$wb['destination_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
+$wb['ip_error_wrong'] = 'The Destination IP address is invalid';
+$wb['destination_ip_empty'] = 'The Destination IP is empty.';
+$wb['source_ip_empty'] = 'The Source IP is empty.';
+$wb['server_empty_error'] = 'The Server is empty.';
+$wb['duplicate_mapping_error'] = 'Mapping already exists.';
+$wb['ip_mapping_error'] = 'Source IP can not be an IP of the Rewrite-Server';
 ?>
diff --git a/interface/web/admin/lib/lang/ar_server_ip_map_list.lng b/interface/web/admin/lib/lang/ar_server_ip_map_list.lng
index 60c6815fda..1fedc10b2e 100644
--- a/interface/web/admin/lib/lang/ar_server_ip_map_list.lng
+++ b/interface/web/admin/lib/lang/ar_server_ip_map_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'IP Mappings';
-$wb["server_id_txt"] = 'Server';
-$wb["source_ip_txt"] = 'Source IP';
-$wb["destination_ip_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
+$wb['list_head_txt'] = 'IP Mappings';
+$wb['server_id_txt'] = 'Server';
+$wb['source_ip_txt'] = 'Source IP';
+$wb['destination_ip_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
 ?>
diff --git a/interface/web/admin/lib/lang/ar_server_list.lng b/interface/web/admin/lib/lang/ar_server_list.lng
index 40cc28e5bf..81b6a00a2e 100644
--- a/interface/web/admin/lib/lang/ar_server_list.lng
+++ b/interface/web/admin/lib/lang/ar_server_list.lng
@@ -10,4 +10,5 @@ $wb['vserver_server_txt'] = 'VServer';
 $wb['add_new_record_txt'] = 'Add new Server';
 $wb['proxy_server_txt'] = 'Proxy';
 $wb['firewall_server_txt'] = 'Firewall';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>
diff --git a/interface/web/admin/lib/lang/ar_system_config.lng b/interface/web/admin/lib/lang/ar_system_config.lng
index 6d3989647d..45fb0fa9e9 100644
--- a/interface/web/admin/lib/lang/ar_system_config.lng
+++ b/interface/web/admin/lib/lang/ar_system_config.lng
@@ -71,9 +71,14 @@ $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["company_name_txt"] = "Company Name for the page title";
-$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
-$wb["custom_login_text_txt"] = "Custom Text on Login-Page";
-$wb["custom_login_link_txt"] = "Custom Link on Login-Page";
-$wb["login_link_error_regex"] = "Invalid Link for Custom Login";
+$wb['company_name_txt'] = 'Company Name for the page title';
+$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
+$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
+$wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
+$wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
 ?>
diff --git a/interface/web/admin/lib/lang/ar_users.lng b/interface/web/admin/lib/lang/ar_users.lng
index 2fc65095d4..93988a0911 100644
--- a/interface/web/admin/lib/lang/ar_users.lng
+++ b/interface/web/admin/lib/lang/ar_users.lng
@@ -31,4 +31,5 @@ $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['lost_password_function_txt'] = 'Forgot password function is available';
 ?>
diff --git a/interface/web/admin/lib/lang/bg.lng b/interface/web/admin/lib/lang/bg.lng
index c4b3ef634b..9d90e56583 100644
--- a/interface/web/admin/lib/lang/bg.lng
+++ b/interface/web/admin/lib/lang/bg.lng
@@ -47,4 +47,6 @@ $wb['Interface'] = 'Interface';
 $wb['Domains'] = 'Domains';
 $wb['Misc'] = 'Misc';
 $wb['Directive Snippets'] = 'Directive Snippets';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
 ?>
diff --git a/interface/web/admin/lib/lang/bg_directive_snippets.lng b/interface/web/admin/lib/lang/bg_directive_snippets.lng
index 0f09c12ee0..21387b31e5 100644
--- a/interface/web/admin/lib/lang/bg_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/bg_directive_snippets.lng
@@ -7,4 +7,5 @@ $wb['active_txt'] = 'Active';
 $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
 $wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
 $wb['variables_txt'] = 'Variables';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/bg_directive_snippets_list.lng b/interface/web/admin/lib/lang/bg_directive_snippets_list.lng
index 4124ea3464..8e189f9f79 100644
--- a/interface/web/admin/lib/lang/bg_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/bg_directive_snippets_list.lng
@@ -4,4 +4,5 @@ $wb['active_txt'] = 'Active';
 $wb['name_txt'] = 'Name of Snippet';
 $wb['type_txt'] = 'Type';
 $wb['add_new_record_txt'] = 'Add Directive Snippet';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/bg_server.lng b/interface/web/admin/lib/lang/bg_server.lng
index b398384da7..448ec572b7 100644
--- a/interface/web/admin/lib/lang/bg_server.lng
+++ b/interface/web/admin/lib/lang/bg_server.lng
@@ -12,4 +12,5 @@ $wb['mirror_server_id_txt'] = 'Is mirror of Server';
 $wb['- None -'] = '- Нищо -';
 $wb['proxy_server_txt'] = 'Proxy-Server';
 $wb['firewall_server_txt'] = 'Firewall-Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
 ?>
diff --git a/interface/web/admin/lib/lang/bg_server_config.lng b/interface/web/admin/lib/lang/bg_server_config.lng
index 3d805a90d9..7f2901ab4d 100644
--- a/interface/web/admin/lib/lang/bg_server_config.lng
+++ b/interface/web/admin/lib/lang/bg_server_config.lng
@@ -195,11 +195,11 @@ $wb['munin_user_txt'] = 'Munin User';
 $wb['munin_password_txt'] = 'Munin Password';
 $wb['munin_url_error_regex'] = 'Invalid Munin URL';
 $wb['munin_url_note_txt'] = 'Placeholder:';
-$wb["dkim_path_txt"] = 'DKIM Path';
+$wb['dkim_path_txt'] = 'DKIM Path';
 $wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
-$wb["v6_prefix_txt"] = 'IPv6 Prefix';
-$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
-$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
+$wb['v6_prefix_txt'] = 'IPv6 Prefix';
+$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
+$wb['v6_prefix_length'] = 'Prefix too long according to defined IPv6 ';
 $wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
 $wb['monitor_system_updates_txt'] = 'Check for Linux updates';
 $wb['hostname_error_regex'] = 'Invalid Hostname.';
@@ -254,6 +254,30 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
-$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
-$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
+$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
+$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
+$wb['do_not_try_rescue_mongodb_txt'] = 'Disable MongoDB monitoring';
+$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
+$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
+$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
+$wb['php_handler_txt'] = 'Default PHP Handler';
+$wb['disabled_txt'] = 'Disabled';
+$wb['dkim_strength_txt'] = 'DKIM strength';
+$wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
+$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
+$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
+$wb['enable_spdy_txt'] = 'Makes SPDY available';
+$wb['web_settings_txt'] = 'Web Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+$wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
+$wb['xmpp_bosh_max_inactivity_txt'] = 'Max. BOSH inactivity time';
+$wb['xmpp_bosh_timeout_range_wrong'] = 'Please enter a bosh timeout range between 15 - 360';
+$wb['xmpp_module_saslauth'] = 'saslauth';
+$wb['xmpp_server_admins_txt'] = 'Server Admins (JIDs)';
+$wb['xmpp_modules_enabled_txt'] = 'Serverwide enabled plugins (one per line)';
+$wb['xmpp_ports_txt'] = 'Component ports';
+$wb['xmpp_port_http_txt'] = 'HTTP';
+$wb['xmpp_port_https_txt'] = 'HTTPS';
+$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
+$wb['xmpp_port_bosh_txt'] = 'BOSH';
 ?>
diff --git a/interface/web/admin/lib/lang/bg_server_ip_map.lng b/interface/web/admin/lib/lang/bg_server_ip_map.lng
index 94508abb79..68b196fb23 100644
--- a/interface/web/admin/lib/lang/bg_server_ip_map.lng
+++ b/interface/web/admin/lib/lang/bg_server_ip_map.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["server_id_txt"] = 'Rewrite on Server';
-$wb["source_txt"] = 'Source IP';
-$wb["destination_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
-$wb["ip_error_wrong"] = 'The Destination IP address is invalid';
-$wb["destination_ip_empty"] = 'The Destination IP is empty.';
-$wb["source_ip_empty"] = 'The Source IP is empty.';
-$wb["server_empty_error"] = 'The Server is empty.';
-$wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb['server_id_txt'] = 'Rewrite on Server';
+$wb['source_txt'] = 'Source IP';
+$wb['destination_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
+$wb['ip_error_wrong'] = 'The Destination IP address is invalid';
+$wb['destination_ip_empty'] = 'The Destination IP is empty.';
+$wb['source_ip_empty'] = 'The Source IP is empty.';
+$wb['server_empty_error'] = 'The Server is empty.';
+$wb['duplicate_mapping_error'] = 'Mapping already exists.';
+$wb['ip_mapping_error'] = 'Source IP can not be an IP of the Rewrite-Server';
 ?>
diff --git a/interface/web/admin/lib/lang/bg_server_ip_map_list.lng b/interface/web/admin/lib/lang/bg_server_ip_map_list.lng
index 60c6815fda..1fedc10b2e 100644
--- a/interface/web/admin/lib/lang/bg_server_ip_map_list.lng
+++ b/interface/web/admin/lib/lang/bg_server_ip_map_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'IP Mappings';
-$wb["server_id_txt"] = 'Server';
-$wb["source_ip_txt"] = 'Source IP';
-$wb["destination_ip_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
+$wb['list_head_txt'] = 'IP Mappings';
+$wb['server_id_txt'] = 'Server';
+$wb['source_ip_txt'] = 'Source IP';
+$wb['destination_ip_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
 ?>
diff --git a/interface/web/admin/lib/lang/bg_server_list.lng b/interface/web/admin/lib/lang/bg_server_list.lng
index a438458183..7cb195345b 100644
--- a/interface/web/admin/lib/lang/bg_server_list.lng
+++ b/interface/web/admin/lib/lang/bg_server_list.lng
@@ -10,4 +10,5 @@ $wb['vserver_server_txt'] = 'VСървър';
 $wb['add_new_record_txt'] = 'Добави нов сървър';
 $wb['proxy_server_txt'] = 'Прокси';
 $wb['firewall_server_txt'] = 'Защитна стена';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>
diff --git a/interface/web/admin/lib/lang/bg_system_config.lng b/interface/web/admin/lib/lang/bg_system_config.lng
index d1e3740cc2..2f4eb86d3c 100644
--- a/interface/web/admin/lib/lang/bg_system_config.lng
+++ b/interface/web/admin/lib/lang/bg_system_config.lng
@@ -71,9 +71,14 @@ $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["company_name_txt"] = "Company Name for the page title";
-$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
-$wb["custom_login_text_txt"] = "Custom Text on Login-Page";
-$wb["custom_login_link_txt"] = "Custom Link on Login-Page";
-$wb["login_link_error_regex"] = "Invalid Link for Custom Login";
+$wb['company_name_txt'] = 'Company Name for the page title';
+$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
+$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
+$wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
+$wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
 ?>
diff --git a/interface/web/admin/lib/lang/bg_users.lng b/interface/web/admin/lib/lang/bg_users.lng
index 2ccb7c1a7c..468e0ac218 100644
--- a/interface/web/admin/lib/lang/bg_users.lng
+++ b/interface/web/admin/lib/lang/bg_users.lng
@@ -31,4 +31,5 @@ $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['lost_password_function_txt'] = 'Forgot password function is available';
 ?>
diff --git a/interface/web/admin/lib/lang/br.lng b/interface/web/admin/lib/lang/br.lng
index 347855558a..c5c205304b 100644
--- a/interface/web/admin/lib/lang/br.lng
+++ b/interface/web/admin/lib/lang/br.lng
@@ -47,4 +47,6 @@ $wb['Remote Actions'] = 'Ações Remotas';
 $wb['Do OS-Update'] = 'Fazer Atualização do SO';
 $wb['Do ISPConfig-Update'] = 'Fazer Atualização do ISPConfig';
 $wb['Directive Snippets'] = 'Directive Snippets';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
 ?>
diff --git a/interface/web/admin/lib/lang/br_directive_snippets.lng b/interface/web/admin/lib/lang/br_directive_snippets.lng
index 0f09c12ee0..21387b31e5 100644
--- a/interface/web/admin/lib/lang/br_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/br_directive_snippets.lng
@@ -7,4 +7,5 @@ $wb['active_txt'] = 'Active';
 $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
 $wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
 $wb['variables_txt'] = 'Variables';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/br_directive_snippets_list.lng b/interface/web/admin/lib/lang/br_directive_snippets_list.lng
index 4124ea3464..8e189f9f79 100644
--- a/interface/web/admin/lib/lang/br_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/br_directive_snippets_list.lng
@@ -4,4 +4,5 @@ $wb['active_txt'] = 'Active';
 $wb['name_txt'] = 'Name of Snippet';
 $wb['type_txt'] = 'Type';
 $wb['add_new_record_txt'] = 'Add Directive Snippet';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/br_server.lng b/interface/web/admin/lib/lang/br_server.lng
index 405188679e..43e8334264 100644
--- a/interface/web/admin/lib/lang/br_server.lng
+++ b/interface/web/admin/lib/lang/br_server.lng
@@ -12,4 +12,5 @@ $wb['mirror_server_id_txt'] = 'É um espelho de servidor';
 $wb['- None -'] = '- Não -';
 $wb['proxy_server_txt'] = 'Proxy-Server';
 $wb['firewall_server_txt'] = 'Firewall-Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
 ?>
diff --git a/interface/web/admin/lib/lang/br_server_config.lng b/interface/web/admin/lib/lang/br_server_config.lng
index 212f9c0f53..7f8ecf922c 100644
--- a/interface/web/admin/lib/lang/br_server_config.lng
+++ b/interface/web/admin/lib/lang/br_server_config.lng
@@ -195,11 +195,11 @@ $wb['munin_user_txt'] = 'Munin User';
 $wb['munin_password_txt'] = 'Munin Password';
 $wb['munin_url_error_regex'] = 'Invalid Munin URL';
 $wb['munin_url_note_txt'] = 'Placeholder:';
-$wb["dkim_path_txt"] = 'DKIM Path';
+$wb['dkim_path_txt'] = 'DKIM Path';
 $wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
-$wb["v6_prefix_txt"] = 'IPv6 Prefix';
-$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
-$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
+$wb['v6_prefix_txt'] = 'IPv6 Prefix';
+$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
+$wb['v6_prefix_length'] = 'Prefix too long according to defined IPv6 ';
 $wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
 $wb['monitor_system_updates_txt'] = 'Check for Linux updates';
 $wb['hostname_error_regex'] = 'Invalid Hostname.';
@@ -254,6 +254,30 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
-$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
-$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
+$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
+$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
+$wb['do_not_try_rescue_mongodb_txt'] = 'Disable MongoDB monitoring';
+$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
+$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
+$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
+$wb['php_handler_txt'] = 'Default PHP Handler';
+$wb['disabled_txt'] = 'Disabled';
+$wb['dkim_strength_txt'] = 'DKIM strength';
+$wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
+$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
+$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
+$wb['enable_spdy_txt'] = 'Makes SPDY available';
+$wb['web_settings_txt'] = 'Web Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+$wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
+$wb['xmpp_bosh_max_inactivity_txt'] = 'Max. BOSH inactivity time';
+$wb['xmpp_bosh_timeout_range_wrong'] = 'Please enter a bosh timeout range between 15 - 360';
+$wb['xmpp_module_saslauth'] = 'saslauth';
+$wb['xmpp_server_admins_txt'] = 'Server Admins (JIDs)';
+$wb['xmpp_modules_enabled_txt'] = 'Serverwide enabled plugins (one per line)';
+$wb['xmpp_ports_txt'] = 'Component ports';
+$wb['xmpp_port_http_txt'] = 'HTTP';
+$wb['xmpp_port_https_txt'] = 'HTTPS';
+$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
+$wb['xmpp_port_bosh_txt'] = 'BOSH';
 ?>
diff --git a/interface/web/admin/lib/lang/br_server_ip_map.lng b/interface/web/admin/lib/lang/br_server_ip_map.lng
index 94508abb79..68b196fb23 100644
--- a/interface/web/admin/lib/lang/br_server_ip_map.lng
+++ b/interface/web/admin/lib/lang/br_server_ip_map.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["server_id_txt"] = 'Rewrite on Server';
-$wb["source_txt"] = 'Source IP';
-$wb["destination_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
-$wb["ip_error_wrong"] = 'The Destination IP address is invalid';
-$wb["destination_ip_empty"] = 'The Destination IP is empty.';
-$wb["source_ip_empty"] = 'The Source IP is empty.';
-$wb["server_empty_error"] = 'The Server is empty.';
-$wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb['server_id_txt'] = 'Rewrite on Server';
+$wb['source_txt'] = 'Source IP';
+$wb['destination_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
+$wb['ip_error_wrong'] = 'The Destination IP address is invalid';
+$wb['destination_ip_empty'] = 'The Destination IP is empty.';
+$wb['source_ip_empty'] = 'The Source IP is empty.';
+$wb['server_empty_error'] = 'The Server is empty.';
+$wb['duplicate_mapping_error'] = 'Mapping already exists.';
+$wb['ip_mapping_error'] = 'Source IP can not be an IP of the Rewrite-Server';
 ?>
diff --git a/interface/web/admin/lib/lang/br_server_ip_map_list.lng b/interface/web/admin/lib/lang/br_server_ip_map_list.lng
index 60c6815fda..1fedc10b2e 100644
--- a/interface/web/admin/lib/lang/br_server_ip_map_list.lng
+++ b/interface/web/admin/lib/lang/br_server_ip_map_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'IP Mappings';
-$wb["server_id_txt"] = 'Server';
-$wb["source_ip_txt"] = 'Source IP';
-$wb["destination_ip_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
+$wb['list_head_txt'] = 'IP Mappings';
+$wb['server_id_txt'] = 'Server';
+$wb['source_ip_txt'] = 'Source IP';
+$wb['destination_ip_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
 ?>
diff --git a/interface/web/admin/lib/lang/br_server_list.lng b/interface/web/admin/lib/lang/br_server_list.lng
index d34b88b040..c4fd078aa6 100644
--- a/interface/web/admin/lib/lang/br_server_list.lng
+++ b/interface/web/admin/lib/lang/br_server_list.lng
@@ -10,4 +10,5 @@ $wb['vserver_server_txt'] = 'VServer';
 $wb['add_new_record_txt'] = 'Adicionar novo Servidor';
 $wb['proxy_server_txt'] = 'Proxy';
 $wb['firewall_server_txt'] = 'Firewall';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>
diff --git a/interface/web/admin/lib/lang/br_system_config.lng b/interface/web/admin/lib/lang/br_system_config.lng
index 826c823375..556f696ccb 100644
--- a/interface/web/admin/lib/lang/br_system_config.lng
+++ b/interface/web/admin/lib/lang/br_system_config.lng
@@ -71,9 +71,14 @@ $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["company_name_txt"] = "Company Name for the page title";
-$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
-$wb["custom_login_text_txt"] = "Custom Text on Login-Page";
-$wb["custom_login_link_txt"] = "Custom Link on Login-Page";
-$wb["login_link_error_regex"] = "Invalid Link for Custom Login";
+$wb['company_name_txt'] = 'Company Name for the page title';
+$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
+$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
+$wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
+$wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
 ?>
diff --git a/interface/web/admin/lib/lang/br_users.lng b/interface/web/admin/lib/lang/br_users.lng
index ae36a32cc7..63e47b2915 100644
--- a/interface/web/admin/lib/lang/br_users.lng
+++ b/interface/web/admin/lib/lang/br_users.lng
@@ -31,4 +31,5 @@ $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['lost_password_function_txt'] = 'Forgot password function is available';
 ?>
diff --git a/interface/web/admin/lib/lang/cz.lng b/interface/web/admin/lib/lang/cz.lng
index aa0a7977d0..ffbeee79dd 100644
--- a/interface/web/admin/lib/lang/cz.lng
+++ b/interface/web/admin/lib/lang/cz.lng
@@ -47,6 +47,6 @@ $wb['Remote Actions'] = 'Vzdálené akce';
 $wb['Do OS-Update'] = 'Aktualizovat operační systém';
 $wb['Do ISPConfig-Update'] = 'Aktualizovat ISPConfig';
 $wb['Directive Snippets'] = 'Directive Snippets';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_directive_snippets.lng b/interface/web/admin/lib/lang/cz_directive_snippets.lng
index 71bd28e8b8..c77222a4fc 100644
--- a/interface/web/admin/lib/lang/cz_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/cz_directive_snippets.lng
@@ -7,6 +7,5 @@ $wb['active_txt'] = 'Aktivní';
 $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
 $wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
 $wb['variables_txt'] = 'Proměnné';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_directive_snippets_list.lng b/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
index cf1bb28c77..e31d707941 100644
--- a/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/cz_directive_snippets_list.lng
@@ -4,6 +4,5 @@ $wb['active_txt'] = 'Aktivní';
 $wb['name_txt'] = 'Name of Snippet';
 $wb['type_txt'] = 'Verze';
 $wb['add_new_record_txt'] = 'Add Directive Snippet';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_firewall.lng b/interface/web/admin/lib/lang/cz_firewall.lng
index df9386ae66..c6146ae93d 100644
--- a/interface/web/admin/lib/lang/cz_firewall.lng
+++ b/interface/web/admin/lib/lang/cz_firewall.lng
@@ -9,5 +9,3 @@ $wb['firewall_error_unique'] = 'Pro tento server již existuje záznam firewallu
 $wb['tcp_ports_error_regex'] = 'Znak není povole v definici TCP portu. Povolené symboly jsou čísla, : a ,.';
 $wb['udp_ports_error_regex'] = 'Znak není povole v definici UDP portu. Povolené symboly jsou čísla, : a ,.';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_firewall_list.lng b/interface/web/admin/lib/lang/cz_firewall_list.lng
index da1af438de..aecc4cf06a 100644
--- a/interface/web/admin/lib/lang/cz_firewall_list.lng
+++ b/interface/web/admin/lib/lang/cz_firewall_list.lng
@@ -6,5 +6,3 @@ $wb['tcp_port_txt'] = 'Otevřené TCP porty';
 $wb['udp_port_txt'] = 'Otevřené UDP porty';
 $wb['add_new_record_txt'] = 'Přidat záznam';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_groups.lng b/interface/web/admin/lib/lang/cz_groups.lng
index 0f1a6be926..a6281be247 100644
--- a/interface/web/admin/lib/lang/cz_groups.lng
+++ b/interface/web/admin/lib/lang/cz_groups.lng
@@ -3,5 +3,3 @@ $wb['description_txt'] = 'Popis';
 $wb['name_txt'] = 'Skupina';
 $wb['name_err'] = 'Skupina musí mít min. 1, max. 30 znaků.';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_groups_list.lng b/interface/web/admin/lib/lang/cz_groups_list.lng
index f285b382b9..c1d7ef9a8b 100644
--- a/interface/web/admin/lib/lang/cz_groups_list.lng
+++ b/interface/web/admin/lib/lang/cz_groups_list.lng
@@ -5,5 +5,3 @@ $wb['name_txt'] = 'Skupina';
 $wb['add_new_record_txt'] = 'Přidat skupinu';
 $wb['warning_txt'] = '<b>VAROVÁNÍ:</b> Zde neupravujte uživatelská nastavení. Užijte klientská a distributorská nastavení v klientském modulu. Úprava uživatelý nebo skupin zde může způsobit ztrátu dat!';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_iptables.lng b/interface/web/admin/lib/lang/cz_iptables.lng
index 6a57b7ce8e..a40fc0490f 100644
--- a/interface/web/admin/lib/lang/cz_iptables.lng
+++ b/interface/web/admin/lib/lang/cz_iptables.lng
@@ -11,5 +11,3 @@ $wb['source_ip_txt'] = 'Zdrojové adresy';
 $wb['active_txt'] = 'Aktivní';
 $wb['iptables_error_unique'] = 'Stejný záznam pro firewall je již na tomto serveru použit.';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_iptables_list.lng b/interface/web/admin/lib/lang/cz_iptables_list.lng
index 3dbc9061a5..65cef7507e 100644
--- a/interface/web/admin/lib/lang/cz_iptables_list.lng
+++ b/interface/web/admin/lib/lang/cz_iptables_list.lng
@@ -13,5 +13,3 @@ $wb['source_ip_txt'] = 'Zdrojové adresy';
 $wb['active_txt'] = 'Aktivní';
 $wb['iptables_error_unique'] = 'Stejný záznam pro firewall je již na tomto serveru použit.';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_language_add.lng b/interface/web/admin/lib/lang/cz_language_add.lng
index d95f12eb35..285dff2761 100644
--- a/interface/web/admin/lib/lang/cz_language_add.lng
+++ b/interface/web/admin/lib/lang/cz_language_add.lng
@@ -6,5 +6,3 @@ $wb['language_new_hint_txt'] = '2 znakové ISO 639-1 jazykové kódy (Viz: http:
 $wb['btn_save_txt'] = 'Vytvořit novou jazykovou sadu souborů';
 $wb['btn_cancel_txt'] = 'Zpět';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_language_complete.lng b/interface/web/admin/lib/lang/cz_language_complete.lng
index eb222b3bd0..f1e6f4924e 100644
--- a/interface/web/admin/lib/lang/cz_language_complete.lng
+++ b/interface/web/admin/lib/lang/cz_language_complete.lng
@@ -5,5 +5,3 @@ $wb['language_select_txt'] = 'Vybrat jazyk k doplnění';
 $wb['btn_save_txt'] = 'Sloučit / doplnit jazykový soubor';
 $wb['btn_cancel_txt'] = 'Zpět';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_language_edit.lng b/interface/web/admin/lib/lang/cz_language_edit.lng
index f880e6dbe7..2a71ed0a77 100644
--- a/interface/web/admin/lib/lang/cz_language_edit.lng
+++ b/interface/web/admin/lib/lang/cz_language_edit.lng
@@ -6,5 +6,3 @@ $wb['lang_file_txt'] = 'Jazykový soubor';
 $wb['btn_save_txt'] = 'Uložit';
 $wb['btn_cancel_txt'] = 'Zpět';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_language_export.lng b/interface/web/admin/lib/lang/cz_language_export.lng
index 7ffdccf522..7998eea017 100644
--- a/interface/web/admin/lib/lang/cz_language_export.lng
+++ b/interface/web/admin/lib/lang/cz_language_export.lng
@@ -4,5 +4,3 @@ $wb['language_select_txt'] = 'Vybrat jazykovou sadu';
 $wb['btn_save_txt'] = 'Uložit vybranou jazykovou sadu do souboru';
 $wb['btn_cancel_txt'] = 'Zpět';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_language_import.lng b/interface/web/admin/lib/lang/cz_language_import.lng
index 5aaad61b70..e4e8877325 100644
--- a/interface/web/admin/lib/lang/cz_language_import.lng
+++ b/interface/web/admin/lib/lang/cz_language_import.lng
@@ -7,5 +7,3 @@ $wb['btn_cancel_txt'] = 'Zpět';
 $wb['ignore_version_txt'] = 'Přeskočit kontrolu verze ISPConfigu.';
 $wb['list_desc_txt'] = 'VAROVÁNÍ: Nepoužívejte import souborů jazyku z nedůvěryhodných zdrojů.';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_language_list.lng b/interface/web/admin/lib/lang/cz_language_list.lng
index 77810e0a75..b2a7863715 100644
--- a/interface/web/admin/lib/lang/cz_language_list.lng
+++ b/interface/web/admin/lib/lang/cz_language_list.lng
@@ -5,5 +5,3 @@ $wb['module_txt'] = 'Modul';
 $wb['lang_file_txt'] = 'Jazykový soubor';
 $wb['lang_file_date_txt'] = 'Poslední úprava';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_package_install.lng b/interface/web/admin/lib/lang/cz_package_install.lng
index 9b767496c2..2bdc9df315 100644
--- a/interface/web/admin/lib/lang/cz_package_install.lng
+++ b/interface/web/admin/lib/lang/cz_package_install.lng
@@ -5,5 +5,3 @@ $wb['repo_username_txt'] = 'Uživatel (volitelné)';
 $wb['repo_password_txt'] = 'Heslo (volitelné)';
 $wb['active_txt'] = 'Aktivní';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_remote_action.lng b/interface/web/admin/lib/lang/cz_remote_action.lng
index 561db1e89c..e1908e2d04 100644
--- a/interface/web/admin/lib/lang/cz_remote_action.lng
+++ b/interface/web/admin/lib/lang/cz_remote_action.lng
@@ -10,5 +10,3 @@ $wb['select_all_server'] = 'Všechny servery';
 $wb['ispconfig_update_title'] = 'ISPConfig pokyny k aktualizaci';
 $wb['ispconfig_update_text'] = 'Přihlaste se jako uživatel root na terminal (shell) serveru a proveďte příkaz<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />spustí se ISPConfig aktualizace.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Klikněte zde pro podrobnější informace o provedení aktualizace</a>';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_remote_user.lng b/interface/web/admin/lib/lang/cz_remote_user.lng
index a34b3d74de..17c4f05b56 100644
--- a/interface/web/admin/lib/lang/cz_remote_user.lng
+++ b/interface/web/admin/lib/lang/cz_remote_user.lng
@@ -45,5 +45,3 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
 $wb['password_mismatch_txt'] = 'Hesla se neshodují.';
 $wb['password_match_txt'] = 'Hesla se shodují.';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_remote_user_list.lng b/interface/web/admin/lib/lang/cz_remote_user_list.lng
index 1b40308735..66b64946e4 100644
--- a/interface/web/admin/lib/lang/cz_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/cz_remote_user_list.lng
@@ -5,5 +5,3 @@ $wb['add_new_record_txt'] = 'Přidat uživatele';
 $wb['parent_remote_userid_txt'] = 'ID';
 $wb['username_txt'] = 'Uživatel';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_server.lng b/interface/web/admin/lib/lang/cz_server.lng
index 9d44fd27c8..8b86caf76b 100644
--- a/interface/web/admin/lib/lang/cz_server.lng
+++ b/interface/web/admin/lib/lang/cz_server.lng
@@ -12,6 +12,5 @@ $wb['mirror_server_id_txt'] = 'Je zrcadlem serveru';
 $wb['- None -'] = '- Žádný -';
 $wb['proxy_server_txt'] = 'Proxy-Server';
 $wb['firewall_server_txt'] = 'Firewall-Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_server_config.lng b/interface/web/admin/lib/lang/cz_server_config.lng
index 0ff0b61e44..2a51eecde2 100644
--- a/interface/web/admin/lib/lang/cz_server_config.lng
+++ b/interface/web/admin/lib/lang/cz_server_config.lng
@@ -189,9 +189,8 @@ $wb['monit_url_txt'] = 'Monit URL';
 $wb['monit_user_txt'] = 'Monit uživatel';
 $wb['monit_password_txt'] = 'Monit heslo';
 $wb['monit_url_error_regex'] = 'Invalid Monit URL';
-$wb["dkim_path_txt"] = 'DKIM Path';
+$wb['dkim_path_txt'] = 'DKIM adresář pro klíče';
 $wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
-$wb['monit_url_note_txt'] = 'Placeholder:';
 $wb['monit_url_note_txt'] = 'Zástupný symbol';
 $wb['munin_url_txt'] = 'Munin URL';
 $wb['munin_user_txt'] = 'Munin uživatel';
@@ -252,10 +251,33 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
-$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
-$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
-$wb['dkim_path_txt'] = 'DKIM adresář pro klíče';
+$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
+$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
 $wb['dkim_strength_txt'] = 'DKIM síla klíče';
+$wb['do_not_try_rescue_mongodb_txt'] = 'Disable MongoDB monitoring';
+$wb['v6_prefix_txt'] = 'IPv6 Prefix';
+$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
+$wb['v6_prefix_length'] = 'Prefix too long according to defined IPv6 ';
+$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
+$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
+$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
+$wb['php_handler_txt'] = 'Default PHP Handler';
+$wb['disabled_txt'] = 'Disabled';
+$wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
+$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
+$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
+$wb['enable_spdy_txt'] = 'Makes SPDY available';
+$wb['web_settings_txt'] = 'Web Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+$wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
+$wb['xmpp_bosh_max_inactivity_txt'] = 'Max. BOSH inactivity time';
+$wb['xmpp_bosh_timeout_range_wrong'] = 'Please enter a bosh timeout range between 15 - 360';
+$wb['xmpp_module_saslauth'] = 'saslauth';
+$wb['xmpp_server_admins_txt'] = 'Server Admins (JIDs)';
+$wb['xmpp_modules_enabled_txt'] = 'Serverwide enabled plugins (one per line)';
+$wb['xmpp_ports_txt'] = 'Component ports';
+$wb['xmpp_port_http_txt'] = 'HTTP';
+$wb['xmpp_port_https_txt'] = 'HTTPS';
+$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
+$wb['xmpp_port_bosh_txt'] = 'BOSH';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_server_config_list.lng b/interface/web/admin/lib/lang/cz_server_config_list.lng
index 8589dbc9d1..2118c35357 100644
--- a/interface/web/admin/lib/lang/cz_server_config_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_config_list.lng
@@ -2,5 +2,3 @@
 $wb['list_head_txt'] = 'Konfigurace serveru';
 $wb['server_name_txt'] = 'Server';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_server_ip.lng b/interface/web/admin/lib/lang/cz_server_ip.lng
index a948939fe2..43a382a646 100644
--- a/interface/web/admin/lib/lang/cz_server_ip.lng
+++ b/interface/web/admin/lib/lang/cz_server_ip.lng
@@ -9,5 +9,3 @@ $wb['ip_type_txt'] = 'Verze';
 $wb['virtualhost_port_txt'] = 'HTTP Porty';
 $wb['error_port_syntax'] = 'Neplatné znaky ve volbě HTTP Portů. Prosím, zadejte pouze číselné hodnoty oddělené čárkami. Příklad: 80,443';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_server_ip_list.lng b/interface/web/admin/lib/lang/cz_server_ip_list.lng
index 2a47ca7591..93b0b77c9b 100644
--- a/interface/web/admin/lib/lang/cz_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_ip_list.lng
@@ -8,5 +8,3 @@ $wb['virtualhost_txt'] = 'HTTP Vhost';
 $wb['virtualhost_port_txt'] = 'HTTP Ports';
 $wb['ip_type_txt'] = 'Verze';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_server_ip_map.lng b/interface/web/admin/lib/lang/cz_server_ip_map.lng
index 94508abb79..68b196fb23 100644
--- a/interface/web/admin/lib/lang/cz_server_ip_map.lng
+++ b/interface/web/admin/lib/lang/cz_server_ip_map.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["server_id_txt"] = 'Rewrite on Server';
-$wb["source_txt"] = 'Source IP';
-$wb["destination_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
-$wb["ip_error_wrong"] = 'The Destination IP address is invalid';
-$wb["destination_ip_empty"] = 'The Destination IP is empty.';
-$wb["source_ip_empty"] = 'The Source IP is empty.';
-$wb["server_empty_error"] = 'The Server is empty.';
-$wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb['server_id_txt'] = 'Rewrite on Server';
+$wb['source_txt'] = 'Source IP';
+$wb['destination_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
+$wb['ip_error_wrong'] = 'The Destination IP address is invalid';
+$wb['destination_ip_empty'] = 'The Destination IP is empty.';
+$wb['source_ip_empty'] = 'The Source IP is empty.';
+$wb['server_empty_error'] = 'The Server is empty.';
+$wb['duplicate_mapping_error'] = 'Mapping already exists.';
+$wb['ip_mapping_error'] = 'Source IP can not be an IP of the Rewrite-Server';
 ?>
diff --git a/interface/web/admin/lib/lang/cz_server_ip_map_list.lng b/interface/web/admin/lib/lang/cz_server_ip_map_list.lng
index 60c6815fda..1fedc10b2e 100644
--- a/interface/web/admin/lib/lang/cz_server_ip_map_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_ip_map_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'IP Mappings';
-$wb["server_id_txt"] = 'Server';
-$wb["source_ip_txt"] = 'Source IP';
-$wb["destination_ip_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
+$wb['list_head_txt'] = 'IP Mappings';
+$wb['server_id_txt'] = 'Server';
+$wb['source_ip_txt'] = 'Source IP';
+$wb['destination_ip_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
 ?>
diff --git a/interface/web/admin/lib/lang/cz_server_list.lng b/interface/web/admin/lib/lang/cz_server_list.lng
index e7a2efd805..a4a88f37d6 100644
--- a/interface/web/admin/lib/lang/cz_server_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_list.lng
@@ -10,6 +10,5 @@ $wb['vserver_server_txt'] = 'VServer';
 $wb['add_new_record_txt'] = 'Přidat server';
 $wb['proxy_server_txt'] = 'Proxy';
 $wb['firewall_server_txt'] = 'Firewall';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_server_php.lng b/interface/web/admin/lib/lang/cz_server_php.lng
index 59cf3c7365..10aba05dd7 100644
--- a/interface/web/admin/lib/lang/cz_server_php.lng
+++ b/interface/web/admin/lib/lang/cz_server_php.lng
@@ -14,5 +14,3 @@ $wb['php_fpm_init_script_txt'] = 'Cesta k PHP-FPM init script';
 $wb['php_fpm_ini_dir_txt'] = 'Cesta k php.ini adresáři';
 $wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM pool adresáři';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_server_php_list.lng b/interface/web/admin/lib/lang/cz_server_php_list.lng
index e0b43a4a99..36b28fe411 100644
--- a/interface/web/admin/lib/lang/cz_server_php_list.lng
+++ b/interface/web/admin/lib/lang/cz_server_php_list.lng
@@ -5,5 +5,3 @@ $wb['add_new_record_txt'] = 'Přidat novou verzi PHP';
 $wb['client_id_txt'] = 'Klient';
 $wb['name_txt'] = 'Verze PHP';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_software_package.lng b/interface/web/admin/lib/lang/cz_software_package.lng
index 4fda4e6c0e..faffe38217 100644
--- a/interface/web/admin/lib/lang/cz_software_package.lng
+++ b/interface/web/admin/lib/lang/cz_software_package.lng
@@ -4,5 +4,3 @@ $wb['package_key_txt'] = 'Package Key';
 $wb['Software Package'] = 'Software Package';
 $wb['Modify software package details'] = 'Modify software package details';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_software_package_install.lng b/interface/web/admin/lib/lang/cz_software_package_install.lng
index 83440257f2..0d079ef6d3 100644
--- a/interface/web/admin/lib/lang/cz_software_package_install.lng
+++ b/interface/web/admin/lib/lang/cz_software_package_install.lng
@@ -4,5 +4,3 @@ $wb['install_key_txt'] = 'Enter install key';
 $wb['btn_save_txt'] = 'Spustit instalaci';
 $wb['btn_cancel_txt'] = 'Zrušit';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_software_package_list.lng b/interface/web/admin/lib/lang/cz_software_package_list.lng
index ef91e92812..6896a9feb4 100644
--- a/interface/web/admin/lib/lang/cz_software_package_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_package_list.lng
@@ -11,5 +11,3 @@ $wb['no_packages_txt'] = 'Žádné balíčky nejsou k dispozici';
 $wb['edit_txt'] = 'Upravit';
 $wb['delete_txt'] = 'Smazat';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_software_repo.lng b/interface/web/admin/lib/lang/cz_software_repo.lng
index add35d3ab2..bd7bc9d0f2 100644
--- a/interface/web/admin/lib/lang/cz_software_repo.lng
+++ b/interface/web/admin/lib/lang/cz_software_repo.lng
@@ -6,5 +6,3 @@ $wb['repo_password_txt'] = 'Heslo (volitelné)';
 $wb['active_txt'] = 'Aktivní';
 $wb['Software Repository which may contain addons or updates'] = 'Softwarové zdroje, které mohou obsahovat addony nebo aktualizace';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_software_repo_list.lng b/interface/web/admin/lib/lang/cz_software_repo_list.lng
index 4b7b217774..ca04f41dcf 100644
--- a/interface/web/admin/lib/lang/cz_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_repo_list.lng
@@ -4,5 +4,3 @@ $wb['active_txt'] = 'Aktivní';
 $wb['repo_name_txt'] = 'Název zdroje';
 $wb['repo_url_txt'] = 'URL';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_software_update_list.lng b/interface/web/admin/lib/lang/cz_software_update_list.lng
index 4e7d161bbe..c48ad8ce30 100644
--- a/interface/web/admin/lib/lang/cz_software_update_list.lng
+++ b/interface/web/admin/lib/lang/cz_software_update_list.lng
@@ -7,5 +7,3 @@ $wb['version_txt'] = 'Verze';
 $wb['action_txt'] = 'Akce';
 $wb['no_updates_txt'] = 'Žádné aktualizace nejsou k dispozici';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_system_config.lng b/interface/web/admin/lib/lang/cz_system_config.lng
index 403a3696aa..d77b3eddf1 100644
--- a/interface/web/admin/lib/lang/cz_system_config.lng
+++ b/interface/web/admin/lib/lang/cz_system_config.lng
@@ -71,11 +71,14 @@ $wb['session_allow_endless_txt'] = 'Povolit - zůstat přihlášen';
 $wb['No'] = 'Ne';
 $wb['min_password_length_txt'] = 'Minimální délka hesla';
 $wb['min_password_strength_txt'] = 'Minimální síla hesla';
-$wb["company_name_txt"] = "Company Name for the page title";
-$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
-$wb["custom_login_text_txt"] = "Custom Text on Login-Page";
-$wb["custom_login_link_txt"] = "Custom Link on Login-Page";
-$wb["login_link_error_regex"] = "Invalid Link for Custom Login";
+$wb['company_name_txt'] = 'Company Name for the page title';
+$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
+$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
+$wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
+$wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_tpl_default_admin.lng b/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
index edf66963d4..480d504421 100644
--- a/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/cz_tpl_default_admin.lng
@@ -16,5 +16,3 @@ $wb['php_fpm_init_script_txt'] = 'Cesta k PHP-FPM init script';
 $wb['php_fpm_ini_dir_txt'] = 'Cesta k php.ini adresáři';
 $wb['php_fpm_pool_dir_txt'] = 'Cesta k PHP-FPM pool adresáři';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_users.lng b/interface/web/admin/lib/lang/cz_users.lng
index d3b3fea218..160caaca50 100644
--- a/interface/web/admin/lib/lang/cz_users.lng
+++ b/interface/web/admin/lib/lang/cz_users.lng
@@ -31,6 +31,5 @@ $wb['password_mismatch_txt'] = 'Hesla se neshodují.';
 $wb['password_match_txt'] = 'Hesla se shodují.';
 $wb['username_error_collision'] = 'Uživatelské jméno nesmí být web nebo web a číslo.\\"';
 $wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin';
+$wb['lost_password_function_txt'] = 'Forgot password function is available';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/cz_users_list.lng b/interface/web/admin/lib/lang/cz_users_list.lng
index a4915a4ca0..e5a7d1e4de 100644
--- a/interface/web/admin/lib/lang/cz_users_list.lng
+++ b/interface/web/admin/lib/lang/cz_users_list.lng
@@ -7,5 +7,3 @@ $wb['add_new_record_txt'] = 'Přidat uživatele';
 $wb['warning_txt'] = '<b>VAROVÁNÍ:</b> Zde neupravujte uživatelská nastavení. Užijte klientská a distributorská nastavení v klientském modulu. Úprava uživatelů nebo skupin zde může způsobit ztrátu dat!';
 $wb['groups_txt'] = 'Skupiny';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/de.lng b/interface/web/admin/lib/lang/de.lng
index 0a7af75131..92b370b19a 100644
--- a/interface/web/admin/lib/lang/de.lng
+++ b/interface/web/admin/lib/lang/de.lng
@@ -47,4 +47,6 @@ $wb['Import'] = 'Importieren';
 $wb['Remote Actions'] = 'Wartung';
 $wb['Do OS-Update'] = 'Betriebssystem Update';
 $wb['Do ISPConfig-Update'] = 'ISPConfig Update';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
 ?>
diff --git a/interface/web/admin/lib/lang/de_server.lng b/interface/web/admin/lib/lang/de_server.lng
index 50f8090488..b32a67bdfc 100644
--- a/interface/web/admin/lib/lang/de_server.lng
+++ b/interface/web/admin/lib/lang/de_server.lng
@@ -12,4 +12,5 @@ $wb['mirror_server_id_txt'] = 'Ist Mirror von Server';
 $wb['- None -'] = '- Nichts ausgewählt -';
 $wb['proxy_server_txt'] = 'Proxy Server';
 $wb['firewall_server_txt'] = 'Firewall Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
 ?>
diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
index 13f7834655..36a26c81a8 100644
--- a/interface/web/admin/lib/lang/de_server_config.lng
+++ b/interface/web/admin/lib/lang/de_server_config.lng
@@ -200,12 +200,11 @@ $wb['munin_url_note_txt'] = 'Platzhalter:';
 $wb['backup_dir_is_mount_txt'] = 'Backupverzeichnis ist ein eigener Mount?';
 $wb['backup_dir_mount_cmd_txt'] = 'Mount-Befehl, falls Backupverzeichnis nicht gemountet';
 $wb['backup_delete_txt'] = 'Backups loeschen wenn eine Domain / Webseite geloescht wird';
-$wb["v6_prefix_txt"] = 'IPv6 Prefix';
-$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
-$wb["v6_prefix_length"] = 'Prefix zu lang fuer angegebene IPv6-Adresse ';
+$wb['v6_prefix_txt'] = 'IPv6 Prefix';
+$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
+$wb['v6_prefix_length'] = 'Prefix zu lang fuer angegebene IPv6-Adresse ';
 $wb['monitor_system_updates_txt'] = 'Suche nach Linux updates';
 $wb['dkim_strength_txt'] = 'DKIM Stärke';
-$wb['monitor_system_updates_txt'] = 'Suche nach Linux updates';
 $wb['hostname_error_regex'] = 'Invalid Hostname.';
 $wb['invalid_apache_user_txt'] = 'Invalid apache user.';
 $wb['invalid_apache_group_txt'] = 'Invalid apache group.';
@@ -265,6 +264,20 @@ $wb['php_ini_check_minutes_error_empty'] = 'Bitte geben Sie einen Wert an, wie o
 $wb['php_ini_check_minutes_info_txt'] = '0 = keine Prüfung';
 $wb['php_handler_txt'] = 'Standard-PHP-Handler';
 $wb['enable_spdy_txt'] = 'Stellt SPDY zur Verfügung';
-$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
-$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
+$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
+$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
+$wb['disabled_txt'] = 'Disabled';
+$wb['web_settings_txt'] = 'Web Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+$wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
+$wb['xmpp_bosh_max_inactivity_txt'] = 'Max. BOSH inactivity time';
+$wb['xmpp_bosh_timeout_range_wrong'] = 'Please enter a bosh timeout range between 15 - 360';
+$wb['xmpp_module_saslauth'] = 'saslauth';
+$wb['xmpp_server_admins_txt'] = 'Server Admins (JIDs)';
+$wb['xmpp_modules_enabled_txt'] = 'Serverwide enabled plugins (one per line)';
+$wb['xmpp_ports_txt'] = 'Component ports';
+$wb['xmpp_port_http_txt'] = 'HTTP';
+$wb['xmpp_port_https_txt'] = 'HTTPS';
+$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
+$wb['xmpp_port_bosh_txt'] = 'BOSH';
 ?>
diff --git a/interface/web/admin/lib/lang/de_server_ip_map.lng b/interface/web/admin/lib/lang/de_server_ip_map.lng
index 1e7ef599a5..4fdb51be1a 100644
--- a/interface/web/admin/lib/lang/de_server_ip_map.lng
+++ b/interface/web/admin/lib/lang/de_server_ip_map.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["server_id_txt"] = 'Rewrite auf Server';
-$wb["source_txt"] = 'eigentliche IP';
-$wb["destination_txt"] = 'neue IP';
-$wb["active_txt"] = 'Aktiv';
-$wb["ip_error_wrong"] = 'Die neue IP ist ungueltig';
-$wb["destination_ip_empty"] = 'Die neue IP ist leer.';
-$wb["source_ip_empty"] = 'Die eigentliche IP ist leer.';
-$wb["server_empty_error"] = 'Der Server ist leer.';
-$wb["duplicate_mapping_error"] = "Mapping existiert bereits.";
-$wb["ip_mapping_error"] = "Die eigentliche IP darf keine IP des Rewrite-Servers sein.";
+$wb['server_id_txt'] = 'Rewrite auf Server';
+$wb['source_txt'] = 'eigentliche IP';
+$wb['destination_txt'] = 'neue IP';
+$wb['active_txt'] = 'Aktiv';
+$wb['ip_error_wrong'] = 'Die neue IP ist ungueltig';
+$wb['destination_ip_empty'] = 'Die neue IP ist leer.';
+$wb['source_ip_empty'] = 'Die eigentliche IP ist leer.';
+$wb['server_empty_error'] = 'Der Server ist leer.';
+$wb['duplicate_mapping_error'] = 'Mapping existiert bereits.';
+$wb['ip_mapping_error'] = 'Die eigentliche IP darf keine IP des Rewrite-Servers sein.';
 ?>
diff --git a/interface/web/admin/lib/lang/de_server_ip_map_list.lng b/interface/web/admin/lib/lang/de_server_ip_map_list.lng
index 5524df9584..4cd9d1069d 100644
--- a/interface/web/admin/lib/lang/de_server_ip_map_list.lng
+++ b/interface/web/admin/lib/lang/de_server_ip_map_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'IP Mappings';
-$wb["server_id_txt"] = 'Server';
-$wb["source_ip_txt"] = 'eigentliche IP';
-$wb["destination_ip_txt"] = 'neue IP';
-$wb["active_txt"] = 'Aktiv';
+$wb['list_head_txt'] = 'IP Mappings';
+$wb['server_id_txt'] = 'Server';
+$wb['source_ip_txt'] = 'eigentliche IP';
+$wb['destination_ip_txt'] = 'neue IP';
+$wb['active_txt'] = 'Aktiv';
 ?>
diff --git a/interface/web/admin/lib/lang/de_server_list.lng b/interface/web/admin/lib/lang/de_server_list.lng
index e38a5db413..1345b0d9db 100644
--- a/interface/web/admin/lib/lang/de_server_list.lng
+++ b/interface/web/admin/lib/lang/de_server_list.lng
@@ -10,4 +10,5 @@ $wb['vserver_server_txt'] = 'vServer';
 $wb['add_new_record_txt'] = 'Neuen Server hinzufügen';
 $wb['proxy_server_txt'] = 'Proxyserver';
 $wb['firewall_server_txt'] = 'Firewallserver';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>
diff --git a/interface/web/admin/lib/lang/de_system_config.lng b/interface/web/admin/lib/lang/de_system_config.lng
index efc4954ed3..8620491ad4 100644
--- a/interface/web/admin/lib/lang/de_system_config.lng
+++ b/interface/web/admin/lib/lang/de_system_config.lng
@@ -72,8 +72,13 @@ $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';
-$wb["company_name_txt"] = "Firmenname fuer den Seitentitel";
-$wb["custom_login_text_txt"] = "Custom Text on Login-Page";
-$wb["custom_login_link_txt"] = "Custom Link on Login-Page";
-$wb["login_link_error_regex"] = "Invalid Link for Custom Login";
+$wb['company_name_txt'] = 'Firmenname fuer den Seitentitel';
+$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
+$wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
+$wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
 ?>
diff --git a/interface/web/admin/lib/lang/el.lng b/interface/web/admin/lib/lang/el.lng
index 010a5506df..0f26e0fbe9 100644
--- a/interface/web/admin/lib/lang/el.lng
+++ b/interface/web/admin/lib/lang/el.lng
@@ -47,4 +47,6 @@ $wb['Remote Actions'] = 'Απομακρυσμένες Ενέργειες';
 $wb['Do OS-Update'] = 'Αναβάθμιση λειτουργικού συστήματος';
 $wb['Do ISPConfig-Update'] = 'Αναβάθμιση ISPConfig';
 $wb['Directive Snippets'] = 'Directive Snippets';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
 ?>
diff --git a/interface/web/admin/lib/lang/el_directive_snippets.lng b/interface/web/admin/lib/lang/el_directive_snippets.lng
index 0f09c12ee0..21387b31e5 100644
--- a/interface/web/admin/lib/lang/el_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/el_directive_snippets.lng
@@ -7,4 +7,5 @@ $wb['active_txt'] = 'Active';
 $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
 $wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
 $wb['variables_txt'] = 'Variables';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/el_directive_snippets_list.lng b/interface/web/admin/lib/lang/el_directive_snippets_list.lng
index 4124ea3464..8e189f9f79 100644
--- a/interface/web/admin/lib/lang/el_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/el_directive_snippets_list.lng
@@ -4,4 +4,5 @@ $wb['active_txt'] = 'Active';
 $wb['name_txt'] = 'Name of Snippet';
 $wb['type_txt'] = 'Type';
 $wb['add_new_record_txt'] = 'Add Directive Snippet';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/el_server.lng b/interface/web/admin/lib/lang/el_server.lng
index 637ee62bd9..560765e15b 100644
--- a/interface/web/admin/lib/lang/el_server.lng
+++ b/interface/web/admin/lib/lang/el_server.lng
@@ -12,4 +12,5 @@ $wb['mirror_server_id_txt'] = 'Είναι mirror του Server';
 $wb['- None -'] = '- Κανενός -';
 $wb['proxy_server_txt'] = 'Proxy-Server';
 $wb['firewall_server_txt'] = 'Firewall-Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
 ?>
diff --git a/interface/web/admin/lib/lang/el_server_config.lng b/interface/web/admin/lib/lang/el_server_config.lng
index e672f60d76..815e31d5f4 100644
--- a/interface/web/admin/lib/lang/el_server_config.lng
+++ b/interface/web/admin/lib/lang/el_server_config.lng
@@ -249,6 +249,35 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
-$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
-$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
+$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
+$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
+$wb['dkim_path_txt'] = 'DKIM Path';
+$wb['do_not_try_rescue_mongodb_txt'] = 'Disable MongoDB monitoring';
+$wb['v6_prefix_txt'] = 'IPv6 Prefix';
+$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
+$wb['v6_prefix_length'] = 'Prefix too long according to defined IPv6 ';
+$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
+$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
+$wb['php_handler_txt'] = 'Default PHP Handler';
+$wb['disabled_txt'] = 'Disabled';
+$wb['dkim_strength_txt'] = 'DKIM strength';
+$wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
+$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
+$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
+$wb['enable_spdy_txt'] = 'Makes SPDY available';
+$wb['web_settings_txt'] = 'Web Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+$wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
+$wb['xmpp_bosh_max_inactivity_txt'] = 'Max. BOSH inactivity time';
+$wb['xmpp_bosh_timeout_range_wrong'] = 'Please enter a bosh timeout range between 15 - 360';
+$wb['xmpp_module_saslauth'] = 'saslauth';
+$wb['xmpp_server_admins_txt'] = 'Server Admins (JIDs)';
+$wb['xmpp_modules_enabled_txt'] = 'Serverwide enabled plugins (one per line)';
+$wb['xmpp_ports_txt'] = 'Component ports';
+$wb['xmpp_port_http_txt'] = 'HTTP';
+$wb['xmpp_port_https_txt'] = 'HTTPS';
+$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
+$wb['xmpp_port_bosh_txt'] = 'BOSH';
 ?>
diff --git a/interface/web/admin/lib/lang/el_server_ip_map.lng b/interface/web/admin/lib/lang/el_server_ip_map.lng
index 94508abb79..68b196fb23 100644
--- a/interface/web/admin/lib/lang/el_server_ip_map.lng
+++ b/interface/web/admin/lib/lang/el_server_ip_map.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["server_id_txt"] = 'Rewrite on Server';
-$wb["source_txt"] = 'Source IP';
-$wb["destination_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
-$wb["ip_error_wrong"] = 'The Destination IP address is invalid';
-$wb["destination_ip_empty"] = 'The Destination IP is empty.';
-$wb["source_ip_empty"] = 'The Source IP is empty.';
-$wb["server_empty_error"] = 'The Server is empty.';
-$wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb['server_id_txt'] = 'Rewrite on Server';
+$wb['source_txt'] = 'Source IP';
+$wb['destination_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
+$wb['ip_error_wrong'] = 'The Destination IP address is invalid';
+$wb['destination_ip_empty'] = 'The Destination IP is empty.';
+$wb['source_ip_empty'] = 'The Source IP is empty.';
+$wb['server_empty_error'] = 'The Server is empty.';
+$wb['duplicate_mapping_error'] = 'Mapping already exists.';
+$wb['ip_mapping_error'] = 'Source IP can not be an IP of the Rewrite-Server';
 ?>
diff --git a/interface/web/admin/lib/lang/el_server_ip_map_list.lng b/interface/web/admin/lib/lang/el_server_ip_map_list.lng
index 60c6815fda..1fedc10b2e 100644
--- a/interface/web/admin/lib/lang/el_server_ip_map_list.lng
+++ b/interface/web/admin/lib/lang/el_server_ip_map_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'IP Mappings';
-$wb["server_id_txt"] = 'Server';
-$wb["source_ip_txt"] = 'Source IP';
-$wb["destination_ip_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
+$wb['list_head_txt'] = 'IP Mappings';
+$wb['server_id_txt'] = 'Server';
+$wb['source_ip_txt'] = 'Source IP';
+$wb['destination_ip_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
 ?>
diff --git a/interface/web/admin/lib/lang/el_server_list.lng b/interface/web/admin/lib/lang/el_server_list.lng
index 4fd50ccdeb..2df67bafd7 100644
--- a/interface/web/admin/lib/lang/el_server_list.lng
+++ b/interface/web/admin/lib/lang/el_server_list.lng
@@ -10,4 +10,5 @@ $wb['vserver_server_txt'] = 'VServer';
 $wb['add_new_record_txt'] = 'Νέος Server';
 $wb['proxy_server_txt'] = 'Proxy';
 $wb['firewall_server_txt'] = 'Firewall';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>
diff --git a/interface/web/admin/lib/lang/el_system_config.lng b/interface/web/admin/lib/lang/el_system_config.lng
index 99e0bd2fce..4dadc1290b 100644
--- a/interface/web/admin/lib/lang/el_system_config.lng
+++ b/interface/web/admin/lib/lang/el_system_config.lng
@@ -71,9 +71,14 @@ $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["company_name_txt"] = "Company Name for the page title";
-$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
-$wb["custom_login_text_txt"] = "Custom Text on Login-Page";
-$wb["custom_login_link_txt"] = "Custom Link on Login-Page";
-$wb["login_link_error_regex"] = "Invalid Link for Custom Login";
+$wb['company_name_txt'] = 'Company Name for the page title';
+$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
+$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
+$wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
+$wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
 ?>
diff --git a/interface/web/admin/lib/lang/el_users.lng b/interface/web/admin/lib/lang/el_users.lng
index 3485981222..7351d6522a 100644
--- a/interface/web/admin/lib/lang/el_users.lng
+++ b/interface/web/admin/lib/lang/el_users.lng
@@ -31,4 +31,5 @@ $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['lost_password_function_txt'] = 'Forgot password function is available';
 ?>
diff --git a/interface/web/admin/lib/lang/es.lng b/interface/web/admin/lib/lang/es.lng
index 5bac1e0c61..c8d04e85e6 100644
--- a/interface/web/admin/lib/lang/es.lng
+++ b/interface/web/admin/lib/lang/es.lng
@@ -47,4 +47,6 @@ $wb['Do OS-Update'] = 'Actualizar el SO';
 $wb['Do ISPConfig-Update'] = 'Actualizar ISPConfig';
 $wb['1001'] = 'El nombre de usuario o contraseña están vacíos.';
 $wb['1002'] = 'El nombre de usuario o contraseña son incorrectos.';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
 ?>
diff --git a/interface/web/admin/lib/lang/es_directive_snippets.lng b/interface/web/admin/lib/lang/es_directive_snippets.lng
index fb51b49f85..b1ae6102e3 100644
--- a/interface/web/admin/lib/lang/es_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/es_directive_snippets.lng
@@ -7,4 +7,5 @@ $wb['active_txt'] = 'Habilitado';
 $wb['directive_snippets_name_empty'] = 'Por favor ingrese un nombre para el fragmento.';
 $wb['directive_snippets_name_error_unique'] = 'Ya existe un fragmento de código con ese nombre.';
 $wb['variables_txt'] = 'Variables';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/es_directive_snippets_list.lng b/interface/web/admin/lib/lang/es_directive_snippets_list.lng
index 9b8e759635..46addcc2c8 100644
--- a/interface/web/admin/lib/lang/es_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/es_directive_snippets_list.lng
@@ -4,4 +4,5 @@ $wb['active_txt'] = 'Habilitado';
 $wb['name_txt'] = 'Nombre del fragmento';
 $wb['type_txt'] = 'Tipo';
 $wb['add_new_record_txt'] = 'Añadir fragmentos de códigos';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/es_firewall.lng b/interface/web/admin/lib/lang/es_firewall.lng
index 8991c2e797..820e547e12 100644
--- a/interface/web/admin/lib/lang/es_firewall.lng
+++ b/interface/web/admin/lib/lang/es_firewall.lng
@@ -6,6 +6,6 @@ $wb['tcp_port_help_txt'] = 'Separados por coma';
 $wb['udp_port_help_txt'] = 'Separados por coma';
 $wb['active_txt'] = 'Habilitado';
 $wb['firewall_error_unique'] = 'Ya existe un registro de corta fuego para este servidor.';
-$wb['tcp_ports_error_regex'] = 'Caracteres no permitidos en la definición de puertos tcp. Los caracteres permitidos son números, \":\" y \",\".';
-$wb['udp_ports_error_regex'] = 'Caracteres no permitidos en la definición de puertos udp. Los caracteres permitidos son números, \":\" y \",\".';
+$wb['tcp_ports_error_regex'] = 'Caracteres no permitidos en la definición de puertos tcp. Los caracteres permitidos son números, \\":\\" y \\",\\".';
+$wb['udp_ports_error_regex'] = 'Caracteres no permitidos en la definición de puertos udp. Los caracteres permitidos son números, \\":\\" y \\",\\".';
 ?>
diff --git a/interface/web/admin/lib/lang/es_remote_user.lng b/interface/web/admin/lib/lang/es_remote_user.lng
index fb6a2a44d5..a733928cf7 100644
--- a/interface/web/admin/lib/lang/es_remote_user.lng
+++ b/interface/web/admin/lib/lang/es_remote_user.lng
@@ -2,13 +2,12 @@
 $wb['username_txt'] = 'Nombre de usuario:';
 $wb['password_txt'] = 'Contraseña:';
 $wb['function_txt'] = 'Funciones:';
-$wb['Mail mailing list functions'] = 'Funciones de listas de correo';
+$wb['Mail mailing list functions'] = 'Funciones de correo para listas de correo';
 $wb['username_error_unique'] = 'En nombre de usuario debe ser único';
 $wb['username_error_empty'] = 'El nombre de usuario no puede esta vacío';
 $wb['password_error_empty'] = 'La contraseña no puede esta vacía';
 $wb['password_strength_txt'] = 'Fortaleza de contraseña:';
 $wb['Mail domain functions'] = 'Funciones de dominio para correo';
-$wb['Mail mailing list functions'] = 'Funciones de correo para listas de correo';
 $wb['Mail user functions'] = 'Funciones de correo para usuario';
 $wb['Mail alias functions'] = 'Funciones de correo para alias';
 $wb['Mail forward functions'] = 'Funciones de correo para reenviadores';
diff --git a/interface/web/admin/lib/lang/es_server.lng b/interface/web/admin/lib/lang/es_server.lng
index 68a15b9130..6be17bae0e 100644
--- a/interface/web/admin/lib/lang/es_server.lng
+++ b/interface/web/admin/lib/lang/es_server.lng
@@ -7,11 +7,10 @@ $wb['dns_server_txt'] = 'Servidor DNS';
 $wb['file_server_txt'] = 'Servidor de archivos';
 $wb['db_server_txt'] = 'Servidor de DB';
 $wb['vserver_server_txt'] = 'Servidor VServer';
-$wb['proxy_server_txt'] = 'Servidor Proxy';
-$wb['firewall_server_txt'] = 'Servidor corta fuego';
+$wb['proxy_server_txt'] = 'Proxy';
+$wb['firewall_server_txt'] = 'Cortafuegos';
 $wb['active_txt'] = 'Habilitado';
 $wb['mirror_server_id_txt'] = 'Es el espejo del servidor';
 $wb['- None -'] = '- Ninguno -';
-$wb['proxy_server_txt'] = 'Proxy';
-$wb['firewall_server_txt'] = 'Cortafuegos';
+$wb['xmpp_server_txt'] = 'XMPP Server';
 ?>
diff --git a/interface/web/admin/lib/lang/es_server_config.lng b/interface/web/admin/lib/lang/es_server_config.lng
index 1612364a7a..b6cca864d2 100644
--- a/interface/web/admin/lib/lang/es_server_config.lng
+++ b/interface/web/admin/lib/lang/es_server_config.lng
@@ -157,7 +157,7 @@ $wb['try_rescue_txt'] = 'Habilitar monitoreo y reinicio en caso de fallas';
 $wb['do_not_try_rescue_httpd_txt'] = 'Deshabilitar monitoreo de HTTPD';
 $wb['do_not_try_rescue_mysql_txt'] = 'Deshabilitar monitoreo de MySQL';
 $wb['do_not_try_rescue_mail_txt'] = 'Deshabilitar monitoreo de Correo';
-$wb['rescue_description_txt'] = '<b>Información:</b> Si desea detener el servicio de mysql debe seleccionar la casilla \"Deshabilitar monitoréo de MySQL\" y luego esperar de 2-3 minutos.<br>Si no espera de 2-3 minutos, el rescatador intentará reiniciar el servicio!';
+$wb['rescue_description_txt'] = '<b>Información:</b> Si desea detener el servicio de mysql debe seleccionar la casilla \\"Deshabilitar monitoréo de MySQL\\" y luego esperar de 2-3 minutos.<br>Si no espera de 2-3 minutos, el rescatador intentará reiniciar el servicio!';
 $wb['enable_sni_txt'] = 'Habilitar SNI';
 $wb['set_folder_permissions_on_update_txt'] = 'Establecer permisos de carpetas al actualizar';
 $wb['add_web_users_to_sshusers_group_txt'] = 'Añadir usuarios web al grupo -sshusers-';
@@ -187,8 +187,8 @@ $wb['no_notifications_txt'] = 'Sin notificaciones';
 $wb['monit_url_txt'] = 'URL de Monit';
 $wb['monit_user_txt'] = 'Usuario de Monit';
 $wb['monit_password_txt'] = 'Contraseña de Monit';
-$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
-$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
+$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
+$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
 $wb['monit_url_error_regex'] = 'La URL de Monit en incorrecta';
 $wb['monit_url_note_txt'] = 'Marcador de posición:';
 $wb['munin_url_txt'] = 'URL de Munin';
@@ -250,4 +250,34 @@ $wb['cron_init_script_error_regex'] = 'El nombre del archivo de inicio para Cron
 $wb['crontab_dir_error_regex'] = 'El directorio de crontab es inválido.';
 $wb['cron_wget_error_regex'] = 'La ruta al cron de wget es inválida.';
 $wb['network_filesystem_txt'] = 'Sistema de archivos de la red.';
+$wb['dkim_path_txt'] = 'DKIM Path';
+$wb['reject_sender_login_mismatch_txt'] = 'Reject sender and login mismatch';
+$wb['do_not_try_rescue_mongodb_txt'] = 'Disable MongoDB monitoring';
+$wb['v6_prefix_txt'] = 'IPv6 Prefix';
+$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
+$wb['v6_prefix_length'] = 'Prefix too long according to defined IPv6 ';
+$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
+$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
+$wb['php_handler_txt'] = 'Default PHP Handler';
+$wb['disabled_txt'] = 'Disabled';
+$wb['dkim_strength_txt'] = 'DKIM strength';
+$wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
+$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
+$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
+$wb['enable_spdy_txt'] = 'Makes SPDY available';
+$wb['web_settings_txt'] = 'Web Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+$wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
+$wb['xmpp_bosh_max_inactivity_txt'] = 'Max. BOSH inactivity time';
+$wb['xmpp_bosh_timeout_range_wrong'] = 'Please enter a bosh timeout range between 15 - 360';
+$wb['xmpp_module_saslauth'] = 'saslauth';
+$wb['xmpp_server_admins_txt'] = 'Server Admins (JIDs)';
+$wb['xmpp_modules_enabled_txt'] = 'Serverwide enabled plugins (one per line)';
+$wb['xmpp_ports_txt'] = 'Component ports';
+$wb['xmpp_port_http_txt'] = 'HTTP';
+$wb['xmpp_port_https_txt'] = 'HTTPS';
+$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
+$wb['xmpp_port_bosh_txt'] = 'BOSH';
 ?>
diff --git a/interface/web/admin/lib/lang/es_server_ip.lng b/interface/web/admin/lib/lang/es_server_ip.lng
index 502131f98e..2245c9b149 100644
--- a/interface/web/admin/lib/lang/es_server_ip.lng
+++ b/interface/web/admin/lib/lang/es_server_ip.lng
@@ -2,15 +2,10 @@
 $wb['server_id_txt'] = 'Servidor';
 $wb['ip_address_txt'] = 'Dirección IP';
 $wb['virtualhost_txt'] = 'Host virtual con nombre HTTP';
-$wb['ip_error_wrong'] = 'Dirección IP no válida';
+$wb['ip_error_wrong'] = 'La dirección IP es inválida';
 $wb['ip_error_unique'] = 'La dirección IP debe ser única';
 $wb['client_id_txt'] = 'Cliente';
 $wb['ip_type_txt'] = 'Tipo';
 $wb['virtualhost_port_txt'] = 'Puertos HTTP';
-$wb['error_port_syntax'] = 'Caracteres no válidos en el campo Puerto, introduzca números separados por comas solo. Ejemplo: 80,443';
-$wb['IP Address'] = 'Dirección IP';
-$wb['IP Addresses'] = 'Direcciones IP';
-$wb['ip_error_wrong'] = 'La dirección IP es inválida';
-$wb['ip_error_unique'] = 'La dirección IP debe ser única';
 $wb['error_port_syntax'] = 'Caracteres inválidos en el campo de puertos, por favor ingrese solo números separados por coma. Ejemplo: 80,443';
 ?>
diff --git a/interface/web/admin/lib/lang/es_server_ip_map.lng b/interface/web/admin/lib/lang/es_server_ip_map.lng
index 94508abb79..68b196fb23 100644
--- a/interface/web/admin/lib/lang/es_server_ip_map.lng
+++ b/interface/web/admin/lib/lang/es_server_ip_map.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["server_id_txt"] = 'Rewrite on Server';
-$wb["source_txt"] = 'Source IP';
-$wb["destination_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
-$wb["ip_error_wrong"] = 'The Destination IP address is invalid';
-$wb["destination_ip_empty"] = 'The Destination IP is empty.';
-$wb["source_ip_empty"] = 'The Source IP is empty.';
-$wb["server_empty_error"] = 'The Server is empty.';
-$wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb['server_id_txt'] = 'Rewrite on Server';
+$wb['source_txt'] = 'Source IP';
+$wb['destination_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
+$wb['ip_error_wrong'] = 'The Destination IP address is invalid';
+$wb['destination_ip_empty'] = 'The Destination IP is empty.';
+$wb['source_ip_empty'] = 'The Source IP is empty.';
+$wb['server_empty_error'] = 'The Server is empty.';
+$wb['duplicate_mapping_error'] = 'Mapping already exists.';
+$wb['ip_mapping_error'] = 'Source IP can not be an IP of the Rewrite-Server';
 ?>
diff --git a/interface/web/admin/lib/lang/es_server_ip_map_list.lng b/interface/web/admin/lib/lang/es_server_ip_map_list.lng
index 60c6815fda..1fedc10b2e 100644
--- a/interface/web/admin/lib/lang/es_server_ip_map_list.lng
+++ b/interface/web/admin/lib/lang/es_server_ip_map_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'IP Mappings';
-$wb["server_id_txt"] = 'Server';
-$wb["source_ip_txt"] = 'Source IP';
-$wb["destination_ip_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
+$wb['list_head_txt'] = 'IP Mappings';
+$wb['server_id_txt'] = 'Server';
+$wb['source_ip_txt'] = 'Source IP';
+$wb['destination_ip_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
 ?>
diff --git a/interface/web/admin/lib/lang/es_server_list.lng b/interface/web/admin/lib/lang/es_server_list.lng
index 59f166c4c1..b466f3ca94 100644
--- a/interface/web/admin/lib/lang/es_server_list.lng
+++ b/interface/web/admin/lib/lang/es_server_list.lng
@@ -10,4 +10,5 @@ $wb['vserver_server_txt'] = 'VServer';
 $wb['proxy_server_txt'] = 'Proxy';
 $wb['firewall_server_txt'] = 'Corta fuego';
 $wb['add_new_record_txt'] = 'Añadir servidor';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>
diff --git a/interface/web/admin/lib/lang/es_system_config.lng b/interface/web/admin/lib/lang/es_system_config.lng
index 0828d450ac..ebebe7ec20 100644
--- a/interface/web/admin/lib/lang/es_system_config.lng
+++ b/interface/web/admin/lib/lang/es_system_config.lng
@@ -10,18 +10,16 @@ $wb['tab_change_warning_txt'] = 'Advertencia en cambio de pestaña';
 $wb['tab_change_warning_note_txt'] = 'Mostrar advertencia al cambiar de pestaña en los formularios de edición si se ha cambiado algún parámetro.';
 $wb['dbname_prefix_txt'] = 'Prefijo del nombre de la base de datos';
 $wb['dbuser_prefix_txt'] = 'Prefijo del usuario de la base de datos';
-$wb['Sites'] = 'Sitios';
-$wb['System Config'] = 'Configuración de sistema';
 $wb['default_mailserver_txt'] = 'Servidor de correo por defecto';
 $wb['default_webserver_txt'] = 'Servidor web por defecto';
 $wb['default_dnsserver_txt'] = 'Servidor DNS por defecto';
 $wb['default_slave_dnsserver_txt'] = 'Servidor DNS secundario por defecto';
 $wb['default_dbserver_txt'] = 'Servidor de bases de datos por defecto';
-$wb["company_name_txt"] = "Company Name for the page title";
-$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
-$wb["custom_login_text_txt"] = "Custom Text on Login-Page";
-$wb["custom_login_link_txt"] = "Custom Link on Login-Page";
-$wb["login_link_error_regex"] = "Invalid Link for Custom Login";
+$wb['company_name_txt'] = 'Company Name for the page title';
+$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
+$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
+$wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
+$wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
 $wb['shelluser_prefix_txt'] = 'Prefijo del usuario del Shell';
 $wb['webdavuser_prefix_txt'] = 'Prefijo del usuario de Webdav';
 $wb['ftpuser_prefix_txt'] = 'Prefijo del usuario de FTP';
@@ -57,7 +55,7 @@ $wb['phpmyadmin_url_error_regex'] = 'URL inválida a phpmyadmin';
 $wb['use_combobox_txt'] = 'Usar jQuery UI Combobox';
 $wb['use_loadindicator_txt'] = 'Usar indicador de carga';
 $wb['f5_to_reload_js_txt'] = 'Si modifica esto, deberá presionar F5 para que el explorador cargue las librerías JavaScript o debe borrar la cache del explorador.';
-$wb['client_username_web_check_disabled_txt'] = 'Desactivar la comprobación de la palabra \"web\" en los nombres de clientes.';
+$wb['client_username_web_check_disabled_txt'] = 'Desactivar la comprobación de la palabra \\"web\\" en los nombres de clientes.';
 $wb['mailbox_show_autoresponder_tab_txt'] = 'Mostrar la pestaña del auto-respondedor en los detalles de la cuenta de correo';
 $wb['mailbox_show_mail_filter_tab_txt'] = 'Mostrar la pestaña filtro de correo en los detalles de la cuenta de correo';
 $wb['mailbox_show_custom_rules_tab_txt'] = 'Mostrar la pestaña filtro de correo personalizado en los detalles de la cuenta de correo';
@@ -76,8 +74,11 @@ $wb['customer_no_template_error_regex_txt'] = 'La plantilla No. de cliente conti
 $wb['customer_no_start_txt'] = 'Valor de inicio de No. de cliente';
 $wb['customer_no_counter_txt'] = 'Contador de No. cliente';
 $wb['session_timeout_txt'] = 'Fin de sesión (minutos)';
-$wb['session_allow_endless_txt'] = 'Habilitar \"mantenerme conectado\"';
+$wb['session_allow_endless_txt'] = 'Habilitar \\"mantenerme conectado\\"';
 $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'Largo mínimo de la contraseña';
 $wb['min_password_strength_txt'] = 'Fortaleza mínima de la contraseña';
+$wb['vhost_aliasdomains_txt'] = 'Create aliasdomains as web site';
+$wb['vhost_aliasdomains_note_txt'] = 'You cannot disable this as long as vhost aliasdomains exist in the system!';
+$wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
 ?>
diff --git a/interface/web/admin/lib/lang/es_users.lng b/interface/web/admin/lib/lang/es_users.lng
index 18e1d6bb28..50bce29399 100644
--- a/interface/web/admin/lib/lang/es_users.lng
+++ b/interface/web/admin/lib/lang/es_users.lng
@@ -31,4 +31,5 @@ $wb['password_mismatch_txt'] = 'Las contraseñas no coinciden.';
 $wb['password_match_txt'] = 'Las contraseñas coinciden.';
 $wb['username_error_collision'] = 'El nombre de usuario no puede ser el del web o el del web más un número.';
 $wb['client_not_admin_err'] = 'Un usuario que pertenece a un cliente no puede ser del tipo: admin';
+$wb['lost_password_function_txt'] = 'Forgot password function is available';
 ?>
diff --git a/interface/web/admin/lib/lang/fi.lng b/interface/web/admin/lib/lang/fi.lng
index 6b1818a925..5037b98314 100755
--- a/interface/web/admin/lib/lang/fi.lng
+++ b/interface/web/admin/lib/lang/fi.lng
@@ -47,4 +47,6 @@ $wb['Remote Actions'] = 'Remote Actions';
 $wb['Do OS-Update'] = 'Do OS-Update';
 $wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
 $wb['Directive Snippets'] = 'Directive Snippets';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
 ?>
diff --git a/interface/web/admin/lib/lang/fi_directive_snippets.lng b/interface/web/admin/lib/lang/fi_directive_snippets.lng
index 0f09c12ee0..21387b31e5 100644
--- a/interface/web/admin/lib/lang/fi_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/fi_directive_snippets.lng
@@ -7,4 +7,5 @@ $wb['active_txt'] = 'Active';
 $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
 $wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
 $wb['variables_txt'] = 'Variables';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/fi_directive_snippets_list.lng b/interface/web/admin/lib/lang/fi_directive_snippets_list.lng
index 4124ea3464..8e189f9f79 100644
--- a/interface/web/admin/lib/lang/fi_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/fi_directive_snippets_list.lng
@@ -4,4 +4,5 @@ $wb['active_txt'] = 'Active';
 $wb['name_txt'] = 'Name of Snippet';
 $wb['type_txt'] = 'Type';
 $wb['add_new_record_txt'] = 'Add Directive Snippet';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/fi_server.lng b/interface/web/admin/lib/lang/fi_server.lng
index 514446dde4..e1110bdf74 100755
--- a/interface/web/admin/lib/lang/fi_server.lng
+++ b/interface/web/admin/lib/lang/fi_server.lng
@@ -12,4 +12,5 @@ $wb['mirror_server_id_txt'] = 'Peilinä palvelimelle';
 $wb['- None -'] = '- Ei mikään -';
 $wb['proxy_server_txt'] = 'Proxy-Server';
 $wb['firewall_server_txt'] = 'Firewall-Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
 ?>
diff --git a/interface/web/admin/lib/lang/fi_server_config.lng b/interface/web/admin/lib/lang/fi_server_config.lng
index 061465ca88..d48a493273 100755
--- a/interface/web/admin/lib/lang/fi_server_config.lng
+++ b/interface/web/admin/lib/lang/fi_server_config.lng
@@ -195,11 +195,11 @@ $wb['munin_user_txt'] = 'Munin User';
 $wb['munin_password_txt'] = 'Munin Password';
 $wb['munin_url_error_regex'] = 'Invalid Munin URL';
 $wb['munin_url_note_txt'] = 'Placeholder:';
-$wb["dkim_path_txt"] = 'DKIM Path';
+$wb['dkim_path_txt'] = 'DKIM Path';
 $wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
-$wb["v6_prefix_txt"] = 'IPv6 Prefix';
-$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
-$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
+$wb['v6_prefix_txt'] = 'IPv6 Prefix';
+$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
+$wb['v6_prefix_length'] = 'Prefix too long according to defined IPv6 ';
 $wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
 $wb['monitor_system_updates_txt'] = 'Check for Linux updates';
 $wb['hostname_error_regex'] = 'Invalid Hostname.';
@@ -254,6 +254,30 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
-$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
-$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
+$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
+$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
+$wb['do_not_try_rescue_mongodb_txt'] = 'Disable MongoDB monitoring';
+$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
+$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
+$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
+$wb['php_handler_txt'] = 'Default PHP Handler';
+$wb['disabled_txt'] = 'Disabled';
+$wb['dkim_strength_txt'] = 'DKIM strength';
+$wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
+$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
+$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
+$wb['enable_spdy_txt'] = 'Makes SPDY available';
+$wb['web_settings_txt'] = 'Web Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+$wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
+$wb['xmpp_bosh_max_inactivity_txt'] = 'Max. BOSH inactivity time';
+$wb['xmpp_bosh_timeout_range_wrong'] = 'Please enter a bosh timeout range between 15 - 360';
+$wb['xmpp_module_saslauth'] = 'saslauth';
+$wb['xmpp_server_admins_txt'] = 'Server Admins (JIDs)';
+$wb['xmpp_modules_enabled_txt'] = 'Serverwide enabled plugins (one per line)';
+$wb['xmpp_ports_txt'] = 'Component ports';
+$wb['xmpp_port_http_txt'] = 'HTTP';
+$wb['xmpp_port_https_txt'] = 'HTTPS';
+$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
+$wb['xmpp_port_bosh_txt'] = 'BOSH';
 ?>
diff --git a/interface/web/admin/lib/lang/fi_server_ip_map.lng b/interface/web/admin/lib/lang/fi_server_ip_map.lng
index 94508abb79..68b196fb23 100644
--- a/interface/web/admin/lib/lang/fi_server_ip_map.lng
+++ b/interface/web/admin/lib/lang/fi_server_ip_map.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["server_id_txt"] = 'Rewrite on Server';
-$wb["source_txt"] = 'Source IP';
-$wb["destination_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
-$wb["ip_error_wrong"] = 'The Destination IP address is invalid';
-$wb["destination_ip_empty"] = 'The Destination IP is empty.';
-$wb["source_ip_empty"] = 'The Source IP is empty.';
-$wb["server_empty_error"] = 'The Server is empty.';
-$wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb['server_id_txt'] = 'Rewrite on Server';
+$wb['source_txt'] = 'Source IP';
+$wb['destination_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
+$wb['ip_error_wrong'] = 'The Destination IP address is invalid';
+$wb['destination_ip_empty'] = 'The Destination IP is empty.';
+$wb['source_ip_empty'] = 'The Source IP is empty.';
+$wb['server_empty_error'] = 'The Server is empty.';
+$wb['duplicate_mapping_error'] = 'Mapping already exists.';
+$wb['ip_mapping_error'] = 'Source IP can not be an IP of the Rewrite-Server';
 ?>
diff --git a/interface/web/admin/lib/lang/fi_server_ip_map_list.lng b/interface/web/admin/lib/lang/fi_server_ip_map_list.lng
index 60c6815fda..1fedc10b2e 100644
--- a/interface/web/admin/lib/lang/fi_server_ip_map_list.lng
+++ b/interface/web/admin/lib/lang/fi_server_ip_map_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'IP Mappings';
-$wb["server_id_txt"] = 'Server';
-$wb["source_ip_txt"] = 'Source IP';
-$wb["destination_ip_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
+$wb['list_head_txt'] = 'IP Mappings';
+$wb['server_id_txt'] = 'Server';
+$wb['source_ip_txt'] = 'Source IP';
+$wb['destination_ip_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
 ?>
diff --git a/interface/web/admin/lib/lang/fi_server_list.lng b/interface/web/admin/lib/lang/fi_server_list.lng
index eaa10fe99d..b7d0459258 100755
--- a/interface/web/admin/lib/lang/fi_server_list.lng
+++ b/interface/web/admin/lib/lang/fi_server_list.lng
@@ -10,4 +10,5 @@ $wb['vserver_server_txt'] = 'Virtuaalipalvelin';
 $wb['add_new_record_txt'] = 'Lisää uusi tietue';
 $wb['proxy_server_txt'] = 'Proxy';
 $wb['firewall_server_txt'] = 'Firewall';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>
diff --git a/interface/web/admin/lib/lang/fi_system_config.lng b/interface/web/admin/lib/lang/fi_system_config.lng
index b5440b7593..c4987d01a3 100644
--- a/interface/web/admin/lib/lang/fi_system_config.lng
+++ b/interface/web/admin/lib/lang/fi_system_config.lng
@@ -71,9 +71,14 @@ $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["company_name_txt"] = "Company Name for the page title";
-$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
-$wb["custom_login_text_txt"] = "Custom Text on Login-Page";
-$wb["custom_login_link_txt"] = "Custom Link on Login-Page";
-$wb["login_link_error_regex"] = "Invalid Link for Custom Login";
+$wb['company_name_txt'] = 'Company Name for the page title';
+$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
+$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
+$wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
+$wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
 ?>
diff --git a/interface/web/admin/lib/lang/fi_users.lng b/interface/web/admin/lib/lang/fi_users.lng
index f0d74ea932..24968c8fd0 100755
--- a/interface/web/admin/lib/lang/fi_users.lng
+++ b/interface/web/admin/lib/lang/fi_users.lng
@@ -31,4 +31,5 @@ $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['lost_password_function_txt'] = 'Forgot password function is available';
 ?>
diff --git a/interface/web/admin/lib/lang/fr.lng b/interface/web/admin/lib/lang/fr.lng
index 339dfc3239..7743f5d0e9 100644
--- a/interface/web/admin/lib/lang/fr.lng
+++ b/interface/web/admin/lib/lang/fr.lng
@@ -1,18 +1,18 @@
 <?php
-$wb['1001'] = 'Le nom d\'utilisateur ou le mot de passe est vide.';
-$wb['1002'] = 'Le nom d\'utilisateur ou le mot de passe est faux.';
+$wb['1001'] = 'Le nom d’utilisateur ou le mot de passe est vide.';
+$wb['1002'] = 'Le nom d’utilisateur ou le mot de passe est faux.';
 $wb['Groups'] = 'Groupes';
-$wb['groups_description'] = 'Formulaire d\'édition des groupes d\'utilisateurs système.';
+$wb['groups_description'] = 'Formulaire de modification des groupes d’utilisateurs système.';
 $wb['Servers'] = 'Serveurs';
 $wb['Config'] = 'Configuration';
 $wb['Add user'] = 'Ajout utilisateur';
-$wb['Edit user'] = 'Edition utilisateur';
+$wb['Edit user'] = 'Modification utilisateur';
 $wb['Add group'] = 'Ajout groupe';
-$wb['Edit group'] = 'Edition groupe';
-$wb['Edit server'] = 'Edition serveur';
+$wb['Edit group'] = 'Modification groupe';
+$wb['Edit server'] = 'Modification serveur';
 $wb['Sync. Now'] = 'Sync. maintenant';
 $wb['DB Sync.'] = 'Sync. BDD';
-$wb['User Management'] = 'User Management';
+$wb['User Management'] = 'Gestion des utilisateurs';
 $wb['CP Users'] = 'Utilisateurs';
 $wb['Remote Users'] = 'Utilisateurs distants';
 $wb['System'] = 'Système';
@@ -20,7 +20,7 @@ $wb['Server Services'] = 'Services serveur';
 $wb['Services'] = 'Services';
 $wb['Server Config'] = 'Configuration serveur';
 $wb['Server'] = 'Serveur';
-$wb['Mail'] = 'Email';
+$wb['Mail'] = 'E-mail';
 $wb['Getmail'] = 'Getmail';
 $wb['Web'] = 'Web';
 $wb['FastCGI'] = 'FastCGI';
@@ -37,14 +37,16 @@ $wb['Software'] = 'Applications & Plugins';
 $wb['Repositories'] = 'Dépôt';
 $wb['Packages'] = 'Paquets';
 $wb['Updates'] = 'Mises à jour';
-$wb['Language Editor'] = 'Editeur de langue';
+$wb['Language Editor'] = 'Éditeur de langue';
 $wb['Languages'] = 'Langues';
 $wb['New Language'] = 'Nouvelle Langue';
 $wb['Merge'] = 'Fusion';
 $wb['Export'] = 'Exporter';
 $wb['Import'] = 'Importer';
 $wb['Remote Actions'] = 'Actions distantes';
-$wb['Do OS-Update'] = 'Mise à jour de l\'OS';
+$wb['Do OS-Update'] = 'Mise à jour de l’OS';
 $wb['Do ISPConfig-Update'] = 'Mise à jour ISPConfig';
 $wb['Directive Snippets'] = 'Directive Snippets';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_directive_snippets.lng b/interface/web/admin/lib/lang/fr_directive_snippets.lng
index 0f09c12ee0..21387b31e5 100644
--- a/interface/web/admin/lib/lang/fr_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/fr_directive_snippets.lng
@@ -7,4 +7,5 @@ $wb['active_txt'] = 'Active';
 $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
 $wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
 $wb['variables_txt'] = 'Variables';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_directive_snippets_list.lng b/interface/web/admin/lib/lang/fr_directive_snippets_list.lng
index 4124ea3464..8e189f9f79 100644
--- a/interface/web/admin/lib/lang/fr_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/fr_directive_snippets_list.lng
@@ -4,4 +4,5 @@ $wb['active_txt'] = 'Active';
 $wb['name_txt'] = 'Name of Snippet';
 $wb['type_txt'] = 'Type';
 $wb['add_new_record_txt'] = 'Add Directive Snippet';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_firewall.lng b/interface/web/admin/lib/lang/fr_firewall.lng
index 53b762c082..6c8b97c369 100644
--- a/interface/web/admin/lib/lang/fr_firewall.lng
+++ b/interface/web/admin/lib/lang/fr_firewall.lng
@@ -6,6 +6,6 @@ $wb['tcp_port_help_txt'] = 'Séparés par des virgules';
 $wb['udp_port_help_txt'] = 'Séparés par des virgules';
 $wb['active_txt'] = 'Actif';
 $wb['firewall_error_unique'] = 'Il y a déjà un enregistrement dans le pare-feu pour ce serveur.';
-$wb['tcp_ports_error_regex'] = 'Caractère non autorisé dans la définition du port TCP. Les caractères autorisés sont les nombres, : et ,.';
-$wb['udp_ports_error_regex'] = 'Caractère non autorisé dans la définition du port UDP. Les caractères autorisés sont les nombres, : et ,.';
+$wb['tcp_ports_error_regex'] = 'Caractère non autorisé dans la définition du port TCP. Les caractères autorisés sont les nombres, : et ,.';
+$wb['udp_ports_error_regex'] = 'Caractère non autorisé dans la définition du port UDP. Les caractères autorisés sont les nombres, : et ,.';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_groups_list.lng b/interface/web/admin/lib/lang/fr_groups_list.lng
index e51afd1cfb..c95036472a 100644
--- a/interface/web/admin/lib/lang/fr_groups_list.lng
+++ b/interface/web/admin/lib/lang/fr_groups_list.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['list_head_txt'] = 'Groupes d\'utilisateurs système';
+$wb['list_head_txt'] = 'Groupes d’utilisateurs système';
 $wb['description_txt'] = 'Description';
 $wb['name_txt'] = 'Groupe';
 $wb['add_new_record_txt'] = 'Ajouter un nouveau groupe';
diff --git a/interface/web/admin/lib/lang/fr_language_edit.lng b/interface/web/admin/lib/lang/fr_language_edit.lng
index 744f44d42d..843b2165cf 100644
--- a/interface/web/admin/lib/lang/fr_language_edit.lng
+++ b/interface/web/admin/lib/lang/fr_language_edit.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['list_head_txt'] = 'Editeur de fichier de langue';
+$wb['list_head_txt'] = 'Éditeur de fichier de langue';
 $wb['language_select_txt'] = 'Sélectionnez la langue';
 $wb['module_txt'] = 'Module';
 $wb['lang_file_txt'] = 'Fichier de langue';
diff --git a/interface/web/admin/lib/lang/fr_language_import.lng b/interface/web/admin/lib/lang/fr_language_import.lng
index a7298a4696..3f8a269440 100644
--- a/interface/web/admin/lib/lang/fr_language_import.lng
+++ b/interface/web/admin/lib/lang/fr_language_import.lng
@@ -2,7 +2,7 @@
 $wb['list_head_txt'] = 'Importer un fichier de langue';
 $wb['language_import_txt'] = 'Sélectionnez le fichier de langue';
 $wb['btn_save_txt'] = 'Importer le fichier de langue sélectionné';
-$wb['language_overwrite_txt'] = 'Ecraser le fichier sil existe déja.';
+$wb['language_overwrite_txt'] = 'Écraser le fichier s’il existe déjà.';
 $wb['btn_cancel_txt'] = 'Précédent';
 $wb['ignore_version_txt'] = 'Ignorer le test de version ISPConfig';
 $wb['list_desc_txt'] = 'WARNING: Do not import language files from untrustworthy sources.';
diff --git a/interface/web/admin/lib/lang/fr_language_list.lng b/interface/web/admin/lib/lang/fr_language_list.lng
index 8e9f26a7b1..d959782cda 100644
--- a/interface/web/admin/lib/lang/fr_language_list.lng
+++ b/interface/web/admin/lib/lang/fr_language_list.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['list_head_txt'] = 'Editeur de fichier de langue';
+$wb['list_head_txt'] = 'Éditeur de fichier de langue';
 $wb['language_select_txt'] = 'Sélectionnez le langage';
 $wb['module_txt'] = 'Module';
 $wb['lang_file_txt'] = 'Fichier de langue';
diff --git a/interface/web/admin/lib/lang/fr_remote_action.lng b/interface/web/admin/lib/lang/fr_remote_action.lng
index 58fb49998a..9d8d75c7bb 100644
--- a/interface/web/admin/lib/lang/fr_remote_action.lng
+++ b/interface/web/admin/lib/lang/fr_remote_action.lng
@@ -1,12 +1,12 @@
 <?php
 $wb['select_server_txt'] = 'Sélectionner un serveur';
-$wb['btn_do_txt'] = 'Exécuter laction';
+$wb['btn_do_txt'] = 'Exécuter l’action';
 $wb['do_osupdate_caption'] = 'Mettre à jour lOS du serveur distant';
-$wb['do_osupdate_desc'] = 'Cette action effectue aptitude -y upgrade sur le serveur sélectionné.<br/><br/><strong>UTILISEZ A VOS RISQUES ET PERILS !</strong>';
+$wb['do_osupdate_desc'] = 'Cette action effectue aptitude -y upgrade sur le serveur sélectionné.<br/><br/><strong>UTILISEZ A VOS RISQUES ET PERILS !</strong>';
 $wb['do_ispcupdate_caption'] = 'Mettre à jour ISPConfig 3 sur le serveur distant';
-$wb['do_ispcupdate_desc'] = 'Cette action met à jour ISPConfig3 sur le serveur sélectionné.<br/><br/><strong>UTILISEZ A VOS RISQUES ET PERILS !</strong>';
-$wb['action_scheduled'] = 'Laction est marquée pour exécution';
+$wb['do_ispcupdate_desc'] = 'Cette action met à jour ISPConfig3 sur le serveur sélectionné.<br/><br/><strong>UTILISEZ A VOS RISQUES ET PERILS !</strong>';
+$wb['action_scheduled'] = 'L’action est marquée pour exécution';
 $wb['select_all_server'] = 'Tout serveur';
 $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 instructions</a>';
+$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 instructions</a>';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_remote_user.lng b/interface/web/admin/lib/lang/fr_remote_user.lng
index 12e5b4d37b..57407a929f 100644
--- a/interface/web/admin/lib/lang/fr_remote_user.lng
+++ b/interface/web/admin/lib/lang/fr_remote_user.lng
@@ -1,24 +1,24 @@
 <?php
-$wb['username_txt'] = 'Identifiant :';
-$wb['password_txt'] = 'Mot de passe :';
-$wb['function_txt'] = 'Fonctions :';
+$wb['username_txt'] = 'Identifiant :';
+$wb['password_txt'] = 'Mot de passe :';
+$wb['function_txt'] = 'Fonctions :';
 $wb['username_error_unique'] = 'Lidentifiant doit être unique';
 $wb['username_error_empty'] = 'Lidentifiant ne peut être vide';
 $wb['password_error_empty'] = 'Le mot de passe ne peut être vide';
-$wb['password_strength_txt'] = 'Force du mot de passe :';
-$wb['Mail domain functions'] = 'Fonctions domaine email';
-$wb['Mail user functions'] = 'Fonctions utilisateur email';
-$wb['Mail alias functions'] = 'Fonctions alias email';
-$wb['Mail forward functions'] = 'Fonctions transfert email';
-$wb['Mail catchall functions'] = 'Fonctions collecteur email';
-$wb['Mail transport functions'] = 'Fonctions transport email';
-$wb['Mail whitelist functions'] = 'Fonctions liste blanche email';
-$wb['Mail blacklist functions'] = 'Fonctions liste noire email';
+$wb['password_strength_txt'] = 'Force du mot de passe :';
+$wb['Mail domain functions'] = 'Fonctions domaine e-mail';
+$wb['Mail user functions'] = 'Fonctions utilisateur e-mail';
+$wb['Mail alias functions'] = 'Fonctions alias e-mail';
+$wb['Mail forward functions'] = 'Fonctions transfert e-mail';
+$wb['Mail catchall functions'] = 'Fonctions collecteur e-mail';
+$wb['Mail transport functions'] = 'Fonctions transport e-mail';
+$wb['Mail whitelist functions'] = 'Fonctions liste blanche e-mail';
+$wb['Mail blacklist functions'] = 'Fonctions liste noire e-mail';
 $wb['Mail spamfilter user functions'] = 'Fonctions utilisateur filtre antispam';
 $wb['Mail spamfilter policy functions'] = 'Fonctions politique du filtre antispam';
-$wb['Mail fetchmail functions'] = 'Fonctions récupérateur email';
-$wb['Mail user filter functions'] = 'Fonctions filtre d\'utilisateur email';
-$wb['Mail filter functions'] = 'Fonctions filtre email';
+$wb['Mail fetchmail functions'] = 'Fonctions récupérateur e-mail';
+$wb['Mail user filter functions'] = 'Fonctions filtre d’utilisateur e-mail';
+$wb['Mail filter functions'] = 'Fonctions filtre e-mail';
 $wb['Client functions'] = 'Fonctions client';
 $wb['Sites cron functions'] = 'Fonctions cron des sites';
 $wb['Sites database functions'] = 'Fonctions BDD des sites';
@@ -40,7 +40,7 @@ $wb['DNS rp functions'] = 'Fonctions RP DNS';
 $wb['DNS srv functions'] = 'Fonctions SRV DNS';
 $wb['DNS txt functions'] = 'Fonctions TXT DNS';
 $wb['Mail mailing list functions'] = 'Fonctions Mailinglist Mail';
-$wb['generate_password_txt'] = 'Generate Password';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
 $wb['repeat_password_txt'] = 'Repeat Password';
 $wb['password_mismatch_txt'] = 'The passwords do not match.';
 $wb['password_match_txt'] = 'The passwords do match.';
diff --git a/interface/web/admin/lib/lang/fr_remote_user_list.lng b/interface/web/admin/lib/lang/fr_remote_user_list.lng
index e78707e084..4df35d3bb3 100644
--- a/interface/web/admin/lib/lang/fr_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/fr_remote_user_list.lng
@@ -2,6 +2,6 @@
 $wb['list_head_txt'] = 'Utilisateurs distants';
 $wb['list_desc_txt'] = '';
 $wb['add_new_record_txt'] = 'Ajouter un utilisateur';
-$wb['parent_remote_userid_txt'] = 'ID';
+$wb['parent_remote_userid_txt'] = 'Id';
 $wb['username_txt'] = 'Identifiant';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_server.lng b/interface/web/admin/lib/lang/fr_server.lng
index 7224e1dab1..fe7f4a4aab 100644
--- a/interface/web/admin/lib/lang/fr_server.lng
+++ b/interface/web/admin/lib/lang/fr_server.lng
@@ -6,10 +6,11 @@ $wb['dns_server_txt'] = 'Serveur DNS';
 $wb['file_server_txt'] = 'Serveur de fichier';
 $wb['active_txt'] = 'Actif';
 $wb['config_txt'] = 'Config';
-$wb['db_server_txt'] = 'Serveur BDD';
+$wb['db_server_txt'] = 'Serveur BDd';
 $wb['vserver_server_txt'] = 'Serveur VServer';
 $wb['mirror_server_id_txt'] = 'Est miroir du serveur';
 $wb['- None -'] = '- Aucun -';
 $wb['proxy_server_txt'] = 'Proxy-Server';
 $wb['firewall_server_txt'] = 'Firewall-Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_server_config.lng b/interface/web/admin/lib/lang/fr_server_config.lng
index 8fa674c100..3c34e1d1dd 100644
--- a/interface/web/admin/lib/lang/fr_server_config.lng
+++ b/interface/web/admin/lib/lang/fr_server_config.lng
@@ -1,204 +1,195 @@
 <?php
 $wb['jailkit_chroot_home_txt'] = 'Accueil du chroot Jailkit';
-$wb['jailkit_chroot_app_sections_txt'] = 'Sections des applications chrooté Jailkit';
-$wb['jailkit_chroot_app_programs_txt'] = 'Applications chrooté Jailkit';
+$wb['jailkit_chroot_app_sections_txt'] = 'Sections des applications chrootées Jailkit';
+$wb['jailkit_chroot_app_programs_txt'] = 'Applications chrootées Jailkit';
 $wb['website_path_txt'] = 'Chemin du site web';
 $wb['website_symlinks_txt'] = 'Liens symboliques du site web';
-$wb['website_symlinks_rel_txt'] = 'Cré des liens symboliques relatives';
-$wb['vhost_conf_dir_txt'] = 'Rértoire de configuration des VHosts';
-$wb['vhost_conf_enabled_dir_txt'] = 'Rértoire de configuration des VHosts actifs';
-$wb['getmail_config_dir_txt'] = 'Rértoire de configuration de Getmail';
+$wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
+$wb['vhost_conf_dir_txt'] = 'Répertoire de configuration des VHosts';
+$wb['vhost_conf_enabled_dir_txt'] = 'Répertoire de configuration des VHosts actifs';
+$wb['getmail_config_dir_txt'] = 'Répertoire de configuration de Getmail';
 $wb['fastcgi_starter_path_txt'] = 'Chemin du lanceur de FastCGI';
 $wb['fastcgi_starter_script_txt'] = 'Script lanceur de FastCGI';
 $wb['fastcgi_alias_txt'] = 'Alias de FastCGI';
 $wb['fastcgi_phpini_path_txt'] = 'Chemin du php.ini de FastCGI';
 $wb['fastcgi_children_txt'] = 'Enfant de FastCGI';
-$wb['fastcgi_max_requests_txt'] = 'Nombre maximal de requês FastCGI';
-$wb['fastcgi_bin_txt'] = 'Exétable FastCGI';
+$wb['fastcgi_max_requests_txt'] = 'Nombre maximal de requêtes FastCGI';
+$wb['fastcgi_bin_txt'] = 'Exécutable FastCGI';
 $wb['module_txt'] = 'Module';
 $wb['maildir_path_txt'] = 'Chemin Maildir';
-$wb['maildir_format_txt'] = 'Maildir Format';
 $wb['homedir_path_txt'] = 'Chemin Homedir';
-$wb['mailuser_uid_txt'] = 'UID de l\'utilisateur mail';
-$wb['mailuser_gid_txt'] = 'GID de l\'utilisateur mail';
-$wb['mailuser_name_txt'] = 'Nom d\'utilisateur mail';
-$wb['mailuser_group_txt'] = 'Groupe de l\'utilisateur mail';
-$wb['relayhost_txt'] = 'Hôde relais';
+$wb['mailuser_uid_txt'] = 'UID de l’utilisateur mail';
+$wb['mailuser_gid_txt'] = 'GID de l’utilisateur mail';
+$wb['mailuser_name_txt'] = 'Nom d’utilisateur mail';
+$wb['mailuser_group_txt'] = 'Groupe de l’utilisateur mail';
+$wb['relayhost_txt'] = 'Hôte de relais';
 $wb['relayhost_user_txt'] = 'Utilisateur du relais';
 $wb['relayhost_password_txt'] = 'Mot de passe du relais';
-$wb['reject_sender_login_mismatch_txt'] = 'Reject sender and login mismatch';
-$wb['mailbox_size_limit_txt'] = 'Taille maximale de la boite mail';
+$wb['mailbox_size_limit_txt'] = 'Taille maximale de la boîte mail';
 $wb['message_size_limit_txt'] = 'Taille maximale des messages';
 $wb['ip_address_txt'] = 'Adresse IP';
-$wb['netmask_txt'] = 'Masque de réau';
+$wb['netmask_txt'] = 'Masque de réseau';
 $wb['gateway_txt'] = 'Passerelle';
-$wb['hostname_txt'] = 'Hô';
+$wb['hostname_txt'] = 'Hôte';
 $wb['nameservers_txt'] = 'Serveurs de nom';
-$wb['auto_network_configuration_txt'] = 'Configuration du réau';
-$wb['website_basedir_txt'] = 'Rértoire de base web';
-$wb['ip_address_error_wrong'] = 'Format de l\'adresse IP invalide.';
-$wb['netmask_error_wrong'] = 'Format du masque de réau invalide.';
+$wb['auto_network_configuration_txt'] = 'Configuration du réseau';
+$wb['website_basedir_txt'] = 'Répertoire de base web';
+$wb['ip_address_error_wrong'] = 'Format de ladresse IP invalide.';
+$wb['netmask_error_wrong'] = 'Format du masque de réseau invalide.';
 $wb['gateway_error_wrong'] = 'Format de la passerelle invalide.';
-$wb['hostname_error_empty'] = 'L\'hôest vide.';
+$wb['hostname_error_empty'] = 'Lhôte est vide.';
 $wb['nameservers_error_empty'] = 'Le serveur de nom est vide.';
-$wb['jailkit_chroot_cron_programs_txt'] = 'Applications Cron Jailkit chrooté';
-$wb['config_dir_txt'] = 'Rértoire de configuration';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Applications Cron Jailkit chrootées';
+$wb['config_dir_txt'] = 'Répertoire de configuration';
 $wb['init_script_txt'] = 'Nom du script Cron de lancement';
-$wb['crontab_dir_txt'] = 'Chemin des difféntes tables Cron';
+$wb['crontab_dir_txt'] = 'Chemin des différentes tables Cron';
 $wb['wget_txt'] = 'Chemin du programme wget';
-$wb['security_level_txt'] = 'Niveau de sérité';
+$wb['security_level_txt'] = 'Niveau de sécurité';
 $wb['web_user_txt'] = 'Utilisateur Apache';
 $wb['web_group_txt'] = 'Groupe Apache';
 $wb['loglevel_txt'] = 'Loglevel';
 $wb['apps_vhost_port_txt'] = 'Port Apps-vhost';
 $wb['apps_vhost_ip_txt'] = 'IP Apps-vhost';
 $wb['apps_vhost_servername_txt'] = ' Domaine Apps-vhost';
-$wb['bind_user_txt'] = 'Utilisateur BIND';
-$wb['bind_group_txt'] = 'Groupe BIND';
-$wb['bind_zonefiles_dir_txt'] = 'Dossier pour les zones BIND';
-$wb['named_conf_path_txt'] = 'Chemin named.conf BIND';
-$wb['bind_user_error_empty'] = 'L\'utilisateur BIND est vide.';
+$wb['bind_user_txt'] = 'Utilisateur BINd';
+$wb['bind_group_txt'] = 'Groupe BINd';
+$wb['bind_zonefiles_dir_txt'] = 'Dossier pour les zones BINd';
+$wb['named_conf_path_txt'] = 'Chemin named.conf BINd';
+$wb['bind_user_error_empty'] = 'Lutilisateur BIND est vide.';
 $wb['bind_group_error_empty'] = 'Le groupe BIND est vide.';
 $wb['bind_zonefiles_dir_error_empty'] = 'Le dossier de zones BIND est vide.';
 $wb['named_conf_path_error_empty'] = 'Le chemin du named.conf BIND est vide.';
 $wb['named_conf_local_path_error_empty'] = 'Le chemin du named.conf.local BIND est vide.';
-$wb['mail_filter_syntax_txt'] = 'Syntaxe filtre email';
-$wb['pop3_imap_daemon_txt'] = 'Dén POP3/IMAP';
+$wb['mail_filter_syntax_txt'] = 'Syntaxe filtre e-mail';
+$wb['pop3_imap_daemon_txt'] = 'Démon POP3/IMAP';
 $wb['php_open_basedir_txt'] = 'open_basedir PHP';
-$wb['php_open_basedir_error_empty'] = 'l\'open_basedir PHP est vide.';
-$wb['htaccess_allow_override_txt'] = 'AllowOverride .htaccess (permet de cré de rées dans .htaccess qui passent outre php config du serveur)';
-$wb['htaccess_allow_override_error_empty'] = 'l\'AllowOverride .htaccess est vide.';
+$wb['php_open_basedir_error_empty'] = 'lopen_basedir PHP est vide.';
+$wb['htaccess_allow_override_txt'] = 'AllowOverride .htaccess';
+$wb['htaccess_allow_override_error_empty'] = 'lAllowOverride .htaccess est vide.';
 $wb['awstats_conf_dir_txt'] = 'Dossier de configuration AWstats';
-$wb['awstats_data_dir_txt'] = 'Dossier de donné AWstats';
+$wb['awstats_data_dir_txt'] = 'Dossier de données AWstats';
 $wb['awstats_pl_txt'] = 'Script awstats.pl';
 $wb['awstats_buildstaticpages_pl_txt'] = 'Script awstats_buildstaticpages.pl';
 $wb['backup_dir_txt'] = 'Dossier de sauvegarde';
-$wb['named_conf_local_path_txt'] = 'Chemin named.conf.local BIND';
+$wb['named_conf_local_path_txt'] = 'Chemin named.conf.local BINd';
 $wb['php_ini_path_cgi_txt'] = 'Chemin php.ini CGI';
 $wb['php_ini_path_apache_txt'] = 'Chemin php.ini Apache';
-$wb['check_apache_config_txt'] = 'Tester la configuration Apache au redérrage';
+$wb['check_apache_config_txt'] = 'Tester la configuration Apache au redémarrage';
 $wb['ufw_enable_txt'] = 'Enable';
-$wb['ufw_manage_builtins_txt'] = 'Gér les Rées Intéé';
-$wb['ufw_ipv6_txt'] = 'Activer l\'IPv6';
-$wb['ufw_default_input_policy_txt'] = 'Politique Entrant (Input) par déult';
-$wb['ufw_default_output_policy_txt'] = 'Politique Sortant (Output) par déult';
-$wb['ufw_default_forward_policy_txt'] = 'Politique de Forward par déult';
-$wb['ufw_default_application_policy_txt'] = 'Politique Application par déult';
-$wb['ufw_log_level_txt'] = 'Niveau de Log';
-$wb['network_config_warning_txt'] = "L\'option de configuration du réau n'est disponible QUE pour les serveurs Debian et Ubuntu. NE PAS activer cette option si votre carte réau n'est pas en eth0.";
-$wb['CA_path_txt'] = 'Chemin CA';
-$wb['CA_pass_txt'] = 'Mot de passe CA';
+$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
+$wb['ufw_ipv6_txt'] = 'Enable IPv6';
+$wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
+$wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
+$wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
+$wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
+$wb['ufw_log_level_txt'] = 'Log Level';
+$wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.';
+$wb['CA_path_txt'] = 'CA Path';
+$wb['CA_pass_txt'] = 'CA passphrase';
 $wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
-$wb['server_type_txt'] = 'Type de Serveur';
-$wb['nginx_vhost_conf_dir_txt'] = 'Repertoire Nginx Vhost config';
-$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Repertoire Nginx Vhost config activé';
-$wb['nginx_user_txt'] = 'Utilisateur Nginx';
-$wb['nginx_group_txt'] = 'Gorupe Nginx';
+$wb['server_type_txt'] = 'Server Type';
+$wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
+$wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
+$wb['nginx_user_txt'] = 'Nginx user';
+$wb['nginx_group_txt'] = 'Nginx group';
 $wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
-$wb['backup_dir_error_empty'] = 'Repertoire Backup est vide.';
-$wb['maildir_path_error_empty'] = 'Chemin Maildir est vide.';
-$wb['homedir_path_error_empty'] = 'Chemin Homedir est vide.';
-$wb['mailuser_uid_error_empty'] = 'Mailuser UID vide.';
-$wb['mailuser_gid_error_empty'] = 'Mailuser GID vide.';
-$wb['mailuser_name_error_empty'] = 'Nom Mailuser vide.';
-$wb['mailuser_group_error_empty'] = 'Groupe Mailuser vide.';
-$wb['getmail_config_dir_error_empty'] = 'Repertoire Getmail config est vide.';
-$wb['website_basedir_error_empty'] = 'Chemin racine du site web est vide.';
-$wb['website_path_error_empty'] = 'Chemin du site web est vide.';
-$wb['website_symlinks_error_empty'] = 'Liens symboliques du site web est vide.';
-$wb['vhost_conf_dir_error_empty'] = 'Repertoire Vhost config est vide.';
-$wb['vhost_conf_enabled_dir_error_empty'] = 'Repertoire avtive Vhost config est vide.';
-$wb['nginx_vhost_conf_dir_error_empty'] = 'Repertoire Nginx Vhost config est vide.';
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Repertoire  config enabled est vide.';
-$wb['apache_user_error_empty'] = 'Utilisateur Apache est vide.';
-$wb['apache_group_error_empty'] = 'Groupe Apache est vide.';
-$wb['nginx_user_error_empty'] = 'Utilisateur Nginx est vide.';
-$wb['nginx_group_error_empty'] = 'Groupe Nginx est vide.';
-$wb['php_ini_path_apache_error_empty'] = 'Chemin Apache php.ini est vide.';
-$wb['php_ini_path_cgi_error_empty'] = 'Chemin CGI php.ini est vide.';
-$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket est vide.';
-$wb['apps_vhost_port_error_empty'] = 'Port Apps-vhost est vide.';
-$wb['apps_vhost_ip_error_empty'] = 'IP Apps-vhost est vide.';
-$wb['fastcgi_starter_path_error_empty'] = 'Chemin FastCGI starter est vide.';
-$wb['fastcgi_starter_script_error_empty'] = 'Script FastCGI starter est vide.';
-$wb['fastcgi_alias_error_empty'] = 'Alias FastCGI est vide.';
-$wb['fastcgi_phpini_path_error_empty'] = 'Chemin FastCGI php.ini est vide.';
-$wb['fastcgi_children_error_empty'] = 'FastCGI Children est vide.';
-$wb['fastcgi_max_requests_error_empty'] = 'Max. Reqû FastCGI est vide.';
-$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin est vide.';
-$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home est vide.';
-$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections est vide.';
-$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications est vide.';
-$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications est vide.';
-$wb['vlogger_config_dir_error_empty'] = 'Repertoire Config est vide.';
-$wb['cron_init_script_error_empty'] = 'Nom de script Cron init est vide.';
-$wb['crontab_dir_error_empty'] = 'Chemin pour crontabs individuels est vide.';
-$wb['cron_wget_error_empty'] = 'Chemin au programme wget program est vide.';
+$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
+$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
+$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID is empty.';
+$wb['mailuser_name_error_empty'] = 'Mailuser Name is empty.';
+$wb['mailuser_group_error_empty'] = 'Mailuser Group is empty.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.';
+$wb['website_basedir_error_empty'] = 'Website basedir is empty.';
+$wb['website_path_error_empty'] = 'Website path is empty.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.';
+$wb['apache_user_error_empty'] = 'Apache user is empty.';
+$wb['apache_group_error_empty'] = 'Apache group is empty.';
+$wb['nginx_user_error_empty'] = 'Nginx user is empty.';
+$wb['nginx_group_error_empty'] = 'Nginx group is empty.';
+$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.';
+$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.';
+$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.';
+$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.';
+$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.';
+$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.';
+$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.';
+$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
+$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
+$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
+$wb['cron_wget_error_empty'] = 'Path to wget program is empty.';
 $wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
-$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script est vide.';
-$wb['php_fpm_ini_path_txt'] = 'Chemin PHP-FPM php.ini ';
-$wb['php_fpm_ini_path_error_empty'] = 'Chemin PHP-FPM php.ini est vide.';
-$wb['php_fpm_pool_dir_txt'] = 'Repertoire PHP-FPM pool';
-$wb['php_fpm_pool_dir_error_empty'] = 'Repertoire PHP-FPM pool est vide.';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
+$wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
+$wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
 $wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
-$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port est vide.';
-$wb['php_fpm_socket_dir_txt'] = 'Repertoire PHP-FPM socket';
-$wb['php_fpm_socket_dir_error_empty'] = 'Repertoire PHP-FPM socket est vide.';
-$wb['try_rescue_txt'] = 'Activer le service de monitoring et redérrer sur éec';
-$wb['do_not_try_rescue_mysql_txt'] = 'Déctiver le monitoring MySQL';
-$wb['do_not_try_rescue_mail_txt'] = 'Déctiver le monitoring Email';
-$wb['rescue_description_txt'] = "<b>Information:</b> Si vous voulez arreter mysql vous devez selectionner la case Déctiver le monitoring MySQL puis attendre 2 à minutes.<br>Si vous n'attendez pas 2 à minutes, rescue va tenter de redérrer mysql!";
-$wb['enable_sni_txt'] = 'Activer SNI';
-$wb['do_not_try_rescue_httpd_txt'] = 'Déctiver le monitoring HTTPD ';
-$wb['set_folder_permissions_on_update_txt'] = 'Regler les permissions des dossiers lors de mise a jour';
-$wb['add_web_users_to_sshusers_group_txt'] = 'Ajouter des utilisateur web au groupe -sshusers- ';
-$wb['connect_userid_to_webid_txt'] = 'Lier Linux userid au webid';
-$wb['connect_userid_to_webid_start_txt'] = 'ID de dért pour la liason userid/webid';
-$wb['website_autoalias_txt'] = 'Auto alias Site web';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
+$wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
+$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure';
+$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
+$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
+$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>if you do not wait 2-3 minutes, rescue will try to restart mysql!';
+$wb['enable_sni_txt'] = 'Enable SNI';
+$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
+$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
+$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
+$wb['website_autoalias_txt'] = 'Website auto alias';
 $wb['website_autoalias_note_txt'] = 'Placeholders:';
-$wb['backup_mode_txt'] = 'Mode Sauvegarde';
-$wb['backup_mode_userzip'] = "Sauvegarder les fichiers web dont l'utilisateur est propriéire en tant que zip";
-$wb['backup_mode_rootgz'] = 'Sauvegarder tous les fichiers dans le repertoire web en tant qu\'utilisateur root';
-$wb['realtime_blackhole_list_txt'] = 'Blackhole (trou noir) List en temps ré';
-$wb['realtime_blackhole_list_note_txt'] = '(Separer les RBL avec des virgules)';
-$wb['ssl_settings_txt'] = 'Réages SSL';
+$wb['backup_mode_txt'] = 'Backup mode';
+$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
+$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
+$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
+$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL’s with commas)';
+$wb['ssl_settings_txt'] = 'SSL Settings';
 $wb['permissions_txt'] = 'Permissions';
-$wb['php_settings_txt'] = 'Réages PHP';
-$wb['apps_vhost_settings_txt'] = 'Réages Apps Vhost';
-$wb['awstats_settings_txt'] = 'Réages AWStats';
-$wb['firewall_txt'] = 'PAre-Feu';
-$wb['mailbox_quota_stats_txt'] = 'Statistiques du Mailbox quota';
-$wb['enable_ip_wildcard_txt'] = 'Autoriser un joker (wildcard) IP (*)';
-$wb['web_folder_protection_txt'] = 'Rendre les dossiers web immuables (attributs éndus)';
-$wb['overtraffic_notify_admin_txt'] = 'Envoyer notification d\'overtraffic à\'admin';
-$wb['overtraffic_notify_client_txt'] = 'Envoyer notification d\'overtraffic au client';
-$wb['rbl_error_regex'] = "Merci de renseigner des noms d'hô RBL valides.";
-$wb['overquota_notify_admin_txt'] = 'Envoyer alertes quota à\'admin';
-$wb['overquota_notify_client_txt'] = 'Envoyer alertes quota au client';
-$wb['overquota_notify_onok_txt'] = 'Envoyer message quota ok au client';
-$wb['overquota_notify_freq_txt'] = 'Envoyer des alertes de quota tous les X jours';
-$wb['overquota_notify_freq_note_txt'] = '0 = envoyer le message uniquement une fois, sans repetition';
-$wb['admin_notify_events_txt'] = 'Envoyer email à\'admin a partir du niveau suivant';
-$wb['no_notifications_txt'] = 'Pas de Notifications';
-$wb['monit_url_txt'] = 'URL Monit';
-$wb['monit_user_txt'] = 'Utilisateur Monit';
-$wb['monit_password_txt'] = 'Mot de passe Monit';
-$wb['monit_url_error_regex'] = 'URL Monit non valide';
+$wb['php_settings_txt'] = 'PHP Settings';
+$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
+$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['firewall_txt'] = 'Firewall';
+$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
+$wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
+$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
+$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
+$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
+$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
+$wb['overquota_notify_admin_txt'] = 'Send quota warnings to admin';
+$wb['overquota_notify_client_txt'] = 'Send quota warnings to client';
+$wb['overquota_notify_onok_txt'] = 'Send quota ok message to client';
+$wb['overquota_notify_freq_txt'] = 'Send quota warning each X days';
+$wb['overquota_notify_freq_note_txt'] = '0 = send message just once, no repeated messages';
+$wb['admin_notify_events_txt'] = 'Send e-mail to admin starting with the following level';
+$wb['no_notifications_txt'] = 'No Notifications';
+$wb['monit_url_txt'] = 'Monit URL';
+$wb['monit_user_txt'] = 'Monit User';
+$wb['monit_password_txt'] = 'Monit Password';
+$wb['monit_url_error_regex'] = 'Invalid Monit URL';
 $wb['monit_url_note_txt'] = 'Placeholder:';
-$wb['munin_url_txt'] = 'URL Munin';
-$wb['munin_user_txt'] = 'Utilisateur Munin';
-$wb['munin_password_txt'] = 'Mot de passe Munin';
-$wb['munin_url_error_regex'] = 'URL Munin non valide ';
+$wb['munin_url_txt'] = 'Munin URL';
+$wb['munin_user_txt'] = 'Munin User';
+$wb['munin_password_txt'] = 'Munin Password';
+$wb['munin_url_error_regex'] = 'Invalid Munin URL';
 $wb['munin_url_note_txt'] = 'Placeholder:';
-$wb['backup_dir_is_mount_txt'] = 'Repertoir de Backup/sauvegarde est un mount?';
-$wb['backup_dir_mount_cmd_txt'] = "Commande Mount, si le repertoire de sauvegarde/backup n'est pas monté";
-$wb['monitor_system_updates_txt'] = 'Verifier pour des mises àour Linux';
-$wb['dkim_path_txt'] = 'Chemin DKIM';
-$wb["v6_prefix_txt"] = 'Prefix IPv6';
-$wb["vhost_rewrite_v6_txt"] = "Récrire IPv6 sur miroir";
-$wb["v6_prefix_length"] = "D\'aprèl'IPv6 déni, le préx est trop long";
-$wb["overquota_db_notify_admin_txt"] = "Envoyer avertissement DB quota à\'admin'";
-$wb["overquota_db_notify_client_txt"] = 'Envoyer avertissement DB quota au client';
+$wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
+$wb['monitor_system_updates_txt'] = 'Check for Linux updates';
 $wb['hostname_error_regex'] = 'Invalid Hostname.';
 $wb['invalid_apache_user_txt'] = 'Invalid apache user.';
 $wb['invalid_apache_group_txt'] = 'Invalid apache group.';
@@ -251,7 +242,42 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
-$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
-$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
+$wb['maildir_format_txt'] = 'Maildir Format';
+$wb['dkim_path_txt'] = 'DKIM Path';
+$wb['mailbox_virtual_uidgid_maps_txt'] = 'Use Websites Linux uid for mailbox';
+$wb['mailbox_virtual_uidgid_maps_info_txt'] = 'only in single web and mail-server-setup';
+$wb['mailbox_virtual_uidgid_maps_error_nosingleserver'] = 'Uid cannot be mapped in multi-server-setup.';
+$wb['mailbox_virtual_uidgid_maps_error_nodovecot'] = 'Uid-mapping can only be used with dovecot.';
+$wb['mailbox_virtual_uidgid_maps_error_alreadyusers'] = 'Uid-mapping cannot be changed if there are already mail users.';
+$wb['reject_sender_login_mismatch_txt'] = 'Reject sender and login mismatch';
+$wb['do_not_try_rescue_mongodb_txt'] = 'Disable MongoDB monitoring';
+$wb['v6_prefix_txt'] = 'IPv6 Prefix';
+$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
+$wb['v6_prefix_length'] = 'Prefix too long according to defined IPv6 ';
+$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
+$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
+$wb['php_handler_txt'] = 'Default PHP Handler';
+$wb['disabled_txt'] = 'Disabled';
+$wb['dkim_strength_txt'] = 'DKIM strength';
+$wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
+$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
+$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
+$wb['enable_spdy_txt'] = 'Makes SPDY available';
+$wb['web_settings_txt'] = 'Web Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+$wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
+$wb['xmpp_bosh_max_inactivity_txt'] = 'Max. BOSH inactivity time';
+$wb['xmpp_bosh_timeout_range_wrong'] = 'Please enter a bosh timeout range between 15 - 360';
+$wb['xmpp_module_saslauth'] = 'saslauth';
+$wb['xmpp_server_admins_txt'] = 'Server Admins (JIDs)';
+$wb['xmpp_modules_enabled_txt'] = 'Serverwide enabled plugins (one per line)';
+$wb['xmpp_ports_txt'] = 'Component ports';
+$wb['xmpp_port_http_txt'] = 'HTTP';
+$wb['xmpp_port_https_txt'] = 'HTTPS';
+$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
+$wb['xmpp_port_bosh_txt'] = 'BOSH';
+$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
+$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
 ?>
-
diff --git a/interface/web/admin/lib/lang/fr_server_ip.lng b/interface/web/admin/lib/lang/fr_server_ip.lng
index 5c2f23eee6..471abb87ae 100644
--- a/interface/web/admin/lib/lang/fr_server_ip.lng
+++ b/interface/web/admin/lib/lang/fr_server_ip.lng
@@ -2,8 +2,8 @@
 $wb['server_id_txt'] = 'Serveur';
 $wb['ip_address_txt'] = 'Adresse IP';
 $wb['virtualhost_txt'] = 'NameVirtualHost HTTP';
-$wb['ip_error_wrong'] = 'L\'adresse IP est invalide';
-$wb['ip_error_unique'] = 'L\'adresse IP doit être unique';
+$wb['ip_error_wrong'] = 'L’adresse IP est invalide';
+$wb['ip_error_unique'] = 'L’adresse IP doit être unique';
 $wb['client_id_txt'] = 'Client';
 $wb['ip_type_txt'] = 'Type';
 $wb['virtualhost_port_txt'] = 'HTTP Ports';
diff --git a/interface/web/admin/lib/lang/fr_server_ip_map.lng b/interface/web/admin/lib/lang/fr_server_ip_map.lng
index 94508abb79..68b196fb23 100644
--- a/interface/web/admin/lib/lang/fr_server_ip_map.lng
+++ b/interface/web/admin/lib/lang/fr_server_ip_map.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["server_id_txt"] = 'Rewrite on Server';
-$wb["source_txt"] = 'Source IP';
-$wb["destination_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
-$wb["ip_error_wrong"] = 'The Destination IP address is invalid';
-$wb["destination_ip_empty"] = 'The Destination IP is empty.';
-$wb["source_ip_empty"] = 'The Source IP is empty.';
-$wb["server_empty_error"] = 'The Server is empty.';
-$wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb['server_id_txt'] = 'Rewrite on Server';
+$wb['source_txt'] = 'Source IP';
+$wb['destination_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
+$wb['ip_error_wrong'] = 'The Destination IP address is invalid';
+$wb['destination_ip_empty'] = 'The Destination IP is empty.';
+$wb['source_ip_empty'] = 'The Source IP is empty.';
+$wb['server_empty_error'] = 'The Server is empty.';
+$wb['duplicate_mapping_error'] = 'Mapping already exists.';
+$wb['ip_mapping_error'] = 'Source IP can not be an IP of the Rewrite-Server';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_server_ip_map_list.lng b/interface/web/admin/lib/lang/fr_server_ip_map_list.lng
index 60c6815fda..1fedc10b2e 100644
--- a/interface/web/admin/lib/lang/fr_server_ip_map_list.lng
+++ b/interface/web/admin/lib/lang/fr_server_ip_map_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'IP Mappings';
-$wb["server_id_txt"] = 'Server';
-$wb["source_ip_txt"] = 'Source IP';
-$wb["destination_ip_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
+$wb['list_head_txt'] = 'IP Mappings';
+$wb['server_id_txt'] = 'Server';
+$wb['source_ip_txt'] = 'Source IP';
+$wb['destination_ip_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_server_list.lng b/interface/web/admin/lib/lang/fr_server_list.lng
index 054195f3e3..ddaeb634af 100644
--- a/interface/web/admin/lib/lang/fr_server_list.lng
+++ b/interface/web/admin/lib/lang/fr_server_list.lng
@@ -10,4 +10,5 @@ $wb['vserver_server_txt'] = 'Serveur VServer';
 $wb['add_new_record_txt'] = 'Ajouter nouveau serveur';
 $wb['proxy_server_txt'] = 'Proxy';
 $wb['firewall_server_txt'] = 'Firewall';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_system_config.lng b/interface/web/admin/lib/lang/fr_system_config.lng
index 0c41479f0e..5892e3a269 100644
--- a/interface/web/admin/lib/lang/fr_system_config.lng
+++ b/interface/web/admin/lib/lang/fr_system_config.lng
@@ -3,29 +3,29 @@ $wb['system_config_desc_txt'] = '';
 $wb['dashboard_atom_url_admin_txt'] = 'URL du fil de syndication Atom du tableau de bord (admin)';
 $wb['dashboard_atom_url_reseller_txt'] = 'URL du fil de syndication Atom du tableau de bord ( reseller)';
 $wb['dashboard_atom_url_client_txt'] = 'URL du fil de syndication Atom du tableau de bord (client)';
-$wb['warning'] = 'Editez ces valeurs prudemment ! Il n\'est pas conseillé de modifier les préfixes lorsque vous avez des clients !';
-$wb['dbname_prefix_txt'] = 'Préfixe du nom de la BDD';
-$wb['dbuser_prefix_txt'] = 'Préfixe de l\'utilisateur de la BDD';
-$wb['shelluser_prefix_txt'] = 'Préfixe de l\'utilisateur Shell';
-$wb['webdavuser_prefix_txt'] = 'Préfixe de l\'utilisateur Webdav';
-$wb['ftpuser_prefix_txt'] = 'Préfixe de l\'utilisateur FTP';
+$wb['warning'] = 'Editez ces valeurs prudemment ! Il n’est pas conseillé de modifier les préfixes lorsque vous avez des clients !';
+$wb['dbname_prefix_txt'] = 'Préfixe du nom de la BDd';
+$wb['dbuser_prefix_txt'] = 'Préfixe de l’utilisateur de la BDd';
+$wb['shelluser_prefix_txt'] = 'Préfixe de l’utilisateur Shell';
+$wb['webdavuser_prefix_txt'] = 'Préfixe de l’utilisateur WebDAV';
+$wb['ftpuser_prefix_txt'] = 'Préfixe de l’utilisateur FTP';
 $wb['dbname_prefix_error_regex'] = 'Caractère non autorisé dans le préfixe du nom de la BDD.';
-$wb['dbuser_prefix_error_regex'] = 'Caractère non autorisé dans le préfixe de l\'utilisateur de la BDD.';
-$wb['ftpuser_prefix_error_regex'] = 'Caractère non autorisé dans le préfixe de l\'utilisateur FTP.';
-$wb['shelluser_prefix_error_regex'] = 'Caractère non autorisé dans le préfixe de l\'utilisateur Shell.';
-$wb['webdavuser_prefix_error_regex'] = 'Caractère non autorisé dans le préfixe utilisateur Webdav.';
+$wb['dbuser_prefix_error_regex'] = 'Caractère non autorisé dans le préfixe de l’utilisateur de la BDD.';
+$wb['ftpuser_prefix_error_regex'] = 'Caractère non autorisé dans le préfixe de l’utilisateur FTP.';
+$wb['shelluser_prefix_error_regex'] = 'Caractère non autorisé dans le préfixe de l’utilisateur Shell.';
+$wb['webdavuser_prefix_error_regex'] = 'Caractère non autorisé dans le préfixe utilisateur WebDAV.';
 $wb['dblist_phpmyadmin_link_txt'] = 'Lien vers PHPMyAdmin dans la liste des bases';
-$wb['enable_custom_login_txt'] = 'Autoriser les noms d\'utilisateurs personnalisés';
-$wb['mailboxlist_webmail_link_txt'] = 'Lien vers le Webmail dans la liste des boites mail';
+$wb['enable_custom_login_txt'] = 'Autoriser les noms d’utilisateurs personnalisés';
+$wb['mailboxlist_webmail_link_txt'] = 'Lien vers le Webmail dans la liste des boîtes mail';
 $wb['webmail_url_txt'] = 'URL du Webmail';
-$wb['mailmailinglist_link_txt'] = 'Lien vers la mailing list dans la liste des Mailing list';
-$wb['mailmailinglist_url_txt'] = 'URL des Mailing list';
+$wb['mailmailinglist_link_txt'] = 'Lien vers la mailing list dans la liste des Liste de distribution';
+$wb['mailmailinglist_url_txt'] = 'URL des Liste de distribution';
 $wb['phpmyadmin_url_txt'] = 'URL de PHPMyAdmin';
 $wb['use_domain_module_txt'] = 'Utiliser le module de domaine pour ajouter de nouveaux domaines';
-$wb['use_domain_module_hint'] = 'Si vous utilisez ce module, vos utilisateurs peuvent uniquement sélectionner un des domaines que l\'admin crée pour eux. Ils ne peuvent pas éditer librement le champ domaine. Vous devez vous identifier à nouveau après avoir modifié cette valeur pour rendre les modifications visibles.';
+$wb['use_domain_module_hint'] = 'Si vous utilisez ce module, vos utilisateurs peuvent uniquement sélectionner un des domaines que l’admin crée pour eux. Ils ne peuvent pas éditer librement le champ domaine. Vous devez vous identifier à nouveau après avoir modifié cette valeur pour rendre les modifications visibles.';
 $wb['new_domain_txt'] = 'HTML pour créer un nouveau domaine';
 $wb['webftp_url_txt'] = 'URL du WebFTP';
-$wb['admin_mail_txt'] = 'E-mail de l\'administrateur';
+$wb['admin_mail_txt'] = 'E-mail de l’administrateur';
 $wb['monitor_key_txt'] = 'Mot-clé du moniteur';
 $wb['admin_name_txt'] = 'Nom des administrateurs';
 $wb['maintenance_mode_txt'] = 'Maintenance Mode';
@@ -39,16 +39,13 @@ $wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail
 $wb['tab_change_discard_txt'] = 'Discard changes on tab change';
 $wb['tab_change_warning_txt'] = 'Tab change warning';
 $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'] = 'Create Subdomains as web site';
 $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
-$wb['vhost_aliasdomains_txt'] = 'Create aliasdomains as web site';
-$wb['vhost_aliasdomains_note_txt'] = 'You cannot disable this as long as vhost aliasdomains 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['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
-$wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
+$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_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
@@ -71,9 +68,17 @@ $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["company_name_txt"] = "Company Name for the page title";
-$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
-$wb["custom_login_text_txt"] = "Custom Text on Login-Page";
-$wb["custom_login_link_txt"] = "Custom Link on Login-Page";
-$wb["login_link_error_regex"] = "Invalid Link for Custom Login";
+$wb['vhost_aliasdomains_txt'] = 'Create aliasdomains as web site';
+$wb['vhost_aliasdomains_note_txt'] = 'You cannot disable this as long as vhost aliasdomains exist in the system!';
+$wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['company_name_txt'] = 'Company Name for the page title';
+$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
+$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
+$wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
+$wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_users.lng b/interface/web/admin/lib/lang/fr_users.lng
index c256389bf7..b434aae37c 100644
--- a/interface/web/admin/lib/lang/fr_users.lng
+++ b/interface/web/admin/lib/lang/fr_users.lng
@@ -1,6 +1,6 @@
 <?php
-$wb['username_txt'] = 'Nom d\'utilisateur';
-$wb['username_err'] = 'Le nom d\'utilisateur est trop long ou contient des caractères invalides.';
+$wb['username_txt'] = 'Nom d’utilisateur';
+$wb['username_err'] = 'Le nom d’utilisateur est trop long ou contient des caractères invalides.';
 $wb['passwort_txt'] = 'Mot de passe';
 $wb['modules_txt'] = 'Module';
 $wb['startmodule_txt'] = 'Module de démarrage';
@@ -15,20 +15,21 @@ $wb['strasse_txt'] = 'Rue';
 $wb['ort_txt'] = 'Ville';
 $wb['plz_txt'] = 'Code Postal';
 $wb['land_txt'] = 'Pays';
-$wb['email_txt'] = 'Email';
+$wb['email_txt'] = 'E-mail';
 $wb['url_txt'] = 'Url';
 $wb['telefon_txt'] = 'Télephone';
 $wb['fax_txt'] = 'Fax';
 $wb['groups_txt'] = 'Groupes';
 $wb['default_group_txt'] = 'Groupe par Défaut';
-$wb['username_empty'] = 'Le nom d\'utilisateur est vide.';
-$wb['username_unique'] = 'Le nom d\'utilisateur entré existe déja.';
+$wb['username_empty'] = 'Le nom d’utilisateur est vide.';
+$wb['username_unique'] = 'Le nom d’utilisateur entré existe déja.';
 $wb['password_strength_txt'] = 'Force du mot de passe';
 $wb['startmodule_err'] = 'Le module de départ nexiste pas.';
-$wb['generate_password_txt'] = 'Generate Password';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
 $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['lost_password_function_txt'] = 'Forgot password function is available';
 ?>
diff --git a/interface/web/admin/lib/lang/fr_users_list.lng b/interface/web/admin/lib/lang/fr_users_list.lng
index 44b04da327..cdedcfe457 100644
--- a/interface/web/admin/lib/lang/fr_users_list.lng
+++ b/interface/web/admin/lib/lang/fr_users_list.lng
@@ -1,7 +1,7 @@
 <?php
 $wb['list_head_txt'] = 'Utilisateurs';
-$wb['username_txt'] = 'Nom d\'utilisateur';
-$wb['client_id_txt'] = 'Client ID';
+$wb['username_txt'] = 'Nom d’utilisateur';
+$wb['client_id_txt'] = 'Client Id';
 $wb['active_txt'] = 'Active';
 $wb['add_new_record_txt'] = 'Ajouter un nouvel utilisateur';
 $wb['warning_txt'] = '<b>ATTENTION:</b> Ne pas éditer ou modifier de paramètre utilisateur ici. Utilisez les paramètres Client et Revendeur dans le module Client à la place. Modifier ou changer les informations ici peut conduire à la perte de données';
diff --git a/interface/web/admin/lib/lang/hr.lng b/interface/web/admin/lib/lang/hr.lng
index 919b172def..f105e1f5e9 100644
--- a/interface/web/admin/lib/lang/hr.lng
+++ b/interface/web/admin/lib/lang/hr.lng
@@ -47,6 +47,6 @@ $wb['Remote Actions'] = 'Udaljene akcije';
 $wb['Do OS-Update'] = 'Nadogradnja sistema';
 $wb['Do ISPConfig-Update'] = 'Nadogradnja control panela';
 $wb['Directive Snippets'] = 'Direktive';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_directive_snippets.lng b/interface/web/admin/lib/lang/hr_directive_snippets.lng
index 2c626b63e3..ec6bc986f0 100644
--- a/interface/web/admin/lib/lang/hr_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/hr_directive_snippets.lng
@@ -7,6 +7,5 @@ $wb['active_txt'] = 'Aktivno';
 $wb['directive_snippets_name_empty'] = 'Molimo vas specificirajte naziv direktive.';
 $wb['directive_snippets_name_error_unique'] = 'Već postoji direktiva sa tim imenom.';
 $wb['variables_txt'] = 'Varijable';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_directive_snippets_list.lng b/interface/web/admin/lib/lang/hr_directive_snippets_list.lng
index 15cbc57c36..e04c6e2be9 100644
--- a/interface/web/admin/lib/lang/hr_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/hr_directive_snippets_list.lng
@@ -4,6 +4,5 @@ $wb['active_txt'] = 'Aktivno';
 $wb['name_txt'] = 'Naziv predloška';
 $wb['type_txt'] = 'Vrsta';
 $wb['add_new_record_txt'] = 'Dodaj direktivu';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_firewall.lng b/interface/web/admin/lib/lang/hr_firewall.lng
index ae643c334b..7e28a3aaf1 100644
--- a/interface/web/admin/lib/lang/hr_firewall.lng
+++ b/interface/web/admin/lib/lang/hr_firewall.lng
@@ -9,5 +9,3 @@ $wb['firewall_error_unique'] = 'Već postoji firewall zapis za ovaj server.';
 $wb['tcp_ports_error_regex'] = 'Nedozvoljeni znak pri definiciji TCP porta. Dozvoljeni znakovi su znamenke, : i ,.';
 $wb['udp_ports_error_regex'] = 'Nedozvoljeni znak pri definiciji UDP porta. Dozvoljeni znakovi su znamenke, : i ,.';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_firewall_list.lng b/interface/web/admin/lib/lang/hr_firewall_list.lng
index 2bdb9d5857..568d915a71 100644
--- a/interface/web/admin/lib/lang/hr_firewall_list.lng
+++ b/interface/web/admin/lib/lang/hr_firewall_list.lng
@@ -6,5 +6,3 @@ $wb['tcp_port_txt'] = 'Otvoreni TCP portovi';
 $wb['udp_port_txt'] = 'Otvoreni UDP portovi';
 $wb['add_new_record_txt'] = 'Dodaj Firewall zapis';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_groups.lng b/interface/web/admin/lib/lang/hr_groups.lng
index df0d679bb6..33c1e70df9 100644
--- a/interface/web/admin/lib/lang/hr_groups.lng
+++ b/interface/web/admin/lib/lang/hr_groups.lng
@@ -3,5 +3,3 @@ $wb['description_txt'] = 'Opis';
 $wb['name_txt'] = 'Grupa';
 $wb['name_err'] = 'Grupa mora biti barem jedan do maksimalno 30 znakova.';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_groups_list.lng b/interface/web/admin/lib/lang/hr_groups_list.lng
index def87cc8a8..e88fae2e7e 100644
--- a/interface/web/admin/lib/lang/hr_groups_list.lng
+++ b/interface/web/admin/lib/lang/hr_groups_list.lng
@@ -5,5 +5,3 @@ $wb['name_txt'] = 'Grupa';
 $wb['add_new_record_txt'] = 'Dodaj grupu';
 $wb['warning_txt'] = '<b>UPOZORENJE:</b> Ne mijenjajte postavke klijenta ovdje. Koristite ';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_iptables.lng b/interface/web/admin/lib/lang/hr_iptables.lng
index 112d75a20d..a05513cccf 100644
--- a/interface/web/admin/lib/lang/hr_iptables.lng
+++ b/interface/web/admin/lib/lang/hr_iptables.lng
@@ -11,5 +11,3 @@ $wb['source_ip_txt'] = 'Adresa izvora';
 $wb['active_txt'] = 'Aktivno';
 $wb['iptables_error_unique'] = 'Već postoji zapis u vatrozidu za ovaj server.';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_iptables_list.lng b/interface/web/admin/lib/lang/hr_iptables_list.lng
index f90d7eeced..869bd17761 100644
--- a/interface/web/admin/lib/lang/hr_iptables_list.lng
+++ b/interface/web/admin/lib/lang/hr_iptables_list.lng
@@ -13,5 +13,3 @@ $wb['source_ip_txt'] = 'Adresa izvora';
 $wb['active_txt'] = 'Aktivno';
 $wb['iptables_error_unique'] = 'Već postoji firewall zapis za ovaj server.';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_language_add.lng b/interface/web/admin/lib/lang/hr_language_add.lng
index 3536ac306f..d4a3e1bd85 100644
--- a/interface/web/admin/lib/lang/hr_language_add.lng
+++ b/interface/web/admin/lib/lang/hr_language_add.lng
@@ -6,5 +6,3 @@ $wb['language_new_hint_txt'] = '2 znaka ISO 639-1 jezičnog-koda (Pogledaj http:
 $wb['btn_save_txt'] = 'Kreiraj novu jezičnu datoteku';
 $wb['btn_cancel_txt'] = 'Natrag';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_language_complete.lng b/interface/web/admin/lib/lang/hr_language_complete.lng
index 1f7cb8ea18..e9ce1e5909 100644
--- a/interface/web/admin/lib/lang/hr_language_complete.lng
+++ b/interface/web/admin/lib/lang/hr_language_complete.lng
@@ -5,5 +5,3 @@ $wb['language_select_txt'] = 'Izaberi jezik';
 $wb['btn_save_txt'] = 'Spoji jezike';
 $wb['btn_cancel_txt'] = 'Natrag';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_language_edit.lng b/interface/web/admin/lib/lang/hr_language_edit.lng
index 18c2e7a20a..b223069ba0 100644
--- a/interface/web/admin/lib/lang/hr_language_edit.lng
+++ b/interface/web/admin/lib/lang/hr_language_edit.lng
@@ -6,5 +6,3 @@ $wb['lang_file_txt'] = 'Jezična datoteka';
 $wb['btn_save_txt'] = 'Spremi';
 $wb['btn_cancel_txt'] = 'Natrag';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_language_export.lng b/interface/web/admin/lib/lang/hr_language_export.lng
index 74330bb989..4799ddf85c 100644
--- a/interface/web/admin/lib/lang/hr_language_export.lng
+++ b/interface/web/admin/lib/lang/hr_language_export.lng
@@ -4,5 +4,3 @@ $wb['language_select_txt'] = 'Izaberi jezik';
 $wb['btn_save_txt'] = 'Eksportiraj izabranu jezičnu datoteku';
 $wb['btn_cancel_txt'] = 'Natrag';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_language_import.lng b/interface/web/admin/lib/lang/hr_language_import.lng
index 6944bcb2ca..3a12da47fe 100644
--- a/interface/web/admin/lib/lang/hr_language_import.lng
+++ b/interface/web/admin/lib/lang/hr_language_import.lng
@@ -7,5 +7,3 @@ $wb['btn_cancel_txt'] = 'Natrag';
 $wb['ignore_version_txt'] = 'Preskoči provjeru ISPConfig verzije';
 $wb['list_desc_txt'] = 'PAŽNJA: Nemojte importirati jezične datoteke preuzete sa nepoznatih web lokacija.';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_language_list.lng b/interface/web/admin/lib/lang/hr_language_list.lng
index 2595cc82aa..68f9cca26a 100644
--- a/interface/web/admin/lib/lang/hr_language_list.lng
+++ b/interface/web/admin/lib/lang/hr_language_list.lng
@@ -5,5 +5,3 @@ $wb['module_txt'] = 'Modul';
 $wb['lang_file_txt'] = 'Jezična datoteka';
 $wb['lang_file_date_txt'] = 'Zadnja promjena';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_package_install.lng b/interface/web/admin/lib/lang/hr_package_install.lng
index c690075c15..181c797ab1 100644
--- a/interface/web/admin/lib/lang/hr_package_install.lng
+++ b/interface/web/admin/lib/lang/hr_package_install.lng
@@ -5,5 +5,3 @@ $wb['repo_username_txt'] = 'Korisničko ime (opcionalno)';
 $wb['repo_password_txt'] = 'Šifra (opcionalno)';
 $wb['active_txt'] = 'Aktivno';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_remote_action.lng b/interface/web/admin/lib/lang/hr_remote_action.lng
index 221c3b40e4..fd1444fbdd 100644
--- a/interface/web/admin/lib/lang/hr_remote_action.lng
+++ b/interface/web/admin/lib/lang/hr_remote_action.lng
@@ -10,5 +10,3 @@ $wb['select_all_server'] = 'Svi serveri';
 $wb['ispconfig_update_title'] = 'Upute za ISPConfig nadogradnju';
 $wb['ispconfig_update_text'] = 'Logiraj se kao root korisnik na server (SSH) i pokreni:<br /><br /><strong>ispconfig_update.sh</strong><br /><br /><a href=\'http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/\' target=\'_blank\'>Pogledaj detaljne upute ovdje</a>';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_remote_user.lng b/interface/web/admin/lib/lang/hr_remote_user.lng
index 827b317b91..9f6331b3ea 100644
--- a/interface/web/admin/lib/lang/hr_remote_user.lng
+++ b/interface/web/admin/lib/lang/hr_remote_user.lng
@@ -45,5 +45,3 @@ $wb['repeat_password_txt'] = 'Ponovi šifru';
 $wb['password_mismatch_txt'] = 'Šifre nisu identične.';
 $wb['password_match_txt'] = 'Šifre su identične.';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_remote_user_list.lng b/interface/web/admin/lib/lang/hr_remote_user_list.lng
index 629e01d7bd..13afd0bde1 100644
--- a/interface/web/admin/lib/lang/hr_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/hr_remote_user_list.lng
@@ -5,5 +5,3 @@ $wb['add_new_record_txt'] = 'Dodaj udaljenog klijenta';
 $wb['parent_remote_userid_txt'] = 'ID';
 $wb['username_txt'] = 'Korisničko ime';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_server.lng b/interface/web/admin/lib/lang/hr_server.lng
index bd9f6a8d5a..3fb4f5d38a 100644
--- a/interface/web/admin/lib/lang/hr_server.lng
+++ b/interface/web/admin/lib/lang/hr_server.lng
@@ -12,6 +12,5 @@ $wb['mirror_server_id_txt'] = 'je kopija servera';
 $wb['- None -'] = '- izaberi server -';
 $wb['proxy_server_txt'] = 'Proxy server';
 $wb['firewall_server_txt'] = 'Vatrozid server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_server_config.lng b/interface/web/admin/lib/lang/hr_server_config.lng
index c11593f28b..4c87f4ac97 100644
--- a/interface/web/admin/lib/lang/hr_server_config.lng
+++ b/interface/web/admin/lib/lang/hr_server_config.lng
@@ -195,11 +195,11 @@ $wb['munin_user_txt'] = 'Munin korisničko ime';
 $wb['munin_password_txt'] = 'Munin šifra';
 $wb['munin_url_error_regex'] = 'Neispravan Munin URL';
 $wb['munin_url_note_txt'] = 'Placeholder:';
-$wb["dkim_path_txt"] = 'DKIM Path';
+$wb['dkim_path_txt'] = 'DKIM Path';
 $wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
-$wb["v6_prefix_txt"] = 'IPv6 Prefix';
-$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
-$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
+$wb['v6_prefix_txt'] = 'IPv6 Prefix';
+$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
+$wb['v6_prefix_length'] = 'Prefix too long according to defined IPv6 ';
 $wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
 $wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
 $wb['monitor_system_updates_txt'] = 'Check for Linux updates';
@@ -255,8 +255,29 @@ $wb['cron_init_script_error_regex'] = 'Neispravan cron init script.';
 $wb['crontab_dir_error_regex'] = 'Neispravan crontab direktorij.';
 $wb['cron_wget_error_regex'] = 'Neispravna cron wget putanja.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
-$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
-$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
+$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
+$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
+$wb['do_not_try_rescue_mongodb_txt'] = 'Disable MongoDB monitoring';
+$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
+$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
+$wb['php_handler_txt'] = 'Default PHP Handler';
+$wb['disabled_txt'] = 'Disabled';
+$wb['dkim_strength_txt'] = 'DKIM strength';
+$wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
+$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
+$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
+$wb['enable_spdy_txt'] = 'Makes SPDY available';
+$wb['web_settings_txt'] = 'Web Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+$wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
+$wb['xmpp_bosh_max_inactivity_txt'] = 'Max. BOSH inactivity time';
+$wb['xmpp_bosh_timeout_range_wrong'] = 'Please enter a bosh timeout range between 15 - 360';
+$wb['xmpp_module_saslauth'] = 'saslauth';
+$wb['xmpp_server_admins_txt'] = 'Server Admins (JIDs)';
+$wb['xmpp_modules_enabled_txt'] = 'Serverwide enabled plugins (one per line)';
+$wb['xmpp_ports_txt'] = 'Component ports';
+$wb['xmpp_port_http_txt'] = 'HTTP';
+$wb['xmpp_port_https_txt'] = 'HTTPS';
+$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
+$wb['xmpp_port_bosh_txt'] = 'BOSH';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_server_config_list.lng b/interface/web/admin/lib/lang/hr_server_config_list.lng
index f6b836e376..4b814eb1df 100644
--- a/interface/web/admin/lib/lang/hr_server_config_list.lng
+++ b/interface/web/admin/lib/lang/hr_server_config_list.lng
@@ -2,5 +2,3 @@
 $wb['list_head_txt'] = 'Konfiguracija servera';
 $wb['server_name_txt'] = 'Server';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_server_ip.lng b/interface/web/admin/lib/lang/hr_server_ip.lng
index 61a9891732..0ddf8be14c 100644
--- a/interface/web/admin/lib/lang/hr_server_ip.lng
+++ b/interface/web/admin/lib/lang/hr_server_ip.lng
@@ -9,5 +9,3 @@ $wb['ip_type_txt'] = 'Vrsta';
 $wb['virtualhost_port_txt'] = 'HTTP portovi';
 $wb['error_port_syntax'] = 'Nedozvoljeni znakovi u port polju, unesite samo znamenke odvojene zarezom. Primjer: 80,443';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_server_ip_list.lng b/interface/web/admin/lib/lang/hr_server_ip_list.lng
index 0a6673dc5d..d4210d3a80 100644
--- a/interface/web/admin/lib/lang/hr_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/hr_server_ip_list.lng
@@ -8,5 +8,3 @@ $wb['virtualhost_txt'] = 'HTTP Vhost';
 $wb['virtualhost_port_txt'] = 'HTTP portovi';
 $wb['ip_type_txt'] = 'Vrsta';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_server_ip_map.lng b/interface/web/admin/lib/lang/hr_server_ip_map.lng
index 94508abb79..68b196fb23 100644
--- a/interface/web/admin/lib/lang/hr_server_ip_map.lng
+++ b/interface/web/admin/lib/lang/hr_server_ip_map.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["server_id_txt"] = 'Rewrite on Server';
-$wb["source_txt"] = 'Source IP';
-$wb["destination_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
-$wb["ip_error_wrong"] = 'The Destination IP address is invalid';
-$wb["destination_ip_empty"] = 'The Destination IP is empty.';
-$wb["source_ip_empty"] = 'The Source IP is empty.';
-$wb["server_empty_error"] = 'The Server is empty.';
-$wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb['server_id_txt'] = 'Rewrite on Server';
+$wb['source_txt'] = 'Source IP';
+$wb['destination_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
+$wb['ip_error_wrong'] = 'The Destination IP address is invalid';
+$wb['destination_ip_empty'] = 'The Destination IP is empty.';
+$wb['source_ip_empty'] = 'The Source IP is empty.';
+$wb['server_empty_error'] = 'The Server is empty.';
+$wb['duplicate_mapping_error'] = 'Mapping already exists.';
+$wb['ip_mapping_error'] = 'Source IP can not be an IP of the Rewrite-Server';
 ?>
diff --git a/interface/web/admin/lib/lang/hr_server_ip_map_list.lng b/interface/web/admin/lib/lang/hr_server_ip_map_list.lng
index 60c6815fda..1fedc10b2e 100644
--- a/interface/web/admin/lib/lang/hr_server_ip_map_list.lng
+++ b/interface/web/admin/lib/lang/hr_server_ip_map_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'IP Mappings';
-$wb["server_id_txt"] = 'Server';
-$wb["source_ip_txt"] = 'Source IP';
-$wb["destination_ip_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
+$wb['list_head_txt'] = 'IP Mappings';
+$wb['server_id_txt'] = 'Server';
+$wb['source_ip_txt'] = 'Source IP';
+$wb['destination_ip_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
 ?>
diff --git a/interface/web/admin/lib/lang/hr_server_list.lng b/interface/web/admin/lib/lang/hr_server_list.lng
index 1896375114..61dedb7d99 100644
--- a/interface/web/admin/lib/lang/hr_server_list.lng
+++ b/interface/web/admin/lib/lang/hr_server_list.lng
@@ -10,6 +10,5 @@ $wb['vserver_server_txt'] = 'VServer';
 $wb['add_new_record_txt'] = 'Dodaj novi server';
 $wb['proxy_server_txt'] = 'Proxy';
 $wb['firewall_server_txt'] = 'Vatrozid';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_server_php.lng b/interface/web/admin/lib/lang/hr_server_php.lng
index febb3bae23..585332f6d0 100644
--- a/interface/web/admin/lib/lang/hr_server_php.lng
+++ b/interface/web/admin/lib/lang/hr_server_php.lng
@@ -14,5 +14,3 @@ $wb['php_fpm_init_script_txt'] = 'Putanja do PHP-FPM init skripte';
 $wb['php_fpm_ini_dir_txt'] = 'Putanja do php.ini direktorija';
 $wb['php_fpm_pool_dir_txt'] = 'Putanja do PHP-FPM pool direktorija';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_server_php_list.lng b/interface/web/admin/lib/lang/hr_server_php_list.lng
index b763dcc1c7..8fd3db7a05 100644
--- a/interface/web/admin/lib/lang/hr_server_php_list.lng
+++ b/interface/web/admin/lib/lang/hr_server_php_list.lng
@@ -5,5 +5,3 @@ $wb['add_new_record_txt'] = 'Add new PHP version';
 $wb['client_id_txt'] = 'Klijent';
 $wb['name_txt'] = 'PHP Name';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_software_package.lng b/interface/web/admin/lib/lang/hr_software_package.lng
index 4fda4e6c0e..faffe38217 100644
--- a/interface/web/admin/lib/lang/hr_software_package.lng
+++ b/interface/web/admin/lib/lang/hr_software_package.lng
@@ -4,5 +4,3 @@ $wb['package_key_txt'] = 'Package Key';
 $wb['Software Package'] = 'Software Package';
 $wb['Modify software package details'] = 'Modify software package details';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_software_package_install.lng b/interface/web/admin/lib/lang/hr_software_package_install.lng
index df68e358cb..22d7e0ce7a 100644
--- a/interface/web/admin/lib/lang/hr_software_package_install.lng
+++ b/interface/web/admin/lib/lang/hr_software_package_install.lng
@@ -4,5 +4,3 @@ $wb['install_key_txt'] = 'Unesi instalacijski ključ';
 $wb['btn_save_txt'] = 'Pokreni instalaciju';
 $wb['btn_cancel_txt'] = 'Odustani';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_software_package_list.lng b/interface/web/admin/lib/lang/hr_software_package_list.lng
index dc427fffa8..3722c5cff4 100644
--- a/interface/web/admin/lib/lang/hr_software_package_list.lng
+++ b/interface/web/admin/lib/lang/hr_software_package_list.lng
@@ -11,5 +11,3 @@ $wb['no_packages_txt'] = 'No packages available';
 $wb['edit_txt'] = 'Edit';
 $wb['delete_txt'] = 'Delete';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_software_repo.lng b/interface/web/admin/lib/lang/hr_software_repo.lng
index 16f210f374..bbfb2e2db2 100644
--- a/interface/web/admin/lib/lang/hr_software_repo.lng
+++ b/interface/web/admin/lib/lang/hr_software_repo.lng
@@ -6,5 +6,3 @@ $wb['repo_password_txt'] = 'Šifra (opcionalno)';
 $wb['active_txt'] = 'Aktivno';
 $wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_software_repo_list.lng b/interface/web/admin/lib/lang/hr_software_repo_list.lng
index ab81d1c6d2..b79045bd76 100644
--- a/interface/web/admin/lib/lang/hr_software_repo_list.lng
+++ b/interface/web/admin/lib/lang/hr_software_repo_list.lng
@@ -4,5 +4,3 @@ $wb['active_txt'] = 'Aktivno';
 $wb['repo_name_txt'] = 'Repozitorij';
 $wb['repo_url_txt'] = 'URL';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_software_update_list.lng b/interface/web/admin/lib/lang/hr_software_update_list.lng
index 0990b311e4..2250a186a3 100644
--- a/interface/web/admin/lib/lang/hr_software_update_list.lng
+++ b/interface/web/admin/lib/lang/hr_software_update_list.lng
@@ -7,5 +7,3 @@ $wb['version_txt'] = 'Verzija';
 $wb['action_txt'] = 'Akcija';
 $wb['no_updates_txt'] = 'Nema nadogradnji';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_system_config.lng b/interface/web/admin/lib/lang/hr_system_config.lng
index c00a567364..e02ae57a20 100644
--- a/interface/web/admin/lib/lang/hr_system_config.lng
+++ b/interface/web/admin/lib/lang/hr_system_config.lng
@@ -71,11 +71,14 @@ $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["company_name_txt"] = "Company Name for the page title";
-$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
-$wb["custom_login_text_txt"] = "Custom Text on Login-Page";
-$wb["custom_login_link_txt"] = "Custom Link on Login-Page";
-$wb["login_link_error_regex"] = "Invalid Link for Custom Login";
+$wb['company_name_txt'] = 'Company Name for the page title';
+$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
+$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
+$wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
+$wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_tpl_default_admin.lng b/interface/web/admin/lib/lang/hr_tpl_default_admin.lng
index a28c5172b0..34ddda19e8 100644
--- a/interface/web/admin/lib/lang/hr_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/hr_tpl_default_admin.lng
@@ -16,5 +16,3 @@ $wb['php_fpm_init_script_txt'] = 'Putanja do PHP-FPM init skripte';
 $wb['php_fpm_ini_dir_txt'] = 'Putanja do php.ini direktorija';
 $wb['php_fpm_pool_dir_txt'] = 'Putanja do PHP-FPM pool direktorija';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_users.lng b/interface/web/admin/lib/lang/hr_users.lng
index 0a9ad64dcd..15e12a52f0 100644
--- a/interface/web/admin/lib/lang/hr_users.lng
+++ b/interface/web/admin/lib/lang/hr_users.lng
@@ -31,6 +31,5 @@ $wb['password_mismatch_txt'] = 'Šifre nisu identične.';
 $wb['password_match_txt'] = 'Šifre su identične.';
 $wb['username_error_collision'] = 'Korisničko ime ne može biti web ili web sa brojem.\\"';
 $wb['client_not_admin_err'] = 'Korisnik koji je u grupi klijenti ne može biti admin';
+$wb['lost_password_function_txt'] = 'Forgot password function is available';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hr_users_list.lng b/interface/web/admin/lib/lang/hr_users_list.lng
index e0014c996d..c102e5f7f5 100644
--- a/interface/web/admin/lib/lang/hr_users_list.lng
+++ b/interface/web/admin/lib/lang/hr_users_list.lng
@@ -7,5 +7,3 @@ $wb['add_new_record_txt'] = 'Dodaj klijenta';
 $wb['warning_txt'] = '<b>UPOZORENJE:</b> Ovdje nemojte mijenjati podatke klijenta. Koristite \\"Klijent\\" i \\"Preprodavač\\" postavke u Klijent modulu. Mijenjanjem postavki klijenata ili grupa može doći do gubitka podataka!';
 $wb['groups_txt'] = 'Groups';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/hu.lng b/interface/web/admin/lib/lang/hu.lng
index 81209fe8db..3864c43861 100644
--- a/interface/web/admin/lib/lang/hu.lng
+++ b/interface/web/admin/lib/lang/hu.lng
@@ -47,4 +47,6 @@ $wb['Remote Actions'] = 'Remote Actions';
 $wb['Do OS-Update'] = 'OR-Frissítés';
 $wb['Do ISPConfig-Update'] = 'ISPConfig-Frissítés';
 $wb['Directive Snippets'] = 'Directive Snippets';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
 ?>
diff --git a/interface/web/admin/lib/lang/hu_directive_snippets.lng b/interface/web/admin/lib/lang/hu_directive_snippets.lng
index 0f09c12ee0..21387b31e5 100644
--- a/interface/web/admin/lib/lang/hu_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/hu_directive_snippets.lng
@@ -7,4 +7,5 @@ $wb['active_txt'] = 'Active';
 $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
 $wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
 $wb['variables_txt'] = 'Variables';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/hu_directive_snippets_list.lng b/interface/web/admin/lib/lang/hu_directive_snippets_list.lng
index 4124ea3464..8e189f9f79 100644
--- a/interface/web/admin/lib/lang/hu_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/hu_directive_snippets_list.lng
@@ -4,4 +4,5 @@ $wb['active_txt'] = 'Active';
 $wb['name_txt'] = 'Name of Snippet';
 $wb['type_txt'] = 'Type';
 $wb['add_new_record_txt'] = 'Add Directive Snippet';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/hu_server.lng b/interface/web/admin/lib/lang/hu_server.lng
index d7f1ba2b6d..6f96b9a7a3 100644
--- a/interface/web/admin/lib/lang/hu_server.lng
+++ b/interface/web/admin/lib/lang/hu_server.lng
@@ -12,4 +12,5 @@ $wb['mirror_server_id_txt'] = 'Is mirror of Server';
 $wb['- None -'] = '- Nem -';
 $wb['proxy_server_txt'] = 'Proxy-Server';
 $wb['firewall_server_txt'] = 'Firewall-Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
 ?>
diff --git a/interface/web/admin/lib/lang/hu_server_config.lng b/interface/web/admin/lib/lang/hu_server_config.lng
index 1e4c2a1bd5..7eff09746d 100644
--- a/interface/web/admin/lib/lang/hu_server_config.lng
+++ b/interface/web/admin/lib/lang/hu_server_config.lng
@@ -195,11 +195,11 @@ $wb['munin_user_txt'] = 'Munin User';
 $wb['munin_password_txt'] = 'Munin Password';
 $wb['munin_url_error_regex'] = 'Invalid Munin URL';
 $wb['munin_url_note_txt'] = 'Placeholder:';
-$wb["dkim_path_txt"] = 'DKIM Path';
+$wb['dkim_path_txt'] = 'DKIM Path';
 $wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
-$wb["v6_prefix_txt"] = 'IPv6 Prefix';
-$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
-$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
+$wb['v6_prefix_txt'] = 'IPv6 Prefix';
+$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
+$wb['v6_prefix_length'] = 'Prefix too long according to defined IPv6 ';
 $wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
 $wb['monitor_system_updates_txt'] = 'Check for Linux updates';
 $wb['hostname_error_regex'] = 'Invalid Hostname.';
@@ -254,6 +254,30 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
-$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
-$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
+$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
+$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
+$wb['do_not_try_rescue_mongodb_txt'] = 'Disable MongoDB monitoring';
+$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
+$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
+$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
+$wb['php_handler_txt'] = 'Default PHP Handler';
+$wb['disabled_txt'] = 'Disabled';
+$wb['dkim_strength_txt'] = 'DKIM strength';
+$wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
+$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
+$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
+$wb['enable_spdy_txt'] = 'Makes SPDY available';
+$wb['web_settings_txt'] = 'Web Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+$wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
+$wb['xmpp_bosh_max_inactivity_txt'] = 'Max. BOSH inactivity time';
+$wb['xmpp_bosh_timeout_range_wrong'] = 'Please enter a bosh timeout range between 15 - 360';
+$wb['xmpp_module_saslauth'] = 'saslauth';
+$wb['xmpp_server_admins_txt'] = 'Server Admins (JIDs)';
+$wb['xmpp_modules_enabled_txt'] = 'Serverwide enabled plugins (one per line)';
+$wb['xmpp_ports_txt'] = 'Component ports';
+$wb['xmpp_port_http_txt'] = 'HTTP';
+$wb['xmpp_port_https_txt'] = 'HTTPS';
+$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
+$wb['xmpp_port_bosh_txt'] = 'BOSH';
 ?>
diff --git a/interface/web/admin/lib/lang/hu_server_ip_map.lng b/interface/web/admin/lib/lang/hu_server_ip_map.lng
index 94508abb79..68b196fb23 100644
--- a/interface/web/admin/lib/lang/hu_server_ip_map.lng
+++ b/interface/web/admin/lib/lang/hu_server_ip_map.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["server_id_txt"] = 'Rewrite on Server';
-$wb["source_txt"] = 'Source IP';
-$wb["destination_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
-$wb["ip_error_wrong"] = 'The Destination IP address is invalid';
-$wb["destination_ip_empty"] = 'The Destination IP is empty.';
-$wb["source_ip_empty"] = 'The Source IP is empty.';
-$wb["server_empty_error"] = 'The Server is empty.';
-$wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb['server_id_txt'] = 'Rewrite on Server';
+$wb['source_txt'] = 'Source IP';
+$wb['destination_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
+$wb['ip_error_wrong'] = 'The Destination IP address is invalid';
+$wb['destination_ip_empty'] = 'The Destination IP is empty.';
+$wb['source_ip_empty'] = 'The Source IP is empty.';
+$wb['server_empty_error'] = 'The Server is empty.';
+$wb['duplicate_mapping_error'] = 'Mapping already exists.';
+$wb['ip_mapping_error'] = 'Source IP can not be an IP of the Rewrite-Server';
 ?>
diff --git a/interface/web/admin/lib/lang/hu_server_ip_map_list.lng b/interface/web/admin/lib/lang/hu_server_ip_map_list.lng
index 60c6815fda..1fedc10b2e 100644
--- a/interface/web/admin/lib/lang/hu_server_ip_map_list.lng
+++ b/interface/web/admin/lib/lang/hu_server_ip_map_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'IP Mappings';
-$wb["server_id_txt"] = 'Server';
-$wb["source_ip_txt"] = 'Source IP';
-$wb["destination_ip_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
+$wb['list_head_txt'] = 'IP Mappings';
+$wb['server_id_txt'] = 'Server';
+$wb['source_ip_txt'] = 'Source IP';
+$wb['destination_ip_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
 ?>
diff --git a/interface/web/admin/lib/lang/hu_server_list.lng b/interface/web/admin/lib/lang/hu_server_list.lng
index 285bcce14f..e21db38ca9 100644
--- a/interface/web/admin/lib/lang/hu_server_list.lng
+++ b/interface/web/admin/lib/lang/hu_server_list.lng
@@ -10,4 +10,5 @@ $wb['vserver_server_txt'] = 'VServer';
 $wb['add_new_record_txt'] = 'Új Szerver';
 $wb['proxy_server_txt'] = 'Proxy';
 $wb['firewall_server_txt'] = 'Firewall';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>
diff --git a/interface/web/admin/lib/lang/hu_system_config.lng b/interface/web/admin/lib/lang/hu_system_config.lng
index fac736ee2c..d26fc5be2d 100644
--- a/interface/web/admin/lib/lang/hu_system_config.lng
+++ b/interface/web/admin/lib/lang/hu_system_config.lng
@@ -71,9 +71,14 @@ $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["company_name_txt"] = "Company Name for the page title";
-$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
-$wb["custom_login_text_txt"] = "Custom Text on Login-Page";
-$wb["custom_login_link_txt"] = "Custom Link on Login-Page";
-$wb["login_link_error_regex"] = "Invalid Link for Custom Login";
+$wb['company_name_txt'] = 'Company Name for the page title';
+$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
+$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
+$wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
+$wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
 ?>
diff --git a/interface/web/admin/lib/lang/hu_users.lng b/interface/web/admin/lib/lang/hu_users.lng
index 00da344c6d..126821da44 100644
--- a/interface/web/admin/lib/lang/hu_users.lng
+++ b/interface/web/admin/lib/lang/hu_users.lng
@@ -31,4 +31,5 @@ $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['lost_password_function_txt'] = 'Forgot password function is available';
 ?>
diff --git a/interface/web/admin/lib/lang/id.lng b/interface/web/admin/lib/lang/id.lng
index 557b49b43d..69201b41b1 100644
--- a/interface/web/admin/lib/lang/id.lng
+++ b/interface/web/admin/lib/lang/id.lng
@@ -47,4 +47,6 @@ $wb['Remote Actions'] = 'Tindakan Remote';
 $wb['Do OS-Update'] = 'Lakukan Pemutakhiran OS';
 $wb['Do ISPConfig-Update'] = 'Lakukan Pemutakhiran ISPConfig';
 $wb['Directive Snippets'] = 'Directive Snippets';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
 ?>
diff --git a/interface/web/admin/lib/lang/id_directive_snippets.lng b/interface/web/admin/lib/lang/id_directive_snippets.lng
index 0f09c12ee0..21387b31e5 100644
--- a/interface/web/admin/lib/lang/id_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/id_directive_snippets.lng
@@ -7,4 +7,5 @@ $wb['active_txt'] = 'Active';
 $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
 $wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
 $wb['variables_txt'] = 'Variables';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/id_directive_snippets_list.lng b/interface/web/admin/lib/lang/id_directive_snippets_list.lng
index 4124ea3464..8e189f9f79 100644
--- a/interface/web/admin/lib/lang/id_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/id_directive_snippets_list.lng
@@ -4,4 +4,5 @@ $wb['active_txt'] = 'Active';
 $wb['name_txt'] = 'Name of Snippet';
 $wb['type_txt'] = 'Type';
 $wb['add_new_record_txt'] = 'Add Directive Snippet';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/id_server.lng b/interface/web/admin/lib/lang/id_server.lng
index 439e1dc74a..cedc152fc3 100644
--- a/interface/web/admin/lib/lang/id_server.lng
+++ b/interface/web/admin/lib/lang/id_server.lng
@@ -12,4 +12,5 @@ $wb['mirror_server_id_txt'] = 'Adalah mirror dari Server';
 $wb['- None -'] = '- Tak ada -';
 $wb['proxy_server_txt'] = 'Proxy-Server';
 $wb['firewall_server_txt'] = 'Firewall-Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
 ?>
diff --git a/interface/web/admin/lib/lang/id_server_config.lng b/interface/web/admin/lib/lang/id_server_config.lng
index 8c26f2643b..bc9d4fb83d 100644
--- a/interface/web/admin/lib/lang/id_server_config.lng
+++ b/interface/web/admin/lib/lang/id_server_config.lng
@@ -195,11 +195,11 @@ $wb['munin_user_txt'] = 'Munin User';
 $wb['munin_password_txt'] = 'Munin Password';
 $wb['munin_url_error_regex'] = 'Invalid Munin URL';
 $wb['munin_url_note_txt'] = 'Placeholder:';
-$wb["dkim_path_txt"] = 'DKIM Path';
+$wb['dkim_path_txt'] = 'DKIM Path';
 $wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
-$wb["v6_prefix_txt"] = 'IPv6 Prefix';
-$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
-$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
+$wb['v6_prefix_txt'] = 'IPv6 Prefix';
+$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
+$wb['v6_prefix_length'] = 'Prefix too long according to defined IPv6 ';
 $wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
 $wb['monitor_system_updates_txt'] = 'Check for Linux updates';
 $wb['hostname_error_regex'] = 'Invalid Hostname.';
@@ -254,6 +254,30 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
-$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
-$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
+$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
+$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
+$wb['do_not_try_rescue_mongodb_txt'] = 'Disable MongoDB monitoring';
+$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
+$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
+$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
+$wb['php_handler_txt'] = 'Default PHP Handler';
+$wb['disabled_txt'] = 'Disabled';
+$wb['dkim_strength_txt'] = 'DKIM strength';
+$wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
+$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
+$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
+$wb['enable_spdy_txt'] = 'Makes SPDY available';
+$wb['web_settings_txt'] = 'Web Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+$wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
+$wb['xmpp_bosh_max_inactivity_txt'] = 'Max. BOSH inactivity time';
+$wb['xmpp_bosh_timeout_range_wrong'] = 'Please enter a bosh timeout range between 15 - 360';
+$wb['xmpp_module_saslauth'] = 'saslauth';
+$wb['xmpp_server_admins_txt'] = 'Server Admins (JIDs)';
+$wb['xmpp_modules_enabled_txt'] = 'Serverwide enabled plugins (one per line)';
+$wb['xmpp_ports_txt'] = 'Component ports';
+$wb['xmpp_port_http_txt'] = 'HTTP';
+$wb['xmpp_port_https_txt'] = 'HTTPS';
+$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
+$wb['xmpp_port_bosh_txt'] = 'BOSH';
 ?>
diff --git a/interface/web/admin/lib/lang/id_server_ip_map.lng b/interface/web/admin/lib/lang/id_server_ip_map.lng
index 94508abb79..68b196fb23 100644
--- a/interface/web/admin/lib/lang/id_server_ip_map.lng
+++ b/interface/web/admin/lib/lang/id_server_ip_map.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["server_id_txt"] = 'Rewrite on Server';
-$wb["source_txt"] = 'Source IP';
-$wb["destination_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
-$wb["ip_error_wrong"] = 'The Destination IP address is invalid';
-$wb["destination_ip_empty"] = 'The Destination IP is empty.';
-$wb["source_ip_empty"] = 'The Source IP is empty.';
-$wb["server_empty_error"] = 'The Server is empty.';
-$wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb['server_id_txt'] = 'Rewrite on Server';
+$wb['source_txt'] = 'Source IP';
+$wb['destination_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
+$wb['ip_error_wrong'] = 'The Destination IP address is invalid';
+$wb['destination_ip_empty'] = 'The Destination IP is empty.';
+$wb['source_ip_empty'] = 'The Source IP is empty.';
+$wb['server_empty_error'] = 'The Server is empty.';
+$wb['duplicate_mapping_error'] = 'Mapping already exists.';
+$wb['ip_mapping_error'] = 'Source IP can not be an IP of the Rewrite-Server';
 ?>
diff --git a/interface/web/admin/lib/lang/id_server_ip_map_list.lng b/interface/web/admin/lib/lang/id_server_ip_map_list.lng
index 60c6815fda..1fedc10b2e 100644
--- a/interface/web/admin/lib/lang/id_server_ip_map_list.lng
+++ b/interface/web/admin/lib/lang/id_server_ip_map_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'IP Mappings';
-$wb["server_id_txt"] = 'Server';
-$wb["source_ip_txt"] = 'Source IP';
-$wb["destination_ip_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
+$wb['list_head_txt'] = 'IP Mappings';
+$wb['server_id_txt'] = 'Server';
+$wb['source_ip_txt'] = 'Source IP';
+$wb['destination_ip_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
 ?>
diff --git a/interface/web/admin/lib/lang/id_server_list.lng b/interface/web/admin/lib/lang/id_server_list.lng
index f76f84ec5c..979fb7dd7d 100644
--- a/interface/web/admin/lib/lang/id_server_list.lng
+++ b/interface/web/admin/lib/lang/id_server_list.lng
@@ -10,4 +10,5 @@ $wb['vserver_server_txt'] = 'VServer';
 $wb['add_new_record_txt'] = 'Tambah Server Baru';
 $wb['proxy_server_txt'] = 'Proxy';
 $wb['firewall_server_txt'] = 'Firewall';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>
diff --git a/interface/web/admin/lib/lang/id_system_config.lng b/interface/web/admin/lib/lang/id_system_config.lng
index deffe15d05..c865dff3d8 100644
--- a/interface/web/admin/lib/lang/id_system_config.lng
+++ b/interface/web/admin/lib/lang/id_system_config.lng
@@ -71,9 +71,14 @@ $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["company_name_txt"] = "Company Name for the page title";
-$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
-$wb["custom_login_text_txt"] = "Custom Text on Login-Page";
-$wb["custom_login_link_txt"] = "Custom Link on Login-Page";
-$wb["login_link_error_regex"] = "Invalid Link for Custom Login";
+$wb['company_name_txt'] = 'Company Name for the page title';
+$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
+$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
+$wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
+$wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
 ?>
diff --git a/interface/web/admin/lib/lang/id_users.lng b/interface/web/admin/lib/lang/id_users.lng
index 915cb7e3a1..72641831d7 100644
--- a/interface/web/admin/lib/lang/id_users.lng
+++ b/interface/web/admin/lib/lang/id_users.lng
@@ -31,4 +31,5 @@ $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['lost_password_function_txt'] = 'Forgot password function is available';
 ?>
diff --git a/interface/web/admin/lib/lang/it.lng b/interface/web/admin/lib/lang/it.lng
index d9faee4cfe..5b6644cc71 100644
--- a/interface/web/admin/lib/lang/it.lng
+++ b/interface/web/admin/lib/lang/it.lng
@@ -1,8 +1,8 @@
 <?php
-$wb['1001'] = 'Username or password is empty.';
-$wb['1002'] = 'Username or password is wrong.';
+$wb['1001'] = 'Nome utente o password vuoto.';
+$wb['1002'] = 'Nome utente o password errato.';
 $wb['Groups'] = 'Gruppi';
-$wb['groups_description'] = 'Form to edit systemuser groups.';
+$wb['groups_description'] = 'Modulo per editare i gruppi systemuser.';
 $wb['Servers'] = 'Servers';
 $wb['Config'] = 'Config';
 $wb['Add user'] = 'Aggiungi utente';
@@ -12,7 +12,7 @@ $wb['Edit group'] = 'Modifica gruppo';
 $wb['Edit server'] = 'Modifica server';
 $wb['Sync. Now'] = 'Sync. Now';
 $wb['DB Sync.'] = 'DB Sync.';
-$wb['User Management'] = 'User Management';
+$wb['User Management'] = 'Gestione Utenti';
 $wb['CP Users'] = 'CP Utenti';
 $wb['Remote Users'] = 'Utenti remoti';
 $wb['System'] = 'Sistema';
@@ -26,12 +26,12 @@ $wb['Web'] = 'Web';
 $wb['FastCGI'] = 'FastCGI';
 $wb['Jailkit'] = 'Jailkit';
 $wb['Rescue'] = 'Rescue';
-$wb['Server IP addresses'] = 'Server IP addresses';
-$wb['Additional PHP Versions'] = 'Additional PHP Versions';
+$wb['Server IP addresses'] = 'Server Indirizzi IP';
+$wb['Additional PHP Versions'] = 'Versioni PHP Aggiuntive';
 $wb['Firewall'] = 'Firewall';
-$wb['Interface'] = 'Interface';
-$wb['Interface Config'] = 'Main Config';
-$wb['Domains'] = 'Domains';
+$wb['Interface'] = 'Interfaccia';
+$wb['Interface Config'] = 'Configurazione principale';
+$wb['Domains'] = 'Domini';
 $wb['Misc'] = 'Misc';
 $wb['Software'] = 'Programmi';
 $wb['Repositories'] = 'Repositories';
@@ -40,11 +40,13 @@ $wb['Updates'] = 'Aggiornamenti';
 $wb['Language Editor'] = 'Editor lingua';
 $wb['Languages'] = 'Lingue';
 $wb['New Language'] = 'Nuova lingua';
-$wb['Merge'] = 'Merge';
+$wb['Merge'] = 'Unisci';
 $wb['Export'] = 'Esporta';
 $wb['Import'] = 'Importa';
 $wb['Remote Actions'] = 'Azioni remote';
 $wb['Do OS-Update'] = 'Aggiorna OS';
 $wb['Do ISPConfig-Update'] = 'Aggiorna ISPconfig';
 $wb['Directive Snippets'] = 'Directive Snippets';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
 ?>
diff --git a/interface/web/admin/lib/lang/it_directive_snippets.lng b/interface/web/admin/lib/lang/it_directive_snippets.lng
index 0f09c12ee0..f9a17767cf 100644
--- a/interface/web/admin/lib/lang/it_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/it_directive_snippets.lng
@@ -1,10 +1,11 @@
 <?php
-$wb['Directive Snippets'] = 'Directive Snippets';
-$wb['name_txt'] = 'Name of Snippet';
-$wb['type_txt'] = 'Type';
+$wb['Directive Snippets'] = 'Direttive Snippets';
+$wb['name_txt'] = 'Nome Snippet';
+$wb['type_txt'] = 'Tipo';
 $wb['snippet_txt'] = 'Snippet';
-$wb['active_txt'] = 'Active';
-$wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
-$wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
-$wb['variables_txt'] = 'Variables';
+$wb['active_txt'] = 'Attivo';
+$wb['directive_snippets_name_empty'] = 'Indicare un nome per lo snippet.';
+$wb['directive_snippets_name_error_unique'] = 'Esiste già una direttiva snippet con questo nome.';
+$wb['variables_txt'] = 'Variabili';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/it_directive_snippets_list.lng b/interface/web/admin/lib/lang/it_directive_snippets_list.lng
index 4124ea3464..7bb90ce943 100644
--- a/interface/web/admin/lib/lang/it_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/it_directive_snippets_list.lng
@@ -1,7 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Directive Snippets';
-$wb['active_txt'] = 'Active';
-$wb['name_txt'] = 'Name of Snippet';
-$wb['type_txt'] = 'Type';
-$wb['add_new_record_txt'] = 'Add Directive Snippet';
+$wb['list_head_txt'] = 'Directtive Snippets';
+$wb['active_txt'] = 'Attivo';
+$wb['name_txt'] = 'Nome del Snippet';
+$wb['type_txt'] = 'Tipo';
+$wb['add_new_record_txt'] = 'Aggiungi  Direttive Snippet';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/it_firewall.lng b/interface/web/admin/lib/lang/it_firewall.lng
index 6a7ae5e3c2..95a4336dae 100644
--- a/interface/web/admin/lib/lang/it_firewall.lng
+++ b/interface/web/admin/lib/lang/it_firewall.lng
@@ -5,7 +5,7 @@ $wb['udp_port_txt'] = 'Apri porte UDP';
 $wb['tcp_port_help_txt'] = 'Separate dalla virgola';
 $wb['udp_port_help_txt'] = 'Separate dalle virgola';
 $wb['active_txt'] = 'Attivo';
-$wb['firewall_error_unique'] = 'Cé già  un record firewall per questo 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['firewall_error_unique'] = 'Esiste già  un record firewall per questo server.';
+$wb['tcp_ports_error_regex'] = 'Carattere non ammesso nella definizione di tcp port. Caratteri ammessi sono numeri, : e ,.';
+$wb['udp_ports_error_regex'] = 'Carattere non ammesso nella definizione di udp port. Caratteri ammessi sono numeri, : and ,.';
 ?>
diff --git a/interface/web/admin/lib/lang/it_groups.lng b/interface/web/admin/lib/lang/it_groups.lng
index 61c3dc538d..d8a924bdcd 100644
--- a/interface/web/admin/lib/lang/it_groups.lng
+++ b/interface/web/admin/lib/lang/it_groups.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['description_txt'] = 'Description';
-$wb['name_txt'] = 'Group';
-$wb['name_err'] = 'Group must be min 1, max 30 Chars.';
+$wb['description_txt'] = 'Descrizione';
+$wb['name_txt'] = 'Gruppo';
+$wb['name_err'] = 'Gruppo deve essere minimo 1, max 30 Caratteri.';
 ?>
diff --git a/interface/web/admin/lib/lang/it_groups_list.lng b/interface/web/admin/lib/lang/it_groups_list.lng
index c4650da01f..52cdce78e7 100644
--- a/interface/web/admin/lib/lang/it_groups_list.lng
+++ b/interface/web/admin/lib/lang/it_groups_list.lng
@@ -3,5 +3,5 @@ $wb['list_head_txt'] = 'Gruppi utenti sistema';
 $wb['description_txt'] = 'Descrizione';
 $wb['name_txt'] = 'Gruppo';
 $wb['add_new_record_txt'] = 'Aggiungi nuovo gruppo';
-$wb['warning_txt'] = '<b>ATTENZIONE:</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['warning_txt'] = '<b>ATTENZIONE:</b> Non editare o modificare alcuna impostazione utente da qui. Utilizzare invece le impostazioni del modulo nella sezione Clienti- e Rivenditori. Modificare o cambiare Utenti o Gruppi in questa sezione può causare perdita di dati!';
 ?>
diff --git a/interface/web/admin/lib/lang/it_iptables.lng b/interface/web/admin/lib/lang/it_iptables.lng
index 40760b9498..8fb963ebec 100644
--- a/interface/web/admin/lib/lang/it_iptables.lng
+++ b/interface/web/admin/lib/lang/it_iptables.lng
@@ -8,6 +8,6 @@ $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['active_txt'] = 'Attivo';
 $wb['iptables_error_unique'] = 'There is already a firewall record for this server.';
 ?>
diff --git a/interface/web/admin/lib/lang/it_iptables_list.lng b/interface/web/admin/lib/lang/it_iptables_list.lng
index 15c8baddcb..76fbcaff85 100644
--- a/interface/web/admin/lib/lang/it_iptables_list.lng
+++ b/interface/web/admin/lib/lang/it_iptables_list.lng
@@ -1,6 +1,6 @@
 <?php
 $wb['list_head_txt'] = 'IPTables';
-$wb['add_new_rule_txt'] = 'Add IPTables Rule';
+$wb['add_new_rule_txt'] = 'Aggiungi Regola IPTables';
 $wb['server_id_txt'] = 'Server';
 $wb['multiport_txt'] = 'Multi Port';
 $wb['singleport_txt'] = 'Single Port';
@@ -10,6 +10,6 @@ $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['active_txt'] = 'Attivo';
+$wb['iptables_error_unique'] = 'Esiste già una regola firewall per questo server.';
 ?>
diff --git a/interface/web/admin/lib/lang/it_language_edit.lng b/interface/web/admin/lib/lang/it_language_edit.lng
index 242642432c..5a710c90ea 100644
--- a/interface/web/admin/lib/lang/it_language_edit.lng
+++ b/interface/web/admin/lib/lang/it_language_edit.lng
@@ -1,6 +1,6 @@
 <?php
 $wb['list_head_txt'] = 'Language file editor';
-$wb['language_select_txt'] = 'Select language';
+$wb['language_select_txt'] = 'Seleziona language';
 $wb['module_txt'] = 'Module';
 $wb['lang_file_txt'] = 'Language file';
 $wb['btn_save_txt'] = 'Salva';
diff --git a/interface/web/admin/lib/lang/it_language_export.lng b/interface/web/admin/lib/lang/it_language_export.lng
index bce6b70bf2..6fd607aa28 100644
--- a/interface/web/admin/lib/lang/it_language_export.lng
+++ b/interface/web/admin/lib/lang/it_language_export.lng
@@ -1,6 +1,6 @@
 <?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['list_head_txt'] = 'Esporta file lingua';
+$wb['language_select_txt'] = 'Seleziona lingua';
+$wb['btn_save_txt'] = 'Esporta il set di file di lingua selezionato';
 $wb['btn_cancel_txt'] = 'Annulla';
 ?>
diff --git a/interface/web/admin/lib/lang/it_remote_action.lng b/interface/web/admin/lib/lang/it_remote_action.lng
index 3fc3eaf81f..7a3abe9bfd 100644
--- a/interface/web/admin/lib/lang/it_remote_action.lng
+++ b/interface/web/admin/lib/lang/it_remote_action.lng
@@ -1,6 +1,6 @@
 <?php
-$wb['select_server_txt'] = 'Select Server';
-$wb['btn_do_txt'] = 'Execute action';
+$wb['select_server_txt'] = 'Seleziona Server';
+$wb['btn_do_txt'] = 'Esegui Azione';
 $wb['do_osupdate_caption'] = 'Do OS-Update at remote server';
 $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';
@@ -8,5 +8,5 @@ $wb['do_ispcupdate_desc'] = 'This action does a ISPConfig3 update at your select
 $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 instructions</a>';
+$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>';
 ?>
diff --git a/interface/web/admin/lib/lang/it_remote_user.lng b/interface/web/admin/lib/lang/it_remote_user.lng
index 65b3cfd4a2..15826cfd34 100644
--- a/interface/web/admin/lib/lang/it_remote_user.lng
+++ b/interface/web/admin/lib/lang/it_remote_user.lng
@@ -1,20 +1,20 @@
 <?php
-$wb['username_txt'] = 'Username:';
+$wb['username_txt'] = 'Nome Utente:';
 $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['Mail user functions'] = 'Mail user functions';
-$wb['Mail alias functions'] = 'Mail alias functions';
-$wb['Mail forward functions'] = 'Mail forward functions';
-$wb['Mail catchall functions'] = 'Mail catchall functions';
-$wb['Mail transport functions'] = 'Mail transport functions';
-$wb['Mail whitelist functions'] = 'Mail whitelist functions';
-$wb['Mail blacklist functions'] = 'Mail blacklist functions';
-$wb['Mail spamfilter user functions'] = 'Mail spamfilter user functions';
+$wb['function_txt'] = 'Funzioni:';
+$wb['username_error_unique'] = 'Il nome utente deve essere unico';
+$wb['username_error_empty'] = 'Il nome utente  non può essere vuoto ';
+$wb['password_error_empty'] = 'La Password  non può essere vuoto ';
+$wb['password_strength_txt'] = 'Livello Sicurezza Password:';
+$wb['Mail domain functions'] = 'Funzioni Dominio di Posta';
+$wb['Mail user functions'] = 'Funzioni Utente di posta';
+$wb['Mail alias functions'] = 'Funzioni Alias di posta';
+$wb['Mail forward functions'] = 'Funzioni forward di posta';
+$wb['Mail catchall functions'] = 'Funzioni catchall di posta';
+$wb['Mail transport functions'] = 'Funzioni Mail transport';
+$wb['Mail whitelist functions'] = 'Funzioni whitelist di posta';
+$wb['Mail blacklist functions'] = 'Funzioni blacklist di posta';
+$wb['Mail spamfilter user functions'] = 'Funzioni utente filtri spam di posta';
 $wb['Mail spamfilter policy functions'] = 'Mail spamfilter policy functions';
 $wb['Mail fetchmail functions'] = 'Mail fetchmail functions';
 $wb['Mail user filter functions'] = 'Mail user filter functions';
@@ -40,8 +40,8 @@ $wb['DNS rp functions'] = 'DNS rp functions';
 $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'] = 'Genera Password';
+$wb['repeat_password_txt'] = 'Ripeti Password';
+$wb['password_mismatch_txt'] = 'Le password non coincidono.';
+$wb['password_match_txt'] = 'Le password coincidono.';
 ?>
diff --git a/interface/web/admin/lib/lang/it_server.lng b/interface/web/admin/lib/lang/it_server.lng
index 18966e4a43..fc82b6cc68 100644
--- a/interface/web/admin/lib/lang/it_server.lng
+++ b/interface/web/admin/lib/lang/it_server.lng
@@ -12,4 +12,5 @@ $wb['mirror_server_id_txt'] = 'Mirror del server';
 $wb['- None -'] = '- Nessuno -';
 $wb['proxy_server_txt'] = 'Proxy-Server';
 $wb['firewall_server_txt'] = 'Firewall-Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
 ?>
diff --git a/interface/web/admin/lib/lang/it_server_config.lng b/interface/web/admin/lib/lang/it_server_config.lng
index 3b5cfcfe6e..e2d4f41260 100644
--- a/interface/web/admin/lib/lang/it_server_config.lng
+++ b/interface/web/admin/lib/lang/it_server_config.lng
@@ -2,222 +2,210 @@
 $wb['jailkit_chroot_home_txt'] = 'Jailkit chroot home';
 $wb['jailkit_chroot_app_sections_txt'] = 'Jailkit chroot app sections';
 $wb['jailkit_chroot_app_programs_txt'] = 'Jailkit chrooted applications';
-$wb['website_path_txt'] = 'Website path';
-$wb['website_symlinks_txt'] = 'Website symlinks';
+$wb['website_path_txt'] = 'Percorso Sito Web';
+$wb['website_symlinks_txt'] = 'Sito Web symlinks';
 $wb['vhost_conf_dir_txt'] = 'Vhost config dir';
-$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config enabled dir';
+$wb['vhost_conf_enabled_dir_txt'] = 'Vhost config dir abilitata';
 $wb['getmail_config_dir_txt'] = 'Getmail config dir';
-$wb['fastcgi_starter_path_txt'] = 'FastCGI starter path';
+$wb['fastcgi_starter_path_txt'] = 'Percorso FastCGI starter';
 $wb['fastcgi_starter_script_txt'] = 'FastCGI starter script';
 $wb['fastcgi_alias_txt'] = 'FastCGI Alias';
-$wb['fastcgi_phpini_path_txt'] = 'FastCGI php.ini Path';
+$wb['fastcgi_phpini_path_txt'] = 'Percorso FastCGI php.ini';
 $wb['fastcgi_children_txt'] = 'FastCGI Children';
 $wb['fastcgi_max_requests_txt'] = 'FastCGI max. Requests';
 $wb['fastcgi_bin_txt'] = 'FastCGI Bin';
 $wb['module_txt'] = 'Module';
-$wb['maildir_path_txt'] = 'Maildir Path';
-$wb['maildir_format_txt'] = 'Maildir Format';
-$wb['homedir_path_txt'] = 'Homedir Path';
+$wb['maildir_path_txt'] = 'Percorso Maildir';
+$wb['homedir_path_txt'] = 'Percorso Homedir';
 $wb['mailuser_uid_txt'] = 'Mailuser UID';
 $wb['mailuser_gid_txt'] = 'Mailuser GID';
-$wb['mailuser_name_txt'] = 'Mailuser Name';
-$wb['mailuser_group_txt'] = 'Mailuser Group';
-$wb['mailbox_virtual_uidgid_maps_txt'] = 'Use Websites Linux uid for mailbox';
-$wb['mailbox_virtual_uidgid_maps_info_txt'] = 'only in single web and mail-server-setup';
-$wb['mailbox_virtual_uidgid_maps_error_nosingleserver'] = 'Uid cannot be mapped in multi-server-setup.';
-$wb['mailbox_virtual_uidgid_maps_error_nodovecot'] = 'Uid-mapping can only be used with dovecot.';
-$wb['mailbox_virtual_uidgid_maps_error_alreadyusers'] = 'Uid-mapping cannot be changed if there are already mail users.';
+$wb['mailuser_name_txt'] = 'Nome utente Posta';
+$wb['mailuser_group_txt'] = 'Gruppo utenti di posta';
 $wb['relayhost_txt'] = 'Relayhost';
-$wb['relayhost_user_txt'] = 'Relayhost User';
+$wb['relayhost_user_txt'] = 'Utente Relayhost';
 $wb['relayhost_password_txt'] = 'Relayhost Password';
-$wb['reject_sender_login_mismatch_txt'] = 'Reject sender and login mismatch';
-$wb['mailbox_size_limit_txt'] = 'Mailbox Size Limit';
-$wb['message_size_limit_txt'] = 'Message Size Limit';
+$wb['mailbox_size_limit_txt'] = 'Limite dimensione Casella di Posta';
+$wb['message_size_limit_txt'] = 'Limite dimensione Messaggi';
 $wb['ip_address_txt'] = 'Indirizzo IP';
 $wb['netmask_txt'] = 'Netmask';
 $wb['gateway_txt'] = 'Gateway';
-$wb['hostname_txt'] = 'Hostname';
+$wb['hostname_txt'] = 'Nome Host';
 $wb['nameservers_txt'] = 'Nameservers';
-$wb['auto_network_configuration_txt'] = 'Network Configuration';
-$wb['website_basedir_txt'] = 'Website basedir';
-$wb['ip_address_error_wrong'] = 'Invalid IP address format.';
-$wb['netmask_error_wrong'] = 'Invalid Netmask format.';
-$wb['gateway_error_wrong'] = 'Invalid Gateway format.';
-$wb['hostname_error_empty'] = 'Hostname is empty.';
-$wb['nameservers_error_empty'] = 'Nameserver is empty.';
-$wb['jailkit_chroot_cron_programs_txt'] = 'Jailkit cron chrooted applications';
-$wb['config_dir_txt'] = 'Config directory';
-$wb['init_script_txt'] = 'Cron init script name';
-$wb['crontab_dir_txt'] = 'Path for individual crontabs';
-$wb['wget_txt'] = 'Path to wget program';
-$wb['security_level_txt'] = 'Security level';
-$wb['web_user_txt'] = 'Apache user';
-$wb['web_group_txt'] = 'Apache group';
-$wb['loglevel_txt'] = 'Loglevel';
-$wb['apps_vhost_port_txt'] = 'Apps-vhost port';
+$wb['auto_network_configuration_txt'] = 'Configurazione di rete';
+$wb['website_basedir_txt'] = 'basedir per Sito Web';
+$wb['ip_address_error_wrong'] = 'Formato indirizzo IP non valido.';
+$wb['netmask_error_wrong'] = 'Formato Maschera di rete non valido.';
+$wb['gateway_error_wrong'] = 'Formato Gateway non valido.';
+$wb['hostname_error_empty'] = 'Hostname  vuoto.';
+$wb['nameservers_error_empty'] = 'Nameserver  vuoto.';
+$wb['jailkit_chroot_cron_programs_txt'] = 'Applicazioni Jailkit cron chrooted';
+$wb['config_dir_txt'] = 'Direttrice configurazione';
+$wb['init_script_txt'] = 'Nome script di Cron init';
+$wb['crontab_dir_txt'] = 'Percorso per crontabs individuali';
+$wb['wget_txt'] = 'Percorso per ottenere programma wget';
+$wb['security_level_txt'] = 'Livello di Sicurezza';
+$wb['web_user_txt'] = 'Utente Apache';
+$wb['web_group_txt'] = 'Gruppo Apache';
+$wb['loglevel_txt'] = 'Livello di Log';
+$wb['apps_vhost_port_txt'] = 'Porta Apps-vhost';
 $wb['apps_vhost_ip_txt'] = 'Apps-vhost IP';
-$wb['apps_vhost_servername_txt'] = 'Apps-vhost Domain';
+$wb['apps_vhost_servername_txt'] = 'Apps-vhost Dominio';
 $wb['bind_user_txt'] = 'BIND User';
 $wb['bind_group_txt'] = 'BIND Group';
-$wb['bind_zonefiles_dir_txt'] = 'BIND zonefiles directory';
-$wb['named_conf_path_txt'] = 'BIND named.conf path';
-$wb['bind_user_error_empty'] = 'BIND user is empty.';
-$wb['bind_group_error_empty'] = 'BIND group is empty.';
-$wb['bind_zonefiles_dir_error_empty'] = 'BIND zonefiles directory is empty.';
-$wb['named_conf_path_error_empty'] = 'BIND named.conf path is empty.';
-$wb['named_conf_local_path_error_empty'] = 'BIND named.conf.local path is empty.';
-$wb['mail_filter_syntax_txt'] = 'Mailfilter Syntax';
-$wb['pop3_imap_daemon_txt'] = 'POP3/IMAP Daemon';
+$wb['bind_zonefiles_dir_txt'] = 'Cartella files di zona di BIND';
+$wb['named_conf_path_txt'] = 'BIND percorso per named.conf';
+$wb['bind_user_error_empty'] = 'BIND user  vuoto.';
+$wb['bind_group_error_empty'] = 'BIND group  vuoto.';
+$wb['bind_zonefiles_dir_error_empty'] = 'BIND Campo Cartella files di zona vuoto.';
+$wb['named_conf_path_error_empty'] = 'BIND named.conf Campo Percorso vuoto.';
+$wb['named_conf_local_path_error_empty'] = 'BIND named.conf.local Campo Percorso vuoto.';
+$wb['mail_filter_syntax_txt'] = 'Sintassi per Mailfilter';
+$wb['pop3_imap_daemon_txt'] = 'Demone POP3/IMAP';
 $wb['php_open_basedir_txt'] = 'PHP open_basedir';
-$wb['php_open_basedir_error_empty'] = 'PHP open_basedir is empty.';
+$wb['php_open_basedir_error_empty'] = 'PHP open_basedir  vuoto.';
 $wb['htaccess_allow_override_txt'] = '.htaccess AllowOverride';
-$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride is empty.';
-$wb['awstats_conf_dir_txt'] = 'awstats conf folder';
-$wb['awstats_data_dir_txt'] = 'awstats data folder';
+$wb['htaccess_allow_override_error_empty'] = '.htaccess AllowOverride  vuoto.';
+$wb['awstats_conf_dir_txt'] = 'awstats cartella di configurazione';
+$wb['awstats_data_dir_txt'] = 'awstats cartella dati';
 $wb['awstats_pl_txt'] = 'awstats.pl script';
 $wb['awstats_buildstaticpages_pl_txt'] = 'awstats_buildstaticpages.pl script';
 $wb['backup_dir_txt'] = 'Directory di backup';
-$wb['named_conf_local_path_txt'] = 'BIND named.conf.local path';
+$wb['named_conf_local_path_txt'] = 'BIND Percorso per named.conf.local';
 $wb['php_ini_path_cgi_txt'] = 'Percorso php.ini CGI';
 $wb['php_ini_path_apache_txt'] = 'Percorso php.ini apache';
 $wb['check_apache_config_txt'] = 'Testa al riavvio la configurazione di apache';
-$wb['ufw_enable_txt'] = 'Enable';
-$wb['ufw_manage_builtins_txt'] = 'Manage Builtin Rules';
-$wb['ufw_ipv6_txt'] = 'Enable IPv6';
+$wb['ufw_enable_txt'] = 'Abilita';
+$wb['ufw_manage_builtins_txt'] = 'Gestisci Regole Builtin';
+$wb['ufw_ipv6_txt'] = 'Abilita IPv6';
 $wb['ufw_default_input_policy_txt'] = 'Default Input Policy';
 $wb['ufw_default_output_policy_txt'] = 'Default Output Policy';
 $wb['ufw_default_forward_policy_txt'] = 'Default Forward Policy';
 $wb['ufw_default_application_policy_txt'] = 'Default Application Policy';
-$wb['ufw_log_level_txt'] = 'Log Level';
+$wb['ufw_log_level_txt'] = 'Livello di Log';
 $wb['website_symlinks_rel_txt'] = 'Make relative symlinks';
-$wb['network_config_warning_txt'] = 'The network configuration option is only available for Debian and Ubuntu Servers. Do not enable this option if your network interface is not eth0.';
-$wb['CA_path_txt'] = 'CA Path';
+$wb['network_config_warning_txt'] = 'L opzione di configurazione di rete è disponibile solo per Debian and Ubuntu Servers. Non abilitare se la tua interfaccia di rete non è eth0.';
+$wb['CA_path_txt'] = 'Percorso CA';
 $wb['CA_pass_txt'] = 'CA passphrase';
-$wb['fastcgi_config_syntax_txt'] = 'FastCGI config syntax';
-$wb['server_type_txt'] = 'Server Type';
+$wb['fastcgi_config_syntax_txt'] = 'Sintassi configurazione FastCGI';
+$wb['server_type_txt'] = 'Tipo di Server';
 $wb['nginx_vhost_conf_dir_txt'] = 'Nginx Vhost config dir';
 $wb['nginx_vhost_conf_enabled_dir_txt'] = 'Nginx Vhost config enabled dir';
-$wb['nginx_user_txt'] = 'Nginx user';
-$wb['nginx_group_txt'] = 'Nginx group';
+$wb['nginx_user_txt'] = 'Utente Nginx';
+$wb['nginx_group_txt'] = 'Gruppo Nginx';
 $wb['nginx_cgi_socket_txt'] = 'Nginx CGI Socket';
-$wb['backup_dir_error_empty'] = 'Backup directory is empty.';
-$wb['maildir_path_error_empty'] = 'Maildir Path is empty.';
-$wb['homedir_path_error_empty'] = 'Homedir Path is empty.';
-$wb['mailuser_uid_error_empty'] = 'Mailuser UID is empty.';
-$wb['mailuser_gid_error_empty'] = 'Mailuser GID is empty.';
-$wb['mailuser_name_error_empty'] = 'Mailuser Name is empty.';
-$wb['mailuser_group_error_empty'] = 'Mailuser Group is empty.';
-$wb['getmail_config_dir_error_empty'] = 'Getmail config dir is empty.';
-$wb['website_basedir_error_empty'] = 'Website basedir is empty.';
-$wb['website_path_error_empty'] = 'Website path is empty.';
-$wb['website_symlinks_error_empty'] = 'Website symlinks is empty.';
-$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir is empty.';
-$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir is empty.';
-$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir is empty.';
-$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir is empty.';
-$wb['apache_user_error_empty'] = 'Apache user is empty.';
-$wb['apache_group_error_empty'] = 'Apache group is empty.';
-$wb['nginx_user_error_empty'] = 'Nginx user is empty.';
-$wb['nginx_group_error_empty'] = 'Nginx group is empty.';
-$wb['php_ini_path_apache_error_empty'] = 'Apache php.ini path is empty.';
-$wb['php_ini_path_cgi_error_empty'] = 'CGI php.ini path is empty.';
-$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket is empty.';
-$wb['apps_vhost_port_error_empty'] = 'Apps-vhost port is empty.';
-$wb['apps_vhost_ip_error_empty'] = 'Apps-vhost IP is empty.';
-$wb['fastcgi_starter_path_error_empty'] = 'FastCGI starter path is empty.';
-$wb['fastcgi_starter_script_error_empty'] = 'FastCGI starter script is empty.';
-$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias is empty.';
-$wb['fastcgi_phpini_path_error_empty'] = 'FastCGI php.ini Path is empty.';
-$wb['fastcgi_children_error_empty'] = 'FastCGI Children is empty.';
-$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests is empty.';
-$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin is empty.';
-$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home is empty.';
-$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections is empty.';
-$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications is empty.';
-$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications is empty.';
-$wb['vlogger_config_dir_error_empty'] = 'Config directory is empty.';
-$wb['cron_init_script_error_empty'] = 'Cron init script name is empty.';
-$wb['crontab_dir_error_empty'] = 'Path for individual crontabs is empty.';
-$wb['cron_wget_error_empty'] = 'Path to wget program is empty.';
+$wb['backup_dir_error_empty'] = 'Backup directory  vuoto.';
+$wb['maildir_path_error_empty'] = 'Maildir Percorso  vuoto.';
+$wb['homedir_path_error_empty'] = 'Homedir Percorso  vuoto.';
+$wb['mailuser_uid_error_empty'] = 'Mailuser UID  vuoto.';
+$wb['mailuser_gid_error_empty'] = 'Mailuser GID  vuoto.';
+$wb['mailuser_name_error_empty'] = 'Mailuser Name  vuoto.';
+$wb['mailuser_group_error_empty'] = 'Mailuser Group  vuoto.';
+$wb['getmail_config_dir_error_empty'] = 'Getmail config dir  vuoto.';
+$wb['website_basedir_error_empty'] = 'Percorso base per siti web vuoto.';
+$wb['website_path_error_empty'] = 'Percorso Sito Web  vuoto.';
+$wb['website_symlinks_error_empty'] = 'Website symlinks  vuoto.';
+$wb['vhost_conf_dir_error_empty'] = 'Vhost config dir  vuoto.';
+$wb['vhost_conf_enabled_dir_error_empty'] = 'Vhost config enabled dir  vuoto.';
+$wb['nginx_vhost_conf_dir_error_empty'] = 'Nginx Vhost config dir  vuoto.';
+$wb['nginx_vhost_conf_enabled_dir_error_empty'] = 'Nginx Vhost config enabled dir  vuoto.';
+$wb['apache_user_error_empty'] = 'Utente Apache  vuoto.';
+$wb['apache_group_error_empty'] = 'Gruppo Apache vuoto.';
+$wb['nginx_user_error_empty'] = 'Utente Nginx vuoto.';
+$wb['nginx_group_error_empty'] = 'Gruppo Nginx vuoto.';
+$wb['php_ini_path_apache_error_empty'] = 'Percorso Apache php.ini  vuoto.';
+$wb['php_ini_path_cgi_error_empty'] = 'Percorso CGI php.ini vuoto.';
+$wb['nginx_cgi_socket_empty'] = 'Nginx CGI Socket  vuoto.';
+$wb['apps_vhost_port_error_empty'] = 'Porta Apps-vhost  vuoto.';
+$wb['apps_vhost_ip_error_empty'] = 'IP Apps-vhost vuoto.';
+$wb['fastcgi_starter_path_error_empty'] = 'Percorso FastCGI starter vuoto.';
+$wb['fastcgi_starter_script_error_empty'] = 'Script FastCGI starter vuoto.';
+$wb['fastcgi_alias_error_empty'] = 'FastCGI Alias  vuoto.';
+$wb['fastcgi_phpini_path_error_empty'] = 'Percoro FastCGI php.ini  vuoto.';
+$wb['fastcgi_children_error_empty'] = 'FastCGI Children  vuoto.';
+$wb['fastcgi_max_requests_error_empty'] = 'FastCGI max. Requests  vuoto.';
+$wb['fastcgi_bin_error_empty'] = 'FastCGI Bin  vuoto.';
+$wb['jailkit_chroot_home_error_empty'] = 'Jailkit chroot home  vuoto.';
+$wb['jailkit_chroot_app_sections_error_empty'] = 'Jailkit chroot app sections  vuoto.';
+$wb['jailkit_chroot_app_programs_error_empty'] = 'Jailkit chrooted applications  vuoto.';
+$wb['jailkit_chroot_cron_programs_error_empty'] = 'Jailkit cron chrooted applications  vuoto.';
+$wb['vlogger_config_dir_error_empty'] = 'Config directory  vuoto.';
+$wb['cron_init_script_error_empty'] = 'Cron init script name  vuoto.';
+$wb['crontab_dir_error_empty'] = 'Percorso per crontabs individuali  vuoto.';
+$wb['cron_wget_error_empty'] = 'Percorso al programma wget  vuoto.';
 $wb['php_fpm_init_script_txt'] = 'PHP-FPM init script';
-$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script is empty.';
+$wb['php_fpm_init_script_error_empty'] = 'PHP-FPM init script  vuoto.';
 $wb['php_fpm_ini_path_txt'] = 'PHP-FPM php.ini path';
-$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path is empty.';
+$wb['php_fpm_ini_path_error_empty'] = 'PHP-FPM php.ini path  vuoto.';
 $wb['php_fpm_pool_dir_txt'] = 'PHP-FPM pool directory';
-$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory is empty.';
+$wb['php_fpm_pool_dir_error_empty'] = 'PHP-FPM pool directory  vuoto.';
 $wb['php_fpm_start_port_txt'] = 'PHP-FPM start port';
-$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port is empty.';
+$wb['php_fpm_start_port_error_empty'] = 'PHP-FPM start port  vuoto.';
 $wb['php_fpm_socket_dir_txt'] = 'PHP-FPM socket directory';
-$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory is empty.';
-$wb['try_rescue_txt'] = 'Enable service monitoring and restart on failure';
-$wb['do_not_try_rescue_httpd_txt'] = 'Disable HTTPD monitoring';
-$wb['do_not_try_rescue_mysql_txt'] = 'Disable MySQL monitoring';
-$wb['do_not_try_rescue_mail_txt'] = 'Disable Email monitoring';
-$wb['rescue_description_txt'] = '<b>Information:</b> If you want to shut down mysql you have to select the Disable MySQL monitor checkbox and then wait 2-3 minutes.<br>If you do not wait 2-3 minutes, rescue will try to restart mysql!';
-$wb['enable_sni_txt'] = 'Enable SNI';
-$wb['set_folder_permissions_on_update_txt'] = 'Set folder permissions on update';
-$wb['add_web_users_to_sshusers_group_txt'] = 'Add web users to -sshusers- group';
-$wb['connect_userid_to_webid_txt'] = 'Connect Linux userid to webid';
-$wb['connect_userid_to_webid_start_txt'] = 'Start ID for userid/webid connect';
-$wb['website_autoalias_txt'] = 'Website auto alias';
+$wb['php_fpm_socket_dir_error_empty'] = 'PHP-FPM socket directory  vuoto.';
+$wb['try_rescue_txt'] = 'Abilita servizio di monitoraggio in caso di failure';
+$wb['do_not_try_rescue_httpd_txt'] = 'Disabilita monitoraggio HTTPD';
+$wb['do_not_try_rescue_mysql_txt'] = 'Disabilita monitoraggio MySQL';
+$wb['do_not_try_rescue_mail_txt'] = 'Disabilita monitoraggio Email';
+$wb['rescue_description_txt'] = '<b>Informazione:</b> Se desideri fermare MySQL devi selezionare la spunta per Disabilitare monitor MySQL ed attendere 2-3 minuti.<br>Se non attendi 2-3 minuti, il sistema tenterà di riavviare MySQL!';
+$wb['enable_sni_txt'] = 'Abilita SNI';
+$wb['set_folder_permissions_on_update_txt'] = 'Imposta permessi cartella ad aggiornamento';
+$wb['add_web_users_to_sshusers_group_txt'] = 'Aggiungi utente sito web a  gruppo utenti -ssh-';
+$wb['connect_userid_to_webid_txt'] = 'Conllega userid Linux a webid';
+$wb['connect_userid_to_webid_start_txt'] = 'Avvia ID per collegamento userid/webid';
+$wb['website_autoalias_txt'] = 'Sito Web auto alias';
 $wb['website_autoalias_note_txt'] = 'Placeholders:';
-$wb['backup_mode_txt'] = 'Backup mode';
-$wb['backup_mode_userzip'] = 'Backup web files owned by web user as zip';
-$wb['backup_mode_rootgz'] = 'Backup all files in web directory as root user';
-$wb['realtime_blackhole_list_txt'] = 'Real-time Blackhole List';
-$wb['realtime_blackhole_list_note_txt'] = '(Separate RBL\'s with commas)';
-$wb['ssl_settings_txt'] = 'SSL Settings';
-$wb['permissions_txt'] = 'Permissions';
-$wb['php_settings_txt'] = 'PHP Settings';
-$wb['apps_vhost_settings_txt'] = 'Apps Vhost Settings';
-$wb['awstats_settings_txt'] = 'AWStats Settings';
+$wb['backup_mode_txt'] = 'Modalità di Backup';
+$wb['backup_mode_userzip'] = 'Backup files siti web come utente web in formato zip';
+$wb['backup_mode_rootgz'] = 'Backup di tutti i files nella cartella sito come utente root';
+$wb['realtime_blackhole_list_txt'] = 'Lista Real-Time Blackhole';
+$wb['realtime_blackhole_list_note_txt'] = '(Separare RBL con le virgole)';
+$wb['ssl_settings_txt'] = 'Impostazioni SSL';
+$wb['permissions_txt'] = 'Permessi';
+$wb['php_settings_txt'] = 'Impostazioni PHP';
+$wb['apps_vhost_settings_txt'] = 'Impostazioni Apps Vhost';
+$wb['awstats_settings_txt'] = 'Impostazioni AWStats';
 $wb['firewall_txt'] = 'Firewall';
-$wb['mailbox_quota_stats_txt'] = 'Mailbox quota statistics';
-$wb['enable_ip_wildcard_txt'] = 'Enable IP wildcard (*)';
-$wb['web_folder_protection_txt'] = 'Make web folders immutable (extended attributes)';
-$wb['overtraffic_notify_admin_txt'] = 'Send overtraffic notification to admin';
-$wb['overtraffic_notify_client_txt'] = 'Send overtraffic notification to client';
-$wb['rbl_error_regex'] = 'Please specify valid RBL hostnames.';
-$wb['overquota_notify_admin_txt'] = 'Send quota warnings to admin';
-$wb['overquota_notify_client_txt'] = 'Send quota warnings to client';
-$wb['overquota_notify_onok_txt'] = 'Send quota ok message to client';
-$wb['overquota_notify_freq_txt'] = 'Send quota warning each X days';
-$wb['overquota_notify_freq_note_txt'] = '0 = send message just once, no repeated messages';
-$wb['admin_notify_events_txt'] = 'Send email to admin starting with the following level';
-$wb['no_notifications_txt'] = 'No Notifications';
+$wb['mailbox_quota_stats_txt'] = 'Statistiche Quota Casella di Posta';
+$wb['enable_ip_wildcard_txt'] = 'Abilita  IP wildcard (*)';
+$wb['web_folder_protection_txt'] = 'Imposta cartelle sito in moaniera non modificabile (attributi estesi)';
+$wb['overtraffic_notify_admin_txt'] = 'Trasmetti notifiche superamento traffico ad admin';
+$wb['overtraffic_notify_client_txt'] = 'Trasmetti notifiche superamento traffico al cliente';
+$wb['rbl_error_regex'] = 'Per cortesia specificare nomi host RBL validi.';
+$wb['overquota_notify_admin_txt'] = 'Trasmetti allarmi quota ad admin';
+$wb['overquota_notify_client_txt'] = 'Trasmetti allarmi quota al cliente';
+$wb['overquota_notify_onok_txt'] = 'Trasmetti messaggio quota ok al cliente';
+$wb['overquota_notify_freq_txt'] = 'Trasmetti allarmi quota ogni X giorni';
+$wb['overquota_notify_freq_note_txt'] = '0 = trasmetti il messaggio una volta, nessuna ripetizione';
+$wb['admin_notify_events_txt'] = 'Trasmetti email a admin partendo dal seguente livello';
+$wb['no_notifications_txt'] = 'Nesuna notifica';
 $wb['monit_url_txt'] = 'Monit URL';
-$wb['monit_user_txt'] = 'Monit User';
+$wb['monit_user_txt'] = 'Monit utente';
 $wb['monit_password_txt'] = 'Monit Password';
-$wb['monit_url_error_regex'] = 'Invalid Monit URL';
+$wb['monit_url_error_regex'] = 'Monit URL non valida';
 $wb['monit_url_note_txt'] = 'Placeholder:';
 $wb['munin_url_txt'] = 'Munin URL';
-$wb['munin_user_txt'] = 'Munin User';
+$wb['munin_user_txt'] = 'Munin Utente';
 $wb['munin_password_txt'] = 'Munin Password';
-$wb['munin_url_error_regex'] = 'Invalid Munin URL';
+$wb['munin_url_error_regex'] = 'Munin URL non valida';
 $wb['munin_url_note_txt'] = 'Placeholder:';
-$wb["dkim_path_txt"] = 'DKIM Path';
-$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
-$wb["v6_prefix_txt"] = 'IPv6 Prefix';
-$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
-$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
-$wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
-$wb['monitor_system_updates_txt'] = 'Check for Linux updates';
-$wb['hostname_error_regex'] = 'Invalid Hostname.';
-$wb['invalid_apache_user_txt'] = 'Invalid apache user.';
-$wb['invalid_apache_group_txt'] = 'Invalid apache group.';
-$wb['backup_dir_error_regex'] = 'Invalid backup directory.';
-$wb['maildir_path_error_regex'] = 'Invalid maildir path.';
-$wb['homedir_path_error_regex'] = 'Invalid homedir path.';
-$wb['mailuser_name_error_regex'] = 'Invalid mailuser name.';
-$wb['mailuser_group_name_error_regex'] = 'Invalid mailuser group name.';
-$wb['mailuser_uid_error_range'] = 'Mailuser uid must be >= 2000';
-$wb['mailuser_gid_error_range'] = 'Mailuser gid must be >= 2000';
-$wb['getmail_config_dir_error_regex'] = 'Invalid getmail config directory.';
-$wb['website_basedir_error_regex'] = 'Invalid website basedir.';
-$wb['website_symlinks_error_regex'] = 'Invalid website symlinks.';
-$wb['vhost_conf_dir_error_regex'] = 'Invalid vhost config directory.';
-$wb['vhost_conf_enabled_dir_error_regex'] = 'Invalid vhost conf enabled directory.';
-$wb['nginx_vhost_conf_dir_error_regex'] = 'Invalid nginx config directory.';
+$wb['backup_dir_is_mount_txt'] = 'La direttirice di Backup è un mount?';
+$wb['monitor_system_updates_txt'] = 'Verifica aggiornamenti Linux';
+$wb['hostname_error_regex'] = 'Nome Host non valido.';
+$wb['invalid_apache_user_txt'] = 'Utente apache no valido.';
+$wb['invalid_apache_group_txt'] = 'Gruppo apache non valido.';
+$wb['backup_dir_error_regex'] = 'Direttrice backup non valida.';
+$wb['maildir_path_error_regex'] = 'Percorso maildir non valido.';
+$wb['homedir_path_error_regex'] = 'Percorso homedir non valido.';
+$wb['mailuser_name_error_regex'] = 'Nome utente per Mailuser non valido.';
+$wb['mailuser_group_name_error_regex'] = 'Gruppo utente per Mailuser non valido.';
+$wb['mailuser_uid_error_range'] = 'Mailuser uid deve essere >= 2000';
+$wb['mailuser_gid_error_range'] = 'Mailuser gid deve essere >= 2000';
+$wb['getmail_config_dir_error_regex'] = 'Cartella configurazione di getmail non valida.';
+$wb['website_basedir_error_regex'] = 'Basedir per siti web non valida.';
+$wb['website_symlinks_error_regex'] = 'website symlinks non valido.';
+$wb['vhost_conf_dir_error_regex'] = 'Direttrice configurazione vhost non valida.';
+$wb['vhost_conf_enabled_dir_error_regex'] = 'Direttirce abilitata per vhost conf non valida.';
+$wb['nginx_vhost_conf_dir_error_regex'] = 'nginx config directory non valida.';
 $wb['nginx_vhost_conf_enabled_dir_error_regex'] = 'Invalid nginx conf enabled directory.';
 $wb['ca_path_error_regex'] = 'Invalid CA path.';
 $wb['invalid_nginx_user_txt'] = 'Invalid nginx user.';
@@ -231,7 +219,7 @@ $wb['php_fpm_socket_dir_error_regex'] = 'Invalid php-fpm socket directory.';
 $wb['php_open_basedir_error_regex'] = 'Invalid php open_basedir.';
 $wb['awstats_data_dir_empty'] = 'awstats data directory is empty';
 $wb['awstats_data_dir_error_regex'] = 'Invalid awstats data directory.';
-$wb['awstats_pl_empty'] = 'awstats.pl setting is empty.';
+$wb['awstats_pl_empty'] = 'awstats.pl setting  vuoto.';
 $wb['awstats_pl_error_regex'] = 'Invalid awstats.pl path.';
 $wb['awstats_buildstaticpages_pl_empty'] = 'awstats_buildstaticpages.pl is empty';
 $wb['awstats_buildstaticpages_pl_error_regex'] = 'Invalid awstats_buildstaticpages.pl path.';
@@ -254,6 +242,42 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
-$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
-$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
+$wb['maildir_format_txt'] = 'Maildir Format';
+$wb['dkim_path_txt'] = 'DKIM Path';
+$wb['mailbox_virtual_uidgid_maps_txt'] = 'Use Websites Linux uid for mailbox';
+$wb['mailbox_virtual_uidgid_maps_info_txt'] = 'only in single web and mail-server-setup';
+$wb['mailbox_virtual_uidgid_maps_error_nosingleserver'] = 'Uid cannot be mapped in multi-server-setup.';
+$wb['mailbox_virtual_uidgid_maps_error_nodovecot'] = 'Uid-mapping can only be used with dovecot.';
+$wb['mailbox_virtual_uidgid_maps_error_alreadyusers'] = 'Uid-mapping cannot be changed if there are already mail users.';
+$wb['reject_sender_login_mismatch_txt'] = 'Reject sender and login mismatch';
+$wb['do_not_try_rescue_mongodb_txt'] = 'Disable MongoDB monitoring';
+$wb['v6_prefix_txt'] = 'IPv6 Prefix';
+$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
+$wb['v6_prefix_length'] = 'Prefix too long according to defined IPv6 ';
+$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
+$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
+$wb['php_handler_txt'] = 'Default PHP Handler';
+$wb['disabled_txt'] = 'Disabled';
+$wb['dkim_strength_txt'] = 'DKIM strength';
+$wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
+$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
+$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
+$wb['enable_spdy_txt'] = 'Makes SPDY available';
+$wb['web_settings_txt'] = 'Web Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+$wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
+$wb['xmpp_bosh_max_inactivity_txt'] = 'Max. BOSH inactivity time';
+$wb['xmpp_bosh_timeout_range_wrong'] = 'Please enter a bosh timeout range between 15 - 360';
+$wb['xmpp_module_saslauth'] = 'saslauth';
+$wb['xmpp_server_admins_txt'] = 'Server Admins (JIDs)';
+$wb['xmpp_modules_enabled_txt'] = 'Serverwide enabled plugins (one per line)';
+$wb['xmpp_ports_txt'] = 'Component ports';
+$wb['xmpp_port_http_txt'] = 'HTTP';
+$wb['xmpp_port_https_txt'] = 'HTTPS';
+$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
+$wb['xmpp_port_bosh_txt'] = 'BOSH';
+$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
+$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
 ?>
diff --git a/interface/web/admin/lib/lang/it_server_ip.lng b/interface/web/admin/lib/lang/it_server_ip.lng
index 86758810bd..0d36ac79c3 100644
--- a/interface/web/admin/lib/lang/it_server_ip.lng
+++ b/interface/web/admin/lib/lang/it_server_ip.lng
@@ -3,9 +3,9 @@ $wb['server_id_txt'] = 'Server';
 $wb['ip_address_txt'] = 'Indirizzo IP';
 $wb['virtualhost_txt'] = 'HTTP NameVirtualHost';
 $wb['ip_error_wrong'] = 'Indirizzo IP non valido';
-$wb['ip_error_unique'] = 'Lindirizzo IP devessere unico';
-$wb['client_id_txt'] = 'Client';
+$wb['ip_error_unique'] = 'Indirizzo IP deve essere unico';
+$wb['client_id_txt'] = 'Cliente';
 $wb['ip_type_txt'] = 'Type';
 $wb['virtualhost_port_txt'] = 'HTTP Ports';
-$wb['error_port_syntax'] = 'Invalid chars in port field, please enter only comma separated numbers. Example: 80,443';
+$wb['error_port_syntax'] = 'Caratteri non validi nel campo porta, per favore inserire solo valori separati da virgola. Esempio: 80,443';
 ?>
diff --git a/interface/web/admin/lib/lang/it_server_ip_list.lng b/interface/web/admin/lib/lang/it_server_ip_list.lng
index fe88e2ca62..b831408dc0 100644
--- a/interface/web/admin/lib/lang/it_server_ip_list.lng
+++ b/interface/web/admin/lib/lang/it_server_ip_list.lng
@@ -3,7 +3,7 @@ $wb['list_head_txt'] = 'Indirizzi IP';
 $wb['server_id_txt'] = 'Server';
 $wb['ip_address_txt'] = 'Indirizzo IP';
 $wb['add_new_record_txt'] = 'Aggiungi nuovo indirizzo IP';
-$wb['client_id_txt'] = 'Client';
+$wb['client_id_txt'] = 'Cliente';
 $wb['virtualhost_txt'] = 'HTTP Vhost';
 $wb['virtualhost_port_txt'] = 'HTTP Ports';
 $wb['ip_type_txt'] = 'Type';
diff --git a/interface/web/admin/lib/lang/it_server_ip_map.lng b/interface/web/admin/lib/lang/it_server_ip_map.lng
index 94508abb79..68b196fb23 100644
--- a/interface/web/admin/lib/lang/it_server_ip_map.lng
+++ b/interface/web/admin/lib/lang/it_server_ip_map.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["server_id_txt"] = 'Rewrite on Server';
-$wb["source_txt"] = 'Source IP';
-$wb["destination_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
-$wb["ip_error_wrong"] = 'The Destination IP address is invalid';
-$wb["destination_ip_empty"] = 'The Destination IP is empty.';
-$wb["source_ip_empty"] = 'The Source IP is empty.';
-$wb["server_empty_error"] = 'The Server is empty.';
-$wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb['server_id_txt'] = 'Rewrite on Server';
+$wb['source_txt'] = 'Source IP';
+$wb['destination_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
+$wb['ip_error_wrong'] = 'The Destination IP address is invalid';
+$wb['destination_ip_empty'] = 'The Destination IP is empty.';
+$wb['source_ip_empty'] = 'The Source IP is empty.';
+$wb['server_empty_error'] = 'The Server is empty.';
+$wb['duplicate_mapping_error'] = 'Mapping already exists.';
+$wb['ip_mapping_error'] = 'Source IP can not be an IP of the Rewrite-Server';
 ?>
diff --git a/interface/web/admin/lib/lang/it_server_ip_map_list.lng b/interface/web/admin/lib/lang/it_server_ip_map_list.lng
index 60c6815fda..1fedc10b2e 100644
--- a/interface/web/admin/lib/lang/it_server_ip_map_list.lng
+++ b/interface/web/admin/lib/lang/it_server_ip_map_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'IP Mappings';
-$wb["server_id_txt"] = 'Server';
-$wb["source_ip_txt"] = 'Source IP';
-$wb["destination_ip_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
+$wb['list_head_txt'] = 'IP Mappings';
+$wb['server_id_txt'] = 'Server';
+$wb['source_ip_txt'] = 'Source IP';
+$wb['destination_ip_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
 ?>
diff --git a/interface/web/admin/lib/lang/it_server_list.lng b/interface/web/admin/lib/lang/it_server_list.lng
index d106a57042..3aba94d04a 100644
--- a/interface/web/admin/lib/lang/it_server_list.lng
+++ b/interface/web/admin/lib/lang/it_server_list.lng
@@ -10,4 +10,5 @@ $wb['vserver_server_txt'] = 'VServer';
 $wb['add_new_record_txt'] = 'Aggiungi Server';
 $wb['proxy_server_txt'] = 'Proxy';
 $wb['firewall_server_txt'] = 'Firewall';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>
diff --git a/interface/web/admin/lib/lang/it_server_php.lng b/interface/web/admin/lib/lang/it_server_php.lng
index addbfa4935..1b8d4ffc74 100644
--- a/interface/web/admin/lib/lang/it_server_php.lng
+++ b/interface/web/admin/lib/lang/it_server_php.lng
@@ -1,16 +1,16 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['client_id_txt'] = 'Client';
+$wb['client_id_txt'] = 'Cliente';
 $wb['name_txt'] = 'PHP Name';
-$wb['Name'] = 'Name';
+$wb['Name'] = 'Nome';
 $wb['FastCGI Settings'] = 'FastCGI Settings';
 $wb['PHP-FPM Settings'] = 'PHP-FPM Settings';
 $wb['Additional PHP Versions'] = 'Additional PHP Versions';
 $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';
-$wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory';
-$wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script';
-$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';
+$wb['server_php_name_error_empty'] = 'The Name field must not be vuoto.';
+$wb['php_fastcgi_binary_txt'] = 'Percorso per  PHP FastCGI binary';
+$wb['php_fastcgi_ini_dir_txt'] = 'Percorso per  php.ini directory';
+$wb['php_fpm_init_script_txt'] = 'Percorso per  PHP-FPM init script';
+$wb['php_fpm_ini_dir_txt'] = 'Percorso per  php.ini directory';
+$wb['php_fpm_pool_dir_txt'] = 'Percorso per  PHP-FPM pool directory';
 ?>
diff --git a/interface/web/admin/lib/lang/it_server_php_list.lng b/interface/web/admin/lib/lang/it_server_php_list.lng
index b402fd1ed1..36bfcbc40e 100644
--- a/interface/web/admin/lib/lang/it_server_php_list.lng
+++ b/interface/web/admin/lib/lang/it_server_php_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb['list_head_txt'] = 'Additional PHP Versions';
+$wb['list_head_txt'] = 'Versioni PHP Aggiuntive';
 $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'] = 'Aggiungi una nuova versione PHP';
+$wb['client_id_txt'] = 'Cliente';
+$wb['name_txt'] = 'Nome PHP';
 ?>
diff --git a/interface/web/admin/lib/lang/it_software_package.lng b/interface/web/admin/lib/lang/it_software_package.lng
index faffe38217..d2e123cf85 100644
--- a/interface/web/admin/lib/lang/it_software_package.lng
+++ b/interface/web/admin/lib/lang/it_software_package.lng
@@ -1,6 +1,6 @@
 <?php
-$wb['package_title_txt'] = 'Package Title';
+$wb['package_title_txt'] = 'Titolo pacchetto';
 $wb['package_key_txt'] = 'Package Key';
-$wb['Software Package'] = 'Software Package';
-$wb['Modify software package details'] = 'Modify software package details';
+$wb['Software Package'] = 'Pacchetto Software';
+$wb['Modify software package details'] = 'Modifica dettagli pacchetto software';
 ?>
diff --git a/interface/web/admin/lib/lang/it_software_package_install.lng b/interface/web/admin/lib/lang/it_software_package_install.lng
index 5c8b756434..1e210d5894 100644
--- a/interface/web/admin/lib/lang/it_software_package_install.lng
+++ b/interface/web/admin/lib/lang/it_software_package_install.lng
@@ -1,6 +1,6 @@
 <?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'] = 'Installa pacchetto software';
+$wb['install_key_txt'] = 'Inserisci chiave pacchetto';
+$wb['btn_save_txt'] = 'Avvia installazione';
+$wb['btn_cancel_txt'] = 'Annulla';
 ?>
diff --git a/interface/web/admin/lib/lang/it_software_package_list.lng b/interface/web/admin/lib/lang/it_software_package_list.lng
index 9fa53867bc..5ab82417de 100644
--- a/interface/web/admin/lib/lang/it_software_package_list.lng
+++ b/interface/web/admin/lib/lang/it_software_package_list.lng
@@ -1,13 +1,13 @@
 <?php
-$wb['list_head_txt'] = 'Software packages';
-$wb['installed_txt'] = 'Status';
-$wb['package_title_txt'] = 'Package';
-$wb['package_description_txt'] = 'Description';
+$wb['list_head_txt'] = 'Pacchetti Software';
+$wb['installed_txt'] = 'Stato';
+$wb['package_title_txt'] = 'Pacchetto';
+$wb['package_description_txt'] = 'Descrizione';
 $wb['action_txt'] = 'Action';
-$wb['toolsarea_head_txt'] = 'Packages';
-$wb['repoupdate_txt'] = 'Update package list';
+$wb['toolsarea_head_txt'] = 'Pacchetti';
+$wb['repoupdate_txt'] = 'Aggiorna elenco pacchetti';
 $wb['package_id_txt'] = 'local App-ID';
-$wb['no_packages_txt'] = 'No packages available';
-$wb['edit_txt'] = 'Edit';
-$wb['delete_txt'] = 'Delete';
+$wb['no_packages_txt'] = 'Nessun pacchetto disponibile';
+$wb['edit_txt'] = 'Modifica';
+$wb['delete_txt'] = 'Elimina';
 ?>
diff --git a/interface/web/admin/lib/lang/it_software_repo.lng b/interface/web/admin/lib/lang/it_software_repo.lng
index 7adc6b0863..76b0182697 100644
--- a/interface/web/admin/lib/lang/it_software_repo.lng
+++ b/interface/web/admin/lib/lang/it_software_repo.lng
@@ -4,5 +4,5 @@ $wb['repo_url_txt'] = 'URL';
 $wb['repo_username_txt'] = 'Utente (facoltativo)';
 $wb['repo_password_txt'] = 'Password (facoltativa)';
 $wb['active_txt'] = 'Attivo';
-$wb['Software Repository which may contain addons or updates'] = 'Software Repository which may contain addons or updates';
+$wb['Software Repository which may contain addons or updates'] = 'Software Repository che può contenere aggiunte o aggiornamenti';
 ?>
diff --git a/interface/web/admin/lib/lang/it_software_update_list.lng b/interface/web/admin/lib/lang/it_software_update_list.lng
index 16ca62d8b1..cc264b84ec 100644
--- a/interface/web/admin/lib/lang/it_software_update_list.lng
+++ b/interface/web/admin/lib/lang/it_software_update_list.lng
@@ -5,5 +5,5 @@ $wb['update_title_txt'] = 'Aggiornamento';
 $wb['version_txt'] = 'Versione';
 $wb['action_txt'] = 'Azione';
 $wb['server_select_txt'] = 'Selezionare server';
-$wb['no_updates_txt'] = 'No updates available';
+$wb['no_updates_txt'] = 'Nessun aggiornamento disponibile';
 ?>
diff --git a/interface/web/admin/lib/lang/it_system_config.lng b/interface/web/admin/lib/lang/it_system_config.lng
index 172568dc22..396503f02e 100644
--- a/interface/web/admin/lib/lang/it_system_config.lng
+++ b/interface/web/admin/lib/lang/it_system_config.lng
@@ -39,16 +39,13 @@ $wb['smtp_missing_admin_mail_txt'] = 'Please enter the admin name and admin mail
 $wb['tab_change_discard_txt'] = 'Discard changes on tab change';
 $wb['tab_change_warning_txt'] = 'Tab change warning';
 $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'] = 'Crea  Subdomains as web site';
 $wb['vhost_subdomains_note_txt'] = 'You cannot disable this as long as vhost subdomains exist in the system!';
-$wb['vhost_aliasdomains_txt'] = 'Create aliasdomains as web site';
-$wb['vhost_aliasdomains_note_txt'] = 'You cannot disable this as long as vhost aliasdomains 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['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
-$wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
 $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_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
@@ -71,9 +68,17 @@ $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["company_name_txt"] = "Company Name for the page title";
-$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
-$wb["custom_login_text_txt"] = "Custom Text on Login-Page";
-$wb["custom_login_link_txt"] = "Custom Link on Login-Page";
-$wb["login_link_error_regex"] = "Invalid Link for Custom Login";
+$wb['vhost_aliasdomains_txt'] = 'Create aliasdomains as web site';
+$wb['vhost_aliasdomains_note_txt'] = 'You cannot disable this as long as vhost aliasdomains exist in the system!';
+$wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['company_name_txt'] = 'Company Name for the page title';
+$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
+$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
+$wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
+$wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
 ?>
diff --git a/interface/web/admin/lib/lang/it_tpl_default_admin.lng b/interface/web/admin/lib/lang/it_tpl_default_admin.lng
index eee3af5fe4..04d2bd959a 100644
--- a/interface/web/admin/lib/lang/it_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/it_tpl_default_admin.lng
@@ -2,17 +2,17 @@
 $wb['tpl_default_admin_head_txt'] = 'Global Default-Theme Settings';
 $wb['tpl_default_admin_desc_txt'] = '';
 $wb['server_id_txt'] = 'Server';
-$wb['client_id_txt'] = 'Client';
+$wb['client_id_txt'] = 'Cliente';
 $wb['name_txt'] = 'PHP Name';
-$wb['Name'] = 'Name';
+$wb['Name'] = 'Nome';
 $wb['FastCGI Settings'] = 'FastCGI Settings';
 $wb['PHP-FPM Settings'] = 'PHP-FPM Settings';
 $wb['Additional PHP Versions'] = 'Additional PHP Versions';
 $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';
-$wb['php_fastcgi_ini_dir_txt'] = 'Path to the php.ini directory';
-$wb['php_fpm_init_script_txt'] = 'Path to the PHP-FPM init script';
-$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';
+$wb['server_php_name_error_empty'] = 'The Name field must not be vuoto.';
+$wb['php_fastcgi_binary_txt'] = 'Percorso per  PHP FastCGI binary';
+$wb['php_fastcgi_ini_dir_txt'] = 'Percorso per  php.ini directory';
+$wb['php_fpm_init_script_txt'] = 'Percorso per  PHP-FPM init script';
+$wb['php_fpm_ini_dir_txt'] = 'Percorso per  php.ini directory';
+$wb['php_fpm_pool_dir_txt'] = 'Percorso per  PHP-FPM pool directory';
 ?>
diff --git a/interface/web/admin/lib/lang/it_users.lng b/interface/web/admin/lib/lang/it_users.lng
index a321aa4d13..4c819427b7 100644
--- a/interface/web/admin/lib/lang/it_users.lng
+++ b/interface/web/admin/lib/lang/it_users.lng
@@ -7,7 +7,7 @@ $wb['passwort_txt'] = 'Password';
 $wb['password_strength_txt'] = 'Solidità password';
 $wb['modules_txt'] = 'Modulo';
 $wb['startmodule_txt'] = 'Startmodule';
-$wb['app_theme_txt'] = 'Design';
+$wb['app_theme_txt'] = 'Aspetto';
 $wb['typ_txt'] = 'Tipo';
 $wb['active_txt'] = 'Attiva';
 $wb['language_txt'] = 'Lingua';
@@ -25,10 +25,11 @@ $wb['fax_txt'] = 'Fax';
 $wb['groups_txt'] = 'Gruppi';
 $wb['default_group_txt'] = 'Gruppo predefinito';
 $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['generate_password_txt'] = 'Genera Password';
+$wb['repeat_password_txt'] = 'Ripeti Password';
+$wb['password_mismatch_txt'] = 'Le password non coincidono.';
+$wb['password_match_txt'] = 'Le password coincidono.';
 $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['lost_password_function_txt'] = 'Forgot password function is available';
 ?>
diff --git a/interface/web/admin/lib/lang/it_users_list.lng b/interface/web/admin/lib/lang/it_users_list.lng
index a86279c713..decfe623aa 100644
--- a/interface/web/admin/lib/lang/it_users_list.lng
+++ b/interface/web/admin/lib/lang/it_users_list.lng
@@ -2,8 +2,8 @@
 $wb['list_head_txt'] = 'Utenti';
 $wb['username_txt'] = 'Nome utente';
 $wb['client_id_txt'] = 'Client ID';
-$wb['active_txt'] = 'Active';
-$wb['add_new_record_txt'] = 'Add new user';
+$wb['active_txt'] = 'Attivo';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo  user';
 $wb['warning_txt'] = '<b>ATTENZIONE:</b> non editare o modificare alcuna impostazione utente in questa schermata. Usare piuttosto le impostazioni Cliente/Rivenditore del modulo Clienti. Modificare Utenti o gruppi in questa schermata può provocare la perdita di dati.';
 $wb['groups_txt'] = 'Groups';
 ?>
diff --git a/interface/web/admin/lib/lang/ja.lng b/interface/web/admin/lib/lang/ja.lng
index a54ae46795..b39e9f3085 100644
--- a/interface/web/admin/lib/lang/ja.lng
+++ b/interface/web/admin/lib/lang/ja.lng
@@ -47,4 +47,6 @@ $wb['Remote Actions'] = 'Remote Actions';
 $wb['Do OS-Update'] = 'Do OS-Update';
 $wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
 $wb['Directive Snippets'] = 'Directive Snippets';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
 ?>
diff --git a/interface/web/admin/lib/lang/ja_directive_snippets.lng b/interface/web/admin/lib/lang/ja_directive_snippets.lng
index 0f09c12ee0..21387b31e5 100644
--- a/interface/web/admin/lib/lang/ja_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/ja_directive_snippets.lng
@@ -7,4 +7,5 @@ $wb['active_txt'] = 'Active';
 $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
 $wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
 $wb['variables_txt'] = 'Variables';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/ja_directive_snippets_list.lng b/interface/web/admin/lib/lang/ja_directive_snippets_list.lng
index 4124ea3464..8e189f9f79 100644
--- a/interface/web/admin/lib/lang/ja_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/ja_directive_snippets_list.lng
@@ -4,4 +4,5 @@ $wb['active_txt'] = 'Active';
 $wb['name_txt'] = 'Name of Snippet';
 $wb['type_txt'] = 'Type';
 $wb['add_new_record_txt'] = 'Add Directive Snippet';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/ja_server.lng b/interface/web/admin/lib/lang/ja_server.lng
index 6f1574a2c3..1450c387f4 100644
--- a/interface/web/admin/lib/lang/ja_server.lng
+++ b/interface/web/admin/lib/lang/ja_server.lng
@@ -12,4 +12,5 @@ $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['xmpp_server_txt'] = 'XMPP Server';
 ?>
diff --git a/interface/web/admin/lib/lang/ja_server_config.lng b/interface/web/admin/lib/lang/ja_server_config.lng
index 76e1cf87ae..d50a55bdca 100644
--- a/interface/web/admin/lib/lang/ja_server_config.lng
+++ b/interface/web/admin/lib/lang/ja_server_config.lng
@@ -195,11 +195,11 @@ $wb['munin_user_txt'] = 'Munin User';
 $wb['munin_password_txt'] = 'Munin Password';
 $wb['munin_url_error_regex'] = 'Invalid Munin URL';
 $wb['munin_url_note_txt'] = 'Placeholder:';
-$wb["dkim_path_txt"] = 'DKIM Path';
+$wb['dkim_path_txt'] = 'DKIM Path';
 $wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
-$wb["v6_prefix_txt"] = 'IPv6 Prefix';
-$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
-$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
+$wb['v6_prefix_txt'] = 'IPv6 Prefix';
+$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
+$wb['v6_prefix_length'] = 'Prefix too long according to defined IPv6 ';
 $wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
 $wb['monitor_system_updates_txt'] = 'Check for Linux updates';
 $wb['hostname_error_regex'] = 'Invalid Hostname.';
@@ -254,6 +254,30 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
-$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
-$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
+$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
+$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
+$wb['do_not_try_rescue_mongodb_txt'] = 'Disable MongoDB monitoring';
+$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
+$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
+$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
+$wb['php_handler_txt'] = 'Default PHP Handler';
+$wb['disabled_txt'] = 'Disabled';
+$wb['dkim_strength_txt'] = 'DKIM strength';
+$wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
+$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
+$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
+$wb['enable_spdy_txt'] = 'Makes SPDY available';
+$wb['web_settings_txt'] = 'Web Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+$wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
+$wb['xmpp_bosh_max_inactivity_txt'] = 'Max. BOSH inactivity time';
+$wb['xmpp_bosh_timeout_range_wrong'] = 'Please enter a bosh timeout range between 15 - 360';
+$wb['xmpp_module_saslauth'] = 'saslauth';
+$wb['xmpp_server_admins_txt'] = 'Server Admins (JIDs)';
+$wb['xmpp_modules_enabled_txt'] = 'Serverwide enabled plugins (one per line)';
+$wb['xmpp_ports_txt'] = 'Component ports';
+$wb['xmpp_port_http_txt'] = 'HTTP';
+$wb['xmpp_port_https_txt'] = 'HTTPS';
+$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
+$wb['xmpp_port_bosh_txt'] = 'BOSH';
 ?>
diff --git a/interface/web/admin/lib/lang/ja_server_ip_map.lng b/interface/web/admin/lib/lang/ja_server_ip_map.lng
index 94508abb79..68b196fb23 100644
--- a/interface/web/admin/lib/lang/ja_server_ip_map.lng
+++ b/interface/web/admin/lib/lang/ja_server_ip_map.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["server_id_txt"] = 'Rewrite on Server';
-$wb["source_txt"] = 'Source IP';
-$wb["destination_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
-$wb["ip_error_wrong"] = 'The Destination IP address is invalid';
-$wb["destination_ip_empty"] = 'The Destination IP is empty.';
-$wb["source_ip_empty"] = 'The Source IP is empty.';
-$wb["server_empty_error"] = 'The Server is empty.';
-$wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb['server_id_txt'] = 'Rewrite on Server';
+$wb['source_txt'] = 'Source IP';
+$wb['destination_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
+$wb['ip_error_wrong'] = 'The Destination IP address is invalid';
+$wb['destination_ip_empty'] = 'The Destination IP is empty.';
+$wb['source_ip_empty'] = 'The Source IP is empty.';
+$wb['server_empty_error'] = 'The Server is empty.';
+$wb['duplicate_mapping_error'] = 'Mapping already exists.';
+$wb['ip_mapping_error'] = 'Source IP can not be an IP of the Rewrite-Server';
 ?>
diff --git a/interface/web/admin/lib/lang/ja_server_ip_map_list.lng b/interface/web/admin/lib/lang/ja_server_ip_map_list.lng
index 60c6815fda..1fedc10b2e 100644
--- a/interface/web/admin/lib/lang/ja_server_ip_map_list.lng
+++ b/interface/web/admin/lib/lang/ja_server_ip_map_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'IP Mappings';
-$wb["server_id_txt"] = 'Server';
-$wb["source_ip_txt"] = 'Source IP';
-$wb["destination_ip_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
+$wb['list_head_txt'] = 'IP Mappings';
+$wb['server_id_txt'] = 'Server';
+$wb['source_ip_txt'] = 'Source IP';
+$wb['destination_ip_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
 ?>
diff --git a/interface/web/admin/lib/lang/ja_server_list.lng b/interface/web/admin/lib/lang/ja_server_list.lng
index 611eb9cf24..2c5a6d29c2 100644
--- a/interface/web/admin/lib/lang/ja_server_list.lng
+++ b/interface/web/admin/lib/lang/ja_server_list.lng
@@ -10,4 +10,5 @@ $wb['vserver_server_txt'] = 'VServer';
 $wb['add_new_record_txt'] = 'サーバーを追加する';
 $wb['proxy_server_txt'] = 'Proxy';
 $wb['firewall_server_txt'] = 'Firewall';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>
diff --git a/interface/web/admin/lib/lang/ja_system_config.lng b/interface/web/admin/lib/lang/ja_system_config.lng
index 6125ea1e82..fc32081d96 100644
--- a/interface/web/admin/lib/lang/ja_system_config.lng
+++ b/interface/web/admin/lib/lang/ja_system_config.lng
@@ -71,9 +71,14 @@ $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["company_name_txt"] = "Company Name for the page title";
-$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
-$wb["custom_login_text_txt"] = "Custom Text on Login-Page";
-$wb["custom_login_link_txt"] = "Custom Link on Login-Page";
-$wb["login_link_error_regex"] = "Invalid Link for Custom Login";
+$wb['company_name_txt'] = 'Company Name for the page title';
+$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
+$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
+$wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
+$wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
 ?>
diff --git a/interface/web/admin/lib/lang/ja_users.lng b/interface/web/admin/lib/lang/ja_users.lng
index 7fc4f42b1b..7f16911b75 100644
--- a/interface/web/admin/lib/lang/ja_users.lng
+++ b/interface/web/admin/lib/lang/ja_users.lng
@@ -31,4 +31,5 @@ $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['lost_password_function_txt'] = 'Forgot password function is available';
 ?>
diff --git a/interface/web/admin/lib/lang/nl.lng b/interface/web/admin/lib/lang/nl.lng
index 0164f998c2..26d231ffcd 100644
--- a/interface/web/admin/lib/lang/nl.lng
+++ b/interface/web/admin/lib/lang/nl.lng
@@ -47,4 +47,6 @@ $wb['Remote Actions'] = 'Remote acties';
 $wb['Do OS-Update'] = 'Voer een OS-Update uit';
 $wb['Do ISPConfig-Update'] = 'Voer een ISPConfig-update uit';
 $wb['Directive Snippets'] = 'Directive Snippets';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
 ?>
diff --git a/interface/web/admin/lib/lang/nl_directive_snippets.lng b/interface/web/admin/lib/lang/nl_directive_snippets.lng
index 0f09c12ee0..21387b31e5 100644
--- a/interface/web/admin/lib/lang/nl_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/nl_directive_snippets.lng
@@ -7,4 +7,5 @@ $wb['active_txt'] = 'Active';
 $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
 $wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
 $wb['variables_txt'] = 'Variables';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/nl_directive_snippets_list.lng b/interface/web/admin/lib/lang/nl_directive_snippets_list.lng
index 4124ea3464..8e189f9f79 100644
--- a/interface/web/admin/lib/lang/nl_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/nl_directive_snippets_list.lng
@@ -4,4 +4,5 @@ $wb['active_txt'] = 'Active';
 $wb['name_txt'] = 'Name of Snippet';
 $wb['type_txt'] = 'Type';
 $wb['add_new_record_txt'] = 'Add Directive Snippet';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/nl_server.lng b/interface/web/admin/lib/lang/nl_server.lng
index 1683a6af37..7aed707e15 100644
--- a/interface/web/admin/lib/lang/nl_server.lng
+++ b/interface/web/admin/lib/lang/nl_server.lng
@@ -12,4 +12,5 @@ $wb['mirror_server_id_txt'] = 'Is mirror van server';
 $wb['- None -'] = '- Geen enkele -';
 $wb['proxy_server_txt'] = 'Proxy-Server';
 $wb['firewall_server_txt'] = 'Firewall-Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
 ?>
diff --git a/interface/web/admin/lib/lang/nl_server_config.lng b/interface/web/admin/lib/lang/nl_server_config.lng
index b31b45236d..32ac87587e 100644
--- a/interface/web/admin/lib/lang/nl_server_config.lng
+++ b/interface/web/admin/lib/lang/nl_server_config.lng
@@ -195,11 +195,11 @@ $wb['munin_user_txt'] = 'Munin User';
 $wb['munin_password_txt'] = 'Munin Password';
 $wb['munin_url_error_regex'] = 'Invalid Munin URL';
 $wb['munin_url_note_txt'] = 'Placeholder:';
-$wb["dkim_path_txt"] = 'DKIM Path';
+$wb['dkim_path_txt'] = 'DKIM Path';
 $wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
-$wb["v6_prefix_txt"] = 'IPv6 Prefix';
-$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
-$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
+$wb['v6_prefix_txt'] = 'IPv6 Prefix';
+$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
+$wb['v6_prefix_length'] = 'Prefix too long according to defined IPv6 ';
 $wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
 $wb['monitor_system_updates_txt'] = 'Check for Linux updates';
 $wb['hostname_error_regex'] = 'Invalid Hostname.';
@@ -254,6 +254,30 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
-$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
-$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
+$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
+$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
+$wb['do_not_try_rescue_mongodb_txt'] = 'Disable MongoDB monitoring';
+$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
+$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
+$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
+$wb['php_handler_txt'] = 'Default PHP Handler';
+$wb['disabled_txt'] = 'Disabled';
+$wb['dkim_strength_txt'] = 'DKIM strength';
+$wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
+$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
+$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
+$wb['enable_spdy_txt'] = 'Makes SPDY available';
+$wb['web_settings_txt'] = 'Web Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+$wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
+$wb['xmpp_bosh_max_inactivity_txt'] = 'Max. BOSH inactivity time';
+$wb['xmpp_bosh_timeout_range_wrong'] = 'Please enter a bosh timeout range between 15 - 360';
+$wb['xmpp_module_saslauth'] = 'saslauth';
+$wb['xmpp_server_admins_txt'] = 'Server Admins (JIDs)';
+$wb['xmpp_modules_enabled_txt'] = 'Serverwide enabled plugins (one per line)';
+$wb['xmpp_ports_txt'] = 'Component ports';
+$wb['xmpp_port_http_txt'] = 'HTTP';
+$wb['xmpp_port_https_txt'] = 'HTTPS';
+$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
+$wb['xmpp_port_bosh_txt'] = 'BOSH';
 ?>
diff --git a/interface/web/admin/lib/lang/nl_server_ip_map.lng b/interface/web/admin/lib/lang/nl_server_ip_map.lng
index 94508abb79..68b196fb23 100644
--- a/interface/web/admin/lib/lang/nl_server_ip_map.lng
+++ b/interface/web/admin/lib/lang/nl_server_ip_map.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["server_id_txt"] = 'Rewrite on Server';
-$wb["source_txt"] = 'Source IP';
-$wb["destination_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
-$wb["ip_error_wrong"] = 'The Destination IP address is invalid';
-$wb["destination_ip_empty"] = 'The Destination IP is empty.';
-$wb["source_ip_empty"] = 'The Source IP is empty.';
-$wb["server_empty_error"] = 'The Server is empty.';
-$wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb['server_id_txt'] = 'Rewrite on Server';
+$wb['source_txt'] = 'Source IP';
+$wb['destination_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
+$wb['ip_error_wrong'] = 'The Destination IP address is invalid';
+$wb['destination_ip_empty'] = 'The Destination IP is empty.';
+$wb['source_ip_empty'] = 'The Source IP is empty.';
+$wb['server_empty_error'] = 'The Server is empty.';
+$wb['duplicate_mapping_error'] = 'Mapping already exists.';
+$wb['ip_mapping_error'] = 'Source IP can not be an IP of the Rewrite-Server';
 ?>
diff --git a/interface/web/admin/lib/lang/nl_server_ip_map_list.lng b/interface/web/admin/lib/lang/nl_server_ip_map_list.lng
index 60c6815fda..1fedc10b2e 100644
--- a/interface/web/admin/lib/lang/nl_server_ip_map_list.lng
+++ b/interface/web/admin/lib/lang/nl_server_ip_map_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'IP Mappings';
-$wb["server_id_txt"] = 'Server';
-$wb["source_ip_txt"] = 'Source IP';
-$wb["destination_ip_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
+$wb['list_head_txt'] = 'IP Mappings';
+$wb['server_id_txt'] = 'Server';
+$wb['source_ip_txt'] = 'Source IP';
+$wb['destination_ip_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
 ?>
diff --git a/interface/web/admin/lib/lang/nl_server_list.lng b/interface/web/admin/lib/lang/nl_server_list.lng
index 2fa02fcc48..245f3c8c57 100644
--- a/interface/web/admin/lib/lang/nl_server_list.lng
+++ b/interface/web/admin/lib/lang/nl_server_list.lng
@@ -10,4 +10,5 @@ $wb['vserver_server_txt'] = 'VServer';
 $wb['add_new_record_txt'] = 'Toevoegen nieuwe server';
 $wb['proxy_server_txt'] = 'Proxy';
 $wb['firewall_server_txt'] = 'Firewall';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>
diff --git a/interface/web/admin/lib/lang/nl_system_config.lng b/interface/web/admin/lib/lang/nl_system_config.lng
index fde5bf9483..5177888bb0 100644
--- a/interface/web/admin/lib/lang/nl_system_config.lng
+++ b/interface/web/admin/lib/lang/nl_system_config.lng
@@ -16,9 +16,9 @@ $wb['shelluser_prefix_error_regex'] = 'Char niet toegestaan in shell gebruiker v
 $wb['webdavuser_prefix_error_regex'] = 'Char niet toegestaan in webdav gebruiker voorvoegsel.';
 $wb['dblist_phpmyadmin_link_txt'] = 'Link naar phpmyadmin in DB lijst';
 $wb['mailboxlist_webmail_link_txt'] = 'Link naar webmail in Mailbox lijst';
-$wb['mailbox_show_autoresponder_tab_txt'] = 'Toon Autoresponder tabblad in Mailbox detail';
-$wb['mailbox_show_mail_filter_tab_txt'] = 'Toon Mail Filter tabblad in Mailbox detail';
-$wb['mailbox_show_custom_rules_tab_txt'] = 'Toon Custom Rules tabblad in Mailbox detail';
+$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_custom_rules_tab_txt'] = 'Show custom mailfilter tab in mail account details';
 $wb['webmail_url_txt'] = 'Webmail URL';
 $wb['phpmyadmin_url_txt'] = 'PHPMyAdmin URL';
 $wb['use_domain_module_txt'] = 'Gebruik de domein-module om nieuwe domeinen toe te voegen';
@@ -52,9 +52,6 @@ $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['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
 $wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
-$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_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:';
 $wb['webmail_url_note_txt'] = 'Placeholder:';
@@ -74,9 +71,14 @@ $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["company_name_txt"] = "Company Name for the page title";
-$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
-$wb["custom_login_text_txt"] = "Custom Text on Login-Page";
-$wb["custom_login_link_txt"] = "Custom Link on Login-Page";
-$wb["login_link_error_regex"] = "Invalid Link for Custom Login";
+$wb['company_name_txt'] = 'Company Name for the page title';
+$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
+$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
+$wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
+$wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
 ?>
diff --git a/interface/web/admin/lib/lang/nl_users.lng b/interface/web/admin/lib/lang/nl_users.lng
index b0a5f48e8b..9634ee4bd6 100644
--- a/interface/web/admin/lib/lang/nl_users.lng
+++ b/interface/web/admin/lib/lang/nl_users.lng
@@ -31,4 +31,5 @@ $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['lost_password_function_txt'] = 'Forgot password function is available';
 ?>
diff --git a/interface/web/admin/lib/lang/pl.lng b/interface/web/admin/lib/lang/pl.lng
index e06fba34e8..a24e4357c0 100644
--- a/interface/web/admin/lib/lang/pl.lng
+++ b/interface/web/admin/lib/lang/pl.lng
@@ -47,4 +47,6 @@ $wb['Directive Snippets'] = 'Zestawy dyrektyw';
 $wb['Interface'] = 'Interfejs';
 $wb['Domains'] = 'Domeny';
 $wb['Misc'] = 'Różne';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
 ?>
diff --git a/interface/web/admin/lib/lang/pl_directive_snippets.lng b/interface/web/admin/lib/lang/pl_directive_snippets.lng
index bf5a6f988d..377b5defd2 100644
--- a/interface/web/admin/lib/lang/pl_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/pl_directive_snippets.lng
@@ -7,4 +7,5 @@ $wb['active_txt'] = 'Aktywne';
 $wb['directive_snippets_name_empty'] = 'Wybierz nazwę dla zestawu dyrektyw';
 $wb['directive_snippets_name_error_unique'] = 'Istnieje już zestaw dyrektyw o podanej nazwie';
 $wb['variables_txt'] = 'Variables';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/pl_directive_snippets_list.lng b/interface/web/admin/lib/lang/pl_directive_snippets_list.lng
index 8d731021bb..b7e7e4d266 100644
--- a/interface/web/admin/lib/lang/pl_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/pl_directive_snippets_list.lng
@@ -4,4 +4,5 @@ $wb['active_txt'] = 'Aktywne';
 $wb['name_txt'] = 'Nazwa zestawu';
 $wb['type_txt'] = 'Rodzaj';
 $wb['add_new_record_txt'] = 'Dodaj nowy zestaw dyrektyw';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/pl_server.lng b/interface/web/admin/lib/lang/pl_server.lng
index 5e9c411720..1fe0171ff1 100644
--- a/interface/web/admin/lib/lang/pl_server.lng
+++ b/interface/web/admin/lib/lang/pl_server.lng
@@ -12,4 +12,5 @@ $wb['mirror_server_id_txt'] = 'Jest mirrorem serwera';
 $wb['- None -'] = '- Żaden -';
 $wb['proxy_server_txt'] = 'Proxy-Server';
 $wb['firewall_server_txt'] = 'Firewall-Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
 ?>
diff --git a/interface/web/admin/lib/lang/pl_server_config.lng b/interface/web/admin/lib/lang/pl_server_config.lng
index d1a0b6750b..2315178330 100644
--- a/interface/web/admin/lib/lang/pl_server_config.lng
+++ b/interface/web/admin/lib/lang/pl_server_config.lng
@@ -195,11 +195,11 @@ $wb['munin_user_txt'] = 'Munin User';
 $wb['munin_password_txt'] = 'Munin Password';
 $wb['munin_url_error_regex'] = 'Invalid Munin URL';
 $wb['munin_url_note_txt'] = 'Placeholder:';
-$wb["dkim_path_txt"] = 'DKIM Path';
+$wb['dkim_path_txt'] = 'DKIM Path';
 $wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
-$wb["v6_prefix_txt"] = 'IPv6 Prefix';
-$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
-$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
+$wb['v6_prefix_txt'] = 'IPv6 Prefix';
+$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
+$wb['v6_prefix_length'] = 'Prefix too long according to defined IPv6 ';
 $wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
 $wb['monitor_system_updates_txt'] = 'Check for Linux updates';
 $wb['hostname_error_regex'] = 'Invalid Hostname.';
@@ -254,6 +254,30 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
-$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
-$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
+$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
+$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
+$wb['do_not_try_rescue_mongodb_txt'] = 'Disable MongoDB monitoring';
+$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
+$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
+$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
+$wb['php_handler_txt'] = 'Default PHP Handler';
+$wb['disabled_txt'] = 'Disabled';
+$wb['dkim_strength_txt'] = 'DKIM strength';
+$wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
+$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
+$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
+$wb['enable_spdy_txt'] = 'Makes SPDY available';
+$wb['web_settings_txt'] = 'Web Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+$wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
+$wb['xmpp_bosh_max_inactivity_txt'] = 'Max. BOSH inactivity time';
+$wb['xmpp_bosh_timeout_range_wrong'] = 'Please enter a bosh timeout range between 15 - 360';
+$wb['xmpp_module_saslauth'] = 'saslauth';
+$wb['xmpp_server_admins_txt'] = 'Server Admins (JIDs)';
+$wb['xmpp_modules_enabled_txt'] = 'Serverwide enabled plugins (one per line)';
+$wb['xmpp_ports_txt'] = 'Component ports';
+$wb['xmpp_port_http_txt'] = 'HTTP';
+$wb['xmpp_port_https_txt'] = 'HTTPS';
+$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
+$wb['xmpp_port_bosh_txt'] = 'BOSH';
 ?>
diff --git a/interface/web/admin/lib/lang/pl_server_ip_map.lng b/interface/web/admin/lib/lang/pl_server_ip_map.lng
index 94508abb79..68b196fb23 100644
--- a/interface/web/admin/lib/lang/pl_server_ip_map.lng
+++ b/interface/web/admin/lib/lang/pl_server_ip_map.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["server_id_txt"] = 'Rewrite on Server';
-$wb["source_txt"] = 'Source IP';
-$wb["destination_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
-$wb["ip_error_wrong"] = 'The Destination IP address is invalid';
-$wb["destination_ip_empty"] = 'The Destination IP is empty.';
-$wb["source_ip_empty"] = 'The Source IP is empty.';
-$wb["server_empty_error"] = 'The Server is empty.';
-$wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb['server_id_txt'] = 'Rewrite on Server';
+$wb['source_txt'] = 'Source IP';
+$wb['destination_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
+$wb['ip_error_wrong'] = 'The Destination IP address is invalid';
+$wb['destination_ip_empty'] = 'The Destination IP is empty.';
+$wb['source_ip_empty'] = 'The Source IP is empty.';
+$wb['server_empty_error'] = 'The Server is empty.';
+$wb['duplicate_mapping_error'] = 'Mapping already exists.';
+$wb['ip_mapping_error'] = 'Source IP can not be an IP of the Rewrite-Server';
 ?>
diff --git a/interface/web/admin/lib/lang/pl_server_ip_map_list.lng b/interface/web/admin/lib/lang/pl_server_ip_map_list.lng
index 60c6815fda..1fedc10b2e 100644
--- a/interface/web/admin/lib/lang/pl_server_ip_map_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_ip_map_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'IP Mappings';
-$wb["server_id_txt"] = 'Server';
-$wb["source_ip_txt"] = 'Source IP';
-$wb["destination_ip_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
+$wb['list_head_txt'] = 'IP Mappings';
+$wb['server_id_txt'] = 'Server';
+$wb['source_ip_txt'] = 'Source IP';
+$wb['destination_ip_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
 ?>
diff --git a/interface/web/admin/lib/lang/pl_server_list.lng b/interface/web/admin/lib/lang/pl_server_list.lng
index 81356acf77..bcff6a4dbe 100644
--- a/interface/web/admin/lib/lang/pl_server_list.lng
+++ b/interface/web/admin/lib/lang/pl_server_list.lng
@@ -10,4 +10,5 @@ $wb['vserver_server_txt'] = 'Wirtualny serwer';
 $wb['add_new_record_txt'] = 'Dodaj nowy serwer';
 $wb['proxy_server_txt'] = 'Proxy';
 $wb['firewall_server_txt'] = 'Firewall';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>
diff --git a/interface/web/admin/lib/lang/pl_system_config.lng b/interface/web/admin/lib/lang/pl_system_config.lng
index 74031e4dcb..cea6345e63 100644
--- a/interface/web/admin/lib/lang/pl_system_config.lng
+++ b/interface/web/admin/lib/lang/pl_system_config.lng
@@ -71,9 +71,14 @@ $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["company_name_txt"] = "Company Name for the page title";
-$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
-$wb["custom_login_text_txt"] = "Custom Text on Login-Page";
-$wb["custom_login_link_txt"] = "Custom Link on Login-Page";
-$wb["login_link_error_regex"] = "Invalid Link for Custom Login";
+$wb['company_name_txt'] = 'Company Name for the page title';
+$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
+$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
+$wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
+$wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
 ?>
diff --git a/interface/web/admin/lib/lang/pl_users.lng b/interface/web/admin/lib/lang/pl_users.lng
index 0834e7e1df..8d227e08c3 100644
--- a/interface/web/admin/lib/lang/pl_users.lng
+++ b/interface/web/admin/lib/lang/pl_users.lng
@@ -31,4 +31,5 @@ $wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
 $wb['password_match_txt'] = 'Hasła pasują';
 $wb['username_error_collision'] = 'Nazwa użytkownika nie może być web lub web z numerem.';
 $wb['client_not_admin_err'] = 'A user that belongs to a client can not be set to type: admin';
+$wb['lost_password_function_txt'] = 'Forgot password function is available';
 ?>
diff --git a/interface/web/admin/lib/lang/pt.lng b/interface/web/admin/lib/lang/pt.lng
index 4ed49ac8a3..6aaddc02ae 100644
--- a/interface/web/admin/lib/lang/pt.lng
+++ b/interface/web/admin/lib/lang/pt.lng
@@ -47,4 +47,6 @@ $wb['Remote Actions'] = 'Remote Actions';
 $wb['Do OS-Update'] = 'Do OS-Update';
 $wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
 $wb['Directive Snippets'] = 'Directive Snippets';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
 ?>
diff --git a/interface/web/admin/lib/lang/pt_directive_snippets.lng b/interface/web/admin/lib/lang/pt_directive_snippets.lng
index 0f09c12ee0..21387b31e5 100644
--- a/interface/web/admin/lib/lang/pt_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/pt_directive_snippets.lng
@@ -7,4 +7,5 @@ $wb['active_txt'] = 'Active';
 $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
 $wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
 $wb['variables_txt'] = 'Variables';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/pt_directive_snippets_list.lng b/interface/web/admin/lib/lang/pt_directive_snippets_list.lng
index 4124ea3464..8e189f9f79 100644
--- a/interface/web/admin/lib/lang/pt_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/pt_directive_snippets_list.lng
@@ -4,4 +4,5 @@ $wb['active_txt'] = 'Active';
 $wb['name_txt'] = 'Name of Snippet';
 $wb['type_txt'] = 'Type';
 $wb['add_new_record_txt'] = 'Add Directive Snippet';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/pt_server.lng b/interface/web/admin/lib/lang/pt_server.lng
index e8a635d12e..13f60a3f97 100644
--- a/interface/web/admin/lib/lang/pt_server.lng
+++ b/interface/web/admin/lib/lang/pt_server.lng
@@ -12,4 +12,5 @@ $wb['mirror_server_id_txt'] = 'É um espelho de servidor';
 $wb['- None -'] = '- Não -';
 $wb['proxy_server_txt'] = 'Proxy-Server';
 $wb['firewall_server_txt'] = 'Firewall-Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
 ?>
diff --git a/interface/web/admin/lib/lang/pt_server_config.lng b/interface/web/admin/lib/lang/pt_server_config.lng
index 3081121c2b..5e0e84615f 100644
--- a/interface/web/admin/lib/lang/pt_server_config.lng
+++ b/interface/web/admin/lib/lang/pt_server_config.lng
@@ -195,11 +195,11 @@ $wb['munin_user_txt'] = 'Munin User';
 $wb['munin_password_txt'] = 'Munin Password';
 $wb['munin_url_error_regex'] = 'Invalid Munin URL';
 $wb['munin_url_note_txt'] = 'Placeholder:';
-$wb["dkim_path_txt"] = 'DKIM Path';
+$wb['dkim_path_txt'] = 'DKIM Path';
 $wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
-$wb["v6_prefix_txt"] = 'IPv6 Prefix';
-$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
-$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
+$wb['v6_prefix_txt'] = 'IPv6 Prefix';
+$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
+$wb['v6_prefix_length'] = 'Prefix too long according to defined IPv6 ';
 $wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
 $wb['monitor_system_updates_txt'] = 'Check for Linux updates';
 $wb['hostname_error_regex'] = 'Invalid Hostname.';
@@ -254,6 +254,30 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
-$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
-$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
+$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
+$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
+$wb['do_not_try_rescue_mongodb_txt'] = 'Disable MongoDB monitoring';
+$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
+$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
+$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
+$wb['php_handler_txt'] = 'Default PHP Handler';
+$wb['disabled_txt'] = 'Disabled';
+$wb['dkim_strength_txt'] = 'DKIM strength';
+$wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
+$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
+$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
+$wb['enable_spdy_txt'] = 'Makes SPDY available';
+$wb['web_settings_txt'] = 'Web Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+$wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
+$wb['xmpp_bosh_max_inactivity_txt'] = 'Max. BOSH inactivity time';
+$wb['xmpp_bosh_timeout_range_wrong'] = 'Please enter a bosh timeout range between 15 - 360';
+$wb['xmpp_module_saslauth'] = 'saslauth';
+$wb['xmpp_server_admins_txt'] = 'Server Admins (JIDs)';
+$wb['xmpp_modules_enabled_txt'] = 'Serverwide enabled plugins (one per line)';
+$wb['xmpp_ports_txt'] = 'Component ports';
+$wb['xmpp_port_http_txt'] = 'HTTP';
+$wb['xmpp_port_https_txt'] = 'HTTPS';
+$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
+$wb['xmpp_port_bosh_txt'] = 'BOSH';
 ?>
diff --git a/interface/web/admin/lib/lang/pt_server_ip_map.lng b/interface/web/admin/lib/lang/pt_server_ip_map.lng
index 94508abb79..68b196fb23 100644
--- a/interface/web/admin/lib/lang/pt_server_ip_map.lng
+++ b/interface/web/admin/lib/lang/pt_server_ip_map.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["server_id_txt"] = 'Rewrite on Server';
-$wb["source_txt"] = 'Source IP';
-$wb["destination_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
-$wb["ip_error_wrong"] = 'The Destination IP address is invalid';
-$wb["destination_ip_empty"] = 'The Destination IP is empty.';
-$wb["source_ip_empty"] = 'The Source IP is empty.';
-$wb["server_empty_error"] = 'The Server is empty.';
-$wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb['server_id_txt'] = 'Rewrite on Server';
+$wb['source_txt'] = 'Source IP';
+$wb['destination_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
+$wb['ip_error_wrong'] = 'The Destination IP address is invalid';
+$wb['destination_ip_empty'] = 'The Destination IP is empty.';
+$wb['source_ip_empty'] = 'The Source IP is empty.';
+$wb['server_empty_error'] = 'The Server is empty.';
+$wb['duplicate_mapping_error'] = 'Mapping already exists.';
+$wb['ip_mapping_error'] = 'Source IP can not be an IP of the Rewrite-Server';
 ?>
diff --git a/interface/web/admin/lib/lang/pt_server_ip_map_list.lng b/interface/web/admin/lib/lang/pt_server_ip_map_list.lng
index 60c6815fda..1fedc10b2e 100644
--- a/interface/web/admin/lib/lang/pt_server_ip_map_list.lng
+++ b/interface/web/admin/lib/lang/pt_server_ip_map_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'IP Mappings';
-$wb["server_id_txt"] = 'Server';
-$wb["source_ip_txt"] = 'Source IP';
-$wb["destination_ip_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
+$wb['list_head_txt'] = 'IP Mappings';
+$wb['server_id_txt'] = 'Server';
+$wb['source_ip_txt'] = 'Source IP';
+$wb['destination_ip_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
 ?>
diff --git a/interface/web/admin/lib/lang/pt_server_list.lng b/interface/web/admin/lib/lang/pt_server_list.lng
index cb15c8990f..a4ab77f330 100644
--- a/interface/web/admin/lib/lang/pt_server_list.lng
+++ b/interface/web/admin/lib/lang/pt_server_list.lng
@@ -10,4 +10,5 @@ $wb['vserver_server_txt'] = 'VServer';
 $wb['add_new_record_txt'] = 'Adicionar Servidor';
 $wb['proxy_server_txt'] = 'Proxy';
 $wb['firewall_server_txt'] = 'Firewall';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>
diff --git a/interface/web/admin/lib/lang/pt_system_config.lng b/interface/web/admin/lib/lang/pt_system_config.lng
index 43320c4d30..24ff94fca2 100644
--- a/interface/web/admin/lib/lang/pt_system_config.lng
+++ b/interface/web/admin/lib/lang/pt_system_config.lng
@@ -71,9 +71,14 @@ $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["company_name_txt"] = "Company Name for the page title";
-$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
-$wb["custom_login_text_txt"] = "Custom Text on Login-Page";
-$wb["custom_login_link_txt"] = "Custom Link on Login-Page";
-$wb["login_link_error_regex"] = "Invalid Link for Custom Login";
+$wb['company_name_txt'] = 'Company Name for the page title';
+$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
+$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
+$wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
+$wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
 ?>
diff --git a/interface/web/admin/lib/lang/pt_users.lng b/interface/web/admin/lib/lang/pt_users.lng
index c990a27ff4..f850711529 100644
--- a/interface/web/admin/lib/lang/pt_users.lng
+++ b/interface/web/admin/lib/lang/pt_users.lng
@@ -31,4 +31,5 @@ $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['lost_password_function_txt'] = 'Forgot password function is available';
 ?>
diff --git a/interface/web/admin/lib/lang/ro.lng b/interface/web/admin/lib/lang/ro.lng
index 9c598e3720..dedbaef51f 100644
--- a/interface/web/admin/lib/lang/ro.lng
+++ b/interface/web/admin/lib/lang/ro.lng
@@ -47,4 +47,6 @@ $wb['Remote Actions'] = 'Remote Actions';
 $wb['Do OS-Update'] = 'Do OS-Update';
 $wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
 $wb['Directive Snippets'] = 'Directive Snippets';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
 ?>
diff --git a/interface/web/admin/lib/lang/ro_directive_snippets.lng b/interface/web/admin/lib/lang/ro_directive_snippets.lng
index 0f09c12ee0..21387b31e5 100644
--- a/interface/web/admin/lib/lang/ro_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/ro_directive_snippets.lng
@@ -7,4 +7,5 @@ $wb['active_txt'] = 'Active';
 $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
 $wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
 $wb['variables_txt'] = 'Variables';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/ro_directive_snippets_list.lng b/interface/web/admin/lib/lang/ro_directive_snippets_list.lng
index 4124ea3464..8e189f9f79 100644
--- a/interface/web/admin/lib/lang/ro_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/ro_directive_snippets_list.lng
@@ -4,4 +4,5 @@ $wb['active_txt'] = 'Active';
 $wb['name_txt'] = 'Name of Snippet';
 $wb['type_txt'] = 'Type';
 $wb['add_new_record_txt'] = 'Add Directive Snippet';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/ro_server.lng b/interface/web/admin/lib/lang/ro_server.lng
index 92b6449319..6b63109f98 100644
--- a/interface/web/admin/lib/lang/ro_server.lng
+++ b/interface/web/admin/lib/lang/ro_server.lng
@@ -12,4 +12,5 @@ $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['xmpp_server_txt'] = 'XMPP Server';
 ?>
diff --git a/interface/web/admin/lib/lang/ro_server_config.lng b/interface/web/admin/lib/lang/ro_server_config.lng
index 5ecec82d33..ccb7b87cb4 100644
--- a/interface/web/admin/lib/lang/ro_server_config.lng
+++ b/interface/web/admin/lib/lang/ro_server_config.lng
@@ -195,11 +195,11 @@ $wb['munin_user_txt'] = 'Munin User';
 $wb['munin_password_txt'] = 'Munin Password';
 $wb['munin_url_error_regex'] = 'Invalid Munin URL';
 $wb['munin_url_note_txt'] = 'Placeholder:';
-$wb["dkim_path_txt"] = 'DKIM Path';
+$wb['dkim_path_txt'] = 'DKIM Path';
 $wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
-$wb["v6_prefix_txt"] = 'IPv6 Prefix';
-$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
-$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
+$wb['v6_prefix_txt'] = 'IPv6 Prefix';
+$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
+$wb['v6_prefix_length'] = 'Prefix too long according to defined IPv6 ';
 $wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
 $wb['monitor_system_updates_txt'] = 'Check for Linux updates';
 $wb['hostname_error_regex'] = 'Invalid Hostname.';
@@ -254,6 +254,30 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
-$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
-$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
+$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
+$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
+$wb['do_not_try_rescue_mongodb_txt'] = 'Disable MongoDB monitoring';
+$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
+$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
+$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
+$wb['php_handler_txt'] = 'Default PHP Handler';
+$wb['disabled_txt'] = 'Disabled';
+$wb['dkim_strength_txt'] = 'DKIM strength';
+$wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
+$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
+$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
+$wb['enable_spdy_txt'] = 'Makes SPDY available';
+$wb['web_settings_txt'] = 'Web Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+$wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
+$wb['xmpp_bosh_max_inactivity_txt'] = 'Max. BOSH inactivity time';
+$wb['xmpp_bosh_timeout_range_wrong'] = 'Please enter a bosh timeout range between 15 - 360';
+$wb['xmpp_module_saslauth'] = 'saslauth';
+$wb['xmpp_server_admins_txt'] = 'Server Admins (JIDs)';
+$wb['xmpp_modules_enabled_txt'] = 'Serverwide enabled plugins (one per line)';
+$wb['xmpp_ports_txt'] = 'Component ports';
+$wb['xmpp_port_http_txt'] = 'HTTP';
+$wb['xmpp_port_https_txt'] = 'HTTPS';
+$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
+$wb['xmpp_port_bosh_txt'] = 'BOSH';
 ?>
diff --git a/interface/web/admin/lib/lang/ro_server_ip_map.lng b/interface/web/admin/lib/lang/ro_server_ip_map.lng
index 94508abb79..68b196fb23 100644
--- a/interface/web/admin/lib/lang/ro_server_ip_map.lng
+++ b/interface/web/admin/lib/lang/ro_server_ip_map.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["server_id_txt"] = 'Rewrite on Server';
-$wb["source_txt"] = 'Source IP';
-$wb["destination_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
-$wb["ip_error_wrong"] = 'The Destination IP address is invalid';
-$wb["destination_ip_empty"] = 'The Destination IP is empty.';
-$wb["source_ip_empty"] = 'The Source IP is empty.';
-$wb["server_empty_error"] = 'The Server is empty.';
-$wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb['server_id_txt'] = 'Rewrite on Server';
+$wb['source_txt'] = 'Source IP';
+$wb['destination_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
+$wb['ip_error_wrong'] = 'The Destination IP address is invalid';
+$wb['destination_ip_empty'] = 'The Destination IP is empty.';
+$wb['source_ip_empty'] = 'The Source IP is empty.';
+$wb['server_empty_error'] = 'The Server is empty.';
+$wb['duplicate_mapping_error'] = 'Mapping already exists.';
+$wb['ip_mapping_error'] = 'Source IP can not be an IP of the Rewrite-Server';
 ?>
diff --git a/interface/web/admin/lib/lang/ro_server_ip_map_list.lng b/interface/web/admin/lib/lang/ro_server_ip_map_list.lng
index 60c6815fda..1fedc10b2e 100644
--- a/interface/web/admin/lib/lang/ro_server_ip_map_list.lng
+++ b/interface/web/admin/lib/lang/ro_server_ip_map_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'IP Mappings';
-$wb["server_id_txt"] = 'Server';
-$wb["source_ip_txt"] = 'Source IP';
-$wb["destination_ip_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
+$wb['list_head_txt'] = 'IP Mappings';
+$wb['server_id_txt'] = 'Server';
+$wb['source_ip_txt'] = 'Source IP';
+$wb['destination_ip_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
 ?>
diff --git a/interface/web/admin/lib/lang/ro_server_list.lng b/interface/web/admin/lib/lang/ro_server_list.lng
index 42ea0c3a1b..998c8fc9e5 100644
--- a/interface/web/admin/lib/lang/ro_server_list.lng
+++ b/interface/web/admin/lib/lang/ro_server_list.lng
@@ -10,4 +10,5 @@ $wb['vserver_server_txt'] = 'VServer';
 $wb['add_new_record_txt'] = 'Adauga un nou  Server';
 $wb['proxy_server_txt'] = 'Proxy';
 $wb['firewall_server_txt'] = 'Firewall';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>
diff --git a/interface/web/admin/lib/lang/ro_system_config.lng b/interface/web/admin/lib/lang/ro_system_config.lng
index b700f30b06..b258ee1870 100644
--- a/interface/web/admin/lib/lang/ro_system_config.lng
+++ b/interface/web/admin/lib/lang/ro_system_config.lng
@@ -71,9 +71,14 @@ $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["company_name_txt"] = "Company Name for the page title";
-$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
-$wb["custom_login_text_txt"] = "Custom Text on Login-Page";
-$wb["custom_login_link_txt"] = "Custom Link on Login-Page";
-$wb["login_link_error_regex"] = "Invalid Link for Custom Login";
+$wb['company_name_txt'] = 'Company Name for the page title';
+$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
+$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
+$wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
+$wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
 ?>
diff --git a/interface/web/admin/lib/lang/ro_users.lng b/interface/web/admin/lib/lang/ro_users.lng
index 2fc65095d4..93988a0911 100644
--- a/interface/web/admin/lib/lang/ro_users.lng
+++ b/interface/web/admin/lib/lang/ro_users.lng
@@ -31,4 +31,5 @@ $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['lost_password_function_txt'] = 'Forgot password function is available';
 ?>
diff --git a/interface/web/admin/lib/lang/ru.lng b/interface/web/admin/lib/lang/ru.lng
index faaa081ba9..1f429b07cf 100644
--- a/interface/web/admin/lib/lang/ru.lng
+++ b/interface/web/admin/lib/lang/ru.lng
@@ -47,4 +47,6 @@ $wb['Remote Actions'] = 'Remote Actions';
 $wb['Do OS-Update'] = 'Do OS-Update';
 $wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
 $wb['Directive Snippets'] = 'Directive Snippets';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
 ?>
diff --git a/interface/web/admin/lib/lang/ru_directive_snippets.lng b/interface/web/admin/lib/lang/ru_directive_snippets.lng
index 0f09c12ee0..21387b31e5 100644
--- a/interface/web/admin/lib/lang/ru_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/ru_directive_snippets.lng
@@ -7,4 +7,5 @@ $wb['active_txt'] = 'Active';
 $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
 $wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
 $wb['variables_txt'] = 'Variables';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/ru_directive_snippets_list.lng b/interface/web/admin/lib/lang/ru_directive_snippets_list.lng
index 4124ea3464..8e189f9f79 100644
--- a/interface/web/admin/lib/lang/ru_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/ru_directive_snippets_list.lng
@@ -4,4 +4,5 @@ $wb['active_txt'] = 'Active';
 $wb['name_txt'] = 'Name of Snippet';
 $wb['type_txt'] = 'Type';
 $wb['add_new_record_txt'] = 'Add Directive Snippet';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/ru_server.lng b/interface/web/admin/lib/lang/ru_server.lng
index 0a1638e10b..320e610881 100644
--- a/interface/web/admin/lib/lang/ru_server.lng
+++ b/interface/web/admin/lib/lang/ru_server.lng
@@ -12,4 +12,5 @@ $wb['mirror_server_id_txt'] = 'Зеркало сервера';
 $wb['- None -'] = '- нет -';
 $wb['proxy_server_txt'] = 'Proxy-Server';
 $wb['firewall_server_txt'] = 'Firewall-Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
 ?>
diff --git a/interface/web/admin/lib/lang/ru_server_config.lng b/interface/web/admin/lib/lang/ru_server_config.lng
index fbddb89166..57e1aac9ad 100644
--- a/interface/web/admin/lib/lang/ru_server_config.lng
+++ b/interface/web/admin/lib/lang/ru_server_config.lng
@@ -195,11 +195,11 @@ $wb['munin_user_txt'] = 'Munin User';
 $wb['munin_password_txt'] = 'Munin Password';
 $wb['munin_url_error_regex'] = 'Invalid Munin URL';
 $wb['munin_url_note_txt'] = 'Placeholder:';
-$wb["dkim_path_txt"] = 'DKIM Path';
+$wb['dkim_path_txt'] = 'DKIM Path';
 $wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
-$wb["v6_prefix_txt"] = 'IPv6 Prefix';
-$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
-$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
+$wb['v6_prefix_txt'] = 'IPv6 Prefix';
+$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
+$wb['v6_prefix_length'] = 'Prefix too long according to defined IPv6 ';
 $wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
 $wb['monitor_system_updates_txt'] = 'Check for Linux updates';
 $wb['hostname_error_regex'] = 'Invalid Hostname.';
@@ -254,6 +254,30 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
-$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
-$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
+$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
+$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
+$wb['do_not_try_rescue_mongodb_txt'] = 'Disable MongoDB monitoring';
+$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
+$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
+$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
+$wb['php_handler_txt'] = 'Default PHP Handler';
+$wb['disabled_txt'] = 'Disabled';
+$wb['dkim_strength_txt'] = 'DKIM strength';
+$wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
+$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
+$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
+$wb['enable_spdy_txt'] = 'Makes SPDY available';
+$wb['web_settings_txt'] = 'Web Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+$wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
+$wb['xmpp_bosh_max_inactivity_txt'] = 'Max. BOSH inactivity time';
+$wb['xmpp_bosh_timeout_range_wrong'] = 'Please enter a bosh timeout range between 15 - 360';
+$wb['xmpp_module_saslauth'] = 'saslauth';
+$wb['xmpp_server_admins_txt'] = 'Server Admins (JIDs)';
+$wb['xmpp_modules_enabled_txt'] = 'Serverwide enabled plugins (one per line)';
+$wb['xmpp_ports_txt'] = 'Component ports';
+$wb['xmpp_port_http_txt'] = 'HTTP';
+$wb['xmpp_port_https_txt'] = 'HTTPS';
+$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
+$wb['xmpp_port_bosh_txt'] = 'BOSH';
 ?>
diff --git a/interface/web/admin/lib/lang/ru_server_ip_map.lng b/interface/web/admin/lib/lang/ru_server_ip_map.lng
index 94508abb79..68b196fb23 100644
--- a/interface/web/admin/lib/lang/ru_server_ip_map.lng
+++ b/interface/web/admin/lib/lang/ru_server_ip_map.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["server_id_txt"] = 'Rewrite on Server';
-$wb["source_txt"] = 'Source IP';
-$wb["destination_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
-$wb["ip_error_wrong"] = 'The Destination IP address is invalid';
-$wb["destination_ip_empty"] = 'The Destination IP is empty.';
-$wb["source_ip_empty"] = 'The Source IP is empty.';
-$wb["server_empty_error"] = 'The Server is empty.';
-$wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb['server_id_txt'] = 'Rewrite on Server';
+$wb['source_txt'] = 'Source IP';
+$wb['destination_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
+$wb['ip_error_wrong'] = 'The Destination IP address is invalid';
+$wb['destination_ip_empty'] = 'The Destination IP is empty.';
+$wb['source_ip_empty'] = 'The Source IP is empty.';
+$wb['server_empty_error'] = 'The Server is empty.';
+$wb['duplicate_mapping_error'] = 'Mapping already exists.';
+$wb['ip_mapping_error'] = 'Source IP can not be an IP of the Rewrite-Server';
 ?>
diff --git a/interface/web/admin/lib/lang/ru_server_ip_map_list.lng b/interface/web/admin/lib/lang/ru_server_ip_map_list.lng
index 60c6815fda..1fedc10b2e 100644
--- a/interface/web/admin/lib/lang/ru_server_ip_map_list.lng
+++ b/interface/web/admin/lib/lang/ru_server_ip_map_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'IP Mappings';
-$wb["server_id_txt"] = 'Server';
-$wb["source_ip_txt"] = 'Source IP';
-$wb["destination_ip_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
+$wb['list_head_txt'] = 'IP Mappings';
+$wb['server_id_txt'] = 'Server';
+$wb['source_ip_txt'] = 'Source IP';
+$wb['destination_ip_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
 ?>
diff --git a/interface/web/admin/lib/lang/ru_server_list.lng b/interface/web/admin/lib/lang/ru_server_list.lng
index 7f2bc912b5..16e0c8fcb8 100644
--- a/interface/web/admin/lib/lang/ru_server_list.lng
+++ b/interface/web/admin/lib/lang/ru_server_list.lng
@@ -10,4 +10,5 @@ $wb['vserver_server_txt'] = 'VСервер';
 $wb['add_new_record_txt'] = 'Добавить новый сервер';
 $wb['proxy_server_txt'] = 'Proxy';
 $wb['firewall_server_txt'] = 'Firewall';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>
diff --git a/interface/web/admin/lib/lang/ru_system_config.lng b/interface/web/admin/lib/lang/ru_system_config.lng
index 00064982f6..3de4044c44 100644
--- a/interface/web/admin/lib/lang/ru_system_config.lng
+++ b/interface/web/admin/lib/lang/ru_system_config.lng
@@ -71,9 +71,14 @@ $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["company_name_txt"] = "Company Name for the page title";
-$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
-$wb["custom_login_text_txt"] = "Custom Text on Login-Page";
-$wb["custom_login_link_txt"] = "Custom Link on Login-Page";
-$wb["login_link_error_regex"] = "Invalid Link for Custom Login";
+$wb['company_name_txt'] = 'Company Name for the page title';
+$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
+$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
+$wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
+$wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
 ?>
diff --git a/interface/web/admin/lib/lang/ru_users.lng b/interface/web/admin/lib/lang/ru_users.lng
index cd2e1fea8c..656a4d2370 100644
--- a/interface/web/admin/lib/lang/ru_users.lng
+++ b/interface/web/admin/lib/lang/ru_users.lng
@@ -31,4 +31,5 @@ $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['lost_password_function_txt'] = 'Forgot password function is available';
 ?>
diff --git a/interface/web/admin/lib/lang/se.lng b/interface/web/admin/lib/lang/se.lng
index 0df5d1aa40..198c338c3d 100644
--- a/interface/web/admin/lib/lang/se.lng
+++ b/interface/web/admin/lib/lang/se.lng
@@ -47,4 +47,6 @@ $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';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
 ?>
diff --git a/interface/web/admin/lib/lang/se_directive_snippets.lng b/interface/web/admin/lib/lang/se_directive_snippets.lng
index 0f09c12ee0..21387b31e5 100644
--- a/interface/web/admin/lib/lang/se_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/se_directive_snippets.lng
@@ -7,4 +7,5 @@ $wb['active_txt'] = 'Active';
 $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
 $wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
 $wb['variables_txt'] = 'Variables';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
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 4124ea3464..8e189f9f79 100644
--- a/interface/web/admin/lib/lang/se_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/se_directive_snippets_list.lng
@@ -4,4 +4,5 @@ $wb['active_txt'] = 'Active';
 $wb['name_txt'] = 'Name of Snippet';
 $wb['type_txt'] = 'Type';
 $wb['add_new_record_txt'] = 'Add Directive Snippet';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/se_server.lng b/interface/web/admin/lib/lang/se_server.lng
index 54df6f2ee3..11806c81bc 100644
--- a/interface/web/admin/lib/lang/se_server.lng
+++ b/interface/web/admin/lib/lang/se_server.lng
@@ -12,4 +12,5 @@ $wb['mirror_server_id_txt'] = 'Är spegling av server';
 $wb['- None -'] = '- Ingen';
 $wb['proxy_server_txt'] = 'Proxy-server';
 $wb['firewall_server_txt'] = 'Brandväggsserver';
+$wb['xmpp_server_txt'] = 'XMPP Server';
 ?>
diff --git a/interface/web/admin/lib/lang/se_server_config.lng b/interface/web/admin/lib/lang/se_server_config.lng
index 8bf64edf4e..f5eeefd4e2 100644
--- a/interface/web/admin/lib/lang/se_server_config.lng
+++ b/interface/web/admin/lib/lang/se_server_config.lng
@@ -195,11 +195,11 @@ $wb['munin_user_txt'] = 'Munin User';
 $wb['munin_password_txt'] = 'Munin Password';
 $wb['munin_url_error_regex'] = 'Invalid Munin URL';
 $wb['munin_url_note_txt'] = 'Placeholder:';
-$wb["dkim_path_txt"] = 'DKIM Path';
+$wb['dkim_path_txt'] = 'DKIM Path';
 $wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
-$wb["v6_prefix_txt"] = 'IPv6 Prefix';
-$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
-$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
+$wb['v6_prefix_txt'] = 'IPv6 Prefix';
+$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
+$wb['v6_prefix_length'] = 'Prefix too long according to defined IPv6 ';
 $wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
 $wb['monitor_system_updates_txt'] = 'Check for Linux updates';
 $wb['hostname_error_regex'] = 'Invalid Hostname.';
@@ -254,6 +254,30 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
-$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
-$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
+$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
+$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
+$wb['do_not_try_rescue_mongodb_txt'] = 'Disable MongoDB monitoring';
+$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
+$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
+$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
+$wb['php_handler_txt'] = 'Default PHP Handler';
+$wb['disabled_txt'] = 'Disabled';
+$wb['dkim_strength_txt'] = 'DKIM strength';
+$wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
+$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
+$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
+$wb['enable_spdy_txt'] = 'Makes SPDY available';
+$wb['web_settings_txt'] = 'Web Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+$wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
+$wb['xmpp_bosh_max_inactivity_txt'] = 'Max. BOSH inactivity time';
+$wb['xmpp_bosh_timeout_range_wrong'] = 'Please enter a bosh timeout range between 15 - 360';
+$wb['xmpp_module_saslauth'] = 'saslauth';
+$wb['xmpp_server_admins_txt'] = 'Server Admins (JIDs)';
+$wb['xmpp_modules_enabled_txt'] = 'Serverwide enabled plugins (one per line)';
+$wb['xmpp_ports_txt'] = 'Component ports';
+$wb['xmpp_port_http_txt'] = 'HTTP';
+$wb['xmpp_port_https_txt'] = 'HTTPS';
+$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
+$wb['xmpp_port_bosh_txt'] = 'BOSH';
 ?>
diff --git a/interface/web/admin/lib/lang/se_server_ip_map.lng b/interface/web/admin/lib/lang/se_server_ip_map.lng
index 94508abb79..68b196fb23 100644
--- a/interface/web/admin/lib/lang/se_server_ip_map.lng
+++ b/interface/web/admin/lib/lang/se_server_ip_map.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["server_id_txt"] = 'Rewrite on Server';
-$wb["source_txt"] = 'Source IP';
-$wb["destination_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
-$wb["ip_error_wrong"] = 'The Destination IP address is invalid';
-$wb["destination_ip_empty"] = 'The Destination IP is empty.';
-$wb["source_ip_empty"] = 'The Source IP is empty.';
-$wb["server_empty_error"] = 'The Server is empty.';
-$wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb['server_id_txt'] = 'Rewrite on Server';
+$wb['source_txt'] = 'Source IP';
+$wb['destination_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
+$wb['ip_error_wrong'] = 'The Destination IP address is invalid';
+$wb['destination_ip_empty'] = 'The Destination IP is empty.';
+$wb['source_ip_empty'] = 'The Source IP is empty.';
+$wb['server_empty_error'] = 'The Server is empty.';
+$wb['duplicate_mapping_error'] = 'Mapping already exists.';
+$wb['ip_mapping_error'] = 'Source IP can not be an IP of the Rewrite-Server';
 ?>
diff --git a/interface/web/admin/lib/lang/se_server_ip_map_list.lng b/interface/web/admin/lib/lang/se_server_ip_map_list.lng
index 60c6815fda..1fedc10b2e 100644
--- a/interface/web/admin/lib/lang/se_server_ip_map_list.lng
+++ b/interface/web/admin/lib/lang/se_server_ip_map_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'IP Mappings';
-$wb["server_id_txt"] = 'Server';
-$wb["source_ip_txt"] = 'Source IP';
-$wb["destination_ip_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
+$wb['list_head_txt'] = 'IP Mappings';
+$wb['server_id_txt'] = 'Server';
+$wb['source_ip_txt'] = 'Source IP';
+$wb['destination_ip_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
 ?>
diff --git a/interface/web/admin/lib/lang/se_server_list.lng b/interface/web/admin/lib/lang/se_server_list.lng
index 031ac767f0..0224e30bc2 100644
--- a/interface/web/admin/lib/lang/se_server_list.lng
+++ b/interface/web/admin/lib/lang/se_server_list.lng
@@ -10,4 +10,5 @@ $wb['vserver_server_txt'] = 'VServer';
 $wb['add_new_record_txt'] = 'Lägg till ny server';
 $wb['proxy_server_txt'] = 'Proxy';
 $wb['firewall_server_txt'] = 'Brandvägg';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>
diff --git a/interface/web/admin/lib/lang/se_system_config.lng b/interface/web/admin/lib/lang/se_system_config.lng
index 3451c5f608..285f7807e8 100644
--- a/interface/web/admin/lib/lang/se_system_config.lng
+++ b/interface/web/admin/lib/lang/se_system_config.lng
@@ -71,9 +71,14 @@ $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';
-$wb["company_name_txt"] = "Company Name for the page title";
-$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
-$wb["custom_login_text_txt"] = "Custom Text on Login-Page";
-$wb["custom_login_link_txt"] = "Custom Link on Login-Page";
-$wb["login_link_error_regex"] = "Invalid Link for Custom Login";
+$wb['company_name_txt'] = 'Company Name for the page title';
+$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
+$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
+$wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
+$wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
 ?>
diff --git a/interface/web/admin/lib/lang/se_users.lng b/interface/web/admin/lib/lang/se_users.lng
index 9a819be74e..e7a5e4b8bd 100644
--- a/interface/web/admin/lib/lang/se_users.lng
+++ b/interface/web/admin/lib/lang/se_users.lng
@@ -31,4 +31,5 @@ $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';
+$wb['lost_password_function_txt'] = 'Forgot password function is available';
 ?>
diff --git a/interface/web/admin/lib/lang/sk.lng b/interface/web/admin/lib/lang/sk.lng
index fa506df9ac..6c85afe688 100644
--- a/interface/web/admin/lib/lang/sk.lng
+++ b/interface/web/admin/lib/lang/sk.lng
@@ -47,4 +47,6 @@ $wb['Remote Actions'] = 'Remote Actions';
 $wb['Do OS-Update'] = 'Do OS-Update';
 $wb['Do ISPConfig-Update'] = 'Do ISPConfig-Update';
 $wb['Directive Snippets'] = 'Directive Snippets';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
 ?>
diff --git a/interface/web/admin/lib/lang/sk_directive_snippets.lng b/interface/web/admin/lib/lang/sk_directive_snippets.lng
index 0f09c12ee0..21387b31e5 100644
--- a/interface/web/admin/lib/lang/sk_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/sk_directive_snippets.lng
@@ -7,4 +7,5 @@ $wb['active_txt'] = 'Active';
 $wb['directive_snippets_name_empty'] = 'Please specify a name for the snippet.';
 $wb['directive_snippets_name_error_unique'] = 'There is already a directive snippet with this name.';
 $wb['variables_txt'] = 'Variables';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/sk_directive_snippets_list.lng b/interface/web/admin/lib/lang/sk_directive_snippets_list.lng
index 4124ea3464..8e189f9f79 100644
--- a/interface/web/admin/lib/lang/sk_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/sk_directive_snippets_list.lng
@@ -4,4 +4,5 @@ $wb['active_txt'] = 'Active';
 $wb['name_txt'] = 'Name of Snippet';
 $wb['type_txt'] = 'Type';
 $wb['add_new_record_txt'] = 'Add Directive Snippet';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/sk_server.lng b/interface/web/admin/lib/lang/sk_server.lng
index 8b4eac5a33..3d35c3f20d 100644
--- a/interface/web/admin/lib/lang/sk_server.lng
+++ b/interface/web/admin/lib/lang/sk_server.lng
@@ -12,4 +12,5 @@ $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['xmpp_server_txt'] = 'XMPP Server';
 ?>
diff --git a/interface/web/admin/lib/lang/sk_server_config.lng b/interface/web/admin/lib/lang/sk_server_config.lng
index 6e79b15f08..0d90895b28 100644
--- a/interface/web/admin/lib/lang/sk_server_config.lng
+++ b/interface/web/admin/lib/lang/sk_server_config.lng
@@ -195,11 +195,11 @@ $wb['munin_user_txt'] = 'Munin User';
 $wb['munin_password_txt'] = 'Munin Password';
 $wb['munin_url_error_regex'] = 'Invalid Munin URL';
 $wb['munin_url_note_txt'] = 'Placeholder:';
-$wb["dkim_path_txt"] = 'DKIM Path';
+$wb['dkim_path_txt'] = 'DKIM Path';
 $wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
-$wb["v6_prefix_txt"] = 'IPv6 Prefix';
-$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
-$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
+$wb['v6_prefix_txt'] = 'IPv6 Prefix';
+$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
+$wb['v6_prefix_length'] = 'Prefix too long according to defined IPv6 ';
 $wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
 $wb['monitor_system_updates_txt'] = 'Check for Linux updates';
 $wb['hostname_error_regex'] = 'Invalid Hostname.';
@@ -254,6 +254,30 @@ $wb['cron_init_script_error_regex'] = 'Invalid cron init script.';
 $wb['crontab_dir_error_regex'] = 'Invalid crontab directory.';
 $wb['cron_wget_error_regex'] = 'Invalid cron wget path.';
 $wb['network_filesystem_txt'] = 'Network Filesystem';
-$wb["disable_bind_log_txt"] = "Disable bind9 messages for Loglevel WARN";
-$wb["apps_vhost_enabled_txt"] = "Apps-vhost enabled";
+$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
+$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
+$wb['do_not_try_rescue_mongodb_txt'] = 'Disable MongoDB monitoring';
+$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
+$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
+$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
+$wb['php_handler_txt'] = 'Default PHP Handler';
+$wb['disabled_txt'] = 'Disabled';
+$wb['dkim_strength_txt'] = 'DKIM strength';
+$wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
+$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
+$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
+$wb['enable_spdy_txt'] = 'Makes SPDY available';
+$wb['web_settings_txt'] = 'Web Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+$wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
+$wb['xmpp_bosh_max_inactivity_txt'] = 'Max. BOSH inactivity time';
+$wb['xmpp_bosh_timeout_range_wrong'] = 'Please enter a bosh timeout range between 15 - 360';
+$wb['xmpp_module_saslauth'] = 'saslauth';
+$wb['xmpp_server_admins_txt'] = 'Server Admins (JIDs)';
+$wb['xmpp_modules_enabled_txt'] = 'Serverwide enabled plugins (one per line)';
+$wb['xmpp_ports_txt'] = 'Component ports';
+$wb['xmpp_port_http_txt'] = 'HTTP';
+$wb['xmpp_port_https_txt'] = 'HTTPS';
+$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
+$wb['xmpp_port_bosh_txt'] = 'BOSH';
 ?>
diff --git a/interface/web/admin/lib/lang/sk_server_ip_map.lng b/interface/web/admin/lib/lang/sk_server_ip_map.lng
index 94508abb79..68b196fb23 100644
--- a/interface/web/admin/lib/lang/sk_server_ip_map.lng
+++ b/interface/web/admin/lib/lang/sk_server_ip_map.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["server_id_txt"] = 'Rewrite on Server';
-$wb["source_txt"] = 'Source IP';
-$wb["destination_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
-$wb["ip_error_wrong"] = 'The Destination IP address is invalid';
-$wb["destination_ip_empty"] = 'The Destination IP is empty.';
-$wb["source_ip_empty"] = 'The Source IP is empty.';
-$wb["server_empty_error"] = 'The Server is empty.';
-$wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb['server_id_txt'] = 'Rewrite on Server';
+$wb['source_txt'] = 'Source IP';
+$wb['destination_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
+$wb['ip_error_wrong'] = 'The Destination IP address is invalid';
+$wb['destination_ip_empty'] = 'The Destination IP is empty.';
+$wb['source_ip_empty'] = 'The Source IP is empty.';
+$wb['server_empty_error'] = 'The Server is empty.';
+$wb['duplicate_mapping_error'] = 'Mapping already exists.';
+$wb['ip_mapping_error'] = 'Source IP can not be an IP of the Rewrite-Server';
 ?>
diff --git a/interface/web/admin/lib/lang/sk_server_ip_map_list.lng b/interface/web/admin/lib/lang/sk_server_ip_map_list.lng
index 60c6815fda..1fedc10b2e 100644
--- a/interface/web/admin/lib/lang/sk_server_ip_map_list.lng
+++ b/interface/web/admin/lib/lang/sk_server_ip_map_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'IP Mappings';
-$wb["server_id_txt"] = 'Server';
-$wb["source_ip_txt"] = 'Source IP';
-$wb["destination_ip_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
+$wb['list_head_txt'] = 'IP Mappings';
+$wb['server_id_txt'] = 'Server';
+$wb['source_ip_txt'] = 'Source IP';
+$wb['destination_ip_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
 ?>
diff --git a/interface/web/admin/lib/lang/sk_server_list.lng b/interface/web/admin/lib/lang/sk_server_list.lng
index 09a02c7457..e5fb0a9847 100644
--- a/interface/web/admin/lib/lang/sk_server_list.lng
+++ b/interface/web/admin/lib/lang/sk_server_list.lng
@@ -10,4 +10,5 @@ $wb['vserver_server_txt'] = 'VServer';
 $wb['add_new_record_txt'] = 'Pridať nový Server';
 $wb['proxy_server_txt'] = 'Proxy';
 $wb['firewall_server_txt'] = 'Firewall';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>
diff --git a/interface/web/admin/lib/lang/sk_system_config.lng b/interface/web/admin/lib/lang/sk_system_config.lng
index b5f6687310..be8789a803 100644
--- a/interface/web/admin/lib/lang/sk_system_config.lng
+++ b/interface/web/admin/lib/lang/sk_system_config.lng
@@ -71,9 +71,14 @@ $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["company_name_txt"] = "Company Name for the page title";
-$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
-$wb["custom_login_text_txt"] = "Custom Text on Login-Page";
-$wb["custom_login_link_txt"] = "Custom Link on Login-Page";
-$wb["login_link_error_regex"] = "Invalid Link for Custom Login";
+$wb['company_name_txt'] = 'Company Name for the page title';
+$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
+$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
+$wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
+$wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
 ?>
diff --git a/interface/web/admin/lib/lang/sk_users.lng b/interface/web/admin/lib/lang/sk_users.lng
index 2a473ecd3d..9ba84d433e 100644
--- a/interface/web/admin/lib/lang/sk_users.lng
+++ b/interface/web/admin/lib/lang/sk_users.lng
@@ -31,4 +31,5 @@ $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['lost_password_function_txt'] = 'Forgot password function is available';
 ?>
diff --git a/interface/web/admin/lib/lang/tr.lng b/interface/web/admin/lib/lang/tr.lng
index 0ffeaa911a..23dbc45a49 100644
--- a/interface/web/admin/lib/lang/tr.lng
+++ b/interface/web/admin/lib/lang/tr.lng
@@ -1,26 +1,20 @@
 <?php
 $wb['1001'] = 'Kullanıcı adı ya da parola boş.';
 $wb['1002'] = 'Kullanıcı adı ya da parola hatalı.';
-
 $wb['Groups'] = 'Gruplar';
 $wb['groups_description'] = 'Sistem kullanıcısı gruplarını düzenleme formu.';
-
 $wb['Servers'] = 'Sunucular';
 $wb['Config'] = 'Ayarlar';
-
 $wb['Add user'] = 'Kullanıcı ekle';
 $wb['Edit user'] = 'Kullanıcıyı düzenle';
 $wb['Add group'] = 'Grup ekle';
 $wb['Edit group'] = 'Grubu düzenle';
 $wb['Edit server'] = 'Sunucuyu düzenle';
-
 $wb['Sync. Now'] = 'Şimdi Eşleştir';
 $wb['DB Sync.'] = 'Veritabanı Eşleştirme';
-
 $wb['User Management'] = 'Kullanıcı Yönetimi';
 $wb['CP Users'] = 'Panel Kullanıcıları';
 $wb['Remote Users'] = 'Uzak Kullanıcılar';
-
 $wb['System'] = 'Sistem';
 $wb['Server Services'] = 'Sunucu Hizmetleri';
 $wb['Services'] = 'Hizmetler';
@@ -36,25 +30,23 @@ $wb['Server IP addresses'] = 'Sunucu IP Adresleri';
 $wb['Additional PHP Versions'] = 'Diğer PHP Sürümleri';
 $wb['Directive Snippets'] = 'Yönerge Parçacıkları';
 $wb['Firewall'] = 'Güvenlik Duvarı';
-
 $wb['Interface'] = 'Arayüz';
 $wb['Interface Config'] = 'Temel Ayarlar';
 $wb['Domains'] = 'Alan Adları';
 $wb['Misc'] = 'Çeşitli';
-
 $wb['Software'] = 'Uygulama ve Eklentiler';
 $wb['Repositories'] = 'Depolar';
 $wb['Packages'] = 'Paketler';
 $wb['Updates'] = 'Güncellemeler';
-
 $wb['Language Editor'] = 'Dil İşlemleri';
 $wb['Languages'] = 'Dil Dosyaları';
 $wb['New Language'] = 'Dil Ekleme';
 $wb['Merge'] = 'Dil Birleştirme';
 $wb['Export'] = 'Dil İndirme';
 $wb['Import'] = 'Dil Yükleme';
-
 $wb['Remote Actions'] = 'Uzak İşlemler';
 $wb['Do OS-Update'] = 'İşletim Sistemi Güncelleme';
 $wb['Do ISPConfig-Update'] = 'ISPConfig Güncelleme';
+$wb['Sites'] = 'Sites';
+$wb['DNS'] = 'DNS';
 ?>
diff --git a/interface/web/admin/lib/lang/tr_directive_snippets.lng b/interface/web/admin/lib/lang/tr_directive_snippets.lng
index 7b2f323d1e..8cb67665dc 100644
--- a/interface/web/admin/lib/lang/tr_directive_snippets.lng
+++ b/interface/web/admin/lib/lang/tr_directive_snippets.lng
@@ -7,4 +7,5 @@ $wb['active_txt'] = 'Etkin';
 $wb['directive_snippets_name_empty'] = 'Parçacık adı boş olamaz.';
 $wb['directive_snippets_name_error_unique'] = 'Aynı adlı bir yönerge parçacığı zaten var.';
 $wb['variables_txt'] = 'Değişkenler';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/tr_directive_snippets_list.lng b/interface/web/admin/lib/lang/tr_directive_snippets_list.lng
index 09e5053223..766a194dc1 100644
--- a/interface/web/admin/lib/lang/tr_directive_snippets_list.lng
+++ b/interface/web/admin/lib/lang/tr_directive_snippets_list.lng
@@ -4,4 +4,5 @@ $wb['active_txt'] = 'Etkin';
 $wb['name_txt'] = 'Parçacık Adı';
 $wb['type_txt'] = 'Tip';
 $wb['add_new_record_txt'] = 'Yönerge Parçacığı Ekle';
+$wb['customer_viewable_txt'] = 'Customer viewable';
 ?>
diff --git a/interface/web/admin/lib/lang/tr_firewall.lng b/interface/web/admin/lib/lang/tr_firewall.lng
index 9e853c7bde..8db312ff05 100644
--- a/interface/web/admin/lib/lang/tr_firewall.lng
+++ b/interface/web/admin/lib/lang/tr_firewall.lng
@@ -6,7 +6,6 @@ $wb['tcp_port_help_txt'] = 'Virgül ile ayırarak yazın';
 $wb['udp_port_help_txt'] = 'Virgül ile ayırarak yazın';
 $wb['active_txt'] = 'Etkin';
 $wb['firewall_error_unique'] = 'Bu sunucu için bir güvenlik duvarı kaydı zaten var.';
-$wb['active_txt'] = 'Etkin';
-$wb['tcp_ports_error_regex'] = 'TCP kapı açıklamasında karakter kullanılamaz. Yalnız rakam, ":" ve "," karakterleri kullanılabilir.';
-$wb['udp_ports_error_regex'] = 'UDP kapı açıklamasında karakter kullanılamaz. Yalnız rakam, ":" ve "," karakterleri kullanılabilir.';
+$wb['tcp_ports_error_regex'] = 'TCP kapı açıklamasında karakter kullanılamaz. Yalnız rakam, \":\" ve \",\" karakterleri kullanılabilir.';
+$wb['udp_ports_error_regex'] = 'UDP kapı açıklamasında karakter kullanılamaz. Yalnız rakam, \":\" ve \",\" karakterleri kullanılabilir.';
 ?>
diff --git a/interface/web/admin/lib/lang/tr_iptables.lng b/interface/web/admin/lib/lang/tr_iptables.lng
index e06d3e20db..219d85f567 100644
--- a/interface/web/admin/lib/lang/tr_iptables.lng
+++ b/interface/web/admin/lib/lang/tr_iptables.lng
@@ -1,5 +1,4 @@
 <?php
-
 $wb['server_id_txt'] = 'Sunucu';
 $wb['multiport_txt'] = 'Çok Kapı';
 $wb['singleport_txt'] = 'Tek Kapı';
@@ -11,6 +10,4 @@ $wb['destination_ip_txt'] = 'Hedef Adresi';
 $wb['source_ip_txt'] = 'Kaynak Adresi';
 $wb['active_txt'] = 'Etkin';
 $wb['iptables_error_unique'] = 'Bu sunucu için zaten bir güvenlik kaydı var.';
-
 ?>
-
diff --git a/interface/web/admin/lib/lang/tr_iptables_list.lng b/interface/web/admin/lib/lang/tr_iptables_list.lng
index e6d5a0ec09..a884ef7f78 100644
--- a/interface/web/admin/lib/lang/tr_iptables_list.lng
+++ b/interface/web/admin/lib/lang/tr_iptables_list.lng
@@ -1,5 +1,4 @@
 <?php
-
 $wb['list_head_txt'] = 'IPTables';
 $wb['add_new_rule_txt'] = 'IPTables Kuralı Ekle';
 $wb['server_id_txt'] = 'Sunucu';
@@ -13,6 +12,4 @@ $wb['destination_ip_txt'] = 'Hedef Adresi';
 $wb['source_ip_txt'] = 'Kaynak Adresi';
 $wb['active_txt'] = 'Etkin';
 $wb['iptables_error_unique'] = 'Bu sunucu için zaten bir güvenlik duvarı kaydı var.';
-
 ?>
-
diff --git a/interface/web/admin/lib/lang/tr_language_edit.lng b/interface/web/admin/lib/lang/tr_language_edit.lng
index ccdce15070..7b9fea1006 100644
--- a/interface/web/admin/lib/lang/tr_language_edit.lng
+++ b/interface/web/admin/lib/lang/tr_language_edit.lng
@@ -6,4 +6,3 @@ $wb['lang_file_txt'] = 'Dil dosyası';
 $wb['btn_save_txt'] = 'Kaydet';
 $wb['btn_cancel_txt'] = 'Geri';
 ?>
-
diff --git a/interface/web/admin/lib/lang/tr_language_list.lng b/interface/web/admin/lib/lang/tr_language_list.lng
index b97a81de60..a4cdd20cbf 100644
--- a/interface/web/admin/lib/lang/tr_language_list.lng
+++ b/interface/web/admin/lib/lang/tr_language_list.lng
@@ -5,4 +5,3 @@ $wb['module_txt'] = 'Modül';
 $wb['lang_file_txt'] = 'Dil Dosyası';
 $wb['lang_file_date_txt'] = 'Son değişiklik';
 ?>
-
diff --git a/interface/web/admin/lib/lang/tr_remote_action.lng b/interface/web/admin/lib/lang/tr_remote_action.lng
index de2424b763..2f124714e1 100644
--- a/interface/web/admin/lib/lang/tr_remote_action.lng
+++ b/interface/web/admin/lib/lang/tr_remote_action.lng
@@ -2,12 +2,11 @@
 $wb['select_server_txt'] = 'Sunucu Seçin';
 $wb['btn_do_txt'] = 'İşlemi Başlatın';
 $wb['do_osupdate_caption'] = 'Uzak sunucudaki işletim sistemini güncelleyin';
-$wb['do_osupdate_desc'] = 'Bu işlem seçilmiş sunucuda "aptitude -y upgrade" komutunu yürütür.<br><br><strong>OLUŞABİLECEK RİSKLER SİZE AİTTİR!</strong>';
+$wb['do_osupdate_desc'] = 'Bu işlem seçilmiş sunucuda \"aptitude -y upgrade\" komutunu yürütür.<br><br><strong>OLUŞABİLECEK RİSKLER SİZE AİTTİR!</strong>';
 $wb['do_ispcupdate_caption'] = 'Uzak sunucudaki ISPConfig 3 - sürümünü güncelleyin';
 $wb['do_ispcupdate_desc'] = 'Bu işlem seçilmiş sunucuda ISPConfig3 güncellemesini yürütür.<br><br><strong>OLUŞABİLECEK RİSKLER SÜZE AİTTİR!</strong>';
 $wb['action_scheduled'] = 'İşlem yürütülmek üzere zamanlandı';
 $wb['select_all_server'] = 'Tüm Sunucularda';
 $wb['ispconfig_update_title'] = 'ISPConfig güncelleme yönergeleri';
-$wb['ispconfig_update_text'] = 'Sunucunuzda root kullanıcısı ile bir kabuk oturumu açın ve ISPConfig güncellemesini başlatmak için<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />komutunu yürütün.<br /><br /><a href="http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/" target="_blank">Ayrıntılı güncelleme bilgilerine bakmak için buraya tıklayın</a>';
+$wb['ispconfig_update_text'] = 'Sunucunuzda root kullanıcısı ile bir kabuk oturumu açın ve ISPConfig güncellemesini başlatmak için<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />komutunu yürütün.<br /><br /><a href=\"http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/\" target=\"_blank\">Ayrıntılı güncelleme bilgilerine bakmak için buraya tıklayın</a>';
 ?>
-
diff --git a/interface/web/admin/lib/lang/tr_remote_user.lng b/interface/web/admin/lib/lang/tr_remote_user.lng
index 94e8fa6a70..998d344653 100644
--- a/interface/web/admin/lib/lang/tr_remote_user.lng
+++ b/interface/web/admin/lib/lang/tr_remote_user.lng
@@ -45,4 +45,3 @@ $wb['repeat_password_txt'] = 'Parola Onayı';
 $wb['password_mismatch_txt'] = 'Parola ile onayı aynı değil.';
 $wb['password_match_txt'] = 'Parola ile onayı aynı.';
 ?>
-
diff --git a/interface/web/admin/lib/lang/tr_remote_user_list.lng b/interface/web/admin/lib/lang/tr_remote_user_list.lng
index ca4f5a946d..9e829c9253 100644
--- a/interface/web/admin/lib/lang/tr_remote_user_list.lng
+++ b/interface/web/admin/lib/lang/tr_remote_user_list.lng
@@ -5,5 +5,3 @@ $wb['add_new_record_txt'] = 'Kullanıcı Ekle';
 $wb['parent_remote_userid_txt'] = 'Kod';
 $wb['username_txt'] = 'Kullanıcı Adı';
 ?>
-
-
diff --git a/interface/web/admin/lib/lang/tr_server.lng b/interface/web/admin/lib/lang/tr_server.lng
index 96cf0e744d..61e0b7dd6b 100644
--- a/interface/web/admin/lib/lang/tr_server.lng
+++ b/interface/web/admin/lib/lang/tr_server.lng
@@ -12,4 +12,5 @@ $wb['firewall_server_txt'] = 'Güvenlik Duvarı Sunucusu';
 $wb['active_txt'] = 'Etkin';
 $wb['mirror_server_id_txt'] = 'Sunucunun Yansısı';
 $wb['- None -'] = '- Hiçbiri -';
+$wb['xmpp_server_txt'] = 'XMPP Server';
 ?>
diff --git a/interface/web/admin/lib/lang/tr_server_config.lng b/interface/web/admin/lib/lang/tr_server_config.lng
index da40b3e364..fdf48a26ff 100644
--- a/interface/web/admin/lib/lang/tr_server_config.lng
+++ b/interface/web/admin/lib/lang/tr_server_config.lng
@@ -152,7 +152,7 @@ $wb['try_rescue_txt'] = 'Hizmetler izlensin ve sorun çıktığında yeniden ba
 $wb['do_not_try_rescue_httpd_txt'] = 'HTTPD izlenmesin';
 $wb['do_not_try_rescue_mysql_txt'] = 'MySQL izlenmesin';
 $wb['do_not_try_rescue_mail_txt'] = 'E-posta izlenmesin';
-$wb['rescue_description_txt'] = '<b>Uyarı:</b> mysql sunucusunu kapatmak istiyorsanız "MySQL izlenmesin" seçeneğini işaretleyip 2-3 dakika bekleyin.<br>2-3 dakika beklemezseniz, kurtarma işlemi mysql sunucusunu yeniden başlatmaya çalışır!';
+$wb['rescue_description_txt'] = '<b>Uyarı:</b> mysql sunucusunu kapatmak istiyorsanız \"MySQL izlenmesin\" seçeneğini işaretleyip 2-3 dakika bekleyin.<br>2-3 dakika beklemezseniz, kurtarma işlemi mysql sunucusunu yeniden başlatmaya çalışır!';
 $wb['enable_sni_txt'] = 'SNI Kullanılsın';
 $wb['set_folder_permissions_on_update_txt'] = 'Güncellenirken klasör izinleri ayarlansın';
 $wb['add_web_users_to_sshusers_group_txt'] = 'Web kullanıcıları -sshusers- grubuna eklensin';
@@ -242,5 +242,42 @@ $wb['cron_init_script_error_regex'] = 'Zamanlanmış görev başlatma betiği ge
 $wb['crontab_dir_error_regex'] = 'Zamanlanmış görev klasörü geçersiz.';
 $wb['cron_wget_error_regex'] = 'Zamanlanmış görev wget yolu geçersiz.';
 $wb['network_filesystem_txt'] = 'Ağ Dosya Sistemi';
+$wb['maildir_format_txt'] = 'Maildir Format';
+$wb['dkim_path_txt'] = 'DKIM Path';
+$wb['mailbox_virtual_uidgid_maps_txt'] = 'Use Websites Linux uid for mailbox';
+$wb['mailbox_virtual_uidgid_maps_info_txt'] = 'only in single web and mail-server-setup';
+$wb['mailbox_virtual_uidgid_maps_error_nosingleserver'] = 'Uid cannot be mapped in multi-server-setup.';
+$wb['mailbox_virtual_uidgid_maps_error_nodovecot'] = 'Uid-mapping can only be used with dovecot.';
+$wb['mailbox_virtual_uidgid_maps_error_alreadyusers'] = 'Uid-mapping cannot be changed if there are already mail users.';
+$wb['reject_sender_login_mismatch_txt'] = 'Reject sender and login mismatch';
+$wb['do_not_try_rescue_mongodb_txt'] = 'Disable MongoDB monitoring';
+$wb['v6_prefix_txt'] = 'IPv6 Prefix';
+$wb['vhost_rewrite_v6_txt'] = 'Rewrite IPv6 on Mirror';
+$wb['v6_prefix_length'] = 'Prefix too long according to defined IPv6 ';
+$wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
+$wb['backup_delete_txt'] = 'Delete backups on domain/website delete';
+$wb['overquota_db_notify_admin_txt'] = 'Send DB quota warnings to admin';
+$wb['overquota_db_notify_client_txt'] = 'Send DB quota warnings to client';
+$wb['php_handler_txt'] = 'Default PHP Handler';
+$wb['disabled_txt'] = 'Disabled';
+$wb['dkim_strength_txt'] = 'DKIM strength';
+$wb['php_ini_check_minutes_txt'] = 'Check php.ini every X minutes for changes';
+$wb['php_ini_check_minutes_error_empty'] = 'Please specify a value how often php.ini should be checked for changes.';
+$wb['php_ini_check_minutes_info_txt'] = '0 = no check';
+$wb['enable_spdy_txt'] = 'Makes SPDY available';
+$wb['web_settings_txt'] = 'Web Server';
+$wb['xmpp_server_txt'] = 'XMPP Server';
+$wb['xmpp_use_ipv6_txt'] = 'Use IPv6';
+$wb['xmpp_bosh_max_inactivity_txt'] = 'Max. BOSH inactivity time';
+$wb['xmpp_bosh_timeout_range_wrong'] = 'Please enter a bosh timeout range between 15 - 360';
+$wb['xmpp_module_saslauth'] = 'saslauth';
+$wb['xmpp_server_admins_txt'] = 'Server Admins (JIDs)';
+$wb['xmpp_modules_enabled_txt'] = 'Serverwide enabled plugins (one per line)';
+$wb['xmpp_ports_txt'] = 'Component ports';
+$wb['xmpp_port_http_txt'] = 'HTTP';
+$wb['xmpp_port_https_txt'] = 'HTTPS';
+$wb['xmpp_port_pastebin_txt'] = 'Pastebin';
+$wb['xmpp_port_bosh_txt'] = 'BOSH';
+$wb['disable_bind_log_txt'] = 'Disable bind9 messages for Loglevel WARN';
+$wb['apps_vhost_enabled_txt'] = 'Apps-vhost enabled';
 ?>
-
diff --git a/interface/web/admin/lib/lang/tr_server_ip_map.lng b/interface/web/admin/lib/lang/tr_server_ip_map.lng
index 94508abb79..68b196fb23 100644
--- a/interface/web/admin/lib/lang/tr_server_ip_map.lng
+++ b/interface/web/admin/lib/lang/tr_server_ip_map.lng
@@ -1,12 +1,12 @@
 <?php
-$wb["server_id_txt"] = 'Rewrite on Server';
-$wb["source_txt"] = 'Source IP';
-$wb["destination_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
-$wb["ip_error_wrong"] = 'The Destination IP address is invalid';
-$wb["destination_ip_empty"] = 'The Destination IP is empty.';
-$wb["source_ip_empty"] = 'The Source IP is empty.';
-$wb["server_empty_error"] = 'The Server is empty.';
-$wb["duplicate_mapping_error"] = "Mapping already exists.";
-$wb["ip_mapping_error"] = "Source IP can not be an IP of the Rewrite-Server";
+$wb['server_id_txt'] = 'Rewrite on Server';
+$wb['source_txt'] = 'Source IP';
+$wb['destination_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
+$wb['ip_error_wrong'] = 'The Destination IP address is invalid';
+$wb['destination_ip_empty'] = 'The Destination IP is empty.';
+$wb['source_ip_empty'] = 'The Source IP is empty.';
+$wb['server_empty_error'] = 'The Server is empty.';
+$wb['duplicate_mapping_error'] = 'Mapping already exists.';
+$wb['ip_mapping_error'] = 'Source IP can not be an IP of the Rewrite-Server';
 ?>
diff --git a/interface/web/admin/lib/lang/tr_server_ip_map_list.lng b/interface/web/admin/lib/lang/tr_server_ip_map_list.lng
index 60c6815fda..1fedc10b2e 100644
--- a/interface/web/admin/lib/lang/tr_server_ip_map_list.lng
+++ b/interface/web/admin/lib/lang/tr_server_ip_map_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb["list_head_txt"] = 'IP Mappings';
-$wb["server_id_txt"] = 'Server';
-$wb["source_ip_txt"] = 'Source IP';
-$wb["destination_ip_txt"] = 'Destination IP';
-$wb["active_txt"] = 'Active';
+$wb['list_head_txt'] = 'IP Mappings';
+$wb['server_id_txt'] = 'Server';
+$wb['source_ip_txt'] = 'Source IP';
+$wb['destination_ip_txt'] = 'Destination IP';
+$wb['active_txt'] = 'Active';
 ?>
diff --git a/interface/web/admin/lib/lang/tr_server_list.lng b/interface/web/admin/lib/lang/tr_server_list.lng
index 6bc83799bd..9f791f78a1 100644
--- a/interface/web/admin/lib/lang/tr_server_list.lng
+++ b/interface/web/admin/lib/lang/tr_server_list.lng
@@ -10,4 +10,5 @@ $wb['vserver_server_txt'] = 'SSunucu';
 $wb['proxy_server_txt'] = 'Vekil Sunucu';
 $wb['firewall_server_txt'] = 'Güvenlik Duvarı';
 $wb['add_new_record_txt'] = 'Sunucu Ekle';
+$wb['xmpp_server_txt'] = 'XMPP';
 ?>
diff --git a/interface/web/admin/lib/lang/tr_server_php.lng b/interface/web/admin/lib/lang/tr_server_php.lng
index 46c74aab1d..a86d1959b2 100644
--- a/interface/web/admin/lib/lang/tr_server_php.lng
+++ b/interface/web/admin/lib/lang/tr_server_php.lng
@@ -14,4 +14,3 @@ $wb['php_fpm_init_script_txt'] = 'PHP-FPM Başlatma Betiğinin Yolu';
 $wb['php_fpm_ini_dir_txt'] = 'php.ini Klasörünün Yolu';
 $wb['php_fpm_pool_dir_txt'] = 'PHP-FPM Havuz Klasörünün Yolu';
 ?>
-
diff --git a/interface/web/admin/lib/lang/tr_server_php_list.lng b/interface/web/admin/lib/lang/tr_server_php_list.lng
index 86fcd440af..3b1d39bdd2 100644
--- a/interface/web/admin/lib/lang/tr_server_php_list.lng
+++ b/interface/web/admin/lib/lang/tr_server_php_list.lng
@@ -5,4 +5,3 @@ $wb['add_new_record_txt'] = 'PHP Sürümü Ekle';
 $wb['client_id_txt'] = 'Müşteri';
 $wb['name_txt'] = 'PHP Adı';
 ?>
-
diff --git a/interface/web/admin/lib/lang/tr_software_package_list.lng b/interface/web/admin/lib/lang/tr_software_package_list.lng
index ee44a33090..1838ff94cf 100644
--- a/interface/web/admin/lib/lang/tr_software_package_list.lng
+++ b/interface/web/admin/lib/lang/tr_software_package_list.lng
@@ -11,4 +11,3 @@ $wb['no_packages_txt'] = 'Henüz kullanılabilecek bir paket yok';
 $wb['edit_txt'] = 'Düzenle';
 $wb['delete_txt'] = 'Sil';
 ?>
-
diff --git a/interface/web/admin/lib/lang/tr_software_update_list.lng b/interface/web/admin/lib/lang/tr_software_update_list.lng
index 3f8e08fa43..4ee824a6e1 100644
--- a/interface/web/admin/lib/lang/tr_software_update_list.lng
+++ b/interface/web/admin/lib/lang/tr_software_update_list.lng
@@ -7,4 +7,3 @@ $wb['version_txt'] = 'Sürüm';
 $wb['action_txt'] = 'İşlem';
 $wb['no_updates_txt'] = 'Henüz bir güncelleme yok';
 ?>
-
diff --git a/interface/web/admin/lib/lang/tr_system_config.lng b/interface/web/admin/lib/lang/tr_system_config.lng
index a200649443..2637cd45f3 100644
--- a/interface/web/admin/lib/lang/tr_system_config.lng
+++ b/interface/web/admin/lib/lang/tr_system_config.lng
@@ -13,11 +13,11 @@ $wb['dbuser_prefix_txt'] = 'Veritabanı kullanıcısı ön eki';
 $wb['shelluser_prefix_txt'] = 'Kabuk kullanıcısı ön eki';
 $wb['webdavuser_prefix_txt'] = 'Webdav kullanıcısı ön eki';
 $wb['ftpuser_prefix_txt'] = 'FTP kullanıcısı ön eki';
-$wb["company_name_txt"] = "Company Name for the page title";
-$wb["reseller_can_use_options_txt"] = "Reseller can use the option-tab for websites";
-$wb["custom_login_text_txt"] = "Custom Text on Login-Page";
-$wb["custom_login_link_txt"] = "Custom Link on Login-Page";
-$wb["login_link_error_regex"] = "Invalid Link for Custom Login";
+$wb['company_name_txt'] = 'Company Name for the page title';
+$wb['reseller_can_use_options_txt'] = 'Reseller can use the option-tab for websites';
+$wb['custom_login_text_txt'] = 'Custom Text on Login-Page';
+$wb['custom_login_link_txt'] = 'Custom Link on Login-Page';
+$wb['login_link_error_regex'] = 'Invalid Link for Custom Login';
 $wb['vhost_subdomains_txt'] = 'Alt alanlar web sitesi şeklinde oluşturulsun';
 $wb['vhost_subdomains_note_txt'] = 'Sistemde SSunucu alt alan adları varken bu seçenek devre dışı bırakılamaz!';
 $wb['dbname_prefix_error_regex'] = 'Veritabanı adı ön ekinde izin verilmeyen karakterler var';
@@ -69,9 +69,16 @@ $wb['customer_no_template_error_regex_txt'] = 'Müşteri no kalıbında geçersi
 $wb['customer_no_start_txt'] = 'Müşteri No Başlangıç Değeri';
 $wb['customer_no_counter_txt'] = 'Müşteri No Sayacı';
 $wb['session_timeout_txt'] = 'Oturum Zaman Aşımı (dakika)';
-$wb['session_allow_endless_txt'] = '"Oturum açık kalsın" kullanılabilsin';
+$wb['session_allow_endless_txt'] = '\"Oturum açık kalsın\" kullanılabilsin';
 $wb['No'] = 'No';
 $wb['min_password_length_txt'] = 'En Az Parola Uzunluğu';
 $wb['min_password_strength_txt'] = 'En Az Parola Güçlüğü';
+$wb['vhost_aliasdomains_txt'] = 'Create aliasdomains as web site';
+$wb['vhost_aliasdomains_note_txt'] = 'You cannot disable this as long as vhost aliasdomains exist in the system!';
+$wb['backups_include_into_web_quota_txt'] = 'Include backup files into web quota.';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
 ?>
-
diff --git a/interface/web/admin/lib/lang/tr_tpl_default_admin.lng b/interface/web/admin/lib/lang/tr_tpl_default_admin.lng
index 1040e28956..3c9fe5fd61 100644
--- a/interface/web/admin/lib/lang/tr_tpl_default_admin.lng
+++ b/interface/web/admin/lib/lang/tr_tpl_default_admin.lng
@@ -16,4 +16,3 @@ $wb['php_fpm_init_script_txt'] = 'PHP-FPM Başlatma Betiğinin Yolu';
 $wb['php_fpm_ini_dir_txt'] = 'php.ini Klasörünün Yolu';
 $wb['php_fpm_pool_dir_txt'] = 'PHP-FPM Havuz Klasörünün Yolu';
 ?>
-
diff --git a/interface/web/admin/lib/lang/tr_users.lng b/interface/web/admin/lib/lang/tr_users.lng
index 9438d15419..178f05a78a 100644
--- a/interface/web/admin/lib/lang/tr_users.lng
+++ b/interface/web/admin/lib/lang/tr_users.lng
@@ -29,7 +29,7 @@ $wb['generate_password_txt'] = 'Parola Oluştur';
 $wb['repeat_password_txt'] = 'Parola Onayı';
 $wb['password_mismatch_txt'] = 'Parola ile onayı aynı değil.';
 $wb['password_match_txt'] = 'Parola ile onayı aynı.';
-$wb['username_error_collision'] = 'Kullanıcı adı -web- ya da -web- sözcüğünü izleyen bir sayı ile başlayamaz."';
+$wb['username_error_collision'] = 'Kullanıcı adı -web- ya da -web- sözcüğünü izleyen bir sayı ile başlayamaz.\"';
 $wb['client_not_admin_err'] = 'Bir müşteriye ait bir kullanıcının tipi admin olarak atanamaz';
+$wb['lost_password_function_txt'] = 'Forgot password function is available';
 ?>
-
diff --git a/interface/web/client/lib/lang/ar.lng b/interface/web/client/lib/lang/ar.lng
index bb03af82b7..c8846954d4 100644
--- a/interface/web/client/lib/lang/ar.lng
+++ b/interface/web/client/lib/lang/ar.lng
@@ -23,4 +23,6 @@ $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is i
 $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['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
+$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
 ?>
diff --git a/interface/web/client/lib/lang/ar_client.lng b/interface/web/client/lib/lang/ar_client.lng
index c9475479aa..1fd05521e4 100644
--- a/interface/web/client/lib/lang/ar_client.lng
+++ b/interface/web/client/lib/lang/ar_client.lng
@@ -155,5 +155,43 @@ $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["email_error_empty"] = "Email is empty";
+$wb['email_error_empty'] = 'Email is empty';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.';
+$wb['dns_servers_txt'] = 'DNS servers';
+$wb['dns_servers_placeholder'] = 'Select DNS servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.';
+$wb['db_servers_txt'] = 'Database servers';
+$wb['db_servers_placeholder'] = 'Select database servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select mailservers';
+$wb['no_mail_server_error'] = 'At least one mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['reseller_txt'] = 'Reseller';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/ar_client_template.lng b/interface/web/client/lib/lang/ar_client_template.lng
index 97a01c762c..008951507d 100644
--- a/interface/web/client/lib/lang/ar_client_template.lng
+++ b/interface/web/client/lib/lang/ar_client_template.lng
@@ -90,4 +90,28 @@ $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['dns_servers_txt'] = 'DNS servers';
 ?>
diff --git a/interface/web/client/lib/lang/ar_reseller.lng b/interface/web/client/lib/lang/ar_reseller.lng
index 9ba66cd0ed..adabf8daa5 100644
--- a/interface/web/client/lib/lang/ar_reseller.lng
+++ b/interface/web/client/lib/lang/ar_reseller.lng
@@ -160,7 +160,40 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $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.';
-$wb["btn_save_txt"] = "Save";
-$wb["btn_cancel_txt"] = "Cancel";
-$wb["email_error_empty"] = "Email is empty";
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['email_error_empty'] = 'Email is empty';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select Webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before to remove it.';
+$wb['dns_servers_txt'] = 'DNS Server';
+$wb['dns_servers_placeholder'] = 'Select DNS Servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before to remove it.';
+$wb['db_servers_txt'] = 'Database Server';
+$wb['db_servers_placeholder'] = 'Select Database Servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before to remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select Mailservers';
+$wb['no_mail_server_error'] = 'At least one Mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before to remove it.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/bg.lng b/interface/web/client/lib/lang/bg.lng
index 836fc56d96..cd39a68b26 100644
--- a/interface/web/client/lib/lang/bg.lng
+++ b/interface/web/client/lib/lang/bg.lng
@@ -23,4 +23,6 @@ $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is i
 $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['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
+$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
 ?>
diff --git a/interface/web/client/lib/lang/bg_client.lng b/interface/web/client/lib/lang/bg_client.lng
index 905c31a830..cb61f56211 100644
--- a/interface/web/client/lib/lang/bg_client.lng
+++ b/interface/web/client/lib/lang/bg_client.lng
@@ -155,5 +155,43 @@ $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["email_error_empty"] = "Email is empty";
+$wb['email_error_empty'] = 'Email is empty';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.';
+$wb['dns_servers_txt'] = 'DNS servers';
+$wb['dns_servers_placeholder'] = 'Select DNS servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.';
+$wb['db_servers_txt'] = 'Database servers';
+$wb['db_servers_placeholder'] = 'Select database servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select mailservers';
+$wb['no_mail_server_error'] = 'At least one mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['reseller_txt'] = 'Reseller';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/bg_client_template.lng b/interface/web/client/lib/lang/bg_client_template.lng
index 2456d8e344..3fa3cd7e37 100644
--- a/interface/web/client/lib/lang/bg_client_template.lng
+++ b/interface/web/client/lib/lang/bg_client_template.lng
@@ -90,4 +90,28 @@ $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['dns_servers_txt'] = 'DNS servers';
 ?>
diff --git a/interface/web/client/lib/lang/bg_reseller.lng b/interface/web/client/lib/lang/bg_reseller.lng
index dd8b754c90..c27de728d1 100644
--- a/interface/web/client/lib/lang/bg_reseller.lng
+++ b/interface/web/client/lib/lang/bg_reseller.lng
@@ -160,7 +160,40 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $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.';
-$wb["btn_save_txt"] = "Save";
-$wb["btn_cancel_txt"] = "Cancel";
-$wb["email_error_empty"] = "Email is empty";
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['email_error_empty'] = 'Email is empty';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select Webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before to remove it.';
+$wb['dns_servers_txt'] = 'DNS Server';
+$wb['dns_servers_placeholder'] = 'Select DNS Servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before to remove it.';
+$wb['db_servers_txt'] = 'Database Server';
+$wb['db_servers_placeholder'] = 'Select Database Servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before to remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select Mailservers';
+$wb['no_mail_server_error'] = 'At least one Mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before to remove it.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/br.lng b/interface/web/client/lib/lang/br.lng
index 26049404da..bb71c28a8c 100644
--- a/interface/web/client/lib/lang/br.lng
+++ b/interface/web/client/lib/lang/br.lng
@@ -23,4 +23,6 @@ $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is i
 $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['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
+$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
 ?>
diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng
index fee9b804ee..a1f399ecab 100644
--- a/interface/web/client/lib/lang/br_client.lng
+++ b/interface/web/client/lib/lang/br_client.lng
@@ -155,5 +155,43 @@ $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["email_error_empty"] = "Email is empty";
+$wb['email_error_empty'] = 'Email is empty';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.';
+$wb['dns_servers_txt'] = 'DNS servers';
+$wb['dns_servers_placeholder'] = 'Select DNS servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.';
+$wb['db_servers_txt'] = 'Database servers';
+$wb['db_servers_placeholder'] = 'Select database servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select mailservers';
+$wb['no_mail_server_error'] = 'At least one mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['reseller_txt'] = 'Reseller';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/br_client_template.lng b/interface/web/client/lib/lang/br_client_template.lng
index 4bbc1e98d3..76487d74db 100644
--- a/interface/web/client/lib/lang/br_client_template.lng
+++ b/interface/web/client/lib/lang/br_client_template.lng
@@ -90,4 +90,28 @@ $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['dns_servers_txt'] = 'DNS servers';
 ?>
diff --git a/interface/web/client/lib/lang/br_reseller.lng b/interface/web/client/lib/lang/br_reseller.lng
index dd67192d6f..1fa842aeff 100644
--- a/interface/web/client/lib/lang/br_reseller.lng
+++ b/interface/web/client/lib/lang/br_reseller.lng
@@ -160,7 +160,40 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $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.';
-$wb["btn_save_txt"] = "Save";
-$wb["btn_cancel_txt"] = "Cancel";
-$wb["email_error_empty"] = "Email is empty";
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['email_error_empty'] = 'Email is empty';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select Webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before to remove it.';
+$wb['dns_servers_txt'] = 'DNS Server';
+$wb['dns_servers_placeholder'] = 'Select DNS Servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before to remove it.';
+$wb['db_servers_txt'] = 'Database Server';
+$wb['db_servers_placeholder'] = 'Select Database Servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before to remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select Mailservers';
+$wb['no_mail_server_error'] = 'At least one Mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before to remove it.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/ca.lng b/interface/web/client/lib/lang/ca.lng
new file mode 100644
index 0000000000..32888e6951
--- /dev/null
+++ b/interface/web/client/lib/lang/ca.lng
@@ -0,0 +1,28 @@
+<?php
+$wb['Client'] = 'Client';
+$wb['Address'] = 'Adresse';
+$wb['Limits'] = 'Limites';
+$wb['Add Client'] = 'Ajouter un Client';
+$wb['Edit Client'] = 'Editer un Client';
+$wb['Clients'] = 'Clients';
+$wb['Add Reseller'] = 'Ajouter un Revendeur';
+$wb['Edit Reseller'] = 'Editer un Revendeur';
+$wb['Resellers'] = 'Revendeurs';
+$wb['error_has_clients'] = 'Ce revendeur a des clients. Effacez dabord les clients de ce revendeur.';
+$wb['add_additional_template_txt'] = 'Ajouter un modèle';
+$wb['delete_additional_template_txt'] = 'Supprimer un modèle';
+$wb['Messaging'] = 'Messagerie';
+$wb['Edit Client Circle'] = 'Editer les groupes clients';
+$wb['Domains'] = 'Domaines';
+$wb['domain_txt'] = 'Domaine';
+$wb['client_txt'] = 'Client';
+$wb['error_domain_in mailuse'] = 'Ce domaine ne peut pas être supprimé, il est utilisé par un compte courriel';
+$wb['error_domain_in webuse'] = 'Ce domaine ne peut pas être supprimé, il est utilisé par un site Web';
+$wb['error_client_can_not_add_domain'] = 'Vous ne pouvez pas ajouter de nouveau domaine';
+$wb['error_client_group_id_empty'] = 'Vous devez sélectionner un client<br>';
+$wb['Templates'] = 'Templates';
+$wb['Limit-Templates'] = 'Limit-Templates';
+$wb['Send email'] = 'Send Email';
+$wb['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
+$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
+?>
diff --git a/interface/web/client/lib/lang/ca_client.lng b/interface/web/client/lib/lang/ca_client.lng
new file mode 100644
index 0000000000..1b7662344c
--- /dev/null
+++ b/interface/web/client/lib/lang/ca_client.lng
@@ -0,0 +1,197 @@
+<?php
+$wb['limit_maildomain_txt'] = 'Nombre maximal de domaines d\'email';
+$wb['limit_mailbox_txt'] = 'Nombre maximal de boites courriel';
+$wb['limit_mailalias_txt'] = 'Nombre maximal d\'alias d\'email';
+$wb['limit_mailforward_txt'] = 'Nombre maximal de routeurs d\'email';
+$wb['limit_mailcatchall_txt'] = 'Nombre maximal de comptes collecteurs';
+$wb['limit_mailrouting_txt'] = 'Nombre maximal de routes d\'email';
+$wb['limit_mailfilter_txt'] = 'Nombre maximal de filtres d\'emails';
+$wb['limit_fetchmail_txt'] = 'Nombre maximal de comptes récupérateur courriel';
+$wb['limit_mailquota_txt'] = 'Quota des boites courriel';
+$wb['limit_spamfilter_wblist_txt'] = 'Nombre maximal de liste blanches/noires d\'email';
+$wb['limit_spamfilter_user_txt'] = 'Nombre maximal d\'utilisateurs du filtre antispam';
+$wb['limit_spamfilter_policy_txt'] = 'Nombre maximal de règles du filtre antispam';
+$wb['default_mailserver_txt'] = 'Serveur mail par défaut';
+$wb['company_name_txt'] = 'Nom de l\'entreprise';
+$wb['contact_name_txt'] = 'Nom de contact';
+$wb['username_txt'] = 'Nom d\'utilisateur';
+$wb['password_txt'] = 'Mot de passe';
+$wb['password_strength_txt'] = 'Force du mot de passe';
+$wb['language_txt'] = 'Langage';
+$wb['usertheme_txt'] = 'Thème';
+$wb['street_txt'] = 'Rue';
+$wb['zip_txt'] = 'Code Postal';
+$wb['city_txt'] = 'Ville';
+$wb['state_txt'] = 'Etat';
+$wb['country_txt'] = 'Pays';
+$wb['telephone_txt'] = 'Numéro de téléphone';
+$wb['mobile_txt'] = 'Numéro de Mobile';
+$wb['fax_txt'] = 'Fax';
+$wb['email_txt'] = 'Courriel';
+$wb['internet_txt'] = 'Adresse Web';
+$wb['icq_txt'] = 'ICQ';
+$wb['notes_txt'] = 'Notes';
+$wb['company_txt'] = 'Entreprise';
+$wb['title_txt'] = 'Titre';
+$wb['firstname_txt'] = 'Prénom';
+$wb['surname_txt'] = 'Nom';
+$wb['limit_client_txt'] = 'Nombre maximal de clients';
+$wb['limit_domain_txt'] = 'Nombre maximal de domaines';
+$wb['limit_subdomain_txt'] = 'Nombre maximal de sous-domaines';
+$wb['limit_webquota_txt'] = 'Limite du quota web';
+$wb['limit_database_txt'] = 'Nombre maximal de bases de données';
+$wb['ip_address_txt'] = 'Adresse IP';
+$wb['limit_client_error_notint'] = 'La limite de sous-clients doit être un nombre';
+$wb['firstname_error_empty'] = 'Le prénom est vide.';
+$wb['contact_error_empty'] = 'Le nom de contact est vide.';
+$wb['default_webserver_txt'] = 'Serveur Web par défaut';
+$wb['limit_web_domain_txt'] = 'Nombre maximal de domaines Web';
+$wb['limit_web_aliasdomain_txt'] = 'Nombre maximal d\'alias de domaines';
+$wb['limit_web_subdomain_txt'] = 'Nombre maximal de sous-domaines';
+$wb['limit_ftp_user_txt'] = 'Nombre maximal d\'utilisateurs FTP';
+$wb['default_dnsserver_txt'] = 'Serveur DNS par défaut';
+$wb['limit_dns_zone_txt'] = 'Nombre maximal de zones DNS';
+$wb['limit_dns_record_txt'] = 'Nombre maximal d\'enregistrements DNS';
+$wb['limit_shell_user_txt'] = 'Nombre maximal d\'utilisateurs Shell';
+$wb['username_error_empty'] = 'Le nom d\'utilisateur est vide.';
+$wb['username_error_unique'] = 'Le nom d\'utilisateur existe déja.';
+$wb['limit_maildomain_error_notint'] = 'La limite de domaines d\'email doit être un nombre.';
+$wb['limit_mailbox_error_notint'] = 'La limite de boites d\'email doit être un nombre.';
+$wb['limit_mailalias_error_notint'] = 'La limite d\'alias d\'email doit être un nombre.';
+$wb['limit_mailforward_error_notint'] = 'La limite de routeurs d\'email doit être un nombre.';
+$wb['limit_mailcatchall_error_notint'] = 'La limite de comptes collecteurs doit être un nombre.';
+$wb['limit_mailrouting_error_notint'] = 'La limite de routes d\'email doit être un nombre.';
+$wb['limit_mailfilter_error_notint'] = 'La limite de filtres d\'email doit être un nombre.';
+$wb['limit_mailfetchmail_error_notint'] = 'La limite de comptes récupérateur courriel doit être un nombre.';
+$wb['limit_mailquota_error_notint'] = 'La limite du quota des boites d\'email doit être un nombre.';
+$wb['limit_spamfilter_wblist_error_notint'] = 'La limite de listes blanches/noires du filtre antispam doit être un nombre.';
+$wb['limit_spamfilter_user_error_notint'] = 'La limite d\'utilisateurs du filtre antispam doit être un nombre.';
+$wb['limit_spamfilter_policy_error_notint'] = 'La limite de règles du filtre antispam doit être un nombre.';
+$wb['limit_web_domain_error_notint'] = 'La limite de sites web doit être un nombre.';
+$wb['limit_web_aliasdomain_error_notint'] = 'La limite d\'alias de domaines doit être un nombre.';
+$wb['limit_web_subdomain_error_notint'] = 'La limite de sous-domaines doit être un nombre.';
+$wb['limit_ftp_user_error_notint'] = 'La limite d\'utilisateurs FTP doit être un nombre.';
+$wb['limit_shell_user_error_notint'] = 'La limite d\'utilisateurs Shell doit être un nombre.';
+$wb['limit_dns_zone_error_notint'] = 'La limite d\'enregistrements DNS doit être un nombre.';
+$wb['default_dbserver_txt'] = 'Serveur de bases de données par défaut';
+$wb['limit_database_error_notint'] = 'La limite de bases de données doit être un nombre.';
+$wb['username_error_regex'] = 'Le nom d\'utilisateur contient des caractères invalides.';
+$wb['template_master_txt'] = 'Maître';
+$wb['template_additional_txt'] = 'Ajout';
+$wb['ssh_chroot_txt'] = 'Options Chroot SSH';
+$wb['web_php_options_txt'] = 'Options PHP';
+$wb['limit_cron_txt'] = 'Nombre maximal de tâches Cron';
+$wb['limit_cron_type_txt'] = 'Types des tâches Cron';
+$wb['limit_cron_frequency_txt'] = 'Délai minimum entre deux éxécutions';
+$wb['limit_cron_error_notint'] = 'La limite de tâches Cron doit être un nombre.';
+$wb['limit_cron_error_frequency'] = 'La fréquence des tâches Cron doit être un nombre.';
+$wb['limit_client_error'] = 'Le nombre maximum de clients a été atteint.';
+$wb['limit_mailaliasdomain_txt'] = 'Nombre max d\'alias de domaines';
+$wb['limit_dns_slave_zone_txt'] = 'Nombre max de zones DNS secondaires';
+$wb['limit_webdav_user_txt'] = 'Nombre max d\'utilisateurs webdav';
+$wb['limit_mailaliasdomain_error_notint'] = 'La limite d\'alias de domaine courriel doit être un nombre.';
+$wb['limit_webdav_user_error_notint'] = 'La limite d\'utilisateurs webdav doit être un nombre.';
+$wb['limit_dns_slave_zone_error_notint'] = 'La limite de zones DNS secondaire doit être un nombre.';
+$wb['limit_web_quota_txt'] = 'Quota web';
+$wb['limit_traffic_quota_txt'] = 'Quota de trafic';
+$wb['limit_trafficquota_error_notint'] = 'Le Quota de trafic doit être un nombre.';
+$wb['customer_no_txt'] = 'No. Client';
+$wb['vat_id_txt'] = 'Numéro de TVA';
+$wb['required_fields_txt'] = '* Champs requis';
+$wb['limit_mailmailinglist_txt'] = 'Nombre max de listes d\'email.';
+$wb['limit_mailmailinglist_error_notint'] = 'La limite de listes d\'email doit être un nombre';
+$wb['company_id_txt'] = 'ID Entreprise/Dirigeant';
+$wb['limit_openvz_vm_txt'] = 'Nombre max de serveurs virtuels.';
+$wb['limit_openvz_vm_template_id_txt'] = 'Forcer le modèle de serveur virtuel.';
+$wb['limit_openvz_vm_error_notint'] = 'La limite de serveurs virtuels doit être un nombre.';
+$wb['web_php_options_notempty'] = 'Aucune option PHP choisie. Sélectonnez au moins une option PHP.';
+$wb['ssh_chroot_notempty'] = 'Aucune option SSH chroot choisie. Sélectionnez au moins une option SSH.';
+$wb['username_error_collision'] = 'Le nom d\'utilisateur ne peut pas commencer par -web- ou -web- followed suivi d\'un nombre.';
+$wb['add_additional_template_txt'] = 'Ajouter un modèle';
+$wb['delete_additional_template_txt'] = 'Supprimer un modèle';
+$wb['limit_cgi_txt'] = 'CGI autorisé';
+$wb['limit_ssi_txt'] = 'SSI autorisé';
+$wb['limit_perl_txt'] = 'Perl autorisé';
+$wb['limit_ruby_txt'] = 'Ruby autorisé';
+$wb['limit_python_txt'] = 'Python autorisé';
+$wb['force_suexec_txt'] = 'Forcer le SuEXEC';
+$wb['limit_hterror_txt'] = 'Documents d\'erreurs personnalisés autorisés';
+$wb['limit_wildcard_txt'] = 'Sous-domaine joker autorisé';
+$wb['limit_ssl_txt'] = 'SSL autorisé';
+$wb['bank_account_number_txt'] = 'Numéro de compte bancaire';
+$wb['bank_code_txt'] = 'Code banque';
+$wb['bank_name_txt'] = 'Nom de la banque';
+$wb['bank_account_iban_txt'] = 'IBAN';
+$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['web_limits_txt'] = 'Limites Web';
+$wb['email_limits_txt'] = 'Limites d\'emails';
+$wb['database_limits_txt'] = 'Limite de bases de données';
+$wb['cron_job_limits_txt'] = 'Limites de tâches CRON';
+$wb['dns_limits_txt'] = 'Limites DNS';
+$wb['virtualization_limits_txt'] = 'Limites de virtualisation';
+$wb['generate_password_txt'] = 'Genérer un mot de passe';
+$wb['repeat_password_txt'] = 'Vérification du mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['active_template_additional_txt'] = 'Addons actifs';
+$wb['bank_account_owner_txt'] = 'Titulaire du compte bancaire';
+$wb['email_error_isemail'] = 'Saisissez une adresse courriel valide.';
+$wb['customer_no_error_unique'] = 'Le numéro client doit être unique (ou vide).';
+$wb['paypal_email_error_isemail'] = 'Saisissez un compte Paypal valide.';
+$wb['paypal_email_txt'] = 'Compte Paypal';
+$wb['err_msg_master_tpl_set'] = 'Les paramètres de limites personnalisés seront ignorés si un modèle maître autre que \\"custom\\" est sélectionné.';
+$wb['aps_limits_txt'] = 'Nombre max d\'Installeur APS';
+$wb['limit_aps_txt'] = 'Nombre max d\'instances APS';
+$wb['limit_aps_error_notint'] = 'La limite d\'instances APS doit être un nombre';
+$wb['default_slave_dnsserver_txt'] = 'Serveur DNS secondaire par défaut';
+$wb['locked_txt'] = 'Vérouillé (Désactive web, etc.)';
+$wb['canceled_txt'] = 'Canceled (Désactive connexion Ispconfig)';
+$wb['gender_txt'] = 'Title';
+$wb['gender_m_txt'] = 'Mr.';
+$wb['gender_f_txt'] = 'Mme';
+$wb['added_by_txt'] = 'Ajouté par';
+$wb['added_date_txt'] = 'Date d\'ajout';
+$wb['parent_client_id_txt'] = 'Client du revendeur';
+$wb['none_txt'] = 'none';
+$wb['contact_firstname_txt'] = 'Contact firstname';
+$wb['limit_backup_txt'] = 'Backupfunction available';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.';
+$wb['dns_servers_txt'] = 'DNS servers';
+$wb['dns_servers_placeholder'] = 'Select DNS servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.';
+$wb['db_servers_txt'] = 'Database servers';
+$wb['db_servers_placeholder'] = 'Select database servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select mailservers';
+$wb['no_mail_server_error'] = 'At least one mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['reseller_txt'] = 'Reseller';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
+$wb['email_error_empty'] = 'Email is empty';
+?>
diff --git a/interface/web/client/lib/lang/ca_client_circle.lng b/interface/web/client/lib/lang/ca_client_circle.lng
new file mode 100644
index 0000000000..75288e6bdc
--- /dev/null
+++ b/interface/web/client/lib/lang/ca_client_circle.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['Client Circle'] = 'Groupe client';
+$wb['Circle'] = 'Groupe';
+$wb['circle_txt'] = 'Groupe';
+$wb['circle_name_txt'] = 'Nom du groupe';
+$wb['client_ids_txt'] = 'Clients/Revendeurs';
+$wb['description_txt'] = 'Description';
+$wb['active_txt'] = 'Actif';
+?>
diff --git a/interface/web/client/lib/lang/ca_client_circle_list.lng b/interface/web/client/lib/lang/ca_client_circle_list.lng
new file mode 100644
index 0000000000..0db291a192
--- /dev/null
+++ b/interface/web/client/lib/lang/ca_client_circle_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'Groupes clients';
+$wb['circle_id_txt'] = 'ID du groupe';
+$wb['circle_name_txt'] = 'Nom du groupe';
+$wb['description_txt'] = 'Description';
+$wb['add_new_record_txt'] = 'Ajouter un nouveau groupe';
+$wb['filter_txt'] = 'Filtrer';
+$wb['delete_txt'] = 'Supprimer';
+$wb['active_txt'] = 'Actif';
+?>
diff --git a/interface/web/client/lib/lang/ca_client_del.lng b/interface/web/client/lib/lang/ca_client_del.lng
new file mode 100644
index 0000000000..2ec2d877bf
--- /dev/null
+++ b/interface/web/client/lib/lang/ca_client_del.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['confirm_action_txt'] = 'Confirmer l\'action';
+$wb['delete_explanation'] = 'Cette action va supprimer le nombre d\'enregistrements suivants associés avec le client';
+$wb['btn_save_txt'] = 'Effacer le client';
+$wb['btn_cancel_txt'] = 'Annuler sans effacer le client';
+$wb['confirm_client_delete_txt'] = 'Confirmez-vous la suppression de ce client ?';
+?>
diff --git a/interface/web/client/lib/lang/ca_client_message.lng b/interface/web/client/lib/lang/ca_client_message.lng
new file mode 100644
index 0000000000..8484d1a3ab
--- /dev/null
+++ b/interface/web/client/lib/lang/ca_client_message.lng
@@ -0,0 +1,20 @@
+<?php
+$wb['btn_send_txt'] = 'Envoyer';
+$wb['btn_cancel_txt'] = 'Annuler';
+$wb['sender_txt'] = 'Adresse courriel de l\'expéditeur';
+$wb['subject_txt'] = 'Objet';
+$wb['message_txt'] = 'Message';
+$wb['form_legend_client_txt'] = 'Envoyer l\'email à tous les clients';
+$wb['form_legend_admin_txt'] = 'Envoyer l\'email à tous les clients et revendeurs';
+$wb['sender_invalid_error'] = 'Adresse d\'expédition invalide.';
+$wb['subject_invalid_error'] = 'L\'objet est vide.';
+$wb['message_invalid_error'] = 'Le message est vide.';
+$wb['email_sent_to_txt'] = 'Email envoyé à :';
+$wb['page_head_txt'] = 'Envoyer les informations client';
+$wb['recipient_txt'] = 'Destinataire';
+$wb['all_clients_resellers_txt'] = 'Tous les clients et revendeurs';
+$wb['all_clients_txt'] = 'Tous les clients';
+$wb['variables_txt'] = 'Variables :';
+$wb['gender_m_txt'] = 'Mr';
+$wb['gender_f_txt'] = 'Mme';
+?>
diff --git a/interface/web/client/lib/lang/ca_client_message_template.lng b/interface/web/client/lib/lang/ca_client_message_template.lng
new file mode 100644
index 0000000000..2771206d99
--- /dev/null
+++ b/interface/web/client/lib/lang/ca_client_message_template.lng
@@ -0,0 +1,11 @@
+<?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 courriels.)';
+$wb['duplicate_welcome_error'] = 'There can be only one default welcome courriel template. Please edit the existing template instead of adding a new one.';
+?>
diff --git a/interface/web/client/lib/lang/ca_client_message_template_list.lng b/interface/web/client/lib/lang/ca_client_message_template_list.lng
new file mode 100644
index 0000000000..d9c307ed52
--- /dev/null
+++ b/interface/web/client/lib/lang/ca_client_message_template_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb['list_head_txt'] = 'Email templates';
+$wb['template_type_txt'] = 'Message for';
+$wb['template_name_txt'] = 'Template name';
+?>
diff --git a/interface/web/client/lib/lang/ca_client_template.lng b/interface/web/client/lib/lang/ca_client_template.lng
new file mode 100644
index 0000000000..7f63255164
--- /dev/null
+++ b/interface/web/client/lib/lang/ca_client_template.lng
@@ -0,0 +1,117 @@
+<?php
+$wb['limit_client_error_notint'] = 'La limite de sous clients doit être un nombre.';
+$wb['limit_maildomain_txt'] = 'Nombre maximal de domaines d\'emails';
+$wb['limit_mailbox_txt'] = 'Nombre maximal de boites courriel';
+$wb['limit_mailalias_txt'] = 'Nombre maximal d\'alias d\'email';
+$wb['limit_mailforward_txt'] = 'Nombre maximal de routeurs d\'email';
+$wb['limit_mailcatchall_txt'] = 'Nombre maximal de comptes collecteurs';
+$wb['limit_mailrouting_txt'] = 'Nombre maximal de routes d\'emails';
+$wb['limit_mailfilter_txt'] = 'Nombre maximal de filtres d\'emails';
+$wb['limit_fetchmail_txt'] = 'Nombre maximal de comptes récupérateur courriel';
+$wb['limit_mailquota_txt'] = 'Quota des boites courriel';
+$wb['limit_spamfilter_wblist_txt'] = 'Nombre maximal de liste blanches/noires d\'emails';
+$wb['limit_spamfilter_user_txt'] = 'Nombre maximal d\'utilisateurs du filtre antispam';
+$wb['limit_spamfilter_policy_txt'] = 'Nombre maximal de règles du filtre antispam';
+$wb['limit_client_txt'] = 'Nombre maximal de clients';
+$wb['limit_domain_txt'] = 'Nombre maximal de domaines';
+$wb['limit_subdomain_txt'] = 'Nombre maximal de sous-domaines';
+$wb['limit_webquota_txt'] = 'Limite du quota web';
+$wb['limit_database_txt'] = 'Nombre maximal de bases de données.';
+$wb['limit_web_domain_txt'] = 'Nombre maximal de domaines Web';
+$wb['limit_web_aliasdomain_txt'] = 'Nombre maximal d\'alias de domaine';
+$wb['limit_web_subdomain_txt'] = 'Nombre maximal de sous-domaines';
+$wb['limit_ftp_user_txt'] = 'Nombre maximal d\'utilisateurs FTP';
+$wb['limit_dns_zone_txt'] = 'Nombre maximal de zones DNS';
+$wb['limit_dns_record_txt'] = 'Nombre maximal d\'enregistrements DNS';
+$wb['limit_shell_user_txt'] = 'Nombre maximal d\'utilisateurs Shell';
+$wb['limit_maildomain_error_notint'] = 'La limite de domaines d\'email doit être un nombre.';
+$wb['limit_mailbox_error_notint'] = 'La limite de boites d\'email doit être un nombre.';
+$wb['limit_mailalias_error_notint'] = 'La limite d\'alias d\'email doit être un nombre.';
+$wb['limit_mailforward_error_notint'] = 'La limite de routeurs d\'email doit être un nombre.';
+$wb['limit_mailcatchall_error_notint'] = 'La limite de comptes collecteurs doit être un nombre.';
+$wb['limit_mailrouting_error_notint'] = 'La limite de routes d\'email doit être un nombre.';
+$wb['limit_mailfilter_error_notint'] = 'La limite de filtres d\'email doit être un nombre.';
+$wb['limit_mailfetchmail_error_notint'] = 'La limite de comptes récupérateur courriel doit être un nombre.';
+$wb['limit_mailquota_error_notint'] = 'La limite du quota des boites d\'email doit être un nombre.';
+$wb['limit_spamfilter_wblist_error_notint'] = 'La limite de listes blanches/noires du filtre antispam doit être un nombre.';
+$wb['limit_spamfilter_user_error_notint'] = 'La limite d\'utilisateurs du filtre antispam doit être un nombre.';
+$wb['limit_spamfilter_policy_error_notint'] = 'La limite de règles du filtre antispam doit être un nombre.';
+$wb['limit_web_domain_error_notint'] = 'La limite de sites web doit être un nombre.';
+$wb['limit_web_aliasdomain_error_notint'] = 'La limite d\'alias de domaines doit être un nombre.';
+$wb['limit_web_subdomain_error_notint'] = 'La limite de sous-domaines doit être un nombre.';
+$wb['limit_ftp_user_error_notint'] = 'La limite d\'utilisateurs FTP doit être un nombre.';
+$wb['limit_shell_user_error_notint'] = 'La limite d\'utilisateurs Shell doit être un nombre.';
+$wb['limit_dns_zone_error_notint'] = 'La limite d\'enregistrements DNS doit être un nombre.';
+$wb['limit_database_error_notint'] = 'La limite de bases de données doit être un nombre.';
+$wb['error_template_name_empty'] = 'Entrez le nom du modèle.';
+$wb['limit_cron_txt'] = 'Nombre maximal de tâches Cron';
+$wb['limit_cron_type_txt'] = 'Types des tâches Cron';
+$wb['limit_cron_frequency_txt'] = 'Délai minimum entre deux éxécutions';
+$wb['limit_cron_error_notint'] = 'La limite de tâches Cron doit être un nombre.';
+$wb['limit_cron_error_frequency'] = 'La fréquence des tâches Cron doit être un nombre.';
+$wb['limit_mailaliasdomain_txt'] = 'Nombre max. d\'alias de domaine';
+$wb['limit_dns_slave_zone_txt'] = 'Nombre max. de zones DNS secondaires';
+$wb['limit_webdav_user_txt'] = 'Nombre max. d\'utilisateurs Webdav';
+$wb['limit_mailaliasdomain_error_notint'] = 'La limite d\'alias de domaine doit être un nombre.';
+$wb['limit_webdav_user_error_notint'] = 'La limite d\'utilisateurs webdav doit être un nombre.';
+$wb['limit_dns_slave_zone_error_notint'] = 'La limite de zones DNS secondaires doit être un nombre.';
+$wb['limit_dns_record_error_notint'] = 'Le nombre d\'enregistrements DNS limite doit être un nombre.';
+$wb['limit_web_quota_txt'] = 'Quota web';
+$wb['limit_traffic_quota_txt'] = 'Quota de trafic';
+$wb['limit_trafficquota_error_notint'] = 'le quota de trafic doit être un nombre.';
+$wb['template_del_aborted_txt'] = 'Supression annulée. Il y a toujours un client qui a ce gabarit sélectionné.';
+$wb['limit_mailmailinglist_txt'] = 'Nombre max de listes d\'emails';
+$wb['limit_mailmailinglist_error_notint'] = 'La limite de listes d\'emails doit être un nombre.';
+$wb['limit_openvz_vm_txt'] = 'Nombre max de serveurs virtuels';
+$wb['limit_openvz_vm_template_id_txt'] = 'Forcer le modèle de serveur virtuel';
+$wb['limit_openvz_vm_error_notint'] = 'La limite de serveurs virtuels doit être un nombre.';
+$wb['ssh_chroot_txt'] = 'Options SSH-Chroot';
+$wb['web_php_options_txt'] = 'Options PHP';
+$wb['template_type_txt'] = 'Modèle type';
+$wb['template_name_txt'] = 'Nom du modèle';
+$wb['limit_cgi_txt'] = 'CGI autorisé';
+$wb['limit_ssi_txt'] = 'SSI autorisé';
+$wb['limit_perl_txt'] = 'Perl autorisé';
+$wb['limit_ruby_txt'] = 'Ruby autorisé';
+$wb['limit_python_txt'] = 'Python autorisé';
+$wb['force_suexec_txt'] = 'Forcer le SuEXEC';
+$wb['limit_hterror_txt'] = 'Documents d\'erreurs personnalisés autorisés';
+$wb['limit_wildcard_txt'] = 'Sous-domaine joker autorisé';
+$wb['limit_ssl_txt'] = 'SSL autorisé';
+$wb['web_limits_txt'] = 'Limite Web';
+$wb['email_limits_txt'] = 'Limite d\'emails';
+$wb['database_limits_txt'] = 'Limite de bases de données';
+$wb['cron_job_limits_txt'] = 'Limite de tâches CRON';
+$wb['dns_limits_txt'] = 'Limite DNS';
+$wb['virtualization_limits_txt'] = 'Limite de virtualisations';
+$wb['aps_limits_txt'] = 'Limite d\'installeurs APS';
+$wb['limit_aps_txt'] = 'Nombre max d\'instances APS';
+$wb['limit_aps_error_notint'] = 'La limite d\'instances APS doit être un nombre.';
+$wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
+$wb['client_limits_txt'] = 'Client Limits';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['limit_backup_txt'] = 'Backupfunction available';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['dns_servers_txt'] = 'DNS servers';
+?>
diff --git a/interface/web/client/lib/lang/ca_client_template_list.lng b/interface/web/client/lib/lang/ca_client_template_list.lng
new file mode 100644
index 0000000000..b5315018d2
--- /dev/null
+++ b/interface/web/client/lib/lang/ca_client_template_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['list_head_txt'] = 'Modèles de clients';
+$wb['template_type_txt'] = 'Type';
+$wb['template_name_txt'] = 'Nom du modèle';
+$wb['template_id_txt'] = 'ID du modèle';
+?>
diff --git a/interface/web/client/lib/lang/ca_clients_list.lng b/interface/web/client/lib/lang/ca_clients_list.lng
new file mode 100644
index 0000000000..e3503f39c5
--- /dev/null
+++ b/interface/web/client/lib/lang/ca_clients_list.lng
@@ -0,0 +1,11 @@
+<?php
+$wb['list_head_txt'] = 'Clients';
+$wb['client_id_txt'] = 'ID';
+$wb['company_name_txt'] = 'Nom de l\'entreprise';
+$wb['contact_name_txt'] = 'Nom du contact';
+$wb['city_txt'] = 'Ville';
+$wb['country_txt'] = 'Pays';
+$wb['add_new_record_txt'] = 'Ajouter un nouveau client';
+$wb['username_txt'] = 'Nom d\'utilisateur';
+$wb['customer_no_txt'] = 'Numéro client';
+?>
diff --git a/interface/web/client/lib/lang/ca_domain.lng b/interface/web/client/lib/lang/ca_domain.lng
new file mode 100644
index 0000000000..f94d21bbe5
--- /dev/null
+++ b/interface/web/client/lib/lang/ca_domain.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['domain_error_empty'] = 'Le nom de domaine est vide';
+$wb['domain_error_unique'] = 'Ce nom de domaine existe déjà';
+$wb['domain_error_regex'] = 'Ce nom de domaine n\'est pas autorisé';
+$wb['Domain'] = 'Domaine';
+?>
diff --git a/interface/web/client/lib/lang/ca_domain_list.lng b/interface/web/client/lib/lang/ca_domain_list.lng
new file mode 100644
index 0000000000..c97fd296e0
--- /dev/null
+++ b/interface/web/client/lib/lang/ca_domain_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['list_head_txt'] = 'Domaines';
+$wb['add_new_record_txt'] = 'Ajouter nouveau Domaine';
+$wb['domain_txt'] = 'Domaine';
+$wb['user_txt'] = 'Client';
+?>
diff --git a/interface/web/client/lib/lang/ca_reseller.lng b/interface/web/client/lib/lang/ca_reseller.lng
new file mode 100644
index 0000000000..62da031ea8
--- /dev/null
+++ b/interface/web/client/lib/lang/ca_reseller.lng
@@ -0,0 +1,199 @@
+<?php
+$wb['limit_maildomain_txt'] = 'Nombre maximal de domaines d\'emails';
+$wb['limit_mailbox_txt'] = 'Nombre maximal de boites courriel';
+$wb['limit_mailalias_txt'] = 'Nombre maximal d\'alias d\'email';
+$wb['limit_mailforward_txt'] = 'Nombre maximal de routeurs d\'email';
+$wb['limit_mailcatchall_txt'] = 'Nombre maximal de comptes collecteurs';
+$wb['limit_mailrouting_txt'] = 'Nombre maximal de routes d\'emails';
+$wb['limit_mailfilter_txt'] = 'Nombre maximal de filtres d\'emails';
+$wb['limit_fetchmail_txt'] = 'Nombre maximal de comptes récupérateur courriel';
+$wb['limit_mailquota_txt'] = 'Quota des boites courriel';
+$wb['limit_spamfilter_wblist_txt'] = 'Nombre maximal de liste blanches/noires d\'emails';
+$wb['limit_spamfilter_user_txt'] = 'Nombre maximal d\'utilisateurs du filtre antispam';
+$wb['limit_spamfilter_policy_txt'] = 'Nombre maximal de règles du filtre antispam';
+$wb['default_mailserver_txt'] = 'Serveur mail par défaut';
+$wb['company_name_txt'] = 'Nom de l\'entreprise';
+$wb['contact_name_txt'] = 'Nom de contact';
+$wb['username_txt'] = 'Nom d\'utilisateur';
+$wb['password_txt'] = 'Mot de passe';
+$wb['password_strength_txt'] = 'Force du mot de passe';
+$wb['language_txt'] = 'Langue';
+$wb['usertheme_txt'] = 'Thème';
+$wb['street_txt'] = 'Rue';
+$wb['zip_txt'] = 'Code Postal';
+$wb['city_txt'] = 'Ville';
+$wb['state_txt'] = 'Etat';
+$wb['country_txt'] = 'Pays';
+$wb['telephone_txt'] = 'Numéro de téléphone';
+$wb['mobile_txt'] = 'Numéro de Mobile';
+$wb['fax_txt'] = 'Fax';
+$wb['email_txt'] = 'Courriel';
+$wb['internet_txt'] = 'Adresse Web';
+$wb['icq_txt'] = 'ICQ';
+$wb['notes_txt'] = 'Notes';
+$wb['company_txt'] = 'Entreprise';
+$wb['title_txt'] = 'Titre';
+$wb['firstname_txt'] = 'Prénom';
+$wb['surname_txt'] = 'Nom';
+$wb['limit_domain_txt'] = 'Nombre maximal de domaines';
+$wb['limit_subdomain_txt'] = 'Nombre maximal de sous-domaines';
+$wb['limit_webquota_txt'] = 'Limite du quota web';
+$wb['limit_database_txt'] = 'Nombre maximal de bases de données';
+$wb['limit_cron_txt'] = 'Nombre maximal de tâches cron';
+$wb['limit_cron_type_txt'] = 'Types des tâches cron';
+$wb['limit_cron_frequency_txt'] = 'Délai minimum entre deux exécutions';
+$wb['ip_address_txt'] = 'Adresse IP';
+$wb['limit_client_error_notint'] = 'La limite de sous-clients doit être un nombre.';
+$wb['firstname_error_empty'] = 'Le prénom est vide.';
+$wb['contact_error_empty'] = 'Le nom de contact est vide.';
+$wb['default_webserver_txt'] = 'Serveur Web par défaut';
+$wb['limit_web_domain_txt'] = 'Nombre maximal de domaines Web';
+$wb['limit_web_aliasdomain_txt'] = 'Nombre maximal d\'alias de domaines';
+$wb['limit_web_subdomain_txt'] = 'Nombre maximal de sous-domaines';
+$wb['limit_ftp_user_txt'] = 'Nombre maximal d\'utilisateurs FTP';
+$wb['default_dnsserver_txt'] = 'Serveur DNS par défaut';
+$wb['limit_dns_zone_txt'] = 'Nombre maximal de zones DNS';
+$wb['limit_dns_record_txt'] = 'Nombre maximal d\'enregistrements DNS';
+$wb['limit_shell_user_txt'] = 'Nombre maximal d\'utilisateurs Shell';
+$wb['limit_client_txt'] = 'Nombre maximal de clients';
+$wb['username_error_empty'] = 'Le nom d\'utilisateur est vide.';
+$wb['username_error_unique'] = 'Le nom d\'utilisateur existe déja.';
+$wb['limit_maildomain_error_notint'] = 'La limite de domaines d\'email doit être un nombre.';
+$wb['limit_mailbox_error_notint'] = 'La limite de boites d\'email doit être un nombre.';
+$wb['limit_mailalias_error_notint'] = 'La limite d\'alias d\'email doit être un nombre.';
+$wb['limit_mailforward_error_notint'] = 'La limite de routeurs d\'email doit être un nombre.';
+$wb['limit_mailcatchall_error_notint'] = 'La limite de comptes collecteurs doit être un nombre.';
+$wb['limit_mailrouting_error_notint'] = 'La limite de routes d\'email doit être un nombre.';
+$wb['limit_mailfilter_error_notint'] = 'La limite de filtres d\'email doit être un nombre.';
+$wb['limit_mailfetchmail_error_notint'] = 'La limite de comptes récupérateur courriel doit être un nombre.';
+$wb['limit_mailquota_error_notint'] = 'La limite du quota des boites d\'email doit être un nombre.';
+$wb['limit_spamfilter_wblist_error_notint'] = 'La limite de listes blanches/noires du filtre antispam doit être un nombre.';
+$wb['limit_spamfilter_user_error_notint'] = 'La limite d\'utilisateurs du filtre antispam doit être un nombre.';
+$wb['limit_spamfilter_policy_error_notint'] = 'La limite de règles du filtre antispam doit être un nombre.';
+$wb['limit_web_domain_error_notint'] = 'La limite de sites web doit être un nombre.';
+$wb['limit_web_aliasdomain_error_notint'] = 'La limite d\'alias de domaines doit être un nombre.';
+$wb['limit_web_subdomain_error_notint'] = 'La limite de sous-domaines doit être un nombre.';
+$wb['limit_ftp_user_error_notint'] = 'La limite d\'utilisateurs FTP doit être un nombre.';
+$wb['limit_shell_user_error_notint'] = 'La limite d\'utilisateurs Shell doit être un nombre.';
+$wb['limit_dns_zone_error_notint'] = 'La limite d\'enregistrements DNS doit être un nombre.';
+$wb['default_dbserver_txt'] = 'Serveur de bases de données par défaut';
+$wb['limit_database_error_notint'] = 'La limite de bases de données doit être un nombre.';
+$wb['limit_cron_error_notint'] = 'La limite de tâches Cron doit être un nombre.';
+$wb['limit_cron_error_frequency'] = 'La fréquence des tâches Cron doit être un nombre.';
+$wb['username_error_regex'] = 'Le nom d\'utilisateur contient des caractères invalides.';
+$wb['template_master_txt'] = 'Modèle Maître';
+$wb['template_additional_txt'] = 'Modèle additionnel';
+$wb['ssh_chroot_txt'] = 'Options Chroot SSH';
+$wb['web_php_options_txt'] = 'Options PHP';
+$wb['limit_client_error'] = 'Le nombre maximum de client a été atteint.';
+$wb['limit_dns_slave_zone_txt'] = 'Nombre maximum de zones DNS secondaire';
+$wb['limit_dns_slave_zone_error_notint'] = 'La limite de zones DNS secondaire doit être un nombre';
+$wb['limit_dns_record_error_notint'] = 'Le nombre maximum d\'enregistrements DNS doit être un nombre.';
+$wb['limit_web_quota_txt'] = 'Quota web';
+$wb['limit_traffic_quota_txt'] = 'Quota de trafic';
+$wb['limit_trafficquota_error_notint'] = 'Le quota de trafic doit être un nombre.';
+$wb['customer_no_txt'] = 'No. Client';
+$wb['vat_id_txt'] = 'Numéro de TVA';
+$wb['required_fields_txt'] = '* Champs requis';
+$wb['limit_mailaliasdomain_txt'] = 'Nombre max d\'alias de domaine';
+$wb['limit_webdav_user_txt'] = 'Nombre max d\'utilisateurs Webdav';
+$wb['limit_webdav_user_error_notint'] = 'La limite d\'utilisateurs Webdav doit être un nombre.';
+$wb['limit_mailmailinglist_txt'] = 'Nombre max de listes d\'emails';
+$wb['limit_mailmailinglist_error_notint'] = 'La limite d\'enregistrement de liste d\'emails doit être un nombre.';
+$wb['limit_openvz_vm_txt'] = 'Nombre max de serveurs virtuels.';
+$wb['limit_openvz_vm_template_id_txt'] = 'Forcer le modèle de serveur virtuel.';
+$wb['limit_openvz_vm_error_notint'] = 'La limite de serveurs virtuels doit être un nombre.';
+$wb['web_php_options_notempty'] = 'Aucune option PHP choisie. Selectionnez au moins une option PHP.';
+$wb['ssh_chroot_notempty'] = 'Aucune option SSH chroot choisie. Selectionnez au moins une option SSH.';
+$wb['username_error_collision'] = 'Le nom d\'utilisateur ne devrait pas commencer par le mot -web- ou -web- suivi d\'un nombre.';
+$wb['add_additional_template_txt'] = 'Ajouter un modèle';
+$wb['delete_additional_template_txt'] = 'Supprimer un modèle';
+$wb['limit_cgi_txt'] = 'CGI autorisé';
+$wb['limit_ssi_txt'] = 'SSI autorisé';
+$wb['limit_perl_txt'] = 'Perl autorisé';
+$wb['limit_ruby_txt'] = 'Ruby autorisé';
+$wb['limit_python_txt'] = 'Python autorisé';
+$wb['force_suexec_txt'] = 'SuEXEC forcé';
+$wb['limit_hterror_txt'] = 'Documents d\'erreurs personnalisés autorisés';
+$wb['limit_wildcard_txt'] = 'Sous-domaine Joker autorisé';
+$wb['limit_ssl_txt'] = 'SSL autorisé';
+$wb['web_limits_txt'] = 'Limites Web';
+$wb['email_limits_txt'] = 'Limites courriels';
+$wb['database_limits_txt'] = 'Limites de bases de données';
+$wb['cron_job_limits_txt'] = 'Limites de tâches CRON';
+$wb['dns_limits_txt'] = 'Limites DNS';
+$wb['virtualization_limits_txt'] = 'Limites de virtualisation';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Répétez le mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['email_error_isemail'] = 'Saisissez une adresse courriel valide.';
+$wb['customer_no_error_unique'] = 'Le numéro de client doit être unique (ou vide).';
+$wb['paypal_email_error_isemail'] = 'Saisissez un compte Paypal valide.';
+$wb['paypal_email_txt'] = 'Compte Paypal';
+$wb['company_id_txt'] = 'ID entreprise/dirigeant';
+$wb['bank_account_number_txt'] = 'Numéro de compte bancaire';
+$wb['bank_account_owner_txt'] = 'Titulaire du compte bancaire';
+$wb['bank_code_txt'] = 'Code banque';
+$wb['bank_name_txt'] = 'Nom de la banque';
+$wb['bank_account_iban_txt'] = 'IBAN';
+$wb['bank_account_swift_txt'] = 'BIC / Swift';
+$wb['aps_limits_txt'] = 'Limites d\'installeur APS';
+$wb['limit_aps_txt'] = 'Nombre max d\'instances APS';
+$wb['limit_aps_error_notint'] = 'La limite d\'instances APS doit être un nombre.';
+$wb['default_slave_dnsserver_txt'] = 'Serveur DNS secondaire par défaut';
+$wb['locked_txt'] = 'Locked';
+$wb['canceled_txt'] = 'Canceled';
+$wb['gender_m_txt'] = 'Mr.';
+$wb['gender_f_txt'] = 'Mme';
+$wb['gender_txt'] = 'Genre';
+$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['added_by_txt'] = 'Ajouté par';
+$wb['added_date_txt'] = 'Ajouté le';
+$wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
+$wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
+$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.';
+$wb['contact_firstname_txt'] = 'Contact firstname';
+$wb['limit_backup_txt'] = 'Backupfunction available';
+$wb['limit_client_error_positive_or_unlimited'] = 'The number of clients must be > 0 or -1 (unlimited)';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select Webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before to remove it.';
+$wb['dns_servers_txt'] = 'DNS Server';
+$wb['dns_servers_placeholder'] = 'Select DNS Servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before to remove it.';
+$wb['db_servers_txt'] = 'Database Server';
+$wb['db_servers_placeholder'] = 'Select Database Servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before to remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select Mailservers';
+$wb['no_mail_server_error'] = 'At least one Mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before to remove it.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['email_error_empty'] = 'Email is empty';
+?>
diff --git a/interface/web/client/lib/lang/ca_resellers_list.lng b/interface/web/client/lib/lang/ca_resellers_list.lng
new file mode 100644
index 0000000000..b477e47314
--- /dev/null
+++ b/interface/web/client/lib/lang/ca_resellers_list.lng
@@ -0,0 +1,11 @@
+<?php
+$wb['list_head_txt'] = 'Revendeurs';
+$wb['client_id_txt'] = 'ID';
+$wb['company_name_txt'] = 'Nom de l\'entreprise';
+$wb['contact_name_txt'] = 'Nom du contact';
+$wb['city_txt'] = 'Ville';
+$wb['country_txt'] = 'Pays';
+$wb['add_new_record_txt'] = 'Ajouter un nouveau revendeur';
+$wb['customer_no_txt'] = 'Revendeur No.';
+$wb['username_txt'] = 'Nom d\'utilisateur';
+?>
diff --git a/interface/web/client/lib/lang/cz.lng b/interface/web/client/lib/lang/cz.lng
index 264c8e4a36..954a9c9add 100644
--- a/interface/web/client/lib/lang/cz.lng
+++ b/interface/web/client/lib/lang/cz.lng
@@ -23,6 +23,6 @@ $wb['error_domain_in mailuse'] = 'Tato doména nelze odstranit, protože je v po
 $wb['error_domain_in webuse'] = 'Tato doména nelze odstranit, protože je v používána jako webová doména';
 $wb['error_client_can_not_add_domain'] = 'Nemůžete přidat novou doménu';
 $wb['error_client_group_id_empty'] = 'Musíte vybrat zákazníka<br>';
+$wb['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
+$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng
index 0d94e700db..d7ec73d34b 100644
--- a/interface/web/client/lib/lang/cz_client.lng
+++ b/interface/web/client/lib/lang/cz_client.lng
@@ -155,7 +155,43 @@ $wb['added_by_txt'] = 'Kdo vytvořil účet';
 $wb['added_date_txt'] = 'Datum vytvoření účtu';
 $wb['parent_client_id_txt'] = 'Přiřazení klienta k distributorovi (prodejci)';
 $wb['none_txt'] = 'Žádný';
-$wb["email_error_empty"] = "Email is empty";
+$wb['email_error_empty'] = 'Email is empty';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.';
+$wb['dns_servers_txt'] = 'DNS servers';
+$wb['dns_servers_placeholder'] = 'Select DNS servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.';
+$wb['db_servers_txt'] = 'Database servers';
+$wb['db_servers_placeholder'] = 'Select database servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select mailservers';
+$wb['no_mail_server_error'] = 'At least one mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['reseller_txt'] = 'Reseller';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/cz_client_circle.lng b/interface/web/client/lib/lang/cz_client_circle.lng
index cb4b143b11..f26e2d6d4b 100644
--- a/interface/web/client/lib/lang/cz_client_circle.lng
+++ b/interface/web/client/lib/lang/cz_client_circle.lng
@@ -7,5 +7,3 @@ $wb['client_ids_txt'] = 'Klienti/Distributoři';
 $wb['description_txt'] = 'Popis';
 $wb['active_txt'] = 'Aktivní';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/cz_client_circle_list.lng b/interface/web/client/lib/lang/cz_client_circle_list.lng
index 24025510de..e827605400 100644
--- a/interface/web/client/lib/lang/cz_client_circle_list.lng
+++ b/interface/web/client/lib/lang/cz_client_circle_list.lng
@@ -8,5 +8,3 @@ $wb['filter_txt'] = 'Filtr';
 $wb['delete_txt'] = 'Smazat';
 $wb['active_txt'] = 'Aktivní';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/cz_client_del.lng b/interface/web/client/lib/lang/cz_client_del.lng
index fc13ffbeee..5374ea6f75 100644
--- a/interface/web/client/lib/lang/cz_client_del.lng
+++ b/interface/web/client/lib/lang/cz_client_del.lng
@@ -5,5 +5,3 @@ $wb['btn_save_txt'] = 'Smazat klienta';
 $wb['btn_cancel_txt'] = 'Zrušit bez smazání klienta';
 $wb['confirm_client_delete_txt'] = 'Jste si jisti, že chcete smazat tohoto klienta ?';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/cz_client_message.lng b/interface/web/client/lib/lang/cz_client_message.lng
index 47ea23f356..3710cbd254 100644
--- a/interface/web/client/lib/lang/cz_client_message.lng
+++ b/interface/web/client/lib/lang/cz_client_message.lng
@@ -18,5 +18,3 @@ $wb['variables_txt'] = 'Výběr (možnosti):';
 $wb['gender_m_txt'] = 'Pan';
 $wb['gender_f_txt'] = 'Paní';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/cz_client_message_template.lng b/interface/web/client/lib/lang/cz_client_message_template.lng
index 8ccc6f4d94..b5e0b73039 100644
--- a/interface/web/client/lib/lang/cz_client_message_template.lng
+++ b/interface/web/client/lib/lang/cz_client_message_template.lng
@@ -9,5 +9,3 @@ $wb['variables_txt'] = 'Proměnné';
 $wb['variables_description_txt'] = 'Proměnné uživatelské jméno a heslo jsou k dispozici (funkční) jako volba pouze v uvítacím e-mailu.';
 $wb['duplicate_welcome_error'] = 'There can be only one default welcome email template. Please edit the existing template instead of adding a new one.';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/cz_client_message_template_list.lng b/interface/web/client/lib/lang/cz_client_message_template_list.lng
index c6674975bd..d4c2f63857 100644
--- a/interface/web/client/lib/lang/cz_client_message_template_list.lng
+++ b/interface/web/client/lib/lang/cz_client_message_template_list.lng
@@ -3,5 +3,3 @@ $wb['list_head_txt'] = 'E-mailové šablony';
 $wb['template_type_txt'] = 'Zpráva pro';
 $wb['template_name_txt'] = 'Název šablony';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/cz_client_template.lng b/interface/web/client/lib/lang/cz_client_template.lng
index b058088e10..0113d721da 100644
--- a/interface/web/client/lib/lang/cz_client_template.lng
+++ b/interface/web/client/lib/lang/cz_client_template.lng
@@ -90,6 +90,28 @@ $wb['limit_aps_txt'] = 'Max. počet APS instalací';
 $wb['limit_aps_error_notint'] = 'Limit pro APS instalace musí být číslo.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Klientské limity';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['dns_servers_txt'] = 'DNS servers';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/cz_client_template_list.lng b/interface/web/client/lib/lang/cz_client_template_list.lng
index 72ac07f593..3abbd09adc 100644
--- a/interface/web/client/lib/lang/cz_client_template_list.lng
+++ b/interface/web/client/lib/lang/cz_client_template_list.lng
@@ -4,5 +4,3 @@ $wb['template_type_txt'] = 'Typ';
 $wb['template_name_txt'] = 'Název šablony';
 $wb['template_id_txt'] = 'ID šablony';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/cz_clients_list.lng b/interface/web/client/lib/lang/cz_clients_list.lng
index ffd1b8e82a..9657cb71e8 100644
--- a/interface/web/client/lib/lang/cz_clients_list.lng
+++ b/interface/web/client/lib/lang/cz_clients_list.lng
@@ -9,5 +9,3 @@ $wb['add_new_record_txt'] = 'Přidat klienta';
 $wb['username_txt'] = 'Uživatelské jméno';
 $wb['customer_no_txt'] = 'Zákaznické číslo';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/cz_domain.lng b/interface/web/client/lib/lang/cz_domain.lng
index 410243de85..08b113fc4d 100644
--- a/interface/web/client/lib/lang/cz_domain.lng
+++ b/interface/web/client/lib/lang/cz_domain.lng
@@ -4,5 +4,3 @@ $wb['domain_error_unique'] = 'Doména již existuje';
 $wb['domain_error_regex'] = 'Toto doménové jméno je zakázáno';
 $wb['Domain'] = 'Doména';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/cz_domain_list.lng b/interface/web/client/lib/lang/cz_domain_list.lng
index 9b52d04ddd..6cf7376bd4 100644
--- a/interface/web/client/lib/lang/cz_domain_list.lng
+++ b/interface/web/client/lib/lang/cz_domain_list.lng
@@ -4,5 +4,3 @@ $wb['add_new_record_txt'] = 'Přidat novou doménu';
 $wb['domain_txt'] = 'Doména';
 $wb['user_txt'] = 'Klient';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng
index 7d19b28f6c..1e0e479b67 100644
--- a/interface/web/client/lib/lang/cz_reseller.lng
+++ b/interface/web/client/lib/lang/cz_reseller.lng
@@ -160,9 +160,40 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Klientské limity';
 $wb['err_msg_master_tpl_set'] = 'Nelze nastavit vlastní limity, pokud chtete nastavit vlatní limity musí být \\"hlavní šablona\\" nastavena na volbu \\"Custom\\".';
-$wb["btn_save_txt"] = "Save";
-$wb["btn_cancel_txt"] = "Cancel";
-$wb["email_error_empty"] = "Email is empty";
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['email_error_empty'] = 'Email is empty';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select Webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before to remove it.';
+$wb['dns_servers_txt'] = 'DNS Server';
+$wb['dns_servers_placeholder'] = 'Select DNS Servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before to remove it.';
+$wb['db_servers_txt'] = 'Database Server';
+$wb['db_servers_placeholder'] = 'Select Database Servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before to remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select Mailservers';
+$wb['no_mail_server_error'] = 'At least one Mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before to remove it.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/cz_resellers_list.lng b/interface/web/client/lib/lang/cz_resellers_list.lng
index fb23672a88..8e72797b4d 100644
--- a/interface/web/client/lib/lang/cz_resellers_list.lng
+++ b/interface/web/client/lib/lang/cz_resellers_list.lng
@@ -9,5 +9,3 @@ $wb['add_new_record_txt'] = 'Přidat distributora';
 $wb['customer_no_txt'] = 'Zákaznické číslo';
 $wb['username_txt'] = 'Uživatelské jméno';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/de.lng b/interface/web/client/lib/lang/de.lng
index bdff0bb30e..70eb1f24ae 100644
--- a/interface/web/client/lib/lang/de.lng
+++ b/interface/web/client/lib/lang/de.lng
@@ -23,4 +23,6 @@ $wb['error_domain_in mailuse'] = 'Diese Domain kann nicht gelöscht werden, weil
 $wb['error_domain_in webuse'] = 'Diese Domain kann nicht gelöscht werden, weil sie als Webdomain verwendet wird';
 $wb['error_client_can_not_add_domain'] = 'Sie können keine neue Domain anlegen';
 $wb['error_client_group_id_empty'] = 'Sie müssen ein Benutzerdefiniertes auswählen<br>';
+$wb['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
+$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
 ?>
diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng
index a0afc87e4a..45c6eb910a 100644
--- a/interface/web/client/lib/lang/de_client.lng
+++ b/interface/web/client/lib/lang/de_client.lng
@@ -151,20 +151,20 @@ $wb['canceled_txt'] = 'Gek&uuml;ndigt (verhindert Kundenlogin)';
 $wb['gender_txt'] = 'Anrede';
 $wb['gender_m_txt'] = 'Herr';
 $wb['gender_f_txt'] = 'Frau';
-$wb["web_servers_txt"] = 'Webserver';
-$wb["web_servers_placeholder"] = 'Webserver auswählen';
+$wb['web_servers_txt'] = 'Webserver';
+$wb['web_servers_placeholder'] = 'Webserver auswählen';
 $wb['no_web_server_error'] = 'Bitte wählen Sie mind. einen Webserver aus.';
 $wb['web_servers_used'] = 'Der Server, den Sie entfernen möchten, wird als Webserver verwendet. Bitte stellen Sie sicher, daß dieser Server nicht von diesem Kunden benutzt wird, bevor Sie ihn entfernen.';
-$wb["dns_servers_txt"] = 'DNS-Server';
-$wb["dns_servers_placeholder"] = 'DNS-Server wählen';
+$wb['dns_servers_txt'] = 'DNS-Server';
+$wb['dns_servers_placeholder'] = 'DNS-Server wählen';
 $wb['no_dns_server_error'] = 'Bitte wählen Sie mind. einen DNS-Server aus.';
 $wb['dns_servers_used'] = 'Der Server, den Sie entfernen möchten, wird als DNS-Server verwendet. Bitte stellen Sie sicher, daß dieser Server nicht von diesem Kunden benutzt wird, bevor Sie ihn entfernen.';
-$wb["db_servers_txt"] = 'Datenbank-Server';
-$wb["db_servers_placeholder"] = 'Datenbank-Server wählen';
+$wb['db_servers_txt'] = 'Datenbank-Server';
+$wb['db_servers_placeholder'] = 'Datenbank-Server wählen';
 $wb['no_db_server_error'] = 'Bitte wählen Sie mind. einen Datenbank-Server aus.';
 $wb['db_servers_used'] = 'Der Server, den Sie entfernen möchten, wird als Datenbank-Server verwendet. Bitte stellen Sie sicher, daß dieser Server nicht von diesem Kunden benutzt wird, bevor Sie ihn entfernen.';
-$wb["mail_servers_txt"] = 'Mailserver';
-$wb["mail_servers_placeholder"] = 'Mailserver wählen';
+$wb['mail_servers_txt'] = 'Mailserver';
+$wb['mail_servers_placeholder'] = 'Mailserver wählen';
 $wb['no_mail_server_error'] = 'Bitte wählen Sie mind. einen Mailserver aus.';
 $wb['mail_servers_used'] = 'Der Server, den Sie entfernen möchten, wird als Mailserver verwendet. Bitte stellen Sie sicher, daß dieser Server nicht von diesem Kunden benutzt wird, bevor Sie ihn entfernen.';
 $wb['added_by_txt'] = 'Added by';
@@ -177,5 +177,21 @@ $wb['reseller_txt'] = 'Reseller';
 $wb['btn_save_txt'] = 'Speichern';
 $wb['btn_cancel_txt'] = 'Abbrechen';
 $wb['invalid_vat_id'] = 'Die USt.-ID ist ungültig.';
-$wb["email_error_empty"] = "Email ist leer";
+$wb['email_error_empty'] = 'Email ist leer';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
 ?>
diff --git a/interface/web/client/lib/lang/de_client_template.lng b/interface/web/client/lib/lang/de_client_template.lng
index 1fbd0ab3b7..37f85fe8f1 100644
--- a/interface/web/client/lib/lang/de_client_template.lng
+++ b/interface/web/client/lib/lang/de_client_template.lng
@@ -90,4 +90,28 @@ $wb['limit_aps_txt'] = 'Max. Anzahl an APS-Instanzen';
 $wb['limit_aps_error_notint'] = 'Das APS Instanzen Limit muss eine Zahl sein.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['dns_servers_txt'] = 'DNS servers';
 ?>
diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng
index f6b0224263..43deed8803 100644
--- a/interface/web/client/lib/lang/de_reseller.lng
+++ b/interface/web/client/lib/lang/de_reseller.lng
@@ -161,7 +161,39 @@ $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $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.';
 $wb['invalid_vat_id'] = 'Die USt.-ID ist ungültig.';
-$wb["btn_save_txt"] = "Speichern";
-$wb["btn_cancel_txt"] = "Abbrechen";
-$wb["email_error_empty"] = "Email ist leer";
+$wb['btn_save_txt'] = 'Speichern';
+$wb['btn_cancel_txt'] = 'Abbrechen';
+$wb['email_error_empty'] = 'Email ist leer';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select Webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before to remove it.';
+$wb['dns_servers_txt'] = 'DNS Server';
+$wb['dns_servers_placeholder'] = 'Select DNS Servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before to remove it.';
+$wb['db_servers_txt'] = 'Database Server';
+$wb['db_servers_placeholder'] = 'Select Database Servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before to remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select Mailservers';
+$wb['no_mail_server_error'] = 'At least one Mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before to remove it.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
 ?>
diff --git a/interface/web/client/lib/lang/el.lng b/interface/web/client/lib/lang/el.lng
index ee9e354197..01a54bfed8 100644
--- a/interface/web/client/lib/lang/el.lng
+++ b/interface/web/client/lib/lang/el.lng
@@ -23,4 +23,6 @@ $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['Templates'] = 'Templates';
 $wb['Limit-Templates'] = 'Limit-Templates';
+$wb['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
+$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
 ?>
diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng
index 0ad8f865d2..6e4adbfcce 100644
--- a/interface/web/client/lib/lang/el_client.lng
+++ b/interface/web/client/lib/lang/el_client.lng
@@ -155,5 +155,43 @@ $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["email_error_empty"] = "Email is empty";
+$wb['email_error_empty'] = 'Email is empty';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.';
+$wb['dns_servers_txt'] = 'DNS servers';
+$wb['dns_servers_placeholder'] = 'Select DNS servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.';
+$wb['db_servers_txt'] = 'Database servers';
+$wb['db_servers_placeholder'] = 'Select database servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select mailservers';
+$wb['no_mail_server_error'] = 'At least one mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['reseller_txt'] = 'Reseller';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/el_client_template.lng b/interface/web/client/lib/lang/el_client_template.lng
index 5c9917c245..1959cbd608 100644
--- a/interface/web/client/lib/lang/el_client_template.lng
+++ b/interface/web/client/lib/lang/el_client_template.lng
@@ -90,4 +90,28 @@ $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['dns_servers_txt'] = 'DNS servers';
 ?>
diff --git a/interface/web/client/lib/lang/el_reseller.lng b/interface/web/client/lib/lang/el_reseller.lng
index 11f1de4d2b..f1c1cb8f98 100644
--- a/interface/web/client/lib/lang/el_reseller.lng
+++ b/interface/web/client/lib/lang/el_reseller.lng
@@ -160,7 +160,40 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $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.';
-$wb["btn_save_txt"] = "Save";
-$wb["btn_cancel_txt"] = "Cancel";
-$wb["email_error_empty"] = "Email is empty";
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['email_error_empty'] = 'Email is empty';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select Webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before to remove it.';
+$wb['dns_servers_txt'] = 'DNS Server';
+$wb['dns_servers_placeholder'] = 'Select DNS Servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before to remove it.';
+$wb['db_servers_txt'] = 'Database Server';
+$wb['db_servers_placeholder'] = 'Select Database Servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before to remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select Mailservers';
+$wb['no_mail_server_error'] = 'At least one Mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before to remove it.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/es.lng b/interface/web/client/lib/lang/es.lng
index e50e62954c..d15c24a822 100644
--- a/interface/web/client/lib/lang/es.lng
+++ b/interface/web/client/lib/lang/es.lng
@@ -5,7 +5,6 @@ $wb['Limits'] = 'Límites';
 $wb['Add Client'] = 'Añadir cliente';
 $wb['Edit Client'] = 'Editar cliente';
 $wb['Clients'] = 'Clientes';
-$wb['Email-Templates'] = 'Plantillas de correo';
 $wb['Add Reseller'] = 'Añadir revendedor';
 $wb['Edit Reseller'] = 'Editar revendedor';
 $wb['Resellers'] = 'Revendedores';
@@ -24,4 +23,6 @@ $wb['error_client_can_not_add_domain'] = 'No puede añadir un nuevo dominio';
 $wb['error_client_group_id_empty'] = 'Debe seleccionar un cliente<br>';
 $wb['Templates'] = 'Plantillas';
 $wb['Limit-Templates'] = 'Plantillas delimitadoras';
+$wb['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
+$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
 ?>
diff --git a/interface/web/client/lib/lang/es_client.lng b/interface/web/client/lib/lang/es_client.lng
index cf9c5fa9a7..10bf55272f 100644
--- a/interface/web/client/lib/lang/es_client.lng
+++ b/interface/web/client/lib/lang/es_client.lng
@@ -33,45 +33,42 @@ $wb['fax_txt'] = 'Fax';
 $wb['email_txt'] = 'Correo';
 $wb['internet_txt'] = 'Internet';
 $wb['icq_txt'] = 'ICQ';
-$wb['company_id_txt'] = 'ID de Empresa';
+$wb['company_id_txt'] = 'ID de Compañía/Empresario';
 $wb['notes_txt'] = 'Notas';
 $wb['company_txt'] = 'Compañía';
 $wb['title_txt'] = 'Título';
 $wb['firstname_txt'] = 'Nombre';
-$wb['limit_cron_txt'] = 'Número máximo de tareas cron';
-$wb['limit_cron_type_txt'] = 'Tipo máximo de tareas cron (chrooted y full implican URL)';
-$wb['limit_cron_frequency_txt'] = 'Espera mínima entre ejecuciones';
-$wb['limit_cron_error_notint'] = 'El límite de tareas cron debe ser un número.';
-$wb['limit_cron_error_frequency'] = 'El límite de la frecuencia de cron debe ser un número.';
-$wb['limit_client_error'] = 'Se ha alcanzado el número máximo de clientes.';
+$wb['limit_cron_txt'] = 'Cantidad max. de cron jobs';
+$wb['limit_cron_type_txt'] = 'Tipo de cron job permitido (chrooted y/o url completa)';
+$wb['limit_cron_frequency_txt'] = 'Retraso en min. entre ejecuciones';
+$wb['limit_cron_error_notint'] = 'El límite de cron debe ser un número.';
+$wb['limit_cron_error_frequency'] = 'El límite de frecuencia cron debe ser un número.';
+$wb['limit_client_error'] = 'Ha alcanzado el número máx. de clientes.';
 $wb['limit_mailaliasdomain_error_notint'] = 'El límite de alias de dominio de correo debe ser un número.';
-$wb['limit_web_quota_txt'] = 'Cuota Web';
-$wb['limit_traffic_quota_txt'] = 'Cuota de Tráfico';
-$wb['limit_trafficquota_error_notint'] = 'Cuota de Tráfico debe ser un número.';
-$wb['limit_webdav_user_txt'] = 'Numero máximo de usuarios Webdav';
-$wb['limit_webdav_user_error_notint'] = 'El límite de usuarios Webdav debe ser un número.';
+$wb['limit_web_quota_txt'] = 'Cuota para web';
+$wb['limit_traffic_quota_txt'] = 'Cuota de tráfico';
+$wb['limit_trafficquota_error_notint'] = 'La cuota de tráfico debe ser un número.';
+$wb['limit_webdav_user_txt'] = 'Cantidad max. de usuarios Webdav';
+$wb['limit_webdav_user_error_notint'] = 'El límite de usuarios webdav debe ser un número.';
 $wb['limit_backup_txt'] = 'Copias de seguridad disponibles';
-$wb['customer_no_txt'] = 'Número Cliente';
-$wb['vat_id_txt'] = 'ID de IVA';
-$wb['required_fields_txt'] = '* Campos Requeridos';
-$wb['limit_mailmailinglist_error_notint'] = 'El límite de listas de correo debe ser un número.';
-$wb['limit_openvz_vm_txt'] = 'Max. número de servidores virtuales';
-$wb['limit_openvz_vm_template_id_txt'] = 'Restringir plantilla de servidor virtual';
-$wb['limit_openvz_vm_error_notint'] = 'El límite de servidores virtuales debe ser un número.';
-$wb['web_php_options_notempty'] = 'No hay opciones de PHP seleccionadas. Seleccione al menos una opción de PHP.';
-$wb['ssh_chroot_notempty'] = 'No hay opción chroot SSH seleccionada. Seleccione al menos una opción SSH.';
-$wb['username_error_collision'] = 'El nombre de usuario no puede comenzar con la palabra -web- o web- seguida de un número.';
-$wb['active_template_additional_txt'] = 'Plantillas adicionales activas';
-$wb['add_additional_template_txt'] = 'Añadir plantilla adicional';
-$wb['delete_additional_template_txt'] = 'Elimintar plantilla adicional';
+$wb['customer_no_txt'] = 'Cliente No.';
+$wb['vat_id_txt'] = 'VAT ID';
+$wb['required_fields_txt'] = '* Campos requeridos';
+$wb['limit_mailmailinglist_error_notint'] = 'El límite del registro de la lista de correo debe ser un número.';
+$wb['limit_openvz_vm_txt'] = 'Cantidad max. de servidores virtuales';
+$wb['limit_openvz_vm_template_id_txt'] = 'Forzar plantilla de servidor virtual';
+$wb['limit_openvz_vm_error_notint'] = 'El límite del servidor virtual debe ser un número.';
+$wb['web_php_options_notempty'] = 'No ha seleccionado opciones de PHP. Seleccione al menos una opción de PHP.';
+$wb['ssh_chroot_notempty'] = 'No ha seleccionado opciones de SSH chroot. Seleccione al menos una opción de SSH.';
+$wb['username_error_collision'] = 'El nombre de usuario no puede empezar con la palabra -web- o -web- seguido por un número.';
+$wb['active_template_additional_txt'] = 'Adicionales activos';
+$wb['add_additional_template_txt'] = 'Añadir plantillas adicionales';
+$wb['delete_additional_template_txt'] = 'Borrar plantillas adicionales';
 $wb['surname_txt'] = 'Apellido';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
 $wb['limit_database_txt'] = 'Cantidad máx. de bases de dato';
-$wb['limit_cron_txt'] = 'Cantidad max. de cron jobs';
-$wb['limit_cron_type_txt'] = 'Tipo de cron job permitido (chrooted y/o url completa)';
-$wb['limit_cron_frequency_txt'] = 'Retraso en min. entre ejecuciones';
 $wb['ip_address_txt'] = 'ip_address';
 $wb['limit_client_error_notint'] = 'El límite de sub-cliente no es un número.';
 $wb['firstname_error_empty'] = 'El nombre está vacío.';
@@ -86,15 +83,12 @@ $wb['limit_dns_zone_txt'] = 'Cantidad max. de zonas DNS';
 $wb['limit_dns_slave_zone_txt'] = 'Cantidad max. de zonas secundarias de DNS';
 $wb['limit_dns_record_txt'] = 'Cantidad max. de registros DNS';
 $wb['limit_shell_user_txt'] = 'Cantidad max. de usuarios Shell';
-$wb['limit_webdav_user_txt'] = 'Cantidad max. de usuarios Webdav';
 $wb['limit_client_txt'] = 'Cantidad max. de clientes';
 $wb['username_error_empty'] = 'El nombre de usuario está vacío.';
 $wb['username_error_unique'] = 'En nombre de usuario debe ser único';
 $wb['limit_maildomain_error_notint'] = 'El límite de dominio de correo debe ser un número.';
-$wb['limit_mailmailinglist_error_notint'] = 'El límite del registro de la lista de correo debe ser un número.';
 $wb['limit_mailbox_error_notint'] = 'El límite de buzones debe ser un número.';
 $wb['limit_mailalias_error_notint'] = 'El límite de alias de correo debe ser un número.';
-$wb['limit_mailaliasdomain_error_notint'] = 'El límite de alias de dominio de correo debe ser un número.';
 $wb['limit_mailforward_error_notint'] = 'El límite de reenviadores de correo debe ser un número.';
 $wb['limit_mailcatchall_error_notint'] = 'El límite de receptores de correos huérfanos debe ser un número.';
 $wb['limit_mailrouting_error_notint'] = 'El límite de enrutadores de correo debe ser un número.';
@@ -109,19 +103,13 @@ $wb['limit_web_aliasdomain_error_notint'] = 'El límite de alias de dominio para
 $wb['limit_web_subdomain_error_notint'] = 'El límite de sub-dominios para sitio web debe ser un número.';
 $wb['limit_ftp_user_error_notint'] = 'El límite de usuarios de FTP debe ser un número.';
 $wb['limit_shell_user_error_notint'] = 'El límite de usuario del shell debe ser un número.';
-$wb['limit_webdav_user_error_notint'] = 'El límite de usuarios webdav debe ser un número.';
 $wb['limit_dns_zone_error_notint'] = 'El límite de zonas DNS debe ser un número.';
 $wb['limit_dns_slave_zone_error_notint'] = 'El límite de zonas esclavas de dns debe ser un número.';
 $wb['default_dbserver_txt'] = 'Servidor de base de datos por defecto';
 $wb['limit_database_error_notint'] = 'El límite de bases de datos debe ser un número.';
-$wb['limit_cron_error_notint'] = 'El límite de cron debe ser un número.';
-$wb['limit_cron_error_frequency'] = 'El límite de frecuencia cron debe ser un número.';
 $wb['username_error_regex'] = 'El nombre de usuario contiene caracteres no permitidos.';
 $wb['template_master_txt'] = 'Plantilla maestra';
 $wb['template_additional_txt'] = 'Plantilla adicional';
-$wb['active_template_additional_txt'] = 'Adicionales activos';
-$wb['add_additional_template_txt'] = 'Añadir plantillas adicionales';
-$wb['delete_additional_template_txt'] = 'Borrar plantillas adicionales';
 $wb['ssh_chroot_txt'] = 'Opciones de SSH-Chroot';
 $wb['web_php_options_txt'] = 'Opciones de PHP';
 $wb['limit_cgi_txt'] = 'CGI disponible';
@@ -133,20 +121,6 @@ $wb['force_suexec_txt'] = 'Forzar SuEXEC';
 $wb['limit_hterror_txt'] = 'Documentos de error propios';
 $wb['limit_wildcard_txt'] = 'Habilitar comodín para sub-dominio';
 $wb['limit_ssl_txt'] = 'SSL disponible';
-$wb['limit_client_error'] = 'Ha alcanzado el número máx. de clientes.';
-$wb['limit_web_quota_txt'] = 'Cuota para web';
-$wb['limit_traffic_quota_txt'] = 'Cuota de tráfico';
-$wb['limit_trafficquota_error_notint'] = 'La cuota de tráfico debe ser un número.';
-$wb['customer_no_txt'] = 'Cliente No.';
-$wb['vat_id_txt'] = 'VAT ID';
-$wb['required_fields_txt'] = '* Campos requeridos';
-$wb['company_id_txt'] = 'ID de Compañía/Empresario';
-$wb['limit_openvz_vm_txt'] = 'Cantidad max. de servidores virtuales';
-$wb['limit_openvz_vm_template_id_txt'] = 'Forzar plantilla de servidor virtual';
-$wb['limit_openvz_vm_error_notint'] = 'El límite del servidor virtual debe ser un número.';
-$wb['web_php_options_notempty'] = 'No ha seleccionado opciones de PHP. Seleccione al menos una opción de PHP.';
-$wb['ssh_chroot_notempty'] = 'No ha seleccionado opciones de SSH chroot. Seleccione al menos una opción de SSH.';
-$wb['username_error_collision'] = 'El nombre de usuario no puede empezar con la palabra -web- o -web- seguido por un número.';
 $wb['bank_account_number_txt'] = 'Cuenta de banco no.';
 $wb['bank_account_owner_txt'] = 'Propietario de la cuenta bancaria';
 $wb['bank_code_txt'] = 'Código del banco';
@@ -167,7 +141,7 @@ $wb['email_error_isemail'] = 'Por favor ingrese una dirección de correo válida
 $wb['customer_no_error_unique'] = 'El no. de cliente debe ser único (o déjelo en blanco).';
 $wb['paypal_email_error_isemail'] = 'Por favor ingrese una dirección de correo de PayPal válida.';
 $wb['paypal_email_txt'] = 'Correo de PayPal';
-$wb['err_msg_master_tpl_set'] = 'Todas las opciones de límites personalizados serán ignoradas si la plantilla maestra seleccionada no es \"custom\".';
+$wb['err_msg_master_tpl_set'] = 'Todas las opciones de límites personalizados serán ignoradas si la plantilla maestra seleccionada no es \\"custom\\".';
 $wb['aps_limits_txt'] = 'Límites de instalador de APS';
 $wb['limit_aps_txt'] = 'Cantidad máx. de instancias de APS';
 $wb['limit_aps_error_notint'] = 'La cantidad máx. de instancias de APS debe ser un número.';
@@ -181,8 +155,43 @@ $wb['added_by_txt'] = 'Creado por';
 $wb['limit_database_quota_txt'] = 'Cuota de base de datos';
 $wb['limit_database_quota_error_notint'] = 'Cuota de base de datos debe ser un número.';
 $wb['reseller_txt'] = 'Revendedor';
-$wb["email_error_empty"] = "Email is empty";
+$wb['email_error_empty'] = 'Email is empty';
 $wb['added_date_txt'] = 'Fecha de creación';
 $wb['parent_client_id_txt'] = 'Cliente del revendedor';
 $wb['none_txt'] = 'ninguno';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.';
+$wb['dns_servers_txt'] = 'DNS servers';
+$wb['dns_servers_placeholder'] = 'Select DNS servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.';
+$wb['db_servers_txt'] = 'Database servers';
+$wb['db_servers_placeholder'] = 'Select database servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select mailservers';
+$wb['no_mail_server_error'] = 'At least one mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/es_client_template.lng b/interface/web/client/lib/lang/es_client_template.lng
index 4cb0bf63f3..0775e411b9 100644
--- a/interface/web/client/lib/lang/es_client_template.lng
+++ b/interface/web/client/lib/lang/es_client_template.lng
@@ -90,4 +90,28 @@ $wb['limit_aps_txt'] = 'Cantidad máx. de instancias de APS';
 $wb['limit_aps_error_notint'] = 'La cantidad máx. de instancias de APS debe ser un número.';
 $wb['limit_domainmodule_txt'] = 'Límites del módulo de dominio';
 $wb['client_limits_txt'] = 'Límite de clientes';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['limit_backup_txt'] = 'Backupfunction available';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['dns_servers_txt'] = 'DNS servers';
 ?>
diff --git a/interface/web/client/lib/lang/es_reseller.lng b/interface/web/client/lib/lang/es_reseller.lng
index 18984350ac..523c2754a1 100644
--- a/interface/web/client/lib/lang/es_reseller.lng
+++ b/interface/web/client/lib/lang/es_reseller.lng
@@ -106,7 +106,6 @@ $wb['limit_hterror_txt'] = 'Documentos de error propios';
 $wb['limit_wildcard_txt'] = 'Habilitar comodín para sub-dominio';
 $wb['limit_ssl_txt'] = 'SSL disponible';
 $wb['limit_client_error'] = 'Ha alcanzado el número máx. de clientes.';
-$wb['limit_client_error_positive'] = 'El número máx. de clientes debe ser > 0';
 $wb['limit_web_quota_txt'] = 'Cuota para web';
 $wb['limit_traffic_quota_txt'] = 'Cuota de tráfico';
 $wb['limit_trafficquota_error_notint'] = 'La cuota de tráfico debe ser un número.';
@@ -149,9 +148,9 @@ $wb['canceled_txt'] = 'Cancelado';
 $wb['gender_m_txt'] = 'Sr.';
 $wb['gender_f_txt'] = 'Sra.';
 $wb['gender_txt'] = 'Título';
-$wb["btn_save_txt"] = "Save";
-$wb["btn_cancel_txt"] = "Cancel";
-$wb["email_error_empty"] = "Email is empty";
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['email_error_empty'] = 'Email is empty';
 $wb['customer_no_template_txt'] = 'Plantilla de No. de cliente';
 $wb['customer_no_template_error_regex_txt'] = 'La plantilla No. de cliente contiene caracteres inválidos';
 $wb['customer_no_start_txt'] = 'Valor de inicio de No. de cliente';
@@ -161,5 +160,40 @@ $wb['added_date_txt'] = 'Fecha de creación';
 $wb['limit_domainmodule_error_notint'] = 'El límites del módulo de dominio debe ser un número.';
 $wb['limit_domainmodule_txt'] = 'Límites del módulo de dominio';
 $wb['client_limits_txt'] = 'Límites de cliente';
-$wb['err_msg_master_tpl_set'] = 'Todas las opciones de límites personalizados serán ignoradas si la plantilla maestra seleccionada no es \"custom\".';
+$wb['err_msg_master_tpl_set'] = 'Todas las opciones de límites personalizados serán ignoradas si la plantilla maestra seleccionada no es \\"custom\\".';
+$wb['limit_backup_txt'] = 'Backupfunction available';
+$wb['limit_client_error_positive_or_unlimited'] = 'The number of clients must be > 0 or -1 (unlimited)';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select Webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before to remove it.';
+$wb['dns_servers_txt'] = 'DNS Server';
+$wb['dns_servers_placeholder'] = 'Select DNS Servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before to remove it.';
+$wb['db_servers_txt'] = 'Database Server';
+$wb['db_servers_placeholder'] = 'Select Database Servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before to remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select Mailservers';
+$wb['no_mail_server_error'] = 'At least one Mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before to remove it.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/fi.lng b/interface/web/client/lib/lang/fi.lng
index d440dfe3b0..3dce5c18d5 100755
--- a/interface/web/client/lib/lang/fi.lng
+++ b/interface/web/client/lib/lang/fi.lng
@@ -23,4 +23,6 @@ $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is i
 $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['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
+$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
 ?>
diff --git a/interface/web/client/lib/lang/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng
index aa2506c250..0eedd41840 100755
--- a/interface/web/client/lib/lang/fi_client.lng
+++ b/interface/web/client/lib/lang/fi_client.lng
@@ -155,5 +155,43 @@ $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["email_error_empty"] = "Email is empty";
+$wb['email_error_empty'] = 'Email is empty';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.';
+$wb['dns_servers_txt'] = 'DNS servers';
+$wb['dns_servers_placeholder'] = 'Select DNS servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.';
+$wb['db_servers_txt'] = 'Database servers';
+$wb['db_servers_placeholder'] = 'Select database servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select mailservers';
+$wb['no_mail_server_error'] = 'At least one mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['reseller_txt'] = 'Reseller';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/fi_client_template.lng b/interface/web/client/lib/lang/fi_client_template.lng
index 5a55688768..ff5a7dfecb 100755
--- a/interface/web/client/lib/lang/fi_client_template.lng
+++ b/interface/web/client/lib/lang/fi_client_template.lng
@@ -90,4 +90,28 @@ $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['dns_servers_txt'] = 'DNS servers';
 ?>
diff --git a/interface/web/client/lib/lang/fi_reseller.lng b/interface/web/client/lib/lang/fi_reseller.lng
index 55ef19a664..588cd6bf2b 100644
--- a/interface/web/client/lib/lang/fi_reseller.lng
+++ b/interface/web/client/lib/lang/fi_reseller.lng
@@ -160,7 +160,40 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $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.';
-$wb["btn_save_txt"] = "Save";
-$wb["btn_cancel_txt"] = "Cancel";
-$wb["email_error_empty"] = "Email is empty";
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['email_error_empty'] = 'Email is empty';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select Webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before to remove it.';
+$wb['dns_servers_txt'] = 'DNS Server';
+$wb['dns_servers_placeholder'] = 'Select DNS Servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before to remove it.';
+$wb['db_servers_txt'] = 'Database Server';
+$wb['db_servers_placeholder'] = 'Select Database Servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before to remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select Mailservers';
+$wb['no_mail_server_error'] = 'At least one Mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before to remove it.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/fr.lng b/interface/web/client/lib/lang/fr.lng
index dba251c4ef..7e4d6fe42a 100644
--- a/interface/web/client/lib/lang/fr.lng
+++ b/interface/web/client/lib/lang/fr.lng
@@ -2,25 +2,27 @@
 $wb['Client'] = 'Client';
 $wb['Address'] = 'Adresse';
 $wb['Limits'] = 'Limites';
-$wb['Add Client'] = 'Ajouter un Client';
-$wb['Edit Client'] = 'Editer un Client';
+$wb['Add Client'] = 'Ajouter un client';
+$wb['Edit Client'] = 'Modifier un client';
 $wb['Clients'] = 'Clients';
-$wb['Add Reseller'] = 'Ajouter un Revendeur';
-$wb['Edit Reseller'] = 'Editer un Revendeur';
+$wb['Add Reseller'] = 'Ajouter un revendeur';
+$wb['Edit Reseller'] = 'Modifier un revendeur';
 $wb['Resellers'] = 'Revendeurs';
-$wb['error_has_clients'] = 'Ce revendeur a des clients. Effacez dabord les clients de ce revendeur.';
+$wb['error_has_clients'] = 'Ce revendeur a des clients. Effacez d’abord les clients de ce revendeur.';
 $wb['add_additional_template_txt'] = 'Ajouter un modèle';
 $wb['delete_additional_template_txt'] = 'Supprimer un modèle';
 $wb['Messaging'] = 'Messagerie';
-$wb['Send email'] = 'Envoyer un email';
-$wb['Edit Client Circle'] = 'Editer les groupes clients';
+$wb['Edit Client Circle'] = 'Modifier les groupes clients';
 $wb['Domains'] = 'Domaines';
 $wb['domain_txt'] = 'Domaine';
 $wb['client_txt'] = 'Client';
-$wb['error_domain_in mailuse'] = 'Ce domaine ne peut pas être supprimé, il est utilisé par un compte email';
+$wb['error_domain_in mailuse'] = 'Ce domaine ne peut pas être supprimé, il est utilisé par un compte e-mail';
 $wb['error_domain_in webuse'] = 'Ce domaine ne peut pas être supprimé, il est utilisé par un site Web';
 $wb['error_client_can_not_add_domain'] = 'Vous ne pouvez pas ajouter de nouveau domaine';
 $wb['error_client_group_id_empty'] = 'Vous devez sélectionner un client<br>';
 $wb['Templates'] = 'Templates';
 $wb['Limit-Templates'] = 'Limit-Templates';
+$wb['Send email'] = 'Send Email';
+$wb['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
+$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
 ?>
diff --git a/interface/web/client/lib/lang/fr_client.lng b/interface/web/client/lib/lang/fr_client.lng
index 5dea56d786..1c09968445 100644
--- a/interface/web/client/lib/lang/fr_client.lng
+++ b/interface/web/client/lib/lang/fr_client.lng
@@ -1,21 +1,20 @@
 <?php
-$wb['limit_maildomain_txt'] = 'Nombre maximal de domaines d\'email';
-$wb['limit_mailbox_txt'] = 'Nombre maximal de boites email';
-$wb['limit_mailalias_txt'] = 'Nombre maximal d\'alias d\'email';
-$wb['limit_mailforward_txt'] = 'Nombre maximal de routeurs d\'email';
+$wb['limit_maildomain_txt'] = 'Nombre maximal de domaines d’e-mail';
+$wb['limit_mailbox_txt'] = 'Nombre maximal de boîtes aux lettres';
+$wb['limit_mailalias_txt'] = 'Nombre maximal d’alias d’e-mail';
+$wb['limit_mailforward_txt'] = 'Nombre maximal de routeurs d’e-mail';
 $wb['limit_mailcatchall_txt'] = 'Nombre maximal de comptes collecteurs';
-$wb['limit_mailrouting_txt'] = 'Nombre maximal de routes d\'email';
-$wb['limit_mailfilter_txt'] = 'Nombre maximal de filtres d\'emails';
-$wb['limit_fetchmail_txt'] = 'Nombre maximal de comptes récupérateur email';
-$wb['limit_mailquota_txt'] = 'Quota des boites email';
-$wb['limit_spamfilter_wblist_txt'] = 'Nombre maximal de liste blanches/noires d\'email';
-$wb['limit_spamfilter_user_txt'] = 'Nombre maximal d\'utilisateurs du filtre antispam';
+$wb['limit_mailrouting_txt'] = 'Nombre maximal de routes d’e-mail';
+$wb['limit_mailfilter_txt'] = 'Nombre maximal de filtres d’e-mails';
+$wb['limit_fetchmail_txt'] = 'Nombre maximal de comptes récupérateur e-mail';
+$wb['limit_mailquota_txt'] = 'Quota des boîtes aux lettres';
+$wb['limit_spamfilter_wblist_txt'] = 'Nombre maximal de liste blanches/noires d’e-mail';
+$wb['limit_spamfilter_user_txt'] = 'Nombre maximal d’utilisateurs du filtre antispam';
 $wb['limit_spamfilter_policy_txt'] = 'Nombre maximal de règles du filtre antispam';
 $wb['default_mailserver_txt'] = 'Serveur mail par défaut';
-$wb['company_name_txt'] = 'Nom de l\'entreprise';
-$wb['contact_firstname_txt'] = 'Contact firstname';
+$wb['company_name_txt'] = 'Nom de l’entreprise';
 $wb['contact_name_txt'] = 'Nom de contact';
-$wb['username_txt'] = 'Nom d\'utilisateur';
+$wb['username_txt'] = 'Nom d’utilisateur';
 $wb['password_txt'] = 'Mot de passe';
 $wb['password_strength_txt'] = 'Force du mot de passe';
 $wb['language_txt'] = 'Langage';
@@ -28,7 +27,7 @@ $wb['country_txt'] = 'Pays';
 $wb['telephone_txt'] = 'Numéro de téléphone';
 $wb['mobile_txt'] = 'Numéro de Mobile';
 $wb['fax_txt'] = 'Fax';
-$wb['email_txt'] = 'Email';
+$wb['email_txt'] = 'E-mail';
 $wb['internet_txt'] = 'Adresse Web';
 $wb['icq_txt'] = 'ICQ';
 $wb['notes_txt'] = 'Notes';
@@ -47,36 +46,36 @@ $wb['firstname_error_empty'] = 'Le prénom est vide.';
 $wb['contact_error_empty'] = 'Le nom de contact est vide.';
 $wb['default_webserver_txt'] = 'Serveur Web par défaut';
 $wb['limit_web_domain_txt'] = 'Nombre maximal de domaines Web';
-$wb['limit_web_aliasdomain_txt'] = 'Nombre maximal d\'alias de domaines';
+$wb['limit_web_aliasdomain_txt'] = 'Nombre maximal d’alias de domaines';
 $wb['limit_web_subdomain_txt'] = 'Nombre maximal de sous-domaines';
-$wb['limit_ftp_user_txt'] = 'Nombre maximal d\'utilisateurs FTP';
+$wb['limit_ftp_user_txt'] = 'Nombre maximal d’utilisateurs FTP';
 $wb['default_dnsserver_txt'] = 'Serveur DNS par défaut';
 $wb['limit_dns_zone_txt'] = 'Nombre maximal de zones DNS';
-$wb['limit_dns_record_txt'] = 'Nombre maximal d\'enregistrements DNS';
-$wb['limit_shell_user_txt'] = 'Nombre maximal d\'utilisateurs Shell';
-$wb['username_error_empty'] = 'Le nom d\'utilisateur est vide.';
-$wb['username_error_unique'] = 'Le nom d\'utilisateur existe déja.';
-$wb['limit_maildomain_error_notint'] = 'La limite de domaines d\'email doit être un nombre.';
-$wb['limit_mailbox_error_notint'] = 'La limite de boites d\'email doit être un nombre.';
-$wb['limit_mailalias_error_notint'] = 'La limite d\'alias d\'email doit être un nombre.';
-$wb['limit_mailforward_error_notint'] = 'La limite de routeurs d\'email doit être un nombre.';
+$wb['limit_dns_record_txt'] = 'Nombre maximal d’enregistrements DNS';
+$wb['limit_shell_user_txt'] = 'Nombre maximal d’utilisateurs Shell';
+$wb['username_error_empty'] = 'Le nom d’utilisateur est vide.';
+$wb['username_error_unique'] = 'Le nom d’utilisateur existe déja.';
+$wb['limit_maildomain_error_notint'] = 'La limite de domaines d’e-mail doit être un nombre.';
+$wb['limit_mailbox_error_notint'] = 'La limite de boîtes d’e-mail doit être un nombre.';
+$wb['limit_mailalias_error_notint'] = 'La limite d’alias d’e-mail doit être un nombre.';
+$wb['limit_mailforward_error_notint'] = 'La limite de routeurs d’e-mail doit être un nombre.';
 $wb['limit_mailcatchall_error_notint'] = 'La limite de comptes collecteurs doit être un nombre.';
-$wb['limit_mailrouting_error_notint'] = 'La limite de routes d\'email doit être un nombre.';
-$wb['limit_mailfilter_error_notint'] = 'La limite de filtres d\'email doit être un nombre.';
-$wb['limit_mailfetchmail_error_notint'] = 'La limite de comptes récupérateur email doit être un nombre.';
-$wb['limit_mailquota_error_notint'] = 'La limite du quota des boites d\'email doit être un nombre.';
+$wb['limit_mailrouting_error_notint'] = 'La limite de routes d’e-mail doit être un nombre.';
+$wb['limit_mailfilter_error_notint'] = 'La limite de filtres d’e-mail doit être un nombre.';
+$wb['limit_mailfetchmail_error_notint'] = 'La limite de comptes récupérateur e-mail doit être un nombre.';
+$wb['limit_mailquota_error_notint'] = 'La limite du quota des boîtes d’e-mail doit être un nombre.';
 $wb['limit_spamfilter_wblist_error_notint'] = 'La limite de listes blanches/noires du filtre antispam doit être un nombre.';
-$wb['limit_spamfilter_user_error_notint'] = 'La limite d\'utilisateurs du filtre antispam doit être un nombre.';
+$wb['limit_spamfilter_user_error_notint'] = 'La limite d’utilisateurs du filtre antispam doit être un nombre.';
 $wb['limit_spamfilter_policy_error_notint'] = 'La limite de règles du filtre antispam doit être un nombre.';
 $wb['limit_web_domain_error_notint'] = 'La limite de sites web doit être un nombre.';
-$wb['limit_web_aliasdomain_error_notint'] = 'La limite d\'alias de domaines doit être un nombre.';
+$wb['limit_web_aliasdomain_error_notint'] = 'La limite d’alias de domaines doit être un nombre.';
 $wb['limit_web_subdomain_error_notint'] = 'La limite de sous-domaines doit être un nombre.';
-$wb['limit_ftp_user_error_notint'] = 'La limite d\'utilisateurs FTP doit être un nombre.';
-$wb['limit_shell_user_error_notint'] = 'La limite d\'utilisateurs Shell doit être un nombre.';
-$wb['limit_dns_zone_error_notint'] = 'La limite d\'enregistrements DNS doit être un nombre.';
+$wb['limit_ftp_user_error_notint'] = 'La limite d’utilisateurs FTP doit être un nombre.';
+$wb['limit_shell_user_error_notint'] = 'La limite d’utilisateurs Shell doit être un nombre.';
+$wb['limit_dns_zone_error_notint'] = 'La limite d’enregistrements DNS doit être un nombre.';
 $wb['default_dbserver_txt'] = 'Serveur de bases de données par défaut';
 $wb['limit_database_error_notint'] = 'La limite de bases de données doit être un nombre.';
-$wb['username_error_regex'] = 'Le nom d\'utilisateur contient des caractères invalides.';
+$wb['username_error_regex'] = 'Le nom d’utilisateur contient des caractères invalides.';
 $wb['template_master_txt'] = 'Maître';
 $wb['template_additional_txt'] = 'Ajout';
 $wb['ssh_chroot_txt'] = 'Options Chroot SSH';
@@ -87,12 +86,11 @@ $wb['limit_cron_frequency_txt'] = 'Délai minimum entre deux éxécutions';
 $wb['limit_cron_error_notint'] = 'La limite de tâches Cron doit être un nombre.';
 $wb['limit_cron_error_frequency'] = 'La fréquence des tâches Cron doit être un nombre.';
 $wb['limit_client_error'] = 'Le nombre maximum de clients a été atteint.';
-$wb['limit_mailaliasdomain_txt'] = 'Nombre max d\'alias de domaines';
+$wb['limit_mailaliasdomain_txt'] = 'Nombre max d’alias de domaines';
 $wb['limit_dns_slave_zone_txt'] = 'Nombre max de zones DNS secondaires';
-$wb['limit_webdav_user_txt'] = 'Nombre max d\'utilisateurs webdav';
-$wb['limit_mailaliasdomain_error_notint'] = 'La limite d\'alias de domaine email doit être un nombre.';
-$wb['limit_webdav_user_error_notint'] = 'La limite d\'utilisateurs webdav doit être un nombre.';
-$wb['limit_backup_txt'] = 'Backupfunction available';
+$wb['limit_webdav_user_txt'] = 'Nombre max d’utilisateurs WebDAV';
+$wb['limit_mailaliasdomain_error_notint'] = 'La limite d’alias de domaine e-mail doit être un nombre.';
+$wb['limit_webdav_user_error_notint'] = 'La limite d’utilisateurs WebDAV doit être un nombre.';
 $wb['limit_dns_slave_zone_error_notint'] = 'La limite de zones DNS secondaire doit être un nombre.';
 $wb['limit_web_quota_txt'] = 'Quota web';
 $wb['limit_traffic_quota_txt'] = 'Quota de trafic';
@@ -100,15 +98,15 @@ $wb['limit_trafficquota_error_notint'] = 'Le Quota de trafic doit être un nombr
 $wb['customer_no_txt'] = 'No. Client';
 $wb['vat_id_txt'] = 'Numéro de TVA';
 $wb['required_fields_txt'] = '* Champs requis';
-$wb['limit_mailmailinglist_txt'] = 'Nombre max de listes d\'email.';
-$wb['limit_mailmailinglist_error_notint'] = 'La limite de listes d\'email doit être un nombre';
+$wb['limit_mailmailinglist_txt'] = 'Nombre max de listes d’e-mail.';
+$wb['limit_mailmailinglist_error_notint'] = 'La limite de listes d’e-mail doit être un nombre';
 $wb['company_id_txt'] = 'ID Entreprise/Dirigeant';
 $wb['limit_openvz_vm_txt'] = 'Nombre max de serveurs virtuels.';
 $wb['limit_openvz_vm_template_id_txt'] = 'Forcer le modèle de serveur virtuel.';
 $wb['limit_openvz_vm_error_notint'] = 'La limite de serveurs virtuels doit être un nombre.';
 $wb['web_php_options_notempty'] = 'Aucune option PHP choisie. Sélectonnez au moins une option PHP.';
 $wb['ssh_chroot_notempty'] = 'Aucune option SSH chroot choisie. Sélectionnez au moins une option SSH.';
-$wb['username_error_collision'] = 'Le nom d\'utilisateur ne peut pas commencer par -web- ou -web- followed suivi d\'un nombre.';
+$wb['username_error_collision'] = 'Le nom d’utilisateur ne peut pas commencer par -web- ou -web- followed suivi d’un nombre.';
 $wb['add_additional_template_txt'] = 'Ajouter un modèle';
 $wb['delete_additional_template_txt'] = 'Supprimer un modèle';
 $wb['limit_cgi_txt'] = 'CGI autorisé';
@@ -116,60 +114,84 @@ $wb['limit_ssi_txt'] = 'SSI autorisé';
 $wb['limit_perl_txt'] = 'Perl autorisé';
 $wb['limit_ruby_txt'] = 'Ruby autorisé';
 $wb['limit_python_txt'] = 'Python autorisé';
-$wb['force_suexec_txt'] = 'Forcer le SuEXEC';
-$wb['limit_hterror_txt'] = 'Documents d\'erreurs personnalisés autorisés';
+$wb['force_suexec_txt'] = 'Forcer le suEXEC';
+$wb['limit_hterror_txt'] = 'Documents d’erreurs personnalisés autorisés';
 $wb['limit_wildcard_txt'] = 'Sous-domaine joker autorisé';
 $wb['limit_ssl_txt'] = 'SSL autorisé';
 $wb['bank_account_number_txt'] = 'Numéro de compte bancaire';
 $wb['bank_code_txt'] = 'Code banque';
 $wb['bank_name_txt'] = 'Nom de la banque';
-$wb['bank_account_iban_txt'] = 'IBAN';
+$wb['bank_account_iban_txt'] = 'IBAn';
 $wb['bank_account_swift_txt'] = 'BIC / Swift';
 $wb['web_limits_txt'] = 'Limites Web';
-$wb['email_limits_txt'] = 'Limites d\'emails';
+$wb['email_limits_txt'] = 'Limites d’e-mails';
 $wb['database_limits_txt'] = 'Limite de bases de données';
-$wb['cron_job_limits_txt'] = 'Limites de tâches CRON';
+$wb['cron_job_limits_txt'] = 'Limites de tâches cron';
 $wb['dns_limits_txt'] = 'Limites DNS';
 $wb['virtualization_limits_txt'] = 'Limites de virtualisation';
-$wb['generate_password_txt'] = 'Genérer un mot de passe';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
 $wb['repeat_password_txt'] = 'Vérification du mot de passe';
 $wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
 $wb['password_match_txt'] = 'Les mots de passe correspondent.';
 $wb['active_template_additional_txt'] = 'Addons actifs';
 $wb['bank_account_owner_txt'] = 'Titulaire du compte bancaire';
-$wb['email_error_isemail'] = 'Saisissez une adresse email valide.';
+$wb['email_error_isemail'] = 'Saisissez une adresse e-mail valide.';
 $wb['customer_no_error_unique'] = 'Le numéro client doit être unique (ou vide).';
 $wb['paypal_email_error_isemail'] = 'Saisissez un compte Paypal valide.';
 $wb['paypal_email_txt'] = 'Compte Paypal';
 $wb['err_msg_master_tpl_set'] = 'Les paramètres de limites personnalisés seront ignorés si un modèle maître autre que \\"custom\\" est sélectionné.';
-$wb['aps_limits_txt'] = 'Nombre max d\'Installeur APS';
-$wb['limit_aps_txt'] = 'Nombre max d\'instances APS';
-$wb['limit_aps_error_notint'] = 'La limite d\'instances APS doit être un nombre';
+$wb['aps_limits_txt'] = 'Nombre max d’Installeur APS';
+$wb['limit_aps_txt'] = 'Nombre max d’instances APS';
+$wb['limit_aps_error_notint'] = 'La limite d’instances APS doit être un nombre';
 $wb['default_slave_dnsserver_txt'] = 'Serveur DNS secondaire par défaut';
 $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["web_servers_txt"] = 'Serveurs Web';
-$wb["web_servers_placeholder"] = 'Choisissez des serveurs Web';
-$wb['no_web_server_error'] = 'Au moins un serveur web doit être sélectionné.';
-$wb['web_servers_used'] = 'Le serveur que vous tentez de retirer à ce client est utilisé comme serveur web. Veillez à ce que le serveur ne soit plus utilisé par ce client avant de le retirer.';
-$wb["dns_servers_txt"] = 'Serveurs DNS';
-$wb["dns_servers_placeholder"] = 'Choisissez des serveurs DNS';
-$wb['no_dns_server_error'] = 'Au moins un serveur DNS doit être sélectionné.';
-$wb['dns_servers_used'] = 'Le serveur que vous tentez de retirer à ce client est utilisé comme serveur DNS. Veillez à ce que le serveur ne soit plus utilisé par ce client avant de le retirer.';
-$wb["db_servers_txt"] = 'Serveur de bases de données';
-$wb["db_servers_placeholder"] = 'Choisissez des serveurs de bases de données';
-$wb['no_db_server_error'] = 'Au moins un serveur de bases de données doit être sélectionné.';
-$wb['db_servers_used'] = 'Le serveur que vous tentez de retirer à ce client est utilisé comme serveur de bases de données. Veillez à ce que le serveur ne soit plus utilisé par ce client avant de le retirer.';
-$wb["mail_servers_txt"] = 'Serveurs mail';
-$wb["mail_servers_placeholder"] = 'Choisissez des serveurs mail';
-$wb['no_mail_server_error'] = 'Au moins un serveur mail doit être sélectionné.';
-$wb['mail_servers_used'] = 'Le serveur que vous tentez de retirer à ce client est utilisé comme serveur mail. Veillez à ce que le serveur ne soit plus utilisé par ce client avant de le retirer.';
 $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["email_error_empty"] = "Email is empty";
+$wb['contact_firstname_txt'] = 'Contact firstname';
+$wb['limit_backup_txt'] = 'Backupfunction available';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.';
+$wb['dns_servers_txt'] = 'DNS servers';
+$wb['dns_servers_placeholder'] = 'Select DNS servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.';
+$wb['db_servers_txt'] = 'Database servers';
+$wb['db_servers_placeholder'] = 'Select database servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select mailservers';
+$wb['no_mail_server_error'] = 'At least one mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['reseller_txt'] = 'Reseller';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
+$wb['email_error_empty'] = 'Email is empty';
 ?>
diff --git a/interface/web/client/lib/lang/fr_client_del.lng b/interface/web/client/lib/lang/fr_client_del.lng
index 2ec2d877bf..4fdb5dac77 100644
--- a/interface/web/client/lib/lang/fr_client_del.lng
+++ b/interface/web/client/lib/lang/fr_client_del.lng
@@ -1,7 +1,7 @@
 <?php
-$wb['confirm_action_txt'] = 'Confirmer l\'action';
-$wb['delete_explanation'] = 'Cette action va supprimer le nombre d\'enregistrements suivants associés avec le client';
+$wb['confirm_action_txt'] = 'Confirmer l’action';
+$wb['delete_explanation'] = 'Cette action va supprimer le nombre d’enregistrements suivants associés avec le client';
 $wb['btn_save_txt'] = 'Effacer le client';
 $wb['btn_cancel_txt'] = 'Annuler sans effacer le client';
-$wb['confirm_client_delete_txt'] = 'Confirmez-vous la suppression de ce client ?';
+$wb['confirm_client_delete_txt'] = 'Confirmez-vous la suppression de ce client ?';
 ?>
diff --git a/interface/web/client/lib/lang/fr_client_message.lng b/interface/web/client/lib/lang/fr_client_message.lng
index 7ba9a66c92..265b970385 100644
--- a/interface/web/client/lib/lang/fr_client_message.lng
+++ b/interface/web/client/lib/lang/fr_client_message.lng
@@ -1,20 +1,20 @@
 <?php
 $wb['btn_send_txt'] = 'Envoyer';
 $wb['btn_cancel_txt'] = 'Annuler';
-$wb['sender_txt'] = 'Adresse email de l\'expéditeur';
+$wb['sender_txt'] = 'Adresse e-mail de l’expéditeur';
 $wb['subject_txt'] = 'Objet';
 $wb['message_txt'] = 'Message';
-$wb['form_legend_client_txt'] = 'Envoyer l\'email à tous les clients';
-$wb['form_legend_admin_txt'] = 'Envoyer l\'email à tous les clients et revendeurs';
-$wb['sender_invalid_error'] = 'Adresse d\'expédition invalide.';
-$wb['subject_invalid_error'] = 'L\'objet est vide.';
+$wb['form_legend_client_txt'] = 'Envoyer l’email à tous les clients';
+$wb['form_legend_admin_txt'] = 'Envoyer l’email à tous les clients et revendeurs';
+$wb['sender_invalid_error'] = 'Adresse d’expédition invalide.';
+$wb['subject_invalid_error'] = 'L’objet est vide.';
 $wb['message_invalid_error'] = 'Le message est vide.';
-$wb['email_sent_to_txt'] = 'Email envoyé à :';
+$wb['email_sent_to_txt'] = 'Email envoyé à :';
 $wb['page_head_txt'] = 'Envoyer les informations client';
 $wb['recipient_txt'] = 'Destinataire';
 $wb['all_clients_resellers_txt'] = 'Tous les clients et revendeurs';
 $wb['all_clients_txt'] = 'Tous les clients';
-$wb['variables_txt'] = 'Variables :';
+$wb['variables_txt'] = 'Variables :';
 $wb['gender_m_txt'] = 'Mr.';
 $wb['gender_f_txt'] = 'Ms.';
 ?>
diff --git a/interface/web/client/lib/lang/fr_client_message_template.lng b/interface/web/client/lib/lang/fr_client_message_template.lng
index 65e5fbfba3..8cbc0a5247 100644
--- a/interface/web/client/lib/lang/fr_client_message_template.lng
+++ b/interface/web/client/lib/lang/fr_client_message_template.lng
@@ -7,5 +7,5 @@ $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['duplicate_welcome_error'] = 'There can be only one default welcome e-mail template. Please edit the existing template instead of adding a new one.';
 ?>
diff --git a/interface/web/client/lib/lang/fr_client_template.lng b/interface/web/client/lib/lang/fr_client_template.lng
index 429941c8a6..4309067313 100644
--- a/interface/web/client/lib/lang/fr_client_template.lng
+++ b/interface/web/client/lib/lang/fr_client_template.lng
@@ -1,16 +1,16 @@
 <?php
 $wb['limit_client_error_notint'] = 'La limite de sous clients doit être un nombre.';
-$wb['limit_maildomain_txt'] = 'Nombre maximal de domaines d\'emails';
-$wb['limit_mailbox_txt'] = 'Nombre maximal de boites email';
-$wb['limit_mailalias_txt'] = 'Nombre maximal d\'alias d\'email';
-$wb['limit_mailforward_txt'] = 'Nombre maximal de routeurs d\'email';
+$wb['limit_maildomain_txt'] = 'Nombre maximal de domaines d’e-mails';
+$wb['limit_mailbox_txt'] = 'Nombre maximal de boîtes aux lettres';
+$wb['limit_mailalias_txt'] = 'Nombre maximal d’alias d’e-mail';
+$wb['limit_mailforward_txt'] = 'Nombre maximal de routeurs d’e-mail';
 $wb['limit_mailcatchall_txt'] = 'Nombre maximal de comptes collecteurs';
-$wb['limit_mailrouting_txt'] = 'Nombre maximal de routes d\'emails';
-$wb['limit_mailfilter_txt'] = 'Nombre maximal de filtres d\'emails';
-$wb['limit_fetchmail_txt'] = 'Nombre maximal de comptes récupérateur email';
-$wb['limit_mailquota_txt'] = 'Quota des boites email';
-$wb['limit_spamfilter_wblist_txt'] = 'Nombre maximal de liste blanches/noires d\'emails';
-$wb['limit_spamfilter_user_txt'] = 'Nombre maximal d\'utilisateurs du filtre antispam';
+$wb['limit_mailrouting_txt'] = 'Nombre maximal de routes d’e-mails';
+$wb['limit_mailfilter_txt'] = 'Nombre maximal de filtres d’e-mails';
+$wb['limit_fetchmail_txt'] = 'Nombre maximal de comptes récupérateur e-mail';
+$wb['limit_mailquota_txt'] = 'Quota des boîtes aux lettres';
+$wb['limit_spamfilter_wblist_txt'] = 'Nombre maximal de liste blanches/noires d’e-mails';
+$wb['limit_spamfilter_user_txt'] = 'Nombre maximal d’utilisateurs du filtre antispam';
 $wb['limit_spamfilter_policy_txt'] = 'Nombre maximal de règles du filtre antispam';
 $wb['limit_client_txt'] = 'Nombre maximal de clients';
 $wb['limit_domain_txt'] = 'Nombre maximal de domaines';
@@ -18,30 +18,30 @@ $wb['limit_subdomain_txt'] = 'Nombre maximal de sous-domaines';
 $wb['limit_webquota_txt'] = 'Limite du quota web';
 $wb['limit_database_txt'] = 'Nombre maximal de bases de données.';
 $wb['limit_web_domain_txt'] = 'Nombre maximal de domaines Web';
-$wb['limit_web_aliasdomain_txt'] = 'Nombre maximal d\'alias de domaine';
+$wb['limit_web_aliasdomain_txt'] = 'Nombre maximal d’alias de domaine';
 $wb['limit_web_subdomain_txt'] = 'Nombre maximal de sous-domaines';
-$wb['limit_ftp_user_txt'] = 'Nombre maximal d\'utilisateurs FTP';
+$wb['limit_ftp_user_txt'] = 'Nombre maximal d’utilisateurs FTP';
 $wb['limit_dns_zone_txt'] = 'Nombre maximal de zones DNS';
-$wb['limit_dns_record_txt'] = 'Nombre maximal d\'enregistrements DNS';
-$wb['limit_shell_user_txt'] = 'Nombre maximal d\'utilisateurs Shell';
-$wb['limit_maildomain_error_notint'] = 'La limite de domaines d\'email doit être un nombre.';
-$wb['limit_mailbox_error_notint'] = 'La limite de boites d\'email doit être un nombre.';
-$wb['limit_mailalias_error_notint'] = 'La limite d\'alias d\'email doit être un nombre.';
-$wb['limit_mailforward_error_notint'] = 'La limite de routeurs d\'email doit être un nombre.';
+$wb['limit_dns_record_txt'] = 'Nombre maximal d’enregistrements DNS';
+$wb['limit_shell_user_txt'] = 'Nombre maximal d’utilisateurs Shell';
+$wb['limit_maildomain_error_notint'] = 'La limite de domaines d’e-mail doit être un nombre.';
+$wb['limit_mailbox_error_notint'] = 'La limite de boîtes d’e-mail doit être un nombre.';
+$wb['limit_mailalias_error_notint'] = 'La limite d’alias d’e-mail doit être un nombre.';
+$wb['limit_mailforward_error_notint'] = 'La limite de routeurs d’e-mail doit être un nombre.';
 $wb['limit_mailcatchall_error_notint'] = 'La limite de comptes collecteurs doit être un nombre.';
-$wb['limit_mailrouting_error_notint'] = 'La limite de routes d\'email doit être un nombre.';
-$wb['limit_mailfilter_error_notint'] = 'La limite de filtres d\'email doit être un nombre.';
-$wb['limit_mailfetchmail_error_notint'] = 'La limite de comptes récupérateur email doit être un nombre.';
-$wb['limit_mailquota_error_notint'] = 'La limite du quota des boites d\'email doit être un nombre.';
+$wb['limit_mailrouting_error_notint'] = 'La limite de routes d’e-mail doit être un nombre.';
+$wb['limit_mailfilter_error_notint'] = 'La limite de filtres d’e-mail doit être un nombre.';
+$wb['limit_mailfetchmail_error_notint'] = 'La limite de comptes récupérateur e-mail doit être un nombre.';
+$wb['limit_mailquota_error_notint'] = 'La limite du quota des boîtes d’e-mail doit être un nombre.';
 $wb['limit_spamfilter_wblist_error_notint'] = 'La limite de listes blanches/noires du filtre antispam doit être un nombre.';
-$wb['limit_spamfilter_user_error_notint'] = 'La limite d\'utilisateurs du filtre antispam doit être un nombre.';
+$wb['limit_spamfilter_user_error_notint'] = 'La limite d’utilisateurs du filtre antispam doit être un nombre.';
 $wb['limit_spamfilter_policy_error_notint'] = 'La limite de règles du filtre antispam doit être un nombre.';
 $wb['limit_web_domain_error_notint'] = 'La limite de sites web doit être un nombre.';
-$wb['limit_web_aliasdomain_error_notint'] = 'La limite d\'alias de domaines doit être un nombre.';
+$wb['limit_web_aliasdomain_error_notint'] = 'La limite d’alias de domaines doit être un nombre.';
 $wb['limit_web_subdomain_error_notint'] = 'La limite de sous-domaines doit être un nombre.';
-$wb['limit_ftp_user_error_notint'] = 'La limite d\'utilisateurs FTP doit être un nombre.';
-$wb['limit_shell_user_error_notint'] = 'La limite d\'utilisateurs Shell doit être un nombre.';
-$wb['limit_dns_zone_error_notint'] = 'La limite d\'enregistrements DNS doit être un nombre.';
+$wb['limit_ftp_user_error_notint'] = 'La limite d’utilisateurs FTP doit être un nombre.';
+$wb['limit_shell_user_error_notint'] = 'La limite d’utilisateurs Shell doit être un nombre.';
+$wb['limit_dns_zone_error_notint'] = 'La limite d’enregistrements DNS doit être un nombre.';
 $wb['limit_database_error_notint'] = 'La limite de bases de données doit être un nombre.';
 $wb['error_template_name_empty'] = 'Entrez le nom du modèle.';
 $wb['limit_cron_txt'] = 'Nombre maximal de tâches Cron';
@@ -49,20 +49,19 @@ $wb['limit_cron_type_txt'] = 'Types des tâches Cron';
 $wb['limit_cron_frequency_txt'] = 'Délai minimum entre deux éxécutions';
 $wb['limit_cron_error_notint'] = 'La limite de tâches Cron doit être un nombre.';
 $wb['limit_cron_error_frequency'] = 'La fréquence des tâches Cron doit être un nombre.';
-$wb['limit_mailaliasdomain_txt'] = 'Nombre max. d\'alias de domaine';
+$wb['limit_mailaliasdomain_txt'] = 'Nombre max. d’alias de domaine';
 $wb['limit_dns_slave_zone_txt'] = 'Nombre max. de zones DNS secondaires';
-$wb['limit_webdav_user_txt'] = 'Nombre max. d\'utilisateurs Webdav';
-$wb['limit_mailaliasdomain_error_notint'] = 'La limite d\'alias de domaine doit être un nombre.';
-$wb['limit_webdav_user_error_notint'] = 'La limite d\'utilisateurs webdav doit être un nombre.';
-$wb['limit_backup_txt'] = 'Backupfunction available';
+$wb['limit_webdav_user_txt'] = 'Nombre max. d’utilisateurs WebDAV';
+$wb['limit_mailaliasdomain_error_notint'] = 'La limite d’alias de domaine doit être un nombre.';
+$wb['limit_webdav_user_error_notint'] = 'La limite d’utilisateurs WebDAV doit être un nombre.';
 $wb['limit_dns_slave_zone_error_notint'] = 'La limite de zones DNS secondaires doit être un nombre.';
-$wb['limit_dns_record_error_notint'] = 'Le nombre d\'enregistrements DNS limite doit être un nombre.';
+$wb['limit_dns_record_error_notint'] = 'Le nombre d’enregistrements DNS limite doit être un nombre.';
 $wb['limit_web_quota_txt'] = 'Quota web';
 $wb['limit_traffic_quota_txt'] = 'Quota de trafic';
 $wb['limit_trafficquota_error_notint'] = 'le quota de trafic doit être un nombre.';
 $wb['template_del_aborted_txt'] = 'Supression annulée. Il y a toujours un client qui a ce gabarit sélectionné.';
-$wb['limit_mailmailinglist_txt'] = 'Nombre max de listes d\'emails';
-$wb['limit_mailmailinglist_error_notint'] = 'La limite de listes d\'emails doit être un nombre.';
+$wb['limit_mailmailinglist_txt'] = 'Nombre max de listes d’e-mails';
+$wb['limit_mailmailinglist_error_notint'] = 'La limite de listes d’e-mails doit être un nombre.';
 $wb['limit_openvz_vm_txt'] = 'Nombre max de serveurs virtuels';
 $wb['limit_openvz_vm_template_id_txt'] = 'Forcer le modèle de serveur virtuel';
 $wb['limit_openvz_vm_error_notint'] = 'La limite de serveurs virtuels doit être un nombre.';
@@ -75,19 +74,44 @@ $wb['limit_ssi_txt'] = 'SSI autorisé';
 $wb['limit_perl_txt'] = 'Perl autorisé';
 $wb['limit_ruby_txt'] = 'Ruby autorisé';
 $wb['limit_python_txt'] = 'Python autorisé';
-$wb['force_suexec_txt'] = 'Forcer le SuEXEC';
-$wb['limit_hterror_txt'] = 'Documents d\'erreurs personnalisés autorisés';
+$wb['force_suexec_txt'] = 'Forcer le suEXEC';
+$wb['limit_hterror_txt'] = 'Documents d’erreurs personnalisés autorisés';
 $wb['limit_wildcard_txt'] = 'Sous-domaine joker autorisé';
 $wb['limit_ssl_txt'] = 'SSL autorisé';
 $wb['web_limits_txt'] = 'Limite Web';
-$wb['email_limits_txt'] = 'Limite d\'emails';
+$wb['email_limits_txt'] = 'Limite d’e-mails';
 $wb['database_limits_txt'] = 'Limite de bases de données';
-$wb['cron_job_limits_txt'] = 'Limite de tâches CRON';
+$wb['cron_job_limits_txt'] = 'Limite de tâches CROn';
 $wb['dns_limits_txt'] = 'Limite DNS';
 $wb['virtualization_limits_txt'] = 'Limite de virtualisations';
-$wb['aps_limits_txt'] = 'Limite d\'installeurs APS';
-$wb['limit_aps_txt'] = 'Nombre max d\'instances APS';
-$wb['limit_aps_error_notint'] = 'La limite d\'instances APS doit être un nombre.';
+$wb['aps_limits_txt'] = 'Limite d’installeurs APS';
+$wb['limit_aps_txt'] = 'Nombre max d’instances APS';
+$wb['limit_aps_error_notint'] = 'La limite d’instances APS doit être un nombre.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['limit_backup_txt'] = 'Backupfunction available';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['dns_servers_txt'] = 'DNS servers';
 ?>
diff --git a/interface/web/client/lib/lang/fr_clients_list.lng b/interface/web/client/lib/lang/fr_clients_list.lng
index e3503f39c5..49601b57a1 100644
--- a/interface/web/client/lib/lang/fr_clients_list.lng
+++ b/interface/web/client/lib/lang/fr_clients_list.lng
@@ -1,11 +1,11 @@
 <?php
 $wb['list_head_txt'] = 'Clients';
-$wb['client_id_txt'] = 'ID';
-$wb['company_name_txt'] = 'Nom de l\'entreprise';
+$wb['client_id_txt'] = 'Id';
+$wb['company_name_txt'] = 'Nom de l’entreprise';
 $wb['contact_name_txt'] = 'Nom du contact';
 $wb['city_txt'] = 'Ville';
 $wb['country_txt'] = 'Pays';
 $wb['add_new_record_txt'] = 'Ajouter un nouveau client';
-$wb['username_txt'] = 'Nom d\'utilisateur';
+$wb['username_txt'] = 'Nom d’utilisateur';
 $wb['customer_no_txt'] = 'Numéro client';
 ?>
diff --git a/interface/web/client/lib/lang/fr_domain.lng b/interface/web/client/lib/lang/fr_domain.lng
index f94d21bbe5..03b7c14c28 100644
--- a/interface/web/client/lib/lang/fr_domain.lng
+++ b/interface/web/client/lib/lang/fr_domain.lng
@@ -1,6 +1,6 @@
 <?php
 $wb['domain_error_empty'] = 'Le nom de domaine est vide';
 $wb['domain_error_unique'] = 'Ce nom de domaine existe déjà';
-$wb['domain_error_regex'] = 'Ce nom de domaine n\'est pas autorisé';
+$wb['domain_error_regex'] = 'Ce nom de domaine n’est pas autorisé';
 $wb['Domain'] = 'Domaine';
 ?>
diff --git a/interface/web/client/lib/lang/fr_reseller.lng b/interface/web/client/lib/lang/fr_reseller.lng
index ca033851f6..349f321d92 100644
--- a/interface/web/client/lib/lang/fr_reseller.lng
+++ b/interface/web/client/lib/lang/fr_reseller.lng
@@ -1,21 +1,20 @@
 <?php
-$wb['limit_maildomain_txt'] = 'Nombre maximal de domaines d\'emails';
-$wb['limit_mailbox_txt'] = 'Nombre maximal de boites email';
-$wb['limit_mailalias_txt'] = 'Nombre maximal d\'alias d\'email';
-$wb['limit_mailforward_txt'] = 'Nombre maximal de routeurs d\'email';
+$wb['limit_maildomain_txt'] = 'Nombre maximal de domaines d’e-mails';
+$wb['limit_mailbox_txt'] = 'Nombre maximal de boîtes aux lettres';
+$wb['limit_mailalias_txt'] = 'Nombre maximal d’alias d’e-mail';
+$wb['limit_mailforward_txt'] = 'Nombre maximal de routeurs d’e-mail';
 $wb['limit_mailcatchall_txt'] = 'Nombre maximal de comptes collecteurs';
-$wb['limit_mailrouting_txt'] = 'Nombre maximal de routes d\'emails';
-$wb['limit_mailfilter_txt'] = 'Nombre maximal de filtres d\'emails';
-$wb['limit_fetchmail_txt'] = 'Nombre maximal de comptes récupérateur email';
-$wb['limit_mailquota_txt'] = 'Quota des boites email';
-$wb['limit_spamfilter_wblist_txt'] = 'Nombre maximal de liste blanches/noires d\'emails';
-$wb['limit_spamfilter_user_txt'] = 'Nombre maximal d\'utilisateurs du filtre antispam';
+$wb['limit_mailrouting_txt'] = 'Nombre maximal de routes d’e-mails';
+$wb['limit_mailfilter_txt'] = 'Nombre maximal de filtres d’e-mails';
+$wb['limit_fetchmail_txt'] = 'Nombre maximal de comptes récupérateur e-mail';
+$wb['limit_mailquota_txt'] = 'Quota des boîtes aux lettres';
+$wb['limit_spamfilter_wblist_txt'] = 'Nombre maximal de liste blanches/noires d’e-mails';
+$wb['limit_spamfilter_user_txt'] = 'Nombre maximal d’utilisateurs du filtre antispam';
 $wb['limit_spamfilter_policy_txt'] = 'Nombre maximal de règles du filtre antispam';
 $wb['default_mailserver_txt'] = 'Serveur mail par défaut';
-$wb['company_name_txt'] = 'Nom de l\'entreprise';
-$wb['contact_firstname_txt'] = 'Contact firstname';
+$wb['company_name_txt'] = 'Nom de l’entreprise';
 $wb['contact_name_txt'] = 'Nom de contact';
-$wb['username_txt'] = 'Nom d\'utilisateur';
+$wb['username_txt'] = 'Nom d’utilisateur';
 $wb['password_txt'] = 'Mot de passe';
 $wb['password_strength_txt'] = 'Force du mot de passe';
 $wb['language_txt'] = 'Langue';
@@ -28,7 +27,7 @@ $wb['country_txt'] = 'Pays';
 $wb['telephone_txt'] = 'Numéro de téléphone';
 $wb['mobile_txt'] = 'Numéro de Mobile';
 $wb['fax_txt'] = 'Fax';
-$wb['email_txt'] = 'Email';
+$wb['email_txt'] = 'E-mail';
 $wb['internet_txt'] = 'Adresse Web';
 $wb['icq_txt'] = 'ICQ';
 $wb['notes_txt'] = 'Notes';
@@ -49,65 +48,64 @@ $wb['firstname_error_empty'] = 'Le prénom est vide.';
 $wb['contact_error_empty'] = 'Le nom de contact est vide.';
 $wb['default_webserver_txt'] = 'Serveur Web par défaut';
 $wb['limit_web_domain_txt'] = 'Nombre maximal de domaines Web';
-$wb['limit_web_aliasdomain_txt'] = 'Nombre maximal d\'alias de domaines';
+$wb['limit_web_aliasdomain_txt'] = 'Nombre maximal d’alias de domaines';
 $wb['limit_web_subdomain_txt'] = 'Nombre maximal de sous-domaines';
-$wb['limit_ftp_user_txt'] = 'Nombre maximal d\'utilisateurs FTP';
+$wb['limit_ftp_user_txt'] = 'Nombre maximal d’utilisateurs FTP';
 $wb['default_dnsserver_txt'] = 'Serveur DNS par défaut';
 $wb['limit_dns_zone_txt'] = 'Nombre maximal de zones DNS';
-$wb['limit_dns_record_txt'] = 'Nombre maximal d\'enregistrements DNS';
-$wb['limit_shell_user_txt'] = 'Nombre maximal d\'utilisateurs Shell';
+$wb['limit_dns_record_txt'] = 'Nombre maximal d’enregistrements DNS';
+$wb['limit_shell_user_txt'] = 'Nombre maximal d’utilisateurs Shell';
 $wb['limit_client_txt'] = 'Nombre maximal de clients';
-$wb['username_error_empty'] = 'Le nom d\'utilisateur est vide.';
-$wb['username_error_unique'] = 'Le nom d\'utilisateur existe déja.';
-$wb['limit_maildomain_error_notint'] = 'La limite de domaines d\'email doit être un nombre.';
-$wb['limit_mailbox_error_notint'] = 'La limite de boites d\'email doit être un nombre.';
-$wb['limit_mailalias_error_notint'] = 'La limite d\'alias d\'email doit être un nombre.';
-$wb['limit_mailforward_error_notint'] = 'La limite de routeurs d\'email doit être un nombre.';
+$wb['username_error_empty'] = 'Le nom d’utilisateur est vide.';
+$wb['username_error_unique'] = 'Le nom d’utilisateur existe déja.';
+$wb['limit_maildomain_error_notint'] = 'La limite de domaines d’e-mail doit être un nombre.';
+$wb['limit_mailbox_error_notint'] = 'La limite de boîtes d’e-mail doit être un nombre.';
+$wb['limit_mailalias_error_notint'] = 'La limite d’alias d’e-mail doit être un nombre.';
+$wb['limit_mailforward_error_notint'] = 'La limite de routeurs d’e-mail doit être un nombre.';
 $wb['limit_mailcatchall_error_notint'] = 'La limite de comptes collecteurs doit être un nombre.';
-$wb['limit_mailrouting_error_notint'] = 'La limite de routes d\'email doit être un nombre.';
-$wb['limit_mailfilter_error_notint'] = 'La limite de filtres d\'email doit être un nombre.';
-$wb['limit_mailfetchmail_error_notint'] = 'La limite de comptes récupérateur email doit être un nombre.';
-$wb['limit_mailquota_error_notint'] = 'La limite du quota des boites d\'email doit être un nombre.';
+$wb['limit_mailrouting_error_notint'] = 'La limite de routes d’e-mail doit être un nombre.';
+$wb['limit_mailfilter_error_notint'] = 'La limite de filtres d’e-mail doit être un nombre.';
+$wb['limit_mailfetchmail_error_notint'] = 'La limite de comptes récupérateur e-mail doit être un nombre.';
+$wb['limit_mailquota_error_notint'] = 'La limite du quota des boîtes d’e-mail doit être un nombre.';
 $wb['limit_spamfilter_wblist_error_notint'] = 'La limite de listes blanches/noires du filtre antispam doit être un nombre.';
-$wb['limit_spamfilter_user_error_notint'] = 'La limite d\'utilisateurs du filtre antispam doit être un nombre.';
+$wb['limit_spamfilter_user_error_notint'] = 'La limite d’utilisateurs du filtre antispam doit être un nombre.';
 $wb['limit_spamfilter_policy_error_notint'] = 'La limite de règles du filtre antispam doit être un nombre.';
 $wb['limit_web_domain_error_notint'] = 'La limite de sites web doit être un nombre.';
-$wb['limit_web_aliasdomain_error_notint'] = 'La limite d\'alias de domaines doit être un nombre.';
+$wb['limit_web_aliasdomain_error_notint'] = 'La limite d’alias de domaines doit être un nombre.';
 $wb['limit_web_subdomain_error_notint'] = 'La limite de sous-domaines doit être un nombre.';
-$wb['limit_ftp_user_error_notint'] = 'La limite d\'utilisateurs FTP doit être un nombre.';
-$wb['limit_shell_user_error_notint'] = 'La limite d\'utilisateurs Shell doit être un nombre.';
-$wb['limit_dns_zone_error_notint'] = 'La limite d\'enregistrements DNS doit être un nombre.';
+$wb['limit_ftp_user_error_notint'] = 'La limite d’utilisateurs FTP doit être un nombre.';
+$wb['limit_shell_user_error_notint'] = 'La limite d’utilisateurs Shell doit être un nombre.';
+$wb['limit_dns_zone_error_notint'] = 'La limite d’enregistrements DNS doit être un nombre.';
 $wb['default_dbserver_txt'] = 'Serveur de bases de données par défaut';
 $wb['limit_database_error_notint'] = 'La limite de bases de données doit être un nombre.';
 $wb['limit_cron_error_notint'] = 'La limite de tâches Cron doit être un nombre.';
 $wb['limit_cron_error_frequency'] = 'La fréquence des tâches Cron doit être un nombre.';
-$wb['username_error_regex'] = 'Le nom d\'utilisateur contient des caractères invalides.';
+$wb['username_error_regex'] = 'Le nom d’utilisateur contient des caractères invalides.';
 $wb['template_master_txt'] = 'Modèle Maître';
 $wb['template_additional_txt'] = 'Modèle additionnel';
 $wb['ssh_chroot_txt'] = 'Options Chroot SSH';
 $wb['web_php_options_txt'] = 'Options PHP';
 $wb['limit_client_error'] = 'Le nombre maximum de client a été atteint.';
-$wb['limit_client_error_positive_or_unlimited'] = 'Le nombre de clients doit être plus grand que 0.';
 $wb['limit_dns_slave_zone_txt'] = 'Nombre maximum de zones DNS secondaire';
 $wb['limit_dns_slave_zone_error_notint'] = 'La limite de zones DNS secondaire doit être un nombre';
-$wb['limit_dns_record_error_notint'] = 'Le nombre maximum d\'enregistrements DNS doit être un nombre.';
+$wb['limit_dns_record_error_notint'] = 'Le nombre maximum d’enregistrements DNS doit être un nombre.';
 $wb['limit_web_quota_txt'] = 'Quota web';
 $wb['limit_traffic_quota_txt'] = 'Quota de trafic';
 $wb['limit_trafficquota_error_notint'] = 'Le quota de trafic doit être un nombre.';
 $wb['customer_no_txt'] = 'No. Client';
 $wb['vat_id_txt'] = 'Numéro de TVA';
 $wb['required_fields_txt'] = '* Champs requis';
-$wb['limit_mailaliasdomain_txt'] = 'Nombre max d\'alias de domaine';
-$wb['limit_webdav_user_txt'] = 'Nombre max d\'utilisateurs Webdav';
-$wb['limit_webdav_user_error_notint'] = 'La limite d\'utilisateurs Webdav doit être un nombre.';
-$wb['limit_mailmailinglist_txt'] = 'Nombre max de listes d\'emails';
-$wb['limit_mailmailinglist_error_notint'] = 'La limite d\'enregistrement de liste d\'emails doit être un nombre.';
+$wb['limit_mailaliasdomain_txt'] = 'Nombre max d’alias de domaine';
+$wb['limit_webdav_user_txt'] = 'Nombre max d’utilisateurs WebDAV';
+$wb['limit_webdav_user_error_notint'] = 'La limite d’utilisateurs WebDAV doit être un nombre.';
+$wb['limit_mailmailinglist_txt'] = 'Nombre max de listes d’e-mails';
+$wb['limit_mailmailinglist_error_notint'] = 'La limite d’enregistrement de liste d’e-mails doit être un nombre.';
 $wb['limit_openvz_vm_txt'] = 'Nombre max de serveurs virtuels.';
 $wb['limit_openvz_vm_template_id_txt'] = 'Forcer le modèle de serveur virtuel.';
 $wb['limit_openvz_vm_error_notint'] = 'La limite de serveurs virtuels doit être un nombre.';
 $wb['web_php_options_notempty'] = 'Aucune option PHP choisie. Selectionnez au moins une option PHP.';
 $wb['ssh_chroot_notempty'] = 'Aucune option SSH chroot choisie. Selectionnez au moins une option SSH.';
-$wb['username_error_collision'] = 'Le nom d\'utilisateur ne devrait pas commencer par le mot -web- ou -web- suivi d\'un nombre.';
+$wb['username_error_collision'] = 'Le nom d’utilisateur ne devrait pas commencer par le mot -web- ou -web- suivi d’un chifre.';
 $wb['add_additional_template_txt'] = 'Ajouter un modèle';
 $wb['delete_additional_template_txt'] = 'Supprimer un modèle';
 $wb['limit_cgi_txt'] = 'CGI autorisé';
@@ -115,21 +113,21 @@ $wb['limit_ssi_txt'] = 'SSI autorisé';
 $wb['limit_perl_txt'] = 'Perl autorisé';
 $wb['limit_ruby_txt'] = 'Ruby autorisé';
 $wb['limit_python_txt'] = 'Python autorisé';
-$wb['force_suexec_txt'] = 'SuEXEC forcé';
-$wb['limit_hterror_txt'] = 'Documents d\'erreurs personnalisés autorisés';
+$wb['force_suexec_txt'] = 'suEXEC forcé';
+$wb['limit_hterror_txt'] = 'Documents d’erreurs personnalisés autorisés';
 $wb['limit_wildcard_txt'] = 'Sous-domaine Joker autorisé';
 $wb['limit_ssl_txt'] = 'SSL autorisé';
 $wb['web_limits_txt'] = 'Limites Web';
 $wb['email_limits_txt'] = 'Limites emails';
 $wb['database_limits_txt'] = 'Limites de bases de données';
-$wb['cron_job_limits_txt'] = 'Limites de tâches CRON';
+$wb['cron_job_limits_txt'] = 'Limites de tâches CROn';
 $wb['dns_limits_txt'] = 'Limites DNS';
 $wb['virtualization_limits_txt'] = 'Limites de virtualisation';
 $wb['generate_password_txt'] = 'Générer un mot de passe';
 $wb['repeat_password_txt'] = 'Répétez le mot de passe';
 $wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
 $wb['password_match_txt'] = 'Les mots de passe correspondent.';
-$wb['email_error_isemail'] = 'Saisissez une adresse email valide.';
+$wb['email_error_isemail'] = 'Saisissez une adresse e-mail valide.';
 $wb['customer_no_error_unique'] = 'Le numéro de client doit être unique (ou vide).';
 $wb['paypal_email_error_isemail'] = 'Saisissez un compte Paypal valide.';
 $wb['paypal_email_txt'] = 'Compte Paypal';
@@ -138,33 +136,17 @@ $wb['bank_account_number_txt'] = 'Numéro de compte bancaire';
 $wb['bank_account_owner_txt'] = 'Titulaire du compte bancaire';
 $wb['bank_code_txt'] = 'Code banque';
 $wb['bank_name_txt'] = 'Nom de la banque';
-$wb['bank_account_iban_txt'] = 'IBAN';
+$wb['bank_account_iban_txt'] = 'IBAn';
 $wb['bank_account_swift_txt'] = 'BIC / Swift';
-$wb['aps_limits_txt'] = 'Limites d\'installeur APS';
-$wb['limit_aps_txt'] = 'Nombre max d\'instances APS';
-$wb['limit_aps_error_notint'] = 'La limite d\'instances APS doit être un nombre.';
+$wb['aps_limits_txt'] = 'Limites d’installeur APS';
+$wb['limit_aps_txt'] = 'Nombre max d’instances APS';
+$wb['limit_aps_error_notint'] = 'La limite d’instances APS doit être un nombre.';
 $wb['default_slave_dnsserver_txt'] = 'Serveur DNS secondaire par défaut';
 $wb['locked_txt'] = 'Locked';
 $wb['canceled_txt'] = 'Canceled';
 $wb['gender_m_txt'] = 'Mr.';
 $wb['gender_f_txt'] = 'Ms.';
 $wb['gender_txt'] = 'Title';
-$wb["web_servers_txt"] = 'Serveurs Web';
-$wb["web_servers_placeholder"] = 'Choisissez des serveurs Web';
-$wb['no_web_server_error'] = 'Au moins un serveur web doit être sélectionné.';
-$wb['web_servers_used'] = 'Le serveur que vous tentez de retirer à ce client est utilisé comme serveur web. Veillez à ce que le serveur ne soit plus utilisé par ce client avant de le retirer.';
-$wb["dns_servers_txt"] = 'Serveurs DNS';
-$wb["dns_servers_placeholder"] = 'Choisissez des serveurs DNS';
-$wb['no_dns_server_error'] = 'Au moins un serveur DNS doit être sélectionné.';
-$wb['dns_servers_used'] = 'Le serveur que vous tentez de retirer à ce client est utilisé comme serveur DNS. Veillez à ce que le serveur ne soit plus utilisé par ce client avant de le retirer.';
-$wb["db_servers_txt"] = 'Serveur de bases de données';
-$wb["db_servers_placeholder"] = 'Choisissez des serveurs de bases de données';
-$wb['no_db_server_error'] = 'Au moins un serveur de bases de données doit être sélectionné.';
-$wb['db_servers_used'] = 'Le serveur que vous tentez de retirer à ce client est utilisé comme serveur de bases de données. Veillez à ce que le serveur ne soit plus utilisé par ce client avant de le retirer.';
-$wb["mail_servers_txt"] = 'Serveurs mail';
-$wb["mail_servers_placeholder"] = 'Choisissez des serveurs mail';
-$wb['no_mail_server_error'] = 'Au moins un serveur mail doit être sélectionné.';
-$wb['mail_servers_used'] = 'Le serveur que vous tentez de retirer à ce client est utilisé comme serveur mail. Veillez à ce que le serveur ne soit plus utilisé par ce client avant de le retirer.';
 $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';
@@ -175,7 +157,43 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $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.';
-$wb["btn_save_txt"] = "Save";
-$wb["btn_cancel_txt"] = "Cancel";
-$wb["email_error_empty"] = "Email is empty";
+$wb['contact_firstname_txt'] = 'Contact firstname';
+$wb['limit_backup_txt'] = 'Backupfunction available';
+$wb['limit_client_error_positive_or_unlimited'] = 'The number of clients must be > 0 or -1 (unlimited)';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select Webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before to remove it.';
+$wb['dns_servers_txt'] = 'DNS Server';
+$wb['dns_servers_placeholder'] = 'Select DNS Servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before to remove it.';
+$wb['db_servers_txt'] = 'Database Server';
+$wb['db_servers_placeholder'] = 'Select Database Servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before to remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select Mailservers';
+$wb['no_mail_server_error'] = 'At least one Mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before to remove it.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['email_error_empty'] = 'Email is empty';
 ?>
diff --git a/interface/web/client/lib/lang/fr_resellers_list.lng b/interface/web/client/lib/lang/fr_resellers_list.lng
index b477e47314..94c1fbefc7 100644
--- a/interface/web/client/lib/lang/fr_resellers_list.lng
+++ b/interface/web/client/lib/lang/fr_resellers_list.lng
@@ -1,11 +1,11 @@
 <?php
 $wb['list_head_txt'] = 'Revendeurs';
-$wb['client_id_txt'] = 'ID';
-$wb['company_name_txt'] = 'Nom de l\'entreprise';
+$wb['client_id_txt'] = 'Id';
+$wb['company_name_txt'] = 'Nom de l’entreprise';
 $wb['contact_name_txt'] = 'Nom du contact';
 $wb['city_txt'] = 'Ville';
 $wb['country_txt'] = 'Pays';
 $wb['add_new_record_txt'] = 'Ajouter un nouveau revendeur';
 $wb['customer_no_txt'] = 'Revendeur No.';
-$wb['username_txt'] = 'Nom d\'utilisateur';
+$wb['username_txt'] = 'Nom d’utilisateur';
 ?>
diff --git a/interface/web/client/lib/lang/hr.lng b/interface/web/client/lib/lang/hr.lng
index fed227eafc..6ff33ef4bf 100644
--- a/interface/web/client/lib/lang/hr.lng
+++ b/interface/web/client/lib/lang/hr.lng
@@ -1,5 +1,4 @@
 <?php
-$wb['Klijent'] = 'Klijenti';
 $wb['Address'] = 'Adresa';
 $wb['Limits'] = 'Limiti';
 $wb['Add Client'] = 'Dodaj klijenta';
@@ -23,6 +22,7 @@ $wb['error_domain_in mailuse'] = 'Ova domena ne može biti obrisana jer se koris
 $wb['error_domain_in webuse'] = 'Ova domena ne može biti obrisana jer se koristi kao web domena';
 $wb['error_client_can_not_add_domain'] = 'Ne možete dodati novu domenu';
 $wb['error_client_group_id_empty'] = 'Morate izabrati klijenta<br>';
+$wb['Client'] = 'Client';
+$wb['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
+$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng
index 736b780265..73f7f8fd93 100644
--- a/interface/web/client/lib/lang/hr_client.lng
+++ b/interface/web/client/lib/lang/hr_client.lng
@@ -155,7 +155,43 @@ $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["email_error_empty"] = "Email is empty";
+$wb['email_error_empty'] = 'Email is empty';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.';
+$wb['dns_servers_txt'] = 'DNS servers';
+$wb['dns_servers_placeholder'] = 'Select DNS servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.';
+$wb['db_servers_txt'] = 'Database servers';
+$wb['db_servers_placeholder'] = 'Select database servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select mailservers';
+$wb['no_mail_server_error'] = 'At least one mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['reseller_txt'] = 'Reseller';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/hr_client_circle.lng b/interface/web/client/lib/lang/hr_client_circle.lng
index bff3a9fd51..4621413269 100644
--- a/interface/web/client/lib/lang/hr_client_circle.lng
+++ b/interface/web/client/lib/lang/hr_client_circle.lng
@@ -7,5 +7,3 @@ $wb['client_ids_txt'] = 'Klijenti/Preprodavači';
 $wb['description_txt'] = 'Opis';
 $wb['active_txt'] = 'Aktivno';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/hr_client_circle_list.lng b/interface/web/client/lib/lang/hr_client_circle_list.lng
index c4648b1f7a..2d014df068 100644
--- a/interface/web/client/lib/lang/hr_client_circle_list.lng
+++ b/interface/web/client/lib/lang/hr_client_circle_list.lng
@@ -8,5 +8,3 @@ $wb['filter_txt'] = 'Filter';
 $wb['delete_txt'] = 'Obriši';
 $wb['active_txt'] = 'Aktivno';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/hr_client_del.lng b/interface/web/client/lib/lang/hr_client_del.lng
index 1db0476c84..939cc59fb6 100644
--- a/interface/web/client/lib/lang/hr_client_del.lng
+++ b/interface/web/client/lib/lang/hr_client_del.lng
@@ -5,5 +5,3 @@ $wb['btn_save_txt'] = 'Obriši klijenta';
 $wb['btn_cancel_txt'] = 'Prekini i ne briši klijenta';
 $wb['confirm_client_delete_txt'] = 'Are you sure you want to delete this client?';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/hr_client_message.lng b/interface/web/client/lib/lang/hr_client_message.lng
index 9f273affbb..706eaf0fb4 100644
--- a/interface/web/client/lib/lang/hr_client_message.lng
+++ b/interface/web/client/lib/lang/hr_client_message.lng
@@ -18,5 +18,3 @@ $wb['variables_txt'] = 'Varijable:';
 $wb['gender_m_txt'] = 'g.';
 $wb['gender_f_txt'] = 'gđa.';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/hr_client_message_template.lng b/interface/web/client/lib/lang/hr_client_message_template.lng
index 14d308b465..65e5fbfba3 100644
--- a/interface/web/client/lib/lang/hr_client_message_template.lng
+++ b/interface/web/client/lib/lang/hr_client_message_template.lng
@@ -9,5 +9,3 @@ $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.';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/hr_client_message_template_list.lng b/interface/web/client/lib/lang/hr_client_message_template_list.lng
index 3c858650b1..2bb8f91a9c 100644
--- a/interface/web/client/lib/lang/hr_client_message_template_list.lng
+++ b/interface/web/client/lib/lang/hr_client_message_template_list.lng
@@ -3,5 +3,3 @@ $wb['list_head_txt'] = 'Email predlošci';
 $wb['template_type_txt'] = 'Poruka za';
 $wb['template_name_txt'] = 'Naziv predloška';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/hr_client_template.lng b/interface/web/client/lib/lang/hr_client_template.lng
index b32dff0d7a..78106efae9 100644
--- a/interface/web/client/lib/lang/hr_client_template.lng
+++ b/interface/web/client/lib/lang/hr_client_template.lng
@@ -90,6 +90,28 @@ $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['dns_servers_txt'] = 'DNS servers';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/hr_client_template_list.lng b/interface/web/client/lib/lang/hr_client_template_list.lng
index 53bbd164b2..cdc2f0006a 100644
--- a/interface/web/client/lib/lang/hr_client_template_list.lng
+++ b/interface/web/client/lib/lang/hr_client_template_list.lng
@@ -4,5 +4,3 @@ $wb['template_type_txt'] = 'Vrsta';
 $wb['template_name_txt'] = 'Naziv predloška';
 $wb['template_id_txt'] = 'Template ID';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/hr_clients_list.lng b/interface/web/client/lib/lang/hr_clients_list.lng
index f4dd799d59..a733692285 100644
--- a/interface/web/client/lib/lang/hr_clients_list.lng
+++ b/interface/web/client/lib/lang/hr_clients_list.lng
@@ -9,5 +9,3 @@ $wb['add_new_record_txt'] = 'Dodaj klijenta';
 $wb['username_txt'] = 'Korisničko ime';
 $wb['customer_no_txt'] = 'Customer No.';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/hr_domain.lng b/interface/web/client/lib/lang/hr_domain.lng
index 772b88aa2a..784ccc63b7 100644
--- a/interface/web/client/lib/lang/hr_domain.lng
+++ b/interface/web/client/lib/lang/hr_domain.lng
@@ -2,7 +2,5 @@
 $wb['domain_error_empty'] = 'Ime domene je prazno';
 $wb['domain_error_unique'] = 'Domena već postoji';
 $wb['domain_error_regex'] = 'Ovo ime domene ne možete upotrijebiti';
-$wb['Domena'] = 'Domena';
+$wb['Domain'] = 'Domain';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/hr_domain_list.lng b/interface/web/client/lib/lang/hr_domain_list.lng
index daaf8161ac..2ac93018e0 100644
--- a/interface/web/client/lib/lang/hr_domain_list.lng
+++ b/interface/web/client/lib/lang/hr_domain_list.lng
@@ -4,5 +4,3 @@ $wb['add_new_record_txt'] = 'Dodaj domenu';
 $wb['domain_txt'] = 'Domena';
 $wb['user_txt'] = 'Klijent';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/hr_reseller.lng b/interface/web/client/lib/lang/hr_reseller.lng
index 2988b238c3..9b164737de 100644
--- a/interface/web/client/lib/lang/hr_reseller.lng
+++ b/interface/web/client/lib/lang/hr_reseller.lng
@@ -160,9 +160,40 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domain module Limit';
 $wb['client_limits_txt'] = 'Limiti klijenata';
 $wb['err_msg_master_tpl_set'] = 'All custom limit settings are ignored if any master template other than \\"custom\\" is selected.';
-$wb["btn_save_txt"] = "Save";
-$wb["btn_cancel_txt"] = "Cancel";
-$wb["email_error_empty"] = "Email is empty";
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['email_error_empty'] = 'Email is empty';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select Webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before to remove it.';
+$wb['dns_servers_txt'] = 'DNS Server';
+$wb['dns_servers_placeholder'] = 'Select DNS Servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before to remove it.';
+$wb['db_servers_txt'] = 'Database Server';
+$wb['db_servers_placeholder'] = 'Select Database Servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before to remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select Mailservers';
+$wb['no_mail_server_error'] = 'At least one Mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before to remove it.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/hr_resellers_list.lng b/interface/web/client/lib/lang/hr_resellers_list.lng
index 194d6ff87d..f6e3a0878d 100644
--- a/interface/web/client/lib/lang/hr_resellers_list.lng
+++ b/interface/web/client/lib/lang/hr_resellers_list.lng
@@ -9,5 +9,3 @@ $wb['add_new_record_txt'] = 'Dodaj novog preprodavača';
 $wb['customer_no_txt'] = 'Klijent br.';
 $wb['username_txt'] = 'Korisničko ime';
 ?>
-
-
diff --git a/interface/web/client/lib/lang/hu.lng b/interface/web/client/lib/lang/hu.lng
index 84beaf578a..a0038b4edc 100644
--- a/interface/web/client/lib/lang/hu.lng
+++ b/interface/web/client/lib/lang/hu.lng
@@ -23,4 +23,6 @@ $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is i
 $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['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
+$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
 ?>
diff --git a/interface/web/client/lib/lang/hu_client.lng b/interface/web/client/lib/lang/hu_client.lng
index 80c43b85d6..bc815739ef 100644
--- a/interface/web/client/lib/lang/hu_client.lng
+++ b/interface/web/client/lib/lang/hu_client.lng
@@ -155,5 +155,43 @@ $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["email_error_empty"] = "Email is empty";
+$wb['email_error_empty'] = 'Email is empty';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.';
+$wb['dns_servers_txt'] = 'DNS servers';
+$wb['dns_servers_placeholder'] = 'Select DNS servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.';
+$wb['db_servers_txt'] = 'Database servers';
+$wb['db_servers_placeholder'] = 'Select database servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select mailservers';
+$wb['no_mail_server_error'] = 'At least one mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['reseller_txt'] = 'Reseller';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/hu_client_template.lng b/interface/web/client/lib/lang/hu_client_template.lng
index aeeae7cc04..7adc250dd2 100644
--- a/interface/web/client/lib/lang/hu_client_template.lng
+++ b/interface/web/client/lib/lang/hu_client_template.lng
@@ -90,4 +90,28 @@ $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['dns_servers_txt'] = 'DNS servers';
 ?>
diff --git a/interface/web/client/lib/lang/hu_reseller.lng b/interface/web/client/lib/lang/hu_reseller.lng
index bdbfceb23d..1de852e6a0 100644
--- a/interface/web/client/lib/lang/hu_reseller.lng
+++ b/interface/web/client/lib/lang/hu_reseller.lng
@@ -160,7 +160,40 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $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.';
-$wb["btn_save_txt"] = "Save";
-$wb["btn_cancel_txt"] = "Cancel";
-$wb["email_error_empty"] = "Email is empty";
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['email_error_empty'] = 'Email is empty';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select Webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before to remove it.';
+$wb['dns_servers_txt'] = 'DNS Server';
+$wb['dns_servers_placeholder'] = 'Select DNS Servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before to remove it.';
+$wb['db_servers_txt'] = 'Database Server';
+$wb['db_servers_placeholder'] = 'Select Database Servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before to remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select Mailservers';
+$wb['no_mail_server_error'] = 'At least one Mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before to remove it.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/id.lng b/interface/web/client/lib/lang/id.lng
index 8459d16848..11723aa43e 100644
--- a/interface/web/client/lib/lang/id.lng
+++ b/interface/web/client/lib/lang/id.lng
@@ -23,4 +23,6 @@ $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is i
 $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['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
+$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
 ?>
diff --git a/interface/web/client/lib/lang/id_client.lng b/interface/web/client/lib/lang/id_client.lng
index 6ef65f67e4..1b5170f70f 100644
--- a/interface/web/client/lib/lang/id_client.lng
+++ b/interface/web/client/lib/lang/id_client.lng
@@ -155,5 +155,43 @@ $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["email_error_empty"] = "Email is empty";
+$wb['email_error_empty'] = 'Email is empty';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.';
+$wb['dns_servers_txt'] = 'DNS servers';
+$wb['dns_servers_placeholder'] = 'Select DNS servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.';
+$wb['db_servers_txt'] = 'Database servers';
+$wb['db_servers_placeholder'] = 'Select database servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select mailservers';
+$wb['no_mail_server_error'] = 'At least one mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['reseller_txt'] = 'Reseller';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/id_client_template.lng b/interface/web/client/lib/lang/id_client_template.lng
index 452a2c7662..bf7d8dcfa7 100644
--- a/interface/web/client/lib/lang/id_client_template.lng
+++ b/interface/web/client/lib/lang/id_client_template.lng
@@ -90,4 +90,28 @@ $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['dns_servers_txt'] = 'DNS servers';
 ?>
diff --git a/interface/web/client/lib/lang/id_reseller.lng b/interface/web/client/lib/lang/id_reseller.lng
index c264ef9048..443c585ed1 100644
--- a/interface/web/client/lib/lang/id_reseller.lng
+++ b/interface/web/client/lib/lang/id_reseller.lng
@@ -160,7 +160,40 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $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.';
-$wb["btn_save_txt"] = "Save";
-$wb["btn_cancel_txt"] = "Cancel";
-$wb["email_error_empty"] = "Email is empty";
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['email_error_empty'] = 'Email is empty';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select Webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before to remove it.';
+$wb['dns_servers_txt'] = 'DNS Server';
+$wb['dns_servers_placeholder'] = 'Select DNS Servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before to remove it.';
+$wb['db_servers_txt'] = 'Database Server';
+$wb['db_servers_placeholder'] = 'Select Database Servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before to remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select Mailservers';
+$wb['no_mail_server_error'] = 'At least one Mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before to remove it.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/it.lng b/interface/web/client/lib/lang/it.lng
index b742321aff..0e8b54aa20 100644
--- a/interface/web/client/lib/lang/it.lng
+++ b/interface/web/client/lib/lang/it.lng
@@ -10,17 +10,19 @@ $wb['Edit Reseller'] = 'Modifica rivenditore';
 $wb['Resellers'] = 'Rivenditori';
 $wb['error_has_clients'] = 'Questo rivenditore ha dei clienti, bisogna cancellarli prima di procedere.';
 $wb['add_additional_template_txt'] = 'Add additional template';
-$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['delete_additional_template_txt'] = 'Elimina 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['domain_txt'] = 'Dominio';
+$wb['client_txt'] = 'Cliente';
 $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['Templates'] = 'Templates';
 $wb['Limit-Templates'] = 'Limit-Templates';
+$wb['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
+$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
 ?>
diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng
index 4a2618422c..67db0e8475 100644
--- a/interface/web/client/lib/lang/it_client.lng
+++ b/interface/web/client/lib/lang/it_client.lng
@@ -1,19 +1,18 @@
 <?php
-$wb['limit_maildomain_txt'] = 'Numero massimo di email domains';
-$wb['limit_mailbox_txt'] = 'Numero massimo di mailboxes';
-$wb['limit_mailalias_txt'] = 'Numero massimo di email aliases';
-$wb['limit_mailforward_txt'] = 'Numero massimo di email forwarders';
-$wb['limit_mailcatchall_txt'] = 'Numero massimo di email catchall accounts';
+$wb['limit_maildomain_txt'] = 'Numero massimo di domini di posta';
+$wb['limit_mailbox_txt'] = 'Numero massimo di caselle di posta';
+$wb['limit_mailalias_txt'] = 'Numero massimo di aliases di posta';
+$wb['limit_mailforward_txt'] = 'Numero massimo di forwarders di posta';
+$wb['limit_mailcatchall_txt'] = 'Numero massimo di catchall accounts';
 $wb['limit_mailrouting_txt'] = 'Numero massimo di email routes';
 $wb['limit_mailfilter_txt'] = 'Numero massimo di email filters';
 $wb['limit_fetchmail_txt'] = 'Numero massimo di fetchmail accounts';
 $wb['limit_mailquota_txt'] = 'Limite quota mailbox';
-$wb['limit_spamfilter_wblist_txt'] = 'Numero massimo di spamfilter white / blacklist filters';
-$wb['limit_spamfilter_user_txt'] = 'Numero massimo di spamfilter users';
-$wb['limit_spamfilter_policy_txt'] = 'Numero massimo di spamfilter policys';
-$wb['default_mailserver_txt'] = 'Mailserver predefinito';
+$wb['limit_spamfilter_wblist_txt'] = 'Numero massimo di filtri spamfilter white / blacklist';
+$wb['limit_spamfilter_user_txt'] = 'Numero massimo di utenti spamfilter';
+$wb['limit_spamfilter_policy_txt'] = 'Numero massimo di policy per spamfilter';
+$wb['default_mailserver_txt'] = 'Server di posta predefinito';
 $wb['company_name_txt'] = 'Nome Azienda';
-$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Nome contatto';
 $wb['username_txt'] = 'Nome utente';
 $wb['password_txt'] = 'Password';
@@ -58,7 +57,7 @@ $wb['username_error_empty'] = 'Nome utente è vuoto.';
 $wb['username_error_unique'] = 'Il nome utente deve essere unico.';
 $wb['limit_maildomain_error_notint'] = 'Il limite dei domini email devessere un numero.';
 $wb['limit_mailbox_error_notint'] = 'Il limite delle caselle di posta devessere un numero.';
-$wb['limit_mailalias_error_notint'] = 'The email alias limit must be a number.';
+$wb['limit_mailalias_error_notint'] = 'Il limite di email alias deve essere un numero.';
 $wb['limit_mailforward_error_notint'] = 'The email forward limit must be a number.';
 $wb['limit_mailcatchall_error_notint'] = 'The email catchall limit must be a number.';
 $wb['limit_mailrouting_error_notint'] = 'The email routing limit must be a number.';
@@ -91,26 +90,25 @@ $wb['limit_cron_error_frequency'] = 'The cron frequency limit must be a number.'
 $wb['limit_client_error'] = 'The max. number of clients is reached.';
 $wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
 $wb['limit_mailaliasdomain_error_notint'] = 'The email domain alias limit must be a number.';
-$wb['limit_web_quota_txt'] = 'Web Quota';
-$wb['limit_traffic_quota_txt'] = 'Traffic Quota';
+$wb['limit_web_quota_txt'] = 'Quota Web';
+$wb['limit_traffic_quota_txt'] = 'Quota Traffico';
 $wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.';
 $wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
 $wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
-$wb['limit_backup_txt'] = 'Backupfunction available';
 $wb['customer_no_txt'] = 'Customer No.';
 $wb['vat_id_txt'] = 'P. IVA';
-$wb['required_fields_txt'] = '* Required fields';
+$wb['required_fields_txt'] = '* Campi obbligatori';
 $wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
 $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
-$wb['company_id_txt'] = 'Company/Entrepreneur ID';
-$wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
+$wb['company_id_txt'] = 'Azienda/Titolare ID';
+$wb['limit_openvz_vm_txt'] = 'Numero massimo server virtuali';
 $wb['limit_openvz_vm_template_id_txt'] = 'Force virtual server template';
 $wb['limit_openvz_vm_error_notint'] = 'The virtual server limit must be a number.';
 $wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least one PHP option.';
 $wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.';
 $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['delete_additional_template_txt'] = 'Elimina additional template';
 $wb['limit_cgi_txt'] = 'CGI available';
 $wb['limit_ssi_txt'] = 'SSI available';
 $wb['limit_perl_txt'] = 'Perl available';
@@ -131,11 +129,11 @@ $wb['database_limits_txt'] = 'Database Limits';
 $wb['cron_job_limits_txt'] = 'Cron Job Limits';
 $wb['dns_limits_txt'] = 'DNS Limits';
 $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'] = 'Genera Password';
+$wb['repeat_password_txt'] = 'Ripeti Password';
+$wb['password_mismatch_txt'] = 'Le password non coincidono.';
+$wb['password_match_txt'] = 'Le password coincidono.';
+$wb['active_template_additional_txt'] = 'AttivoAddons';
 $wb['bank_account_owner_txt'] = 'Bank account owner';
 $wb['email_error_isemail'] = 'Please enter a valid email address.';
 $wb['customer_no_error_unique'] = 'The customer no. must be unique (or empty).';
@@ -146,14 +144,54 @@ $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["email_error_empty"] = "Email is empty";
+$wb['locked_txt'] = 'Bloccato (disables all webs etc.)';
+$wb['canceled_txt'] = 'Cancellato(disables client login)';
+$wb['gender_txt'] = 'Titolo';
+$wb['gender_m_txt'] = 'Sig.';
+$wb['gender_f_txt'] = 'Sig.ra';
+$wb['added_by_txt'] = 'Aggiunto da';
+$wb['added_date_txt'] = 'Data inserimento';
+$wb['parent_client_id_txt'] = 'Cliente di rivenditore';
+$wb['none_txt'] = 'Nessuno';
+$wb['contact_firstname_txt'] = 'Contact firstname';
+$wb['limit_backup_txt'] = 'Backupfunction available';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.';
+$wb['dns_servers_txt'] = 'DNS servers';
+$wb['dns_servers_placeholder'] = 'Select DNS servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.';
+$wb['db_servers_txt'] = 'Database servers';
+$wb['db_servers_placeholder'] = 'Select database servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select mailservers';
+$wb['no_mail_server_error'] = 'At least one mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['reseller_txt'] = 'Reseller';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
+$wb['email_error_empty'] = 'Email is empty';
 ?>
diff --git a/interface/web/client/lib/lang/it_client_circle.lng b/interface/web/client/lib/lang/it_client_circle.lng
index f98a1447fc..b7703b4f99 100644
--- a/interface/web/client/lib/lang/it_client_circle.lng
+++ b/interface/web/client/lib/lang/it_client_circle.lng
@@ -4,6 +4,6 @@ $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['description_txt'] = 'Descrizione';
+$wb['active_txt'] = 'Attivo';
 ?>
diff --git a/interface/web/client/lib/lang/it_client_circle_list.lng b/interface/web/client/lib/lang/it_client_circle_list.lng
index 00fd0b3998..faa225f058 100644
--- a/interface/web/client/lib/lang/it_client_circle_list.lng
+++ b/interface/web/client/lib/lang/it_client_circle_list.lng
@@ -2,9 +2,9 @@
 $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['description_txt'] = 'Descrizione';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo  circle';
 $wb['filter_txt'] = 'Filter';
-$wb['delete_txt'] = 'Delete';
-$wb['active_txt'] = 'Active';
+$wb['delete_txt'] = 'Elimina';
+$wb['active_txt'] = 'Attivo';
 ?>
diff --git a/interface/web/client/lib/lang/it_client_message.lng b/interface/web/client/lib/lang/it_client_message.lng
index 6b2a872f10..f5f93c2294 100644
--- a/interface/web/client/lib/lang/it_client_message.lng
+++ b/interface/web/client/lib/lang/it_client_message.lng
@@ -1,14 +1,14 @@
 <?php
 $wb['btn_send_txt'] = 'Send email';
-$wb['btn_cancel_txt'] = 'Cancel';
+$wb['btn_cancel_txt'] = 'Annulla';
 $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['subject_invalid_error'] = 'Subject  vuoto.';
+$wb['message_invalid_error'] = 'Message  vuoto.';
 $wb['email_sent_to_txt'] = 'Email sent to:';
 $wb['page_head_txt'] = 'Send customer information';
 $wb['recipient_txt'] = 'Recipient';
diff --git a/interface/web/client/lib/lang/it_client_message_template.lng b/interface/web/client/lib/lang/it_client_message_template.lng
index 65e5fbfba3..ea748be685 100644
--- a/interface/web/client/lib/lang/it_client_message_template.lng
+++ b/interface/web/client/lib/lang/it_client_message_template.lng
@@ -1,6 +1,5 @@
 <?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';
@@ -8,4 +7,5 @@ $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_name_txt'] = 'Template name';
 ?>
diff --git a/interface/web/client/lib/lang/it_client_template.lng b/interface/web/client/lib/lang/it_client_template.lng
index ad167f6c0c..64c6eaf34c 100644
--- a/interface/web/client/lib/lang/it_client_template.lng
+++ b/interface/web/client/lib/lang/it_client_template.lng
@@ -60,9 +60,7 @@ $wb['limit_trafficquota_error_notint'] = 'Quota traffico devessere un numero.';
 $wb['template_del_aborted_txt'] = 'Eliminazione annullata. Esiste almeno un cliente che ha questo template attivo.';
 $wb['limit_webdav_user_txt'] = 'Num. massimo utenti webdav';
 $wb['limit_webdav_user_error_notint'] = 'Il limite utenti webdav devessere un numero.';
-$wb['limit_backup_txt'] = 'Backupfunction available';
 $wb['template_type_txt'] = 'Template type';
-$wb['template_name_txt'] = 'Template name';
 $wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
 $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
 $wb['limit_openvz_vm_txt'] = 'Max. number of virtual servers';
@@ -90,4 +88,30 @@ $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
+$wb['template_name_txt'] = 'Template name';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['limit_backup_txt'] = 'Backupfunction available';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['dns_servers_txt'] = 'DNS servers';
 ?>
diff --git a/interface/web/client/lib/lang/it_clients_list.lng b/interface/web/client/lib/lang/it_clients_list.lng
index c924577a06..14aacb1f0f 100644
--- a/interface/web/client/lib/lang/it_clients_list.lng
+++ b/interface/web/client/lib/lang/it_clients_list.lng
@@ -6,6 +6,6 @@ $wb['contact_name_txt'] = 'Nome contatto';
 $wb['city_txt'] = 'Città';
 $wb['country_txt'] = 'Stato';
 $wb['add_new_record_txt'] = 'Aggiungi nuovo cliente';
-$wb['username_txt'] = 'Username';
+$wb['username_txt'] = 'Nome Utente';
 $wb['customer_no_txt'] = 'Customer No.';
 ?>
diff --git a/interface/web/client/lib/lang/it_domain_list.lng b/interface/web/client/lib/lang/it_domain_list.lng
index 7ee0b19442..922bcd8ef3 100644
--- a/interface/web/client/lib/lang/it_domain_list.lng
+++ b/interface/web/client/lib/lang/it_domain_list.lng
@@ -2,5 +2,5 @@
 $wb['list_head_txt'] = 'Domini';
 $wb['add_new_record_txt'] = 'Aggiungi nuovo dominio';
 $wb['domain_txt'] = 'Dominio';
-$wb['user_txt'] = 'Client';
+$wb['user_txt'] = 'Cliente';
 ?>
diff --git a/interface/web/client/lib/lang/it_reseller.lng b/interface/web/client/lib/lang/it_reseller.lng
index 9ba66cd0ed..eb6ad2972d 100644
--- a/interface/web/client/lib/lang/it_reseller.lng
+++ b/interface/web/client/lib/lang/it_reseller.lng
@@ -13,29 +13,28 @@ $wb['limit_spamfilter_user_txt'] = 'Max. number of spamfilter users';
 $wb['limit_spamfilter_policy_txt'] = 'Max. number of spamfilter policies';
 $wb['default_mailserver_txt'] = 'Default Mailserver';
 $wb['company_name_txt'] = 'Company name';
-$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Contact name';
-$wb['username_txt'] = 'Username';
+$wb['username_txt'] = 'Nome Utente';
 $wb['password_txt'] = 'Password';
-$wb['password_strength_txt'] = 'Password strength';
+$wb['password_strength_txt'] = 'Livello sicurezza Password';
 $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['usertheme_txt'] = 'Tema';
+$wb['street_txt'] = 'Via';
+$wb['zip_txt'] = 'CAP';
+$wb['city_txt'] = 'Città';
+$wb['state_txt'] = 'Stato';
 $wb['country_txt'] = 'Country';
-$wb['telephone_txt'] = 'Telephone';
+$wb['telephone_txt'] = 'Telefono';
 $wb['mobile_txt'] = 'Mobile';
 $wb['fax_txt'] = 'Fax';
 $wb['email_txt'] = 'Email';
 $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['notes_txt'] = 'Note';
+$wb['company_txt'] = 'Azienda';
+$wb['title_txt'] = 'Titolo';
+$wb['firstname_txt'] = 'Nome';
+$wb['surname_txt'] = 'Cognome';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
@@ -45,8 +44,8 @@ $wb['limit_cron_type_txt'] = 'Max. type of cron jobs (chrooted and full implies
 $wb['limit_cron_frequency_txt'] = 'Min. delay between executions';
 $wb['ip_address_txt'] = 'ip_address';
 $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.';
+$wb['firstname_error_empty'] = 'Firstname  vuoto.';
+$wb['contact_error_empty'] = 'Contact name  vuoto.';
 $wb['default_webserver_txt'] = 'Default Webserver';
 $wb['limit_web_domain_txt'] = 'Max. number of web domains';
 $wb['limit_web_aliasdomain_txt'] = 'Max. number of web aliasdomains';
@@ -58,7 +57,7 @@ $wb['limit_dns_slave_zone_txt'] = 'Max. number of secondary DNS zones';
 $wb['limit_dns_record_txt'] = 'Max. number DNS records';
 $wb['limit_shell_user_txt'] = 'Max. number of Shell users';
 $wb['limit_client_txt'] = 'Max. number of Clients';
-$wb['username_error_empty'] = 'Username is empty.';
+$wb['username_error_empty'] = 'Username  vuoto.';
 $wb['username_error_unique'] = 'The username must be unique.';
 $wb['limit_maildomain_error_notint'] = 'The email domain limit must be a number.';
 $wb['limit_mailbox_error_notint'] = 'The mailbox limit must be a number.';
@@ -90,7 +89,6 @@ $wb['template_additional_txt'] = 'Addon template';
 $wb['ssh_chroot_txt'] = 'SSH-Chroot Options';
 $wb['web_php_options_txt'] = 'PHP Options';
 $wb['limit_client_error'] = 'The max. number of clients is reached.';
-$wb['limit_client_error_positive_or_unlimited'] = 'The number of clients must be > 0';
 $wb['limit_web_quota_txt'] = 'Web Quota';
 $wb['limit_traffic_quota_txt'] = 'Traffic Quota';
 $wb['limit_trafficquota_error_notint'] = 'Traffic Quota must be a number.';
@@ -99,7 +97,6 @@ $wb['vat_id_txt'] = 'VAT ID';
 $wb['required_fields_txt'] = '* Required fields';
 $wb['limit_webdav_user_txt'] = 'Max. number of Webdav users';
 $wb['limit_webdav_user_error_notint'] = 'The webdav user limit must be a number.';
-$wb['limit_backup_txt'] = 'Backupfunction available';
 $wb['limit_mailmailinglist_txt'] = 'Max. number of mailing lists';
 $wb['limit_mailaliasdomain_txt'] = 'Max. number of domain aliases';
 $wb['limit_mailmailinglist_error_notint'] = 'The mailing list record limit must be a number.';
@@ -110,7 +107,7 @@ $wb['web_php_options_notempty'] = 'No PHP option(s) selected. Select at least on
 $wb['ssh_chroot_notempty'] = 'No SSH chroot option selected. Select at least one SSH option.';
 $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['delete_additional_template_txt'] = 'Elimina additional template';
 $wb['limit_cgi_txt'] = 'CGI available';
 $wb['limit_ssi_txt'] = 'SSI available';
 $wb['limit_perl_txt'] = 'Perl available';
@@ -126,10 +123,10 @@ $wb['database_limits_txt'] = 'Database Limits';
 $wb['cron_job_limits_txt'] = 'Cron Job Limits';
 $wb['dns_limits_txt'] = 'DNS Limits';
 $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['generate_password_txt'] = 'Genera Password';
+$wb['repeat_password_txt'] = 'Ripeti Password';
+$wb['password_mismatch_txt'] = 'Le password non coincidono.';
+$wb['password_match_txt'] = 'Le password coincidono.';
 $wb['email_error_isemail'] = 'Please enter a valid email address.';
 $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.';
@@ -160,7 +157,43 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $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.';
-$wb["btn_save_txt"] = "Save";
-$wb["btn_cancel_txt"] = "Cancel";
-$wb["email_error_empty"] = "Email is empty";
+$wb['contact_firstname_txt'] = 'Contact firstname';
+$wb['limit_backup_txt'] = 'Backupfunction available';
+$wb['limit_client_error_positive_or_unlimited'] = 'The number of clients must be > 0 or -1 (unlimited)';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select Webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before to remove it.';
+$wb['dns_servers_txt'] = 'DNS Server';
+$wb['dns_servers_placeholder'] = 'Select DNS Servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before to remove it.';
+$wb['db_servers_txt'] = 'Database Server';
+$wb['db_servers_placeholder'] = 'Select Database Servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before to remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select Mailservers';
+$wb['no_mail_server_error'] = 'At least one Mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before to remove it.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['email_error_empty'] = 'Email is empty';
 ?>
diff --git a/interface/web/client/lib/lang/it_resellers_list.lng b/interface/web/client/lib/lang/it_resellers_list.lng
index 3e74292053..079ce84f4d 100644
--- a/interface/web/client/lib/lang/it_resellers_list.lng
+++ b/interface/web/client/lib/lang/it_resellers_list.lng
@@ -7,5 +7,5 @@ $wb['city_txt'] = 'Città';
 $wb['country_txt'] = 'Nazione';
 $wb['add_new_record_txt'] = 'Aggiungi nuovo rivenditore';
 $wb['customer_no_txt'] = 'Customer No.';
-$wb['username_txt'] = 'Username';
+$wb['username_txt'] = 'Nome Utente';
 ?>
diff --git a/interface/web/client/lib/lang/ja.lng b/interface/web/client/lib/lang/ja.lng
index c0c097156f..f723ebf4bc 100644
--- a/interface/web/client/lib/lang/ja.lng
+++ b/interface/web/client/lib/lang/ja.lng
@@ -23,4 +23,6 @@ $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is i
 $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['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
+$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
 ?>
diff --git a/interface/web/client/lib/lang/ja_client.lng b/interface/web/client/lib/lang/ja_client.lng
index 875ac92daa..fcad2c8af7 100644
--- a/interface/web/client/lib/lang/ja_client.lng
+++ b/interface/web/client/lib/lang/ja_client.lng
@@ -155,5 +155,43 @@ $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["email_error_empty"] = "Email is empty";
+$wb['email_error_empty'] = 'Email is empty';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.';
+$wb['dns_servers_txt'] = 'DNS servers';
+$wb['dns_servers_placeholder'] = 'Select DNS servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.';
+$wb['db_servers_txt'] = 'Database servers';
+$wb['db_servers_placeholder'] = 'Select database servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select mailservers';
+$wb['no_mail_server_error'] = 'At least one mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['reseller_txt'] = 'Reseller';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/ja_client_template.lng b/interface/web/client/lib/lang/ja_client_template.lng
index 1044e913e6..55f53d9a4e 100644
--- a/interface/web/client/lib/lang/ja_client_template.lng
+++ b/interface/web/client/lib/lang/ja_client_template.lng
@@ -90,4 +90,28 @@ $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['dns_servers_txt'] = 'DNS servers';
 ?>
diff --git a/interface/web/client/lib/lang/ja_reseller.lng b/interface/web/client/lib/lang/ja_reseller.lng
index 16b3831ff8..3ae09d4d0c 100644
--- a/interface/web/client/lib/lang/ja_reseller.lng
+++ b/interface/web/client/lib/lang/ja_reseller.lng
@@ -160,7 +160,40 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $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.';
-$wb["btn_save_txt"] = "Save";
-$wb["btn_cancel_txt"] = "Cancel";
-$wb["email_error_empty"] = "Email is empty";
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['email_error_empty'] = 'Email is empty';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select Webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before to remove it.';
+$wb['dns_servers_txt'] = 'DNS Server';
+$wb['dns_servers_placeholder'] = 'Select DNS Servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before to remove it.';
+$wb['db_servers_txt'] = 'Database Server';
+$wb['db_servers_placeholder'] = 'Select Database Servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before to remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select Mailservers';
+$wb['no_mail_server_error'] = 'At least one Mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before to remove it.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/nl.lng b/interface/web/client/lib/lang/nl.lng
index 2ebe3895be..4c4b4d19b3 100644
--- a/interface/web/client/lib/lang/nl.lng
+++ b/interface/web/client/lib/lang/nl.lng
@@ -23,4 +23,6 @@ $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is i
 $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['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
+$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
 ?>
diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng
index 7772219537..85a8da4a41 100644
--- a/interface/web/client/lib/lang/nl_client.lng
+++ b/interface/web/client/lib/lang/nl_client.lng
@@ -155,5 +155,43 @@ $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["email_error_empty"] = "Email is empty";
+$wb['email_error_empty'] = 'Email is empty';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.';
+$wb['dns_servers_txt'] = 'DNS servers';
+$wb['dns_servers_placeholder'] = 'Select DNS servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.';
+$wb['db_servers_txt'] = 'Database servers';
+$wb['db_servers_placeholder'] = 'Select database servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select mailservers';
+$wb['no_mail_server_error'] = 'At least one mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['reseller_txt'] = 'Reseller';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/nl_client_template.lng b/interface/web/client/lib/lang/nl_client_template.lng
index e3316be2b8..676571dfe2 100644
--- a/interface/web/client/lib/lang/nl_client_template.lng
+++ b/interface/web/client/lib/lang/nl_client_template.lng
@@ -90,4 +90,28 @@ $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['dns_servers_txt'] = 'DNS servers';
 ?>
diff --git a/interface/web/client/lib/lang/nl_reseller.lng b/interface/web/client/lib/lang/nl_reseller.lng
index fcb709f67a..75fe763c83 100644
--- a/interface/web/client/lib/lang/nl_reseller.lng
+++ b/interface/web/client/lib/lang/nl_reseller.lng
@@ -160,7 +160,40 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $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.';
-$wb["btn_save_txt"] = "Save";
-$wb["btn_cancel_txt"] = "Cancel";
-$wb["email_error_empty"] = "Email is empty";
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['email_error_empty'] = 'Email is empty';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select Webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before to remove it.';
+$wb['dns_servers_txt'] = 'DNS Server';
+$wb['dns_servers_placeholder'] = 'Select DNS Servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before to remove it.';
+$wb['db_servers_txt'] = 'Database Server';
+$wb['db_servers_placeholder'] = 'Select Database Servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before to remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select Mailservers';
+$wb['no_mail_server_error'] = 'At least one Mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before to remove it.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/pl.lng b/interface/web/client/lib/lang/pl.lng
index 12dc65ce96..885a99883d 100644
--- a/interface/web/client/lib/lang/pl.lng
+++ b/interface/web/client/lib/lang/pl.lng
@@ -23,4 +23,6 @@ $wb['error_domain_in mailuse'] = 'Ta domena nie może zostać usunięta poniewa
 $wb['error_domain_in webuse'] = 'Ta domena nie może zostać usunięta ponieważ jest używana jako domena dla strony www.';
 $wb['error_client_can_not_add_domain'] = 'Nie możesz dodać nowej domeny';
 $wb['error_client_group_id_empty'] = 'Musisz wybrać klienta<br>';
+$wb['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
+$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
 ?>
diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng
index 19adef1044..3070af7a42 100644
--- a/interface/web/client/lib/lang/pl_client.lng
+++ b/interface/web/client/lib/lang/pl_client.lng
@@ -155,5 +155,43 @@ $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["email_error_empty"] = "Email is empty";
+$wb['email_error_empty'] = 'Email is empty';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.';
+$wb['dns_servers_txt'] = 'DNS servers';
+$wb['dns_servers_placeholder'] = 'Select DNS servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.';
+$wb['db_servers_txt'] = 'Database servers';
+$wb['db_servers_placeholder'] = 'Select database servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select mailservers';
+$wb['no_mail_server_error'] = 'At least one mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['reseller_txt'] = 'Reseller';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/pl_client_template.lng b/interface/web/client/lib/lang/pl_client_template.lng
index 55e377d835..7cda2afdea 100644
--- a/interface/web/client/lib/lang/pl_client_template.lng
+++ b/interface/web/client/lib/lang/pl_client_template.lng
@@ -90,4 +90,28 @@ $wb['limit_aps_txt'] = 'Maks. liczba instancji APS';
 $wb['limit_aps_error_notint'] = 'Limit instancji APS musi być liczbą';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['dns_servers_txt'] = 'DNS servers';
 ?>
diff --git a/interface/web/client/lib/lang/pl_reseller.lng b/interface/web/client/lib/lang/pl_reseller.lng
index 056094c54e..37e64c81e7 100644
--- a/interface/web/client/lib/lang/pl_reseller.lng
+++ b/interface/web/client/lib/lang/pl_reseller.lng
@@ -160,7 +160,40 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $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.';
-$wb["btn_save_txt"] = "Save";
-$wb["btn_cancel_txt"] = "Cancel";
-$wb["email_error_empty"] = "Email is empty";
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['email_error_empty'] = 'Email is empty';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select Webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before to remove it.';
+$wb['dns_servers_txt'] = 'DNS Server';
+$wb['dns_servers_placeholder'] = 'Select DNS Servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before to remove it.';
+$wb['db_servers_txt'] = 'Database Server';
+$wb['db_servers_placeholder'] = 'Select Database Servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before to remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select Mailservers';
+$wb['no_mail_server_error'] = 'At least one Mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before to remove it.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/pt.lng b/interface/web/client/lib/lang/pt.lng
index cd565699bc..eb7e6629f4 100644
--- a/interface/web/client/lib/lang/pt.lng
+++ b/interface/web/client/lib/lang/pt.lng
@@ -23,4 +23,6 @@ $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is i
 $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['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
+$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
 ?>
diff --git a/interface/web/client/lib/lang/pt_client.lng b/interface/web/client/lib/lang/pt_client.lng
index 5f2a397208..a77746ead6 100644
--- a/interface/web/client/lib/lang/pt_client.lng
+++ b/interface/web/client/lib/lang/pt_client.lng
@@ -155,5 +155,43 @@ $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["email_error_empty"] = "Email is empty";
+$wb['email_error_empty'] = 'Email is empty';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.';
+$wb['dns_servers_txt'] = 'DNS servers';
+$wb['dns_servers_placeholder'] = 'Select DNS servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.';
+$wb['db_servers_txt'] = 'Database servers';
+$wb['db_servers_placeholder'] = 'Select database servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select mailservers';
+$wb['no_mail_server_error'] = 'At least one mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['reseller_txt'] = 'Reseller';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/pt_client_template.lng b/interface/web/client/lib/lang/pt_client_template.lng
index e3d81aece8..30f086a42b 100644
--- a/interface/web/client/lib/lang/pt_client_template.lng
+++ b/interface/web/client/lib/lang/pt_client_template.lng
@@ -90,4 +90,28 @@ $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['dns_servers_txt'] = 'DNS servers';
 ?>
diff --git a/interface/web/client/lib/lang/pt_reseller.lng b/interface/web/client/lib/lang/pt_reseller.lng
index 05b1bf08e2..1c7ffc35c0 100644
--- a/interface/web/client/lib/lang/pt_reseller.lng
+++ b/interface/web/client/lib/lang/pt_reseller.lng
@@ -160,7 +160,40 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $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.';
-$wb["btn_save_txt"] = "Save";
-$wb["btn_cancel_txt"] = "Cancel";
-$wb["email_error_empty"] = "Email is empty";
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['email_error_empty'] = 'Email is empty';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select Webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before to remove it.';
+$wb['dns_servers_txt'] = 'DNS Server';
+$wb['dns_servers_placeholder'] = 'Select DNS Servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before to remove it.';
+$wb['db_servers_txt'] = 'Database Server';
+$wb['db_servers_placeholder'] = 'Select Database Servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before to remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select Mailservers';
+$wb['no_mail_server_error'] = 'At least one Mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before to remove it.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/ro.lng b/interface/web/client/lib/lang/ro.lng
index bb03af82b7..c8846954d4 100644
--- a/interface/web/client/lib/lang/ro.lng
+++ b/interface/web/client/lib/lang/ro.lng
@@ -23,4 +23,6 @@ $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is i
 $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['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
+$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
 ?>
diff --git a/interface/web/client/lib/lang/ro_client.lng b/interface/web/client/lib/lang/ro_client.lng
index 72bc88f579..a059dec405 100644
--- a/interface/web/client/lib/lang/ro_client.lng
+++ b/interface/web/client/lib/lang/ro_client.lng
@@ -155,5 +155,43 @@ $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["email_error_empty"] = "Email is empty";
+$wb['email_error_empty'] = 'Email is empty';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.';
+$wb['dns_servers_txt'] = 'DNS servers';
+$wb['dns_servers_placeholder'] = 'Select DNS servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.';
+$wb['db_servers_txt'] = 'Database servers';
+$wb['db_servers_placeholder'] = 'Select database servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select mailservers';
+$wb['no_mail_server_error'] = 'At least one mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['reseller_txt'] = 'Reseller';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/ro_client_template.lng b/interface/web/client/lib/lang/ro_client_template.lng
index 19338fe055..8e7ebb62a0 100644
--- a/interface/web/client/lib/lang/ro_client_template.lng
+++ b/interface/web/client/lib/lang/ro_client_template.lng
@@ -90,4 +90,28 @@ $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['dns_servers_txt'] = 'DNS servers';
 ?>
diff --git a/interface/web/client/lib/lang/ro_reseller.lng b/interface/web/client/lib/lang/ro_reseller.lng
index 9ba66cd0ed..adabf8daa5 100644
--- a/interface/web/client/lib/lang/ro_reseller.lng
+++ b/interface/web/client/lib/lang/ro_reseller.lng
@@ -160,7 +160,40 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $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.';
-$wb["btn_save_txt"] = "Save";
-$wb["btn_cancel_txt"] = "Cancel";
-$wb["email_error_empty"] = "Email is empty";
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['email_error_empty'] = 'Email is empty';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select Webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before to remove it.';
+$wb['dns_servers_txt'] = 'DNS Server';
+$wb['dns_servers_placeholder'] = 'Select DNS Servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before to remove it.';
+$wb['db_servers_txt'] = 'Database Server';
+$wb['db_servers_placeholder'] = 'Select Database Servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before to remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select Mailservers';
+$wb['no_mail_server_error'] = 'At least one Mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before to remove it.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/ru.lng b/interface/web/client/lib/lang/ru.lng
index 087e68b345..eb5851f013 100644
--- a/interface/web/client/lib/lang/ru.lng
+++ b/interface/web/client/lib/lang/ru.lng
@@ -23,4 +23,6 @@ $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is i
 $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['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
+$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
 ?>
diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng
index 3c03cf4f68..3f5de65e90 100644
--- a/interface/web/client/lib/lang/ru_client.lng
+++ b/interface/web/client/lib/lang/ru_client.lng
@@ -155,5 +155,43 @@ $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["email_error_empty"] = "Email is empty";
+$wb['email_error_empty'] = 'Email is empty';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.';
+$wb['dns_servers_txt'] = 'DNS servers';
+$wb['dns_servers_placeholder'] = 'Select DNS servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.';
+$wb['db_servers_txt'] = 'Database servers';
+$wb['db_servers_placeholder'] = 'Select database servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select mailservers';
+$wb['no_mail_server_error'] = 'At least one mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['reseller_txt'] = 'Reseller';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/ru_client_template.lng b/interface/web/client/lib/lang/ru_client_template.lng
index a20e9aeed8..d3a35d1707 100644
--- a/interface/web/client/lib/lang/ru_client_template.lng
+++ b/interface/web/client/lib/lang/ru_client_template.lng
@@ -90,4 +90,28 @@ $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['dns_servers_txt'] = 'DNS servers';
 ?>
diff --git a/interface/web/client/lib/lang/ru_reseller.lng b/interface/web/client/lib/lang/ru_reseller.lng
index 9e88277ebe..66835b9d4f 100644
--- a/interface/web/client/lib/lang/ru_reseller.lng
+++ b/interface/web/client/lib/lang/ru_reseller.lng
@@ -160,7 +160,40 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $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.';
-$wb["btn_save_txt"] = "Save";
-$wb["btn_cancel_txt"] = "Cancel";
-$wb["email_error_empty"] = "Email is empty";
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['email_error_empty'] = 'Email is empty';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select Webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before to remove it.';
+$wb['dns_servers_txt'] = 'DNS Server';
+$wb['dns_servers_placeholder'] = 'Select DNS Servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before to remove it.';
+$wb['db_servers_txt'] = 'Database Server';
+$wb['db_servers_placeholder'] = 'Select Database Servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before to remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select Mailservers';
+$wb['no_mail_server_error'] = 'At least one Mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before to remove it.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/se.lng b/interface/web/client/lib/lang/se.lng
index 3f396d6465..93075b65c1 100644
--- a/interface/web/client/lib/lang/se.lng
+++ b/interface/web/client/lib/lang/se.lng
@@ -23,4 +23,6 @@ $wb['error_domain_in mailuse'] = 'Den här domänen kan inte tas bort då den an
 $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>';
+$wb['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
+$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
 ?>
diff --git a/interface/web/client/lib/lang/se_client.lng b/interface/web/client/lib/lang/se_client.lng
index 7d4b58022d..118adcfe2a 100644
--- a/interface/web/client/lib/lang/se_client.lng
+++ b/interface/web/client/lib/lang/se_client.lng
@@ -155,5 +155,43 @@ $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';
-$wb["email_error_empty"] = "Email is empty";
+$wb['email_error_empty'] = 'Email is empty';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.';
+$wb['dns_servers_txt'] = 'DNS servers';
+$wb['dns_servers_placeholder'] = 'Select DNS servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.';
+$wb['db_servers_txt'] = 'Database servers';
+$wb['db_servers_placeholder'] = 'Select database servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select mailservers';
+$wb['no_mail_server_error'] = 'At least one mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['reseller_txt'] = 'Reseller';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/se_client_template.lng b/interface/web/client/lib/lang/se_client_template.lng
index 59d4d89014..5e250fb1ec 100644
--- a/interface/web/client/lib/lang/se_client_template.lng
+++ b/interface/web/client/lib/lang/se_client_template.lng
@@ -90,4 +90,28 @@ $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['dns_servers_txt'] = 'DNS servers';
 ?>
diff --git a/interface/web/client/lib/lang/se_reseller.lng b/interface/web/client/lib/lang/se_reseller.lng
index 9ba66cd0ed..adabf8daa5 100644
--- a/interface/web/client/lib/lang/se_reseller.lng
+++ b/interface/web/client/lib/lang/se_reseller.lng
@@ -160,7 +160,40 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $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.';
-$wb["btn_save_txt"] = "Save";
-$wb["btn_cancel_txt"] = "Cancel";
-$wb["email_error_empty"] = "Email is empty";
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['email_error_empty'] = 'Email is empty';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select Webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before to remove it.';
+$wb['dns_servers_txt'] = 'DNS Server';
+$wb['dns_servers_placeholder'] = 'Select DNS Servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before to remove it.';
+$wb['db_servers_txt'] = 'Database Server';
+$wb['db_servers_placeholder'] = 'Select Database Servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before to remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select Mailservers';
+$wb['no_mail_server_error'] = 'At least one Mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before to remove it.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/sk.lng b/interface/web/client/lib/lang/sk.lng
index 6351f3d905..ef23dbfc0e 100644
--- a/interface/web/client/lib/lang/sk.lng
+++ b/interface/web/client/lib/lang/sk.lng
@@ -23,4 +23,6 @@ $wb['error_domain_in mailuse'] = 'This domain cannot be deleted, because it is i
 $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['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
+$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
 ?>
diff --git a/interface/web/client/lib/lang/sk_client.lng b/interface/web/client/lib/lang/sk_client.lng
index f8486e5b36..3311f1bf9e 100644
--- a/interface/web/client/lib/lang/sk_client.lng
+++ b/interface/web/client/lib/lang/sk_client.lng
@@ -155,5 +155,43 @@ $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["email_error_empty"] = "Email is empty";
+$wb['email_error_empty'] = 'Email is empty';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.';
+$wb['dns_servers_txt'] = 'DNS servers';
+$wb['dns_servers_placeholder'] = 'Select DNS servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.';
+$wb['db_servers_txt'] = 'Database servers';
+$wb['db_servers_placeholder'] = 'Select database servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select mailservers';
+$wb['no_mail_server_error'] = 'At least one mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['reseller_txt'] = 'Reseller';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/sk_client_template.lng b/interface/web/client/lib/lang/sk_client_template.lng
index f281dea145..d9669a69bc 100644
--- a/interface/web/client/lib/lang/sk_client_template.lng
+++ b/interface/web/client/lib/lang/sk_client_template.lng
@@ -90,4 +90,28 @@ $wb['limit_aps_txt'] = 'Max. number of APS instances';
 $wb['limit_aps_error_notint'] = 'The APS instances limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $wb['client_limits_txt'] = 'Client Limits';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['dns_servers_txt'] = 'DNS servers';
 ?>
diff --git a/interface/web/client/lib/lang/sk_reseller.lng b/interface/web/client/lib/lang/sk_reseller.lng
index 651eaaa788..25a1910480 100644
--- a/interface/web/client/lib/lang/sk_reseller.lng
+++ b/interface/web/client/lib/lang/sk_reseller.lng
@@ -13,7 +13,7 @@ $wb['limit_spamfilter_user_txt'] = 'Max. počet poUžívateľov Spamfiltrov';
 $wb['limit_spamfilter_policy_txt'] = 'Max. počet Spamfilter politík';
 $wb['default_mailserver_txt'] = 'Predvolený Mailserver';
 $wb['company_name_txt'] = 'Názov firmy';
-$wb["contact_firstname_txt"] = 'Contact firstname';
+$wb['contact_firstname_txt'] = 'Contact firstname';
 $wb['contact_name_txt'] = 'Meno kontaktnej osoby';
 $wb['username_txt'] = 'Užívateľské meno';
 $wb['password_txt'] = 'Heslo';
@@ -160,7 +160,40 @@ $wb['limit_domainmodule_error_notint'] = 'Domainmodule limit must be a number.';
 $wb['limit_domainmodule_txt'] = 'Domainmodule Limit';
 $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.';
-$wb["btn_save_txt"] = "Save";
-$wb["btn_cancel_txt"] = "Cancel";
-$wb["email_error_empty"] = "Email is empty";
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['email_error_empty'] = 'Email is empty';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select Webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before to remove it.';
+$wb['dns_servers_txt'] = 'DNS Server';
+$wb['dns_servers_placeholder'] = 'Select DNS Servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before to remove it.';
+$wb['db_servers_txt'] = 'Database Server';
+$wb['db_servers_placeholder'] = 'Select Database Servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before to remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select Mailservers';
+$wb['no_mail_server_error'] = 'At least one Mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before to remove it.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
 ?>
diff --git a/interface/web/client/lib/lang/tr.lng b/interface/web/client/lib/lang/tr.lng
index 4e0dcf763c..c87792b52f 100644
--- a/interface/web/client/lib/lang/tr.lng
+++ b/interface/web/client/lib/lang/tr.lng
@@ -22,6 +22,7 @@ $wb['client_txt'] = 'Müşteri';
 $wb['error_domain_in mailuse'] = 'Bu alan adı e-posta alan adı olarak kullanıldığından silinemez';
 $wb['error_domain_in webuse'] = 'Bu alan adı web alan adı olarak kullanıldığından silinemez';
 $wb['error_client_can_not_add_domain'] = 'Yeni bir alan adı ekleyemezsiniz';
-$wb['domain_txt'] = 'Alan Adı';
 $wb['error_client_group_id_empty'] = 'Bir müşteri seçmelisiniz<br>';
+$wb['error_domain_in dnsuse'] = 'This domain cannot be deleted, because it is in use as dns zone';
+$wb['error_domain_in dnsslaveuse'] = 'This domain cannot be deleted, because it is in use as secondary dns zone';
 ?>
diff --git a/interface/web/client/lib/lang/tr_client.lng b/interface/web/client/lib/lang/tr_client.lng
index 0ec41a8788..c071c74c93 100644
--- a/interface/web/client/lib/lang/tr_client.lng
+++ b/interface/web/client/lib/lang/tr_client.lng
@@ -40,12 +40,12 @@ $wb['surname_txt'] = 'Soyad';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
-$wb['limit_database_txt'] = 'limit_database';
+$wb['limit_database_txt'] = 'En Fazla Veritabanı Sayısı';
 $wb['limit_cron_txt'] = 'En Fazla Zamanlanmış Görev Sayısı';
 $wb['limit_cron_type_txt'] = 'En Fazla Zamanlanmış Görev Tipi Sayısı (chroot ve tam İnternet adresi uygulama)';
 $wb['limit_cron_frequency_txt'] = 'İki Çalıştırma Arasındaki Süre';
 $wb['ip_address_txt'] = 'ip_address';
-$wb['limit_client_error_notint'] = 'Müşteri sınırı bir sayı olmalı.';
+$wb['limit_client_error_notint'] = 'Alt müşteri sınırı bir sayı olmalıdır.';
 $wb['firstname_error_empty'] = 'Ad boş olamaz.';
 $wb['contact_error_empty'] = 'İlgili adı boş olamaz.';
 $wb['default_webserver_txt'] = 'Varsayılan Web Sunucusu';
@@ -82,12 +82,9 @@ $wb['limit_web_subdomain_error_notint'] = 'Web sitesi alt alan adı sınırı bi
 $wb['limit_ftp_user_error_notint'] = 'FTP kullanıcısı sınırı bir sayı olmalıdır.';
 $wb['limit_shell_user_error_notint'] = 'Kabuk kullanıcısı sınırı bir sayı olmalıdır.';
 $wb['limit_webdav_user_error_notint'] = 'Webdav kullanıcısı sınırı bir sayı olmalıdır.';
-$wb['limit_dns_zone_error_notint'] = 'DNS bölgesi sınırı bir sayı olmalıdır.';
-$wb['limit_dns_slave_zone_error_notint'] = 'İkincil DNS bölgesi sınırı bir sayı olmalıdır.';
 $wb['limit_dns_zone_error_notint'] = 'DNS kaydı sınırı bir sayı olmalıdır.';
-$wb['limit_client_error_notint'] = 'Alt müşteri sınırı bir sayı olmalıdır.';
+$wb['limit_dns_slave_zone_error_notint'] = 'İkincil DNS bölgesi sınırı bir sayı olmalıdır.';
 $wb['default_dbserver_txt'] = 'Varsayılan Veritabanı Sunucusu';
-$wb['limit_database_txt'] = 'En Fazla Veritabanı Sayısı';
 $wb['limit_database_error_notint'] = 'Veritabanı sınırı bir sayı olmalıdır.';
 $wb['limit_cron_error_notint'] = 'Zamanlanmış Görev sınırı bir sayı olmalıdır.';
 $wb['limit_cron_error_frequency'] = 'Zamanlanmış Görev sıklığı sınırı bir sayı olmalıdır.';
@@ -142,7 +139,7 @@ $wb['email_error_isemail'] = 'Lütfen geçerli bir e-posta adresi yazın.';
 $wb['customer_no_error_unique'] = 'Müşteri numarası eşsiz (ya da boş) olmalıdır.';
 $wb['paypal_email_error_isemail'] = 'Lütfen geçerli bir PayPal e-posta adresi yazın.';
 $wb['paypal_email_txt'] = 'PayPal E-posta Adresi';
-$wb['err_msg_master_tpl_set'] = '"Özel" kalıptan başka bir ana kalıp seçilirse, tüm özel sınırlama ayarları yoksayılır.';
+$wb['err_msg_master_tpl_set'] = '\"Özel\" kalıptan başka bir ana kalıp seçilirse, tüm özel sınırlama ayarları yoksayılır.';
 $wb['aps_limits_txt'] = 'APS Yükleyici Sınırları';
 $wb['limit_aps_txt'] = 'En Fazla APS Kopyası Sayısı';
 $wb['limit_aps_error_notint'] = 'APS kopya sayısı sınırı bir sayı olmalıdır.';
@@ -156,5 +153,45 @@ $wb['added_by_txt'] = 'Ekleyen';
 $wb['added_date_txt'] = 'Eklendiği Tarih';
 $wb['parent_client_id_txt'] = 'Bayi Müşterisi';
 $wb['none_txt'] = 'yok';
+$wb['contact_firstname_txt'] = 'Contact firstname';
+$wb['limit_backup_txt'] = 'Backupfunction available';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before you remove it.';
+$wb['dns_servers_txt'] = 'DNS servers';
+$wb['dns_servers_placeholder'] = 'Select DNS servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before you remove it.';
+$wb['db_servers_txt'] = 'Database servers';
+$wb['db_servers_placeholder'] = 'Select database servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before you remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select mailservers';
+$wb['no_mail_server_error'] = 'At least one mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before you remove it.';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['reseller_txt'] = 'Reseller';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
+$wb['email_error_empty'] = 'Email is empty';
 ?>
-
diff --git a/interface/web/client/lib/lang/tr_client_del.lng b/interface/web/client/lib/lang/tr_client_del.lng
index 74b367c0a6..b93579998b 100644
--- a/interface/web/client/lib/lang/tr_client_del.lng
+++ b/interface/web/client/lib/lang/tr_client_del.lng
@@ -5,4 +5,3 @@ $wb['btn_save_txt'] = 'Müşteriyi sil';
 $wb['btn_cancel_txt'] = 'Müşteriyi silmeden iptal et';
 $wb['confirm_client_delete_txt'] = 'Bu müşteriyi silmek istediğinize emin misiniz?';
 ?>
-
diff --git a/interface/web/client/lib/lang/tr_client_message.lng b/interface/web/client/lib/lang/tr_client_message.lng
index eb3c7aba0c..9be9173401 100644
--- a/interface/web/client/lib/lang/tr_client_message.lng
+++ b/interface/web/client/lib/lang/tr_client_message.lng
@@ -18,4 +18,3 @@ $wb['variables_txt'] = 'Değişkenler:';
 $wb['gender_m_txt'] = 'Bay';
 $wb['gender_f_txt'] = 'Bayan';
 ?>
-
diff --git a/interface/web/client/lib/lang/tr_client_template.lng b/interface/web/client/lib/lang/tr_client_template.lng
index 8c5cf43674..cf9e529394 100644
--- a/interface/web/client/lib/lang/tr_client_template.lng
+++ b/interface/web/client/lib/lang/tr_client_template.lng
@@ -19,7 +19,7 @@ $wb['limit_spamfilter_policy_txt'] = 'En Fazla Önemsiz Posta Süzgeci Kuralı S
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
-$wb['limit_database_txt'] = 'limit_database';
+$wb['limit_database_txt'] = 'En Fazla Veritabanı Sayısı';
 $wb['limit_cron_txt'] = 'En Fazla Zamanlanmış Görev Sayısı';
 $wb['limit_cron_type_txt'] = 'En Fazla Zamanlanmış Görev Tipi (chroot ve tam İnternet adresi uygulanan)';
 $wb['limit_cron_frequency_txt'] = 'İki çalıştırma arasındaki süre';
@@ -56,7 +56,6 @@ $wb['limit_webdav_user_error_notint'] = 'Webdav kullanıcı sınırı bir sayı
 $wb['limit_dns_zone_error_notint'] = 'DNS kaydı sınırı bir sayı olmalıdır.';
 $wb['limit_dns_slave_zone_error_notint'] = 'İkinci DNS bölgesi sınırı bir sayı olmalıdır.';
 $wb['limit_dns_record_error_notint'] = 'DNS kaydı sınırı bir sayı olmalıdır.';
-$wb['limit_database_txt'] = 'En Fazla Veritabanı Sayısı';
 $wb['limit_database_error_notint'] = 'Veritabanı sınırı bir sayı olmalıdır.';
 $wb['limit_cron_error_notint'] = 'Zamanlanmış Görev sınırı bir sayı olmalıdır.';
 $wb['limit_cron_error_frequency'] = 'Zamanlanmış Görev sıklığı sınırı bir sayı olmalıdır.';
@@ -90,4 +89,29 @@ $wb['limit_aps_txt'] = 'En fazla APS kopyası sayısı';
 $wb['limit_aps_error_notint'] = 'APS kopyaları sınırı bir sayı olmalıdır.';
 $wb['limit_domainmodule_txt'] = 'Alan Adı Modülü Sınırı';
 $wb['client_limits_txt'] = 'Müşteri Sınırları';
+$wb['default_mailserver_txt'] = 'Default Mailserver';
+$wb['default_webserver_txt'] = 'Default Webserver';
+$wb['default_dnsserver_txt'] = 'Default DNS Server';
+$wb['default_slave_dnsserver_txt'] = 'Default Secondary DNS Server';
+$wb['limit_backup_txt'] = 'Backupfunction available';
+$wb['default_dbserver_txt'] = 'Default Database Server';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['dns_servers_txt'] = 'DNS servers';
 ?>
diff --git a/interface/web/client/lib/lang/tr_client_template_list.lng b/interface/web/client/lib/lang/tr_client_template_list.lng
index c1de11b235..1663e6e2da 100644
--- a/interface/web/client/lib/lang/tr_client_template_list.lng
+++ b/interface/web/client/lib/lang/tr_client_template_list.lng
@@ -4,4 +4,3 @@ $wb['template_type_txt'] = 'Tip';
 $wb['template_name_txt'] = 'Kalıp adı';
 $wb['template_id_txt'] = 'Kalıp kodu';
 ?>
-
diff --git a/interface/web/client/lib/lang/tr_domain.lng b/interface/web/client/lib/lang/tr_domain.lng
index 02b592e0a1..ba5dab700d 100644
--- a/interface/web/client/lib/lang/tr_domain.lng
+++ b/interface/web/client/lib/lang/tr_domain.lng
@@ -4,4 +4,3 @@ $wb['domain_error_unique'] = 'Aynı alan adı zaten var';
 $wb['domain_error_regex'] = 'Bu alan adına izin verilmiyor';
 $wb['Domain'] = 'Alan Adı';
 ?>
-
diff --git a/interface/web/client/lib/lang/tr_reseller.lng b/interface/web/client/lib/lang/tr_reseller.lng
index eebe63c495..5d3debf377 100644
--- a/interface/web/client/lib/lang/tr_reseller.lng
+++ b/interface/web/client/lib/lang/tr_reseller.lng
@@ -40,12 +40,12 @@ $wb['surname_txt'] = 'Soyadı';
 $wb['limit_domain_txt'] = 'limit_domain';
 $wb['limit_subdomain_txt'] = 'limit_subdomain';
 $wb['limit_webquota_txt'] = 'limit_webquota';
-$wb['limit_database_txt'] = 'limit_database';
+$wb['limit_database_txt'] = 'En Fazla Veritabanı Sayısı';
 $wb['limit_cron_txt'] = 'En Fazla Zamanlanmış Görev Sayısı';
 $wb['limit_cron_type_txt'] = 'En Fazla Zamanlanmış Görev Tipi (chroot ve tam İnternet adresi uygulaması)';
 $wb['limit_cron_frequency_txt'] = 'İki Çalıştırma Arasındaki Süre';
 $wb['ip_address_txt'] = 'ip_adresi';
-$wb['limit_client_error_notint'] = 'Müşteri sınırı bir sayı olmalıdır.';
+$wb['limit_client_error_notint'] = 'Alt müşteri sınırı bir sayı olmalıdır.';
 $wb['firstname_error_empty'] = 'Adı boş olamaz.';
 $wb['contact_error_empty'] = 'İlgili adı boş olamaz.';
 $wb['default_webserver_txt'] = 'Varsayılan Web Sunucusu';
@@ -84,9 +84,7 @@ $wb['limit_shell_user_error_notint'] = 'Kabuk kullanıcısı sınırı bir sayı
 $wb['limit_dns_zone_error_notint'] = 'DNS bölgesi sınırı bir sayı olmalıdır.';
 $wb['limit_dns_slave_zone_error_notint'] = 'İkincil DNS bölgesi sınırı bir sayı olmalıdır.';
 $wb['limit_dns_record_error_notint'] = 'DNS kaydı sınırı bir sayı olmalıdır.';
-$wb['limit_client_error_notint'] = 'Alt müşteri sınırı bir sayı olmalıdır.';
 $wb['default_dbserver_txt'] = 'Varsayılan Veritabanı Sunucusu';
-$wb['limit_database_txt'] = 'En Fazla Veritabanı Sayısı';
 $wb['limit_database_error_notint'] = 'Veritabanı sınırı bir sayı olmalıdır.';
 $wb['limit_cron_error_notint'] = 'Zamanlanmış görev sınırı bir sayı olmalıdır.';
 $wb['limit_cron_error_frequency'] = 'Zamanlanmış görev sıklığı sınırı bir sayı olmalıdır.';
@@ -107,7 +105,6 @@ $wb['limit_hterror_txt'] = 'Özel Hata Sayfaları Kullanılabilir';
 $wb['limit_wildcard_txt'] = 'Genel Alt Alan Kullanılabilir';
 $wb['limit_ssl_txt'] = 'SSL Kullanılabilir';
 $wb['limit_client_error'] = 'Hesabınıza ekleyebileceğiniz en fazla müşteri sayısına ulaştınız.';
-$wb['limit_client_error_positive'] = 'Müşteri sayısı sıfırdan büyük olmalı';
 $wb['limit_web_quota_txt'] = 'Web Kotası';
 $wb['limit_traffic_quota_txt'] = 'Trafik Kotası';
 $wb['limit_trafficquota_error_notint'] = 'Trafik kotası bir sayı olmalıdır.';
@@ -159,6 +156,44 @@ $wb['added_date_txt'] = 'Eklendiği Tarih';
 $wb['limit_domainmodule_error_notint'] = 'Alan adı modülü sınırı bir sayı olmalıdır.';
 $wb['limit_domainmodule_txt'] = 'Alan Adı Modülü Sınırı';
 $wb['client_limits_txt'] = 'Müşteri Sınırları';
-$wb['err_msg_master_tpl_set'] = '"Özel" kalıptan başka bir ana kalıp seçilirse, tüm özel sınırlama ayarları yoksayılır.';
+$wb['err_msg_master_tpl_set'] = '\"Özel\" kalıptan başka bir ana kalıp seçilirse, tüm özel sınırlama ayarları yoksayılır.';
+$wb['contact_firstname_txt'] = 'Contact firstname';
+$wb['limit_backup_txt'] = 'Backupfunction available';
+$wb['limit_client_error_positive_or_unlimited'] = 'The number of clients must be > 0 or -1 (unlimited)';
+$wb['web_servers_txt'] = 'Webservers';
+$wb['web_servers_placeholder'] = 'Select Webservers';
+$wb['no_web_server_error'] = 'At least one webserver must be selected.';
+$wb['web_servers_used'] = 'The server you are trying to remove from this client is used as a webserver. Be sure that this server is not used by this client before to remove it.';
+$wb['dns_servers_txt'] = 'DNS Server';
+$wb['dns_servers_placeholder'] = 'Select DNS Servers';
+$wb['no_dns_server_error'] = 'At least one DNS server must be selected.';
+$wb['dns_servers_used'] = 'The server you are trying to remove from this client is used as a DNS server. Be sure that this server is not used by this client before to remove it.';
+$wb['db_servers_txt'] = 'Database Server';
+$wb['db_servers_placeholder'] = 'Select Database Servers';
+$wb['no_db_server_error'] = 'At least one Database server must be selected.';
+$wb['db_servers_used'] = 'The server you are trying to remove from this client is used as a Database server. Be sure that this server is not used by this client before to remove it.';
+$wb['mail_servers_txt'] = 'Mailservers';
+$wb['mail_servers_placeholder'] = 'Select Mailservers';
+$wb['no_mail_server_error'] = 'At least one Mailserver must be selected.';
+$wb['mail_servers_used'] = 'The server you are trying to remove from this client is used as a Mailserver. Be sure that this server is not used by this client before to remove it.';
+$wb['xmpp_limits_txt'] = 'XMPP Limits';
+$wb['xmpp_servers_txt'] = 'XMPP Servers';
+$wb['xmpp_servers_placeholder'] = 'Select XMPP Servers';
+$wb['no_xmpp_server_error'] = 'At least one XMPP Server must be selected.';
+$wb['xmpp_servers_used'] = 'The server you are trying to remove from this client is used as a XMPP Server. Be sure that this server is not used by this client before you remove it.';
+$wb['limit_xmpp_domain_error_notint'] = 'The XMPP domain limit must be a number.';
+$wb['limit_xmpp_user_error_notint'] = 'The XMPP user limit must be a number.';
+$wb['limit_xmpp_domain_txt'] = 'Max. number of XMPP domains';
+$wb['limit_xmpp_user_txt'] = 'Max. number of XMPP accounts';
+$wb['limit_xmpp_muc_txt'] = 'Multiuser chat available';
+$wb['limit_xmpp_pastebin_txt'] = 'Pastebin for MUC available';
+$wb['limit_xmpp_httparchive_txt'] = 'HTTP archive for MUC available';
+$wb['limit_xmpp_anon_txt'] = 'Anonymous host available';
+$wb['limit_xmpp_vjud_txt'] = 'VJUD user directory available';
+$wb['limit_xmpp_proxy_txt'] = 'Bytestream proxy available';
+$wb['limit_xmpp_status_txt'] = 'Status host available';
+$wb['invalid_vat_id'] = 'The VAT ID is invalid.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['email_error_empty'] = 'Email is empty';
 ?>
-
diff --git a/interface/web/dashboard/lib/lang/ar_dashlet_customer.lng b/interface/web/dashboard/lib/lang/ar_dashlet_customer.lng
new file mode 100644
index 0000000000..4fe6cb0ef7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ar_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'My Data';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/ar_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/ar_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..8cae3dfb4f
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ar_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/ar_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/ar_dashlet_invoices.lng
new file mode 100644
index 0000000000..a680daa8f6
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ar_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = 'Invoices';
+$wb['invoice_no_txt'] = 'Invoice No.';
+$wb['amount_txt'] = 'Amount';
+$wb['date_txt'] = 'Date';
+$wb['invoice_status_txt'] = 'Status';
+$wb['no_invoices_txt'] = 'No Invoices available.';
+$wb['paid_txt'] = 'Paid';
+$wb['unpaid_txt'] = 'Unpaid';
+$wb['paynow_txt'] = 'pay now';
+$wb['proforma_txt'] = 'Proforma';
+$wb['refunded_txt'] = 'Refunded';
+$wb['not_refunded_txt'] = 'Not refunded';
+$wb['invoice_type_invoice_txt'] = 'Invoice';
+$wb['invoice_type_proforma_txt'] = 'Proforma';
+$wb['invoice_type_refund_txt'] = 'Refund';
+$wb['invoice_type_reminder_txt'] = 'Reminder';
+?>
diff --git a/interface/web/dashboard/lib/lang/ar_dashlet_limits.lng b/interface/web/dashboard/lib/lang/ar_dashlet_limits.lng
index e6617be59b..93986e5128 100644
--- a/interface/web/dashboard/lib/lang/ar_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/ar_dashlet_limits.lng
@@ -27,4 +27,5 @@ $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_domain_txt'] = 'Number of Domains';
 ?>
diff --git a/interface/web/dashboard/lib/lang/ar_dashlet_products.lng b/interface/web/dashboard/lib/lang/ar_dashlet_products.lng
new file mode 100644
index 0000000000..a69b61d2fb
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ar_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'My Products';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['next_payment_date_txt'] = 'Next Invoice';
+$wb['no_products_txt'] = 'No products found.';
+$wb['edit_txt'] = 'Edit';
+$wb['cancellation_date_txt'] = 'Cancelled by';
+?>
diff --git a/interface/web/dashboard/lib/lang/ar_dashlet_shop.lng b/interface/web/dashboard/lib/lang/ar_dashlet_shop.lng
new file mode 100644
index 0000000000..1e0b5361d7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ar_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Order';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['setup_fee_txt'] = 'Setup Fee';
+$wb['no_products_txt'] = 'No products found.';
+$wb['order_txt'] = 'Order';
+?>
diff --git a/interface/web/dashboard/lib/lang/bg_dashlet_customer.lng b/interface/web/dashboard/lib/lang/bg_dashlet_customer.lng
new file mode 100644
index 0000000000..4fe6cb0ef7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/bg_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'My Data';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/bg_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/bg_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..d021c17f8a
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/bg_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/bg_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/bg_dashlet_invoices.lng
new file mode 100644
index 0000000000..a680daa8f6
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/bg_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = 'Invoices';
+$wb['invoice_no_txt'] = 'Invoice No.';
+$wb['amount_txt'] = 'Amount';
+$wb['date_txt'] = 'Date';
+$wb['invoice_status_txt'] = 'Status';
+$wb['no_invoices_txt'] = 'No Invoices available.';
+$wb['paid_txt'] = 'Paid';
+$wb['unpaid_txt'] = 'Unpaid';
+$wb['paynow_txt'] = 'pay now';
+$wb['proforma_txt'] = 'Proforma';
+$wb['refunded_txt'] = 'Refunded';
+$wb['not_refunded_txt'] = 'Not refunded';
+$wb['invoice_type_invoice_txt'] = 'Invoice';
+$wb['invoice_type_proforma_txt'] = 'Proforma';
+$wb['invoice_type_refund_txt'] = 'Refund';
+$wb['invoice_type_reminder_txt'] = 'Reminder';
+?>
diff --git a/interface/web/dashboard/lib/lang/bg_dashlet_limits.lng b/interface/web/dashboard/lib/lang/bg_dashlet_limits.lng
index 5ab57e21e8..3d4a48c5f7 100644
--- a/interface/web/dashboard/lib/lang/bg_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/bg_dashlet_limits.lng
@@ -27,4 +27,5 @@ $wb['limit_webdav_user_txt'] = 'Брой на Webdav потребители';
 $wb['limit_client_txt'] = 'Брой на Клиенти';
 $wb['limit_database_txt'] = 'Брой на Бази данни';
 $wb['limit_mailmailinglist_txt'] = 'Брой на mailing листа';
+$wb['limit_domain_txt'] = 'Number of Domains';
 ?>
diff --git a/interface/web/dashboard/lib/lang/bg_dashlet_products.lng b/interface/web/dashboard/lib/lang/bg_dashlet_products.lng
new file mode 100644
index 0000000000..a69b61d2fb
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/bg_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'My Products';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['next_payment_date_txt'] = 'Next Invoice';
+$wb['no_products_txt'] = 'No products found.';
+$wb['edit_txt'] = 'Edit';
+$wb['cancellation_date_txt'] = 'Cancelled by';
+?>
diff --git a/interface/web/dashboard/lib/lang/bg_dashlet_shop.lng b/interface/web/dashboard/lib/lang/bg_dashlet_shop.lng
new file mode 100644
index 0000000000..1e0b5361d7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/bg_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Order';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['setup_fee_txt'] = 'Setup Fee';
+$wb['no_products_txt'] = 'No products found.';
+$wb['order_txt'] = 'Order';
+?>
diff --git a/interface/web/dashboard/lib/lang/br_dashlet_customer.lng b/interface/web/dashboard/lib/lang/br_dashlet_customer.lng
new file mode 100644
index 0000000000..4fe6cb0ef7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/br_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'My Data';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/br_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/br_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..d021c17f8a
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/br_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/br_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/br_dashlet_invoices.lng
new file mode 100644
index 0000000000..a680daa8f6
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/br_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = 'Invoices';
+$wb['invoice_no_txt'] = 'Invoice No.';
+$wb['amount_txt'] = 'Amount';
+$wb['date_txt'] = 'Date';
+$wb['invoice_status_txt'] = 'Status';
+$wb['no_invoices_txt'] = 'No Invoices available.';
+$wb['paid_txt'] = 'Paid';
+$wb['unpaid_txt'] = 'Unpaid';
+$wb['paynow_txt'] = 'pay now';
+$wb['proforma_txt'] = 'Proforma';
+$wb['refunded_txt'] = 'Refunded';
+$wb['not_refunded_txt'] = 'Not refunded';
+$wb['invoice_type_invoice_txt'] = 'Invoice';
+$wb['invoice_type_proforma_txt'] = 'Proforma';
+$wb['invoice_type_refund_txt'] = 'Refund';
+$wb['invoice_type_reminder_txt'] = 'Reminder';
+?>
diff --git a/interface/web/dashboard/lib/lang/br_dashlet_limits.lng b/interface/web/dashboard/lib/lang/br_dashlet_limits.lng
index 384574caa0..693272a13e 100644
--- a/interface/web/dashboard/lib/lang/br_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/br_dashlet_limits.lng
@@ -27,4 +27,5 @@ $wb['limit_webdav_user_txt'] = 'Número de usuários Webdav';
 $wb['limit_client_txt'] = 'Número de Clientes';
 $wb['limit_database_txt'] = 'Número de Banco de Dados';
 $wb['limit_mailmailinglist_txt'] = 'Número  de mailing lists';
+$wb['limit_domain_txt'] = 'Number of Domains';
 ?>
diff --git a/interface/web/dashboard/lib/lang/br_dashlet_products.lng b/interface/web/dashboard/lib/lang/br_dashlet_products.lng
new file mode 100644
index 0000000000..a69b61d2fb
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/br_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'My Products';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['next_payment_date_txt'] = 'Next Invoice';
+$wb['no_products_txt'] = 'No products found.';
+$wb['edit_txt'] = 'Edit';
+$wb['cancellation_date_txt'] = 'Cancelled by';
+?>
diff --git a/interface/web/dashboard/lib/lang/br_dashlet_shop.lng b/interface/web/dashboard/lib/lang/br_dashlet_shop.lng
new file mode 100644
index 0000000000..1e0b5361d7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/br_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Order';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['setup_fee_txt'] = 'Setup Fee';
+$wb['no_products_txt'] = 'No products found.';
+$wb['order_txt'] = 'Order';
+?>
diff --git a/interface/web/dashboard/lib/lang/ca.lng b/interface/web/dashboard/lib/lang/ca.lng
new file mode 100644
index 0000000000..a33b5e4efc
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ca.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['welcome_user_txt'] = 'Bienvenue %s';
+$wb['available_modules_txt'] = 'Modules disponibles';
+?>
diff --git a/interface/web/dashboard/lib/lang/ca_dashlet_customer.lng b/interface/web/dashboard/lib/lang/ca_dashlet_customer.lng
new file mode 100644
index 0000000000..4fe6cb0ef7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ca_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'My Data';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/ca_dashlet_databasequota.lng b/interface/web/dashboard/lib/lang/ca_dashlet_databasequota.lng
new file mode 100644
index 0000000000..bd2402dbf6
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ca_dashlet_databasequota.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['databasequota_txt'] = 'Database Quota';
+$wb['database_txt'] = 'Database Name';
+$wb['used_txt'] = 'Used Space';
+$wb['quota_txt'] = 'Quota';
+$wb['no_database_accounts_txt'] = 'No databases found.';
+?>
diff --git a/interface/web/dashboard/lib/lang/ca_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/ca_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..8cae3dfb4f
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ca_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/ca_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/ca_dashlet_invoices.lng
new file mode 100644
index 0000000000..a680daa8f6
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ca_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = 'Invoices';
+$wb['invoice_no_txt'] = 'Invoice No.';
+$wb['amount_txt'] = 'Amount';
+$wb['date_txt'] = 'Date';
+$wb['invoice_status_txt'] = 'Status';
+$wb['no_invoices_txt'] = 'No Invoices available.';
+$wb['paid_txt'] = 'Paid';
+$wb['unpaid_txt'] = 'Unpaid';
+$wb['paynow_txt'] = 'pay now';
+$wb['proforma_txt'] = 'Proforma';
+$wb['refunded_txt'] = 'Refunded';
+$wb['not_refunded_txt'] = 'Not refunded';
+$wb['invoice_type_invoice_txt'] = 'Invoice';
+$wb['invoice_type_proforma_txt'] = 'Proforma';
+$wb['invoice_type_refund_txt'] = 'Refund';
+$wb['invoice_type_reminder_txt'] = 'Reminder';
+?>
diff --git a/interface/web/dashboard/lib/lang/ca_dashlet_limits.lng b/interface/web/dashboard/lib/lang/ca_dashlet_limits.lng
new file mode 100644
index 0000000000..c9978ad17d
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ca_dashlet_limits.lng
@@ -0,0 +1,31 @@
+<?php
+$wb['limits_txt'] = 'Limites du compte';
+$wb['of_txt'] = 'sur';
+$wb['unlimited_txt'] = 'Illimité';
+$wb['limit_maildomain_txt'] = 'Nombre de domaines courriel';
+$wb['limit_mailmailinglist_txt'] = 'Nombre de mailing lists';
+$wb['limit_mailbox_txt'] = 'Nombre de boites courriel';
+$wb['limit_mailalias_txt'] = 'Nombre d\'alias courriel';
+$wb['limit_mailaliasdomain_txt'] = 'Nombre d\'alias de domaine';
+$wb['limit_mailforward_txt'] = 'Nombre de transferts d\'email';
+$wb['limit_mailcatchall_txt'] = 'Nombre de comptes courriel collecteurs';
+$wb['limit_mailrouting_txt'] = 'Nombre de routes courriel';
+$wb['limit_mailfilter_txt'] = 'Nombre de filtres courriel';
+$wb['limit_fetchmail_txt'] = 'Nombre de comptes Fetchmail';
+$wb['limit_spamfilter_wblist_txt'] = 'Nombre de listes blanches / noires de l\'anti-spam';
+$wb['limit_spamfilter_user_txt'] = 'Nombre d\'utilisateurs de l\'anti-spam';
+$wb['limit_spamfilter_policy_txt'] = 'Nombre de stratégies de l\'anti-spam';
+$wb['limit_cron_txt'] = 'Nombre de tâches Cron';
+$wb['limit_web_domain_txt'] = 'Nombre de domaines web';
+$wb['limit_web_aliasdomain_txt'] = 'Nombre d\'alias de domaine web';
+$wb['limit_web_subdomain_txt'] = 'Nombre de sous-domaines web';
+$wb['limit_ftp_user_txt'] = 'Nombre d\'utilisateurs FTP';
+$wb['limit_dns_zone_txt'] = 'Nombre de zones DNS';
+$wb['limit_dns_slave_zone_txt'] = 'Nombre de zones DNS secondaires';
+$wb['limit_dns_record_txt'] = 'Nombre d\'enregistrements DNS';
+$wb['limit_shell_user_txt'] = 'Nombre d\'utilisateurs Shell';
+$wb['limit_webdav_user_txt'] = 'Nombre d\'utilisateurs WebDAV';
+$wb['limit_client_txt'] = 'Nombre de clients';
+$wb['limit_database_txt'] = 'Nombre de bases de données';
+$wb['limit_domain_txt'] = 'Number of Domains';
+?>
diff --git a/interface/web/dashboard/lib/lang/ca_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/ca_dashlet_mailquota.lng
new file mode 100644
index 0000000000..72c87e0006
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ca_dashlet_mailquota.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['mailquota_txt'] = 'Quota de la boite mail';
+$wb['email_txt'] = 'Adresse courriel';
+$wb['name_txt'] = 'Nom';
+$wb['used_txt'] = 'Espace utilisé';
+$wb['quota_txt'] = 'Quota';
+$wb['no_email_accounts_txt'] = 'Aucun compte mail trouvé.';
+?>
diff --git a/interface/web/dashboard/lib/lang/ca_dashlet_modules.lng b/interface/web/dashboard/lib/lang/ca_dashlet_modules.lng
new file mode 100644
index 0000000000..4d6a5d827a
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ca_dashlet_modules.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['available_modules_txt'] = 'Modules disponibles';
+?>
diff --git a/interface/web/dashboard/lib/lang/ca_dashlet_products.lng b/interface/web/dashboard/lib/lang/ca_dashlet_products.lng
new file mode 100644
index 0000000000..a69b61d2fb
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ca_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'My Products';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['next_payment_date_txt'] = 'Next Invoice';
+$wb['no_products_txt'] = 'No products found.';
+$wb['edit_txt'] = 'Edit';
+$wb['cancellation_date_txt'] = 'Cancelled by';
+?>
diff --git a/interface/web/dashboard/lib/lang/ca_dashlet_quota.lng b/interface/web/dashboard/lib/lang/ca_dashlet_quota.lng
new file mode 100644
index 0000000000..674057e7f7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ca_dashlet_quota.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['quota_txt'] = 'Quota disque dur du site Web';
+$wb['domain_txt'] = 'Domaine / Site Web';
+$wb['used_txt'] = 'Espace utilisé';
+$wb['hard_txt'] = 'Limite Hard';
+$wb['soft_txt'] = 'Limite Soft';
+$wb['no_sites_txt'] = 'Aucun site Web trouvé.';
+?>
diff --git a/interface/web/dashboard/lib/lang/ca_dashlet_shop.lng b/interface/web/dashboard/lib/lang/ca_dashlet_shop.lng
new file mode 100644
index 0000000000..1e0b5361d7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ca_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Order';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['setup_fee_txt'] = 'Setup Fee';
+$wb['no_products_txt'] = 'No products found.';
+$wb['order_txt'] = 'Order';
+?>
diff --git a/interface/web/dashboard/lib/lang/cz.lng b/interface/web/dashboard/lib/lang/cz.lng
index 297b6397fa..9d2a3211cb 100644
--- a/interface/web/dashboard/lib/lang/cz.lng
+++ b/interface/web/dashboard/lib/lang/cz.lng
@@ -2,5 +2,3 @@
 $wb['welcome_user_txt'] = 'Vítejte %s';
 $wb['available_modules_txt'] = 'Dostupné moduly';
 ?>
-
-
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_customer.lng b/interface/web/dashboard/lib/lang/cz_dashlet_customer.lng
new file mode 100644
index 0000000000..4fe6cb0ef7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'My Data';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_databasequota.lng b/interface/web/dashboard/lib/lang/cz_dashlet_databasequota.lng
index 2a33b3d894..209d0d325e 100644
--- a/interface/web/dashboard/lib/lang/cz_dashlet_databasequota.lng
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_databasequota.lng
@@ -1,7 +1,7 @@
 <?php
-$wb['mailquota_txt'] = 'Database Quota';
 $wb['database_txt'] = 'Database Name';
 $wb['used_txt'] = 'Used Space';
 $wb['quota_txt'] = 'Quota';
 $wb['no_database_accounts_txt'] = 'No databases found.';
+$wb['databasequota_txt'] = 'Database Quota';
 ?>
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/cz_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..d021c17f8a
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/cz_dashlet_invoices.lng
new file mode 100644
index 0000000000..a680daa8f6
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = 'Invoices';
+$wb['invoice_no_txt'] = 'Invoice No.';
+$wb['amount_txt'] = 'Amount';
+$wb['date_txt'] = 'Date';
+$wb['invoice_status_txt'] = 'Status';
+$wb['no_invoices_txt'] = 'No Invoices available.';
+$wb['paid_txt'] = 'Paid';
+$wb['unpaid_txt'] = 'Unpaid';
+$wb['paynow_txt'] = 'pay now';
+$wb['proforma_txt'] = 'Proforma';
+$wb['refunded_txt'] = 'Refunded';
+$wb['not_refunded_txt'] = 'Not refunded';
+$wb['invoice_type_invoice_txt'] = 'Invoice';
+$wb['invoice_type_proforma_txt'] = 'Proforma';
+$wb['invoice_type_refund_txt'] = 'Refund';
+$wb['invoice_type_reminder_txt'] = 'Reminder';
+?>
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
index 6a6b68cb8d..31621288f0 100644
--- a/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_limits.lng
@@ -29,5 +29,3 @@ $wb['limit_database_txt'] = 'Počet databází';
 $wb['limit_mailmailinglist_txt'] = 'Počet e-mailových konferencí';
 $wb['limit_domain_txt'] = 'Počet domén';
 ?>
-
-
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/cz_dashlet_mailquota.lng
index ad720d2dee..742721c5ff 100644
--- a/interface/web/dashboard/lib/lang/cz_dashlet_mailquota.lng
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_mailquota.lng
@@ -6,5 +6,3 @@ $wb['used_txt'] = 'Využité místo';
 $wb['quota_txt'] = 'Kvóta';
 $wb['no_email_accounts_txt'] = 'Nenalezeny žádné e-mailové účty.';
 ?>
-
-
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
index a25ba21fc3..66275f1d05 100644
--- a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
@@ -1,5 +1,3 @@
 <?php
 $wb['available_modules_txt'] = 'Dostupné moduly';
 ?>
-
-
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_products.lng b/interface/web/dashboard/lib/lang/cz_dashlet_products.lng
new file mode 100644
index 0000000000..a69b61d2fb
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'My Products';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['next_payment_date_txt'] = 'Next Invoice';
+$wb['no_products_txt'] = 'No products found.';
+$wb['edit_txt'] = 'Edit';
+$wb['cancellation_date_txt'] = 'Cancelled by';
+?>
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_quota.lng b/interface/web/dashboard/lib/lang/cz_dashlet_quota.lng
index 214af233d6..0c2074a996 100644
--- a/interface/web/dashboard/lib/lang/cz_dashlet_quota.lng
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_quota.lng
@@ -6,5 +6,3 @@ $wb['hard_txt'] = 'Kvóta max. obsazení';
 $wb['soft_txt'] = 'Kvóta pro upozornění';
 $wb['no_sites_txt'] = 'Nenalezeny žádné webové stránky.';
 ?>
-
-
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_shop.lng b/interface/web/dashboard/lib/lang/cz_dashlet_shop.lng
new file mode 100644
index 0000000000..1e0b5361d7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/cz_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Order';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['setup_fee_txt'] = 'Setup Fee';
+$wb['no_products_txt'] = 'No products found.';
+$wb['order_txt'] = 'Order';
+?>
diff --git a/interface/web/dashboard/lib/lang/de_dashlet_customer.lng b/interface/web/dashboard/lib/lang/de_dashlet_customer.lng
new file mode 100644
index 0000000000..7cdf768271
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/de_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'Meine Daten';
+$wb['edit_txt'] = 'Bearbeiten';
+?>
diff --git a/interface/web/dashboard/lib/lang/de_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/de_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..a3f78e9a95
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/de_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Abrechnungseinstellungen';
+$wb['edit_txt'] = 'Bearbeiten';
+?>
diff --git a/interface/web/dashboard/lib/lang/de_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/de_dashlet_invoices.lng
new file mode 100644
index 0000000000..a8b9c80957
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/de_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = 'Rechnungen';
+$wb['invoice_no_txt'] = 'RE Nr.';
+$wb['amount_txt'] = 'Summe';
+$wb['date_txt'] = 'Datum';
+$wb['invoice_status_txt'] = 'Status';
+$wb['no_invoices_txt'] = 'Keine Rechnungen vorhanden.';
+$wb['paid_txt'] = 'Bezahlt';
+$wb['unpaid_txt'] = 'Unbezahlt';
+$wb['paynow_txt'] = 'Bezahlen';
+$wb['proforma_txt'] = 'Proforma';
+$wb['refunded_txt'] = 'Erstattet';
+$wb['not_refunded_txt'] = 'Nicht erstattet';
+$wb['invoice_type_invoice_txt'] = 'Rechnung';
+$wb['invoice_type_proforma_txt'] = 'Proforma';
+$wb['invoice_type_refund_txt'] = 'Gutschrift';
+$wb['invoice_type_reminder_txt'] = 'Mahnung';
+?>
diff --git a/interface/web/dashboard/lib/lang/de_dashlet_products.lng b/interface/web/dashboard/lib/lang/de_dashlet_products.lng
new file mode 100644
index 0000000000..c1550a9ded
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/de_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'Meine Produkte';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Preis';
+$wb['next_payment_date_txt'] = 'N&auml;chste Rechnung';
+$wb['no_products_txt'] = 'Keine Produkte vorhanden.';
+$wb['edit_txt'] = 'Bearbeiten';
+$wb['cancellation_date_txt'] = 'Gek&uuml;ndigt zum';
+?>
diff --git a/interface/web/dashboard/lib/lang/de_dashlet_shop.lng b/interface/web/dashboard/lib/lang/de_dashlet_shop.lng
new file mode 100644
index 0000000000..ca33307a22
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/de_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Bestellen';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Preis';
+$wb['setup_fee_txt'] = 'Einrichtung';
+$wb['no_products_txt'] = 'Keine Produkte gefunden.';
+$wb['order_txt'] = 'Bestellen';
+?>
diff --git a/interface/web/dashboard/lib/lang/el_dashlet_customer.lng b/interface/web/dashboard/lib/lang/el_dashlet_customer.lng
new file mode 100644
index 0000000000..4fe6cb0ef7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/el_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'My Data';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/el_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/el_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..d021c17f8a
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/el_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/el_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/el_dashlet_invoices.lng
new file mode 100644
index 0000000000..a680daa8f6
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/el_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = 'Invoices';
+$wb['invoice_no_txt'] = 'Invoice No.';
+$wb['amount_txt'] = 'Amount';
+$wb['date_txt'] = 'Date';
+$wb['invoice_status_txt'] = 'Status';
+$wb['no_invoices_txt'] = 'No Invoices available.';
+$wb['paid_txt'] = 'Paid';
+$wb['unpaid_txt'] = 'Unpaid';
+$wb['paynow_txt'] = 'pay now';
+$wb['proforma_txt'] = 'Proforma';
+$wb['refunded_txt'] = 'Refunded';
+$wb['not_refunded_txt'] = 'Not refunded';
+$wb['invoice_type_invoice_txt'] = 'Invoice';
+$wb['invoice_type_proforma_txt'] = 'Proforma';
+$wb['invoice_type_refund_txt'] = 'Refund';
+$wb['invoice_type_reminder_txt'] = 'Reminder';
+?>
diff --git a/interface/web/dashboard/lib/lang/el_dashlet_limits.lng b/interface/web/dashboard/lib/lang/el_dashlet_limits.lng
index fc373ea3e4..d7e687bfc4 100644
--- a/interface/web/dashboard/lib/lang/el_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/el_dashlet_limits.lng
@@ -27,4 +27,5 @@ $wb['limit_webdav_user_txt'] = 'Αριθμός χρηστών Webdav';
 $wb['limit_client_txt'] = 'Αριθμός Πελατών';
 $wb['limit_database_txt'] = 'Αριθμός Databases';
 $wb['limit_mailmailinglist_txt'] = 'Αριθμός λιστών ηλ. αλληλογραφίας';
+$wb['limit_domain_txt'] = 'Number of Domains';
 ?>
diff --git a/interface/web/dashboard/lib/lang/el_dashlet_products.lng b/interface/web/dashboard/lib/lang/el_dashlet_products.lng
new file mode 100644
index 0000000000..a69b61d2fb
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/el_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'My Products';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['next_payment_date_txt'] = 'Next Invoice';
+$wb['no_products_txt'] = 'No products found.';
+$wb['edit_txt'] = 'Edit';
+$wb['cancellation_date_txt'] = 'Cancelled by';
+?>
diff --git a/interface/web/dashboard/lib/lang/el_dashlet_shop.lng b/interface/web/dashboard/lib/lang/el_dashlet_shop.lng
new file mode 100644
index 0000000000..1e0b5361d7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/el_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Order';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['setup_fee_txt'] = 'Setup Fee';
+$wb['no_products_txt'] = 'No products found.';
+$wb['order_txt'] = 'Order';
+?>
diff --git a/interface/web/dashboard/lib/lang/en_dashlet_customer.lng b/interface/web/dashboard/lib/lang/en_dashlet_customer.lng
new file mode 100644
index 0000000000..4fe6cb0ef7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/en_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'My Data';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/en_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/en_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..d021c17f8a
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/en_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/en_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/en_dashlet_invoices.lng
new file mode 100644
index 0000000000..b085406e1d
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/en_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = "Invoices";
+$wb['invoice_no_txt'] = "Invoice No.";
+$wb['amount_txt'] = "Amount";
+$wb['date_txt'] = "Date";
+$wb['invoice_status_txt'] = "Status";
+$wb['no_invoices_txt'] = "No Invoices available.";
+$wb['paid_txt'] = "Paid";
+$wb['unpaid_txt'] = "Unpaid";
+$wb['paynow_txt'] = "pay now";
+$wb['proforma_txt'] = "Proforma";
+$wb['refunded_txt'] = "Refunded";
+$wb['not_refunded_txt'] = "Not refunded";
+$wb['invoice_type_invoice_txt'] = "Invoice";
+$wb['invoice_type_proforma_txt'] = "Proforma";
+$wb['invoice_type_refund_txt'] = "Refund";
+$wb['invoice_type_reminder_txt'] = "Reminder";
+?>
diff --git a/interface/web/dashboard/lib/lang/en_dashlet_products.lng b/interface/web/dashboard/lib/lang/en_dashlet_products.lng
new file mode 100644
index 0000000000..a69b61d2fb
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/en_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'My Products';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['next_payment_date_txt'] = 'Next Invoice';
+$wb['no_products_txt'] = 'No products found.';
+$wb['edit_txt'] = 'Edit';
+$wb['cancellation_date_txt'] = 'Cancelled by';
+?>
diff --git a/interface/web/dashboard/lib/lang/en_dashlet_shop.lng b/interface/web/dashboard/lib/lang/en_dashlet_shop.lng
new file mode 100644
index 0000000000..1e0b5361d7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/en_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Order';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['setup_fee_txt'] = 'Setup Fee';
+$wb['no_products_txt'] = 'No products found.';
+$wb['order_txt'] = 'Order';
+?>
diff --git a/interface/web/dashboard/lib/lang/es_dashlet_customer.lng b/interface/web/dashboard/lib/lang/es_dashlet_customer.lng
new file mode 100644
index 0000000000..4fe6cb0ef7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/es_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'My Data';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/es_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/es_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..d021c17f8a
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/es_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/es_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/es_dashlet_invoices.lng
new file mode 100644
index 0000000000..a680daa8f6
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/es_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = 'Invoices';
+$wb['invoice_no_txt'] = 'Invoice No.';
+$wb['amount_txt'] = 'Amount';
+$wb['date_txt'] = 'Date';
+$wb['invoice_status_txt'] = 'Status';
+$wb['no_invoices_txt'] = 'No Invoices available.';
+$wb['paid_txt'] = 'Paid';
+$wb['unpaid_txt'] = 'Unpaid';
+$wb['paynow_txt'] = 'pay now';
+$wb['proforma_txt'] = 'Proforma';
+$wb['refunded_txt'] = 'Refunded';
+$wb['not_refunded_txt'] = 'Not refunded';
+$wb['invoice_type_invoice_txt'] = 'Invoice';
+$wb['invoice_type_proforma_txt'] = 'Proforma';
+$wb['invoice_type_refund_txt'] = 'Refund';
+$wb['invoice_type_reminder_txt'] = 'Reminder';
+?>
diff --git a/interface/web/dashboard/lib/lang/es_dashlet_limits.lng b/interface/web/dashboard/lib/lang/es_dashlet_limits.lng
index cf028cb861..2d57a27e8f 100644
--- a/interface/web/dashboard/lib/lang/es_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/es_dashlet_limits.lng
@@ -1,5 +1,4 @@
 <?php
-
 $wb['limits_txt'] = 'Límites de la cuenta';
 $wb['of_txt'] = 'de';
 $wb['unlimited_txt'] = 'Ilimitado';
diff --git a/interface/web/dashboard/lib/lang/es_dashlet_products.lng b/interface/web/dashboard/lib/lang/es_dashlet_products.lng
new file mode 100644
index 0000000000..a69b61d2fb
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/es_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'My Products';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['next_payment_date_txt'] = 'Next Invoice';
+$wb['no_products_txt'] = 'No products found.';
+$wb['edit_txt'] = 'Edit';
+$wb['cancellation_date_txt'] = 'Cancelled by';
+?>
diff --git a/interface/web/dashboard/lib/lang/es_dashlet_shop.lng b/interface/web/dashboard/lib/lang/es_dashlet_shop.lng
new file mode 100644
index 0000000000..1e0b5361d7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/es_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Order';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['setup_fee_txt'] = 'Setup Fee';
+$wb['no_products_txt'] = 'No products found.';
+$wb['order_txt'] = 'Order';
+?>
diff --git a/interface/web/dashboard/lib/lang/fi_dashlet_customer.lng b/interface/web/dashboard/lib/lang/fi_dashlet_customer.lng
new file mode 100644
index 0000000000..4fe6cb0ef7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/fi_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'My Data';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/fi_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/fi_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..d021c17f8a
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/fi_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/fi_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/fi_dashlet_invoices.lng
new file mode 100644
index 0000000000..a680daa8f6
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/fi_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = 'Invoices';
+$wb['invoice_no_txt'] = 'Invoice No.';
+$wb['amount_txt'] = 'Amount';
+$wb['date_txt'] = 'Date';
+$wb['invoice_status_txt'] = 'Status';
+$wb['no_invoices_txt'] = 'No Invoices available.';
+$wb['paid_txt'] = 'Paid';
+$wb['unpaid_txt'] = 'Unpaid';
+$wb['paynow_txt'] = 'pay now';
+$wb['proforma_txt'] = 'Proforma';
+$wb['refunded_txt'] = 'Refunded';
+$wb['not_refunded_txt'] = 'Not refunded';
+$wb['invoice_type_invoice_txt'] = 'Invoice';
+$wb['invoice_type_proforma_txt'] = 'Proforma';
+$wb['invoice_type_refund_txt'] = 'Refund';
+$wb['invoice_type_reminder_txt'] = 'Reminder';
+?>
diff --git a/interface/web/dashboard/lib/lang/fi_dashlet_limits.lng b/interface/web/dashboard/lib/lang/fi_dashlet_limits.lng
index e6617be59b..93986e5128 100644
--- a/interface/web/dashboard/lib/lang/fi_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/fi_dashlet_limits.lng
@@ -27,4 +27,5 @@ $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_domain_txt'] = 'Number of Domains';
 ?>
diff --git a/interface/web/dashboard/lib/lang/fi_dashlet_products.lng b/interface/web/dashboard/lib/lang/fi_dashlet_products.lng
new file mode 100644
index 0000000000..a69b61d2fb
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/fi_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'My Products';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['next_payment_date_txt'] = 'Next Invoice';
+$wb['no_products_txt'] = 'No products found.';
+$wb['edit_txt'] = 'Edit';
+$wb['cancellation_date_txt'] = 'Cancelled by';
+?>
diff --git a/interface/web/dashboard/lib/lang/fi_dashlet_shop.lng b/interface/web/dashboard/lib/lang/fi_dashlet_shop.lng
new file mode 100644
index 0000000000..1e0b5361d7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/fi_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Order';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['setup_fee_txt'] = 'Setup Fee';
+$wb['no_products_txt'] = 'No products found.';
+$wb['order_txt'] = 'Order';
+?>
diff --git a/interface/web/dashboard/lib/lang/fr_dashlet_customer.lng b/interface/web/dashboard/lib/lang/fr_dashlet_customer.lng
new file mode 100644
index 0000000000..4fe6cb0ef7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/fr_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'My Data';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/fr_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/fr_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..8cae3dfb4f
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/fr_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/fr_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/fr_dashlet_invoices.lng
new file mode 100644
index 0000000000..a680daa8f6
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/fr_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = 'Invoices';
+$wb['invoice_no_txt'] = 'Invoice No.';
+$wb['amount_txt'] = 'Amount';
+$wb['date_txt'] = 'Date';
+$wb['invoice_status_txt'] = 'Status';
+$wb['no_invoices_txt'] = 'No Invoices available.';
+$wb['paid_txt'] = 'Paid';
+$wb['unpaid_txt'] = 'Unpaid';
+$wb['paynow_txt'] = 'pay now';
+$wb['proforma_txt'] = 'Proforma';
+$wb['refunded_txt'] = 'Refunded';
+$wb['not_refunded_txt'] = 'Not refunded';
+$wb['invoice_type_invoice_txt'] = 'Invoice';
+$wb['invoice_type_proforma_txt'] = 'Proforma';
+$wb['invoice_type_refund_txt'] = 'Refund';
+$wb['invoice_type_reminder_txt'] = 'Reminder';
+?>
diff --git a/interface/web/dashboard/lib/lang/fr_dashlet_limits.lng b/interface/web/dashboard/lib/lang/fr_dashlet_limits.lng
index 60e3ef211d..c3d99fab9d 100644
--- a/interface/web/dashboard/lib/lang/fr_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/fr_dashlet_limits.lng
@@ -2,29 +2,30 @@
 $wb['limits_txt'] = 'Limites du compte';
 $wb['of_txt'] = 'sur';
 $wb['unlimited_txt'] = 'Illimité';
-$wb['limit_maildomain_txt'] = 'Nombre de domaines email';
-$wb['limit_mailmailinglist_txt'] = 'Nombre de mailing lists';
-$wb['limit_mailbox_txt'] = 'Nombre de boites email';
-$wb['limit_mailalias_txt'] = 'Nombre d\'alias email';
-$wb['limit_mailaliasdomain_txt'] = 'Nombre d\'alias de domaine';
-$wb['limit_mailforward_txt'] = 'Nombre de transferts d\'email';
-$wb['limit_mailcatchall_txt'] = 'Nombre de comptes email collecteurs';
-$wb['limit_mailrouting_txt'] = 'Nombre de routes email';
-$wb['limit_mailfilter_txt'] = 'Nombre de filtres email';
+$wb['limit_maildomain_txt'] = 'Nombre de domaines e-mail';
+$wb['limit_mailmailinglist_txt'] = 'Nombre de liste de distribution';
+$wb['limit_mailbox_txt'] = 'Nombre de boîtes aux lettres';
+$wb['limit_mailalias_txt'] = 'Nombre d’alias de messagerie';
+$wb['limit_mailaliasdomain_txt'] = 'Nombre d’alias de domaine';
+$wb['limit_mailforward_txt'] = 'Nombre de transferts de messagerie';
+$wb['limit_mailcatchall_txt'] = 'Nombre de comptes e-mail collecteurs';
+$wb['limit_mailrouting_txt'] = 'Nombre de routes e-mail';
+$wb['limit_mailfilter_txt'] = 'Nombre de filtres e-mail';
 $wb['limit_fetchmail_txt'] = 'Nombre de comptes Fetchmail';
-$wb['limit_spamfilter_wblist_txt'] = 'Nombre de listes blanches / noires de l\'anti-spam';
-$wb['limit_spamfilter_user_txt'] = 'Nombre d\'utilisateurs de l\'anti-spam';
-$wb['limit_spamfilter_policy_txt'] = 'Nombre de stratégies de l\'anti-spam';
+$wb['limit_spamfilter_wblist_txt'] = 'Nombre de listes blanches / noires de l’anti-spam';
+$wb['limit_spamfilter_user_txt'] = 'Nombre d’utilisateurs de l’anti-spam';
+$wb['limit_spamfilter_policy_txt'] = 'Nombre de stratégies de l’anti-spam';
 $wb['limit_cron_txt'] = 'Nombre de tâches Cron';
 $wb['limit_web_domain_txt'] = 'Nombre de domaines web';
-$wb['limit_web_aliasdomain_txt'] = 'Nombre d\'alias de domaine web';
+$wb['limit_web_aliasdomain_txt'] = 'Nombre d’alias de domaine web';
 $wb['limit_web_subdomain_txt'] = 'Nombre de sous-domaines web';
-$wb['limit_ftp_user_txt'] = 'Nombre d\'utilisateurs FTP';
+$wb['limit_ftp_user_txt'] = 'Nombre d’utilisateurs FTP';
 $wb['limit_dns_zone_txt'] = 'Nombre de zones DNS';
 $wb['limit_dns_slave_zone_txt'] = 'Nombre de zones DNS secondaires';
-$wb['limit_dns_record_txt'] = 'Nombre d\'enregistrements DNS';
-$wb['limit_shell_user_txt'] = 'Nombre d\'utilisateurs Shell';
-$wb['limit_webdav_user_txt'] = 'Nombre d\'utilisateurs WebDAV';
+$wb['limit_dns_record_txt'] = 'Nombre d’enregistrements DNS';
+$wb['limit_shell_user_txt'] = 'Nombre d’utilisateurs Shell';
+$wb['limit_webdav_user_txt'] = 'Nombre d’utilisateurs WebDAV';
 $wb['limit_client_txt'] = 'Nombre de clients';
 $wb['limit_database_txt'] = 'Nombre de bases de données';
+$wb['limit_domain_txt'] = 'Number of Domains';
 ?>
diff --git a/interface/web/dashboard/lib/lang/fr_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/fr_dashlet_mailquota.lng
index d18317ce32..47109efcbb 100644
--- a/interface/web/dashboard/lib/lang/fr_dashlet_mailquota.lng
+++ b/interface/web/dashboard/lib/lang/fr_dashlet_mailquota.lng
@@ -1,8 +1,8 @@
 <?php
-$wb['mailquota_txt'] = 'Quota de la boite mail';
-$wb['email_txt'] = 'Adresse Email';
+$wb['mailquota_txt'] = 'Quota de la boîte e-mail';
+$wb['email_txt'] = 'Adresse e-mail';
 $wb['name_txt'] = 'Nom';
 $wb['used_txt'] = 'Espace utilisé';
 $wb['quota_txt'] = 'Quota';
-$wb['no_email_accounts_txt'] = 'Aucun compte mail trouvé.';
+$wb['no_email_accounts_txt'] = 'Aucun compte e-mail trouvé.';
 ?>
diff --git a/interface/web/dashboard/lib/lang/fr_dashlet_products.lng b/interface/web/dashboard/lib/lang/fr_dashlet_products.lng
new file mode 100644
index 0000000000..a69b61d2fb
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/fr_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'My Products';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['next_payment_date_txt'] = 'Next Invoice';
+$wb['no_products_txt'] = 'No products found.';
+$wb['edit_txt'] = 'Edit';
+$wb['cancellation_date_txt'] = 'Cancelled by';
+?>
diff --git a/interface/web/dashboard/lib/lang/fr_dashlet_shop.lng b/interface/web/dashboard/lib/lang/fr_dashlet_shop.lng
new file mode 100644
index 0000000000..1e0b5361d7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/fr_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Order';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['setup_fee_txt'] = 'Setup Fee';
+$wb['no_products_txt'] = 'No products found.';
+$wb['order_txt'] = 'Order';
+?>
diff --git a/interface/web/dashboard/lib/lang/hr.lng b/interface/web/dashboard/lib/lang/hr.lng
index 4fd68c5918..769b77ae54 100644
--- a/interface/web/dashboard/lib/lang/hr.lng
+++ b/interface/web/dashboard/lib/lang/hr.lng
@@ -2,5 +2,3 @@
 $wb['welcome_user_txt'] = 'Dobrodošao %s';
 $wb['available_modules_txt'] = 'Dostupni moduli';
 ?>
-
-
diff --git a/interface/web/dashboard/lib/lang/hr_dashlet_customer.lng b/interface/web/dashboard/lib/lang/hr_dashlet_customer.lng
new file mode 100644
index 0000000000..4fe6cb0ef7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/hr_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'My Data';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/hr_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/hr_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..8cae3dfb4f
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/hr_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/hr_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/hr_dashlet_invoices.lng
new file mode 100644
index 0000000000..a680daa8f6
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/hr_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = 'Invoices';
+$wb['invoice_no_txt'] = 'Invoice No.';
+$wb['amount_txt'] = 'Amount';
+$wb['date_txt'] = 'Date';
+$wb['invoice_status_txt'] = 'Status';
+$wb['no_invoices_txt'] = 'No Invoices available.';
+$wb['paid_txt'] = 'Paid';
+$wb['unpaid_txt'] = 'Unpaid';
+$wb['paynow_txt'] = 'pay now';
+$wb['proforma_txt'] = 'Proforma';
+$wb['refunded_txt'] = 'Refunded';
+$wb['not_refunded_txt'] = 'Not refunded';
+$wb['invoice_type_invoice_txt'] = 'Invoice';
+$wb['invoice_type_proforma_txt'] = 'Proforma';
+$wb['invoice_type_refund_txt'] = 'Refund';
+$wb['invoice_type_reminder_txt'] = 'Reminder';
+?>
diff --git a/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng b/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng
index fb27cfe152..3fc9765a75 100644
--- a/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/hr_dashlet_limits.lng
@@ -27,6 +27,5 @@ $wb['limit_webdav_user_txt'] = 'Webdav računi';
 $wb['limit_client_txt'] = 'Klijenti';
 $wb['limit_database_txt'] = 'Broj baza';
 $wb['limit_mailmailinglist_txt'] = 'Broj mail lista';
+$wb['limit_domain_txt'] = 'Number of Domains';
 ?>
-
-
diff --git a/interface/web/dashboard/lib/lang/hr_dashlet_mailquota.lng b/interface/web/dashboard/lib/lang/hr_dashlet_mailquota.lng
index 8b3b20fc79..51b92fbb9b 100644
--- a/interface/web/dashboard/lib/lang/hr_dashlet_mailquota.lng
+++ b/interface/web/dashboard/lib/lang/hr_dashlet_mailquota.lng
@@ -6,5 +6,3 @@ $wb['used_txt'] = 'Used Space';
 $wb['quota_txt'] = 'Kvota';
 $wb['no_email_accounts_txt'] = 'No email accounts found.';
 ?>
-
-
diff --git a/interface/web/dashboard/lib/lang/hr_dashlet_modules.lng b/interface/web/dashboard/lib/lang/hr_dashlet_modules.lng
index 2ff293afbf..76f2a1f7c5 100644
--- a/interface/web/dashboard/lib/lang/hr_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/hr_dashlet_modules.lng
@@ -1,5 +1,3 @@
 <?php
 $wb['available_modules_txt'] = 'Dostupni moduli';
 ?>
-
-
diff --git a/interface/web/dashboard/lib/lang/hr_dashlet_products.lng b/interface/web/dashboard/lib/lang/hr_dashlet_products.lng
new file mode 100644
index 0000000000..a69b61d2fb
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/hr_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'My Products';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['next_payment_date_txt'] = 'Next Invoice';
+$wb['no_products_txt'] = 'No products found.';
+$wb['edit_txt'] = 'Edit';
+$wb['cancellation_date_txt'] = 'Cancelled by';
+?>
diff --git a/interface/web/dashboard/lib/lang/hr_dashlet_quota.lng b/interface/web/dashboard/lib/lang/hr_dashlet_quota.lng
index 46dd781276..de7b5a8936 100644
--- a/interface/web/dashboard/lib/lang/hr_dashlet_quota.lng
+++ b/interface/web/dashboard/lib/lang/hr_dashlet_quota.lng
@@ -6,5 +6,3 @@ $wb['hard_txt'] = 'Hard limit';
 $wb['soft_txt'] = 'Soft limit';
 $wb['no_sites_txt'] = 'No web sites found.';
 ?>
-
-
diff --git a/interface/web/dashboard/lib/lang/hr_dashlet_shop.lng b/interface/web/dashboard/lib/lang/hr_dashlet_shop.lng
new file mode 100644
index 0000000000..1e0b5361d7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/hr_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Order';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['setup_fee_txt'] = 'Setup Fee';
+$wb['no_products_txt'] = 'No products found.';
+$wb['order_txt'] = 'Order';
+?>
diff --git a/interface/web/dashboard/lib/lang/hu_dashlet_customer.lng b/interface/web/dashboard/lib/lang/hu_dashlet_customer.lng
new file mode 100644
index 0000000000..4fe6cb0ef7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/hu_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'My Data';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/hu_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/hu_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..d021c17f8a
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/hu_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/hu_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/hu_dashlet_invoices.lng
new file mode 100644
index 0000000000..a680daa8f6
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/hu_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = 'Invoices';
+$wb['invoice_no_txt'] = 'Invoice No.';
+$wb['amount_txt'] = 'Amount';
+$wb['date_txt'] = 'Date';
+$wb['invoice_status_txt'] = 'Status';
+$wb['no_invoices_txt'] = 'No Invoices available.';
+$wb['paid_txt'] = 'Paid';
+$wb['unpaid_txt'] = 'Unpaid';
+$wb['paynow_txt'] = 'pay now';
+$wb['proforma_txt'] = 'Proforma';
+$wb['refunded_txt'] = 'Refunded';
+$wb['not_refunded_txt'] = 'Not refunded';
+$wb['invoice_type_invoice_txt'] = 'Invoice';
+$wb['invoice_type_proforma_txt'] = 'Proforma';
+$wb['invoice_type_refund_txt'] = 'Refund';
+$wb['invoice_type_reminder_txt'] = 'Reminder';
+?>
diff --git a/interface/web/dashboard/lib/lang/hu_dashlet_limits.lng b/interface/web/dashboard/lib/lang/hu_dashlet_limits.lng
index 21ef3ab885..32694a682a 100644
--- a/interface/web/dashboard/lib/lang/hu_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/hu_dashlet_limits.lng
@@ -27,4 +27,5 @@ $wb['limit_webdav_user_txt'] = 'Number of Webdav users';
 $wb['limit_client_txt'] = 'Number of Ügyféls';
 $wb['limit_database_txt'] = 'Number of Databases';
 $wb['limit_mailmailinglist_txt'] = 'Number of mailing lists';
+$wb['limit_domain_txt'] = 'Number of Domains';
 ?>
diff --git a/interface/web/dashboard/lib/lang/hu_dashlet_products.lng b/interface/web/dashboard/lib/lang/hu_dashlet_products.lng
new file mode 100644
index 0000000000..a69b61d2fb
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/hu_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'My Products';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['next_payment_date_txt'] = 'Next Invoice';
+$wb['no_products_txt'] = 'No products found.';
+$wb['edit_txt'] = 'Edit';
+$wb['cancellation_date_txt'] = 'Cancelled by';
+?>
diff --git a/interface/web/dashboard/lib/lang/hu_dashlet_shop.lng b/interface/web/dashboard/lib/lang/hu_dashlet_shop.lng
new file mode 100644
index 0000000000..1e0b5361d7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/hu_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Order';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['setup_fee_txt'] = 'Setup Fee';
+$wb['no_products_txt'] = 'No products found.';
+$wb['order_txt'] = 'Order';
+?>
diff --git a/interface/web/dashboard/lib/lang/id_dashlet_customer.lng b/interface/web/dashboard/lib/lang/id_dashlet_customer.lng
new file mode 100644
index 0000000000..4fe6cb0ef7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/id_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'My Data';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/id_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/id_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..d021c17f8a
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/id_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/id_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/id_dashlet_invoices.lng
new file mode 100644
index 0000000000..a680daa8f6
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/id_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = 'Invoices';
+$wb['invoice_no_txt'] = 'Invoice No.';
+$wb['amount_txt'] = 'Amount';
+$wb['date_txt'] = 'Date';
+$wb['invoice_status_txt'] = 'Status';
+$wb['no_invoices_txt'] = 'No Invoices available.';
+$wb['paid_txt'] = 'Paid';
+$wb['unpaid_txt'] = 'Unpaid';
+$wb['paynow_txt'] = 'pay now';
+$wb['proforma_txt'] = 'Proforma';
+$wb['refunded_txt'] = 'Refunded';
+$wb['not_refunded_txt'] = 'Not refunded';
+$wb['invoice_type_invoice_txt'] = 'Invoice';
+$wb['invoice_type_proforma_txt'] = 'Proforma';
+$wb['invoice_type_refund_txt'] = 'Refund';
+$wb['invoice_type_reminder_txt'] = 'Reminder';
+?>
diff --git a/interface/web/dashboard/lib/lang/id_dashlet_limits.lng b/interface/web/dashboard/lib/lang/id_dashlet_limits.lng
index 20b310cb6d..73779bee8f 100644
--- a/interface/web/dashboard/lib/lang/id_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/id_dashlet_limits.lng
@@ -27,4 +27,5 @@ $wb['limit_webdav_user_txt'] = 'Jumlah pengguna Webdav';
 $wb['limit_client_txt'] = 'Jumlah Klien';
 $wb['limit_database_txt'] = 'Jumlah Database';
 $wb['limit_mailmailinglist_txt'] = 'Number of mailing lists';
+$wb['limit_domain_txt'] = 'Number of Domains';
 ?>
diff --git a/interface/web/dashboard/lib/lang/id_dashlet_products.lng b/interface/web/dashboard/lib/lang/id_dashlet_products.lng
new file mode 100644
index 0000000000..a69b61d2fb
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/id_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'My Products';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['next_payment_date_txt'] = 'Next Invoice';
+$wb['no_products_txt'] = 'No products found.';
+$wb['edit_txt'] = 'Edit';
+$wb['cancellation_date_txt'] = 'Cancelled by';
+?>
diff --git a/interface/web/dashboard/lib/lang/id_dashlet_shop.lng b/interface/web/dashboard/lib/lang/id_dashlet_shop.lng
new file mode 100644
index 0000000000..1e0b5361d7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/id_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Order';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['setup_fee_txt'] = 'Setup Fee';
+$wb['no_products_txt'] = 'No products found.';
+$wb['order_txt'] = 'Order';
+?>
diff --git a/interface/web/dashboard/lib/lang/it_dashlet_customer.lng b/interface/web/dashboard/lib/lang/it_dashlet_customer.lng
new file mode 100644
index 0000000000..4fe6cb0ef7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/it_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'My Data';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/it_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/it_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..d021c17f8a
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/it_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/it_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/it_dashlet_invoices.lng
new file mode 100644
index 0000000000..a680daa8f6
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/it_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = 'Invoices';
+$wb['invoice_no_txt'] = 'Invoice No.';
+$wb['amount_txt'] = 'Amount';
+$wb['date_txt'] = 'Date';
+$wb['invoice_status_txt'] = 'Status';
+$wb['no_invoices_txt'] = 'No Invoices available.';
+$wb['paid_txt'] = 'Paid';
+$wb['unpaid_txt'] = 'Unpaid';
+$wb['paynow_txt'] = 'pay now';
+$wb['proforma_txt'] = 'Proforma';
+$wb['refunded_txt'] = 'Refunded';
+$wb['not_refunded_txt'] = 'Not refunded';
+$wb['invoice_type_invoice_txt'] = 'Invoice';
+$wb['invoice_type_proforma_txt'] = 'Proforma';
+$wb['invoice_type_refund_txt'] = 'Refund';
+$wb['invoice_type_reminder_txt'] = 'Reminder';
+?>
diff --git a/interface/web/dashboard/lib/lang/it_dashlet_limits.lng b/interface/web/dashboard/lib/lang/it_dashlet_limits.lng
index a89a62b9fb..8546480f32 100644
--- a/interface/web/dashboard/lib/lang/it_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/it_dashlet_limits.lng
@@ -27,4 +27,5 @@ $wb['limit_webdav_user_txt'] = 'Utenti Webdav';
 $wb['limit_client_txt'] = 'Client';
 $wb['limit_database_txt'] = 'Database';
 $wb['limit_mailmailinglist_txt'] = 'Number of mailing lists';
+$wb['limit_domain_txt'] = 'Number of Domains';
 ?>
diff --git a/interface/web/dashboard/lib/lang/it_dashlet_products.lng b/interface/web/dashboard/lib/lang/it_dashlet_products.lng
new file mode 100644
index 0000000000..a69b61d2fb
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/it_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'My Products';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['next_payment_date_txt'] = 'Next Invoice';
+$wb['no_products_txt'] = 'No products found.';
+$wb['edit_txt'] = 'Edit';
+$wb['cancellation_date_txt'] = 'Cancelled by';
+?>
diff --git a/interface/web/dashboard/lib/lang/it_dashlet_shop.lng b/interface/web/dashboard/lib/lang/it_dashlet_shop.lng
new file mode 100644
index 0000000000..1e0b5361d7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/it_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Order';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['setup_fee_txt'] = 'Setup Fee';
+$wb['no_products_txt'] = 'No products found.';
+$wb['order_txt'] = 'Order';
+?>
diff --git a/interface/web/dashboard/lib/lang/ja_dashlet_customer.lng b/interface/web/dashboard/lib/lang/ja_dashlet_customer.lng
new file mode 100644
index 0000000000..4fe6cb0ef7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ja_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'My Data';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/ja_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/ja_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..d021c17f8a
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ja_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/ja_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/ja_dashlet_invoices.lng
new file mode 100644
index 0000000000..a680daa8f6
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ja_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = 'Invoices';
+$wb['invoice_no_txt'] = 'Invoice No.';
+$wb['amount_txt'] = 'Amount';
+$wb['date_txt'] = 'Date';
+$wb['invoice_status_txt'] = 'Status';
+$wb['no_invoices_txt'] = 'No Invoices available.';
+$wb['paid_txt'] = 'Paid';
+$wb['unpaid_txt'] = 'Unpaid';
+$wb['paynow_txt'] = 'pay now';
+$wb['proforma_txt'] = 'Proforma';
+$wb['refunded_txt'] = 'Refunded';
+$wb['not_refunded_txt'] = 'Not refunded';
+$wb['invoice_type_invoice_txt'] = 'Invoice';
+$wb['invoice_type_proforma_txt'] = 'Proforma';
+$wb['invoice_type_refund_txt'] = 'Refund';
+$wb['invoice_type_reminder_txt'] = 'Reminder';
+?>
diff --git a/interface/web/dashboard/lib/lang/ja_dashlet_limits.lng b/interface/web/dashboard/lib/lang/ja_dashlet_limits.lng
index e6617be59b..93986e5128 100644
--- a/interface/web/dashboard/lib/lang/ja_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/ja_dashlet_limits.lng
@@ -27,4 +27,5 @@ $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_domain_txt'] = 'Number of Domains';
 ?>
diff --git a/interface/web/dashboard/lib/lang/ja_dashlet_products.lng b/interface/web/dashboard/lib/lang/ja_dashlet_products.lng
new file mode 100644
index 0000000000..a69b61d2fb
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ja_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'My Products';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['next_payment_date_txt'] = 'Next Invoice';
+$wb['no_products_txt'] = 'No products found.';
+$wb['edit_txt'] = 'Edit';
+$wb['cancellation_date_txt'] = 'Cancelled by';
+?>
diff --git a/interface/web/dashboard/lib/lang/ja_dashlet_shop.lng b/interface/web/dashboard/lib/lang/ja_dashlet_shop.lng
new file mode 100644
index 0000000000..1e0b5361d7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ja_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Order';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['setup_fee_txt'] = 'Setup Fee';
+$wb['no_products_txt'] = 'No products found.';
+$wb['order_txt'] = 'Order';
+?>
diff --git a/interface/web/dashboard/lib/lang/nl_dashlet_customer.lng b/interface/web/dashboard/lib/lang/nl_dashlet_customer.lng
new file mode 100644
index 0000000000..4fe6cb0ef7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/nl_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'My Data';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/nl_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/nl_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..d021c17f8a
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/nl_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/nl_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/nl_dashlet_invoices.lng
new file mode 100644
index 0000000000..a680daa8f6
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/nl_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = 'Invoices';
+$wb['invoice_no_txt'] = 'Invoice No.';
+$wb['amount_txt'] = 'Amount';
+$wb['date_txt'] = 'Date';
+$wb['invoice_status_txt'] = 'Status';
+$wb['no_invoices_txt'] = 'No Invoices available.';
+$wb['paid_txt'] = 'Paid';
+$wb['unpaid_txt'] = 'Unpaid';
+$wb['paynow_txt'] = 'pay now';
+$wb['proforma_txt'] = 'Proforma';
+$wb['refunded_txt'] = 'Refunded';
+$wb['not_refunded_txt'] = 'Not refunded';
+$wb['invoice_type_invoice_txt'] = 'Invoice';
+$wb['invoice_type_proforma_txt'] = 'Proforma';
+$wb['invoice_type_refund_txt'] = 'Refund';
+$wb['invoice_type_reminder_txt'] = 'Reminder';
+?>
diff --git a/interface/web/dashboard/lib/lang/nl_dashlet_limits.lng b/interface/web/dashboard/lib/lang/nl_dashlet_limits.lng
index f192ed5fad..9cbb1a79ed 100644
--- a/interface/web/dashboard/lib/lang/nl_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/nl_dashlet_limits.lng
@@ -27,4 +27,5 @@ $wb['limit_webdav_user_txt'] = 'Aantal Webdav users';
 $wb['limit_client_txt'] = 'Aantal klanten';
 $wb['limit_database_txt'] = 'Aantal databases';
 $wb['limit_mailmailinglist_txt'] = 'Number of mailing lists';
+$wb['limit_domain_txt'] = 'Number of Domains';
 ?>
diff --git a/interface/web/dashboard/lib/lang/nl_dashlet_products.lng b/interface/web/dashboard/lib/lang/nl_dashlet_products.lng
new file mode 100644
index 0000000000..a69b61d2fb
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/nl_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'My Products';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['next_payment_date_txt'] = 'Next Invoice';
+$wb['no_products_txt'] = 'No products found.';
+$wb['edit_txt'] = 'Edit';
+$wb['cancellation_date_txt'] = 'Cancelled by';
+?>
diff --git a/interface/web/dashboard/lib/lang/nl_dashlet_shop.lng b/interface/web/dashboard/lib/lang/nl_dashlet_shop.lng
new file mode 100644
index 0000000000..1e0b5361d7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/nl_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Order';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['setup_fee_txt'] = 'Setup Fee';
+$wb['no_products_txt'] = 'No products found.';
+$wb['order_txt'] = 'Order';
+?>
diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_customer.lng b/interface/web/dashboard/lib/lang/pl_dashlet_customer.lng
new file mode 100644
index 0000000000..9d8124b04d
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/pl_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'Moje dane';
+$wb['edit_txt'] = 'Edycja';
+?>
diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/pl_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..d021c17f8a
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/pl_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/pl_dashlet_invoices.lng
new file mode 100644
index 0000000000..ef1d267b90
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/pl_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = 'Faktury';
+$wb['invoice_no_txt'] = 'Faktura Nr.';
+$wb['amount_txt'] = 'Kwota';
+$wb['date_txt'] = 'Data';
+$wb['invoice_status_txt'] = 'Status';
+$wb['no_invoices_txt'] = 'Brak faktur.';
+$wb['paid_txt'] = 'Zapłacone';
+$wb['unpaid_txt'] = 'Niezapłacone';
+$wb['paynow_txt'] = 'Zapłać';
+$wb['proforma_txt'] = 'Proforma';
+$wb['refunded_txt'] = 'Zwrócone';
+$wb['not_refunded_txt'] = 'Nie zwrócone';
+$wb['invoice_type_invoice_txt'] = 'Faktura';
+$wb['invoice_type_proforma_txt'] = 'Proforma';
+$wb['invoice_type_refund_txt'] = 'Korekta';
+$wb['invoice_type_reminder_txt'] = 'Reminder';
+?>
diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng b/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng
index d69a551bd0..feff0ac338 100644
--- a/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/pl_dashlet_limits.lng
@@ -27,4 +27,5 @@ $wb['limit_webdav_user_txt'] = 'Liczba użytkowników Webdav';
 $wb['limit_client_txt'] = 'Liczba klientów';
 $wb['limit_database_txt'] = 'Liczba baz danych';
 $wb['limit_mailmailinglist_txt'] = 'Liczba list mailingowych';
+$wb['limit_domain_txt'] = 'Number of Domains';
 ?>
diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_products.lng b/interface/web/dashboard/lib/lang/pl_dashlet_products.lng
new file mode 100644
index 0000000000..c67cb045f9
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/pl_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'Moje usługi';
+$wb['name_txt'] = 'Nazwa';
+$wb['price_txt'] = 'Cena brutto';
+$wb['next_payment_date_txt'] = 'Następna faktura';
+$wb['no_products_txt'] = 'Pusta lista usług';
+$wb['edit_txt'] = 'Edycja';
+$wb['cancellation_date_txt'] = 'Data wygaśnięcia';
+?>
diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_shop.lng b/interface/web/dashboard/lib/lang/pl_dashlet_shop.lng
new file mode 100644
index 0000000000..ceea9fea48
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/pl_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Zamówienie';
+$wb['name_txt'] = 'Nazwa';
+$wb['price_txt'] = 'Cena';
+$wb['setup_fee_txt'] = 'Aktywacja usługi';
+$wb['no_products_txt'] = 'Nie znaleziono usług';
+$wb['order_txt'] = 'Zamówienie';
+?>
diff --git a/interface/web/dashboard/lib/lang/pt_dashlet_customer.lng b/interface/web/dashboard/lib/lang/pt_dashlet_customer.lng
new file mode 100644
index 0000000000..4fe6cb0ef7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/pt_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'My Data';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/pt_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/pt_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..d021c17f8a
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/pt_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/pt_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/pt_dashlet_invoices.lng
new file mode 100644
index 0000000000..a680daa8f6
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/pt_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = 'Invoices';
+$wb['invoice_no_txt'] = 'Invoice No.';
+$wb['amount_txt'] = 'Amount';
+$wb['date_txt'] = 'Date';
+$wb['invoice_status_txt'] = 'Status';
+$wb['no_invoices_txt'] = 'No Invoices available.';
+$wb['paid_txt'] = 'Paid';
+$wb['unpaid_txt'] = 'Unpaid';
+$wb['paynow_txt'] = 'pay now';
+$wb['proforma_txt'] = 'Proforma';
+$wb['refunded_txt'] = 'Refunded';
+$wb['not_refunded_txt'] = 'Not refunded';
+$wb['invoice_type_invoice_txt'] = 'Invoice';
+$wb['invoice_type_proforma_txt'] = 'Proforma';
+$wb['invoice_type_refund_txt'] = 'Refund';
+$wb['invoice_type_reminder_txt'] = 'Reminder';
+?>
diff --git a/interface/web/dashboard/lib/lang/pt_dashlet_limits.lng b/interface/web/dashboard/lib/lang/pt_dashlet_limits.lng
index e6617be59b..93986e5128 100644
--- a/interface/web/dashboard/lib/lang/pt_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/pt_dashlet_limits.lng
@@ -27,4 +27,5 @@ $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_domain_txt'] = 'Number of Domains';
 ?>
diff --git a/interface/web/dashboard/lib/lang/pt_dashlet_products.lng b/interface/web/dashboard/lib/lang/pt_dashlet_products.lng
new file mode 100644
index 0000000000..a69b61d2fb
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/pt_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'My Products';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['next_payment_date_txt'] = 'Next Invoice';
+$wb['no_products_txt'] = 'No products found.';
+$wb['edit_txt'] = 'Edit';
+$wb['cancellation_date_txt'] = 'Cancelled by';
+?>
diff --git a/interface/web/dashboard/lib/lang/pt_dashlet_shop.lng b/interface/web/dashboard/lib/lang/pt_dashlet_shop.lng
new file mode 100644
index 0000000000..1e0b5361d7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/pt_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Order';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['setup_fee_txt'] = 'Setup Fee';
+$wb['no_products_txt'] = 'No products found.';
+$wb['order_txt'] = 'Order';
+?>
diff --git a/interface/web/dashboard/lib/lang/ro_dashlet_customer.lng b/interface/web/dashboard/lib/lang/ro_dashlet_customer.lng
new file mode 100644
index 0000000000..4fe6cb0ef7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ro_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'My Data';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/ro_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/ro_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..8cae3dfb4f
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ro_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/ro_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/ro_dashlet_invoices.lng
new file mode 100644
index 0000000000..a680daa8f6
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ro_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = 'Invoices';
+$wb['invoice_no_txt'] = 'Invoice No.';
+$wb['amount_txt'] = 'Amount';
+$wb['date_txt'] = 'Date';
+$wb['invoice_status_txt'] = 'Status';
+$wb['no_invoices_txt'] = 'No Invoices available.';
+$wb['paid_txt'] = 'Paid';
+$wb['unpaid_txt'] = 'Unpaid';
+$wb['paynow_txt'] = 'pay now';
+$wb['proforma_txt'] = 'Proforma';
+$wb['refunded_txt'] = 'Refunded';
+$wb['not_refunded_txt'] = 'Not refunded';
+$wb['invoice_type_invoice_txt'] = 'Invoice';
+$wb['invoice_type_proforma_txt'] = 'Proforma';
+$wb['invoice_type_refund_txt'] = 'Refund';
+$wb['invoice_type_reminder_txt'] = 'Reminder';
+?>
diff --git a/interface/web/dashboard/lib/lang/ro_dashlet_limits.lng b/interface/web/dashboard/lib/lang/ro_dashlet_limits.lng
index e6617be59b..93986e5128 100644
--- a/interface/web/dashboard/lib/lang/ro_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/ro_dashlet_limits.lng
@@ -27,4 +27,5 @@ $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_domain_txt'] = 'Number of Domains';
 ?>
diff --git a/interface/web/dashboard/lib/lang/ro_dashlet_products.lng b/interface/web/dashboard/lib/lang/ro_dashlet_products.lng
new file mode 100644
index 0000000000..a69b61d2fb
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ro_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'My Products';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['next_payment_date_txt'] = 'Next Invoice';
+$wb['no_products_txt'] = 'No products found.';
+$wb['edit_txt'] = 'Edit';
+$wb['cancellation_date_txt'] = 'Cancelled by';
+?>
diff --git a/interface/web/dashboard/lib/lang/ro_dashlet_shop.lng b/interface/web/dashboard/lib/lang/ro_dashlet_shop.lng
new file mode 100644
index 0000000000..1e0b5361d7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ro_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Order';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['setup_fee_txt'] = 'Setup Fee';
+$wb['no_products_txt'] = 'No products found.';
+$wb['order_txt'] = 'Order';
+?>
diff --git a/interface/web/dashboard/lib/lang/ru_dashlet_customer.lng b/interface/web/dashboard/lib/lang/ru_dashlet_customer.lng
new file mode 100644
index 0000000000..4fe6cb0ef7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ru_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'My Data';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/ru_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/ru_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..d021c17f8a
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ru_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/ru_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/ru_dashlet_invoices.lng
new file mode 100644
index 0000000000..a680daa8f6
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ru_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = 'Invoices';
+$wb['invoice_no_txt'] = 'Invoice No.';
+$wb['amount_txt'] = 'Amount';
+$wb['date_txt'] = 'Date';
+$wb['invoice_status_txt'] = 'Status';
+$wb['no_invoices_txt'] = 'No Invoices available.';
+$wb['paid_txt'] = 'Paid';
+$wb['unpaid_txt'] = 'Unpaid';
+$wb['paynow_txt'] = 'pay now';
+$wb['proforma_txt'] = 'Proforma';
+$wb['refunded_txt'] = 'Refunded';
+$wb['not_refunded_txt'] = 'Not refunded';
+$wb['invoice_type_invoice_txt'] = 'Invoice';
+$wb['invoice_type_proforma_txt'] = 'Proforma';
+$wb['invoice_type_refund_txt'] = 'Refund';
+$wb['invoice_type_reminder_txt'] = 'Reminder';
+?>
diff --git a/interface/web/dashboard/lib/lang/ru_dashlet_limits.lng b/interface/web/dashboard/lib/lang/ru_dashlet_limits.lng
index d5b7e9c72d..c364a46910 100644
--- a/interface/web/dashboard/lib/lang/ru_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/ru_dashlet_limits.lng
@@ -27,4 +27,5 @@ $wb['limit_webdav_user_txt'] = 'Количество Webdav пользовате
 $wb['limit_client_txt'] = 'Количество клиентов';
 $wb['limit_database_txt'] = 'Количество баз данных';
 $wb['limit_mailmailinglist_txt'] = 'Number of mailing lists';
+$wb['limit_domain_txt'] = 'Number of Domains';
 ?>
diff --git a/interface/web/dashboard/lib/lang/ru_dashlet_products.lng b/interface/web/dashboard/lib/lang/ru_dashlet_products.lng
new file mode 100644
index 0000000000..a69b61d2fb
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ru_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'My Products';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['next_payment_date_txt'] = 'Next Invoice';
+$wb['no_products_txt'] = 'No products found.';
+$wb['edit_txt'] = 'Edit';
+$wb['cancellation_date_txt'] = 'Cancelled by';
+?>
diff --git a/interface/web/dashboard/lib/lang/ru_dashlet_shop.lng b/interface/web/dashboard/lib/lang/ru_dashlet_shop.lng
new file mode 100644
index 0000000000..1e0b5361d7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/ru_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Order';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['setup_fee_txt'] = 'Setup Fee';
+$wb['no_products_txt'] = 'No products found.';
+$wb['order_txt'] = 'Order';
+?>
diff --git a/interface/web/dashboard/lib/lang/se_dashlet_customer.lng b/interface/web/dashboard/lib/lang/se_dashlet_customer.lng
new file mode 100644
index 0000000000..4fe6cb0ef7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/se_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'My Data';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/se_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/se_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..d021c17f8a
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/se_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/se_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/se_dashlet_invoices.lng
new file mode 100644
index 0000000000..a680daa8f6
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/se_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = 'Invoices';
+$wb['invoice_no_txt'] = 'Invoice No.';
+$wb['amount_txt'] = 'Amount';
+$wb['date_txt'] = 'Date';
+$wb['invoice_status_txt'] = 'Status';
+$wb['no_invoices_txt'] = 'No Invoices available.';
+$wb['paid_txt'] = 'Paid';
+$wb['unpaid_txt'] = 'Unpaid';
+$wb['paynow_txt'] = 'pay now';
+$wb['proforma_txt'] = 'Proforma';
+$wb['refunded_txt'] = 'Refunded';
+$wb['not_refunded_txt'] = 'Not refunded';
+$wb['invoice_type_invoice_txt'] = 'Invoice';
+$wb['invoice_type_proforma_txt'] = 'Proforma';
+$wb['invoice_type_refund_txt'] = 'Refund';
+$wb['invoice_type_reminder_txt'] = 'Reminder';
+?>
diff --git a/interface/web/dashboard/lib/lang/se_dashlet_limits.lng b/interface/web/dashboard/lib/lang/se_dashlet_limits.lng
index 9fbfe97cbd..84adfc3ae5 100644
--- a/interface/web/dashboard/lib/lang/se_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/se_dashlet_limits.lng
@@ -27,4 +27,5 @@ $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';
+$wb['limit_domain_txt'] = 'Number of Domains';
 ?>
diff --git a/interface/web/dashboard/lib/lang/se_dashlet_products.lng b/interface/web/dashboard/lib/lang/se_dashlet_products.lng
new file mode 100644
index 0000000000..a69b61d2fb
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/se_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'My Products';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['next_payment_date_txt'] = 'Next Invoice';
+$wb['no_products_txt'] = 'No products found.';
+$wb['edit_txt'] = 'Edit';
+$wb['cancellation_date_txt'] = 'Cancelled by';
+?>
diff --git a/interface/web/dashboard/lib/lang/se_dashlet_shop.lng b/interface/web/dashboard/lib/lang/se_dashlet_shop.lng
new file mode 100644
index 0000000000..1e0b5361d7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/se_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Order';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['setup_fee_txt'] = 'Setup Fee';
+$wb['no_products_txt'] = 'No products found.';
+$wb['order_txt'] = 'Order';
+?>
diff --git a/interface/web/dashboard/lib/lang/sk_dashlet_customer.lng b/interface/web/dashboard/lib/lang/sk_dashlet_customer.lng
new file mode 100644
index 0000000000..4fe6cb0ef7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/sk_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'My Data';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/sk_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/sk_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..d021c17f8a
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/sk_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/sk_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/sk_dashlet_invoices.lng
new file mode 100644
index 0000000000..a680daa8f6
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/sk_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = 'Invoices';
+$wb['invoice_no_txt'] = 'Invoice No.';
+$wb['amount_txt'] = 'Amount';
+$wb['date_txt'] = 'Date';
+$wb['invoice_status_txt'] = 'Status';
+$wb['no_invoices_txt'] = 'No Invoices available.';
+$wb['paid_txt'] = 'Paid';
+$wb['unpaid_txt'] = 'Unpaid';
+$wb['paynow_txt'] = 'pay now';
+$wb['proforma_txt'] = 'Proforma';
+$wb['refunded_txt'] = 'Refunded';
+$wb['not_refunded_txt'] = 'Not refunded';
+$wb['invoice_type_invoice_txt'] = 'Invoice';
+$wb['invoice_type_proforma_txt'] = 'Proforma';
+$wb['invoice_type_refund_txt'] = 'Refund';
+$wb['invoice_type_reminder_txt'] = 'Reminder';
+?>
diff --git a/interface/web/dashboard/lib/lang/sk_dashlet_limits.lng b/interface/web/dashboard/lib/lang/sk_dashlet_limits.lng
index e6617be59b..93986e5128 100644
--- a/interface/web/dashboard/lib/lang/sk_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/sk_dashlet_limits.lng
@@ -27,4 +27,5 @@ $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_domain_txt'] = 'Number of Domains';
 ?>
diff --git a/interface/web/dashboard/lib/lang/sk_dashlet_products.lng b/interface/web/dashboard/lib/lang/sk_dashlet_products.lng
new file mode 100644
index 0000000000..a69b61d2fb
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/sk_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'My Products';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['next_payment_date_txt'] = 'Next Invoice';
+$wb['no_products_txt'] = 'No products found.';
+$wb['edit_txt'] = 'Edit';
+$wb['cancellation_date_txt'] = 'Cancelled by';
+?>
diff --git a/interface/web/dashboard/lib/lang/sk_dashlet_shop.lng b/interface/web/dashboard/lib/lang/sk_dashlet_shop.lng
new file mode 100644
index 0000000000..1e0b5361d7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/sk_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Order';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['setup_fee_txt'] = 'Setup Fee';
+$wb['no_products_txt'] = 'No products found.';
+$wb['order_txt'] = 'Order';
+?>
diff --git a/interface/web/dashboard/lib/lang/tr.lng b/interface/web/dashboard/lib/lang/tr.lng
index d8d6c54773..fea8a3ae5a 100644
--- a/interface/web/dashboard/lib/lang/tr.lng
+++ b/interface/web/dashboard/lib/lang/tr.lng
@@ -2,4 +2,3 @@
 $wb['welcome_user_txt'] = 'Merhaba %s';
 $wb['available_modules_txt'] = 'Kullanılabilecek Modüller';
 ?>
-
diff --git a/interface/web/dashboard/lib/lang/tr_dashlet_customer.lng b/interface/web/dashboard/lib/lang/tr_dashlet_customer.lng
new file mode 100644
index 0000000000..4fe6cb0ef7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/tr_dashlet_customer.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['customerdata_txt'] = 'My Data';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/tr_dashlet_invoice_client_settings.lng b/interface/web/dashboard/lib/lang/tr_dashlet_invoice_client_settings.lng
new file mode 100644
index 0000000000..d021c17f8a
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/tr_dashlet_invoice_client_settings.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['invoice_client_settings_txt'] = 'Invoice Client Settings';
+$wb['edit_txt'] = 'Edit';
+?>
diff --git a/interface/web/dashboard/lib/lang/tr_dashlet_invoices.lng b/interface/web/dashboard/lib/lang/tr_dashlet_invoices.lng
new file mode 100644
index 0000000000..a680daa8f6
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/tr_dashlet_invoices.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['invoices_txt'] = 'Invoices';
+$wb['invoice_no_txt'] = 'Invoice No.';
+$wb['amount_txt'] = 'Amount';
+$wb['date_txt'] = 'Date';
+$wb['invoice_status_txt'] = 'Status';
+$wb['no_invoices_txt'] = 'No Invoices available.';
+$wb['paid_txt'] = 'Paid';
+$wb['unpaid_txt'] = 'Unpaid';
+$wb['paynow_txt'] = 'pay now';
+$wb['proforma_txt'] = 'Proforma';
+$wb['refunded_txt'] = 'Refunded';
+$wb['not_refunded_txt'] = 'Not refunded';
+$wb['invoice_type_invoice_txt'] = 'Invoice';
+$wb['invoice_type_proforma_txt'] = 'Proforma';
+$wb['invoice_type_refund_txt'] = 'Refund';
+$wb['invoice_type_reminder_txt'] = 'Reminder';
+?>
diff --git a/interface/web/dashboard/lib/lang/tr_dashlet_limits.lng b/interface/web/dashboard/lib/lang/tr_dashlet_limits.lng
index fe38ee4119..65985925cf 100644
--- a/interface/web/dashboard/lib/lang/tr_dashlet_limits.lng
+++ b/interface/web/dashboard/lib/lang/tr_dashlet_limits.lng
@@ -29,4 +29,3 @@ $wb['limit_client_txt'] = 'Müşteri Sayısı';
 $wb['limit_database_txt'] = 'Veritabanı Sayısı';
 $wb['limit_domain_txt'] = 'Alan Adı Sayısı';
 ?>
-
diff --git a/interface/web/dashboard/lib/lang/tr_dashlet_modules.lng b/interface/web/dashboard/lib/lang/tr_dashlet_modules.lng
index f0a468a7fc..90de86f128 100644
--- a/interface/web/dashboard/lib/lang/tr_dashlet_modules.lng
+++ b/interface/web/dashboard/lib/lang/tr_dashlet_modules.lng
@@ -1,4 +1,3 @@
 <?php
 $wb['available_modules_txt'] = 'Kullanılabilecek Modüller';
 ?>
-
diff --git a/interface/web/dashboard/lib/lang/tr_dashlet_products.lng b/interface/web/dashboard/lib/lang/tr_dashlet_products.lng
new file mode 100644
index 0000000000..a69b61d2fb
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/tr_dashlet_products.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['products_txt'] = 'My Products';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['next_payment_date_txt'] = 'Next Invoice';
+$wb['no_products_txt'] = 'No products found.';
+$wb['edit_txt'] = 'Edit';
+$wb['cancellation_date_txt'] = 'Cancelled by';
+?>
diff --git a/interface/web/dashboard/lib/lang/tr_dashlet_shop.lng b/interface/web/dashboard/lib/lang/tr_dashlet_shop.lng
new file mode 100644
index 0000000000..1e0b5361d7
--- /dev/null
+++ b/interface/web/dashboard/lib/lang/tr_dashlet_shop.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['shop_txt'] = 'Order';
+$wb['name_txt'] = 'Name';
+$wb['price_txt'] = 'Price';
+$wb['setup_fee_txt'] = 'Setup Fee';
+$wb['no_products_txt'] = 'No products found.';
+$wb['order_txt'] = 'Order';
+?>
diff --git a/interface/web/dns/lib/lang/ar_dns_dmarc.lng b/interface/web/dns/lib/lang/ar_dns_dmarc.lng
index b00949bc98..cf78bb8eed 100644
--- a/interface/web/dns/lib/lang/ar_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/ar_dns_dmarc.lng
@@ -11,16 +11,16 @@ $wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages
 $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address';
 $wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).';
 $wb['dmarc_fo_txt'] = 'Forensic reporting options';
-$wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result.";
+$wb['dmarc_fo0_txt'] = 'Generate reports if all underlying authentication mechanisms fail to produce a DMARC \'pass\' result.';
 $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.';
 $wb['dmarc_fod_txt'] = 'Generate report if DKIM signature failed to verify.';
 $wb['dmarc_fos_txt'] = 'Generate report if SPF failed.';
 $wb['dmarc_adkim_txt'] = 'DKIM identifier alignment';
-$wb['dmarc_adkim_note_txt'] = "'strict' requires exact matching between DKIM domain and email's from";
+$wb['dmarc_adkim_note_txt'] = '\'strict\' requires exact matching between DKIM domain and email\'s from';
 $wb['dmarc_adkim_r_txt'] = 'relaxed';
 $wb['dmarc_adkim_s_txt'] = 'strict';
 $wb['dmarc_aspf_txt'] = 'SPF identifier alignment';
-$wb['dmarc_aspf_note_txt'] = "'strict' requires exact matching between SPF domain and email's from";
+$wb['dmarc_aspf_note_txt'] = '\'strict\' requires exact matching between SPF domain and email\'s from';
 $wb['dmarc_aspf_r_txt'] = 'relaxed';
 $wb['dmarc_aspf_s_txt'] = 'strict';
 $wb['dmarc_rf_txt'] = 'Report Format';
@@ -37,7 +37,7 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine';
 $wb['dmarc_sp_reject_txt'] = 'reject';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
-$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails.";
+$wb['dmarc_policy_error_txt'] = 'Only policy \'none\' is allowed without DKIM-signed emails.';
 $wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.';
 $wb['dmarc_no_spf_txt'] = 'No active SPF Record.';
 $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record';
diff --git a/interface/web/dns/lib/lang/ar_dns_ds.lng b/interface/web/dns/lib/lang/ar_dns_ds.lng
new file mode 100644
index 0000000000..c3622dc5b5
--- /dev/null
+++ b/interface/web/dns/lib/lang/ar_dns_ds.lng
@@ -0,0 +1,17 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Data';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$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.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'Text empty';
+$wb['data_error_regex'] = 'Text format invalid';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['invalid_type_ds'] = 'DS-Record has a wrong format.';
+?>
diff --git a/interface/web/dns/lib/lang/ar_dns_import.lng b/interface/web/dns/lib/lang/ar_dns_import.lng
index 2d1fe083ea..8f67eba14c 100644
--- a/interface/web/dns/lib/lang/ar_dns_import.lng
+++ b/interface/web/dns/lib/lang/ar_dns_import.lng
@@ -11,4 +11,6 @@ $wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filen
 $wb['title'] = 'Import Zone Files';
 $wb['no_file_uploaded_error'] = 'No zonefile uploaded';
 $wb['zone_file_import_txt'] = 'Zone File Import';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/ar_dns_loc.lng b/interface/web/dns/lib/lang/ar_dns_loc.lng
new file mode 100644
index 0000000000..dc9ad9a006
--- /dev/null
+++ b/interface/web/dns/lib/lang/ar_dns_loc.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Data';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$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.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'Text empty';
+$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/ar_dns_soa.lng b/interface/web/dns/lib/lang/ar_dns_soa.lng
index c805d7e48f..572349d085 100644
--- a/interface/web/dns/lib/lang/ar_dns_soa.lng
+++ b/interface/web/dns/lib/lang/ar_dns_soa.lng
@@ -35,4 +35,9 @@ $wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
 $wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 $wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
+$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
+$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
+$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
 ?>
diff --git a/interface/web/dns/lib/lang/ar_dns_soa_list.lng b/interface/web/dns/lib/lang/ar_dns_soa_list.lng
index da7b8e28d2..eb1b6cce43 100644
--- a/interface/web/dns/lib/lang/ar_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/ar_dns_soa_list.lng
@@ -7,4 +7,5 @@ $wb['ns_txt'] = 'NS';
 $wb['mbox_txt'] = 'Email';
 $wb['add_new_record_txt'] = 'Add new DNS Zone (SOA)';
 $wb['add_new_record_wizard_txt'] = 'Add new DNS Zone with Wizard';
+$wb['import_zone_file_txt'] = 'Import Zone File';
 ?>
diff --git a/interface/web/dns/lib/lang/ar_dns_spf.lng b/interface/web/dns/lib/lang/ar_dns_spf.lng
index 8a1a611c21..df8d1fe145 100644
--- a/interface/web/dns/lib/lang/ar_dns_spf.lng
+++ b/interface/web/dns/lib/lang/ar_dns_spf.lng
@@ -16,10 +16,10 @@ $wb['spf_invalid_hostname_txt'] = 'Invalid hostname';
 $wb['spf_domain_txt'] = 'Any domains that may deliver or relay mail for this domain';
 $wb['spf_domain_note_txt'] = '(Sepearate domains with whitespaces)';
 $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["record_exists_txt"] = 'DNS-Record already exists';
-$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['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/ar_dns_tlsa.lng b/interface/web/dns/lib/lang/ar_dns_tlsa.lng
new file mode 100644
index 0000000000..3b87e2ad59
--- /dev/null
+++ b/interface/web/dns/lib/lang/ar_dns_tlsa.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Service-Descriptor';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'TLSA-Data';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$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.';
+$wb['name_error_regex'] = 'The hostname has the wrong format. Correct: _&lt;port&gt;._(tcp|udp).&lt;hostname&gt;';
+$wb['data_error_empty'] = 'TLSA-Data empty';
+$wb['data_error_regex'] = 'TLSA dataformat is wrong. Correct: n n n HASH';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
diff --git a/interface/web/dns/lib/lang/ar_dns_txt.lng b/interface/web/dns/lib/lang/ar_dns_txt.lng
index 658b0ddf83..ecbb5215cb 100644
--- a/interface/web/dns/lib/lang/ar_dns_txt.lng
+++ b/interface/web/dns/lib/lang/ar_dns_txt.lng
@@ -1,17 +1,17 @@
 <?php
-$wb["server_id_txt"] = 'Server';
-$wb["zone_txt"] = 'Zone';
-$wb["name_txt"] = 'Hostname';
-$wb["type_txt"] = 'type';
-$wb["data_txt"] = 'Text';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$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.';
-$wb["name_error_regex"] = 'The hostname has the wrong format.';
-$wb["data_error_empty"] = 'Text empty';
-$wb["data_error_regex"] = 'Text format invalid';
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Text';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$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.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'Text empty';
+$wb['data_error_regex'] = 'Text format invalid';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 $wb['invalid_type_dkim'] = 'DKIM is not allowed. Use the DKIM button';
 $wb['invalid_type_dmarc'] = 'DMARC is not allowed. Use the DMARC button';
diff --git a/interface/web/dns/lib/lang/ar_dns_wizard.lng b/interface/web/dns/lib/lang/ar_dns_wizard.lng
index 5e1df4a3a1..9061c97483 100644
--- a/interface/web/dns/lib/lang/ar_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/ar_dns_wizard.lng
@@ -38,4 +38,6 @@ $wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
 $wb['list_head_txt'] = 'DNS Zone Wizard';
 $wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
 $wb['dkim_txt'] = 'DKIM enabled';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/bg_dns_dmarc.lng b/interface/web/dns/lib/lang/bg_dns_dmarc.lng
index b00949bc98..cf78bb8eed 100644
--- a/interface/web/dns/lib/lang/bg_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/bg_dns_dmarc.lng
@@ -11,16 +11,16 @@ $wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages
 $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address';
 $wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).';
 $wb['dmarc_fo_txt'] = 'Forensic reporting options';
-$wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result.";
+$wb['dmarc_fo0_txt'] = 'Generate reports if all underlying authentication mechanisms fail to produce a DMARC \'pass\' result.';
 $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.';
 $wb['dmarc_fod_txt'] = 'Generate report if DKIM signature failed to verify.';
 $wb['dmarc_fos_txt'] = 'Generate report if SPF failed.';
 $wb['dmarc_adkim_txt'] = 'DKIM identifier alignment';
-$wb['dmarc_adkim_note_txt'] = "'strict' requires exact matching between DKIM domain and email's from";
+$wb['dmarc_adkim_note_txt'] = '\'strict\' requires exact matching between DKIM domain and email\'s from';
 $wb['dmarc_adkim_r_txt'] = 'relaxed';
 $wb['dmarc_adkim_s_txt'] = 'strict';
 $wb['dmarc_aspf_txt'] = 'SPF identifier alignment';
-$wb['dmarc_aspf_note_txt'] = "'strict' requires exact matching between SPF domain and email's from";
+$wb['dmarc_aspf_note_txt'] = '\'strict\' requires exact matching between SPF domain and email\'s from';
 $wb['dmarc_aspf_r_txt'] = 'relaxed';
 $wb['dmarc_aspf_s_txt'] = 'strict';
 $wb['dmarc_rf_txt'] = 'Report Format';
@@ -37,7 +37,7 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine';
 $wb['dmarc_sp_reject_txt'] = 'reject';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
-$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails.";
+$wb['dmarc_policy_error_txt'] = 'Only policy \'none\' is allowed without DKIM-signed emails.';
 $wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.';
 $wb['dmarc_no_spf_txt'] = 'No active SPF Record.';
 $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record';
diff --git a/interface/web/dns/lib/lang/bg_dns_ds.lng b/interface/web/dns/lib/lang/bg_dns_ds.lng
new file mode 100644
index 0000000000..3f9b447811
--- /dev/null
+++ b/interface/web/dns/lib/lang/bg_dns_ds.lng
@@ -0,0 +1,18 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$wb["data_error_regex"] = 'Text format invalid';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['invalid_type_ds'] = 'DS-Record has a wrong format.';
+
+?>
diff --git a/interface/web/dns/lib/lang/bg_dns_import.lng b/interface/web/dns/lib/lang/bg_dns_import.lng
index 52a7f3806a..848a4f933b 100644
--- a/interface/web/dns/lib/lang/bg_dns_import.lng
+++ b/interface/web/dns/lib/lang/bg_dns_import.lng
@@ -11,4 +11,6 @@ $wb['domain_field_desc_txt'] = 'Може да се остави празно, а
 $wb['title'] = 'Въвеждане на файл с зона';
 $wb['no_file_uploaded_error'] = 'Не е качен файла с зоната';
 $wb['zone_file_import_txt'] = 'Zone File Import';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/bg_dns_loc.lng b/interface/web/dns/lib/lang/bg_dns_loc.lng
new file mode 100644
index 0000000000..a2e3322bb6
--- /dev/null
+++ b/interface/web/dns/lib/lang/bg_dns_loc.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$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/bg_dns_soa.lng b/interface/web/dns/lib/lang/bg_dns_soa.lng
index 3ec655d8a9..0838d133bd 100644
--- a/interface/web/dns/lib/lang/bg_dns_soa.lng
+++ b/interface/web/dns/lib/lang/bg_dns_soa.lng
@@ -35,4 +35,9 @@ $wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
 $wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 $wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
+$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
+$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
+$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
 ?>
diff --git a/interface/web/dns/lib/lang/bg_dns_soa_list.lng b/interface/web/dns/lib/lang/bg_dns_soa_list.lng
index f2dffbe68f..0f6c305ab5 100644
--- a/interface/web/dns/lib/lang/bg_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/bg_dns_soa_list.lng
@@ -7,4 +7,5 @@ $wb['ns_txt'] = 'NS';
 $wb['mbox_txt'] = 'Email';
 $wb['add_new_record_txt'] = 'Добави нова зона (SOA)';
 $wb['add_new_record_wizard_txt'] = 'Добави нова зона с помощник';
+$wb['import_zone_file_txt'] = 'Import Zone File';
 ?>
diff --git a/interface/web/dns/lib/lang/bg_dns_spf.lng b/interface/web/dns/lib/lang/bg_dns_spf.lng
index 8a1a611c21..df8d1fe145 100644
--- a/interface/web/dns/lib/lang/bg_dns_spf.lng
+++ b/interface/web/dns/lib/lang/bg_dns_spf.lng
@@ -16,10 +16,10 @@ $wb['spf_invalid_hostname_txt'] = 'Invalid hostname';
 $wb['spf_domain_txt'] = 'Any domains that may deliver or relay mail for this domain';
 $wb['spf_domain_note_txt'] = '(Sepearate domains with whitespaces)';
 $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["record_exists_txt"] = 'DNS-Record already exists';
-$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['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/bg_dns_tlsa.lng b/interface/web/dns/lib/lang/bg_dns_tlsa.lng
new file mode 100644
index 0000000000..dcfb3bfa33
--- /dev/null
+++ b/interface/web/dns/lib/lang/bg_dns_tlsa.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb['name_txt'] = 'Service-Descriptor';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'TLSA-Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format. Correct: _&lt;port&gt;._(tcp|udp).&lt;hostname&gt;';
+$wb["data_error_empty"] = 'TLSA-Data empty';
+$wb["data_error_regex"] = 'TLSA dataformat is wrong. Correct: n n n HASH';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/bg_dns_wizard.lng b/interface/web/dns/lib/lang/bg_dns_wizard.lng
index 7e8cce66b9..9031cee2c8 100644
--- a/interface/web/dns/lib/lang/bg_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/bg_dns_wizard.lng
@@ -38,4 +38,6 @@ $wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
 $wb['list_head_txt'] = 'DNS Zone Wizard';
 $wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
 $wb['dkim_txt'] = 'DKIM enabled';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/br_dns_dmarc.lng b/interface/web/dns/lib/lang/br_dns_dmarc.lng
index b00949bc98..cf78bb8eed 100644
--- a/interface/web/dns/lib/lang/br_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/br_dns_dmarc.lng
@@ -11,16 +11,16 @@ $wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages
 $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address';
 $wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).';
 $wb['dmarc_fo_txt'] = 'Forensic reporting options';
-$wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result.";
+$wb['dmarc_fo0_txt'] = 'Generate reports if all underlying authentication mechanisms fail to produce a DMARC \'pass\' result.';
 $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.';
 $wb['dmarc_fod_txt'] = 'Generate report if DKIM signature failed to verify.';
 $wb['dmarc_fos_txt'] = 'Generate report if SPF failed.';
 $wb['dmarc_adkim_txt'] = 'DKIM identifier alignment';
-$wb['dmarc_adkim_note_txt'] = "'strict' requires exact matching between DKIM domain and email's from";
+$wb['dmarc_adkim_note_txt'] = '\'strict\' requires exact matching between DKIM domain and email\'s from';
 $wb['dmarc_adkim_r_txt'] = 'relaxed';
 $wb['dmarc_adkim_s_txt'] = 'strict';
 $wb['dmarc_aspf_txt'] = 'SPF identifier alignment';
-$wb['dmarc_aspf_note_txt'] = "'strict' requires exact matching between SPF domain and email's from";
+$wb['dmarc_aspf_note_txt'] = '\'strict\' requires exact matching between SPF domain and email\'s from';
 $wb['dmarc_aspf_r_txt'] = 'relaxed';
 $wb['dmarc_aspf_s_txt'] = 'strict';
 $wb['dmarc_rf_txt'] = 'Report Format';
@@ -37,7 +37,7 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine';
 $wb['dmarc_sp_reject_txt'] = 'reject';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
-$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails.";
+$wb['dmarc_policy_error_txt'] = 'Only policy \'none\' is allowed without DKIM-signed emails.';
 $wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.';
 $wb['dmarc_no_spf_txt'] = 'No active SPF Record.';
 $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record';
diff --git a/interface/web/dns/lib/lang/br_dns_ds.lng b/interface/web/dns/lib/lang/br_dns_ds.lng
new file mode 100644
index 0000000000..3f9b447811
--- /dev/null
+++ b/interface/web/dns/lib/lang/br_dns_ds.lng
@@ -0,0 +1,18 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$wb["data_error_regex"] = 'Text format invalid';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['invalid_type_ds'] = 'DS-Record has a wrong format.';
+
+?>
diff --git a/interface/web/dns/lib/lang/br_dns_import.lng b/interface/web/dns/lib/lang/br_dns_import.lng
index 2d1fe083ea..8f67eba14c 100644
--- a/interface/web/dns/lib/lang/br_dns_import.lng
+++ b/interface/web/dns/lib/lang/br_dns_import.lng
@@ -11,4 +11,6 @@ $wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filen
 $wb['title'] = 'Import Zone Files';
 $wb['no_file_uploaded_error'] = 'No zonefile uploaded';
 $wb['zone_file_import_txt'] = 'Zone File Import';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/br_dns_loc.lng b/interface/web/dns/lib/lang/br_dns_loc.lng
new file mode 100644
index 0000000000..a2e3322bb6
--- /dev/null
+++ b/interface/web/dns/lib/lang/br_dns_loc.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$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/br_dns_soa.lng b/interface/web/dns/lib/lang/br_dns_soa.lng
index 591f5d8b64..6149be5fe4 100644
--- a/interface/web/dns/lib/lang/br_dns_soa.lng
+++ b/interface/web/dns/lib/lang/br_dns_soa.lng
@@ -35,4 +35,9 @@ $wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
 $wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 $wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
+$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
+$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
+$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
 ?>
diff --git a/interface/web/dns/lib/lang/br_dns_soa_list.lng b/interface/web/dns/lib/lang/br_dns_soa_list.lng
index 5556a88c97..4de41c269d 100644
--- a/interface/web/dns/lib/lang/br_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/br_dns_soa_list.lng
@@ -7,4 +7,5 @@ $wb['ns_txt'] = 'NS';
 $wb['mbox_txt'] = 'Correio';
 $wb['add_new_record_txt'] = 'Adcionar uma nova Zona DNS';
 $wb['add_new_record_wizard_txt'] = 'Adicionar nova zona DNS com Assistente';
+$wb['import_zone_file_txt'] = 'Import Zone File';
 ?>
diff --git a/interface/web/dns/lib/lang/br_dns_spf.lng b/interface/web/dns/lib/lang/br_dns_spf.lng
index 8a1a611c21..df8d1fe145 100644
--- a/interface/web/dns/lib/lang/br_dns_spf.lng
+++ b/interface/web/dns/lib/lang/br_dns_spf.lng
@@ -16,10 +16,10 @@ $wb['spf_invalid_hostname_txt'] = 'Invalid hostname';
 $wb['spf_domain_txt'] = 'Any domains that may deliver or relay mail for this domain';
 $wb['spf_domain_note_txt'] = '(Sepearate domains with whitespaces)';
 $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["record_exists_txt"] = 'DNS-Record already exists';
-$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['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/br_dns_tlsa.lng b/interface/web/dns/lib/lang/br_dns_tlsa.lng
new file mode 100644
index 0000000000..dcfb3bfa33
--- /dev/null
+++ b/interface/web/dns/lib/lang/br_dns_tlsa.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb['name_txt'] = 'Service-Descriptor';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'TLSA-Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format. Correct: _&lt;port&gt;._(tcp|udp).&lt;hostname&gt;';
+$wb["data_error_empty"] = 'TLSA-Data empty';
+$wb["data_error_regex"] = 'TLSA dataformat is wrong. Correct: n n n HASH';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/br_dns_wizard.lng b/interface/web/dns/lib/lang/br_dns_wizard.lng
index 351fc6992e..45266d1cec 100644
--- a/interface/web/dns/lib/lang/br_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/br_dns_wizard.lng
@@ -38,4 +38,6 @@ $wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
 $wb['list_head_txt'] = 'DNS Zone Wizard';
 $wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
 $wb['dkim_txt'] = 'DKIM enabled';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/ca.lng b/interface/web/dns/lib/lang/ca.lng
new file mode 100644
index 0000000000..bfed1eb2bc
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca.lng
@@ -0,0 +1,22 @@
+<?php
+$wb['DNS'] = 'DNS';
+$wb['Zones'] = 'Zones';
+$wb['DNS A'] = 'DNS A';
+$wb['DNS ALIAS'] = 'DNS ALIAS';
+$wb['DNS CNAME'] = 'DNS CNAME';
+$wb['DNS hinfo'] = 'DNS HINFO';
+$wb['DNS mx'] = 'DNS MX';
+$wb['DNS ns'] = 'DNS NS';
+$wb['DNS ptr'] = 'DNS PTR';
+$wb['DNS RP'] = 'DNS RP';
+$wb['DNS Zone'] = 'Zone DNS';
+$wb['Records'] = 'Enregistrements';
+$wb['DNS SRV'] = 'DNS SRV';
+$wb['DNS TXT Record'] = 'Enregistrement DNS TXT';
+$wb['DNS TXT'] = 'DNS TXT';
+$wb['DNS Wizard'] = 'Assistant DNS';
+$wb['Add DNS Zone'] = 'Ajout zone DNS';
+$wb['Templates'] = 'Modèles';
+$wb['Secondary Zones'] = 'Zones secondaires';
+$wb['Import Zone File'] = 'Importer un fichier de Zone';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_a.lng b/interface/web/dns/lib/lang/ca_dns_a.lng
new file mode 100644
index 0000000000..6b3b31ae4c
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_a.lng
@@ -0,0 +1,17 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Nom d\'hôte';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Adresse IP';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Actif';
+$wb['limit_dns_record_txt'] = 'Le nombre maximum d\'enregistrements DNS pour votre compte a été atteint.';
+$wb['no_zone_perm'] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement dans cette zone DNS.';
+$wb['name_error_empty'] = 'Le nom d\'hôte est vide.';
+$wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.';
+$wb['data_error_empty'] = 'L\'adresse IP est vide.';
+$wb['data_error_duplicate'] = 'Enregistrement A ou CNAME en double';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['ip_error_wrong'] = 'IP-Address format invalid';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_a_list.lng b/interface/web/dns/lib/lang/ca_dns_a_list.lng
new file mode 100644
index 0000000000..67eb1b7d42
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_a_list.lng
@@ -0,0 +1,15 @@
+<?php
+$wb['list_head_txt'] = 'Enregistrement A';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Nom';
+$wb['data_txt'] = 'Données';
+$wb['aux_txt'] = 'Priorité';
+$wb['ttl_txt'] = 'TTL';
+$wb['type_txt'] = 'Type';
+$wb['add_new_record_txt'] = 'Ajouter un nouvel enregistrement A';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'de';
+$wb['delete_confirmation'] = 'Voulez-vous vraiment supprimer cet enregistrement ?';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_aaaa.lng b/interface/web/dns/lib/lang/ca_dns_aaaa.lng
new file mode 100644
index 0000000000..e29a5cbf0d
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_aaaa.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Nom d\'hôte';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Adresse IPv6';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Actif';
+$wb['limit_dns_record_txt'] = 'Le nombre maximum d\'enregistrements DNS pour votre compte a été atteint.';
+$wb['no_zone_perm'] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement dans cette zone DNS.';
+$wb['name_error_empty'] = 'Le nom d\'hôte est vide.';
+$wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.';
+$wb['data_error_empty'] = 'L\'adresse IP est vide.';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['ip_error_wrong'] = 'IP-Address format invalid';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_alias.lng b/interface/web/dns/lib/lang/ca_dns_alias.lng
new file mode 100644
index 0000000000..4071d430b9
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_alias.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Nom d\'hôte';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Nom d\'hôte cible';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Actif';
+$wb['limit_dns_record_txt'] = 'Le nombre maximum d\'enregistrements DNS pour votre compte a été atteint.';
+$wb['no_zone_perm'] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement dans cette zone DNS.';
+$wb['name_error_empty'] = 'Le nom d\'hôte est vide.';
+$wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.';
+$wb['data_error_empty'] = 'Le nom d\'hôte cible est vide.';
+$wb['data_error_regex'] = 'Le format du nom d\'hôte est invalide.';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_cname.lng b/interface/web/dns/lib/lang/ca_dns_cname.lng
new file mode 100644
index 0000000000..3d191f703b
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_cname.lng
@@ -0,0 +1,17 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Nom d\'hôte';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Nom d\'hôte cible';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Actif';
+$wb['limit_dns_record_txt'] = 'Le nombre maximum d\'enregistrements DNS pour votre compte a été atteint.';
+$wb['no_zone_perm'] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement dans cette zone DNS.';
+$wb['name_error_empty'] = 'Le nom d\'hôte est vide.';
+$wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.';
+$wb['data_error_empty'] = 'Le nom d\'hôte cible est vide.';
+$wb['data_error_regex'] = 'Le format du nom d\'hôte cible invalide.';
+$wb['data_error_duplicate'] = 'Enregistrement A ou CNAME en double';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_dkim.lng b/interface/web/dns/lib/lang/ca_dns_dkim.lng
new file mode 100644
index 0000000000..b7a2b9be7d
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_dkim.lng
@@ -0,0 +1,11 @@
+<?php
+$wb['public_key_txt'] = 'Public-Key';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['dkim_disabled_txt'] = 'DKIM disabled for this mail-domain';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_dmarc.lng b/interface/web/dns/lib/lang/ca_dns_dmarc.lng
new file mode 100644
index 0000000000..cf78bb8eed
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_dmarc.lng
@@ -0,0 +1,50 @@
+<?php
+$wb['data_txt'] = 'DMARC Record';
+$wb['domain_txt'] = 'Domain';
+$wb['dmarc_policy_txt'] = 'Mail Receiver Policy';
+$wb['dmarc_policy_note_txt'] = 'How ISPs should handle messages that failed SPF or DKIM (DMARC).';
+$wb['dmarc_policy_none_txt'] = 'none';
+$wb['dmarc_policy_quarantine_txt'] = 'quarantine';
+$wb['dmarc_policy_reject_txt'] = 'reject';
+$wb['dmarc_rua_txt'] = 'Aggregate Data Reporting Address';
+$wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages which failed DMARC checks for the domain (separated by whitespaces).';
+$wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address';
+$wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).';
+$wb['dmarc_fo_txt'] = 'Forensic reporting options';
+$wb['dmarc_fo0_txt'] = 'Generate reports if all underlying authentication mechanisms fail to produce a DMARC \'pass\' result.';
+$wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.';
+$wb['dmarc_fod_txt'] = 'Generate report if DKIM signature failed to verify.';
+$wb['dmarc_fos_txt'] = 'Generate report if SPF failed.';
+$wb['dmarc_adkim_txt'] = 'DKIM identifier alignment';
+$wb['dmarc_adkim_note_txt'] = '\'strict\' requires exact matching between DKIM domain and email\'s from';
+$wb['dmarc_adkim_r_txt'] = 'relaxed';
+$wb['dmarc_adkim_s_txt'] = 'strict';
+$wb['dmarc_aspf_txt'] = 'SPF identifier alignment';
+$wb['dmarc_aspf_note_txt'] = '\'strict\' requires exact matching between SPF domain and email\'s from';
+$wb['dmarc_aspf_r_txt'] = 'relaxed';
+$wb['dmarc_aspf_s_txt'] = 'strict';
+$wb['dmarc_rf_txt'] = 'Report Format';
+$wb['dmarc_rf_afrf_txt'] = 'Authentication Failure Reporting Format';
+$wb['dmarc_rf_iodef_txt'] = 'Incident Object Description Exchange Format';
+$wb['dmarc_pct_txt'] = 'Apply Policy to this Percentage';
+$wb['dmarc_pct_note_txt'] = '% (100 default). Messages in percent from the domain you want ISPs to check.';
+$wb['dmarc_ri_txt'] = 'Reporting Interval';
+$wb['dmarc_ri_note_txt'] = 'Seconds (default=86400). The time in seconds that aggregate reports should be generate (86400 represents 1 day).';
+$wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults to same as domain).';
+$wb['dmarc_sp_same_txt'] = 'same as domain';
+$wb['dmarc_sp_none_txt'] = 'none';
+$wb['dmarc_sp_quarantine_txt'] = 'quarantine';
+$wb['dmarc_sp_reject_txt'] = 'reject';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['dmarc_policy_error_txt'] = 'Only policy \'none\' is allowed without DKIM-signed emails.';
+$wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.';
+$wb['dmarc_no_spf_txt'] = 'No active SPF Record.';
+$wb['dmarc_more_spf_txt'] = 'More than one active SPF Record';
+$wb['dmarc_invalid_email_txt'] = 'Invalid Email';
+$wb['dmarc_empty_txt'] = 'DMARC Record empty - specify at least one option';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_ds.lng b/interface/web/dns/lib/lang/ca_dns_ds.lng
new file mode 100644
index 0000000000..c3622dc5b5
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_ds.lng
@@ -0,0 +1,17 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Data';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$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.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'Text empty';
+$wb['data_error_regex'] = 'Text format invalid';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['invalid_type_ds'] = 'DS-Record has a wrong format.';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_hinfo.lng b/interface/web/dns/lib/lang/ca_dns_hinfo.lng
new file mode 100644
index 0000000000..b91e3d4917
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_hinfo.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Nom d\'hôte';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Information de l\'hôte';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Actif';
+$wb['limit_dns_record_txt'] = 'Le nombre maximum d\'enregistrements DNS pour votre compte a été atteint.';
+$wb['no_zone_perm'] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement dans cette zone DNS.';
+$wb['name_error_empty'] = 'Le nom de l\'hôte est vide.';
+$wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.';
+$wb['data_error_empty'] = 'L\'information de l\'hôte est vide';
+$wb['data_error_regex'] = 'Le format de l\'information de l\'hôte est invalide';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_import.lng b/interface/web/dns/lib/lang/ca_dns_import.lng
new file mode 100644
index 0000000000..feb0ba7919
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_import.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['client_txt'] = 'Client';
+$wb['btn_save_txt'] = 'Importer un fichier de Zone';
+$wb['btn_cancel_txt'] = 'Annuler';
+$wb['domain_txt'] = 'Domaine';
+$wb['zone_file_successfully_imported_txt'] = 'Le fichier de Zone a été importé avec succès !';
+$wb['error_no_valid_zone_file_txt'] = 'Le fichier de Zone semble être invalide !';
+$wb['zonefile_to_import_txt'] = 'Fichier de Zone';
+$wb['domain_field_desc_txt'] = 'Peut-être laissé vide si le nom de domaine est dans le nom de fichier ou dans le contenu du fichier de Zone.';
+$wb['title'] = 'Importer des fichiers de Zone';
+$wb['no_file_uploaded_error'] = 'Aucun fichier de Zone téléchargé';
+$wb['zone_file_import_txt'] = 'Importer un fichier de Zone';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_loc.lng b/interface/web/dns/lib/lang/ca_dns_loc.lng
new file mode 100644
index 0000000000..dc9ad9a006
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_loc.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Data';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$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.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'Text empty';
+$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/ca_dns_mx.lng b/interface/web/dns/lib/lang/ca_dns_mx.lng
new file mode 100644
index 0000000000..2253ffe00b
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_mx.lng
@@ -0,0 +1,18 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Nom d\'hôte';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Nom d\'hôte du serveur mail';
+$wb['aux_txt'] = 'Priorité';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Actif';
+$wb['limit_dns_record_txt'] = 'Le nombre maximum d\'enregistrements DNS pour votre compte a été atteint.';
+$wb['no_zone_perm'] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement dans cette zone DNS.';
+$wb['name_error_empty'] = 'Le nom d\'hôte est vide.';
+$wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.';
+$wb['data_error_empty'] = 'Le nom d\'hôte du serveur mail est vide';
+$wb['data_error_regex'] = 'Le format du nom d\'hôte du serveur mail est invalide';
+$wb['duplicate_mx_record_txt'] = 'Enregistrement MX dupliqué.';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_ns.lng b/interface/web/dns/lib/lang/ca_dns_ns.lng
new file mode 100644
index 0000000000..c8e36ccaec
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_ns.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Zone';
+$wb['type_txt'] = 'Type';
+$wb['data_txt'] = 'Nom d\'hôte du serveur de nom';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Actif';
+$wb['limit_dns_record_txt'] = 'Le nombre maximum d\'enregistrements DNS pour votre compte a été atteint.';
+$wb['no_zone_perm'] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement dans cette zone DNS.';
+$wb['name_error_empty'] = 'La zone est vide.';
+$wb['name_error_regex'] = 'Le format de la zone est invalide.';
+$wb['data_error_empty'] = 'Le serveur de nom est vide.';
+$wb['data_error_regex'] = 'Le format du serveur de nom est invalide.';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_ptr.lng b/interface/web/dns/lib/lang/ca_dns_ptr.lng
new file mode 100644
index 0000000000..c9e36c733c
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_ptr.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Nom';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Nom d\'hôte canonique';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Actif';
+$wb['limit_dns_record_txt'] = 'Le nombre maximum d\'enregistrements DNS pour votre compte a été atteint.';
+$wb['no_zone_perm'] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement dans cette zone DNS.';
+$wb['name_error_empty'] = 'Le nom est vide.';
+$wb['name_error_regex'] = 'Le format du nom est invalide.';
+$wb['data_error_empty'] = 'Le nom d\'hôte canonique est vide';
+$wb['data_error_regex'] = 'Le format du nom d\'hôte canonique est invalide';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_rp.lng b/interface/web/dns/lib/lang/ca_dns_rp.lng
new file mode 100644
index 0000000000..7abb4eb0f8
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_rp.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Nom d\'hôte';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Personne responsable';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Actif';
+$wb['limit_dns_record_txt'] = 'Le nombre maximum d\'enregistrements DNS pour votre compte a été atteint.';
+$wb['no_zone_perm'] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement dans cette zone DNS.';
+$wb['name_error_empty'] = 'Le nom d\'hôte est vide.';
+$wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.';
+$wb['data_error_empty'] = 'Le champ de la personne responsable est vide.';
+$wb['data_error_regex'] = 'Le format du champ de la personne responsable est invalide.';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_slave.lng b/interface/web/dns/lib/lang/ca_dns_slave.lng
new file mode 100644
index 0000000000..887cc7dcd4
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_slave.lng
@@ -0,0 +1,17 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['origin_txt'] = 'Zone DNS';
+$wb['ns_txt'] = 'NS';
+$wb['active_txt'] = 'Actif';
+$wb['limit_dns_slave_zone_txt'] = 'Le nombre maximal de zones DNS secondaire pour votre compte est atteint.';
+$wb['client_txt'] = 'Client';
+$wb['xfer_txt'] = 'Autoriser les transferts de zone de <br />ces IPs (liste séparée par des virgules)';
+$wb['server_id_error_empty'] = 'Aucun serveur sélectionné';
+$wb['origin_error_empty'] = 'Zone vide.';
+$wb['origin_error_unique'] = 'Il y a déjà un enregistrement pour cette zone.';
+$wb['origin_error_regex'] = 'Le format de la zone est invalide.';
+$wb['ns_error_regex'] = 'Le format de l\'enregistrement NS est invalide.';
+$wb['eg_domain_tld'] = 'ex. domain.tld.';
+$wb['ipv4_form_txt'] = 'Format IPv4 - ex. 1.2.3.4';
+$wb['secondary_zone_txt'] = 'Zone DNS secondaire';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_slave_admin_list.lng b/interface/web/dns/lib/lang/ca_dns_slave_admin_list.lng
new file mode 100644
index 0000000000..fd95205cd4
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_slave_admin_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'Zone DNS secondaire';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Serveur';
+$wb['origin_txt'] = 'Zone';
+$wb['ns_txt'] = 'NS';
+$wb['add_new_record_txt'] = 'Ajouté une zone DNS secondaire';
+$wb['eg_domain_tld'] = 'e.g. domain.tld.';
+$wb['sys_groupid_txt'] = 'Client';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_slave_list.lng b/interface/web/dns/lib/lang/ca_dns_slave_list.lng
new file mode 100644
index 0000000000..c85acf202a
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_slave_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Zones DNS secondaires';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['origin_txt'] = 'Zone';
+$wb['ns_txt'] = 'NS';
+$wb['add_new_record_txt'] = 'Ajouter une nouvelle zone DNS secondaire';
+$wb['eg_domain_tld'] = 'ex. domain.tld.';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_soa.lng b/interface/web/dns/lib/lang/ca_dns_soa.lng
new file mode 100644
index 0000000000..277948a297
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_soa.lng
@@ -0,0 +1,43 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['origin_txt'] = 'Zone (SOA)';
+$wb['ns_txt'] = 'NS';
+$wb['mbox_txt'] = 'Courriel';
+$wb['serial_txt'] = 'Serial';
+$wb['refresh_txt'] = 'Refresh';
+$wb['retry_txt'] = 'Retry';
+$wb['expire_txt'] = 'Expire';
+$wb['minimum_txt'] = 'Minimum';
+$wb['ttl_txt'] = 'TTL';
+$wb['xfer_txt'] = 'Autoriser les transfers de zones vers <br />ces IP (liste séparée par des virgules)';
+$wb['active_txt'] = 'Actif';
+$wb['limit_dns_zone_txt'] = 'Le nombre maximal de zones DNS pour votre compte est atteint.';
+$wb['client_txt'] = 'Client';
+$wb['no_zone_perm'] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement dans cette zone DNS.';
+$wb['server_id_error_empty'] = 'Aucun serveur sélectionné';
+$wb['origin_error_empty'] = 'Zone vide.';
+$wb['origin_error_unique'] = 'Il y a déja un enregistrement pour cette zone.';
+$wb['origin_error_regex'] = 'Le format de la zone est invalide.';
+$wb['ns_error_regex'] = 'Le format du champ NS est invalide.';
+$wb['mbox_error_empty'] = 'L\'adresse courriel est vide.';
+$wb['mbox_error_regex'] = 'L\'adresse courriel est dun format invalide.';
+$wb['also_notify_txt'] = 'Notifier aussi';
+$wb['also_notify_error_regex'] = 'Veuillez utiliser une adresse IP.';
+$wb['update_acl_txt'] = 'Mettre à jour l\'ACL';
+$wb['seconds_txt'] = 'Secondes';
+$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.'] = 'Le domaine ne peut pas être modifié. Veuillez contacter votre administrateur si vous souhaitez modifier le nom de domaine.';
+$wb['refresh_range_error'] = 'Le temps de refresh minimum est 60 secondes.';
+$wb['retry_range_error'] = 'Le temps de retry minimum est 60 secondes.';
+$wb['expire_range_error'] = 'Le temps de expire minimum est 60 secondes.';
+$wb['minimum_range_error'] = 'Le temps Minimum minimum est 60 secondes.';
+$wb['ttl_range_error'] = 'La TTL minimum est 60 secondes.';
+$wb['xfer_error_regex'] = 'A noter également : Veuillez utiliser une adresse IP.';
+$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
+$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
+$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_soa_admin_list.lng b/interface/web/dns/lib/lang/ca_dns_soa_admin_list.lng
new file mode 100644
index 0000000000..ff6fe695ae
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_soa_admin_list.lng
@@ -0,0 +1,11 @@
+<?php
+$wb['list_head_txt'] = 'DNS-Zones';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['origin_txt'] = 'Zone';
+$wb['ns_txt'] = 'NS';
+$wb['mbox_txt'] = 'Courriel';
+$wb['add_new_record_wizard_txt'] = 'Assistant de création de zone';
+$wb['add_new_record_txt'] = 'Création manuel de zone';
+$wb['sys_groupid_txt'] = 'Client';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_soa_list.lng b/interface/web/dns/lib/lang/ca_dns_soa_list.lng
new file mode 100644
index 0000000000..7ac880c6c1
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_soa_list.lng
@@ -0,0 +1,11 @@
+<?php
+$wb['list_head_txt'] = 'Zones DNS';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['origin_txt'] = 'Zone';
+$wb['ns_txt'] = 'NS';
+$wb['mbox_txt'] = 'Courriel';
+$wb['add_new_record_wizard_txt'] = 'Ajouter une nouvelle zone DNS en utilisant l\'assistant';
+$wb['add_new_record_txt'] = 'Ajouter manuellement une nouvelle zone DNS';
+$wb['import_zone_file_txt'] = 'Import Zone File';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_spf.lng b/interface/web/dns/lib/lang/ca_dns_spf.lng
new file mode 100644
index 0000000000..df8d1fe145
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_spf.lng
@@ -0,0 +1,25 @@
+<?php
+$wb['data_txt'] = 'SPF-Record';
+$wb['spf_mechanism_txt'] = 'SPF Mechanism';
+$wb['spf_mechanism_pass_txt'] = 'Pass - allow mail from other senders';
+$wb['spf_mechanism_fail_txt'] = 'Fail - reject mail from other senders';
+$wb['spf_mechanism_softfail_txt'] = 'SoftFail - allow mail from other senders but mark the email';
+$wb['spf_mechanism_neutral_txt'] = 'Neutral - do nothing';
+$wb['spf_mx_txt'] = 'Allow servers listed as MX to send email for this domain';
+$wb['spf_a_txt'] = 'Allow current IP address of the domain to send email for this domain';
+$wb['spf_ip_txt'] = 'Additional IP addresses in CIDR format that deliver or relay mail for this domain';
+$wb['spf_ip_note_txt'] = '(Sepearate IPs with whitespaces)';
+$wb['spf_invalid_ip_txt'] = 'Invalid IP-address';
+$wb['spf_hostname_txt'] = 'Any other server hostname that may deliver or relay mail for this domain';
+$wb['spf_hostname_note_txt'] = '(Sepearate hostnames with whitespaces)';
+$wb['spf_invalid_hostname_txt'] = 'Invalid hostname';
+$wb['spf_domain_txt'] = 'Any domains that may deliver or relay mail for this domain';
+$wb['spf_domain_note_txt'] = '(Sepearate domains with whitespaces)';
+$wb['spf_invalid_domain_txt'] = 'Invalid domainname';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_srv.lng b/interface/web/dns/lib/lang/ca_dns_srv.lng
new file mode 100644
index 0000000000..55f2484d71
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_srv.lng
@@ -0,0 +1,20 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Nom d\'hôte';
+$wb['type_txt'] = 'type';
+$wb['target_txt'] = 'Cible';
+$wb['weight_txt'] = 'Poids';
+$wb['port_txt'] = 'Port';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Actif';
+$wb['aux_txt'] = 'Priorité';
+$wb['limit_dns_record_txt'] = 'Le nombre maximum d\'enregistrements DNS pour votre compte a été atteint.';
+$wb['no_zone_perm'] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement dans cette zone DNS.';
+$wb['name_error_empty'] = 'Le nom d\'hôte est vide.';
+$wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.';
+$wb['data_error_empty'] = 'L\'enregistrement serveur est vide';
+$wb['data_error_regex'] = 'Le format de l\'enregistrement serveur est invalide';
+$wb['srv_error_regex'] = 'Le format d\'enregistrement serveur invalide. L\'enregistrement serveur doit contenir 3 chaînes de caractères séparées par des espaces.';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_template.lng b/interface/web/dns/lib/lang/ca_dns_template.lng
new file mode 100644
index 0000000000..1202cfd768
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_template.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['name_txt'] = 'Nom';
+$wb['fields_txt'] = 'Champs';
+$wb['template_txt'] = 'Modèle';
+$wb['visible_txt'] = 'Visible';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_template_list.lng b/interface/web/dns/lib/lang/ca_dns_template_list.lng
new file mode 100644
index 0000000000..7f28cad4a6
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_template_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['list_head_txt'] = 'Modèle de l\'assistant DNS';
+$wb['visible_txt'] = 'Visible';
+$wb['name_txt'] = 'Nom';
+$wb['add_new_record_txt'] = 'Ajouter un nouvel enregistrement';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_tlsa.lng b/interface/web/dns/lib/lang/ca_dns_tlsa.lng
new file mode 100644
index 0000000000..3b87e2ad59
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_tlsa.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Service-Descriptor';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'TLSA-Data';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$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.';
+$wb['name_error_regex'] = 'The hostname has the wrong format. Correct: _&lt;port&gt;._(tcp|udp).&lt;hostname&gt;';
+$wb['data_error_empty'] = 'TLSA-Data empty';
+$wb['data_error_regex'] = 'TLSA dataformat is wrong. Correct: n n n HASH';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_txt.lng b/interface/web/dns/lib/lang/ca_dns_txt.lng
new file mode 100644
index 0000000000..333dd30d94
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_txt.lng
@@ -0,0 +1,19 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Nom d\'hôte';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Texte';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Actif';
+$wb['limit_dns_record_txt'] = 'Le nombre maximum d\'enregistrements DNS pour votre compte a été atteint.';
+$wb['no_zone_perm'] = 'Vous n\'avez pas la permissions d\'ajouter un enregistrement dans cette zone DNS.';
+$wb['name_error_empty'] = 'Le nom d\'hôte est vide.';
+$wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.';
+$wb['data_error_empty'] = 'Le texte est vide';
+$wb['data_error_regex'] = 'Le format du texte est invalide';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['invalid_type_dkim'] = 'DKIM is not allowed. Use the DKIM button';
+$wb['invalid_type_dmarc'] = 'DMARC is not allowed. Use the DMARC button';
+$wb['invalid_type_spf'] = 'SPF is not allowed. Use the SPF button.';
+?>
diff --git a/interface/web/dns/lib/lang/ca_dns_wizard.lng b/interface/web/dns/lib/lang/ca_dns_wizard.lng
new file mode 100644
index 0000000000..b9a6b79480
--- /dev/null
+++ b/interface/web/dns/lib/lang/ca_dns_wizard.lng
@@ -0,0 +1,43 @@
+<?php
+$wb['template_id_txt'] = 'Modèle';
+$wb['server_id_txt'] = 'Serveur';
+$wb['client_txt'] = 'Client';
+$wb['btn_save_txt'] = 'Créer l\'enregistrement DNS';
+$wb['btn_cancel_txt'] = 'Annuler';
+$wb['domain_txt'] = 'Domaine';
+$wb['email_txt'] = 'Courriel';
+$wb['ns1_txt'] = 'NS 1';
+$wb['ns2_txt'] = 'NS 2';
+$wb['ip_txt'] = 'Adresse IP';
+$wb['error_origin_empty'] = 'Origine vide.';
+$wb['error_ns_empty'] = 'NS vide.';
+$wb['error_mbox_empty'] = 'Mbox vide.';
+$wb['error_refresh_empty'] = 'Refresh vide.';
+$wb['error_retry_empty'] = 'Retry vide.';
+$wb['error_expire_empty'] = 'Expire vide.';
+$wb['error_minimum_empty'] = 'Minimum vide.';
+$wb['error_ttl_empty'] = 'TTL vide.';
+$wb['error_domain_empty'] = 'Domaine vide';
+$wb['error_ip_empty'] = 'IP vide.';
+$wb['error_ns1_empty'] = 'NS1 vide.';
+$wb['error_ns2_empty'] = 'NS2 vide.';
+$wb['error_email_empty'] = 'Email vide.';
+$wb['error_domain_regex'] = 'Le domaine contient des caractères invalides.';
+$wb['error_ns1_regex'] = 'NS1 contient des caractères invalides.';
+$wb['error_ns2_regex'] = 'NS2 contient des caractères invalides.';
+$wb['error_email_regex'] = 'L\'email ne contient pas une adresse courriel valide.';
+$wb['dns_zone_txt'] = 'Zone DNS';
+$wb['globalsearch_resultslimit_of_txt'] = 'de';
+$wb['globalsearch_resultslimit_results_txt'] = 'resultats';
+$wb['globalsearch_noresults_text_txt'] = 'Pas de résultat.';
+$wb['globalsearch_noresults_limit_txt'] = '0 resultat';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Chercher';
+$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['list_head_txt'] = 'Assistant Zone DNS';
+$wb['list_desc_txt'] = 'Créer une Zone DNS via l\'assistant';
+$wb['dkim_txt'] = 'DKIM enabled';
+$wb['ipv6_txt'] = 'IPv6 Address';
+$wb['error_ipv6_empty'] = 'IPv6 empty.';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+?>
diff --git a/interface/web/dns/lib/lang/cz.lng b/interface/web/dns/lib/lang/cz.lng
index 876a5751e2..f143b0b922 100644
--- a/interface/web/dns/lib/lang/cz.lng
+++ b/interface/web/dns/lib/lang/cz.lng
@@ -20,5 +20,3 @@ $wb['Templates'] = 'Šablony DNS';
 $wb['Secondary Zones'] = 'Sekundární DNS zóny';
 $wb['Import Zone File'] = 'Importovat vybraný DNS zonový soubor';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_a.lng b/interface/web/dns/lib/lang/cz_dns_a.lng
index c48b333a21..9790c23114 100644
--- a/interface/web/dns/lib/lang/cz_dns_a.lng
+++ b/interface/web/dns/lib/lang/cz_dns_a.lng
@@ -15,5 +15,3 @@ $wb['ip_error_wrong'] = 'IP adresa má chybný formát';
 $wb['data_error_duplicate'] = 'Duplikace A záznamu';
 $wb['ttl_range_error'] = 'Min. TTL doba je 60 sekund.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_a_list.lng b/interface/web/dns/lib/lang/cz_dns_a_list.lng
index 9f16d3c36c..a61265a595 100644
--- a/interface/web/dns/lib/lang/cz_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_a_list.lng
@@ -13,5 +13,3 @@ $wb['page_txt'] = 'Stránka';
 $wb['page_of_txt'] = 'z';
 $wb['delete_confirmation'] = 'Skutečně chcete smazat tento záznam ?';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_aaaa.lng b/interface/web/dns/lib/lang/cz_dns_aaaa.lng
index 966487e3f5..2fa5185f45 100644
--- a/interface/web/dns/lib/lang/cz_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/cz_dns_aaaa.lng
@@ -14,5 +14,3 @@ $wb['data_error_empty'] = 'IP adresa je prázdná';
 $wb['ip_error_wrong'] = 'IP adresa má chybný formát';
 $wb['ttl_range_error'] = 'Min. TTL doba je 60 sekund.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_alias.lng b/interface/web/dns/lib/lang/cz_dns_alias.lng
index feee717865..356570e300 100644
--- a/interface/web/dns/lib/lang/cz_dns_alias.lng
+++ b/interface/web/dns/lib/lang/cz_dns_alias.lng
@@ -14,5 +14,3 @@ $wb['data_error_empty'] = 'Cílový Hostname je prázdný';
 $wb['data_error_regex'] = 'Cílový Hostname má chybný formát';
 $wb['ttl_range_error'] = 'Min. TTL doba je 60 sekund.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_cname.lng b/interface/web/dns/lib/lang/cz_dns_cname.lng
index 1cb74ff7ce..592abb7f4a 100644
--- a/interface/web/dns/lib/lang/cz_dns_cname.lng
+++ b/interface/web/dns/lib/lang/cz_dns_cname.lng
@@ -15,5 +15,3 @@ $wb['data_error_regex'] = 'Cílový hostname má chybný formát';
 $wb['data_error_duplicate'] = 'Duplikace A záznamu nebo CNAME-záznamu';
 $wb['ttl_range_error'] = 'Min. TTL doba je 60 sekund.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_dmarc.lng b/interface/web/dns/lib/lang/cz_dns_dmarc.lng
index b00949bc98..cf78bb8eed 100644
--- a/interface/web/dns/lib/lang/cz_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/cz_dns_dmarc.lng
@@ -11,16 +11,16 @@ $wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages
 $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address';
 $wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).';
 $wb['dmarc_fo_txt'] = 'Forensic reporting options';
-$wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result.";
+$wb['dmarc_fo0_txt'] = 'Generate reports if all underlying authentication mechanisms fail to produce a DMARC \'pass\' result.';
 $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.';
 $wb['dmarc_fod_txt'] = 'Generate report if DKIM signature failed to verify.';
 $wb['dmarc_fos_txt'] = 'Generate report if SPF failed.';
 $wb['dmarc_adkim_txt'] = 'DKIM identifier alignment';
-$wb['dmarc_adkim_note_txt'] = "'strict' requires exact matching between DKIM domain and email's from";
+$wb['dmarc_adkim_note_txt'] = '\'strict\' requires exact matching between DKIM domain and email\'s from';
 $wb['dmarc_adkim_r_txt'] = 'relaxed';
 $wb['dmarc_adkim_s_txt'] = 'strict';
 $wb['dmarc_aspf_txt'] = 'SPF identifier alignment';
-$wb['dmarc_aspf_note_txt'] = "'strict' requires exact matching between SPF domain and email's from";
+$wb['dmarc_aspf_note_txt'] = '\'strict\' requires exact matching between SPF domain and email\'s from';
 $wb['dmarc_aspf_r_txt'] = 'relaxed';
 $wb['dmarc_aspf_s_txt'] = 'strict';
 $wb['dmarc_rf_txt'] = 'Report Format';
@@ -37,7 +37,7 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine';
 $wb['dmarc_sp_reject_txt'] = 'reject';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
-$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails.";
+$wb['dmarc_policy_error_txt'] = 'Only policy \'none\' is allowed without DKIM-signed emails.';
 $wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.';
 $wb['dmarc_no_spf_txt'] = 'No active SPF Record.';
 $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record';
diff --git a/interface/web/dns/lib/lang/cz_dns_ds.lng b/interface/web/dns/lib/lang/cz_dns_ds.lng
new file mode 100644
index 0000000000..3f9b447811
--- /dev/null
+++ b/interface/web/dns/lib/lang/cz_dns_ds.lng
@@ -0,0 +1,18 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$wb["data_error_regex"] = 'Text format invalid';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['invalid_type_ds'] = 'DS-Record has a wrong format.';
+
+?>
diff --git a/interface/web/dns/lib/lang/cz_dns_hinfo.lng b/interface/web/dns/lib/lang/cz_dns_hinfo.lng
index 2e57758c65..6174cf460f 100644
--- a/interface/web/dns/lib/lang/cz_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/cz_dns_hinfo.lng
@@ -14,5 +14,3 @@ $wb['data_error_empty'] = 'Informace o hostovi je prázdná';
 $wb['data_error_regex'] = 'Informace o hostovi má chybný formát';
 $wb['ttl_range_error'] = 'Min. TTL doba je 60 sekund.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_import.lng b/interface/web/dns/lib/lang/cz_dns_import.lng
index b3585eed77..9c03fa961a 100644
--- a/interface/web/dns/lib/lang/cz_dns_import.lng
+++ b/interface/web/dns/lib/lang/cz_dns_import.lng
@@ -11,6 +11,6 @@ $wb['domain_field_desc_txt'] = 'Může být ponechána nevyplněná, pokud je n
 $wb['title'] = 'Importovat soubory zón';
 $wb['no_file_uploaded_error'] = 'Nelze odeslat DNS zonový soubor';
 $wb['zone_file_import_txt'] = 'Importovat vybraný DNS zonový soubor';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_loc.lng b/interface/web/dns/lib/lang/cz_dns_loc.lng
new file mode 100644
index 0000000000..a2e3322bb6
--- /dev/null
+++ b/interface/web/dns/lib/lang/cz_dns_loc.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$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/cz_dns_mx.lng b/interface/web/dns/lib/lang/cz_dns_mx.lng
index a3eb079b21..4766642f16 100644
--- a/interface/web/dns/lib/lang/cz_dns_mx.lng
+++ b/interface/web/dns/lib/lang/cz_dns_mx.lng
@@ -16,5 +16,3 @@ $wb['data_error_regex'] = 'Hostname e-mailového serveru má chybný formát';
 $wb['duplicate_mx_record_txt'] = 'Duplicitní MX záznam.';
 $wb['ttl_range_error'] = 'Min. TTL doba je 60 sekund.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_ns.lng b/interface/web/dns/lib/lang/cz_dns_ns.lng
index 01e43555af..194bfd23ab 100644
--- a/interface/web/dns/lib/lang/cz_dns_ns.lng
+++ b/interface/web/dns/lib/lang/cz_dns_ns.lng
@@ -14,5 +14,3 @@ $wb['data_error_empty'] = 'Jmenný server je prázdný';
 $wb['data_error_regex'] = 'Jmenný server má chybný formát';
 $wb['ttl_range_error'] = 'Min. TTL doba je 60 sekund.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_ptr.lng b/interface/web/dns/lib/lang/cz_dns_ptr.lng
index 146fcfc310..c0a9a10922 100644
--- a/interface/web/dns/lib/lang/cz_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/cz_dns_ptr.lng
@@ -14,5 +14,3 @@ $wb['data_error_empty'] = 'Kanonický hostname je prázdný';
 $wb['data_error_regex'] = 'Kanonického hostname má chybný formát';
 $wb['ttl_range_error'] = 'Min. TTL doba je 60 sekund.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_rp.lng b/interface/web/dns/lib/lang/cz_dns_rp.lng
index 648fa887ec..04c7ac051f 100644
--- a/interface/web/dns/lib/lang/cz_dns_rp.lng
+++ b/interface/web/dns/lib/lang/cz_dns_rp.lng
@@ -14,5 +14,3 @@ $wb['data_error_empty'] = 'Odpovědná osoba je prázdná';
 $wb['data_error_regex'] = 'Odpovědná osoba má chybný formát';
 $wb['ttl_range_error'] = 'Min. TTL doba je 60 sekund.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_slave.lng b/interface/web/dns/lib/lang/cz_dns_slave.lng
index b8cc5f139f..16617f6c59 100644
--- a/interface/web/dns/lib/lang/cz_dns_slave.lng
+++ b/interface/web/dns/lib/lang/cz_dns_slave.lng
@@ -15,5 +15,3 @@ $wb['eg_domain_tld'] = 'např. domena.cz';
 $wb['ipv4_form_txt'] = 'IPV4 formát, např. 1.2.3.4';
 $wb['secondary_zone_txt'] = 'Sekundární DNS zóna';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_slave_admin_list.lng b/interface/web/dns/lib/lang/cz_dns_slave_admin_list.lng
index 67ea65b648..eb00f29ca9 100644
--- a/interface/web/dns/lib/lang/cz_dns_slave_admin_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_slave_admin_list.lng
@@ -8,5 +8,3 @@ $wb['add_new_record_txt'] = 'Přidat novou Sekundarní DNS-Zónu';
 $wb['eg_domain_tld'] = 'např. domena.cz';
 $wb['sys_groupid_txt'] = 'Klient';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_slave_list.lng b/interface/web/dns/lib/lang/cz_dns_slave_list.lng
index eead22a8b7..1e0a3d0106 100644
--- a/interface/web/dns/lib/lang/cz_dns_slave_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_slave_list.lng
@@ -7,5 +7,3 @@ $wb['ns_txt'] = 'NS';
 $wb['add_new_record_txt'] = 'Přidat sekundární DNS zónu';
 $wb['eg_domain_tld'] = 'např. domena.cz';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_soa.lng b/interface/web/dns/lib/lang/cz_dns_soa.lng
index 8bc1eb8c53..0c1443ba08 100644
--- a/interface/web/dns/lib/lang/cz_dns_soa.lng
+++ b/interface/web/dns/lib/lang/cz_dns_soa.lng
@@ -35,6 +35,9 @@ $wb['expire_range_error'] = 'Min. expirační doba je 60 sekund.';
 $wb['minimum_range_error'] = 'Minimální doba je 60 sekund.';
 $wb['ttl_range_error'] = 'Min. TTL čas je 60 sekund.';
 $wb['xfer_error_regex'] = 'Také oznámí: Prosím, použijte IP adresu.';
+$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
+$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
+$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_soa_admin_list.lng b/interface/web/dns/lib/lang/cz_dns_soa_admin_list.lng
index f85a66665b..4a87f66462 100644
--- a/interface/web/dns/lib/lang/cz_dns_soa_admin_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_soa_admin_list.lng
@@ -9,5 +9,3 @@ $wb['add_new_record_wizard_txt'] = 'Přidat novou DNS zónu pomocí průvodce';
 $wb['add_new_record_txt'] = 'Přidat novou DNS zónu manuálně';
 $wb['sys_groupid_txt'] = 'Klient';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_soa_list.lng b/interface/web/dns/lib/lang/cz_dns_soa_list.lng
index 999e5bd68d..e16d46e806 100644
--- a/interface/web/dns/lib/lang/cz_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_soa_list.lng
@@ -7,6 +7,5 @@ $wb['ns_txt'] = 'NS';
 $wb['mbox_txt'] = 'E-mail';
 $wb['add_new_record_txt'] = 'Přidat DNS zónu (SOA záznam)';
 $wb['add_new_record_wizard_txt'] = 'Přidat DNS zónu (dle šablony)';
+$wb['import_zone_file_txt'] = 'Import Zone File';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_spf.lng b/interface/web/dns/lib/lang/cz_dns_spf.lng
index 8a1a611c21..df8d1fe145 100644
--- a/interface/web/dns/lib/lang/cz_dns_spf.lng
+++ b/interface/web/dns/lib/lang/cz_dns_spf.lng
@@ -16,10 +16,10 @@ $wb['spf_invalid_hostname_txt'] = 'Invalid hostname';
 $wb['spf_domain_txt'] = 'Any domains that may deliver or relay mail for this domain';
 $wb['spf_domain_note_txt'] = '(Sepearate domains with whitespaces)';
 $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["record_exists_txt"] = 'DNS-Record already exists';
-$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['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/cz_dns_srv.lng b/interface/web/dns/lib/lang/cz_dns_srv.lng
index 90dc430bea..c863246e49 100644
--- a/interface/web/dns/lib/lang/cz_dns_srv.lng
+++ b/interface/web/dns/lib/lang/cz_dns_srv.lng
@@ -18,5 +18,3 @@ $wb['srv_error_regex'] = 'Neplatný formát záznamu serveru. Záznam serveru mu
 $wb['aux_txt'] = 'Priorita';
 $wb['ttl_range_error'] = 'Min. TTL doba je 60 sekund.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_template.lng b/interface/web/dns/lib/lang/cz_dns_template.lng
index b91b3ae257..be4ac0e949 100644
--- a/interface/web/dns/lib/lang/cz_dns_template.lng
+++ b/interface/web/dns/lib/lang/cz_dns_template.lng
@@ -4,5 +4,3 @@ $wb['fields_txt'] = 'Pole';
 $wb['template_txt'] = 'Šablona';
 $wb['visible_txt'] = 'Viditelný';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_template_list.lng b/interface/web/dns/lib/lang/cz_dns_template_list.lng
index a7218a4976..bdd6e18204 100644
--- a/interface/web/dns/lib/lang/cz_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/cz_dns_template_list.lng
@@ -4,5 +4,3 @@ $wb['visible_txt'] = 'Viditelný';
 $wb['name_txt'] = 'Název';
 $wb['add_new_record_txt'] = 'Přidat záznam';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/cz_dns_tlsa.lng b/interface/web/dns/lib/lang/cz_dns_tlsa.lng
new file mode 100644
index 0000000000..dcfb3bfa33
--- /dev/null
+++ b/interface/web/dns/lib/lang/cz_dns_tlsa.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb['name_txt'] = 'Service-Descriptor';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'TLSA-Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format. Correct: _&lt;port&gt;._(tcp|udp).&lt;hostname&gt;';
+$wb["data_error_empty"] = 'TLSA-Data empty';
+$wb["data_error_regex"] = 'TLSA dataformat is wrong. Correct: n n n HASH';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/cz_dns_txt.lng b/interface/web/dns/lib/lang/cz_dns_txt.lng
index cc291c7ae5..556e4dc5a6 100644
--- a/interface/web/dns/lib/lang/cz_dns_txt.lng
+++ b/interface/web/dns/lib/lang/cz_dns_txt.lng
@@ -16,4 +16,4 @@ $wb['ttl_range_error'] = 'Min. TTL doba je 60 sekund.';
 $wb['invalid_type_dkim'] = 'Přímá editace DKIM záznamu zde není povolena. Editujte záznam pomocí tlačítka DKIM.';
 $wb['invalid_type_dmarc'] = 'Přímá editace DMARC záznamu zde není povolena. Editujte záznam pomocí tlačítka DMARC.';
 $wb['invalid_type_spf'] = 'Přímá editace SPF záznamu zde není povolena. Editujte záznam pomocí tlačítka SPF.';
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/dns/lib/lang/cz_dns_wizard.lng b/interface/web/dns/lib/lang/cz_dns_wizard.lng
index e8f9df6a53..0594b13832 100644
--- a/interface/web/dns/lib/lang/cz_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/cz_dns_wizard.lng
@@ -41,5 +41,3 @@ $wb['dkim_txt'] = 'DKIM enabled';
 $wb['error_no_server_id'] = 'No server provided.';
 $wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/de_dns_dkim.lng b/interface/web/dns/lib/lang/de_dns_dkim.lng
index ce70829412..617415a6d5 100644
--- a/interface/web/dns/lib/lang/de_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/de_dns_dkim.lng
@@ -1,11 +1,11 @@
 <?php
-$wb["public_key_txt"] = 'öffentlicher Schlüssel';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Aktiv';
-$wb["record_exists_txt"] = 'DNS-Eintrag bereits vorhanden';
-$wb["dkim_disabled_txt"] = 'DKIM ist für diese Domain nicht aktiv.';
-$wb["limit_dns_record_txt"] = 'Die max. Anzahl von DNS Eintraegen für den Account ist erreicht.';
-$wb["no_zone_perm"] = 'Fehlende Berechtigung zum Hinzufuegen eines Eintrags zur DNS-Zone.';
+$wb['public_key_txt'] = 'öffentlicher Schlüssel';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Aktiv';
+$wb['record_exists_txt'] = 'DNS-Eintrag bereits vorhanden';
+$wb['dkim_disabled_txt'] = 'DKIM ist für diese Domain nicht aktiv.';
+$wb['limit_dns_record_txt'] = 'Die max. Anzahl von DNS Eintraegen für den Account ist erreicht.';
+$wb['no_zone_perm'] = 'Fehlende Berechtigung zum Hinzufuegen eines Eintrags zur DNS-Zone.';
 $wb['ttl_range_error'] = 'Min. TTL time ist 60 Sekunden.';
 $wb['selector_txt'] = 'DKIM-Selector';
 ?>
diff --git a/interface/web/dns/lib/lang/de_dns_dmarc.lng b/interface/web/dns/lib/lang/de_dns_dmarc.lng
index 4da1b03668..1cbe115d20 100644
--- a/interface/web/dns/lib/lang/de_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/de_dns_dmarc.lng
@@ -6,21 +6,21 @@ $wb['dmarc_policy_note_txt'] = 'Wie der empfangen Server Mails behandeln soll, b
 $wb['dmarc_policy_none_txt'] = 'nur Reports';
 $wb['dmarc_policy_quarantine_txt'] = 'Quarantäne';
 $wb['dmarc_policy_reject_txt'] = 'abweisen';
-$wb['dmarc_rua_txt'] = "'Aggregate Data Reporting' Adresse";
+$wb['dmarc_rua_txt'] = '\'Aggregate Data Reporting\' Adresse';
 $wb['dmarc_rua_note_txt'] = 'Email für Berichte ISPs für Mails mit fehlgeschlagenen DMARC-Checks (mehrere mit Leerzeichen trennen).';
-$wb['dmarc_ruf_txt'] = "'Forensic Data Reporting' Adresse";
+$wb['dmarc_ruf_txt'] = '\'Forensic Data Reporting\' Adresse';
 $wb['dmarc_ruf_note_txt'] = 'Email für Mails bei einem fehlgeschlagenen DMARC-Check (mehrere mit Leerzeichen trennen).';
 $wb['dmarc_fo_txt'] = 'Forensic Report Optionen';
-$wb['dmarc_fo0_txt'] = "Reports, wenn alle Authentifizierungen für DMARC fehlschlagen";
+$wb['dmarc_fo0_txt'] = 'Reports, wenn alle Authentifizierungen für DMARC fehlschlagen';
 $wb['dmarc_fo1_txt'] = 'Reports, wenn eine Authentifizierung fehlschlägt.';
 $wb['dmarc_fod_txt'] = 'Reports, wenn die DKIM-Überprüfung fehlschlägt.';
 $wb['dmarc_fos_txt'] = 'Reports, wenn die SPF-Überprüfung fehlschlägt.';
 $wb['dmarc_adkim_txt'] = 'DKIM identifier alignment';
-$wb['dmarc_adkim_note_txt'] = "'strict' erfordert exakte Übereinstimmung zwischen DKIM der Domain und dem From-Header der Email";
+$wb['dmarc_adkim_note_txt'] = '\'strict\' erfordert exakte Übereinstimmung zwischen DKIM der Domain und dem From-Header der Email';
 $wb['dmarc_adkim_r_txt'] = 'relaxed';
 $wb['dmarc_adkim_s_txt'] = 'strict';
-$wb['dmarc_aspf_txt'] = "Abgleichsmodus ('alignment mode') für SPF";
-$wb['dmarc_aspf_note_txt'] = "'strict' erfordert exakte Übereinstimmung zwischen dem SPF der Domain und dem From-Header der Email";
+$wb['dmarc_aspf_txt'] = 'Abgleichsmodus (\'alignment mode\') für SPF';
+$wb['dmarc_aspf_note_txt'] = '\'strict\' erfordert exakte Übereinstimmung zwischen dem SPF der Domain und dem From-Header der Email';
 $wb['dmarc_aspf_r_txt'] = 'relaxed';
 $wb['dmarc_aspf_s_txt'] = 'strict';
 $wb['dmarc_rf_txt'] = 'Report Format';
@@ -29,7 +29,7 @@ $wb['dmarc_rf_iodef_txt'] = 'Incident Object Description Exchange Format';
 $wb['dmarc_pct_txt'] = '% der Nachrichten, die gefiltert werden';
 $wb['dmarc_pct_note_txt'] = '% (100 Standard). Messages in Prozent die der Empfänger testen soll.';
 $wb['dmarc_ri_txt'] = 'Report-Interval';
-$wb['dmarc_ri_note_txt'] = "Sekunden (default=86400). Wie oft 'Aggregate Reports' erstellt werden sollen (86400 entsprechen 1 Tag).";
+$wb['dmarc_ri_note_txt'] = 'Sekunden (default=86400). Wie oft \'Aggregate Reports\' erstellt werden sollen (86400 entsprechen 1 Tag).';
 $wb['dmarc_sp_txt'] = 'Subdomain Policy (Defaults identisch zur Domain).';
 $wb['dmarc_sp_same_txt'] = 'wie Domain';
 $wb['dmarc_sp_none_txt'] = 'none';
@@ -37,7 +37,7 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine';
 $wb['dmarc_sp_reject_txt'] = 'reject';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Aktiv';
-$wb['dmarc_policy_error_txt'] = "Nur die Policy 'none' ist ohne DKIM möglich.";
+$wb['dmarc_policy_error_txt'] = 'Nur die Policy \'none\' ist ohne DKIM möglich.';
 $wb['dmarc_no_dkim_txt'] = 'Kein aktiver DKIM Eintrag.';
 $wb['dmarc_no_spf_txt'] = 'Kein aktiver SPF Eintrag.';
 $wb['dmarc_more_spf_txt'] = 'Mehr als ein aktiver SPF-Eintrag.';
diff --git a/interface/web/dns/lib/lang/de_dns_import.lng b/interface/web/dns/lib/lang/de_dns_import.lng
index 183809de66..f33d304a0d 100644
--- a/interface/web/dns/lib/lang/de_dns_import.lng
+++ b/interface/web/dns/lib/lang/de_dns_import.lng
@@ -11,4 +11,6 @@ $wb['zonefile_to_import_txt'] = 'Datei auswählen';
 $wb['domain_field_desc_txt'] = 'Kann freigelassen werden, falls der Dateiname oder der Dateiinhalt die Domain enthält.';
 $wb['title'] = 'Zonen Datei importieren';
 $wb['no_file_uploaded_error'] = 'Keine Datei hochgeladen';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/de_dns_soa.lng b/interface/web/dns/lib/lang/de_dns_soa.lng
index 6c475ed072..76d825be05 100644
--- a/interface/web/dns/lib/lang/de_dns_soa.lng
+++ b/interface/web/dns/lib/lang/de_dns_soa.lng
@@ -39,4 +39,5 @@ $wb['minimum_range_error'] = 'Min. Minimum ist 60 Sekunden.';
 $wb['ttl_range_error'] = 'Min. TTL ist 60 Sekunden.';
 $wb['xfer_error_regex'] = 'Zonentransfer: Verwenden Sie eine oder mehrere durch Komma getrennte IP Adressen oder das Wort: any.';
 $wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/de_dns_soa_list.lng b/interface/web/dns/lib/lang/de_dns_soa_list.lng
index 8281fbd222..31116ac242 100644
--- a/interface/web/dns/lib/lang/de_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/de_dns_soa_list.lng
@@ -7,4 +7,5 @@ $wb['ns_txt'] = 'NS';
 $wb['mbox_txt'] = 'E-Mail';
 $wb['add_new_record_txt'] = 'Neue DNS Zone (SOA) hinzufügen';
 $wb['add_new_record_wizard_txt'] = 'Neue DNS Zone per Assistent hinzufügen';
+$wb['import_zone_file_txt'] = 'Import Zone File';
 ?>
diff --git a/interface/web/dns/lib/lang/de_dns_spf.lng b/interface/web/dns/lib/lang/de_dns_spf.lng
index e75cd7aaaf..aec5595ad3 100644
--- a/interface/web/dns/lib/lang/de_dns_spf.lng
+++ b/interface/web/dns/lib/lang/de_dns_spf.lng
@@ -1,5 +1,3 @@
-
-
 <?php
 $wb['data_txt'] = 'SPF Record';
 $wb['spf_mechanism_txt'] = 'SPF Mechanismus';
@@ -20,9 +18,8 @@ $wb['spf_domain_note_txt'] = '(mehrerer Domains mit Leerzeichen trennen)';
 $wb['spf_invalid_domain_txt'] = 'Ungültiger Domainname';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Aktiv';
-$wb["record_exists_txt"] = 'DNS-Eintrag existiert bereits';
+$wb['record_exists_txt'] = 'DNS-Eintrag existiert bereits';
 $wb['ttl_range_error'] = 'Min. TTL time ist 60 Sekunden.';
 $wb['limit_dns_record_txt'] = 'Die maximale Anzahl an DNS Einträgen für Ihr Konto wurde erreicht.';
 $wb['no_zone_perm'] = 'Sie haben nicht die Berechtigung, einen Eintrag zu dieser DNS Zone hinzuzufügen.';
 ?>
-
diff --git a/interface/web/dns/lib/lang/de_dns_wizard.lng b/interface/web/dns/lib/lang/de_dns_wizard.lng
index 13d6ce5ba5..b4e70bc8fc 100644
--- a/interface/web/dns/lib/lang/de_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/de_dns_wizard.lng
@@ -38,4 +38,6 @@ $wb['globalsearch_noresults_text_txt'] = 'Keine Treffer.';
 $wb['globalsearch_noresults_limit_txt'] = '0 Treffer';
 $wb['globalsearch_searchfield_watermark_txt'] = 'Suche';
 $wb['globalsearch_suggestions_text_txt'] = 'Vorschläge';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/el_dns_dkim.lng b/interface/web/dns/lib/lang/el_dns_dkim.lng
index 5ed8bfa416..b7a2b9be7d 100644
--- a/interface/web/dns/lib/lang/el_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/el_dns_dkim.lng
@@ -7,4 +7,5 @@ $wb['dkim_disabled_txt'] = 'DKIM disabled for this mail-domain';
 $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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
 ?>
diff --git a/interface/web/dns/lib/lang/el_dns_dmarc.lng b/interface/web/dns/lib/lang/el_dns_dmarc.lng
index b00949bc98..cf78bb8eed 100644
--- a/interface/web/dns/lib/lang/el_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/el_dns_dmarc.lng
@@ -11,16 +11,16 @@ $wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages
 $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address';
 $wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).';
 $wb['dmarc_fo_txt'] = 'Forensic reporting options';
-$wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result.";
+$wb['dmarc_fo0_txt'] = 'Generate reports if all underlying authentication mechanisms fail to produce a DMARC \'pass\' result.';
 $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.';
 $wb['dmarc_fod_txt'] = 'Generate report if DKIM signature failed to verify.';
 $wb['dmarc_fos_txt'] = 'Generate report if SPF failed.';
 $wb['dmarc_adkim_txt'] = 'DKIM identifier alignment';
-$wb['dmarc_adkim_note_txt'] = "'strict' requires exact matching between DKIM domain and email's from";
+$wb['dmarc_adkim_note_txt'] = '\'strict\' requires exact matching between DKIM domain and email\'s from';
 $wb['dmarc_adkim_r_txt'] = 'relaxed';
 $wb['dmarc_adkim_s_txt'] = 'strict';
 $wb['dmarc_aspf_txt'] = 'SPF identifier alignment';
-$wb['dmarc_aspf_note_txt'] = "'strict' requires exact matching between SPF domain and email's from";
+$wb['dmarc_aspf_note_txt'] = '\'strict\' requires exact matching between SPF domain and email\'s from';
 $wb['dmarc_aspf_r_txt'] = 'relaxed';
 $wb['dmarc_aspf_s_txt'] = 'strict';
 $wb['dmarc_rf_txt'] = 'Report Format';
@@ -37,7 +37,7 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine';
 $wb['dmarc_sp_reject_txt'] = 'reject';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
-$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails.";
+$wb['dmarc_policy_error_txt'] = 'Only policy \'none\' is allowed without DKIM-signed emails.';
 $wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.';
 $wb['dmarc_no_spf_txt'] = 'No active SPF Record.';
 $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record';
diff --git a/interface/web/dns/lib/lang/el_dns_ds.lng b/interface/web/dns/lib/lang/el_dns_ds.lng
new file mode 100644
index 0000000000..3f9b447811
--- /dev/null
+++ b/interface/web/dns/lib/lang/el_dns_ds.lng
@@ -0,0 +1,18 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$wb["data_error_regex"] = 'Text format invalid';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['invalid_type_ds'] = 'DS-Record has a wrong format.';
+
+?>
diff --git a/interface/web/dns/lib/lang/el_dns_import.lng b/interface/web/dns/lib/lang/el_dns_import.lng
index 2d1fe083ea..8f67eba14c 100644
--- a/interface/web/dns/lib/lang/el_dns_import.lng
+++ b/interface/web/dns/lib/lang/el_dns_import.lng
@@ -11,4 +11,6 @@ $wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filen
 $wb['title'] = 'Import Zone Files';
 $wb['no_file_uploaded_error'] = 'No zonefile uploaded';
 $wb['zone_file_import_txt'] = 'Zone File Import';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/el_dns_loc.lng b/interface/web/dns/lib/lang/el_dns_loc.lng
new file mode 100644
index 0000000000..a2e3322bb6
--- /dev/null
+++ b/interface/web/dns/lib/lang/el_dns_loc.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$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/el_dns_soa.lng b/interface/web/dns/lib/lang/el_dns_soa.lng
index 87d5fc7ec5..f5f008f089 100644
--- a/interface/web/dns/lib/lang/el_dns_soa.lng
+++ b/interface/web/dns/lib/lang/el_dns_soa.lng
@@ -35,4 +35,9 @@ $wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
 $wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 $wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
+$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
+$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
+$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
 ?>
diff --git a/interface/web/dns/lib/lang/el_dns_soa_list.lng b/interface/web/dns/lib/lang/el_dns_soa_list.lng
index 99c1d73d9a..1bba3d97ef 100644
--- a/interface/web/dns/lib/lang/el_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/el_dns_soa_list.lng
@@ -7,4 +7,5 @@ $wb['ns_txt'] = 'NS';
 $wb['mbox_txt'] = 'Email';
 $wb['add_new_record_wizard_txt'] = 'Νέα ζώνη DNS με Οδηγό';
 $wb['add_new_record_txt'] = 'Νέα ζώνη DNS (χειροκίνητα)';
+$wb['import_zone_file_txt'] = 'Import Zone File';
 ?>
diff --git a/interface/web/dns/lib/lang/el_dns_spf.lng b/interface/web/dns/lib/lang/el_dns_spf.lng
index 8a1a611c21..df8d1fe145 100644
--- a/interface/web/dns/lib/lang/el_dns_spf.lng
+++ b/interface/web/dns/lib/lang/el_dns_spf.lng
@@ -16,10 +16,10 @@ $wb['spf_invalid_hostname_txt'] = 'Invalid hostname';
 $wb['spf_domain_txt'] = 'Any domains that may deliver or relay mail for this domain';
 $wb['spf_domain_note_txt'] = '(Sepearate domains with whitespaces)';
 $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["record_exists_txt"] = 'DNS-Record already exists';
-$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['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/el_dns_tlsa.lng b/interface/web/dns/lib/lang/el_dns_tlsa.lng
new file mode 100644
index 0000000000..dcfb3bfa33
--- /dev/null
+++ b/interface/web/dns/lib/lang/el_dns_tlsa.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb['name_txt'] = 'Service-Descriptor';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'TLSA-Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format. Correct: _&lt;port&gt;._(tcp|udp).&lt;hostname&gt;';
+$wb["data_error_empty"] = 'TLSA-Data empty';
+$wb["data_error_regex"] = 'TLSA dataformat is wrong. Correct: n n n HASH';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/el_dns_wizard.lng b/interface/web/dns/lib/lang/el_dns_wizard.lng
index 96bea29deb..c7ecbddd3d 100644
--- a/interface/web/dns/lib/lang/el_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/el_dns_wizard.lng
@@ -37,4 +37,7 @@ $wb['globalsearch_searchfield_watermark_txt'] = 'Search';
 $wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
 $wb['list_head_txt'] = 'DNS Zone Wizard';
 $wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
+$wb['dkim_txt'] = 'DKIM enabled';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/es_dns_dmarc.lng b/interface/web/dns/lib/lang/es_dns_dmarc.lng
index b00949bc98..cf78bb8eed 100644
--- a/interface/web/dns/lib/lang/es_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/es_dns_dmarc.lng
@@ -11,16 +11,16 @@ $wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages
 $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address';
 $wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).';
 $wb['dmarc_fo_txt'] = 'Forensic reporting options';
-$wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result.";
+$wb['dmarc_fo0_txt'] = 'Generate reports if all underlying authentication mechanisms fail to produce a DMARC \'pass\' result.';
 $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.';
 $wb['dmarc_fod_txt'] = 'Generate report if DKIM signature failed to verify.';
 $wb['dmarc_fos_txt'] = 'Generate report if SPF failed.';
 $wb['dmarc_adkim_txt'] = 'DKIM identifier alignment';
-$wb['dmarc_adkim_note_txt'] = "'strict' requires exact matching between DKIM domain and email's from";
+$wb['dmarc_adkim_note_txt'] = '\'strict\' requires exact matching between DKIM domain and email\'s from';
 $wb['dmarc_adkim_r_txt'] = 'relaxed';
 $wb['dmarc_adkim_s_txt'] = 'strict';
 $wb['dmarc_aspf_txt'] = 'SPF identifier alignment';
-$wb['dmarc_aspf_note_txt'] = "'strict' requires exact matching between SPF domain and email's from";
+$wb['dmarc_aspf_note_txt'] = '\'strict\' requires exact matching between SPF domain and email\'s from';
 $wb['dmarc_aspf_r_txt'] = 'relaxed';
 $wb['dmarc_aspf_s_txt'] = 'strict';
 $wb['dmarc_rf_txt'] = 'Report Format';
@@ -37,7 +37,7 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine';
 $wb['dmarc_sp_reject_txt'] = 'reject';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
-$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails.";
+$wb['dmarc_policy_error_txt'] = 'Only policy \'none\' is allowed without DKIM-signed emails.';
 $wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.';
 $wb['dmarc_no_spf_txt'] = 'No active SPF Record.';
 $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record';
diff --git a/interface/web/dns/lib/lang/es_dns_ds.lng b/interface/web/dns/lib/lang/es_dns_ds.lng
new file mode 100644
index 0000000000..3f9b447811
--- /dev/null
+++ b/interface/web/dns/lib/lang/es_dns_ds.lng
@@ -0,0 +1,18 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$wb["data_error_regex"] = 'Text format invalid';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['invalid_type_ds'] = 'DS-Record has a wrong format.';
+
+?>
diff --git a/interface/web/dns/lib/lang/es_dns_import.lng b/interface/web/dns/lib/lang/es_dns_import.lng
index a8b57eb8d9..2c93606d8a 100644
--- a/interface/web/dns/lib/lang/es_dns_import.lng
+++ b/interface/web/dns/lib/lang/es_dns_import.lng
@@ -11,4 +11,6 @@ $wb['zonefile_to_import_txt'] = 'Archivo de Zona';
 $wb['domain_field_desc_txt'] = 'Puede quedar en blanco si el nombre de dominio es el nombre del archivo o está en el contenido del archivo de zona.';
 $wb['title'] = 'Importar Archivos de Zona';
 $wb['no_file_uploaded_error'] = 'No hay archivo de zona cargado';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/es_dns_loc.lng b/interface/web/dns/lib/lang/es_dns_loc.lng
new file mode 100644
index 0000000000..a2e3322bb6
--- /dev/null
+++ b/interface/web/dns/lib/lang/es_dns_loc.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$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/es_dns_slave.lng b/interface/web/dns/lib/lang/es_dns_slave.lng
index 94dcc25832..4293b4248f 100644
--- a/interface/web/dns/lib/lang/es_dns_slave.lng
+++ b/interface/web/dns/lib/lang/es_dns_slave.lng
@@ -10,7 +10,6 @@ $wb['xfer_txt'] = 'Permitir transferencia de zonas a<br />estas IP (lista separa
 $wb['server_id_error_empty'] = 'No hay seleccionado un servidor';
 $wb['origin_error_empty'] = 'Zona vacía.';
 $wb['origin_error_unique'] = 'Ya existe un registro para esta zona.';
-$wb['secondary_zone_txt'] = 'Zona DNS Secundaria';
 $wb['origin_error_regex'] = 'La zona contiene un formato inválido.';
 $wb['ns_error_regex'] = 'NS contiene un formato inválido.';
 $wb['eg_domain_tld'] = 'eje. dominio.tld.';
diff --git a/interface/web/dns/lib/lang/es_dns_soa.lng b/interface/web/dns/lib/lang/es_dns_soa.lng
index dd34fed3e1..cf93aa7c87 100644
--- a/interface/web/dns/lib/lang/es_dns_soa.lng
+++ b/interface/web/dns/lib/lang/es_dns_soa.lng
@@ -23,10 +23,9 @@ $wb['mbox_error_empty'] = 'Correo vacío.';
 $wb['mbox_error_regex'] = 'Formato de correo inválido.';
 $wb['also_notify_txt'] = 'También notificar';
 $wb['also_notify_error_regex'] = 'También notificar: Por favor use una dirección IP.';
-$wb['xfer_error_regex'] = 'Xfer: Por favor use una dirección IP.';
+$wb['xfer_error_regex'] = 'Notificar también a: Por favor, usa una dirección IP.';
 $wb['update_acl_txt'] = 'Actualizar ACL';
 $wb['seconds_txt'] = 'Segundos';
-$wb['xfer_error_regex'] = 'Notificar también a: Por favor, usa una dirección IP.';
 $wb['eg_domain_tld'] = 'eje. dominio.tld';
 $wb['eg_ns1_domain_tld'] = 'eje. ns1.dominio.tld';
 $wb['eg_webmaster_domain_tld'] = 'eje. webmaster@dominio.tld';
@@ -36,4 +35,9 @@ $wb['retry_range_error'] = 'Tiempo mín. de reintento es 60 segundos.';
 $wb['expire_range_error'] = 'Tiempo mín. de expiración es 60 segundos.';
 $wb['minimum_range_error'] = 'Tiempo mín. de Mínimo es 60 segundos.';
 $wb['ttl_range_error'] = 'El tiempo mín. de TTL es 60 segundos.';
+$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
+$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
+$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
 ?>
diff --git a/interface/web/dns/lib/lang/es_dns_spf.lng b/interface/web/dns/lib/lang/es_dns_spf.lng
index 8a1a611c21..df8d1fe145 100644
--- a/interface/web/dns/lib/lang/es_dns_spf.lng
+++ b/interface/web/dns/lib/lang/es_dns_spf.lng
@@ -16,10 +16,10 @@ $wb['spf_invalid_hostname_txt'] = 'Invalid hostname';
 $wb['spf_domain_txt'] = 'Any domains that may deliver or relay mail for this domain';
 $wb['spf_domain_note_txt'] = '(Sepearate domains with whitespaces)';
 $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["record_exists_txt"] = 'DNS-Record already exists';
-$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['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/es_dns_tlsa.lng b/interface/web/dns/lib/lang/es_dns_tlsa.lng
new file mode 100644
index 0000000000..dcfb3bfa33
--- /dev/null
+++ b/interface/web/dns/lib/lang/es_dns_tlsa.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb['name_txt'] = 'Service-Descriptor';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'TLSA-Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format. Correct: _&lt;port&gt;._(tcp|udp).&lt;hostname&gt;';
+$wb["data_error_empty"] = 'TLSA-Data empty';
+$wb["data_error_regex"] = 'TLSA dataformat is wrong. Correct: n n n HASH';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/es_dns_wizard.lng b/interface/web/dns/lib/lang/es_dns_wizard.lng
index fb7cacbdfb..a900a0fd38 100644
--- a/interface/web/dns/lib/lang/es_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/es_dns_wizard.lng
@@ -1,6 +1,6 @@
 <?php
-$wb['list_head_txt'] = 'Ayudante de Zona DNS';
-$wb['list_desc_txt'] = 'Cree una Zona DNS mediante el ayudante';
+$wb['list_head_txt'] = 'Asistente de Zona DNS';
+$wb['list_desc_txt'] = 'Crear una zona DNS con asistente';
 $wb['dns_zone_txt'] = 'Zona DNS';
 $wb['template_id_txt'] = 'Plantilla';
 $wb['server_id_txt'] = 'Servidor';
@@ -13,9 +13,6 @@ $wb['ns1_txt'] = 'NS 1';
 $wb['ns2_txt'] = 'NS 2';
 $wb['ip_txt'] = 'Dirección IP';
 $wb['ipv6_txt'] = 'Dirección IPv6';
-$wb['list_head_txt'] = 'Asistente de Zona DNS';
-$wb['list_desc_txt'] = 'Crear una zona DNS con asistente';
-$wb['dns_zone_txt'] = 'Zona DNS';
 $wb['error_origin_empty'] = 'Origen está vacío.';
 $wb['error_ns_empty'] = 'NS está vacío.';
 $wb['error_mbox_empty'] = 'Mbox está vacío.';
@@ -40,4 +37,7 @@ $wb['globalsearch_noresults_limit_txt'] = '0 resultados';
 $wb['globalsearch_searchfield_watermark_txt'] = 'Buscar';
 $wb['globalsearch_suggestions_text_txt'] = 'Sugerencias';
 $wb['dkim_txt'] = 'DKIM activado';
+$wb['error_ipv6_empty'] = 'IPv6 empty.';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/fi_dns_dmarc.lng b/interface/web/dns/lib/lang/fi_dns_dmarc.lng
index b00949bc98..cf78bb8eed 100644
--- a/interface/web/dns/lib/lang/fi_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/fi_dns_dmarc.lng
@@ -11,16 +11,16 @@ $wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages
 $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address';
 $wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).';
 $wb['dmarc_fo_txt'] = 'Forensic reporting options';
-$wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result.";
+$wb['dmarc_fo0_txt'] = 'Generate reports if all underlying authentication mechanisms fail to produce a DMARC \'pass\' result.';
 $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.';
 $wb['dmarc_fod_txt'] = 'Generate report if DKIM signature failed to verify.';
 $wb['dmarc_fos_txt'] = 'Generate report if SPF failed.';
 $wb['dmarc_adkim_txt'] = 'DKIM identifier alignment';
-$wb['dmarc_adkim_note_txt'] = "'strict' requires exact matching between DKIM domain and email's from";
+$wb['dmarc_adkim_note_txt'] = '\'strict\' requires exact matching between DKIM domain and email\'s from';
 $wb['dmarc_adkim_r_txt'] = 'relaxed';
 $wb['dmarc_adkim_s_txt'] = 'strict';
 $wb['dmarc_aspf_txt'] = 'SPF identifier alignment';
-$wb['dmarc_aspf_note_txt'] = "'strict' requires exact matching between SPF domain and email's from";
+$wb['dmarc_aspf_note_txt'] = '\'strict\' requires exact matching between SPF domain and email\'s from';
 $wb['dmarc_aspf_r_txt'] = 'relaxed';
 $wb['dmarc_aspf_s_txt'] = 'strict';
 $wb['dmarc_rf_txt'] = 'Report Format';
@@ -37,7 +37,7 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine';
 $wb['dmarc_sp_reject_txt'] = 'reject';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
-$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails.";
+$wb['dmarc_policy_error_txt'] = 'Only policy \'none\' is allowed without DKIM-signed emails.';
 $wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.';
 $wb['dmarc_no_spf_txt'] = 'No active SPF Record.';
 $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record';
diff --git a/interface/web/dns/lib/lang/fi_dns_ds.lng b/interface/web/dns/lib/lang/fi_dns_ds.lng
new file mode 100644
index 0000000000..3f9b447811
--- /dev/null
+++ b/interface/web/dns/lib/lang/fi_dns_ds.lng
@@ -0,0 +1,18 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$wb["data_error_regex"] = 'Text format invalid';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['invalid_type_ds'] = 'DS-Record has a wrong format.';
+
+?>
diff --git a/interface/web/dns/lib/lang/fi_dns_import.lng b/interface/web/dns/lib/lang/fi_dns_import.lng
index 2d1fe083ea..8f67eba14c 100644
--- a/interface/web/dns/lib/lang/fi_dns_import.lng
+++ b/interface/web/dns/lib/lang/fi_dns_import.lng
@@ -11,4 +11,6 @@ $wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filen
 $wb['title'] = 'Import Zone Files';
 $wb['no_file_uploaded_error'] = 'No zonefile uploaded';
 $wb['zone_file_import_txt'] = 'Zone File Import';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/fi_dns_loc.lng b/interface/web/dns/lib/lang/fi_dns_loc.lng
new file mode 100644
index 0000000000..a2e3322bb6
--- /dev/null
+++ b/interface/web/dns/lib/lang/fi_dns_loc.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$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/fi_dns_soa.lng b/interface/web/dns/lib/lang/fi_dns_soa.lng
index 779dfca9af..1c75c596f1 100755
--- a/interface/web/dns/lib/lang/fi_dns_soa.lng
+++ b/interface/web/dns/lib/lang/fi_dns_soa.lng
@@ -35,4 +35,9 @@ $wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
 $wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 $wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
+$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
+$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
+$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
 ?>
diff --git a/interface/web/dns/lib/lang/fi_dns_soa_list.lng b/interface/web/dns/lib/lang/fi_dns_soa_list.lng
index 7901a0a18e..62789da7f8 100755
--- a/interface/web/dns/lib/lang/fi_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/fi_dns_soa_list.lng
@@ -7,4 +7,5 @@ $wb['ns_txt'] = 'nimipalvelin (NS)';
 $wb['mbox_txt'] = 'Yhteyshenkilön sähköpostiosoite';
 $wb['add_new_record_txt'] = 'Lisää uusi DNS-alue (SOA)';
 $wb['add_new_record_wizard_txt'] = 'Add new DNS Zone with Wizard';
+$wb['import_zone_file_txt'] = 'Import Zone File';
 ?>
diff --git a/interface/web/dns/lib/lang/fi_dns_spf.lng b/interface/web/dns/lib/lang/fi_dns_spf.lng
index 8a1a611c21..df8d1fe145 100644
--- a/interface/web/dns/lib/lang/fi_dns_spf.lng
+++ b/interface/web/dns/lib/lang/fi_dns_spf.lng
@@ -16,10 +16,10 @@ $wb['spf_invalid_hostname_txt'] = 'Invalid hostname';
 $wb['spf_domain_txt'] = 'Any domains that may deliver or relay mail for this domain';
 $wb['spf_domain_note_txt'] = '(Sepearate domains with whitespaces)';
 $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["record_exists_txt"] = 'DNS-Record already exists';
-$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['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/fi_dns_tlsa.lng b/interface/web/dns/lib/lang/fi_dns_tlsa.lng
new file mode 100644
index 0000000000..dcfb3bfa33
--- /dev/null
+++ b/interface/web/dns/lib/lang/fi_dns_tlsa.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb['name_txt'] = 'Service-Descriptor';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'TLSA-Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format. Correct: _&lt;port&gt;._(tcp|udp).&lt;hostname&gt;';
+$wb["data_error_empty"] = 'TLSA-Data empty';
+$wb["data_error_regex"] = 'TLSA dataformat is wrong. Correct: n n n HASH';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/fi_dns_wizard.lng b/interface/web/dns/lib/lang/fi_dns_wizard.lng
index 3402723b1e..8d9fa02e88 100755
--- a/interface/web/dns/lib/lang/fi_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/fi_dns_wizard.lng
@@ -38,4 +38,6 @@ $wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
 $wb['list_head_txt'] = 'DNS Zone Wizard';
 $wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
 $wb['dkim_txt'] = 'DKIM enabled';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_a.lng b/interface/web/dns/lib/lang/fr_dns_a.lng
index 636e3f0398..381fd623a6 100644
--- a/interface/web/dns/lib/lang/fr_dns_a.lng
+++ b/interface/web/dns/lib/lang/fr_dns_a.lng
@@ -1,17 +1,17 @@
 <?php
 $wb['server_id_txt'] = 'Serveur';
 $wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Nom d\'hôte';
+$wb['name_txt'] = 'Nom d’hôte';
 $wb['type_txt'] = 'type';
 $wb['data_txt'] = 'Adresse IP';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Actif';
-$wb['limit_dns_record_txt'] = 'Le nombre maximum d\'enregistrements DNS pour votre compte a été atteint.';
-$wb['no_zone_perm'] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement dans cette zone DNS.';
-$wb['name_error_empty'] = 'Le nom d\'hôte est vide.';
-$wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.';
-$wb['data_error_empty'] = 'L\'adresse IP est vide.';
-$wb['ip_error_wrong'] = 'Le format de l\'adresse IP est invalide.';
+$wb['limit_dns_record_txt'] = 'Le nombre maximum d’enregistrements DNS pour votre compte a été atteint.';
+$wb['no_zone_perm'] = 'Vous n’avez pas la permission d’ajouter un enregistrement dans cette zone DNS.';
+$wb['name_error_empty'] = 'Le nom d’hôte est vide.';
+$wb['name_error_regex'] = 'Le format du nom d’hôte est invalide.';
+$wb['data_error_empty'] = 'L’adresse IP est vide.';
 $wb['data_error_duplicate'] = 'Enregistrement A ou CNAME en double';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['ip_error_wrong'] = 'IP-Address format invalid';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_a_list.lng b/interface/web/dns/lib/lang/fr_dns_a_list.lng
index 67eb1b7d42..4c66db104a 100644
--- a/interface/web/dns/lib/lang/fr_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/fr_dns_a_list.lng
@@ -11,5 +11,5 @@ $wb['type_txt'] = 'Type';
 $wb['add_new_record_txt'] = 'Ajouter un nouvel enregistrement A';
 $wb['page_txt'] = 'Page';
 $wb['page_of_txt'] = 'de';
-$wb['delete_confirmation'] = 'Voulez-vous vraiment supprimer cet enregistrement ?';
+$wb['delete_confirmation'] = 'Voulez-vous vraiment supprimer cet enregistrement ?';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_aaaa.lng b/interface/web/dns/lib/lang/fr_dns_aaaa.lng
index 9d731bb0bb..1cc3722de5 100644
--- a/interface/web/dns/lib/lang/fr_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/fr_dns_aaaa.lng
@@ -1,16 +1,16 @@
 <?php
 $wb['server_id_txt'] = 'Serveur';
 $wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Nom d\'hôte';
+$wb['name_txt'] = 'Nom d’hôte';
 $wb['type_txt'] = 'type';
 $wb['data_txt'] = 'Adresse IPv6';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Actif';
-$wb['limit_dns_record_txt'] = 'Le nombre maximum d\'enregistrements DNS pour votre compte a été atteint.';
-$wb['no_zone_perm'] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement dans cette zone DNS.';
-$wb['name_error_empty'] = 'Le nom d\'hôte est vide.';
-$wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.';
-$wb['data_error_empty'] = 'L\'adresse IP est vide.';
-$wb['ip_error_wrong'] = 'Le format de l\'adresse IP est invalide.';
+$wb['limit_dns_record_txt'] = 'Le nombre maximum d’enregistrements DNS pour votre compte a été atteint.';
+$wb['no_zone_perm'] = 'Vous n’avez pas la permission d’ajouter un enregistrement dans cette zone DNS.';
+$wb['name_error_empty'] = 'Le nom d’hôte est vide.';
+$wb['name_error_regex'] = 'Le format du nom d’hôte est invalide.';
+$wb['data_error_empty'] = 'L’adresse IP est vide.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['ip_error_wrong'] = 'IP-Address format invalid';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_alias.lng b/interface/web/dns/lib/lang/fr_dns_alias.lng
index 4071d430b9..4684ce36ff 100644
--- a/interface/web/dns/lib/lang/fr_dns_alias.lng
+++ b/interface/web/dns/lib/lang/fr_dns_alias.lng
@@ -1,16 +1,16 @@
 <?php
 $wb['server_id_txt'] = 'Serveur';
 $wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Nom d\'hôte';
+$wb['name_txt'] = 'Nom d’hôte';
 $wb['type_txt'] = 'type';
-$wb['data_txt'] = 'Nom d\'hôte cible';
+$wb['data_txt'] = 'Nom d’hôte cible';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Actif';
-$wb['limit_dns_record_txt'] = 'Le nombre maximum d\'enregistrements DNS pour votre compte a été atteint.';
-$wb['no_zone_perm'] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement dans cette zone DNS.';
-$wb['name_error_empty'] = 'Le nom d\'hôte est vide.';
-$wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.';
-$wb['data_error_empty'] = 'Le nom d\'hôte cible est vide.';
-$wb['data_error_regex'] = 'Le format du nom d\'hôte est invalide.';
+$wb['limit_dns_record_txt'] = 'Le nombre maximum d’enregistrements DNS pour votre compte a été atteint.';
+$wb['no_zone_perm'] = 'Vous n’avez pas la permission d’ajouter un enregistrement dans cette zone DNS.';
+$wb['name_error_empty'] = 'Le nom d’hôte est vide.';
+$wb['name_error_regex'] = 'Le format du nom d’hôte est invalide.';
+$wb['data_error_empty'] = 'Le nom d’hôte cible est vide.';
+$wb['data_error_regex'] = 'Le format du nom d’hôte est invalide.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_cname.lng b/interface/web/dns/lib/lang/fr_dns_cname.lng
index 3d191f703b..15b4144086 100644
--- a/interface/web/dns/lib/lang/fr_dns_cname.lng
+++ b/interface/web/dns/lib/lang/fr_dns_cname.lng
@@ -1,17 +1,17 @@
 <?php
 $wb['server_id_txt'] = 'Serveur';
 $wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Nom d\'hôte';
+$wb['name_txt'] = 'Nom d’hôte';
 $wb['type_txt'] = 'type';
-$wb['data_txt'] = 'Nom d\'hôte cible';
+$wb['data_txt'] = 'Nom d’hôte cible';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Actif';
-$wb['limit_dns_record_txt'] = 'Le nombre maximum d\'enregistrements DNS pour votre compte a été atteint.';
-$wb['no_zone_perm'] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement dans cette zone DNS.';
-$wb['name_error_empty'] = 'Le nom d\'hôte est vide.';
-$wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.';
-$wb['data_error_empty'] = 'Le nom d\'hôte cible est vide.';
-$wb['data_error_regex'] = 'Le format du nom d\'hôte cible invalide.';
+$wb['limit_dns_record_txt'] = 'Le nombre maximum d’enregistrements DNS pour votre compte a été atteint.';
+$wb['no_zone_perm'] = 'Vous n’avez pas la permission d’ajouter un enregistrement dans cette zone DNS.';
+$wb['name_error_empty'] = 'Le nom d’hôte est vide.';
+$wb['name_error_regex'] = 'Le format du nom d’hôte est invalide.';
+$wb['data_error_empty'] = 'Le nom d’hôte cible est vide.';
+$wb['data_error_regex'] = 'Le format du nom d’hôte cible invalide.';
 $wb['data_error_duplicate'] = 'Enregistrement A ou CNAME en double';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_dkim.lng b/interface/web/dns/lib/lang/fr_dns_dkim.lng
index 7c98c1cb28..d5872d4405 100644
--- a/interface/web/dns/lib/lang/fr_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/fr_dns_dkim.lng
@@ -1,10 +1,11 @@
 <?php
-$wb["public_key_txt"] = 'CléubliquePublic-Key';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Actif';
-$wb["record_exists_txt"] = 'L\'enregistrement DNS exist dé';
-$wb["limit_dns_record_txt"] = 'Le nombre max. d\'enregistrement DNS pour votre compte àtétteint.';
-$wb["no_zone_perm"] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement àette Zone DNS.';
+$wb['public_key_txt'] = 'CléubliquePublic-Key';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Actif';
+$wb['record_exists_txt'] = 'L\'enregistrement DNS exist dé';
+$wb['limit_dns_record_txt'] = 'Le nombre max. d\'enregistrement DNS pour votre compte àtétteint.';
+$wb['no_zone_perm'] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement àette Zone DNS.';
 $wb['ttl_range_error'] = 'Le temps minimum TTL est de 60 secondes.';
 $wb['selector_txt'] = 'Selecteur DKIM';
+$wb['dkim_disabled_txt'] = 'DKIM disabled for this mail-domain';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_dmarc.lng b/interface/web/dns/lib/lang/fr_dns_dmarc.lng
index b00949bc98..cf78bb8eed 100644
--- a/interface/web/dns/lib/lang/fr_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/fr_dns_dmarc.lng
@@ -11,16 +11,16 @@ $wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages
 $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address';
 $wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).';
 $wb['dmarc_fo_txt'] = 'Forensic reporting options';
-$wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result.";
+$wb['dmarc_fo0_txt'] = 'Generate reports if all underlying authentication mechanisms fail to produce a DMARC \'pass\' result.';
 $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.';
 $wb['dmarc_fod_txt'] = 'Generate report if DKIM signature failed to verify.';
 $wb['dmarc_fos_txt'] = 'Generate report if SPF failed.';
 $wb['dmarc_adkim_txt'] = 'DKIM identifier alignment';
-$wb['dmarc_adkim_note_txt'] = "'strict' requires exact matching between DKIM domain and email's from";
+$wb['dmarc_adkim_note_txt'] = '\'strict\' requires exact matching between DKIM domain and email\'s from';
 $wb['dmarc_adkim_r_txt'] = 'relaxed';
 $wb['dmarc_adkim_s_txt'] = 'strict';
 $wb['dmarc_aspf_txt'] = 'SPF identifier alignment';
-$wb['dmarc_aspf_note_txt'] = "'strict' requires exact matching between SPF domain and email's from";
+$wb['dmarc_aspf_note_txt'] = '\'strict\' requires exact matching between SPF domain and email\'s from';
 $wb['dmarc_aspf_r_txt'] = 'relaxed';
 $wb['dmarc_aspf_s_txt'] = 'strict';
 $wb['dmarc_rf_txt'] = 'Report Format';
@@ -37,7 +37,7 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine';
 $wb['dmarc_sp_reject_txt'] = 'reject';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
-$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails.";
+$wb['dmarc_policy_error_txt'] = 'Only policy \'none\' is allowed without DKIM-signed emails.';
 $wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.';
 $wb['dmarc_no_spf_txt'] = 'No active SPF Record.';
 $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record';
diff --git a/interface/web/dns/lib/lang/fr_dns_ds.lng b/interface/web/dns/lib/lang/fr_dns_ds.lng
new file mode 100644
index 0000000000..c3622dc5b5
--- /dev/null
+++ b/interface/web/dns/lib/lang/fr_dns_ds.lng
@@ -0,0 +1,17 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Data';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$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.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'Text empty';
+$wb['data_error_regex'] = 'Text format invalid';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['invalid_type_ds'] = 'DS-Record has a wrong format.';
+?>
diff --git a/interface/web/dns/lib/lang/fr_dns_hinfo.lng b/interface/web/dns/lib/lang/fr_dns_hinfo.lng
index b91e3d4917..0efdaf06ed 100644
--- a/interface/web/dns/lib/lang/fr_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/fr_dns_hinfo.lng
@@ -1,16 +1,16 @@
 <?php
 $wb['server_id_txt'] = 'Serveur';
 $wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Nom d\'hôte';
+$wb['name_txt'] = 'Nom d’hôte';
 $wb['type_txt'] = 'type';
-$wb['data_txt'] = 'Information de l\'hôte';
+$wb['data_txt'] = 'Information de l’hôte';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Actif';
-$wb['limit_dns_record_txt'] = 'Le nombre maximum d\'enregistrements DNS pour votre compte a été atteint.';
-$wb['no_zone_perm'] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement dans cette zone DNS.';
-$wb['name_error_empty'] = 'Le nom de l\'hôte est vide.';
-$wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.';
-$wb['data_error_empty'] = 'L\'information de l\'hôte est vide';
-$wb['data_error_regex'] = 'Le format de l\'information de l\'hôte est invalide';
+$wb['limit_dns_record_txt'] = 'Le nombre maximum d’enregistrements DNS pour votre compte a été atteint.';
+$wb['no_zone_perm'] = 'Vous n’avez pas la permission d’ajouter un enregistrement dans cette zone DNS.';
+$wb['name_error_empty'] = 'Le nom de l’hôte est vide.';
+$wb['name_error_regex'] = 'Le format du nom d’hôte est invalide.';
+$wb['data_error_empty'] = 'L’information de l’hôte est vide';
+$wb['data_error_regex'] = 'Le format de l’information de l’hôte est invalide';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_import.lng b/interface/web/dns/lib/lang/fr_dns_import.lng
index 24584c08e0..73bc88f824 100644
--- a/interface/web/dns/lib/lang/fr_dns_import.lng
+++ b/interface/web/dns/lib/lang/fr_dns_import.lng
@@ -1,16 +1,16 @@
 <?php
 $wb['server_id_txt'] = 'Server';
 $wb['client_txt'] = 'Client';
-$wb['error_no_server_id'] = 'Aucun serveur fourni.';
-$wb['error_not_allowed_server_id'] = 'Le serveur choisi n\'est pas autorisé pour ce compte.';
 $wb['btn_save_txt'] = 'Importer un fichier de Zone';
 $wb['btn_cancel_txt'] = 'Annuler';
 $wb['domain_txt'] = 'Domaine';
-$wb['zone_file_successfully_imported_txt'] = 'Le fichier de Zone a été importé avec succès !';
-$wb['error_no_valid_zone_file_txt'] = 'Le fichier de Zone semble être invalide !';
+$wb['zone_file_successfully_imported_txt'] = 'Le fichier de Zone a été importé avec succès !';
+$wb['error_no_valid_zone_file_txt'] = 'Le fichier de Zone semble être invalide !';
 $wb['zonefile_to_import_txt'] = 'Fichier de Zone';
 $wb['domain_field_desc_txt'] = 'Peut-être laissé vide si le nom de domaine est dans le nom de fichier ou dans le contenu du fichier de Zone.';
 $wb['title'] = 'Importer des fichiers de Zone';
 $wb['no_file_uploaded_error'] = 'Aucun fichier de Zone téléchargé';
 $wb['zone_file_import_txt'] = 'Importer un fichier de Zone';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_loc.lng b/interface/web/dns/lib/lang/fr_dns_loc.lng
new file mode 100644
index 0000000000..dc9ad9a006
--- /dev/null
+++ b/interface/web/dns/lib/lang/fr_dns_loc.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Data';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$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.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'Text empty';
+$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/fr_dns_mx.lng b/interface/web/dns/lib/lang/fr_dns_mx.lng
index 2253ffe00b..5c16e674c6 100644
--- a/interface/web/dns/lib/lang/fr_dns_mx.lng
+++ b/interface/web/dns/lib/lang/fr_dns_mx.lng
@@ -1,18 +1,18 @@
 <?php
 $wb['server_id_txt'] = 'Serveur';
 $wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Nom d\'hôte';
+$wb['name_txt'] = 'Nom d’hôte';
 $wb['type_txt'] = 'type';
-$wb['data_txt'] = 'Nom d\'hôte du serveur mail';
+$wb['data_txt'] = 'Nom d’hôte du serveur mail';
 $wb['aux_txt'] = 'Priorité';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Actif';
-$wb['limit_dns_record_txt'] = 'Le nombre maximum d\'enregistrements DNS pour votre compte a été atteint.';
-$wb['no_zone_perm'] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement dans cette zone DNS.';
-$wb['name_error_empty'] = 'Le nom d\'hôte est vide.';
-$wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.';
-$wb['data_error_empty'] = 'Le nom d\'hôte du serveur mail est vide';
-$wb['data_error_regex'] = 'Le format du nom d\'hôte du serveur mail est invalide';
+$wb['limit_dns_record_txt'] = 'Le nombre maximum d’enregistrements DNS pour votre compte a été atteint.';
+$wb['no_zone_perm'] = 'Vous n’avez pas la permission d’ajouter un enregistrement dans cette zone DNS.';
+$wb['name_error_empty'] = 'Le nom d’hôte est vide.';
+$wb['name_error_regex'] = 'Le format du nom d’hôte est invalide.';
+$wb['data_error_empty'] = 'Le nom d’hôte du serveur mail est vide';
+$wb['data_error_regex'] = 'Le format du nom d’hôte du serveur mail est invalide';
 $wb['duplicate_mx_record_txt'] = 'Enregistrement MX dupliqué.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_ns.lng b/interface/web/dns/lib/lang/fr_dns_ns.lng
index c8e36ccaec..7ebbb8e727 100644
--- a/interface/web/dns/lib/lang/fr_dns_ns.lng
+++ b/interface/web/dns/lib/lang/fr_dns_ns.lng
@@ -3,11 +3,11 @@ $wb['server_id_txt'] = 'Serveur';
 $wb['zone_txt'] = 'Zone';
 $wb['name_txt'] = 'Zone';
 $wb['type_txt'] = 'Type';
-$wb['data_txt'] = 'Nom d\'hôte du serveur de nom';
+$wb['data_txt'] = 'Nom d’hôte du serveur de nom';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Actif';
-$wb['limit_dns_record_txt'] = 'Le nombre maximum d\'enregistrements DNS pour votre compte a été atteint.';
-$wb['no_zone_perm'] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement dans cette zone DNS.';
+$wb['limit_dns_record_txt'] = 'Le nombre maximum d’enregistrements DNS pour votre compte a été atteint.';
+$wb['no_zone_perm'] = 'Vous n’avez pas la permission d’ajouter un enregistrement dans cette zone DNS.';
 $wb['name_error_empty'] = 'La zone est vide.';
 $wb['name_error_regex'] = 'Le format de la zone est invalide.';
 $wb['data_error_empty'] = 'Le serveur de nom est vide.';
diff --git a/interface/web/dns/lib/lang/fr_dns_ptr.lng b/interface/web/dns/lib/lang/fr_dns_ptr.lng
index c9e36c733c..1155d36c4d 100644
--- a/interface/web/dns/lib/lang/fr_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/fr_dns_ptr.lng
@@ -3,14 +3,14 @@ $wb['server_id_txt'] = 'Serveur';
 $wb['zone_txt'] = 'Zone';
 $wb['name_txt'] = 'Nom';
 $wb['type_txt'] = 'type';
-$wb['data_txt'] = 'Nom d\'hôte canonique';
+$wb['data_txt'] = 'Nom d’hôte canonique';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Actif';
-$wb['limit_dns_record_txt'] = 'Le nombre maximum d\'enregistrements DNS pour votre compte a été atteint.';
-$wb['no_zone_perm'] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement dans cette zone DNS.';
+$wb['limit_dns_record_txt'] = 'Le nombre maximum d’enregistrements DNS pour votre compte a été atteint.';
+$wb['no_zone_perm'] = 'Vous n’avez pas la permission d’ajouter un enregistrement dans cette zone DNS.';
 $wb['name_error_empty'] = 'Le nom est vide.';
 $wb['name_error_regex'] = 'Le format du nom est invalide.';
-$wb['data_error_empty'] = 'Le nom d\'hôte canonique est vide';
-$wb['data_error_regex'] = 'Le format du nom d\'hôte canonique est invalide';
+$wb['data_error_empty'] = 'Le nom d’hôte canonique est vide';
+$wb['data_error_regex'] = 'Le format du nom d’hôte canonique est invalide';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_rp.lng b/interface/web/dns/lib/lang/fr_dns_rp.lng
index 7abb4eb0f8..9b9dbbd6f1 100644
--- a/interface/web/dns/lib/lang/fr_dns_rp.lng
+++ b/interface/web/dns/lib/lang/fr_dns_rp.lng
@@ -1,15 +1,15 @@
 <?php
 $wb['server_id_txt'] = 'Serveur';
 $wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Nom d\'hôte';
+$wb['name_txt'] = 'Nom d’hôte';
 $wb['type_txt'] = 'type';
 $wb['data_txt'] = 'Personne responsable';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Actif';
-$wb['limit_dns_record_txt'] = 'Le nombre maximum d\'enregistrements DNS pour votre compte a été atteint.';
-$wb['no_zone_perm'] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement dans cette zone DNS.';
-$wb['name_error_empty'] = 'Le nom d\'hôte est vide.';
-$wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.';
+$wb['limit_dns_record_txt'] = 'Le nombre maximum d’enregistrements DNS pour votre compte a été atteint.';
+$wb['no_zone_perm'] = 'Vous n’avez pas la permission d’ajouter un enregistrement dans cette zone DNS.';
+$wb['name_error_empty'] = 'Le nom d’hôte est vide.';
+$wb['name_error_regex'] = 'Le format du nom d’hôte est invalide.';
 $wb['data_error_empty'] = 'Le champ de la personne responsable est vide.';
 $wb['data_error_regex'] = 'Le format du champ de la personne responsable est invalide.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
diff --git a/interface/web/dns/lib/lang/fr_dns_slave.lng b/interface/web/dns/lib/lang/fr_dns_slave.lng
index 887cc7dcd4..c3795322b7 100644
--- a/interface/web/dns/lib/lang/fr_dns_slave.lng
+++ b/interface/web/dns/lib/lang/fr_dns_slave.lng
@@ -10,7 +10,7 @@ $wb['server_id_error_empty'] = 'Aucun serveur sélectionné';
 $wb['origin_error_empty'] = 'Zone vide.';
 $wb['origin_error_unique'] = 'Il y a déjà un enregistrement pour cette zone.';
 $wb['origin_error_regex'] = 'Le format de la zone est invalide.';
-$wb['ns_error_regex'] = 'Le format de l\'enregistrement NS est invalide.';
+$wb['ns_error_regex'] = 'Le format de l’enregistrement NS est invalide.';
 $wb['eg_domain_tld'] = 'ex. domain.tld.';
 $wb['ipv4_form_txt'] = 'Format IPv4 - ex. 1.2.3.4';
 $wb['secondary_zone_txt'] = 'Zone DNS secondaire';
diff --git a/interface/web/dns/lib/lang/fr_dns_soa.lng b/interface/web/dns/lib/lang/fr_dns_soa.lng
index a3410ae132..b7e302704d 100644
--- a/interface/web/dns/lib/lang/fr_dns_soa.lng
+++ b/interface/web/dns/lib/lang/fr_dns_soa.lng
@@ -2,7 +2,7 @@
 $wb['server_id_txt'] = 'Serveur';
 $wb['origin_txt'] = 'Zone (SOA)';
 $wb['ns_txt'] = 'NS';
-$wb['mbox_txt'] = 'Email';
+$wb['mbox_txt'] = 'E-mail';
 $wb['serial_txt'] = 'Serial';
 $wb['refresh_txt'] = 'Refresh';
 $wb['retry_txt'] = 'Retry';
@@ -13,27 +13,31 @@ $wb['xfer_txt'] = 'Autoriser les transfers de zones vers <br />ces IP (liste sé
 $wb['active_txt'] = 'Actif';
 $wb['limit_dns_zone_txt'] = 'Le nombre maximal de zones DNS pour votre compte est atteint.';
 $wb['client_txt'] = 'Client';
-$wb['no_zone_perm'] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement dans cette zone DNS.';
+$wb['no_zone_perm'] = 'Vous n’avez pas la permission d’ajouter un enregistrement dans cette zone DNS.';
 $wb['server_id_error_empty'] = 'Aucun serveur sélectionné';
 $wb['origin_error_empty'] = 'Zone vide.';
 $wb['origin_error_unique'] = 'Il y a déja un enregistrement pour cette zone.';
 $wb['origin_error_regex'] = 'Le format de la zone est invalide.';
 $wb['ns_error_regex'] = 'Le format du champ NS est invalide.';
-$wb['mbox_error_empty'] = 'L\'adresse email est vide.';
-$wb['mbox_error_regex'] = 'L\'adresse email est dun format invalide.';
+$wb['mbox_error_empty'] = 'L’adresse e-mail est vide.';
+$wb['mbox_error_regex'] = 'L’adresse e-mail est dun format invalide.';
 $wb['also_notify_txt'] = 'Notifier aussi';
 $wb['also_notify_error_regex'] = 'Veuillez utiliser une adresse IP.';
-$wb['update_acl_txt'] = 'Mettre à jour l\'ACL';
+$wb['update_acl_txt'] = 'Mettre à jour l’ACL';
 $wb['seconds_txt'] = 'Secondes';
 $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['error_not_allowed_server_id'] = 'Le serveur choisi n\'est pas autorisé pour ce compte.';
 $wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'Le domaine ne peut pas être modifié. Veuillez contacter votre administrateur si vous souhaitez modifier le nom de domaine.';
 $wb['refresh_range_error'] = 'Le temps de refresh minimum est 60 secondes.';
 $wb['retry_range_error'] = 'Le temps de retry minimum est 60 secondes.';
 $wb['expire_range_error'] = 'Le temps de expire minimum est 60 secondes.';
 $wb['minimum_range_error'] = 'Le temps Minimum minimum est 60 secondes.';
 $wb['ttl_range_error'] = 'La TTL minimum est 60 secondes.';
-$wb['xfer_error_regex'] = 'A noter également : Veuillez utiliser une adresse IP.';
+$wb['xfer_error_regex'] = 'A noter également : Veuillez utiliser une adresse IP.';
+$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
+$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
+$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_soa_admin_list.lng b/interface/web/dns/lib/lang/fr_dns_soa_admin_list.lng
index 183d1a8349..e4d52ffee5 100644
--- a/interface/web/dns/lib/lang/fr_dns_soa_admin_list.lng
+++ b/interface/web/dns/lib/lang/fr_dns_soa_admin_list.lng
@@ -4,7 +4,7 @@ $wb['active_txt'] = 'Active';
 $wb['server_id_txt'] = 'Server';
 $wb['origin_txt'] = 'Zone';
 $wb['ns_txt'] = 'NS';
-$wb['mbox_txt'] = 'Email';
+$wb['mbox_txt'] = 'E-mail';
 $wb['add_new_record_wizard_txt'] = 'Add new DNS Zone with Wizard';
 $wb['add_new_record_txt'] = 'Add new DNS Zone manually';
 $wb['sys_groupid_txt'] = 'Client';
diff --git a/interface/web/dns/lib/lang/fr_dns_soa_list.lng b/interface/web/dns/lib/lang/fr_dns_soa_list.lng
index 0abb4c042b..a396fe8ff2 100644
--- a/interface/web/dns/lib/lang/fr_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/fr_dns_soa_list.lng
@@ -4,7 +4,8 @@ $wb['active_txt'] = 'Actif';
 $wb['server_id_txt'] = 'Serveur';
 $wb['origin_txt'] = 'Zone';
 $wb['ns_txt'] = 'NS';
-$wb['mbox_txt'] = 'Email';
-$wb['add_new_record_wizard_txt'] = 'Ajouter une nouvelle zone DNS en utilisant l\'assistant';
+$wb['mbox_txt'] = 'E-mail';
+$wb['add_new_record_wizard_txt'] = 'Ajouter une nouvelle zone DNS en utilisant l’assistant';
 $wb['add_new_record_txt'] = 'Ajouter manuellement une nouvelle zone DNS';
+$wb['import_zone_file_txt'] = 'Import Zone File';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_spf.lng b/interface/web/dns/lib/lang/fr_dns_spf.lng
index 8a1a611c21..df8d1fe145 100644
--- a/interface/web/dns/lib/lang/fr_dns_spf.lng
+++ b/interface/web/dns/lib/lang/fr_dns_spf.lng
@@ -16,10 +16,10 @@ $wb['spf_invalid_hostname_txt'] = 'Invalid hostname';
 $wb['spf_domain_txt'] = 'Any domains that may deliver or relay mail for this domain';
 $wb['spf_domain_note_txt'] = '(Sepearate domains with whitespaces)';
 $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["record_exists_txt"] = 'DNS-Record already exists';
-$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['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_srv.lng b/interface/web/dns/lib/lang/fr_dns_srv.lng
index 55f2484d71..e847176909 100644
--- a/interface/web/dns/lib/lang/fr_dns_srv.lng
+++ b/interface/web/dns/lib/lang/fr_dns_srv.lng
@@ -1,7 +1,7 @@
 <?php
 $wb['server_id_txt'] = 'Serveur';
 $wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Nom d\'hôte';
+$wb['name_txt'] = 'Nom d’hôte';
 $wb['type_txt'] = 'type';
 $wb['target_txt'] = 'Cible';
 $wb['weight_txt'] = 'Poids';
@@ -9,12 +9,12 @@ $wb['port_txt'] = 'Port';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Actif';
 $wb['aux_txt'] = 'Priorité';
-$wb['limit_dns_record_txt'] = 'Le nombre maximum d\'enregistrements DNS pour votre compte a été atteint.';
-$wb['no_zone_perm'] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement dans cette zone DNS.';
-$wb['name_error_empty'] = 'Le nom d\'hôte est vide.';
-$wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.';
-$wb['data_error_empty'] = 'L\'enregistrement serveur est vide';
-$wb['data_error_regex'] = 'Le format de l\'enregistrement serveur est invalide';
-$wb['srv_error_regex'] = 'Le format d\'enregistrement serveur invalide. L\'enregistrement serveur doit contenir 3 chaînes de caractères séparées par des espaces.';
+$wb['limit_dns_record_txt'] = 'Le nombre maximum d’enregistrements DNS pour votre compte a été atteint.';
+$wb['no_zone_perm'] = 'Vous n’avez pas la permission d’ajouter un enregistrement dans cette zone DNS.';
+$wb['name_error_empty'] = 'Le nom d’hôte est vide.';
+$wb['name_error_regex'] = 'Le format du nom d’hôte est invalide.';
+$wb['data_error_empty'] = 'L’enregistrement serveur est vide';
+$wb['data_error_regex'] = 'Le format de l’enregistrement serveur est invalide';
+$wb['srv_error_regex'] = 'Le format d’enregistrement serveur invalide. L’enregistrement serveur doit contenir 3 chaînes de caractères séparées par des espaces.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/fr_dns_template_list.lng b/interface/web/dns/lib/lang/fr_dns_template_list.lng
index 7f28cad4a6..fdcaf009b4 100644
--- a/interface/web/dns/lib/lang/fr_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/fr_dns_template_list.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['list_head_txt'] = 'Modèle de l\'assistant DNS';
+$wb['list_head_txt'] = 'Modèle de l’assistant DNS';
 $wb['visible_txt'] = 'Visible';
 $wb['name_txt'] = 'Nom';
 $wb['add_new_record_txt'] = 'Ajouter un nouvel enregistrement';
diff --git a/interface/web/dns/lib/lang/fr_dns_tlsa.lng b/interface/web/dns/lib/lang/fr_dns_tlsa.lng
new file mode 100644
index 0000000000..3b87e2ad59
--- /dev/null
+++ b/interface/web/dns/lib/lang/fr_dns_tlsa.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Service-Descriptor';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'TLSA-Data';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$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.';
+$wb['name_error_regex'] = 'The hostname has the wrong format. Correct: _&lt;port&gt;._(tcp|udp).&lt;hostname&gt;';
+$wb['data_error_empty'] = 'TLSA-Data empty';
+$wb['data_error_regex'] = 'TLSA dataformat is wrong. Correct: n n n HASH';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
diff --git a/interface/web/dns/lib/lang/fr_dns_txt.lng b/interface/web/dns/lib/lang/fr_dns_txt.lng
index 333dd30d94..cb1c89a9b2 100644
--- a/interface/web/dns/lib/lang/fr_dns_txt.lng
+++ b/interface/web/dns/lib/lang/fr_dns_txt.lng
@@ -1,15 +1,15 @@
 <?php
 $wb['server_id_txt'] = 'Serveur';
 $wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Nom d\'hôte';
+$wb['name_txt'] = 'Nom d’hôte';
 $wb['type_txt'] = 'type';
 $wb['data_txt'] = 'Texte';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Actif';
-$wb['limit_dns_record_txt'] = 'Le nombre maximum d\'enregistrements DNS pour votre compte a été atteint.';
-$wb['no_zone_perm'] = 'Vous n\'avez pas la permissions d\'ajouter un enregistrement dans cette zone DNS.';
-$wb['name_error_empty'] = 'Le nom d\'hôte est vide.';
-$wb['name_error_regex'] = 'Le format du nom d\'hôte est invalide.';
+$wb['limit_dns_record_txt'] = 'Le nombre maximum d’enregistrements DNS pour votre compte a été atteint.';
+$wb['no_zone_perm'] = 'Vous n’avez pas la permissions d’ajouter un enregistrement dans cette zone DNS.';
+$wb['name_error_empty'] = 'Le nom d’hôte est vide.';
+$wb['name_error_regex'] = 'Le format du nom d’hôte est invalide.';
 $wb['data_error_empty'] = 'Le texte est vide';
 $wb['data_error_regex'] = 'Le format du texte est invalide';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
diff --git a/interface/web/dns/lib/lang/fr_dns_wizard.lng b/interface/web/dns/lib/lang/fr_dns_wizard.lng
index 5ab5f5fa29..a510b76119 100644
--- a/interface/web/dns/lib/lang/fr_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/fr_dns_wizard.lng
@@ -1,46 +1,43 @@
 <?php
-$wb['template_id_txt'] = 'Modè';
+$wb['template_id_txt'] = 'Modèle';
 $wb['server_id_txt'] = 'Serveur';
 $wb['client_txt'] = 'Client';
-$wb['btn_save_txt'] = 'Cré l\'enregistrement DNS';
+$wb['btn_save_txt'] = 'Créer l’enregistrement DNS';
 $wb['btn_cancel_txt'] = 'Annuler';
 $wb['domain_txt'] = 'Domaine';
-$wb['email_txt'] = 'Email';
-$wb['dkim_txt'] = 'DKIM activé';
+$wb['email_txt'] = 'E-mail';
 $wb['ns1_txt'] = 'NS 1';
 $wb['ns2_txt'] = 'NS 2';
 $wb['ip_txt'] = 'Adresse IP';
-$wb['ipv6_txt'] = 'Adresse IPv6';
 $wb['error_origin_empty'] = 'Origine vide.';
 $wb['error_ns_empty'] = 'NS vide.';
 $wb['error_mbox_empty'] = 'Mbox vide.';
-$wb['error_refresh_empty'] = 'Rafraichissement vide.';
-$wb['error_retry_empty'] = 'Re-essayer vide.';
-$wb['error_expire_empty'] = 'Expiration vide.';
+$wb['error_refresh_empty'] = 'Refresh vide.';
+$wb['error_retry_empty'] = 'Retry vide.';
+$wb['error_expire_empty'] = 'Expire vide.';
 $wb['error_minimum_empty'] = 'Minimum vide.';
 $wb['error_ttl_empty'] = 'TTL vide.';
 $wb['error_domain_empty'] = 'Domaine vide';
 $wb['error_ip_empty'] = 'IP vide.';
-$wb['error_ipv6_empty'] = 'IPv6 vide.';
 $wb['error_ns1_empty'] = 'NS1 vide.';
 $wb['error_ns2_empty'] = 'NS2 vide.';
 $wb['error_email_empty'] = 'Email vide.';
-$wb['error_domain_regex'] = 'Le domaine contient des caractès invalides.';
-$wb['error_ns1_regex'] = 'NS1 contient des caractès invalides.';
-$wb['error_ns2_regex'] = 'NS2 contient des caractès invalides.';
-$wb['error_email_regex'] = 'L\'email ne contient pas une adresse email valide.';
+$wb['error_domain_regex'] = 'Le domaine contient des caractères invalides.';
+$wb['error_ns1_regex'] = 'NS1 contient des caractères invalides.';
+$wb['error_ns2_regex'] = 'NS2 contient des caractères invalides.';
+$wb['error_email_regex'] = 'L’email ne contient pas une adresse e-mail valide.';
 $wb['dns_zone_txt'] = 'Zone DNS';
 $wb['globalsearch_resultslimit_of_txt'] = 'de';
 $wb['globalsearch_resultslimit_results_txt'] = 'resultats';
-$wb['globalsearch_noresults_text_txt'] = 'Pas de réltat.';
+$wb['globalsearch_noresults_text_txt'] = 'Pas de résultat.';
 $wb['globalsearch_noresults_limit_txt'] = '0 resultat';
 $wb['globalsearch_searchfield_watermark_txt'] = 'Chercher';
 $wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
 $wb['list_head_txt'] = 'Assistant Zone DNS';
-$wb['list_desc_txt'] = 'Cré une Zone DNS via l\'assistant';
-$wb['error_no_server_id'] = 'Aucun serveur fourni.';
-$wb['error_not_allowed_server_id'] = 'Le serveur choisi n\'est pas autoriséour ce compte.';
-$wb['list_head_txt'] = 'Assistant Zone DNS';
-$wb['list_desc_txt'] = 'Cré une Zone DNS via l\'assistant';
+$wb['list_desc_txt'] = 'Créer une Zone DNS via l’assistant';
+$wb['dkim_txt'] = 'DKIM enabled';
+$wb['ipv6_txt'] = 'IPv6 Address';
+$wb['error_ipv6_empty'] = 'IPv6 empty.';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
-
diff --git a/interface/web/dns/lib/lang/hr.lng b/interface/web/dns/lib/lang/hr.lng
index 1fba79c89f..1495b3e6d3 100644
--- a/interface/web/dns/lib/lang/hr.lng
+++ b/interface/web/dns/lib/lang/hr.lng
@@ -20,5 +20,3 @@ $wb['Templates'] = 'Predlošci';
 $wb['Secondary Zones'] = 'Sekundarne zone';
 $wb['Import Zone File'] = 'Importiraj zonsku datoteku';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/hr_dns_a.lng b/interface/web/dns/lib/lang/hr_dns_a.lng
index 82c1f6c61e..a6be0b89fc 100644
--- a/interface/web/dns/lib/lang/hr_dns_a.lng
+++ b/interface/web/dns/lib/lang/hr_dns_a.lng
@@ -15,5 +15,3 @@ $wb['ip_error_wrong'] = 'Neispravan format A zapisa';
 $wb['data_error_duplicate'] = 'Već postoji ovaj A ili CNAME zapis';
 $wb['ttl_range_error'] = 'Minimalno TTL vrijeme je 60 sekundi.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/hr_dns_a_list.lng b/interface/web/dns/lib/lang/hr_dns_a_list.lng
index 0a1099ef03..8fff6885de 100644
--- a/interface/web/dns/lib/lang/hr_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/hr_dns_a_list.lng
@@ -13,5 +13,3 @@ $wb['page_txt'] = 'Stranica';
 $wb['page_of_txt'] = 'od';
 $wb['delete_confirmation'] = 'Sigurno želite obrisati ovaj zapis?';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/hr_dns_aaaa.lng b/interface/web/dns/lib/lang/hr_dns_aaaa.lng
index ce9bfeea31..d8a3419309 100644
--- a/interface/web/dns/lib/lang/hr_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/hr_dns_aaaa.lng
@@ -14,5 +14,3 @@ $wb['data_error_empty'] = 'Polje IPv6 adresa je prazno';
 $wb['ip_error_wrong'] = 'Neispravan format IPv6 adrese';
 $wb['ttl_range_error'] = 'Minimalno TTL vrijeme je 60 sekundi.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/hr_dns_alias.lng b/interface/web/dns/lib/lang/hr_dns_alias.lng
index 088ce4a994..90bdb35d66 100644
--- a/interface/web/dns/lib/lang/hr_dns_alias.lng
+++ b/interface/web/dns/lib/lang/hr_dns_alias.lng
@@ -14,5 +14,3 @@ $wb['data_error_empty'] = 'Polje odredišni host je prazno';
 $wb['data_error_regex'] = 'Neispravan format odredišnog hosta';
 $wb['ttl_range_error'] = 'Minimalno TTL vrijeme je 60 sekundi.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/hr_dns_cname.lng b/interface/web/dns/lib/lang/hr_dns_cname.lng
index 6c281d6c60..cb1f5ece00 100644
--- a/interface/web/dns/lib/lang/hr_dns_cname.lng
+++ b/interface/web/dns/lib/lang/hr_dns_cname.lng
@@ -15,5 +15,3 @@ $wb['data_error_regex'] = 'Neispravan format odredišnog host zapisa';
 $wb['data_error_duplicate'] = 'Duplicirani A zapis ili CNAME zapis';
 $wb['ttl_range_error'] = 'Minimalno TTL vrijeme je 60 sekundi.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/hr_dns_dmarc.lng b/interface/web/dns/lib/lang/hr_dns_dmarc.lng
index b00949bc98..cf78bb8eed 100644
--- a/interface/web/dns/lib/lang/hr_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/hr_dns_dmarc.lng
@@ -11,16 +11,16 @@ $wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages
 $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address';
 $wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).';
 $wb['dmarc_fo_txt'] = 'Forensic reporting options';
-$wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result.";
+$wb['dmarc_fo0_txt'] = 'Generate reports if all underlying authentication mechanisms fail to produce a DMARC \'pass\' result.';
 $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.';
 $wb['dmarc_fod_txt'] = 'Generate report if DKIM signature failed to verify.';
 $wb['dmarc_fos_txt'] = 'Generate report if SPF failed.';
 $wb['dmarc_adkim_txt'] = 'DKIM identifier alignment';
-$wb['dmarc_adkim_note_txt'] = "'strict' requires exact matching between DKIM domain and email's from";
+$wb['dmarc_adkim_note_txt'] = '\'strict\' requires exact matching between DKIM domain and email\'s from';
 $wb['dmarc_adkim_r_txt'] = 'relaxed';
 $wb['dmarc_adkim_s_txt'] = 'strict';
 $wb['dmarc_aspf_txt'] = 'SPF identifier alignment';
-$wb['dmarc_aspf_note_txt'] = "'strict' requires exact matching between SPF domain and email's from";
+$wb['dmarc_aspf_note_txt'] = '\'strict\' requires exact matching between SPF domain and email\'s from';
 $wb['dmarc_aspf_r_txt'] = 'relaxed';
 $wb['dmarc_aspf_s_txt'] = 'strict';
 $wb['dmarc_rf_txt'] = 'Report Format';
@@ -37,7 +37,7 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine';
 $wb['dmarc_sp_reject_txt'] = 'reject';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
-$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails.";
+$wb['dmarc_policy_error_txt'] = 'Only policy \'none\' is allowed without DKIM-signed emails.';
 $wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.';
 $wb['dmarc_no_spf_txt'] = 'No active SPF Record.';
 $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record';
diff --git a/interface/web/dns/lib/lang/hr_dns_ds.lng b/interface/web/dns/lib/lang/hr_dns_ds.lng
new file mode 100644
index 0000000000..c3622dc5b5
--- /dev/null
+++ b/interface/web/dns/lib/lang/hr_dns_ds.lng
@@ -0,0 +1,17 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Data';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$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.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'Text empty';
+$wb['data_error_regex'] = 'Text format invalid';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['invalid_type_ds'] = 'DS-Record has a wrong format.';
+?>
diff --git a/interface/web/dns/lib/lang/hr_dns_hinfo.lng b/interface/web/dns/lib/lang/hr_dns_hinfo.lng
index 6c212b1683..c8816c41ea 100644
--- a/interface/web/dns/lib/lang/hr_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/hr_dns_hinfo.lng
@@ -14,5 +14,3 @@ $wb['data_error_empty'] = 'Nedostaju informacije o hostu';
 $wb['data_error_regex'] = 'Informacije o hostu su u neispravanom formatu';
 $wb['ttl_range_error'] = 'Minimalno TTL vrijeme je 60 sekundi.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/hr_dns_import.lng b/interface/web/dns/lib/lang/hr_dns_import.lng
index 711132cbc8..09c178e5bb 100644
--- a/interface/web/dns/lib/lang/hr_dns_import.lng
+++ b/interface/web/dns/lib/lang/hr_dns_import.lng
@@ -11,6 +11,6 @@ $wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filen
 $wb['title'] = 'Importiraj zonske datoteka';
 $wb['no_file_uploaded_error'] = 'Nije prenešena zonska datoteka';
 $wb['zone_file_import_txt'] = 'Importiraj zonsku datoteku';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/hr_dns_loc.lng b/interface/web/dns/lib/lang/hr_dns_loc.lng
new file mode 100644
index 0000000000..dc9ad9a006
--- /dev/null
+++ b/interface/web/dns/lib/lang/hr_dns_loc.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Data';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$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.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'Text empty';
+$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/hr_dns_mx.lng b/interface/web/dns/lib/lang/hr_dns_mx.lng
index b2f800e1f3..271486f557 100644
--- a/interface/web/dns/lib/lang/hr_dns_mx.lng
+++ b/interface/web/dns/lib/lang/hr_dns_mx.lng
@@ -16,5 +16,3 @@ $wb['data_error_regex'] = 'Neispravan format naziva mail host zapisa';
 $wb['duplicate_mx_record_txt'] = 'Duplicirani MX zapis.';
 $wb['ttl_range_error'] = 'Minimalno TTL vrijeme je 60 sekundi.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/hr_dns_ns.lng b/interface/web/dns/lib/lang/hr_dns_ns.lng
index c04d1a0c96..86fa032311 100644
--- a/interface/web/dns/lib/lang/hr_dns_ns.lng
+++ b/interface/web/dns/lib/lang/hr_dns_ns.lng
@@ -14,5 +14,3 @@ $wb['data_error_empty'] = 'Nameserver nije upisan';
 $wb['data_error_regex'] = 'Nameserver je u pogrešnom formatu';
 $wb['ttl_range_error'] = 'Minimalno TTL vrijeme je 60 sekundi.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/hr_dns_ptr.lng b/interface/web/dns/lib/lang/hr_dns_ptr.lng
index c6451e7f74..fd9f0db383 100644
--- a/interface/web/dns/lib/lang/hr_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/hr_dns_ptr.lng
@@ -14,5 +14,3 @@ $wb['data_error_empty'] = 'Polje Canonical naziv hosta je prazno';
 $wb['data_error_regex'] = 'Neispravan format Canonical host zapisa';
 $wb['ttl_range_error'] = 'Minimalno TTL vrijeme je 60 sekundi.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/hr_dns_rp.lng b/interface/web/dns/lib/lang/hr_dns_rp.lng
index 54ab872b8c..e48d64f5c9 100644
--- a/interface/web/dns/lib/lang/hr_dns_rp.lng
+++ b/interface/web/dns/lib/lang/hr_dns_rp.lng
@@ -14,5 +14,3 @@ $wb['data_error_empty'] = 'Polje za odgovornu osobu je prazno';
 $wb['data_error_regex'] = 'Polje za odgovornu osobu je neispravno';
 $wb['ttl_range_error'] = 'Minimalno TTL vrijeme je 60 sekundi.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/hr_dns_slave.lng b/interface/web/dns/lib/lang/hr_dns_slave.lng
index 471cbf1c5f..5bfb6b8d78 100644
--- a/interface/web/dns/lib/lang/hr_dns_slave.lng
+++ b/interface/web/dns/lib/lang/hr_dns_slave.lng
@@ -15,5 +15,3 @@ $wb['eg_domain_tld'] = 'npr. domena.tld.';
 $wb['ipv4_form_txt'] = 'IPv4 forma - npr. 1.2.3.4';
 $wb['secondary_zone_txt'] = 'Sekundarne DNS zone';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/hr_dns_slave_admin_list.lng b/interface/web/dns/lib/lang/hr_dns_slave_admin_list.lng
index 219b9ede2c..a5759f0066 100644
--- a/interface/web/dns/lib/lang/hr_dns_slave_admin_list.lng
+++ b/interface/web/dns/lib/lang/hr_dns_slave_admin_list.lng
@@ -8,5 +8,3 @@ $wb['add_new_record_txt'] = 'Dodaj sekundarnu DNS zonu';
 $wb['eg_domain_tld'] = 'npr. domena.tld.';
 $wb['sys_groupid_txt'] = 'Klijent';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/hr_dns_slave_list.lng b/interface/web/dns/lib/lang/hr_dns_slave_list.lng
index ced26358a9..02fafc529d 100644
--- a/interface/web/dns/lib/lang/hr_dns_slave_list.lng
+++ b/interface/web/dns/lib/lang/hr_dns_slave_list.lng
@@ -7,5 +7,3 @@ $wb['ns_txt'] = 'NS';
 $wb['add_new_record_txt'] = 'Dodaj sekundarnu DNS zonu';
 $wb['eg_domain_tld'] = 'npr. domena.tld.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/hr_dns_soa.lng b/interface/web/dns/lib/lang/hr_dns_soa.lng
index 4d9afde0a7..9c9e060bed 100644
--- a/interface/web/dns/lib/lang/hr_dns_soa.lng
+++ b/interface/web/dns/lib/lang/hr_dns_soa.lng
@@ -35,6 +35,9 @@ $wb['expire_range_error'] = 'Minimalno vrijeme isteka je 60 sekundi.';
 $wb['minimum_range_error'] = 'Minimalno vrijeme minimuma je 60 sekundi.';
 $wb['ttl_range_error'] = 'Minimalno TTL vrijeme je 60 sekundi.';
 $wb['xfer_error_regex'] = 'Također obavijesti: Koristite IP adresu.';
+$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
+$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
+$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/hr_dns_soa_admin_list.lng b/interface/web/dns/lib/lang/hr_dns_soa_admin_list.lng
index 9b24cafbe4..1dc2853bcf 100644
--- a/interface/web/dns/lib/lang/hr_dns_soa_admin_list.lng
+++ b/interface/web/dns/lib/lang/hr_dns_soa_admin_list.lng
@@ -9,5 +9,3 @@ $wb['add_new_record_wizard_txt'] = 'Dodaj novu DNS zonu sa čarobnjakom';
 $wb['add_new_record_txt'] = 'Dodaj novu DNS zonu ručno';
 $wb['sys_groupid_txt'] = 'Klijent';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/hr_dns_soa_list.lng b/interface/web/dns/lib/lang/hr_dns_soa_list.lng
index 25539b8295..725a906f0a 100644
--- a/interface/web/dns/lib/lang/hr_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/hr_dns_soa_list.lng
@@ -7,6 +7,5 @@ $wb['ns_txt'] = 'NS';
 $wb['mbox_txt'] = 'Email';
 $wb['add_new_record_wizard_txt'] = 'Dodaj novu DNS zonu sa čarobnjakom';
 $wb['add_new_record_txt'] = 'Dodaj novu DNS zonu ručno';
+$wb['import_zone_file_txt'] = 'Import Zone File';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/hr_dns_spf.lng b/interface/web/dns/lib/lang/hr_dns_spf.lng
index 8a1a611c21..df8d1fe145 100644
--- a/interface/web/dns/lib/lang/hr_dns_spf.lng
+++ b/interface/web/dns/lib/lang/hr_dns_spf.lng
@@ -16,10 +16,10 @@ $wb['spf_invalid_hostname_txt'] = 'Invalid hostname';
 $wb['spf_domain_txt'] = 'Any domains that may deliver or relay mail for this domain';
 $wb['spf_domain_note_txt'] = '(Sepearate domains with whitespaces)';
 $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["record_exists_txt"] = 'DNS-Record already exists';
-$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['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/hr_dns_srv.lng b/interface/web/dns/lib/lang/hr_dns_srv.lng
index b6213d7f67..ae684ceae1 100644
--- a/interface/web/dns/lib/lang/hr_dns_srv.lng
+++ b/interface/web/dns/lib/lang/hr_dns_srv.lng
@@ -18,5 +18,3 @@ $wb['data_error_regex'] = 'Neispravan format serverskog zapisa';
 $wb['srv_error_regex'] = 'Neispravan format serverskog zapisa. Mora sadržavati barem 3 tekstualne riječi odvojene razmakom.';
 $wb['ttl_range_error'] = 'Minimalno TTL vrijeme je 60 sekundi.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/hr_dns_template.lng b/interface/web/dns/lib/lang/hr_dns_template.lng
index aa880f670e..100c5c8239 100644
--- a/interface/web/dns/lib/lang/hr_dns_template.lng
+++ b/interface/web/dns/lib/lang/hr_dns_template.lng
@@ -4,5 +4,3 @@ $wb['fields_txt'] = 'Polja';
 $wb['template_txt'] = 'Predložak';
 $wb['visible_txt'] = 'Vidljivo';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/hr_dns_template_list.lng b/interface/web/dns/lib/lang/hr_dns_template_list.lng
index 2585238ed5..23cb912b0b 100644
--- a/interface/web/dns/lib/lang/hr_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/hr_dns_template_list.lng
@@ -4,5 +4,3 @@ $wb['visible_txt'] = 'Vidljivo';
 $wb['name_txt'] = 'Naziv';
 $wb['add_new_record_txt'] = 'Dodaj novi';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/hr_dns_tlsa.lng b/interface/web/dns/lib/lang/hr_dns_tlsa.lng
new file mode 100644
index 0000000000..3b87e2ad59
--- /dev/null
+++ b/interface/web/dns/lib/lang/hr_dns_tlsa.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Service-Descriptor';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'TLSA-Data';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$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.';
+$wb['name_error_regex'] = 'The hostname has the wrong format. Correct: _&lt;port&gt;._(tcp|udp).&lt;hostname&gt;';
+$wb['data_error_empty'] = 'TLSA-Data empty';
+$wb['data_error_regex'] = 'TLSA dataformat is wrong. Correct: n n n HASH';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
diff --git a/interface/web/dns/lib/lang/hr_dns_wizard.lng b/interface/web/dns/lib/lang/hr_dns_wizard.lng
index e4d5416ed9..1714690aed 100644
--- a/interface/web/dns/lib/lang/hr_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/hr_dns_wizard.lng
@@ -38,6 +38,6 @@ $wb['globalsearch_searchfield_watermark_txt'] = 'Traži';
 $wb['globalsearch_suggestions_text_txt'] = 'Sugestija';
 $wb['list_head_txt'] = 'DNS čarobnjak';
 $wb['list_desc_txt'] = 'Kreiraj DNS zonu sa čarobnjakom';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
-
-
diff --git a/interface/web/dns/lib/lang/hu_dns_dmarc.lng b/interface/web/dns/lib/lang/hu_dns_dmarc.lng
index b00949bc98..cf78bb8eed 100644
--- a/interface/web/dns/lib/lang/hu_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/hu_dns_dmarc.lng
@@ -11,16 +11,16 @@ $wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages
 $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address';
 $wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).';
 $wb['dmarc_fo_txt'] = 'Forensic reporting options';
-$wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result.";
+$wb['dmarc_fo0_txt'] = 'Generate reports if all underlying authentication mechanisms fail to produce a DMARC \'pass\' result.';
 $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.';
 $wb['dmarc_fod_txt'] = 'Generate report if DKIM signature failed to verify.';
 $wb['dmarc_fos_txt'] = 'Generate report if SPF failed.';
 $wb['dmarc_adkim_txt'] = 'DKIM identifier alignment';
-$wb['dmarc_adkim_note_txt'] = "'strict' requires exact matching between DKIM domain and email's from";
+$wb['dmarc_adkim_note_txt'] = '\'strict\' requires exact matching between DKIM domain and email\'s from';
 $wb['dmarc_adkim_r_txt'] = 'relaxed';
 $wb['dmarc_adkim_s_txt'] = 'strict';
 $wb['dmarc_aspf_txt'] = 'SPF identifier alignment';
-$wb['dmarc_aspf_note_txt'] = "'strict' requires exact matching between SPF domain and email's from";
+$wb['dmarc_aspf_note_txt'] = '\'strict\' requires exact matching between SPF domain and email\'s from';
 $wb['dmarc_aspf_r_txt'] = 'relaxed';
 $wb['dmarc_aspf_s_txt'] = 'strict';
 $wb['dmarc_rf_txt'] = 'Report Format';
@@ -37,7 +37,7 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine';
 $wb['dmarc_sp_reject_txt'] = 'reject';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
-$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails.";
+$wb['dmarc_policy_error_txt'] = 'Only policy \'none\' is allowed without DKIM-signed emails.';
 $wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.';
 $wb['dmarc_no_spf_txt'] = 'No active SPF Record.';
 $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record';
diff --git a/interface/web/dns/lib/lang/hu_dns_ds.lng b/interface/web/dns/lib/lang/hu_dns_ds.lng
new file mode 100644
index 0000000000..3f9b447811
--- /dev/null
+++ b/interface/web/dns/lib/lang/hu_dns_ds.lng
@@ -0,0 +1,18 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$wb["data_error_regex"] = 'Text format invalid';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['invalid_type_ds'] = 'DS-Record has a wrong format.';
+
+?>
diff --git a/interface/web/dns/lib/lang/hu_dns_import.lng b/interface/web/dns/lib/lang/hu_dns_import.lng
index 2d1fe083ea..8f67eba14c 100644
--- a/interface/web/dns/lib/lang/hu_dns_import.lng
+++ b/interface/web/dns/lib/lang/hu_dns_import.lng
@@ -11,4 +11,6 @@ $wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filen
 $wb['title'] = 'Import Zone Files';
 $wb['no_file_uploaded_error'] = 'No zonefile uploaded';
 $wb['zone_file_import_txt'] = 'Zone File Import';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/hu_dns_loc.lng b/interface/web/dns/lib/lang/hu_dns_loc.lng
new file mode 100644
index 0000000000..a2e3322bb6
--- /dev/null
+++ b/interface/web/dns/lib/lang/hu_dns_loc.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$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/hu_dns_soa.lng b/interface/web/dns/lib/lang/hu_dns_soa.lng
index dce36f6e97..881d7622fc 100644
--- a/interface/web/dns/lib/lang/hu_dns_soa.lng
+++ b/interface/web/dns/lib/lang/hu_dns_soa.lng
@@ -35,4 +35,9 @@ $wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
 $wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 $wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
+$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
+$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
+$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
 ?>
diff --git a/interface/web/dns/lib/lang/hu_dns_soa_list.lng b/interface/web/dns/lib/lang/hu_dns_soa_list.lng
index db3c855ff9..cc879c9332 100644
--- a/interface/web/dns/lib/lang/hu_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/hu_dns_soa_list.lng
@@ -7,4 +7,5 @@ $wb['ns_txt'] = 'NS';
 $wb['mbox_txt'] = 'Email';
 $wb['add_new_record_txt'] = 'Új DNS Zóna (SOA)';
 $wb['add_new_record_wizard_txt'] = 'Új DNS Zóna hozzáadása varázslóval';
+$wb['import_zone_file_txt'] = 'Import Zone File';
 ?>
diff --git a/interface/web/dns/lib/lang/hu_dns_spf.lng b/interface/web/dns/lib/lang/hu_dns_spf.lng
index 8a1a611c21..df8d1fe145 100644
--- a/interface/web/dns/lib/lang/hu_dns_spf.lng
+++ b/interface/web/dns/lib/lang/hu_dns_spf.lng
@@ -16,10 +16,10 @@ $wb['spf_invalid_hostname_txt'] = 'Invalid hostname';
 $wb['spf_domain_txt'] = 'Any domains that may deliver or relay mail for this domain';
 $wb['spf_domain_note_txt'] = '(Sepearate domains with whitespaces)';
 $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["record_exists_txt"] = 'DNS-Record already exists';
-$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['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/hu_dns_tlsa.lng b/interface/web/dns/lib/lang/hu_dns_tlsa.lng
new file mode 100644
index 0000000000..dcfb3bfa33
--- /dev/null
+++ b/interface/web/dns/lib/lang/hu_dns_tlsa.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb['name_txt'] = 'Service-Descriptor';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'TLSA-Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format. Correct: _&lt;port&gt;._(tcp|udp).&lt;hostname&gt;';
+$wb["data_error_empty"] = 'TLSA-Data empty';
+$wb["data_error_regex"] = 'TLSA dataformat is wrong. Correct: n n n HASH';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/hu_dns_wizard.lng b/interface/web/dns/lib/lang/hu_dns_wizard.lng
index 89098341b7..f517702857 100644
--- a/interface/web/dns/lib/lang/hu_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/hu_dns_wizard.lng
@@ -38,4 +38,6 @@ $wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
 $wb['list_head_txt'] = 'DNS Zone Wizard';
 $wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
 $wb['dkim_txt'] = 'DKIM enabled';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/id_dns_dmarc.lng b/interface/web/dns/lib/lang/id_dns_dmarc.lng
index b00949bc98..cf78bb8eed 100644
--- a/interface/web/dns/lib/lang/id_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/id_dns_dmarc.lng
@@ -11,16 +11,16 @@ $wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages
 $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address';
 $wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).';
 $wb['dmarc_fo_txt'] = 'Forensic reporting options';
-$wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result.";
+$wb['dmarc_fo0_txt'] = 'Generate reports if all underlying authentication mechanisms fail to produce a DMARC \'pass\' result.';
 $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.';
 $wb['dmarc_fod_txt'] = 'Generate report if DKIM signature failed to verify.';
 $wb['dmarc_fos_txt'] = 'Generate report if SPF failed.';
 $wb['dmarc_adkim_txt'] = 'DKIM identifier alignment';
-$wb['dmarc_adkim_note_txt'] = "'strict' requires exact matching between DKIM domain and email's from";
+$wb['dmarc_adkim_note_txt'] = '\'strict\' requires exact matching between DKIM domain and email\'s from';
 $wb['dmarc_adkim_r_txt'] = 'relaxed';
 $wb['dmarc_adkim_s_txt'] = 'strict';
 $wb['dmarc_aspf_txt'] = 'SPF identifier alignment';
-$wb['dmarc_aspf_note_txt'] = "'strict' requires exact matching between SPF domain and email's from";
+$wb['dmarc_aspf_note_txt'] = '\'strict\' requires exact matching between SPF domain and email\'s from';
 $wb['dmarc_aspf_r_txt'] = 'relaxed';
 $wb['dmarc_aspf_s_txt'] = 'strict';
 $wb['dmarc_rf_txt'] = 'Report Format';
@@ -37,7 +37,7 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine';
 $wb['dmarc_sp_reject_txt'] = 'reject';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
-$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails.";
+$wb['dmarc_policy_error_txt'] = 'Only policy \'none\' is allowed without DKIM-signed emails.';
 $wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.';
 $wb['dmarc_no_spf_txt'] = 'No active SPF Record.';
 $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record';
diff --git a/interface/web/dns/lib/lang/id_dns_ds.lng b/interface/web/dns/lib/lang/id_dns_ds.lng
new file mode 100644
index 0000000000..3f9b447811
--- /dev/null
+++ b/interface/web/dns/lib/lang/id_dns_ds.lng
@@ -0,0 +1,18 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$wb["data_error_regex"] = 'Text format invalid';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['invalid_type_ds'] = 'DS-Record has a wrong format.';
+
+?>
diff --git a/interface/web/dns/lib/lang/id_dns_import.lng b/interface/web/dns/lib/lang/id_dns_import.lng
index 2d1fe083ea..8f67eba14c 100644
--- a/interface/web/dns/lib/lang/id_dns_import.lng
+++ b/interface/web/dns/lib/lang/id_dns_import.lng
@@ -11,4 +11,6 @@ $wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filen
 $wb['title'] = 'Import Zone Files';
 $wb['no_file_uploaded_error'] = 'No zonefile uploaded';
 $wb['zone_file_import_txt'] = 'Zone File Import';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/id_dns_loc.lng b/interface/web/dns/lib/lang/id_dns_loc.lng
new file mode 100644
index 0000000000..a2e3322bb6
--- /dev/null
+++ b/interface/web/dns/lib/lang/id_dns_loc.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$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/id_dns_soa.lng b/interface/web/dns/lib/lang/id_dns_soa.lng
index 544795bcb9..7efedb9e13 100644
--- a/interface/web/dns/lib/lang/id_dns_soa.lng
+++ b/interface/web/dns/lib/lang/id_dns_soa.lng
@@ -35,4 +35,9 @@ $wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
 $wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 $wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
+$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
+$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
+$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
 ?>
diff --git a/interface/web/dns/lib/lang/id_dns_soa_list.lng b/interface/web/dns/lib/lang/id_dns_soa_list.lng
index 19388c2185..bb79fbc211 100644
--- a/interface/web/dns/lib/lang/id_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/id_dns_soa_list.lng
@@ -7,4 +7,5 @@ $wb['ns_txt'] = 'NS';
 $wb['mbox_txt'] = 'Email';
 $wb['add_new_record_txt'] = 'Tambah Zona DNS Baru (SOA)';
 $wb['add_new_record_wizard_txt'] = 'Tambah Zona DNS Baru dengan Wizard';
+$wb['import_zone_file_txt'] = 'Import Zone File';
 ?>
diff --git a/interface/web/dns/lib/lang/id_dns_spf.lng b/interface/web/dns/lib/lang/id_dns_spf.lng
index 8a1a611c21..df8d1fe145 100644
--- a/interface/web/dns/lib/lang/id_dns_spf.lng
+++ b/interface/web/dns/lib/lang/id_dns_spf.lng
@@ -16,10 +16,10 @@ $wb['spf_invalid_hostname_txt'] = 'Invalid hostname';
 $wb['spf_domain_txt'] = 'Any domains that may deliver or relay mail for this domain';
 $wb['spf_domain_note_txt'] = '(Sepearate domains with whitespaces)';
 $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["record_exists_txt"] = 'DNS-Record already exists';
-$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['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/id_dns_tlsa.lng b/interface/web/dns/lib/lang/id_dns_tlsa.lng
new file mode 100644
index 0000000000..dcfb3bfa33
--- /dev/null
+++ b/interface/web/dns/lib/lang/id_dns_tlsa.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb['name_txt'] = 'Service-Descriptor';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'TLSA-Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format. Correct: _&lt;port&gt;._(tcp|udp).&lt;hostname&gt;';
+$wb["data_error_empty"] = 'TLSA-Data empty';
+$wb["data_error_regex"] = 'TLSA dataformat is wrong. Correct: n n n HASH';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/id_dns_wizard.lng b/interface/web/dns/lib/lang/id_dns_wizard.lng
index 3ad597727d..b9fc29cc71 100644
--- a/interface/web/dns/lib/lang/id_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/id_dns_wizard.lng
@@ -38,4 +38,6 @@ $wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
 $wb['list_head_txt'] = 'DNS Zone Wizard';
 $wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
 $wb['dkim_txt'] = 'DKIM enabled';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/it.lng b/interface/web/dns/lib/lang/it.lng
index d01b6b31b9..0df62b2811 100644
--- a/interface/web/dns/lib/lang/it.lng
+++ b/interface/web/dns/lib/lang/it.lng
@@ -1,6 +1,6 @@
 <?php
 $wb['DNS'] = 'DNS';
-$wb['Zones'] = 'Zones';
+$wb['Zones'] = 'Zone';
 $wb['DNS A'] = 'DNS A';
 $wb['DNS ALIAS'] = 'DNS ALIAS';
 $wb['DNS CNAME'] = 'DNS CNAME';
@@ -9,14 +9,14 @@ $wb['DNS mx'] = 'DNS mx';
 $wb['DNS ns'] = 'DNS ns';
 $wb['DNS ptr'] = 'DNS ptr';
 $wb['DNS RP'] = 'DNS RP';
-$wb['DNS Zone'] = 'DNS Zone';
+$wb['DNS Zone'] = 'Zona DNS';
 $wb['Records'] = 'Records';
 $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['Add DNS Zone'] = 'Aggiungi Zona DNS';
+$wb['Templates'] = 'Modelli';
+$wb['Secondary Zones'] = 'Zone Secondarie';
+$wb['Import Zone File'] = 'Importa file di Zona';
 ?>
diff --git a/interface/web/dns/lib/lang/it_dns_a.lng b/interface/web/dns/lib/lang/it_dns_a.lng
index 7543672a94..122560b487 100644
--- a/interface/web/dns/lib/lang/it_dns_a.lng
+++ b/interface/web/dns/lib/lang/it_dns_a.lng
@@ -5,13 +5,13 @@ $wb['name_txt'] = 'Hostname';
 $wb['type_txt'] = 'type';
 $wb['data_txt'] = 'IP-Address';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
-$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['active_txt'] = 'Attivo';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records raggiunto per il tuo account.';
 $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.';
+$wb['name_error_empty'] = 'The hostname  vuoto.';
 $wb['name_error_regex'] = 'The hostname has the wrong format.';
 $wb['data_error_empty'] = 'IP-Address empty';
-$wb['ip_error_wrong'] = 'IP-Address format invalid';
 $wb['data_error_duplicate'] = 'Duplicate A-Record';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['ip_error_wrong'] = 'IP-Address format invalid';
 ?>
diff --git a/interface/web/dns/lib/lang/it_dns_a_list.lng b/interface/web/dns/lib/lang/it_dns_a_list.lng
index 3fa1e7f8a7..4c9a3de2dd 100644
--- a/interface/web/dns/lib/lang/it_dns_a_list.lng
+++ b/interface/web/dns/lib/lang/it_dns_a_list.lng
@@ -1,15 +1,15 @@
 <?php
 $wb['list_head_txt'] = 'A-Record';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Attivo';
 $wb['server_id_txt'] = 'Server';
 $wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Name';
+$wb['name_txt'] = 'Nome';
 $wb['data_txt'] = 'Data';
-$wb['aux_txt'] = 'Priority';
+$wb['aux_txt'] = 'Priorita';
 $wb['ttl_txt'] = 'TTL';
 $wb['type_txt'] = 'Type';
-$wb['add_new_record_txt'] = 'Add new DNS A-Record';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo  DNS A-Record';
 $wb['page_txt'] = 'Page';
 $wb['page_of_txt'] = 'of';
-$wb['delete_confirmation'] = 'Do you really want to delete this record?';
+$wb['delete_confirmation'] = 'Vuoi davvero eliminare questo record?';
 ?>
diff --git a/interface/web/dns/lib/lang/it_dns_aaaa.lng b/interface/web/dns/lib/lang/it_dns_aaaa.lng
index 0b7e38ac65..2746bb887d 100644
--- a/interface/web/dns/lib/lang/it_dns_aaaa.lng
+++ b/interface/web/dns/lib/lang/it_dns_aaaa.lng
@@ -1,16 +1,16 @@
 <?php
 $wb['server_id_txt'] = 'Server';
 $wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'type';
-$wb['data_txt'] = 'IPv6-Address';
+$wb['name_txt'] = 'Nome Host';
+$wb['type_txt'] = 'tipo';
+$wb['data_txt'] = 'Indirizzo IPv6';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
-$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.';
-$wb['name_error_regex'] = 'The hostname has the wrong format.';
-$wb['data_error_empty'] = 'IP-Address empty';
+$wb['active_txt'] = 'Attivo';
+$wb['limit_dns_record_txt'] = 'Numero massimo records DNS raggiunto per il tuo account.';
+$wb['no_zone_perm'] = 'Non hai il permesso di aggiungere record a questa zona DNS.';
+$wb['name_error_empty'] = 'Nome Host vuoto.';
+$wb['name_error_regex'] = 'Formato errato per Nome Host.';
+$wb['data_error_empty'] = 'Indirizzo Ip vuoto';
+$wb['ttl_range_error'] = 'TTL time minimo 60 secondi.';
 $wb['ip_error_wrong'] = 'IP-Address format invalid';
-$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/it_dns_alias.lng b/interface/web/dns/lib/lang/it_dns_alias.lng
index bd4be9f219..fef96c9880 100644
--- a/interface/web/dns/lib/lang/it_dns_alias.lng
+++ b/interface/web/dns/lib/lang/it_dns_alias.lng
@@ -5,10 +5,10 @@ $wb['name_txt'] = 'Hostname';
 $wb['type_txt'] = 'type';
 $wb['data_txt'] = 'Target Hostname';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
-$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['active_txt'] = 'Attivo';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records raggiunto per il tuo account.';
 $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.';
+$wb['name_error_empty'] = 'The hostname  vuoto.';
 $wb['name_error_regex'] = 'The hostname has the wrong format.';
 $wb['data_error_empty'] = 'Target hostname empty';
 $wb['data_error_regex'] = 'Target hostname format invalid';
diff --git a/interface/web/dns/lib/lang/it_dns_cname.lng b/interface/web/dns/lib/lang/it_dns_cname.lng
index 5f8363aaa8..0732cbd72a 100644
--- a/interface/web/dns/lib/lang/it_dns_cname.lng
+++ b/interface/web/dns/lib/lang/it_dns_cname.lng
@@ -1,17 +1,17 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'type';
-$wb['data_txt'] = 'Target Hostname';
+$wb['zone_txt'] = 'Zona';
+$wb['name_txt'] = 'Nome Host';
+$wb['type_txt'] = 'tipo';
+$wb['data_txt'] = 'Target Nome Host';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
-$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.';
-$wb['name_error_regex'] = 'The hostname has the wrong format.';
-$wb['data_error_empty'] = 'Target hostname empty';
-$wb['data_error_regex'] = 'Target hostname format invalid';
-$wb['data_error_duplicate'] = 'Duplicate A-Record or CNAME-Record';
-$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['active_txt'] = 'Attivo';
+$wb['limit_dns_record_txt'] = 'Numero massimo di record DNS raggiunto per il tuo account.';
+$wb['no_zone_perm'] = 'Non hai il permesso di aggiungere record a questa zona DNS.';
+$wb['name_error_empty'] = 'Nome Host vuoto.';
+$wb['name_error_regex'] = 'Formato errato per Nome Host.';
+$wb['data_error_empty'] = 'Target nome host vuoto';
+$wb['data_error_regex'] = 'Target nome host formato errato';
+$wb['data_error_duplicate'] = 'A-Record o CNAME-Record duplicato';
+$wb['ttl_range_error'] = 'TTL time minimo 60 secondi.';
 ?>
diff --git a/interface/web/dns/lib/lang/it_dns_dmarc.lng b/interface/web/dns/lib/lang/it_dns_dmarc.lng
index b00949bc98..cf78bb8eed 100644
--- a/interface/web/dns/lib/lang/it_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/it_dns_dmarc.lng
@@ -11,16 +11,16 @@ $wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages
 $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address';
 $wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).';
 $wb['dmarc_fo_txt'] = 'Forensic reporting options';
-$wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result.";
+$wb['dmarc_fo0_txt'] = 'Generate reports if all underlying authentication mechanisms fail to produce a DMARC \'pass\' result.';
 $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.';
 $wb['dmarc_fod_txt'] = 'Generate report if DKIM signature failed to verify.';
 $wb['dmarc_fos_txt'] = 'Generate report if SPF failed.';
 $wb['dmarc_adkim_txt'] = 'DKIM identifier alignment';
-$wb['dmarc_adkim_note_txt'] = "'strict' requires exact matching between DKIM domain and email's from";
+$wb['dmarc_adkim_note_txt'] = '\'strict\' requires exact matching between DKIM domain and email\'s from';
 $wb['dmarc_adkim_r_txt'] = 'relaxed';
 $wb['dmarc_adkim_s_txt'] = 'strict';
 $wb['dmarc_aspf_txt'] = 'SPF identifier alignment';
-$wb['dmarc_aspf_note_txt'] = "'strict' requires exact matching between SPF domain and email's from";
+$wb['dmarc_aspf_note_txt'] = '\'strict\' requires exact matching between SPF domain and email\'s from';
 $wb['dmarc_aspf_r_txt'] = 'relaxed';
 $wb['dmarc_aspf_s_txt'] = 'strict';
 $wb['dmarc_rf_txt'] = 'Report Format';
@@ -37,7 +37,7 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine';
 $wb['dmarc_sp_reject_txt'] = 'reject';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
-$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails.";
+$wb['dmarc_policy_error_txt'] = 'Only policy \'none\' is allowed without DKIM-signed emails.';
 $wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.';
 $wb['dmarc_no_spf_txt'] = 'No active SPF Record.';
 $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record';
diff --git a/interface/web/dns/lib/lang/it_dns_ds.lng b/interface/web/dns/lib/lang/it_dns_ds.lng
new file mode 100644
index 0000000000..3f9b447811
--- /dev/null
+++ b/interface/web/dns/lib/lang/it_dns_ds.lng
@@ -0,0 +1,18 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$wb["data_error_regex"] = 'Text format invalid';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['invalid_type_ds'] = 'DS-Record has a wrong format.';
+
+?>
diff --git a/interface/web/dns/lib/lang/it_dns_hinfo.lng b/interface/web/dns/lib/lang/it_dns_hinfo.lng
index 937bd9b4ac..905b1e62e2 100644
--- a/interface/web/dns/lib/lang/it_dns_hinfo.lng
+++ b/interface/web/dns/lib/lang/it_dns_hinfo.lng
@@ -5,10 +5,10 @@ $wb['name_txt'] = 'Hostname';
 $wb['type_txt'] = 'type';
 $wb['data_txt'] = 'Host Information';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
-$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['active_txt'] = 'Attivo';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records raggiunto per il tuo account.';
 $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.';
+$wb['name_error_empty'] = 'The hostname  vuoto.';
 $wb['name_error_regex'] = 'The hostname has the wrong format.';
 $wb['data_error_empty'] = 'Host information empty';
 $wb['data_error_regex'] = 'Host Information format invalid';
diff --git a/interface/web/dns/lib/lang/it_dns_import.lng b/interface/web/dns/lib/lang/it_dns_import.lng
index 2d1fe083ea..4ccee92b65 100644
--- a/interface/web/dns/lib/lang/it_dns_import.lng
+++ b/interface/web/dns/lib/lang/it_dns_import.lng
@@ -1,14 +1,16 @@
 <?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['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['client_txt'] = 'Cliente';
+$wb['btn_save_txt'] = 'Importa file di zona';
+$wb['btn_cancel_txt'] = 'Annulla';
+$wb['domain_txt'] = 'Dominio';
+$wb['zone_file_successfully_imported_txt'] = 'File di zona importato con successo!';
+$wb['error_no_valid_zone_file_txt'] = 'Fil di zona non corretto!';
+$wb['zonefile_to_import_txt'] = 'File di Zona';
+$wb['domain_field_desc_txt'] = 'Può essere tralasciato se il dominio è nel nome del file di zona o nel contenuto del file.';
+$wb['title'] = 'Importa file di zona';
+$wb['no_file_uploaded_error'] = 'Nessun file di zona selezionato';
+$wb['zone_file_import_txt'] = 'Importa file di zona';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/it_dns_loc.lng b/interface/web/dns/lib/lang/it_dns_loc.lng
new file mode 100644
index 0000000000..a2e3322bb6
--- /dev/null
+++ b/interface/web/dns/lib/lang/it_dns_loc.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$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/it_dns_mx.lng b/interface/web/dns/lib/lang/it_dns_mx.lng
index e95fa84f6b..d01ec250e1 100644
--- a/interface/web/dns/lib/lang/it_dns_mx.lng
+++ b/interface/web/dns/lib/lang/it_dns_mx.lng
@@ -4,12 +4,12 @@ $wb['zone_txt'] = 'Zone';
 $wb['name_txt'] = 'Hostname';
 $wb['type_txt'] = 'type';
 $wb['data_txt'] = 'Mailserver hostname';
-$wb['aux_txt'] = 'Priority';
+$wb['aux_txt'] = 'Priorita';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
-$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['active_txt'] = 'Attivo';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records raggiunto per il tuo account.';
 $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.';
+$wb['name_error_empty'] = 'The hostname  vuoto.';
 $wb['name_error_regex'] = 'The hostname has the wrong format.';
 $wb['data_error_empty'] = 'Mailserver hostname empty';
 $wb['data_error_regex'] = 'Mailserver hostname format invalid';
diff --git a/interface/web/dns/lib/lang/it_dns_ns.lng b/interface/web/dns/lib/lang/it_dns_ns.lng
index d0cc4b0957..4ee8be59c8 100644
--- a/interface/web/dns/lib/lang/it_dns_ns.lng
+++ b/interface/web/dns/lib/lang/it_dns_ns.lng
@@ -1,16 +1,16 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Zone';
+$wb['zone_txt'] = 'Zona';
+$wb['name_txt'] = 'Zona';
 $wb['type_txt'] = 'type';
-$wb['data_txt'] = 'Nameserver Hostname';
+$wb['data_txt'] = 'Hostname';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
-$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['active_txt'] = 'Attivo';
+$wb['limit_dns_record_txt'] = 'Numero massimo record DNS raggiunto per il tuo account.';
+$wb['no_zone_perm'] = 'Non hai i permessi per aggiungere record a questa zona DNS.';
+$wb['name_error_empty'] = 'Zona vuota.';
+$wb['name_error_regex'] = 'La zona ha un formato errato.';
+$wb['data_error_empty'] = 'Nameserver vuoto';
+$wb['data_error_regex'] = 'Formato nameserver non valido';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/it_dns_ptr.lng b/interface/web/dns/lib/lang/it_dns_ptr.lng
index 8ed2dba0c0..0da6da4366 100644
--- a/interface/web/dns/lib/lang/it_dns_ptr.lng
+++ b/interface/web/dns/lib/lang/it_dns_ptr.lng
@@ -1,14 +1,14 @@
 <?php
 $wb['server_id_txt'] = 'Server';
 $wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Name';
-$wb['type_txt'] = 'type';
+$wb['name_txt'] = 'Nome';
+$wb['type_txt'] = 'tipo';
 $wb['data_txt'] = 'Canonical Hostname';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
-$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['active_txt'] = 'Attivo';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records raggiunto per il tuo account.';
 $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_empty'] = 'The name  vuoto.';
 $wb['name_error_regex'] = 'The name has the wrong format.';
 $wb['data_error_empty'] = 'Canonical hostname empty';
 $wb['data_error_regex'] = 'Canonical hostname format invalid';
diff --git a/interface/web/dns/lib/lang/it_dns_rp.lng b/interface/web/dns/lib/lang/it_dns_rp.lng
index 2669b1bd99..691177bfe5 100644
--- a/interface/web/dns/lib/lang/it_dns_rp.lng
+++ b/interface/web/dns/lib/lang/it_dns_rp.lng
@@ -5,10 +5,10 @@ $wb['name_txt'] = 'Hostname';
 $wb['type_txt'] = 'type';
 $wb['data_txt'] = 'Responsible Person';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
-$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['active_txt'] = 'Attivo';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records raggiunto per il tuo account.';
 $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.';
+$wb['name_error_empty'] = 'The hostname  vuoto.';
 $wb['name_error_regex'] = 'The hostname has the wrong format.';
 $wb['data_error_empty'] = 'Responsible person field empty';
 $wb['data_error_regex'] = 'Responsible person field format invalid';
diff --git a/interface/web/dns/lib/lang/it_dns_slave.lng b/interface/web/dns/lib/lang/it_dns_slave.lng
index c426df7ed5..cbd6a3a418 100644
--- a/interface/web/dns/lib/lang/it_dns_slave.lng
+++ b/interface/web/dns/lib/lang/it_dns_slave.lng
@@ -2,12 +2,12 @@
 $wb['server_id_txt'] = 'Server';
 $wb['origin_txt'] = 'DNS Zone';
 $wb['ns_txt'] = 'NS';
-$wb['active_txt'] = 'Active';
-$wb['limit_dns_slave_zone_txt'] = 'The max. number of Secondary DNS zones for your account is reached.';
-$wb['client_txt'] = 'Client';
+$wb['active_txt'] = 'Attivo';
+$wb['limit_dns_slave_zone_txt'] = 'The max. number of Secondary DNS zones raggiunto per il tuo account.';
+$wb['client_txt'] = 'Cliente';
 $wb['xfer_txt'] = 'Allow zone transfers to <br />these IPs (comma separated list)';
 $wb['server_id_error_empty'] = 'No server selected';
-$wb['origin_error_empty'] = 'Zone empty.';
+$wb['origin_error_empty'] = 'Zone vuoto.';
 $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.';
diff --git a/interface/web/dns/lib/lang/it_dns_slave_admin_list.lng b/interface/web/dns/lib/lang/it_dns_slave_admin_list.lng
index 59d84877c6..726f14ffd3 100644
--- a/interface/web/dns/lib/lang/it_dns_slave_admin_list.lng
+++ b/interface/web/dns/lib/lang/it_dns_slave_admin_list.lng
@@ -1,10 +1,10 @@
 <?php
 $wb['list_head_txt'] = 'Secondary DNS-Zones';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Attivo';
 $wb['server_id_txt'] = 'Server';
 $wb['origin_txt'] = 'Zone';
 $wb['ns_txt'] = 'NS';
-$wb['add_new_record_txt'] = 'Add new Secondary DNS-Zone';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo  Secondary DNS-Zone';
 $wb['eg_domain_tld'] = 'e.g. domain.tld.';
-$wb['sys_groupid_txt'] = 'Client';
+$wb['sys_groupid_txt'] = 'Cliente';
 ?>
diff --git a/interface/web/dns/lib/lang/it_dns_slave_list.lng b/interface/web/dns/lib/lang/it_dns_slave_list.lng
index 4ced2ddb59..3ab1a1de9d 100644
--- a/interface/web/dns/lib/lang/it_dns_slave_list.lng
+++ b/interface/web/dns/lib/lang/it_dns_slave_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'DNS Secondary Zones';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'DNS Zone Secondarie';
+$wb['active_txt'] = 'Attivo';
 $wb['server_id_txt'] = 'Server';
-$wb['origin_txt'] = 'Zone';
+$wb['origin_txt'] = 'Zona';
 $wb['ns_txt'] = 'NS';
-$wb['add_new_record_txt'] = 'Add new secondary DNS Zone';
+$wb['add_new_record_txt'] = 'Aggiungi una nuova zona DNS Secondaria';
 $wb['eg_domain_tld'] = 'e.g. domain.tld.';
 ?>
diff --git a/interface/web/dns/lib/lang/it_dns_soa.lng b/interface/web/dns/lib/lang/it_dns_soa.lng
index ff761b261f..2dda695f14 100644
--- a/interface/web/dns/lib/lang/it_dns_soa.lng
+++ b/interface/web/dns/lib/lang/it_dns_soa.lng
@@ -1,38 +1,43 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['origin_txt'] = 'Zone (SOA)';
+$wb['origin_txt'] = 'Zona (SOA)';
 $wb['ns_txt'] = 'NS';
 $wb['mbox_txt'] = 'Email';
-$wb['serial_txt'] = 'Serial';
+$wb['serial_txt'] = 'Seriale';
 $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['limit_dns_zone_txt'] = 'The max. number of DNS zones for your account is reached.';
-$wb['client_txt'] = 'Client';
+$wb['xfer_txt'] = 'Consenti trasferimento zone a <br />questi IP (elenco separato da virgola)';
+$wb['active_txt'] = 'Attivo';
+$wb['limit_dns_zone_txt'] = 'Numero massimo zone DNS raggiunto per il tuo account.';
+$wb['client_txt'] = 'Cliente';
 $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['server_id_error_empty'] = 'Nessun server selezionato!';
+$wb['origin_error_empty'] = 'Zona vuoto.';
+$wb['origin_error_unique'] = 'Esiste già un record per questa zona.';
+$wb['origin_error_regex'] = 'La zona ha un formato errato.';
+$wb['ns_error_regex'] = 'NS ha un formato errato.';
+$wb['mbox_error_empty'] = 'Email  vuoto.';
+$wb['mbox_error_regex'] = 'Email formato errato.';
 $wb['also_notify_txt'] = 'Also Notify';
-$wb['update_acl_txt'] = 'Update ACL';
-$wb['also_notify_error_regex'] = 'Please use an IP address.';
-$wb['seconds_txt'] = 'Seconds';
+$wb['update_acl_txt'] = 'Aggiorna   ACL';
+$wb['also_notify_error_regex'] = 'Per favore utilizza un indirizzo IP.';
+$wb['seconds_txt'] = 'Secondi';
 $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['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.';
-$wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
-$wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
-$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
-$wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
+$wb['The Domain can not be changed. Please ask your Administrator if you want to change the domain name.'] = 'Il dominio non può essere modificato. Per cortesia contatta l';
+$wb['refresh_range_error'] = 'Min. Refresh time di 60 secondi.';
+$wb['retry_range_error'] = 'Min. Retry time di 60 secondi.';
+$wb['expire_range_error'] = 'Min. Expire time di 60 secondi.';
+$wb['minimum_range_error'] = 'Min. Minimum time di 60 secondi.';
+$wb['ttl_range_error'] = 'Min. TTL time di 60 secondi.';
+$wb['xfer_error_regex'] = 'Also notify: Per cortesia utilizzare un indirizzo IP.';
+$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
+$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
+$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
 ?>
diff --git a/interface/web/dns/lib/lang/it_dns_soa_admin_list.lng b/interface/web/dns/lib/lang/it_dns_soa_admin_list.lng
index 183d1a8349..5f0c730599 100644
--- a/interface/web/dns/lib/lang/it_dns_soa_admin_list.lng
+++ b/interface/web/dns/lib/lang/it_dns_soa_admin_list.lng
@@ -1,11 +1,11 @@
 <?php
 $wb['list_head_txt'] = 'DNS-Zones';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Attivo';
 $wb['server_id_txt'] = 'Server';
 $wb['origin_txt'] = 'Zone';
 $wb['ns_txt'] = 'NS';
 $wb['mbox_txt'] = 'Email';
-$wb['add_new_record_wizard_txt'] = 'Add new DNS Zone with Wizard';
-$wb['add_new_record_txt'] = 'Add new DNS Zone manually';
-$wb['sys_groupid_txt'] = 'Client';
+$wb['add_new_record_wizard_txt'] = 'Aggiungi un nuovo  DNS Zone with Wizard';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo  DNS Zone manually';
+$wb['sys_groupid_txt'] = 'Cliente';
 ?>
diff --git a/interface/web/dns/lib/lang/it_dns_soa_list.lng b/interface/web/dns/lib/lang/it_dns_soa_list.lng
index da7b8e28d2..0e5ea64569 100644
--- a/interface/web/dns/lib/lang/it_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/it_dns_soa_list.lng
@@ -1,10 +1,11 @@
 <?php
 $wb['list_head_txt'] = 'DNS Zones';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Attivo';
 $wb['server_id_txt'] = 'Server';
 $wb['origin_txt'] = 'Zone';
 $wb['ns_txt'] = 'NS';
 $wb['mbox_txt'] = 'Email';
-$wb['add_new_record_txt'] = 'Add new DNS Zone (SOA)';
-$wb['add_new_record_wizard_txt'] = 'Add new DNS Zone with Wizard';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo  DNS Zone (SOA)';
+$wb['add_new_record_wizard_txt'] = 'Aggiungi un nuova nuova Zona DNS con il configuratore automatico';
+$wb['import_zone_file_txt'] = 'Import Zone File';
 ?>
diff --git a/interface/web/dns/lib/lang/it_dns_spf.lng b/interface/web/dns/lib/lang/it_dns_spf.lng
index 8a1a611c21..df8d1fe145 100644
--- a/interface/web/dns/lib/lang/it_dns_spf.lng
+++ b/interface/web/dns/lib/lang/it_dns_spf.lng
@@ -16,10 +16,10 @@ $wb['spf_invalid_hostname_txt'] = 'Invalid hostname';
 $wb['spf_domain_txt'] = 'Any domains that may deliver or relay mail for this domain';
 $wb['spf_domain_note_txt'] = '(Sepearate domains with whitespaces)';
 $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["record_exists_txt"] = 'DNS-Record already exists';
-$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['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/it_dns_srv.lng b/interface/web/dns/lib/lang/it_dns_srv.lng
index 866f44dab3..6d77d66e7f 100644
--- a/interface/web/dns/lib/lang/it_dns_srv.lng
+++ b/interface/web/dns/lib/lang/it_dns_srv.lng
@@ -1,20 +1,20 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['zone_txt'] = 'Zone';
-$wb['name_txt'] = 'Hostname';
-$wb['type_txt'] = 'type';
+$wb['zone_txt'] = 'Zona';
+$wb['name_txt'] = 'Nome Host';
+$wb['type_txt'] = 'tipo';
 $wb['target_txt'] = 'Target';
 $wb['weight_txt'] = 'Weight';
 $wb['port_txt'] = 'Port';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
-$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['active_txt'] = 'Attivo';
+$wb['limit_dns_record_txt'] = 'Limite massimo record DNS raggiunto per il tuo account.';
 $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.';
-$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['name_error_empty'] = 'Nome Host  vuoto.';
+$wb['name_error_regex'] = 'Nome Host formato errato.';
 $wb['data_error_empty'] = 'Server record empty';
 $wb['data_error_regex'] = 'Server record format invalid';
 $wb['srv_error_regex'] = 'Invalid server record format. The server record must contain 3 text strings separated by spaces.';
-$wb['aux_txt'] = 'Priority';
+$wb['aux_txt'] = 'Priorita';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/it_dns_template.lng b/interface/web/dns/lib/lang/it_dns_template.lng
index 3a09e3bb71..290cf3e4b9 100644
--- a/interface/web/dns/lib/lang/it_dns_template.lng
+++ b/interface/web/dns/lib/lang/it_dns_template.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['name_txt'] = 'Name';
+$wb['name_txt'] = 'Nome';
 $wb['fields_txt'] = 'Fields';
 $wb['template_txt'] = 'Template';
 $wb['visible_txt'] = 'Visible';
diff --git a/interface/web/dns/lib/lang/it_dns_template_list.lng b/interface/web/dns/lib/lang/it_dns_template_list.lng
index 8d9d730e50..0d316c5629 100644
--- a/interface/web/dns/lib/lang/it_dns_template_list.lng
+++ b/interface/web/dns/lib/lang/it_dns_template_list.lng
@@ -1,6 +1,6 @@
 <?php
-$wb['list_head_txt'] = 'DNS Wizard Template';
-$wb['visible_txt'] = 'Visible';
-$wb['name_txt'] = 'Name';
-$wb['add_new_record_txt'] = 'Add new record';
+$wb['list_head_txt'] = 'DNS Wizard Modello';
+$wb['visible_txt'] = 'Visibile';
+$wb['name_txt'] = 'Nome';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo  record';
 ?>
diff --git a/interface/web/dns/lib/lang/it_dns_tlsa.lng b/interface/web/dns/lib/lang/it_dns_tlsa.lng
new file mode 100644
index 0000000000..dcfb3bfa33
--- /dev/null
+++ b/interface/web/dns/lib/lang/it_dns_tlsa.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb['name_txt'] = 'Service-Descriptor';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'TLSA-Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format. Correct: _&lt;port&gt;._(tcp|udp).&lt;hostname&gt;';
+$wb["data_error_empty"] = 'TLSA-Data empty';
+$wb["data_error_regex"] = 'TLSA dataformat is wrong. Correct: n n n HASH';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/it_dns_txt.lng b/interface/web/dns/lib/lang/it_dns_txt.lng
index ecbb5215cb..de49712afd 100644
--- a/interface/web/dns/lib/lang/it_dns_txt.lng
+++ b/interface/web/dns/lib/lang/it_dns_txt.lng
@@ -5,10 +5,10 @@ $wb['name_txt'] = 'Hostname';
 $wb['type_txt'] = 'type';
 $wb['data_txt'] = 'Text';
 $wb['ttl_txt'] = 'TTL';
-$wb['active_txt'] = 'Active';
-$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
+$wb['active_txt'] = 'Attivo';
+$wb['limit_dns_record_txt'] = 'The max. number of DNS records raggiunto per il tuo account.';
 $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.';
+$wb['name_error_empty'] = 'The hostname  vuoto.';
 $wb['name_error_regex'] = 'The hostname has the wrong format.';
 $wb['data_error_empty'] = 'Text empty';
 $wb['data_error_regex'] = 'Text format invalid';
diff --git a/interface/web/dns/lib/lang/it_dns_wizard.lng b/interface/web/dns/lib/lang/it_dns_wizard.lng
index 5e1df4a3a1..69595a6e02 100644
--- a/interface/web/dns/lib/lang/it_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/it_dns_wizard.lng
@@ -1,41 +1,43 @@
 <?php
-$wb['template_id_txt'] = 'Template';
+$wb['template_id_txt'] = 'Modello';
 $wb['server_id_txt'] = 'Server';
-$wb['client_txt'] = 'Client';
-$wb['btn_save_txt'] = 'Create DNS Record';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['domain_txt'] = 'Domain';
+$wb['client_txt'] = 'Cliente';
+$wb['btn_save_txt'] = 'Crea  DNS Record';
+$wb['btn_cancel_txt'] = 'Annulla';
+$wb['domain_txt'] = 'Dominio';
 $wb['email_txt'] = 'Email';
 $wb['ns1_txt'] = 'NS 1';
 $wb['ns2_txt'] = 'NS 2';
-$wb['ip_txt'] = 'IP Address';
-$wb['ipv6_txt'] = 'IPv6 Address';
-$wb['error_origin_empty'] = 'Origin empty.';
-$wb['error_ns_empty'] = 'NS empty.';
-$wb['error_mbox_empty'] = 'Mbox empty.';
-$wb['error_refresh_empty'] = 'Refresh empty.';
-$wb['error_retry_empty'] = 'Retry empty.';
-$wb['error_expire_empty'] = 'Expire empty.';
-$wb['error_minimum_empty'] = 'Minimum empty.';
-$wb['error_ttl_empty'] = 'TTL empty.';
-$wb['error_domain_empty'] = 'Domain empty';
-$wb['error_ip_empty'] = 'IP empty.';
-$wb['error_ipv6_empty'] = 'IPv6 empty.';
-$wb['error_ns1_empty'] = 'NS1 empty.';
-$wb['error_ns2_empty'] = 'NS2 empty.';
-$wb['error_email_empty'] = 'EMail empty.';
-$wb['error_domain_regex'] = 'Domain contains invalid characters.';
-$wb['error_ns1_regex'] = 'NS1 contains invalid characters.';
-$wb['error_ns2_regex'] = 'NS2 contains invalid characters.';
+$wb['ip_txt'] = 'Indirizzo IP';
+$wb['error_origin_empty'] = 'Origine vuoto.';
+$wb['error_ns_empty'] = 'NS vuoto.';
+$wb['error_mbox_empty'] = 'Casella Mail vuoto.';
+$wb['error_refresh_empty'] = 'Refresh vuoto.';
+$wb['error_retry_empty'] = 'Retry vuoto.';
+$wb['error_expire_empty'] = 'Expire vuoto.';
+$wb['error_minimum_empty'] = 'Minimum vuoto.';
+$wb['error_ttl_empty'] = 'TTL vuoto.';
+$wb['error_domain_empty'] = 'Dominio vuoto';
+$wb['error_ip_empty'] = 'IP vuoto.';
+$wb['error_ns1_empty'] = 'NS1 vuoto.';
+$wb['error_ns2_empty'] = 'NS2 vuoto.';
+$wb['error_email_empty'] = 'EMail vuoto.';
+$wb['error_domain_regex'] = 'Dominio contiene caratteri non validi.';
+$wb['error_ns1_regex'] = 'NS1 contiene caratteri non validi.';
+$wb['error_ns2_regex'] = 'NS2 contiene caratteri non validi.';
 $wb['error_email_regex'] = 'Email does not contain a valid email address.';
 $wb['dns_zone_txt'] = 'DNS Zone';
-$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['list_head_txt'] = 'DNS Zone Wizard';
-$wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
+$wb['globalsearch_resultslimit_of_txt'] = 'di';
+$wb['globalsearch_resultslimit_results_txt'] = 'risultati';
+$wb['globalsearch_noresults_text_txt'] = 'Nessun risultato.';
+$wb['globalsearch_noresults_limit_txt'] = '0 risultati';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Cerca';
+$wb['globalsearch_suggestions_text_txt'] = 'Suggerimenti';
+$wb['list_head_txt'] = 'Wizard Zone DNS';
+$wb['list_desc_txt'] = 'Crea una zona DNS con un configuratore automatico';
 $wb['dkim_txt'] = 'DKIM enabled';
+$wb['ipv6_txt'] = 'IPv6 Address';
+$wb['error_ipv6_empty'] = 'IPv6 empty.';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/ja_dns_dmarc.lng b/interface/web/dns/lib/lang/ja_dns_dmarc.lng
index b00949bc98..cf78bb8eed 100644
--- a/interface/web/dns/lib/lang/ja_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/ja_dns_dmarc.lng
@@ -11,16 +11,16 @@ $wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages
 $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address';
 $wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).';
 $wb['dmarc_fo_txt'] = 'Forensic reporting options';
-$wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result.";
+$wb['dmarc_fo0_txt'] = 'Generate reports if all underlying authentication mechanisms fail to produce a DMARC \'pass\' result.';
 $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.';
 $wb['dmarc_fod_txt'] = 'Generate report if DKIM signature failed to verify.';
 $wb['dmarc_fos_txt'] = 'Generate report if SPF failed.';
 $wb['dmarc_adkim_txt'] = 'DKIM identifier alignment';
-$wb['dmarc_adkim_note_txt'] = "'strict' requires exact matching between DKIM domain and email's from";
+$wb['dmarc_adkim_note_txt'] = '\'strict\' requires exact matching between DKIM domain and email\'s from';
 $wb['dmarc_adkim_r_txt'] = 'relaxed';
 $wb['dmarc_adkim_s_txt'] = 'strict';
 $wb['dmarc_aspf_txt'] = 'SPF identifier alignment';
-$wb['dmarc_aspf_note_txt'] = "'strict' requires exact matching between SPF domain and email's from";
+$wb['dmarc_aspf_note_txt'] = '\'strict\' requires exact matching between SPF domain and email\'s from';
 $wb['dmarc_aspf_r_txt'] = 'relaxed';
 $wb['dmarc_aspf_s_txt'] = 'strict';
 $wb['dmarc_rf_txt'] = 'Report Format';
@@ -37,7 +37,7 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine';
 $wb['dmarc_sp_reject_txt'] = 'reject';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
-$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails.";
+$wb['dmarc_policy_error_txt'] = 'Only policy \'none\' is allowed without DKIM-signed emails.';
 $wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.';
 $wb['dmarc_no_spf_txt'] = 'No active SPF Record.';
 $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record';
diff --git a/interface/web/dns/lib/lang/ja_dns_ds.lng b/interface/web/dns/lib/lang/ja_dns_ds.lng
new file mode 100644
index 0000000000..3f9b447811
--- /dev/null
+++ b/interface/web/dns/lib/lang/ja_dns_ds.lng
@@ -0,0 +1,18 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$wb["data_error_regex"] = 'Text format invalid';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['invalid_type_ds'] = 'DS-Record has a wrong format.';
+
+?>
diff --git a/interface/web/dns/lib/lang/ja_dns_import.lng b/interface/web/dns/lib/lang/ja_dns_import.lng
index 2d1fe083ea..8f67eba14c 100644
--- a/interface/web/dns/lib/lang/ja_dns_import.lng
+++ b/interface/web/dns/lib/lang/ja_dns_import.lng
@@ -11,4 +11,6 @@ $wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filen
 $wb['title'] = 'Import Zone Files';
 $wb['no_file_uploaded_error'] = 'No zonefile uploaded';
 $wb['zone_file_import_txt'] = 'Zone File Import';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/ja_dns_loc.lng b/interface/web/dns/lib/lang/ja_dns_loc.lng
new file mode 100644
index 0000000000..a2e3322bb6
--- /dev/null
+++ b/interface/web/dns/lib/lang/ja_dns_loc.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$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/ja_dns_soa.lng b/interface/web/dns/lib/lang/ja_dns_soa.lng
index 81b166b16f..07a43b2d33 100644
--- a/interface/web/dns/lib/lang/ja_dns_soa.lng
+++ b/interface/web/dns/lib/lang/ja_dns_soa.lng
@@ -35,4 +35,9 @@ $wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
 $wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 $wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
+$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
+$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
+$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
 ?>
diff --git a/interface/web/dns/lib/lang/ja_dns_soa_list.lng b/interface/web/dns/lib/lang/ja_dns_soa_list.lng
index 6a715463aa..4c9accb75f 100644
--- a/interface/web/dns/lib/lang/ja_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/ja_dns_soa_list.lng
@@ -7,4 +7,5 @@ $wb['ns_txt'] = 'NS';
 $wb['mbox_txt'] = 'メールアドレス';
 $wb['add_new_record_txt'] = 'DNSゾーン（SOA）を追加する';
 $wb['add_new_record_wizard_txt'] = 'Add new DNS Zone with Wizard';
+$wb['import_zone_file_txt'] = 'Import Zone File';
 ?>
diff --git a/interface/web/dns/lib/lang/ja_dns_spf.lng b/interface/web/dns/lib/lang/ja_dns_spf.lng
index 8a1a611c21..df8d1fe145 100644
--- a/interface/web/dns/lib/lang/ja_dns_spf.lng
+++ b/interface/web/dns/lib/lang/ja_dns_spf.lng
@@ -16,10 +16,10 @@ $wb['spf_invalid_hostname_txt'] = 'Invalid hostname';
 $wb['spf_domain_txt'] = 'Any domains that may deliver or relay mail for this domain';
 $wb['spf_domain_note_txt'] = '(Sepearate domains with whitespaces)';
 $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["record_exists_txt"] = 'DNS-Record already exists';
-$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['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/ja_dns_tlsa.lng b/interface/web/dns/lib/lang/ja_dns_tlsa.lng
new file mode 100644
index 0000000000..dcfb3bfa33
--- /dev/null
+++ b/interface/web/dns/lib/lang/ja_dns_tlsa.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb['name_txt'] = 'Service-Descriptor';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'TLSA-Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format. Correct: _&lt;port&gt;._(tcp|udp).&lt;hostname&gt;';
+$wb["data_error_empty"] = 'TLSA-Data empty';
+$wb["data_error_regex"] = 'TLSA dataformat is wrong. Correct: n n n HASH';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/ja_dns_wizard.lng b/interface/web/dns/lib/lang/ja_dns_wizard.lng
index a4c6413098..968183938b 100644
--- a/interface/web/dns/lib/lang/ja_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/ja_dns_wizard.lng
@@ -37,4 +37,7 @@ $wb['globalsearch_searchfield_watermark_txt'] = 'Search';
 $wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
 $wb['list_head_txt'] = 'DNS Zone Wizard';
 $wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
-$wb['dkim_txt'] = 'DKIM enabled';?>
+$wb['dkim_txt'] = 'DKIM enabled';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+?>
diff --git a/interface/web/dns/lib/lang/nl_dns_dmarc.lng b/interface/web/dns/lib/lang/nl_dns_dmarc.lng
index b00949bc98..cf78bb8eed 100644
--- a/interface/web/dns/lib/lang/nl_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/nl_dns_dmarc.lng
@@ -11,16 +11,16 @@ $wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages
 $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address';
 $wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).';
 $wb['dmarc_fo_txt'] = 'Forensic reporting options';
-$wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result.";
+$wb['dmarc_fo0_txt'] = 'Generate reports if all underlying authentication mechanisms fail to produce a DMARC \'pass\' result.';
 $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.';
 $wb['dmarc_fod_txt'] = 'Generate report if DKIM signature failed to verify.';
 $wb['dmarc_fos_txt'] = 'Generate report if SPF failed.';
 $wb['dmarc_adkim_txt'] = 'DKIM identifier alignment';
-$wb['dmarc_adkim_note_txt'] = "'strict' requires exact matching between DKIM domain and email's from";
+$wb['dmarc_adkim_note_txt'] = '\'strict\' requires exact matching between DKIM domain and email\'s from';
 $wb['dmarc_adkim_r_txt'] = 'relaxed';
 $wb['dmarc_adkim_s_txt'] = 'strict';
 $wb['dmarc_aspf_txt'] = 'SPF identifier alignment';
-$wb['dmarc_aspf_note_txt'] = "'strict' requires exact matching between SPF domain and email's from";
+$wb['dmarc_aspf_note_txt'] = '\'strict\' requires exact matching between SPF domain and email\'s from';
 $wb['dmarc_aspf_r_txt'] = 'relaxed';
 $wb['dmarc_aspf_s_txt'] = 'strict';
 $wb['dmarc_rf_txt'] = 'Report Format';
@@ -37,7 +37,7 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine';
 $wb['dmarc_sp_reject_txt'] = 'reject';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
-$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails.";
+$wb['dmarc_policy_error_txt'] = 'Only policy \'none\' is allowed without DKIM-signed emails.';
 $wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.';
 $wb['dmarc_no_spf_txt'] = 'No active SPF Record.';
 $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record';
diff --git a/interface/web/dns/lib/lang/nl_dns_ds.lng b/interface/web/dns/lib/lang/nl_dns_ds.lng
new file mode 100644
index 0000000000..3f9b447811
--- /dev/null
+++ b/interface/web/dns/lib/lang/nl_dns_ds.lng
@@ -0,0 +1,18 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$wb["data_error_regex"] = 'Text format invalid';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['invalid_type_ds'] = 'DS-Record has a wrong format.';
+
+?>
diff --git a/interface/web/dns/lib/lang/nl_dns_import.lng b/interface/web/dns/lib/lang/nl_dns_import.lng
index 2d1fe083ea..8f67eba14c 100644
--- a/interface/web/dns/lib/lang/nl_dns_import.lng
+++ b/interface/web/dns/lib/lang/nl_dns_import.lng
@@ -11,4 +11,6 @@ $wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filen
 $wb['title'] = 'Import Zone Files';
 $wb['no_file_uploaded_error'] = 'No zonefile uploaded';
 $wb['zone_file_import_txt'] = 'Zone File Import';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/nl_dns_loc.lng b/interface/web/dns/lib/lang/nl_dns_loc.lng
new file mode 100644
index 0000000000..a2e3322bb6
--- /dev/null
+++ b/interface/web/dns/lib/lang/nl_dns_loc.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$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/nl_dns_soa.lng b/interface/web/dns/lib/lang/nl_dns_soa.lng
index 698b0085b9..d9f0fc0d6c 100644
--- a/interface/web/dns/lib/lang/nl_dns_soa.lng
+++ b/interface/web/dns/lib/lang/nl_dns_soa.lng
@@ -35,4 +35,9 @@ $wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
 $wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 $wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
+$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
+$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
+$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
 ?>
diff --git a/interface/web/dns/lib/lang/nl_dns_soa_list.lng b/interface/web/dns/lib/lang/nl_dns_soa_list.lng
index 088479f87c..547c740432 100644
--- a/interface/web/dns/lib/lang/nl_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/nl_dns_soa_list.lng
@@ -7,4 +7,5 @@ $wb['ns_txt'] = 'NS';
 $wb['mbox_txt'] = 'E-mail';
 $wb['add_new_record_wizard_txt'] = 'Toevoegen nieuw DNS Zone met wizard';
 $wb['add_new_record_txt'] = 'Toevoegen nieuwe DNS Zone (handmatig)';
+$wb['import_zone_file_txt'] = 'Import Zone File';
 ?>
diff --git a/interface/web/dns/lib/lang/nl_dns_spf.lng b/interface/web/dns/lib/lang/nl_dns_spf.lng
index 8a1a611c21..df8d1fe145 100644
--- a/interface/web/dns/lib/lang/nl_dns_spf.lng
+++ b/interface/web/dns/lib/lang/nl_dns_spf.lng
@@ -16,10 +16,10 @@ $wb['spf_invalid_hostname_txt'] = 'Invalid hostname';
 $wb['spf_domain_txt'] = 'Any domains that may deliver or relay mail for this domain';
 $wb['spf_domain_note_txt'] = '(Sepearate domains with whitespaces)';
 $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["record_exists_txt"] = 'DNS-Record already exists';
-$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['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/nl_dns_tlsa.lng b/interface/web/dns/lib/lang/nl_dns_tlsa.lng
new file mode 100644
index 0000000000..dcfb3bfa33
--- /dev/null
+++ b/interface/web/dns/lib/lang/nl_dns_tlsa.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb['name_txt'] = 'Service-Descriptor';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'TLSA-Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format. Correct: _&lt;port&gt;._(tcp|udp).&lt;hostname&gt;';
+$wb["data_error_empty"] = 'TLSA-Data empty';
+$wb["data_error_regex"] = 'TLSA dataformat is wrong. Correct: n n n HASH';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/nl_dns_wizard.lng b/interface/web/dns/lib/lang/nl_dns_wizard.lng
index a8aa8119f4..f67c4a8394 100644
--- a/interface/web/dns/lib/lang/nl_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/nl_dns_wizard.lng
@@ -38,4 +38,6 @@ $wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
 $wb['list_head_txt'] = 'DNS Zone Wizard';
 $wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
 $wb['dkim_txt'] = 'DKIM enabled';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/pl_dns_dkim.lng b/interface/web/dns/lib/lang/pl_dns_dkim.lng
new file mode 100644
index 0000000000..b89f024ed2
--- /dev/null
+++ b/interface/web/dns/lib/lang/pl_dns_dkim.lng
@@ -0,0 +1,11 @@
+<?php
+$wb["public_key_txt"] = 'Public-Key';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$wb["record_exists_txt"] = 'DNS-Record already exists';
+$wb["dkim_disabled_txt"] = 'DKIM disabled for this mail-domain';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
+?>
diff --git a/interface/web/dns/lib/lang/pl_dns_dmarc.lng b/interface/web/dns/lib/lang/pl_dns_dmarc.lng
index b00949bc98..cf78bb8eed 100644
--- a/interface/web/dns/lib/lang/pl_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/pl_dns_dmarc.lng
@@ -11,16 +11,16 @@ $wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages
 $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address';
 $wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).';
 $wb['dmarc_fo_txt'] = 'Forensic reporting options';
-$wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result.";
+$wb['dmarc_fo0_txt'] = 'Generate reports if all underlying authentication mechanisms fail to produce a DMARC \'pass\' result.';
 $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.';
 $wb['dmarc_fod_txt'] = 'Generate report if DKIM signature failed to verify.';
 $wb['dmarc_fos_txt'] = 'Generate report if SPF failed.';
 $wb['dmarc_adkim_txt'] = 'DKIM identifier alignment';
-$wb['dmarc_adkim_note_txt'] = "'strict' requires exact matching between DKIM domain and email's from";
+$wb['dmarc_adkim_note_txt'] = '\'strict\' requires exact matching between DKIM domain and email\'s from';
 $wb['dmarc_adkim_r_txt'] = 'relaxed';
 $wb['dmarc_adkim_s_txt'] = 'strict';
 $wb['dmarc_aspf_txt'] = 'SPF identifier alignment';
-$wb['dmarc_aspf_note_txt'] = "'strict' requires exact matching between SPF domain and email's from";
+$wb['dmarc_aspf_note_txt'] = '\'strict\' requires exact matching between SPF domain and email\'s from';
 $wb['dmarc_aspf_r_txt'] = 'relaxed';
 $wb['dmarc_aspf_s_txt'] = 'strict';
 $wb['dmarc_rf_txt'] = 'Report Format';
@@ -37,7 +37,7 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine';
 $wb['dmarc_sp_reject_txt'] = 'reject';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
-$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails.";
+$wb['dmarc_policy_error_txt'] = 'Only policy \'none\' is allowed without DKIM-signed emails.';
 $wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.';
 $wb['dmarc_no_spf_txt'] = 'No active SPF Record.';
 $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record';
diff --git a/interface/web/dns/lib/lang/pl_dns_ds.lng b/interface/web/dns/lib/lang/pl_dns_ds.lng
new file mode 100644
index 0000000000..3f9b447811
--- /dev/null
+++ b/interface/web/dns/lib/lang/pl_dns_ds.lng
@@ -0,0 +1,18 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$wb["data_error_regex"] = 'Text format invalid';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['invalid_type_ds'] = 'DS-Record has a wrong format.';
+
+?>
diff --git a/interface/web/dns/lib/lang/pl_dns_import.lng b/interface/web/dns/lib/lang/pl_dns_import.lng
index 62cfb4f8cd..d622e03985 100644
--- a/interface/web/dns/lib/lang/pl_dns_import.lng
+++ b/interface/web/dns/lib/lang/pl_dns_import.lng
@@ -11,4 +11,6 @@ $wb['domain_field_desc_txt'] = 'Może być puste jeżeli nazwa domeny jest w naz
 $wb['title'] = 'Importuj pliki strefy';
 $wb['no_file_uploaded_error'] = 'Nie załadowany żaden plik';
 $wb['zone_file_import_txt'] = 'Import pliku strefy';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/pl_dns_loc.lng b/interface/web/dns/lib/lang/pl_dns_loc.lng
new file mode 100644
index 0000000000..a2e3322bb6
--- /dev/null
+++ b/interface/web/dns/lib/lang/pl_dns_loc.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$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/pl_dns_soa.lng b/interface/web/dns/lib/lang/pl_dns_soa.lng
index b5471dbb9e..c5788160d6 100644
--- a/interface/web/dns/lib/lang/pl_dns_soa.lng
+++ b/interface/web/dns/lib/lang/pl_dns_soa.lng
@@ -35,4 +35,9 @@ $wb['retry_range_error'] = 'Min. czas powtórzenia wynosi 60 sekund';
 $wb['expire_range_error'] = 'Min. czas przedawnienia wynosi 60 sekund';
 $wb['minimum_range_error'] = 'Min. czas minimalny wynosi 60 sekund';
 $wb['ttl_range_error'] = 'Min. czas TTL wynosi 60 sekund';
+$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
+$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
+$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
 ?>
diff --git a/interface/web/dns/lib/lang/pl_dns_soa_list.lng b/interface/web/dns/lib/lang/pl_dns_soa_list.lng
index d440e05469..d0d0ee7b22 100644
--- a/interface/web/dns/lib/lang/pl_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/pl_dns_soa_list.lng
@@ -7,4 +7,5 @@ $wb['ns_txt'] = 'NS';
 $wb['mbox_txt'] = 'E-mail';
 $wb['add_new_record_txt'] = 'Dodaj nową strefę DNS (SOA)';
 $wb['add_new_record_wizard_txt'] = 'Dodaj nową strefę DNS za pomocą Kreatora';
+$wb['import_zone_file_txt'] = 'Import Zone File';
 ?>
diff --git a/interface/web/dns/lib/lang/pl_dns_spf.lng b/interface/web/dns/lib/lang/pl_dns_spf.lng
index 8a1a611c21..df8d1fe145 100644
--- a/interface/web/dns/lib/lang/pl_dns_spf.lng
+++ b/interface/web/dns/lib/lang/pl_dns_spf.lng
@@ -16,10 +16,10 @@ $wb['spf_invalid_hostname_txt'] = 'Invalid hostname';
 $wb['spf_domain_txt'] = 'Any domains that may deliver or relay mail for this domain';
 $wb['spf_domain_note_txt'] = '(Sepearate domains with whitespaces)';
 $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["record_exists_txt"] = 'DNS-Record already exists';
-$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['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/pl_dns_tlsa.lng b/interface/web/dns/lib/lang/pl_dns_tlsa.lng
new file mode 100644
index 0000000000..dcfb3bfa33
--- /dev/null
+++ b/interface/web/dns/lib/lang/pl_dns_tlsa.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb['name_txt'] = 'Service-Descriptor';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'TLSA-Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format. Correct: _&lt;port&gt;._(tcp|udp).&lt;hostname&gt;';
+$wb["data_error_empty"] = 'TLSA-Data empty';
+$wb["data_error_regex"] = 'TLSA dataformat is wrong. Correct: n n n HASH';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/pl_dns_wizard.lng b/interface/web/dns/lib/lang/pl_dns_wizard.lng
index a205b6c6c4..87c9760e29 100644
--- a/interface/web/dns/lib/lang/pl_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/pl_dns_wizard.lng
@@ -38,4 +38,6 @@ $wb['globalsearch_noresults_limit_txt'] = '0 wyników';
 $wb['globalsearch_searchfield_watermark_txt'] = 'Szukaj';
 $wb['globalsearch_suggestions_text_txt'] = 'Sugestie';
 $wb['dkim_txt'] = 'DKIM enabled';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/pt_dns_dkim.lng b/interface/web/dns/lib/lang/pt_dns_dkim.lng
new file mode 100644
index 0000000000..b89f024ed2
--- /dev/null
+++ b/interface/web/dns/lib/lang/pt_dns_dkim.lng
@@ -0,0 +1,11 @@
+<?php
+$wb["public_key_txt"] = 'Public-Key';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$wb["record_exists_txt"] = 'DNS-Record already exists';
+$wb["dkim_disabled_txt"] = 'DKIM disabled for this mail-domain';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
+?>
diff --git a/interface/web/dns/lib/lang/pt_dns_dmarc.lng b/interface/web/dns/lib/lang/pt_dns_dmarc.lng
index b00949bc98..cf78bb8eed 100644
--- a/interface/web/dns/lib/lang/pt_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/pt_dns_dmarc.lng
@@ -11,16 +11,16 @@ $wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages
 $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address';
 $wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).';
 $wb['dmarc_fo_txt'] = 'Forensic reporting options';
-$wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result.";
+$wb['dmarc_fo0_txt'] = 'Generate reports if all underlying authentication mechanisms fail to produce a DMARC \'pass\' result.';
 $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.';
 $wb['dmarc_fod_txt'] = 'Generate report if DKIM signature failed to verify.';
 $wb['dmarc_fos_txt'] = 'Generate report if SPF failed.';
 $wb['dmarc_adkim_txt'] = 'DKIM identifier alignment';
-$wb['dmarc_adkim_note_txt'] = "'strict' requires exact matching between DKIM domain and email's from";
+$wb['dmarc_adkim_note_txt'] = '\'strict\' requires exact matching between DKIM domain and email\'s from';
 $wb['dmarc_adkim_r_txt'] = 'relaxed';
 $wb['dmarc_adkim_s_txt'] = 'strict';
 $wb['dmarc_aspf_txt'] = 'SPF identifier alignment';
-$wb['dmarc_aspf_note_txt'] = "'strict' requires exact matching between SPF domain and email's from";
+$wb['dmarc_aspf_note_txt'] = '\'strict\' requires exact matching between SPF domain and email\'s from';
 $wb['dmarc_aspf_r_txt'] = 'relaxed';
 $wb['dmarc_aspf_s_txt'] = 'strict';
 $wb['dmarc_rf_txt'] = 'Report Format';
@@ -37,7 +37,7 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine';
 $wb['dmarc_sp_reject_txt'] = 'reject';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
-$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails.";
+$wb['dmarc_policy_error_txt'] = 'Only policy \'none\' is allowed without DKIM-signed emails.';
 $wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.';
 $wb['dmarc_no_spf_txt'] = 'No active SPF Record.';
 $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record';
diff --git a/interface/web/dns/lib/lang/pt_dns_ds.lng b/interface/web/dns/lib/lang/pt_dns_ds.lng
new file mode 100644
index 0000000000..3f9b447811
--- /dev/null
+++ b/interface/web/dns/lib/lang/pt_dns_ds.lng
@@ -0,0 +1,18 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$wb["data_error_regex"] = 'Text format invalid';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['invalid_type_ds'] = 'DS-Record has a wrong format.';
+
+?>
diff --git a/interface/web/dns/lib/lang/pt_dns_import.lng b/interface/web/dns/lib/lang/pt_dns_import.lng
index 2d1fe083ea..8f67eba14c 100644
--- a/interface/web/dns/lib/lang/pt_dns_import.lng
+++ b/interface/web/dns/lib/lang/pt_dns_import.lng
@@ -11,4 +11,6 @@ $wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filen
 $wb['title'] = 'Import Zone Files';
 $wb['no_file_uploaded_error'] = 'No zonefile uploaded';
 $wb['zone_file_import_txt'] = 'Zone File Import';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/pt_dns_loc.lng b/interface/web/dns/lib/lang/pt_dns_loc.lng
new file mode 100644
index 0000000000..a2e3322bb6
--- /dev/null
+++ b/interface/web/dns/lib/lang/pt_dns_loc.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$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/pt_dns_soa.lng b/interface/web/dns/lib/lang/pt_dns_soa.lng
index fa0dd16ff3..f73fd86007 100644
--- a/interface/web/dns/lib/lang/pt_dns_soa.lng
+++ b/interface/web/dns/lib/lang/pt_dns_soa.lng
@@ -35,4 +35,9 @@ $wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
 $wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 $wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
+$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
+$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
+$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
 ?>
diff --git a/interface/web/dns/lib/lang/pt_dns_soa_list.lng b/interface/web/dns/lib/lang/pt_dns_soa_list.lng
index ddbf3281d6..9e80bd769a 100644
--- a/interface/web/dns/lib/lang/pt_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/pt_dns_soa_list.lng
@@ -7,4 +7,5 @@ $wb['ns_txt'] = 'NS';
 $wb['mbox_txt'] = 'Correio';
 $wb['add_new_record_txt'] = 'Adicionar uma nova zona dns (SOA)';
 $wb['add_new_record_wizard_txt'] = 'Add new DNS Zone with Wizard';
+$wb['import_zone_file_txt'] = 'Import Zone File';
 ?>
diff --git a/interface/web/dns/lib/lang/pt_dns_spf.lng b/interface/web/dns/lib/lang/pt_dns_spf.lng
index 8a1a611c21..df8d1fe145 100644
--- a/interface/web/dns/lib/lang/pt_dns_spf.lng
+++ b/interface/web/dns/lib/lang/pt_dns_spf.lng
@@ -16,10 +16,10 @@ $wb['spf_invalid_hostname_txt'] = 'Invalid hostname';
 $wb['spf_domain_txt'] = 'Any domains that may deliver or relay mail for this domain';
 $wb['spf_domain_note_txt'] = '(Sepearate domains with whitespaces)';
 $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["record_exists_txt"] = 'DNS-Record already exists';
-$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['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/pt_dns_tlsa.lng b/interface/web/dns/lib/lang/pt_dns_tlsa.lng
new file mode 100644
index 0000000000..dcfb3bfa33
--- /dev/null
+++ b/interface/web/dns/lib/lang/pt_dns_tlsa.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb['name_txt'] = 'Service-Descriptor';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'TLSA-Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format. Correct: _&lt;port&gt;._(tcp|udp).&lt;hostname&gt;';
+$wb["data_error_empty"] = 'TLSA-Data empty';
+$wb["data_error_regex"] = 'TLSA dataformat is wrong. Correct: n n n HASH';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/pt_dns_wizard.lng b/interface/web/dns/lib/lang/pt_dns_wizard.lng
index f6b4aad778..cacf8eae8d 100644
--- a/interface/web/dns/lib/lang/pt_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/pt_dns_wizard.lng
@@ -38,4 +38,6 @@ $wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
 $wb['list_head_txt'] = 'DNS Zone Wizard';
 $wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
 $wb['dkim_txt'] = 'DKIM enabled';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/ro_dns_dkim.lng b/interface/web/dns/lib/lang/ro_dns_dkim.lng
new file mode 100644
index 0000000000..b7a2b9be7d
--- /dev/null
+++ b/interface/web/dns/lib/lang/ro_dns_dkim.lng
@@ -0,0 +1,11 @@
+<?php
+$wb['public_key_txt'] = 'Public-Key';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$wb['dkim_disabled_txt'] = 'DKIM disabled for this mail-domain';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
+?>
diff --git a/interface/web/dns/lib/lang/ro_dns_dmarc.lng b/interface/web/dns/lib/lang/ro_dns_dmarc.lng
index b00949bc98..cf78bb8eed 100644
--- a/interface/web/dns/lib/lang/ro_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/ro_dns_dmarc.lng
@@ -11,16 +11,16 @@ $wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages
 $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address';
 $wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).';
 $wb['dmarc_fo_txt'] = 'Forensic reporting options';
-$wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result.";
+$wb['dmarc_fo0_txt'] = 'Generate reports if all underlying authentication mechanisms fail to produce a DMARC \'pass\' result.';
 $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.';
 $wb['dmarc_fod_txt'] = 'Generate report if DKIM signature failed to verify.';
 $wb['dmarc_fos_txt'] = 'Generate report if SPF failed.';
 $wb['dmarc_adkim_txt'] = 'DKIM identifier alignment';
-$wb['dmarc_adkim_note_txt'] = "'strict' requires exact matching between DKIM domain and email's from";
+$wb['dmarc_adkim_note_txt'] = '\'strict\' requires exact matching between DKIM domain and email\'s from';
 $wb['dmarc_adkim_r_txt'] = 'relaxed';
 $wb['dmarc_adkim_s_txt'] = 'strict';
 $wb['dmarc_aspf_txt'] = 'SPF identifier alignment';
-$wb['dmarc_aspf_note_txt'] = "'strict' requires exact matching between SPF domain and email's from";
+$wb['dmarc_aspf_note_txt'] = '\'strict\' requires exact matching between SPF domain and email\'s from';
 $wb['dmarc_aspf_r_txt'] = 'relaxed';
 $wb['dmarc_aspf_s_txt'] = 'strict';
 $wb['dmarc_rf_txt'] = 'Report Format';
@@ -37,7 +37,7 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine';
 $wb['dmarc_sp_reject_txt'] = 'reject';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
-$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails.";
+$wb['dmarc_policy_error_txt'] = 'Only policy \'none\' is allowed without DKIM-signed emails.';
 $wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.';
 $wb['dmarc_no_spf_txt'] = 'No active SPF Record.';
 $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record';
diff --git a/interface/web/dns/lib/lang/ro_dns_ds.lng b/interface/web/dns/lib/lang/ro_dns_ds.lng
new file mode 100644
index 0000000000..c3622dc5b5
--- /dev/null
+++ b/interface/web/dns/lib/lang/ro_dns_ds.lng
@@ -0,0 +1,17 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Data';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$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.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'Text empty';
+$wb['data_error_regex'] = 'Text format invalid';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['invalid_type_ds'] = 'DS-Record has a wrong format.';
+?>
diff --git a/interface/web/dns/lib/lang/ro_dns_import.lng b/interface/web/dns/lib/lang/ro_dns_import.lng
index 2d1fe083ea..8f67eba14c 100644
--- a/interface/web/dns/lib/lang/ro_dns_import.lng
+++ b/interface/web/dns/lib/lang/ro_dns_import.lng
@@ -11,4 +11,6 @@ $wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filen
 $wb['title'] = 'Import Zone Files';
 $wb['no_file_uploaded_error'] = 'No zonefile uploaded';
 $wb['zone_file_import_txt'] = 'Zone File Import';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/ro_dns_loc.lng b/interface/web/dns/lib/lang/ro_dns_loc.lng
new file mode 100644
index 0000000000..dc9ad9a006
--- /dev/null
+++ b/interface/web/dns/lib/lang/ro_dns_loc.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Hostname';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'Data';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$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.';
+$wb['name_error_regex'] = 'The hostname has the wrong format.';
+$wb['data_error_empty'] = 'Text empty';
+$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/ro_dns_soa.lng b/interface/web/dns/lib/lang/ro_dns_soa.lng
index 7ceba8c263..c38dc3ba61 100644
--- a/interface/web/dns/lib/lang/ro_dns_soa.lng
+++ b/interface/web/dns/lib/lang/ro_dns_soa.lng
@@ -35,4 +35,9 @@ $wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
 $wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 $wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
+$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
+$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
+$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
 ?>
diff --git a/interface/web/dns/lib/lang/ro_dns_soa_list.lng b/interface/web/dns/lib/lang/ro_dns_soa_list.lng
index 6b0588ae1b..6fc1b590c4 100644
--- a/interface/web/dns/lib/lang/ro_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/ro_dns_soa_list.lng
@@ -7,4 +7,5 @@ $wb['ns_txt'] = 'NS';
 $wb['mbox_txt'] = 'E-mail';
 $wb['add_new_record_txt'] = 'Adauga  o noua zona  DNS  (SOA)';
 $wb['add_new_record_wizard_txt'] = 'Add new DNS Zone with Wizard';
+$wb['import_zone_file_txt'] = 'Import Zone File';
 ?>
diff --git a/interface/web/dns/lib/lang/ro_dns_spf.lng b/interface/web/dns/lib/lang/ro_dns_spf.lng
index 8a1a611c21..df8d1fe145 100644
--- a/interface/web/dns/lib/lang/ro_dns_spf.lng
+++ b/interface/web/dns/lib/lang/ro_dns_spf.lng
@@ -16,10 +16,10 @@ $wb['spf_invalid_hostname_txt'] = 'Invalid hostname';
 $wb['spf_domain_txt'] = 'Any domains that may deliver or relay mail for this domain';
 $wb['spf_domain_note_txt'] = '(Sepearate domains with whitespaces)';
 $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["record_exists_txt"] = 'DNS-Record already exists';
-$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['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/ro_dns_tlsa.lng b/interface/web/dns/lib/lang/ro_dns_tlsa.lng
new file mode 100644
index 0000000000..3b87e2ad59
--- /dev/null
+++ b/interface/web/dns/lib/lang/ro_dns_tlsa.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['zone_txt'] = 'Zone';
+$wb['name_txt'] = 'Service-Descriptor';
+$wb['type_txt'] = 'type';
+$wb['data_txt'] = 'TLSA-Data';
+$wb['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$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.';
+$wb['name_error_regex'] = 'The hostname has the wrong format. Correct: _&lt;port&gt;._(tcp|udp).&lt;hostname&gt;';
+$wb['data_error_empty'] = 'TLSA-Data empty';
+$wb['data_error_regex'] = 'TLSA dataformat is wrong. Correct: n n n HASH';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
diff --git a/interface/web/dns/lib/lang/ro_dns_wizard.lng b/interface/web/dns/lib/lang/ro_dns_wizard.lng
index 7c847cb983..3221969873 100644
--- a/interface/web/dns/lib/lang/ro_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/ro_dns_wizard.lng
@@ -38,4 +38,6 @@ $wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
 $wb['list_head_txt'] = 'DNS Zone Wizard';
 $wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
 $wb['dkim_txt'] = 'DKIM enabled';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/ru_dns_dmarc.lng b/interface/web/dns/lib/lang/ru_dns_dmarc.lng
index b00949bc98..cf78bb8eed 100644
--- a/interface/web/dns/lib/lang/ru_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/ru_dns_dmarc.lng
@@ -11,16 +11,16 @@ $wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages
 $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address';
 $wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).';
 $wb['dmarc_fo_txt'] = 'Forensic reporting options';
-$wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result.";
+$wb['dmarc_fo0_txt'] = 'Generate reports if all underlying authentication mechanisms fail to produce a DMARC \'pass\' result.';
 $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.';
 $wb['dmarc_fod_txt'] = 'Generate report if DKIM signature failed to verify.';
 $wb['dmarc_fos_txt'] = 'Generate report if SPF failed.';
 $wb['dmarc_adkim_txt'] = 'DKIM identifier alignment';
-$wb['dmarc_adkim_note_txt'] = "'strict' requires exact matching between DKIM domain and email's from";
+$wb['dmarc_adkim_note_txt'] = '\'strict\' requires exact matching between DKIM domain and email\'s from';
 $wb['dmarc_adkim_r_txt'] = 'relaxed';
 $wb['dmarc_adkim_s_txt'] = 'strict';
 $wb['dmarc_aspf_txt'] = 'SPF identifier alignment';
-$wb['dmarc_aspf_note_txt'] = "'strict' requires exact matching between SPF domain and email's from";
+$wb['dmarc_aspf_note_txt'] = '\'strict\' requires exact matching between SPF domain and email\'s from';
 $wb['dmarc_aspf_r_txt'] = 'relaxed';
 $wb['dmarc_aspf_s_txt'] = 'strict';
 $wb['dmarc_rf_txt'] = 'Report Format';
@@ -37,7 +37,7 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine';
 $wb['dmarc_sp_reject_txt'] = 'reject';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
-$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails.";
+$wb['dmarc_policy_error_txt'] = 'Only policy \'none\' is allowed without DKIM-signed emails.';
 $wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.';
 $wb['dmarc_no_spf_txt'] = 'No active SPF Record.';
 $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record';
diff --git a/interface/web/dns/lib/lang/ru_dns_ds.lng b/interface/web/dns/lib/lang/ru_dns_ds.lng
new file mode 100644
index 0000000000..3f9b447811
--- /dev/null
+++ b/interface/web/dns/lib/lang/ru_dns_ds.lng
@@ -0,0 +1,18 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$wb["data_error_regex"] = 'Text format invalid';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['invalid_type_ds'] = 'DS-Record has a wrong format.';
+
+?>
diff --git a/interface/web/dns/lib/lang/ru_dns_import.lng b/interface/web/dns/lib/lang/ru_dns_import.lng
index 2d1fe083ea..8f67eba14c 100644
--- a/interface/web/dns/lib/lang/ru_dns_import.lng
+++ b/interface/web/dns/lib/lang/ru_dns_import.lng
@@ -11,4 +11,6 @@ $wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filen
 $wb['title'] = 'Import Zone Files';
 $wb['no_file_uploaded_error'] = 'No zonefile uploaded';
 $wb['zone_file_import_txt'] = 'Zone File Import';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/ru_dns_loc.lng b/interface/web/dns/lib/lang/ru_dns_loc.lng
new file mode 100644
index 0000000000..a2e3322bb6
--- /dev/null
+++ b/interface/web/dns/lib/lang/ru_dns_loc.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$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/ru_dns_soa.lng b/interface/web/dns/lib/lang/ru_dns_soa.lng
index c208d4fb54..5536cd8bb3 100644
--- a/interface/web/dns/lib/lang/ru_dns_soa.lng
+++ b/interface/web/dns/lib/lang/ru_dns_soa.lng
@@ -35,4 +35,9 @@ $wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
 $wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 $wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
+$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
+$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
+$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
 ?>
diff --git a/interface/web/dns/lib/lang/ru_dns_soa_list.lng b/interface/web/dns/lib/lang/ru_dns_soa_list.lng
index d9827f18f1..afb26ee51a 100644
--- a/interface/web/dns/lib/lang/ru_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/ru_dns_soa_list.lng
@@ -7,4 +7,5 @@ $wb['ns_txt'] = 'NS';
 $wb['mbox_txt'] = 'Email';
 $wb['add_new_record_txt'] = 'Добавить новую DNS Zone (SOA)';
 $wb['add_new_record_wizard_txt'] = 'Add new DNS Zone with Wizard';
+$wb['import_zone_file_txt'] = 'Import Zone File';
 ?>
diff --git a/interface/web/dns/lib/lang/ru_dns_spf.lng b/interface/web/dns/lib/lang/ru_dns_spf.lng
index 8a1a611c21..df8d1fe145 100644
--- a/interface/web/dns/lib/lang/ru_dns_spf.lng
+++ b/interface/web/dns/lib/lang/ru_dns_spf.lng
@@ -16,10 +16,10 @@ $wb['spf_invalid_hostname_txt'] = 'Invalid hostname';
 $wb['spf_domain_txt'] = 'Any domains that may deliver or relay mail for this domain';
 $wb['spf_domain_note_txt'] = '(Sepearate domains with whitespaces)';
 $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["record_exists_txt"] = 'DNS-Record already exists';
-$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['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/ru_dns_tlsa.lng b/interface/web/dns/lib/lang/ru_dns_tlsa.lng
new file mode 100644
index 0000000000..dcfb3bfa33
--- /dev/null
+++ b/interface/web/dns/lib/lang/ru_dns_tlsa.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb['name_txt'] = 'Service-Descriptor';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'TLSA-Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format. Correct: _&lt;port&gt;._(tcp|udp).&lt;hostname&gt;';
+$wb["data_error_empty"] = 'TLSA-Data empty';
+$wb["data_error_regex"] = 'TLSA dataformat is wrong. Correct: n n n HASH';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/ru_dns_wizard.lng b/interface/web/dns/lib/lang/ru_dns_wizard.lng
index 385eaacf79..071be550b4 100644
--- a/interface/web/dns/lib/lang/ru_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/ru_dns_wizard.lng
@@ -38,4 +38,6 @@ $wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
 $wb['list_head_txt'] = 'DNS Zone Wizard';
 $wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
 $wb['dkim_txt'] = 'DKIM enabled';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/se_dns_dmarc.lng b/interface/web/dns/lib/lang/se_dns_dmarc.lng
index b00949bc98..cf78bb8eed 100644
--- a/interface/web/dns/lib/lang/se_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/se_dns_dmarc.lng
@@ -11,16 +11,16 @@ $wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages
 $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address';
 $wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).';
 $wb['dmarc_fo_txt'] = 'Forensic reporting options';
-$wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result.";
+$wb['dmarc_fo0_txt'] = 'Generate reports if all underlying authentication mechanisms fail to produce a DMARC \'pass\' result.';
 $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.';
 $wb['dmarc_fod_txt'] = 'Generate report if DKIM signature failed to verify.';
 $wb['dmarc_fos_txt'] = 'Generate report if SPF failed.';
 $wb['dmarc_adkim_txt'] = 'DKIM identifier alignment';
-$wb['dmarc_adkim_note_txt'] = "'strict' requires exact matching between DKIM domain and email's from";
+$wb['dmarc_adkim_note_txt'] = '\'strict\' requires exact matching between DKIM domain and email\'s from';
 $wb['dmarc_adkim_r_txt'] = 'relaxed';
 $wb['dmarc_adkim_s_txt'] = 'strict';
 $wb['dmarc_aspf_txt'] = 'SPF identifier alignment';
-$wb['dmarc_aspf_note_txt'] = "'strict' requires exact matching between SPF domain and email's from";
+$wb['dmarc_aspf_note_txt'] = '\'strict\' requires exact matching between SPF domain and email\'s from';
 $wb['dmarc_aspf_r_txt'] = 'relaxed';
 $wb['dmarc_aspf_s_txt'] = 'strict';
 $wb['dmarc_rf_txt'] = 'Report Format';
@@ -37,7 +37,7 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine';
 $wb['dmarc_sp_reject_txt'] = 'reject';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
-$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails.";
+$wb['dmarc_policy_error_txt'] = 'Only policy \'none\' is allowed without DKIM-signed emails.';
 $wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.';
 $wb['dmarc_no_spf_txt'] = 'No active SPF Record.';
 $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record';
diff --git a/interface/web/dns/lib/lang/se_dns_ds.lng b/interface/web/dns/lib/lang/se_dns_ds.lng
new file mode 100644
index 0000000000..3f9b447811
--- /dev/null
+++ b/interface/web/dns/lib/lang/se_dns_ds.lng
@@ -0,0 +1,18 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$wb["data_error_regex"] = 'Text format invalid';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['invalid_type_ds'] = 'DS-Record has a wrong format.';
+
+?>
diff --git a/interface/web/dns/lib/lang/se_dns_import.lng b/interface/web/dns/lib/lang/se_dns_import.lng
index 4d703fa868..801dd473f7 100644
--- a/interface/web/dns/lib/lang/se_dns_import.lng
+++ b/interface/web/dns/lib/lang/se_dns_import.lng
@@ -11,4 +11,6 @@ $wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filen
 $wb['title'] = 'Importera zonfiler';
 $wb['no_file_uploaded_error'] = 'Ingen zonfil uppladdad';
 $wb['zone_file_import_txt'] = 'Zonfilsimport';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/se_dns_loc.lng b/interface/web/dns/lib/lang/se_dns_loc.lng
new file mode 100644
index 0000000000..a2e3322bb6
--- /dev/null
+++ b/interface/web/dns/lib/lang/se_dns_loc.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$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_soa.lng b/interface/web/dns/lib/lang/se_dns_soa.lng
index 935211a060..2aa8af9721 100644
--- a/interface/web/dns/lib/lang/se_dns_soa.lng
+++ b/interface/web/dns/lib/lang/se_dns_soa.lng
@@ -35,4 +35,9 @@ $wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
 $wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 $wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
+$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
+$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
+$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
 ?>
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 da7b8e28d2..eb1b6cce43 100644
--- a/interface/web/dns/lib/lang/se_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/se_dns_soa_list.lng
@@ -7,4 +7,5 @@ $wb['ns_txt'] = 'NS';
 $wb['mbox_txt'] = 'Email';
 $wb['add_new_record_txt'] = 'Add new DNS Zone (SOA)';
 $wb['add_new_record_wizard_txt'] = 'Add new DNS Zone with Wizard';
+$wb['import_zone_file_txt'] = 'Import Zone File';
 ?>
diff --git a/interface/web/dns/lib/lang/se_dns_spf.lng b/interface/web/dns/lib/lang/se_dns_spf.lng
index 8a1a611c21..df8d1fe145 100644
--- a/interface/web/dns/lib/lang/se_dns_spf.lng
+++ b/interface/web/dns/lib/lang/se_dns_spf.lng
@@ -16,10 +16,10 @@ $wb['spf_invalid_hostname_txt'] = 'Invalid hostname';
 $wb['spf_domain_txt'] = 'Any domains that may deliver or relay mail for this domain';
 $wb['spf_domain_note_txt'] = '(Sepearate domains with whitespaces)';
 $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["record_exists_txt"] = 'DNS-Record already exists';
-$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['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/se_dns_tlsa.lng b/interface/web/dns/lib/lang/se_dns_tlsa.lng
new file mode 100644
index 0000000000..dcfb3bfa33
--- /dev/null
+++ b/interface/web/dns/lib/lang/se_dns_tlsa.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb['name_txt'] = 'Service-Descriptor';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'TLSA-Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format. Correct: _&lt;port&gt;._(tcp|udp).&lt;hostname&gt;';
+$wb["data_error_empty"] = 'TLSA-Data empty';
+$wb["data_error_regex"] = 'TLSA dataformat is wrong. Correct: n n n HASH';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/se_dns_wizard.lng b/interface/web/dns/lib/lang/se_dns_wizard.lng
index 5e1df4a3a1..9061c97483 100644
--- a/interface/web/dns/lib/lang/se_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/se_dns_wizard.lng
@@ -38,4 +38,6 @@ $wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
 $wb['list_head_txt'] = 'DNS Zone Wizard';
 $wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
 $wb['dkim_txt'] = 'DKIM enabled';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/sk_dns_dmarc.lng b/interface/web/dns/lib/lang/sk_dns_dmarc.lng
index b00949bc98..cf78bb8eed 100644
--- a/interface/web/dns/lib/lang/sk_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/sk_dns_dmarc.lng
@@ -11,16 +11,16 @@ $wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages
 $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address';
 $wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).';
 $wb['dmarc_fo_txt'] = 'Forensic reporting options';
-$wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result.";
+$wb['dmarc_fo0_txt'] = 'Generate reports if all underlying authentication mechanisms fail to produce a DMARC \'pass\' result.';
 $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.';
 $wb['dmarc_fod_txt'] = 'Generate report if DKIM signature failed to verify.';
 $wb['dmarc_fos_txt'] = 'Generate report if SPF failed.';
 $wb['dmarc_adkim_txt'] = 'DKIM identifier alignment';
-$wb['dmarc_adkim_note_txt'] = "'strict' requires exact matching between DKIM domain and email's from";
+$wb['dmarc_adkim_note_txt'] = '\'strict\' requires exact matching between DKIM domain and email\'s from';
 $wb['dmarc_adkim_r_txt'] = 'relaxed';
 $wb['dmarc_adkim_s_txt'] = 'strict';
 $wb['dmarc_aspf_txt'] = 'SPF identifier alignment';
-$wb['dmarc_aspf_note_txt'] = "'strict' requires exact matching between SPF domain and email's from";
+$wb['dmarc_aspf_note_txt'] = '\'strict\' requires exact matching between SPF domain and email\'s from';
 $wb['dmarc_aspf_r_txt'] = 'relaxed';
 $wb['dmarc_aspf_s_txt'] = 'strict';
 $wb['dmarc_rf_txt'] = 'Report Format';
@@ -37,7 +37,7 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine';
 $wb['dmarc_sp_reject_txt'] = 'reject';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
-$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails.";
+$wb['dmarc_policy_error_txt'] = 'Only policy \'none\' is allowed without DKIM-signed emails.';
 $wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.';
 $wb['dmarc_no_spf_txt'] = 'No active SPF Record.';
 $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record';
diff --git a/interface/web/dns/lib/lang/sk_dns_ds.lng b/interface/web/dns/lib/lang/sk_dns_ds.lng
new file mode 100644
index 0000000000..3f9b447811
--- /dev/null
+++ b/interface/web/dns/lib/lang/sk_dns_ds.lng
@@ -0,0 +1,18 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$wb["data_error_regex"] = 'Text format invalid';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['invalid_type_ds'] = 'DS-Record has a wrong format.';
+
+?>
diff --git a/interface/web/dns/lib/lang/sk_dns_import.lng b/interface/web/dns/lib/lang/sk_dns_import.lng
index 2d1fe083ea..8f67eba14c 100644
--- a/interface/web/dns/lib/lang/sk_dns_import.lng
+++ b/interface/web/dns/lib/lang/sk_dns_import.lng
@@ -11,4 +11,6 @@ $wb['domain_field_desc_txt'] = 'Can be left empty if domain name is in the filen
 $wb['title'] = 'Import Zone Files';
 $wb['no_file_uploaded_error'] = 'No zonefile uploaded';
 $wb['zone_file_import_txt'] = 'Zone File Import';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/sk_dns_loc.lng b/interface/web/dns/lib/lang/sk_dns_loc.lng
new file mode 100644
index 0000000000..a2e3322bb6
--- /dev/null
+++ b/interface/web/dns/lib/lang/sk_dns_loc.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$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/sk_dns_soa.lng b/interface/web/dns/lib/lang/sk_dns_soa.lng
index b659d6e1b3..b0654a4320 100644
--- a/interface/web/dns/lib/lang/sk_dns_soa.lng
+++ b/interface/web/dns/lib/lang/sk_dns_soa.lng
@@ -35,4 +35,9 @@ $wb['expire_range_error'] = 'Min. Expire time is 60 seconds.';
 $wb['minimum_range_error'] = 'Min. Minimum time is 60 seconds.';
 $wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 $wb['xfer_error_regex'] = 'Also notify: Please use an IP address.';
+$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
+$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
+$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
 ?>
diff --git a/interface/web/dns/lib/lang/sk_dns_soa_list.lng b/interface/web/dns/lib/lang/sk_dns_soa_list.lng
index e352d28828..23373e1159 100644
--- a/interface/web/dns/lib/lang/sk_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/sk_dns_soa_list.lng
@@ -7,4 +7,5 @@ $wb['ns_txt'] = 'NS';
 $wb['mbox_txt'] = 'Email';
 $wb['add_new_record_txt'] = 'Pridať novú DNS Zónu (SOA)';
 $wb['add_new_record_wizard_txt'] = 'Add new DNS Zone with Wizard';
+$wb['import_zone_file_txt'] = 'Import Zone File';
 ?>
diff --git a/interface/web/dns/lib/lang/sk_dns_spf.lng b/interface/web/dns/lib/lang/sk_dns_spf.lng
index 8a1a611c21..df8d1fe145 100644
--- a/interface/web/dns/lib/lang/sk_dns_spf.lng
+++ b/interface/web/dns/lib/lang/sk_dns_spf.lng
@@ -16,10 +16,10 @@ $wb['spf_invalid_hostname_txt'] = 'Invalid hostname';
 $wb['spf_domain_txt'] = 'Any domains that may deliver or relay mail for this domain';
 $wb['spf_domain_note_txt'] = '(Sepearate domains with whitespaces)';
 $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["record_exists_txt"] = 'DNS-Record already exists';
-$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['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/sk_dns_tlsa.lng b/interface/web/dns/lib/lang/sk_dns_tlsa.lng
new file mode 100644
index 0000000000..dcfb3bfa33
--- /dev/null
+++ b/interface/web/dns/lib/lang/sk_dns_tlsa.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb['name_txt'] = 'Service-Descriptor';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'TLSA-Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format. Correct: _&lt;port&gt;._(tcp|udp).&lt;hostname&gt;';
+$wb["data_error_empty"] = 'TLSA-Data empty';
+$wb["data_error_regex"] = 'TLSA dataformat is wrong. Correct: n n n HASH';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/sk_dns_wizard.lng b/interface/web/dns/lib/lang/sk_dns_wizard.lng
index e826103542..26258c300d 100644
--- a/interface/web/dns/lib/lang/sk_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/sk_dns_wizard.lng
@@ -38,4 +38,6 @@ $wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
 $wb['list_head_txt'] = 'DNS Zone Wizard';
 $wb['list_desc_txt'] = 'Create a DNS Zone via a wizard';
 $wb['dkim_txt'] = 'DKIM enabled';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/tr.lng b/interface/web/dns/lib/lang/tr.lng
index 96309a128f..a101cf7b2b 100644
--- a/interface/web/dns/lib/lang/tr.lng
+++ b/interface/web/dns/lib/lang/tr.lng
@@ -1,5 +1,4 @@
 <?php
-
 $wb['DNS'] = 'DNS';
 $wb['Zones'] = 'Bölgeler';
 $wb['DNS A'] = 'DNS A';
diff --git a/interface/web/dns/lib/lang/tr_dns_dmarc.lng b/interface/web/dns/lib/lang/tr_dns_dmarc.lng
index b00949bc98..cf78bb8eed 100644
--- a/interface/web/dns/lib/lang/tr_dns_dmarc.lng
+++ b/interface/web/dns/lib/lang/tr_dns_dmarc.lng
@@ -11,16 +11,16 @@ $wb['dmarc_rua_note_txt'] = 'Email to receive reports from ISPs aboute messages
 $wb['dmarc_ruf_txt'] = 'Forensic Data Reporting Address';
 $wb['dmarc_ruf_note_txt'] = 'Email to receive sample messages that are failing DMARC checks for the domain (separated by whitespaces).';
 $wb['dmarc_fo_txt'] = 'Forensic reporting options';
-$wb['dmarc_fo0_txt'] = "Generate reports if all underlying authentication mechanisms fail to produce a DMARC 'pass' result.";
+$wb['dmarc_fo0_txt'] = 'Generate reports if all underlying authentication mechanisms fail to produce a DMARC \'pass\' result.';
 $wb['dmarc_fo1_txt'] = 'Generate reports if any mechanisms fail.';
 $wb['dmarc_fod_txt'] = 'Generate report if DKIM signature failed to verify.';
 $wb['dmarc_fos_txt'] = 'Generate report if SPF failed.';
 $wb['dmarc_adkim_txt'] = 'DKIM identifier alignment';
-$wb['dmarc_adkim_note_txt'] = "'strict' requires exact matching between DKIM domain and email's from";
+$wb['dmarc_adkim_note_txt'] = '\'strict\' requires exact matching between DKIM domain and email\'s from';
 $wb['dmarc_adkim_r_txt'] = 'relaxed';
 $wb['dmarc_adkim_s_txt'] = 'strict';
 $wb['dmarc_aspf_txt'] = 'SPF identifier alignment';
-$wb['dmarc_aspf_note_txt'] = "'strict' requires exact matching between SPF domain and email's from";
+$wb['dmarc_aspf_note_txt'] = '\'strict\' requires exact matching between SPF domain and email\'s from';
 $wb['dmarc_aspf_r_txt'] = 'relaxed';
 $wb['dmarc_aspf_s_txt'] = 'strict';
 $wb['dmarc_rf_txt'] = 'Report Format';
@@ -37,7 +37,7 @@ $wb['dmarc_sp_quarantine_txt'] = 'quarantine';
 $wb['dmarc_sp_reject_txt'] = 'reject';
 $wb['ttl_txt'] = 'TTL';
 $wb['active_txt'] = 'Active';
-$wb['dmarc_policy_error_txt'] = "Only policy 'none' is allowed without DKIM-signed emails.";
+$wb['dmarc_policy_error_txt'] = 'Only policy \'none\' is allowed without DKIM-signed emails.';
 $wb['dmarc_no_dkim_txt'] = 'No active DKIM Record.';
 $wb['dmarc_no_spf_txt'] = 'No active SPF Record.';
 $wb['dmarc_more_spf_txt'] = 'More than one active SPF Record';
diff --git a/interface/web/dns/lib/lang/tr_dns_ds.lng b/interface/web/dns/lib/lang/tr_dns_ds.lng
new file mode 100644
index 0000000000..3f9b447811
--- /dev/null
+++ b/interface/web/dns/lib/lang/tr_dns_ds.lng
@@ -0,0 +1,18 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$wb["data_error_regex"] = 'Text format invalid';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['invalid_type_ds'] = 'DS-Record has a wrong format.';
+
+?>
diff --git a/interface/web/dns/lib/lang/tr_dns_import.lng b/interface/web/dns/lib/lang/tr_dns_import.lng
index 5d1b4fcfd1..64073d2b49 100644
--- a/interface/web/dns/lib/lang/tr_dns_import.lng
+++ b/interface/web/dns/lib/lang/tr_dns_import.lng
@@ -11,4 +11,6 @@ $wb['zonefile_to_import_txt'] = 'Bölge Dosyası';
 $wb['domain_field_desc_txt'] = 'Alan adı dosya adında ya da bölge dosyasının içeriğinde bulunuyor ise boş bırakılabilir.';
 $wb['title'] = 'Bölge Dosyalarını Al';
 $wb['no_file_uploaded_error'] = 'Hiçbir bölge dosyası yüklenmedi';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/dns/lib/lang/tr_dns_loc.lng b/interface/web/dns/lib/lang/tr_dns_loc.lng
new file mode 100644
index 0000000000..a2e3322bb6
--- /dev/null
+++ b/interface/web/dns/lib/lang/tr_dns_loc.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb["name_txt"] = 'Hostname';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format.';
+$wb["data_error_empty"] = 'Text empty';
+$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/tr_dns_slave.lng b/interface/web/dns/lib/lang/tr_dns_slave.lng
index 0ff0b9163e..eeee447fbc 100644
--- a/interface/web/dns/lib/lang/tr_dns_slave.lng
+++ b/interface/web/dns/lib/lang/tr_dns_slave.lng
@@ -15,4 +15,3 @@ $wb['ns_error_regex'] = 'NS biçimi geçersiz.';
 $wb['eg_domain_tld'] = 'Örnek: domain.tld.';
 $wb['ipv4_form_txt'] = 'IPv4 biçimi - Örnek: 1.2.3.4';
 ?>
-
diff --git a/interface/web/dns/lib/lang/tr_dns_slave_admin_list.lng b/interface/web/dns/lib/lang/tr_dns_slave_admin_list.lng
index 87f30b114a..f0c359a7d3 100644
--- a/interface/web/dns/lib/lang/tr_dns_slave_admin_list.lng
+++ b/interface/web/dns/lib/lang/tr_dns_slave_admin_list.lng
@@ -8,4 +8,3 @@ $wb['add_new_record_txt'] = 'İkincil DNS Bölgesi Ekle';
 $wb['eg_domain_tld'] = 'Örnek: domain.tld.';
 $wb['sys_groupid_txt'] = 'Müşteri';
 ?>
-
diff --git a/interface/web/dns/lib/lang/tr_dns_slave_list.lng b/interface/web/dns/lib/lang/tr_dns_slave_list.lng
index 3d3086d148..34a7d97baa 100644
--- a/interface/web/dns/lib/lang/tr_dns_slave_list.lng
+++ b/interface/web/dns/lib/lang/tr_dns_slave_list.lng
@@ -7,4 +7,3 @@ $wb['ns_txt'] = 'Ad Sunucusu';
 $wb['add_new_record_txt'] = 'İkincil DNS Bölgesi Ekle';
 $wb['eg_domain_tld'] = 'Örnek: domain.tld.';
 ?>
-
diff --git a/interface/web/dns/lib/lang/tr_dns_soa.lng b/interface/web/dns/lib/lang/tr_dns_soa.lng
index 4a1b2c96f6..412d6fd5ac 100644
--- a/interface/web/dns/lib/lang/tr_dns_soa.lng
+++ b/interface/web/dns/lib/lang/tr_dns_soa.lng
@@ -35,5 +35,9 @@ $wb['retry_range_error'] = 'En kısa yinelenme süresi 60 saniyedir.';
 $wb['expire_range_error'] = 'En kısa sona erme süresi 60 saniyedir.';
 $wb['minimum_range_error'] = 'En kısa en kısa süre 60 saniyedir.';
 $wb['ttl_range_error'] = 'En düşük TTL süresi 60 saniyedir.';
+$wb['dnssec_info_txt'] = 'DNSSEC DS-Data for registry';
+$wb['dnssec_wanted_txt'] = 'Sign zone (DNSSEC)';
+$wb['dnssec_wanted_info'] = 'When disabling DNSSEC keys are not going to be deleted if DNSSEC was enabled before and keys already have been generated but the zone will no longer be delievered in signed format afterwards.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
+$wb['soa_cannot_be_changed_txt'] = 'Die Zone (SOA) kann nicht verändert werden. Bitte kontaktieren Sie ihren Administrator, um die Zone zu ändern.';
 ?>
-
diff --git a/interface/web/dns/lib/lang/tr_dns_soa_admin_list.lng b/interface/web/dns/lib/lang/tr_dns_soa_admin_list.lng
index 2a39d0715c..d8e56c17ee 100644
--- a/interface/web/dns/lib/lang/tr_dns_soa_admin_list.lng
+++ b/interface/web/dns/lib/lang/tr_dns_soa_admin_list.lng
@@ -9,4 +9,3 @@ $wb['add_new_record_wizard_txt'] = 'Yardımcı ile DNS bölgesi ekle';
 $wb['add_new_record_txt'] = 'El ile DNS Bölgesi Ekle';
 $wb['sys_groupid_txt'] = 'Müşteri';
 ?>
-
diff --git a/interface/web/dns/lib/lang/tr_dns_soa_list.lng b/interface/web/dns/lib/lang/tr_dns_soa_list.lng
index d109d3935a..8f7ed985ee 100644
--- a/interface/web/dns/lib/lang/tr_dns_soa_list.lng
+++ b/interface/web/dns/lib/lang/tr_dns_soa_list.lng
@@ -7,5 +7,5 @@ $wb['ns_txt'] = 'Ad Sunucusu';
 $wb['mbox_txt'] = 'E-posta';
 $wb['add_new_record_wizard_txt'] = 'Yardımcı ile DNS bölgesi ekle';
 $wb['add_new_record_txt'] = 'DNS Bölgesi (SOA) Ekle';
+$wb['import_zone_file_txt'] = 'Import Zone File';
 ?>
-
diff --git a/interface/web/dns/lib/lang/tr_dns_spf.lng b/interface/web/dns/lib/lang/tr_dns_spf.lng
index 8a1a611c21..df8d1fe145 100644
--- a/interface/web/dns/lib/lang/tr_dns_spf.lng
+++ b/interface/web/dns/lib/lang/tr_dns_spf.lng
@@ -16,10 +16,10 @@ $wb['spf_invalid_hostname_txt'] = 'Invalid hostname';
 $wb['spf_domain_txt'] = 'Any domains that may deliver or relay mail for this domain';
 $wb['spf_domain_note_txt'] = '(Sepearate domains with whitespaces)';
 $wb['spf_invalid_domain_txt'] = 'Invalid domainname';
-$wb["ttl_txt"] = 'TTL';
-$wb["active_txt"] = 'Active';
-$wb["record_exists_txt"] = 'DNS-Record already exists';
-$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['ttl_txt'] = 'TTL';
+$wb['active_txt'] = 'Active';
+$wb['record_exists_txt'] = 'DNS-Record already exists';
+$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['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
 ?>
diff --git a/interface/web/dns/lib/lang/tr_dns_tlsa.lng b/interface/web/dns/lib/lang/tr_dns_tlsa.lng
new file mode 100644
index 0000000000..dcfb3bfa33
--- /dev/null
+++ b/interface/web/dns/lib/lang/tr_dns_tlsa.lng
@@ -0,0 +1,16 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["zone_txt"] = 'Zone';
+$wb['name_txt'] = 'Service-Descriptor';
+$wb["type_txt"] = 'type';
+$wb["data_txt"] = 'TLSA-Data';
+$wb["ttl_txt"] = 'TTL';
+$wb["active_txt"] = 'Active';
+$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.';
+$wb["name_error_regex"] = 'The hostname has the wrong format. Correct: _&lt;port&gt;._(tcp|udp).&lt;hostname&gt;';
+$wb["data_error_empty"] = 'TLSA-Data empty';
+$wb["data_error_regex"] = 'TLSA dataformat is wrong. Correct: n n n HASH';
+$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+?>
\ No newline at end of file
diff --git a/interface/web/dns/lib/lang/tr_dns_wizard.lng b/interface/web/dns/lib/lang/tr_dns_wizard.lng
index eb9b161e3c..2b05487dbc 100644
--- a/interface/web/dns/lib/lang/tr_dns_wizard.lng
+++ b/interface/web/dns/lib/lang/tr_dns_wizard.lng
@@ -35,4 +35,9 @@ $wb['globalsearch_noresults_text_txt'] = 'Sonuç yok.';
 $wb['globalsearch_noresults_limit_txt'] = '0 sonuç';
 $wb['globalsearch_searchfield_watermark_txt'] = 'Arama';
 $wb['globalsearch_suggestions_text_txt'] = 'Öneriler';
+$wb['dkim_txt'] = 'DKIM enabled';
+$wb['ipv6_txt'] = 'IPv6 Address';
+$wb['error_ipv6_empty'] = 'IPv6 empty.';
+$wb['error_no_server_id'] = 'No server provided.';
+$wb['error_not_allowed_server_id'] = 'The selected server is not allowed for this account.';
 ?>
diff --git a/interface/web/help/lib/lang/ca.lng b/interface/web/help/lib/lang/ca.lng
new file mode 100644
index 0000000000..5c09ff83b6
--- /dev/null
+++ b/interface/web/help/lib/lang/ca.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['Support Message'] = 'Message de support';
+$wb['Message'] = 'Message';
+$wb['Send message'] = 'Envoyer un message';
+$wb['View messages'] = 'Voir les messages';
+$wb['Support'] = 'Support';
+$wb['About ISPConfig'] = 'A propos d\'ISPConfig';
+$wb['Version'] = 'Version';
+$wb['Frequently Asked Questions'] = 'Foire Aux Qestions';
+$wb['FAQ Sections'] = 'Sections FAQ';
+$wb['Manage Sections'] = 'Gérer les Sections';
+$wb['Add a Question & Answer Pair'] = 'Ajouter un couple Question & Réponse';
+$wb['Manage Questions'] = 'Gérer les Questions';
+?>
diff --git a/interface/web/help/lib/lang/ca_faq_form.lng b/interface/web/help/lib/lang/ca_faq_form.lng
new file mode 100644
index 0000000000..c251b42c47
--- /dev/null
+++ b/interface/web/help/lib/lang/ca_faq_form.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['faq_faq_txt'] = 'Foire Aux Questions';
+$wb['faq_question_txt'] = 'Question';
+$wb['faq_answer_txt'] = 'Réponse';
+$wb['faq_section_txt'] = 'Section';
+?>
diff --git a/interface/web/help/lib/lang/ca_faq_manage_questions_list.lng b/interface/web/help/lib/lang/ca_faq_manage_questions_list.lng
new file mode 100644
index 0000000000..6a9754b2af
--- /dev/null
+++ b/interface/web/help/lib/lang/ca_faq_manage_questions_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['faq_question_txt'] = 'Question';
+$wb['faq_section_name_txt'] = 'Section';
+$wb['faq_delete_txt'] = 'Supprimer';
+$wb['faq_edit_txt'] = 'Editer';
+$wb['faq_sections_txt'] = 'Section';
+$wb['faq_faq_questions_txt'] = 'Foire Aux Questions';
+$wb['faq_new_question_txt'] = 'Ajouter un nouveau couple Question & Réponse';
+?>
diff --git a/interface/web/help/lib/lang/ca_faq_sections_form.lng b/interface/web/help/lib/lang/ca_faq_sections_form.lng
new file mode 100644
index 0000000000..ee014e0940
--- /dev/null
+++ b/interface/web/help/lib/lang/ca_faq_sections_form.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['faq_section_name_txt'] = 'Nom de la Section';
+?>
diff --git a/interface/web/help/lib/lang/ca_help_faq_list.lng b/interface/web/help/lib/lang/ca_help_faq_list.lng
new file mode 100644
index 0000000000..6af86cfbbf
--- /dev/null
+++ b/interface/web/help/lib/lang/ca_help_faq_list.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['edit_txt'] = 'Editer';
+?>
diff --git a/interface/web/help/lib/lang/ca_help_faq_sections_list.lng b/interface/web/help/lib/lang/ca_help_faq_sections_list.lng
new file mode 100644
index 0000000000..a15c2ea9dc
--- /dev/null
+++ b/interface/web/help/lib/lang/ca_help_faq_sections_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['faq_section_name_txt'] = 'Nom de la Section';
+$wb['faq_delete_txt'] = 'Supprimer';
+$wb['faq_edit_txt'] = 'Editer';
+$wb['faq_sections_txt'] = 'Sections';
+$wb['faq_faq_sections_txt'] = 'Sections FAQ';
+$wb['faq_new_section_txt'] = 'Ajouter une nouvelle section';
+?>
diff --git a/interface/web/help/lib/lang/ca_support_message.lng b/interface/web/help/lib/lang/ca_support_message.lng
new file mode 100644
index 0000000000..d0d289a43f
--- /dev/null
+++ b/interface/web/help/lib/lang/ca_support_message.lng
@@ -0,0 +1,15 @@
+<?php
+$wb['recipient_id_txt'] = 'ID Destinataire';
+$wb['sender_id_txt'] = 'ID Expéditeur';
+$wb['subject_txt'] = 'Sujet';
+$wb['message_txt'] = 'Message';
+$wb['tstamp_txt'] = 'Timestamp';
+$wb['reply_txt'] = 'Répondre';
+$wb['date_txt'] = 'Date';
+$wb['support_request_subject_txt'] = 'Demande d\'assistance';
+$wb['support_request_txt'] = 'Vous avez une demande d\'assistance. Merci de ne pas répondre directement à cet courriel, mais de gérer la demande d\'assistance dans ISPConfig.';
+$wb['answer_to_support_request_txt'] = 'Vous avez une réponse à votre demande d\'assistance. Merci de ne pas répondre directement à cet courriel, mais de gérer la demande d\'assistance dans ISPConfig.';
+$wb['answer_to_support_request_sent_txt'] = 'VOtre message à été envoyé au support.';
+$wb['support_request_sent_txt'] = 'Votre réponse à la demande d\'assistance a été envoyée. Merci de ne pas répondre à cet courriel.';
+$wb['recipient_or_sender_email_address_not_valid_txt'] = 'Le message n\'a pas pu être envoyé parce que l\'adresse courriel du destinataire et/ou de l\'émetteur est invalide.';
+?>
diff --git a/interface/web/help/lib/lang/ca_support_message_list.lng b/interface/web/help/lib/lang/ca_support_message_list.lng
new file mode 100644
index 0000000000..271f9dcf93
--- /dev/null
+++ b/interface/web/help/lib/lang/ca_support_message_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Messages de support';
+$wb['sender_id_txt'] = 'Expéditeur';
+$wb['subject_txt'] = 'Sujet';
+$wb['add_new_record_txt'] = 'Créer un nouveau message de support';
+$wb['date_txt'] = 'Date';
+?>
diff --git a/interface/web/help/lib/lang/cz.lng b/interface/web/help/lib/lang/cz.lng
index 04cef1473b..f1b8337bb2 100644
--- a/interface/web/help/lib/lang/cz.lng
+++ b/interface/web/help/lib/lang/cz.lng
@@ -12,5 +12,3 @@ $wb['Manage Sections'] = 'Spravovat sekce';
 $wb['Manage Questions'] = 'Spravovat dotazy';
 $wb['Add a Question & Answer Pair'] = 'Přidat otázku a odpověď';
 ?>
-
-
diff --git a/interface/web/help/lib/lang/cz_faq_form.lng b/interface/web/help/lib/lang/cz_faq_form.lng
index dc951a40ab..73feee6955 100644
--- a/interface/web/help/lib/lang/cz_faq_form.lng
+++ b/interface/web/help/lib/lang/cz_faq_form.lng
@@ -4,5 +4,3 @@ $wb['faq_question_txt'] = 'Otázka';
 $wb['faq_answer_txt'] = 'Odpověď';
 $wb['faq_section_txt'] = 'Sekce';
 ?>
-
-
diff --git a/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng b/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng
index ab5d07c4e1..a9488445ca 100644
--- a/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng
+++ b/interface/web/help/lib/lang/cz_faq_manage_questions_list.lng
@@ -7,5 +7,3 @@ $wb['faq_sections_txt'] = 'Sekce';
 $wb['faq_faq_questions_txt'] = 'Často kladené dotazy';
 $wb['faq_new_question_txt'] = 'Přidat nový dotaz';
 ?>
-
-
diff --git a/interface/web/help/lib/lang/cz_faq_sections_form.lng b/interface/web/help/lib/lang/cz_faq_sections_form.lng
index d19eb51911..f9de704d8a 100644
--- a/interface/web/help/lib/lang/cz_faq_sections_form.lng
+++ b/interface/web/help/lib/lang/cz_faq_sections_form.lng
@@ -1,5 +1,3 @@
 <?php
 $wb['faq_section_name_txt'] = 'Název sekce';
 ?>
-
-
diff --git a/interface/web/help/lib/lang/cz_help_faq_list.lng b/interface/web/help/lib/lang/cz_help_faq_list.lng
index 0fa75dd06b..923d9b892a 100644
--- a/interface/web/help/lib/lang/cz_help_faq_list.lng
+++ b/interface/web/help/lib/lang/cz_help_faq_list.lng
@@ -1,5 +1,3 @@
 <?php
 $wb['edit_txt'] = 'Upravit';
 ?>
-
-
diff --git a/interface/web/help/lib/lang/cz_help_faq_sections_list.lng b/interface/web/help/lib/lang/cz_help_faq_sections_list.lng
index 3c290921b3..fbaf4ad810 100644
--- a/interface/web/help/lib/lang/cz_help_faq_sections_list.lng
+++ b/interface/web/help/lib/lang/cz_help_faq_sections_list.lng
@@ -6,5 +6,3 @@ $wb['faq_sections_txt'] = 'Sekce';
 $wb['faq_faq_sections_txt'] = 'Sekce FAQ - Často kladené dotazy';
 $wb['faq_new_section_txt'] = 'Přidat novou sekci';
 ?>
-
-
diff --git a/interface/web/help/lib/lang/cz_support_message.lng b/interface/web/help/lib/lang/cz_support_message.lng
index 59958e72e5..b9355474c9 100644
--- a/interface/web/help/lib/lang/cz_support_message.lng
+++ b/interface/web/help/lib/lang/cz_support_message.lng
@@ -13,5 +13,3 @@ $wb['answer_to_support_request_sent_txt'] = 'Your reply to the support request h
 $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'] = 'Zprávu nelze odeslat, protože e-mailová adresa příjemce a/nebo odesílatele není platná.';
 ?>
-
-
diff --git a/interface/web/help/lib/lang/cz_support_message_list.lng b/interface/web/help/lib/lang/cz_support_message_list.lng
index 42b1698222..23f80584f9 100644
--- a/interface/web/help/lib/lang/cz_support_message_list.lng
+++ b/interface/web/help/lib/lang/cz_support_message_list.lng
@@ -5,5 +5,3 @@ $wb['subject_txt'] = 'Předmět';
 $wb['add_new_record_txt'] = 'Vytvořit zprávu pro podporu';
 $wb['date_txt'] = 'Datum';
 ?>
-
-
diff --git a/interface/web/help/lib/lang/fr.lng b/interface/web/help/lib/lang/fr.lng
index 5c09ff83b6..39c2c801b7 100644
--- a/interface/web/help/lib/lang/fr.lng
+++ b/interface/web/help/lib/lang/fr.lng
@@ -4,7 +4,7 @@ $wb['Message'] = 'Message';
 $wb['Send message'] = 'Envoyer un message';
 $wb['View messages'] = 'Voir les messages';
 $wb['Support'] = 'Support';
-$wb['About ISPConfig'] = 'A propos d\'ISPConfig';
+$wb['About ISPConfig'] = 'A propos d’ISPConfig';
 $wb['Version'] = 'Version';
 $wb['Frequently Asked Questions'] = 'Foire Aux Qestions';
 $wb['FAQ Sections'] = 'Sections FAQ';
diff --git a/interface/web/help/lib/lang/fr_support_message.lng b/interface/web/help/lib/lang/fr_support_message.lng
index 10d37a9417..826a121ad4 100644
--- a/interface/web/help/lib/lang/fr_support_message.lng
+++ b/interface/web/help/lib/lang/fr_support_message.lng
@@ -6,10 +6,10 @@ $wb['message_txt'] = 'Message';
 $wb['tstamp_txt'] = 'Timestamp';
 $wb['reply_txt'] = 'Répondre';
 $wb['date_txt'] = 'Date';
-$wb['support_request_subject_txt'] = 'Demande d\'assistance';
-$wb['support_request_txt'] = 'Vous avez une demande d\'assistance. Merci de ne pas répondre directement à cet email, mais de gérer la demande d\'assistance dans ISPConfig.';
-$wb['answer_to_support_request_txt'] = 'Vous avez une réponse à votre demande d\'assistance. Merci de ne pas répondre directement à cet email, mais de gérer la demande d\'assistance dans 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'] = 'Votre réponse à la demande d\'assistance a été envoyée. Merci de ne pas répondre à cet email.';
-$wb['recipient_or_sender_email_address_not_valid_txt'] = 'Le message n\'a pas pu être envoyé parce que l\'adresse email du destinataire et/ou de l\'émetteur est invalide.';
+$wb['support_request_subject_txt'] = 'Demande d’assistance';
+$wb['support_request_txt'] = 'Vous avez une demande d’assistance. Merci de ne pas répondre directement à cet e-mail, mais de gérer la demande d’assistance dans ISPConfig.';
+$wb['answer_to_support_request_txt'] = 'Vous avez une réponse à votre demande d’assistance. Merci de ne pas répondre directement à cet e-mail, mais de gérer la demande d’assistance dans ISPConfig.';
+$wb['answer_to_support_request_sent_txt'] = 'Your reply to the support request has been sent. Please don’t reply to this e-mail.';
+$wb['support_request_sent_txt'] = 'Votre réponse à la demande d’assistance a été envoyée. Merci de ne pas répondre à cet e-mail.';
+$wb['recipient_or_sender_email_address_not_valid_txt'] = 'Le message n’a pas pu être envoyé parce que l’adresse e-mail du destinataire et/ou de l’émetteur est invalide.';
 ?>
diff --git a/interface/web/help/lib/lang/hr.lng b/interface/web/help/lib/lang/hr.lng
index 71f5920d07..fd9153f239 100644
--- a/interface/web/help/lib/lang/hr.lng
+++ b/interface/web/help/lib/lang/hr.lng
@@ -12,5 +12,3 @@ $wb['Manage Sections'] = 'Upravljaj rubrikama';
 $wb['Add a Question & Answer Pair'] = 'Dodaj pitanje i odgovor';
 $wb['Manage Questions'] = 'Upravljaj pitanjima';
 ?>
-
-
diff --git a/interface/web/help/lib/lang/hr_faq_form.lng b/interface/web/help/lib/lang/hr_faq_form.lng
index 156f32717d..ca798d79e0 100644
--- a/interface/web/help/lib/lang/hr_faq_form.lng
+++ b/interface/web/help/lib/lang/hr_faq_form.lng
@@ -4,5 +4,3 @@ $wb['faq_question_txt'] = 'Pitanje';
 $wb['faq_answer_txt'] = 'Odgovor';
 $wb['faq_section_txt'] = 'Rubrika';
 ?>
-
-
diff --git a/interface/web/help/lib/lang/hr_faq_manage_questions_list.lng b/interface/web/help/lib/lang/hr_faq_manage_questions_list.lng
index 8c03762338..54f46e270e 100644
--- a/interface/web/help/lib/lang/hr_faq_manage_questions_list.lng
+++ b/interface/web/help/lib/lang/hr_faq_manage_questions_list.lng
@@ -7,5 +7,3 @@ $wb['faq_sections_txt'] = 'Rubrika';
 $wb['faq_faq_questions_txt'] = 'Često postavljana pitanja (FAQ)';
 $wb['faq_new_question_txt'] = 'Dodaj novo pitanje i odgovor';
 ?>
-
-
diff --git a/interface/web/help/lib/lang/hr_faq_sections_form.lng b/interface/web/help/lib/lang/hr_faq_sections_form.lng
index 1ada45e644..5eba900af4 100644
--- a/interface/web/help/lib/lang/hr_faq_sections_form.lng
+++ b/interface/web/help/lib/lang/hr_faq_sections_form.lng
@@ -1,5 +1,3 @@
 <?php
 $wb['faq_section_name_txt'] = 'Naziv rubrike';
 ?>
-
-
diff --git a/interface/web/help/lib/lang/hr_help_faq_list.lng b/interface/web/help/lib/lang/hr_help_faq_list.lng
index 83de65ed73..9d910dc0d3 100644
--- a/interface/web/help/lib/lang/hr_help_faq_list.lng
+++ b/interface/web/help/lib/lang/hr_help_faq_list.lng
@@ -1,5 +1,3 @@
 <?php
 $wb['edit_txt'] = 'Izmjeni';
 ?>
-
-
diff --git a/interface/web/help/lib/lang/hr_help_faq_sections_list.lng b/interface/web/help/lib/lang/hr_help_faq_sections_list.lng
index 21026b0a7e..91c78e4485 100644
--- a/interface/web/help/lib/lang/hr_help_faq_sections_list.lng
+++ b/interface/web/help/lib/lang/hr_help_faq_sections_list.lng
@@ -6,5 +6,3 @@ $wb['faq_sections_txt'] = 'Rubrike';
 $wb['faq_faq_sections_txt'] = 'FAQ rubrike';
 $wb['faq_new_section_txt'] = 'Dodaj novu rubriku';
 ?>
-
-
diff --git a/interface/web/help/lib/lang/hr_support_message.lng b/interface/web/help/lib/lang/hr_support_message.lng
index eeed993e74..fca139b995 100644
--- a/interface/web/help/lib/lang/hr_support_message.lng
+++ b/interface/web/help/lib/lang/hr_support_message.lng
@@ -13,5 +13,3 @@ $wb['answer_to_support_request_sent_txt'] = 'Your reply to the support request h
 $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/hr_support_message_list.lng b/interface/web/help/lib/lang/hr_support_message_list.lng
index eb37bac4f0..e7aea1ab72 100644
--- a/interface/web/help/lib/lang/hr_support_message_list.lng
+++ b/interface/web/help/lib/lang/hr_support_message_list.lng
@@ -5,5 +5,3 @@ $wb['subject_txt'] = 'Naslov poruke';
 $wb['add_new_record_txt'] = 'Pošalji novu poruku';
 $wb['date_txt'] = 'Date';
 ?>
-
-
diff --git a/interface/web/help/lib/lang/it.lng b/interface/web/help/lib/lang/it.lng
index c89ffbb235..d02e52ee37 100644
--- a/interface/web/help/lib/lang/it.lng
+++ b/interface/web/help/lib/lang/it.lng
@@ -5,10 +5,10 @@ $wb['Send message'] = 'Spedisci messaggio';
 $wb['View messages'] = 'Visualizza messaggi';
 $wb['Support'] = 'Supporto';
 $wb['About ISPConfig'] = 'About ISPConfig';
-$wb['Version'] = 'Version';
+$wb['Version'] = 'Versione';
 $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['FAQ Sections'] = 'FAQ Sezioni';
+$wb['Manage Sections'] = 'Gestisci Sezioni';
+$wb['Add a Question & Answer Pair'] = 'Aggiungi una domanda e rispondi';
 $wb['Manage Questions'] = 'Manage Questions';
 ?>
diff --git a/interface/web/help/lib/lang/it_faq_form.lng b/interface/web/help/lib/lang/it_faq_form.lng
index dfc4e8799c..7716d19dfa 100644
--- a/interface/web/help/lib/lang/it_faq_form.lng
+++ b/interface/web/help/lib/lang/it_faq_form.lng
@@ -1,6 +1,6 @@
 <?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_question_txt'] = 'Domanda';
+$wb['faq_answer_txt'] = 'Risposta';
+$wb['faq_section_txt'] = 'Sezione';
 ?>
diff --git a/interface/web/help/lib/lang/it_faq_manage_questions_list.lng b/interface/web/help/lib/lang/it_faq_manage_questions_list.lng
index 54e727dead..23a85b5ab6 100644
--- a/interface/web/help/lib/lang/it_faq_manage_questions_list.lng
+++ b/interface/web/help/lib/lang/it_faq_manage_questions_list.lng
@@ -1,9 +1,9 @@
 <?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_question_txt'] = 'Domande';
+$wb['faq_section_name_txt'] = 'Sezione';
+$wb['faq_delete_txt'] = 'Elimina';
+$wb['faq_edit_txt'] = 'Modifica';
+$wb['faq_sections_txt'] = 'Sezione';
 $wb['faq_faq_questions_txt'] = 'Frequently Asked Questions';
-$wb['faq_new_question_txt'] = 'Add a new question & answer pair';
+$wb['faq_new_question_txt'] = 'Aggiungi nuova domanda & rispondi';
 ?>
diff --git a/interface/web/help/lib/lang/it_faq_sections_form.lng b/interface/web/help/lib/lang/it_faq_sections_form.lng
index dab0863b81..8d56d7f3e7 100644
--- a/interface/web/help/lib/lang/it_faq_sections_form.lng
+++ b/interface/web/help/lib/lang/it_faq_sections_form.lng
@@ -1,3 +1,3 @@
 <?php
-$wb['faq_section_name_txt'] = 'Section Name';
+$wb['faq_section_name_txt'] = 'Nome Sezione';
 ?>
diff --git a/interface/web/help/lib/lang/it_help_faq_list.lng b/interface/web/help/lib/lang/it_help_faq_list.lng
index b6c7b460b9..949e33afc2 100644
--- a/interface/web/help/lib/lang/it_help_faq_list.lng
+++ b/interface/web/help/lib/lang/it_help_faq_list.lng
@@ -1,3 +1,3 @@
 <?php
-$wb['edit_txt'] = 'Edit';
+$wb['edit_txt'] = 'Modifica';
 ?>
diff --git a/interface/web/help/lib/lang/it_help_faq_sections_list.lng b/interface/web/help/lib/lang/it_help_faq_sections_list.lng
index cb6ce84c05..470d41eebd 100644
--- a/interface/web/help/lib/lang/it_help_faq_sections_list.lng
+++ b/interface/web/help/lib/lang/it_help_faq_sections_list.lng
@@ -1,8 +1,8 @@
 <?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'] = 'Nome Sezione';
+$wb['faq_delete_txt'] = 'Elimina';
+$wb['faq_edit_txt'] = 'Modifica';
+$wb['faq_sections_txt'] = 'Sezioni';
+$wb['faq_faq_sections_txt'] = 'Sezioni FAQ';
+$wb['faq_new_section_txt'] = 'Aggiungi una nuova sezione';
 ?>
diff --git a/interface/web/help/lib/lang/it_support_message.lng b/interface/web/help/lib/lang/it_support_message.lng
index a4712bda61..5024411b12 100644
--- a/interface/web/help/lib/lang/it_support_message.lng
+++ b/interface/web/help/lib/lang/it_support_message.lng
@@ -4,12 +4,12 @@ $wb['sender_id_txt'] = 'ID del Mittente';
 $wb['subject_txt'] = 'Oggetto';
 $wb['message_txt'] = 'Messaggio';
 $wb['tstamp_txt'] = 'Timestamp';
-$wb['reply_txt'] = 'Reply';
-$wb['date_txt'] = 'Date';
-$wb['support_request_subject_txt'] = 'Support Request';
-$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.';
+$wb['reply_txt'] = 'Rispondi';
+$wb['date_txt'] = 'Data';
+$wb['support_request_subject_txt'] = 'Richiesta supporto';
+$wb['support_request_txt'] = 'Hai una richiesta di supporto Non rispondere a questa email, ma risolvi la richesta direttamente nel pannello di ISPConfig.';
+$wb['answer_to_support_request_txt'] = 'Hai una risposta alla richiesta di supporto. Non rispondere a questa email, ma risolvi la richesta direttamente nel pannello diISPConfig.';
+$wb['answer_to_support_request_sent_txt'] = 'La tua richiesta di supporto è stata trasmessa. Non rispondere a questa email.';
+$wb['support_request_sent_txt'] = 'La tua richiesta di supporto è stata trasmessa. Non rispondere a questa email.';
+$wb['recipient_or_sender_email_address_not_valid_txt'] = 'Impossibile trasmettere il messaggio. Destinatario non valido.';
 ?>
diff --git a/interface/web/help/lib/lang/tr.lng b/interface/web/help/lib/lang/tr.lng
index 0b8e96227b..4aeaa0ac0f 100644
--- a/interface/web/help/lib/lang/tr.lng
+++ b/interface/web/help/lib/lang/tr.lng
@@ -11,6 +11,4 @@ $wb['FAQ Sections'] = 'SSS Bölümleri';
 $wb['Manage Sections'] = 'Bölüm Yönetimi';
 $wb['Add a Question & Answer Pair'] = 'Soru-Yanıt Ekle';
 $wb['Manage Questions'] = 'Soru Yönetimi';
-
 ?>
-
diff --git a/interface/web/help/lib/lang/tr_faq_form.lng b/interface/web/help/lib/lang/tr_faq_form.lng
index 3a5e210c0c..e128fca8a6 100644
--- a/interface/web/help/lib/lang/tr_faq_form.lng
+++ b/interface/web/help/lib/lang/tr_faq_form.lng
@@ -4,4 +4,3 @@ $wb['faq_question_txt'] = 'Soru';
 $wb['faq_answer_txt'] = 'Yanıt';
 $wb['faq_section_txt'] = 'Bölüm';
 ?>
-
diff --git a/interface/web/help/lib/lang/tr_faq_manage_questions_list.lng b/interface/web/help/lib/lang/tr_faq_manage_questions_list.lng
index 2c53d547dd..51d14a607d 100644
--- a/interface/web/help/lib/lang/tr_faq_manage_questions_list.lng
+++ b/interface/web/help/lib/lang/tr_faq_manage_questions_list.lng
@@ -6,7 +6,4 @@ $wb['faq_edit_txt'] = 'Düzenle';
 $wb['faq_sections_txt'] = 'Bölüm';
 $wb['faq_faq_questions_txt'] = 'Sık Sorulan Sorular';
 $wb['faq_new_question_txt'] = 'Soru Yanıt Çifti Ekle';
-$wb['faq_new_question_txt'] = 'Soru Yanıt Çifti Ekle';
 ?>
-
-
diff --git a/interface/web/help/lib/lang/tr_faq_sections_form.lng b/interface/web/help/lib/lang/tr_faq_sections_form.lng
index b4f7caaf58..1e62f4a113 100644
--- a/interface/web/help/lib/lang/tr_faq_sections_form.lng
+++ b/interface/web/help/lib/lang/tr_faq_sections_form.lng
@@ -1,4 +1,3 @@
 <?php
 $wb['faq_section_name_txt'] = 'Bölüm Adı';
 ?>
-
diff --git a/interface/web/help/lib/lang/tr_help_faq_list.lng b/interface/web/help/lib/lang/tr_help_faq_list.lng
index 1382a4d00b..bfd17069a0 100644
--- a/interface/web/help/lib/lang/tr_help_faq_list.lng
+++ b/interface/web/help/lib/lang/tr_help_faq_list.lng
@@ -1,4 +1,3 @@
 <?php
 $wb['edit_txt'] = 'Düzenle';
 ?>
-
diff --git a/interface/web/help/lib/lang/tr_help_faq_sections_list.lng b/interface/web/help/lib/lang/tr_help_faq_sections_list.lng
index 50c6840cd2..2eb01f6ee4 100644
--- a/interface/web/help/lib/lang/tr_help_faq_sections_list.lng
+++ b/interface/web/help/lib/lang/tr_help_faq_sections_list.lng
@@ -6,5 +6,3 @@ $wb['faq_sections_txt'] = 'Bölümler';
 $wb['faq_faq_sections_txt'] = 'SSS Bölümleri';
 $wb['faq_new_section_txt'] = 'Bölüm Ekle';
 ?>
-
-
diff --git a/interface/web/help/lib/lang/tr_support_message.lng b/interface/web/help/lib/lang/tr_support_message.lng
index d67a37fadf..76a788e2b6 100644
--- a/interface/web/help/lib/lang/tr_support_message.lng
+++ b/interface/web/help/lib/lang/tr_support_message.lng
@@ -13,4 +13,3 @@ $wb['answer_to_support_request_sent_txt'] = 'Destek isteğinize yazdığınız y
 $wb['support_request_sent_txt'] = 'Destek isteğiniz gönderildi. Lütfen bu e-postayı yanıtlamayın.';
 $wb['recipient_or_sender_email_address_not_valid_txt'] = 'Gönderen ya da alıcı adresi geçersiz olduğundan bu ileti gönderilemedi.';
 ?>
-
diff --git a/interface/web/login/lib/lang/ar.lng b/interface/web/login/lib/lang/ar.lng
index 18ea8c8e89..9ba0072130 100644
--- a/interface/web/login/lib/lang/ar.lng
+++ b/interface/web/login/lib/lang/ar.lng
@@ -24,4 +24,5 @@ $wb['theme_not_compatible'] = 'The chosen theme is not compatible with the curre
 $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['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
 ?>
diff --git a/interface/web/login/lib/lang/bg.lng b/interface/web/login/lib/lang/bg.lng
index e6f158f2f9..09906f7109 100644
--- a/interface/web/login/lib/lang/bg.lng
+++ b/interface/web/login/lib/lang/bg.lng
@@ -24,4 +24,5 @@ $wb['theme_not_compatible'] = 'The chosen theme is not compatible with the curre
 $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['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
 ?>
diff --git a/interface/web/login/lib/lang/br.lng b/interface/web/login/lib/lang/br.lng
index 54ad4b15b1..3e0ef0ac49 100644
--- a/interface/web/login/lib/lang/br.lng
+++ b/interface/web/login/lib/lang/br.lng
@@ -24,4 +24,5 @@ $wb['theme_not_compatible'] = 'The chosen theme is not compatible with the curre
 $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['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
 ?>
diff --git a/interface/web/login/lib/lang/ca.lng b/interface/web/login/lib/lang/ca.lng
new file mode 100644
index 0000000000..87a9368be0
--- /dev/null
+++ b/interface/web/login/lib/lang/ca.lng
@@ -0,0 +1,28 @@
+<?php
+$wb['error_user_password_empty'] = 'Le nom d\'utilisateur ou le mot de passe sont vides.';
+$wb['error_user_password_incorrect'] = 'Le nom d\'utilisateur ou le mot de passe sont incorrects.';
+$wb['error_user_blocked'] = 'L\'utilisateur a été bloqué.';
+$wb['error_user_too_many_logins'] = 'Trop de tentatives effectuées, essayez dans 15 minutes.';
+$wb['pass_reset_txt'] = 'Un nouveau mot de passe vous sera envoyé à votre adresse e-mail si celle-ci correspond à celle dans votre espace client.';
+$wb['pw_reset'] = 'Le mot de passe a été réinitialisé, et vous a été envoyé à votre adresse e-mail.';
+$wb['pw_error'] = 'Le nom d\'utilisateur et/ou L\'adresse e-mail ne correspondent pas.';
+$wb['pw_error_noinput'] = 'Entrez votre nom d\'utilisateur et votre adresse e-mail.';
+$wb['pw_reset_mail_msg'] = 'Le mot de passe d\'accès à votre panel a été réinitialisé. Le nouveau mot de passe est : ';
+$wb['pw_reset_mail_title'] = 'Le mot de passe d\'accès à votre panel a été réinitialisé.';
+$wb['user_regex_error'] = 'Le nom d\'utilisateur contient des caractères incorrects ou contient plus de 64 caractères.';
+$wb['pw_error_length'] = 'Le nom d\'utilisateur contient plus de que 64 caractères.';
+$wb['username_txt'] = 'Nom d\'utilisateur';
+$wb['password_txt'] = 'Mot de passe';
+$wb['login_button_txt'] = 'Connexion';
+$wb['pw_lost_txt'] = 'Mot de passe perdu';
+$wb['error_maintenance_mode'] = 'Cette installation de ISPConfig est actuellement en maintenance. Nous serons de retour bientôt. Merci pour votre patience.';
+$wb['login_txt'] = 'Identifiants';
+$wb['pw_reset_txt'] = 'Réinitialiser le mot de passe';
+$wb['pw_button_txt'] = 'Renvoyer le mot de passe';
+$wb['email_txt'] = 'Courriel';
+$wb['theme_not_compatible'] = 'Le thème choisi n\'est pas compatible avecla version courante de ISPConfig. Veuillez chercher une nouvelle version du thème.<br />Le thème par defaut a été automatiquement activé.';
+$wb['back_txt'] = 'Retour';
+$wb['email_error'] = 'Email contains unallowed characters or has a invalid format.';
+$wb['stay_logged_in_txt'] = 'Keep me logged in';
+$wb['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
+?>
diff --git a/interface/web/login/lib/lang/ca_login_as.lng b/interface/web/login/lib/lang/ca_login_as.lng
new file mode 100644
index 0000000000..c660ff1a4b
--- /dev/null
+++ b/interface/web/login/lib/lang/ca_login_as.lng
@@ -0,0 +1,11 @@
+<?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['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 \\",\\".';
+?>
diff --git a/interface/web/login/lib/lang/cz.lng b/interface/web/login/lib/lang/cz.lng
index 2d06ecb883..39fbb6cd85 100644
--- a/interface/web/login/lib/lang/cz.lng
+++ b/interface/web/login/lib/lang/cz.lng
@@ -24,6 +24,5 @@ $wb['theme_not_compatible'] = 'Zvolené téma není kompatibilní s aktuální v
 $wb['back_txt'] = 'Zpět';
 $wb['email_error'] = 'E-mail obsahuje nepovolené znaky nebo má neplatný formát.';
 $wb['stay_logged_in_txt'] = 'Zapamatovat si přihlášení';
+$wb['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
 ?>
-
-
diff --git a/interface/web/login/lib/lang/el.lng b/interface/web/login/lib/lang/el.lng
index 95e1db242f..66ed0dfdd4 100644
--- a/interface/web/login/lib/lang/el.lng
+++ b/interface/web/login/lib/lang/el.lng
@@ -24,4 +24,5 @@ $wb['theme_not_compatible'] = 'The chosen theme is not compatible with the curre
 $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['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
 ?>
diff --git a/interface/web/login/lib/lang/es.lng b/interface/web/login/lib/lang/es.lng
index 0a35fcbbda..2a1550b5ea 100644
--- a/interface/web/login/lib/lang/es.lng
+++ b/interface/web/login/lib/lang/es.lng
@@ -24,4 +24,5 @@ $wb['theme_not_compatible'] = 'El tema elegido no es compatible con la versión
 $wb['back_txt'] = 'Volver';
 $wb['email_error'] = 'La dirección de correo contiene caracteres no permitidos o no es válida.';
 $wb['stay_logged_in_txt'] = 'Permanecer conectado';
+$wb['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
 ?>
diff --git a/interface/web/login/lib/lang/es_login_as.lng b/interface/web/login/lib/lang/es_login_as.lng
index c029a8aab7..c5c46a9619 100644
--- a/interface/web/login/lib/lang/es_login_as.lng
+++ b/interface/web/login/lib/lang/es_login_as.lng
@@ -1,11 +1,11 @@
 <?php
 $wb['login_1_txt'] = 'Desea iniciar sesión como usuario';
-$wb['login_2_txt'] = 'Si lo hace, puede \"volver\" haciendo clic en salir.';
+$wb['login_2_txt'] = 'Si lo hace, puede \\"volver\\" haciendo clic en salir.';
 $wb['btn_yes_txt'] = 'Sí, iniciar sesión como cliente';
 $wb['btn_back_txt'] = 'No, volver a la lista';
 $wb['udp_port_help_txt'] = 'Separado por coma';
 $wb['active_txt'] = 'Habilitado';
 $wb['firewall_error_unique'] = 'Ya existe un registro de corta fuego para este servidor.';
-$wb['tcp_ports_error_regex'] = 'Caracteres no permitidos en la definición de puertos tcp. Los caracteres permitidos son números, \":\" y \",\".';
-$wb['udp_ports_error_regex'] = 'Caracteres no permitidos en la definición de puertos udp. Los caracteres permitidos son números, \":\" y \",\".';
+$wb['tcp_ports_error_regex'] = 'Caracteres no permitidos en la definición de puertos tcp. Los caracteres permitidos son números, \\":\\" y \\",\\".';
+$wb['udp_ports_error_regex'] = 'Caracteres no permitidos en la definición de puertos udp. Los caracteres permitidos son números, \\":\\" y \\",\\".';
 ?>
diff --git a/interface/web/login/lib/lang/fi.lng b/interface/web/login/lib/lang/fi.lng
index 46ab8dea38..54e5f4a46a 100755
--- a/interface/web/login/lib/lang/fi.lng
+++ b/interface/web/login/lib/lang/fi.lng
@@ -24,4 +24,5 @@ $wb['theme_not_compatible'] = 'The chosen theme is not compatible with the curre
 $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['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
 ?>
diff --git a/interface/web/login/lib/lang/fr.lng b/interface/web/login/lib/lang/fr.lng
index 98aef7dd6d..2d7520753e 100644
--- a/interface/web/login/lib/lang/fr.lng
+++ b/interface/web/login/lib/lang/fr.lng
@@ -1,17 +1,17 @@
 <?php
-$wb['error_user_password_empty'] = 'Le nom d\'utilisateur ou le mot de passe sont vides.';
-$wb['error_user_password_incorrect'] = 'Le nom d\'utilisateur ou le mot de passe sont incorrects.';
-$wb['error_user_blocked'] = 'L\'utilisateur a été bloqué.';
+$wb['error_user_password_empty'] = 'Le nom d’utilisateur ou le mot de passe sont vides.';
+$wb['error_user_password_incorrect'] = 'Le nom d’utilisateur ou le mot de passe sont incorrects.';
+$wb['error_user_blocked'] = 'L’utilisateur a été bloqué.';
 $wb['error_user_too_many_logins'] = 'Trop de tentatives effectuées, essayez dans 15 minutes.';
-$wb['pass_reset_txt'] = 'Un nouveau mot de passe vous sera envoyé à votre adresse e-mail si celle-ci correspond à celle dans votre espace client.';
+$wb['pass_reset_txt'] = 'Un nouveau mot de passe vous sera envoyé à votre adresse e-mail si celle-ci correspond à celle définie dans votre espace client.';
 $wb['pw_reset'] = 'Le mot de passe a été réinitialisé, et vous a été envoyé à votre adresse e-mail.';
-$wb['pw_error'] = 'Le nom d\'utilisateur et/ou L\'adresse e-mail ne correspondent pas.';
-$wb['pw_error_noinput'] = 'Entrez votre nom d\'utilisateur et votre adresse e-mail.';
-$wb['pw_reset_mail_msg'] = 'Le mot de passe d\'accès à votre panel a été réinitialisé. Le nouveau mot de passe est : ';
-$wb['pw_reset_mail_title'] = 'Le mot de passe d\'accès à votre panel a été réinitialisé.';
-$wb['user_regex_error'] = 'Le nom d\'utilisateur contient des caractères incorrects ou contient plus de 64 caractères.';
-$wb['pw_error_length'] = 'Le nom d\'utilisateur contient plus de que 64 caractères.';
-$wb['username_txt'] = 'Nom d\'utilisateur';
+$wb['pw_error'] = 'Le nom d’utilisateur ou l’adresse e-mail ne correspondent pas.';
+$wb['pw_error_noinput'] = 'Saisissez votre nom d’utilisateur et votre adresse e-mail.';
+$wb['pw_reset_mail_msg'] = 'Le mot de passe d’accès à votre Panel a été réinitialisé. Le nouveau mot de passe est : ';
+$wb['pw_reset_mail_title'] = 'Le mot de passe d’accès à votre Panel a été réinitialisé.';
+$wb['user_regex_error'] = 'Le nom d’utilisateur contient des caractères incorrects ou contient plus de 64 caractères.';
+$wb['pw_error_length'] = 'Le mot de passe contient plus de 64 caractères.';
+$wb['username_txt'] = 'Nom d’utilisateur';
 $wb['password_txt'] = 'Mot de passe';
 $wb['login_button_txt'] = 'Connexion';
 $wb['pw_lost_txt'] = 'Mot de passe perdu';
@@ -19,9 +19,10 @@ $wb['error_maintenance_mode'] = 'Cette installation de ISPConfig est actuellemen
 $wb['login_txt'] = 'Login';
 $wb['pw_reset_txt'] = 'Réinitialiser le mot de passe';
 $wb['pw_button_txt'] = 'Renvoyer le mot de passe';
-$wb['email_txt'] = 'Email';
-$wb['theme_not_compatible'] = 'Le thème choisi n\'est pas compatible avecla version courante de ISPConfig. Veuillez chercher une nouvelle version du thème.<br />Le thème par defaut a été automatiquement activé.';
+$wb['email_txt'] = 'E-mail';
+$wb['theme_not_compatible'] = 'Le thème choisi n’est pas compatible avec la version courante de ISPConfig. Veuillez chercher une nouvelle version du thème.<br />Le thème par defaut a été automatiquement activé.';
 $wb['back_txt'] = 'Retour';
-$wb['email_error'] = 'Email contains unallowed characters or has a invalid format.';
+$wb['email_error'] = 'L’adresse e-mail contient des caractères non antorisés ou n’est pas dans le bon format.';
 $wb['stay_logged_in_txt'] = 'Keep me logged in';
+$wb['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
 ?>
diff --git a/interface/web/login/lib/lang/fr_login_as.lng b/interface/web/login/lib/lang/fr_login_as.lng
index c660ff1a4b..01b4606111 100644
--- a/interface/web/login/lib/lang/fr_login_as.lng
+++ b/interface/web/login/lib/lang/fr_login_as.lng
@@ -1,11 +1,11 @@
 <?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'] = 'Voulez-vous vous connecter en tant qu’un utilisateur ';
+$wb['login_2_txt'] = 'Si vous le faites, vous pourrez vous « revenir en arrière » en cliquant sur « Se déconnnecter ».';
+$wb['btn_yes_txt'] = 'Oui, se connecter en tant qu’un client';
+$wb['btn_back_txt'] = 'Non, revenir à la liste';
+$wb['udp_port_help_txt'] = 'Séparée par une virgule';
+$wb['active_txt'] = 'Actif';
 $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'] = 'Caractère non autorisé dans la règle de port TCP. Les caractères autorisés sont : les chiffres, « : » et « , ».';
+$wb['udp_ports_error_regex'] = 'Caractère non autorisé dans la règle de port UDP. Les caractères autorisés sont : les chiffres, « : » et « , ».';
 ?>
diff --git a/interface/web/login/lib/lang/hr.lng b/interface/web/login/lib/lang/hr.lng
index 6550f5b34e..c8bad67a5b 100644
--- a/interface/web/login/lib/lang/hr.lng
+++ b/interface/web/login/lib/lang/hr.lng
@@ -24,6 +24,5 @@ $wb['theme_not_compatible'] = 'The chosen theme is not compatible with the curre
 $wb['back_txt'] = 'Natrag';
 $wb['email_error'] = 'Email contains unallowed characters or has a invalid format.';
 $wb['stay_logged_in_txt'] = 'Keep me logged in';
+$wb['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
 ?>
-
-
diff --git a/interface/web/login/lib/lang/hr_login_as.lng b/interface/web/login/lib/lang/hr_login_as.lng
index bbb66c6310..2bf96faf9b 100644
--- a/interface/web/login/lib/lang/hr_login_as.lng
+++ b/interface/web/login/lib/lang/hr_login_as.lng
@@ -9,5 +9,3 @@ $wb['firewall_error_unique'] = 'There is already a firewall record for this serv
 $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/lib/lang/hu.lng b/interface/web/login/lib/lang/hu.lng
index c2a36bbaae..6073ce20db 100644
--- a/interface/web/login/lib/lang/hu.lng
+++ b/interface/web/login/lib/lang/hu.lng
@@ -24,4 +24,5 @@ $wb['theme_not_compatible'] = 'The chosen theme is not compatible with the curre
 $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['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
 ?>
diff --git a/interface/web/login/lib/lang/id.lng b/interface/web/login/lib/lang/id.lng
index 1daa432407..a71c688d1f 100644
--- a/interface/web/login/lib/lang/id.lng
+++ b/interface/web/login/lib/lang/id.lng
@@ -24,4 +24,5 @@ $wb['theme_not_compatible'] = 'The chosen theme is not compatible with the curre
 $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['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
 ?>
diff --git a/interface/web/login/lib/lang/it.lng b/interface/web/login/lib/lang/it.lng
index 74a0870ec8..0c3ca1be98 100644
--- a/interface/web/login/lib/lang/it.lng
+++ b/interface/web/login/lib/lang/it.lng
@@ -13,15 +13,16 @@ $wb['user_regex_error'] = 'Nome utente contenente caratteri non permessi oppure
 $wb['pw_error_length'] = 'Lunghezza password maggiore di 64 caratteri.';
 $wb['username_txt'] = 'Nome utente';
 $wb['password_txt'] = 'Password';
-$wb['login_button_txt'] = 'Login';
-$wb['pw_lost_txt'] = 'Password lost';
-$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['login_button_txt'] = 'Accedi';
+$wb['pw_lost_txt'] = 'Password smarrita';
+$wb['error_maintenance_mode'] = 'Il pannello di controllo ISPConfig è in manutenzione. Saremo online tra breve. Grazie per la collaborazione.';
+$wb['login_txt'] = 'Accedi';
 $wb['pw_reset_txt'] = 'Password reset';
-$wb['pw_button_txt'] = 'Resend password';
+$wb['pw_button_txt'] = 'Invia password';
 $wb['email_txt'] = 'Email';
-$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['theme_not_compatible'] = 'Il tema selezionato non è compatibile con questa versione del pannello ISPConfig. Verificare esistenza di una nuova versione del tema.<br />Il tema di default è stato attivato automaticamente.';
+$wb['back_txt'] = 'Indietro';
+$wb['email_error'] = 'Email contiene caratteri non autorizzati o un formato non valido.';
+$wb['stay_logged_in_txt'] = 'Ricordami';
+$wb['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
 ?>
diff --git a/interface/web/login/lib/lang/it_login_as.lng b/interface/web/login/lib/lang/it_login_as.lng
index c660ff1a4b..3c8025697a 100644
--- a/interface/web/login/lib/lang/it_login_as.lng
+++ b/interface/web/login/lib/lang/it_login_as.lng
@@ -1,11 +1,11 @@
 <?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['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['login_1_txt'] = 'Desideri accedere come utente';
+$wb['login_2_txt'] = 'Se vuoi procedere puoi tornare indietro \\"go back\\" eseguendo il logout.';
+$wb['btn_yes_txt'] = 'Si, login accedi come cliente';
+$wb['btn_back_txt'] = 'No, torna alla lista';
+$wb['udp_port_help_txt'] = 'Separato da virgola';
+$wb['active_txt'] = 'Attivo';
+$wb['firewall_error_unique'] = 'Esiste già un record firewall per questo server.';
+$wb['tcp_ports_error_regex'] = 'Caratteri non autorizzati nella definizine di porta tcp. Sono consentiti caratteri numerici, \\":\\" e \\",\\".';
+$wb['udp_ports_error_regex'] = 'Caratteri non autorizzati nella definizine di porta udp. ono consentiti caratteri numerici, \\":\\" e \\",\\".';
 ?>
diff --git a/interface/web/login/lib/lang/ja.lng b/interface/web/login/lib/lang/ja.lng
index 85b7059bfa..762cf82377 100644
--- a/interface/web/login/lib/lang/ja.lng
+++ b/interface/web/login/lib/lang/ja.lng
@@ -24,4 +24,5 @@ $wb['theme_not_compatible'] = 'The chosen theme is not compatible with the curre
 $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['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
 ?>
diff --git a/interface/web/login/lib/lang/nl.lng b/interface/web/login/lib/lang/nl.lng
index 16a0dee04d..142be8540a 100644
--- a/interface/web/login/lib/lang/nl.lng
+++ b/interface/web/login/lib/lang/nl.lng
@@ -24,4 +24,5 @@ $wb['theme_not_compatible'] = 'The chosen theme is not compatible with the curre
 $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['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
 ?>
diff --git a/interface/web/login/lib/lang/pl.lng b/interface/web/login/lib/lang/pl.lng
index b08d7ba7ba..169832f494 100644
--- a/interface/web/login/lib/lang/pl.lng
+++ b/interface/web/login/lib/lang/pl.lng
@@ -24,4 +24,5 @@ $wb['theme_not_compatible'] = 'Wybrany temat nie jest kompatybilny z aktualną w
 $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['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
 ?>
diff --git a/interface/web/login/lib/lang/pt.lng b/interface/web/login/lib/lang/pt.lng
index 2c39b0bc7f..def58a9429 100644
--- a/interface/web/login/lib/lang/pt.lng
+++ b/interface/web/login/lib/lang/pt.lng
@@ -24,4 +24,5 @@ $wb['theme_not_compatible'] = 'The chosen theme is not compatible with the curre
 $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['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
 ?>
diff --git a/interface/web/login/lib/lang/ro.lng b/interface/web/login/lib/lang/ro.lng
index 337ebda844..7b8ac4b917 100644
--- a/interface/web/login/lib/lang/ro.lng
+++ b/interface/web/login/lib/lang/ro.lng
@@ -24,4 +24,5 @@ $wb['theme_not_compatible'] = 'The chosen theme is not compatible with the curre
 $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['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
 ?>
diff --git a/interface/web/login/lib/lang/ru.lng b/interface/web/login/lib/lang/ru.lng
index 348b04f214..9108c10109 100644
--- a/interface/web/login/lib/lang/ru.lng
+++ b/interface/web/login/lib/lang/ru.lng
@@ -24,4 +24,5 @@ $wb['theme_not_compatible'] = 'The chosen theme is not compatible with the curre
 $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['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
 ?>
diff --git a/interface/web/login/lib/lang/se.lng b/interface/web/login/lib/lang/se.lng
index aeb58b1588..eb454890a2 100644
--- a/interface/web/login/lib/lang/se.lng
+++ b/interface/web/login/lib/lang/se.lng
@@ -24,4 +24,5 @@ $wb['theme_not_compatible'] = 'The chosen theme is not compatible with the curre
 $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';
+$wb['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
 ?>
diff --git a/interface/web/login/lib/lang/sk.lng b/interface/web/login/lib/lang/sk.lng
index 53fe255a9a..d4b91e407e 100644
--- a/interface/web/login/lib/lang/sk.lng
+++ b/interface/web/login/lib/lang/sk.lng
@@ -24,4 +24,5 @@ $wb['theme_not_compatible'] = 'The chosen theme is not compatible with the curre
 $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['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
 ?>
diff --git a/interface/web/login/lib/lang/tr.lng b/interface/web/login/lib/lang/tr.lng
index a1518f9872..4efd4f416c 100644
--- a/interface/web/login/lib/lang/tr.lng
+++ b/interface/web/login/lib/lang/tr.lng
@@ -24,4 +24,5 @@ $wb['back_txt'] = 'Geri';
 $wb['error_maintenance_mode'] = 'ISPConfig bakımda. Kısa bir süre sonra yeniden çalışıyor olacak, sabrınız için teşekkürler.';
 $wb['theme_not_compatible'] = 'Seçilmiş tema geçerli ISPConfig sürümü ile uyumlu değil. Lütfen temanın yeni sürümünü araştırın.<br />Varsayılan tema etkinleştirildi.';
 $wb['stay_logged_in_txt'] = 'Oturumum açık kalsın';
+$wb['lost_password_function_disabled_txt'] = 'The lost password function is not available for this user.';
 ?>
diff --git a/interface/web/login/lib/lang/tr_login_as.lng b/interface/web/login/lib/lang/tr_login_as.lng
index b7fc8ff987..24efdfddfd 100644
--- a/interface/web/login/lib/lang/tr_login_as.lng
+++ b/interface/web/login/lib/lang/tr_login_as.lng
@@ -1,12 +1,11 @@
 <?php
 $wb['login_1_txt'] = 'Bu kullanıcı olarak oturum açmak ister misiniz';
-$wb['login_2_txt'] = '"Geri dönmek" için oturumu kapat üzerine tıklayın.';
+$wb['login_2_txt'] = '\"Geri dönmek\" için oturumu kapat üzerine tıklayın.';
 $wb['btn_yes_txt'] = 'Evet, Müşteri olarak oturum aç';
 $wb['btn_back_txt'] = 'Hayır, listeye geri dön';
 $wb['udp_port_help_txt'] = 'Virgül ile ayırarak yazın';
 $wb['active_txt'] = 'Etkin';
 $wb['firewall_error_unique'] = 'Bu sunucu için bir güvenlik duvarı kaydı zaten var.';
-$wb['active_txt'] = 'Etkin';
-$wb['tcp_ports_error_regex'] = 'TCP kapı açıklamasında karakter kullanılamaz. Yalnız rakam, ":" ve "," karakterleri kullanılabilir.';
-$wb['udp_ports_error_regex'] = 'UDP kapı açıklamasında karakter kullanılamaz. Yalnız rakam, ":" ve "," karakterleri kullanılabilir.';
+$wb['tcp_ports_error_regex'] = 'TCP kapı açıklamasında karakter kullanılamaz. Yalnız rakam, \":\" ve \",\" karakterleri kullanılabilir.';
+$wb['udp_ports_error_regex'] = 'UDP kapı açıklamasında karakter kullanılamaz. Yalnız rakam, \":\" ve \",\" karakterleri kullanılabilir.';
 ?>
diff --git a/interface/web/mail/lib/lang/ar_backup_stats_list.lng b/interface/web/mail/lib/lang/ar_backup_stats_list.lng
index 9ae9658257..79cd6c9a63 100644
--- a/interface/web/mail/lib/lang/ar_backup_stats_list.lng
+++ b/interface/web/mail/lib/lang/ar_backup_stats_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Email';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Email';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/mail/lib/lang/ar_mail_alias.lng b/interface/web/mail/lib/lang/ar_mail_alias.lng
index a0fa3b45ba..32a6b85e4e 100644
--- a/interface/web/mail/lib/lang/ar_mail_alias.lng
+++ b/interface/web/mail/lib/lang/ar_mail_alias.lng
@@ -12,4 +12,6 @@ $wb['domain_txt'] = 'Domain';
 $wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
 $wb['source_txt'] = 'Alias';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
 ?>
diff --git a/interface/web/mail/lib/lang/ar_mail_domain.lng b/interface/web/mail/lib/lang/ar_mail_domain.lng
index 1ab11938e0..4d99d0fb5e 100644
--- a/interface/web/mail/lib/lang/ar_mail_domain.lng
+++ b/interface/web/mail/lib/lang/ar_mail_domain.lng
@@ -10,13 +10,14 @@ $wb['client_txt'] = 'Client';
 $wb['limit_maildomain_txt'] = 'The max. number of email domains for your account is reached.';
 $wb['policy_txt'] = 'Spamfilter';
 $wb['no_policy'] = '- not enabled -';
-$wb["dkim_txt"] = 'enable DKIM';
-$wb["dkim_private_txt"] = 'DKIM Private-key';
-$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
-$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
-$wb["dkim_dns_txt"] = 'DNS-Record';
-$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
+$wb['dkim_txt'] = 'enable DKIM';
+$wb['dkim_private_txt'] = 'DKIM Private-key';
+$wb['dkim_public_txt'] = 'DKIM Public-key\nfor information only';
+$wb['dkim_generate_txt'] = 'Generate DKIM Private-key';
+$wb['dkim_dns_txt'] = 'DNS-Record';
+$wb['dkim_private_key_error'] = 'Invalid DKIM-Private key';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
-$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
+$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 ?>
diff --git a/interface/web/mail/lib/lang/ar_mail_forward.lng b/interface/web/mail/lib/lang/ar_mail_forward.lng
index 120ec98c3c..95f9a13495 100644
--- a/interface/web/mail/lib/lang/ar_mail_forward.lng
+++ b/interface/web/mail/lib/lang/ar_mail_forward.lng
@@ -7,4 +7,7 @@ $wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email addre
 $wb['domain_txt'] = 'Domain';
 $wb['source_txt'] = 'Source Email';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
 ?>
diff --git a/interface/web/mail/lib/lang/ar_mail_user.lng b/interface/web/mail/lib/lang/ar_mail_user.lng
index eae105ff2c..688d558aec 100644
--- a/interface/web/mail/lib/lang/ar_mail_user.lng
+++ b/interface/web/mail/lib/lang/ar_mail_user.lng
@@ -48,8 +48,8 @@ $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["backup_interval_txt"] = 'Backup interval';
-$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['no_backup_txt'] = 'No backup';
 $wb['daily_backup_txt'] = 'Daily';
 $wb['weekly_backup_txt'] = 'Weekly';
@@ -57,4 +57,8 @@ $wb['monthly_backup_txt'] = 'Monthly';
 $wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
 $wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
+$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
+$wb['sender_cc_txt'] = 'Send outgoing copy to';
+$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
+$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
diff --git a/interface/web/mail/lib/lang/ar_mail_user_filter.lng b/interface/web/mail/lib/lang/ar_mail_user_filter.lng
index 2e74ffd4f7..2c92d65013 100644
--- a/interface/web/mail/lib/lang/ar_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/ar_mail_user_filter.lng
@@ -15,6 +15,14 @@ $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['move_stop_txt'] = 'Move to';
+$wb['header_txt'] = 'Header';
+$wb['size_over_txt'] = 'Email size over (KB)';
+$wb['size_under_txt'] = 'Email size under (KB)';
+$wb['localpart_txt'] = 'Localpart';
+$wb['domain_txt'] = 'Domain';
+$wb['keep_txt'] = 'Keep';
+$wb['reject_txt'] = 'Reject';
+$wb['stop_txt'] = 'Stop';
 ?>
diff --git a/interface/web/mail/lib/lang/ar_mail_user_list.lng b/interface/web/mail/lib/lang/ar_mail_user_list.lng
index 3417eaacfd..0bb531f785 100644
--- a/interface/web/mail/lib/lang/ar_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/ar_mail_user_list.lng
@@ -5,4 +5,8 @@ $wb['autoresponder_txt'] = 'Autoresponder';
 $wb['add_new_record_txt'] = 'Add new Mailbox';
 $wb['name_txt'] = 'Realname';
 $wb['login_txt'] = 'Login';
+$wb['postfix_txt'] = 'Receiving';
+$wb['disablesmtp_txt'] = 'SMTP (sending)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
 ?>
diff --git a/interface/web/mail/lib/lang/ar_xmpp_domain.lng b/interface/web/mail/lib/lang/ar_xmpp_domain.lng
new file mode 100644
index 0000000000..0541203b2e
--- /dev/null
+++ b/interface/web/mail/lib/lang/ar_xmpp_domain.lng
@@ -0,0 +1,62 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['client_group_id_txt'] = 'Client';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Type';
+$wb['active_txt'] = 'Active';
+$wb['client_txt'] = 'Client';
+$wb['management_method_txt'] = 'Management of user accounts';
+$wb['public_registration_txt'] = 'Enable public registration';
+$wb['registration_url_txt'] = 'Registration URL';
+$wb['registration_message_txt'] = 'Registration Message';
+$wb['domain_admins_txt'] = 'Domain Admins (JIDs)';
+$wb['use_pubsub_txt'] = 'Enable Pubsub';
+$wb['use_proxy_txt'] = 'Enable Bytestream Proxy';
+$wb['use_anon_host_txt'] = 'Enable Anonymous Host';
+$wb['use_vjud_txt'] = 'Enable VJUD User Directory';
+$wb['vjud_opt_mode_txt'] = 'VJUD Opt Mode';
+$wb['use_muc_host_txt'] = 'Enable Multi User Chatrooms';
+$wb['muc_name_txt'] = 'Name in MUC Service Discovery';
+$wb['muc_restrict_room_creation_txt'] = 'Permission to create chatrooms';
+$wb['muc_admins_txt'] = 'MUC Admins (JIDs)';
+$wb['use_pastebin_txt'] = 'Enable Pastebin';
+$wb['pastebin_expire_after_txt'] = 'Pastes expire after (hours)';
+$wb['pastebin_trigger_txt'] = 'Pastebin trigger';
+$wb['use_http_archive_txt'] = 'Enable HTTP chatroom archive';
+$wb['http_archive_show_join_txt'] = 'Show join messages in archive';
+$wb['http_archive_show_status_txt'] = 'Show status changes in archive';
+$wb['use_status_host_txt'] = 'Enable XML Status host';
+$wb['cant_change_domainname_txt'] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb['about_registration_url_txt'] = 'Link to your registration form.';
+$wb['about_registration_message_txt'] = 'Description about your account registration process.';
+$wb['no_corresponding_maildomain_txt'] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_email_txt'] = 'Email Address';
+$wb['ssl_txt'] = 'SSL';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['none_txt'] = 'None';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ssl_error_isemail'] = 'Please enter a valid email adress for generation of the SSL certificate';
+$wb['limit_xmppdomain_txt'] = 'The max. number of XMPP domains for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/ar_xmpp_domain_admin_list.lng b/interface/web/mail/lib/lang/ar_xmpp_domain_admin_list.lng
new file mode 100644
index 0000000000..af643eab5a
--- /dev/null
+++ b/interface/web/mail/lib/lang/ar_xmpp_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'XMPP Domain';
+$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';
+?>
diff --git a/interface/web/mail/lib/lang/ar_xmpp_domain_list.lng b/interface/web/mail/lib/lang/ar_xmpp_domain_list.lng
new file mode 100644
index 0000000000..ebfebab7d5
--- /dev/null
+++ b/interface/web/mail/lib/lang/ar_xmpp_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'XMPP Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Add new Domain';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/mail/lib/lang/ar_xmpp_user.lng b/interface/web/mail/lib/lang/ar_xmpp_user.lng
new file mode 100644
index 0000000000..6ab739d98b
--- /dev/null
+++ b/interface/web/mail/lib/lang/ar_xmpp_user.lng
@@ -0,0 +1,15 @@
+<?php
+$wb['list_head_txt'] = 'XMPP User Accounts';
+$wb['jid_txt'] = 'Jabber ID';
+$wb['active_txt'] = 'Active';
+$wb['cryptpwd_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['error_no_pwd'] = 'Password is empty.';
+$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['no_domain_perm'] = 'You have no permission for this domain.';
+$wb['limit_xmpp_user_txt'] = 'The max. number of xmpp accounts for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/ar_xmpp_user_list.lng b/interface/web/mail/lib/lang/ar_xmpp_user_list.lng
new file mode 100644
index 0000000000..f2651cb62b
--- /dev/null
+++ b/interface/web/mail/lib/lang/ar_xmpp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'XMPP User Accounts';
+$wb['jid_txt'] = 'Jabber ID';
+$wb['is_domain_admin_txt'] = 'Domain admin';
+$wb['is_muc_admin_txt'] = 'MUC admin';
+$wb['add_new_record_txt'] = 'Add new user';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/mail/lib/lang/bg_backup_stats_list.lng b/interface/web/mail/lib/lang/bg_backup_stats_list.lng
index 9ae9658257..79cd6c9a63 100644
--- a/interface/web/mail/lib/lang/bg_backup_stats_list.lng
+++ b/interface/web/mail/lib/lang/bg_backup_stats_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Email';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Email';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/mail/lib/lang/bg_mail_alias.lng b/interface/web/mail/lib/lang/bg_mail_alias.lng
index a0fa3b45ba..32a6b85e4e 100644
--- a/interface/web/mail/lib/lang/bg_mail_alias.lng
+++ b/interface/web/mail/lib/lang/bg_mail_alias.lng
@@ -12,4 +12,6 @@ $wb['domain_txt'] = 'Domain';
 $wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
 $wb['source_txt'] = 'Alias';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
 ?>
diff --git a/interface/web/mail/lib/lang/bg_mail_domain.lng b/interface/web/mail/lib/lang/bg_mail_domain.lng
index 6c4af599d6..6e30a26494 100644
--- a/interface/web/mail/lib/lang/bg_mail_domain.lng
+++ b/interface/web/mail/lib/lang/bg_mail_domain.lng
@@ -8,15 +8,16 @@ $wb['domain_error_unique'] = 'Дублиращ се домейн.';
 $wb['domain_error_regex'] = 'Неправилно домейн име.';
 $wb['client_txt'] = 'Клиент';
 $wb['limit_maildomain_txt'] = 'The max. number of email domains for your account is reached.';
-$wb["dkim_txt"] = 'enable DKIM';
-$wb["dkim_private_txt"] = 'DKIM Private-key';
-$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
-$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
-$wb["dkim_dns_txt"] = 'DNS-Record';
+$wb['dkim_txt'] = 'enable DKIM';
+$wb['dkim_private_txt'] = 'DKIM Private-key';
+$wb['dkim_public_txt'] = 'DKIM Public-key\nfor information only';
+$wb['dkim_generate_txt'] = 'Generate DKIM Private-key';
+$wb['dkim_dns_txt'] = 'DNS-Record';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
-$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
-$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
+$wb['dkim_private_key_error'] = 'Invalid DKIM-Private key';
+$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['policy_txt'] = 'Спамфилтър';
 $wb['no_policy'] = '- не е разрешен -';
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 ?>
diff --git a/interface/web/mail/lib/lang/bg_mail_forward.lng b/interface/web/mail/lib/lang/bg_mail_forward.lng
index a104032059..538d65dc2a 100644
--- a/interface/web/mail/lib/lang/bg_mail_forward.lng
+++ b/interface/web/mail/lib/lang/bg_mail_forward.lng
@@ -7,4 +7,7 @@ $wb['duplicate_mailbox_txt'] = 'Вече съществува пощенска 
 $wb['domain_txt'] = 'Домейн';
 $wb['source_txt'] = 'Source Email';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
 ?>
diff --git a/interface/web/mail/lib/lang/bg_mail_user.lng b/interface/web/mail/lib/lang/bg_mail_user.lng
index 9d6cdbba2c..ec19a636c9 100644
--- a/interface/web/mail/lib/lang/bg_mail_user.lng
+++ b/interface/web/mail/lib/lang/bg_mail_user.lng
@@ -51,4 +51,14 @@ $wb['password_match_txt'] = 'The passwords do match.';
 $wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
 $wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
+$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
+$wb['sender_cc_txt'] = 'Send outgoing copy to';
+$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
+$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
diff --git a/interface/web/mail/lib/lang/bg_mail_user_filter.lng b/interface/web/mail/lib/lang/bg_mail_user_filter.lng
index f776822c2b..c4dc6d51d9 100644
--- a/interface/web/mail/lib/lang/bg_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/bg_mail_user_filter.lng
@@ -15,6 +15,14 @@ $wb['contains_txt'] = 'Описание';
 $wb['is_txt'] = 'е';
 $wb['begins_with_txt'] = 'Начало с';
 $wb['ends_with_txt'] = 'Край с';
-$wb['move_to_txt'] = 'Премести в';
 $wb['delete_txt'] = 'Изтрий';
+$wb['move_stop_txt'] = 'Move to';
+$wb['header_txt'] = 'Header';
+$wb['size_over_txt'] = 'Email size over (KB)';
+$wb['size_under_txt'] = 'Email size under (KB)';
+$wb['localpart_txt'] = 'Localpart';
+$wb['domain_txt'] = 'Domain';
+$wb['keep_txt'] = 'Keep';
+$wb['reject_txt'] = 'Reject';
+$wb['stop_txt'] = 'Stop';
 ?>
diff --git a/interface/web/mail/lib/lang/bg_mail_user_list.lng b/interface/web/mail/lib/lang/bg_mail_user_list.lng
index d83e992115..9ccdb51124 100644
--- a/interface/web/mail/lib/lang/bg_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/bg_mail_user_list.lng
@@ -5,4 +5,8 @@ $wb['autoresponder_txt'] = 'Авто отговор';
 $wb['add_new_record_txt'] = 'Добави нова Пощенска кутия';
 $wb['name_txt'] = 'Истинско име';
 $wb['login_txt'] = 'Вход';
+$wb['postfix_txt'] = 'Receiving';
+$wb['disablesmtp_txt'] = 'SMTP (sending)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
 ?>
diff --git a/interface/web/mail/lib/lang/bg_xmpp_domain.lng b/interface/web/mail/lib/lang/bg_xmpp_domain.lng
new file mode 100644
index 0000000000..f1da77ba29
--- /dev/null
+++ b/interface/web/mail/lib/lang/bg_xmpp_domain.lng
@@ -0,0 +1,62 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["client_group_id_txt"] = 'Client';
+$wb["domain_txt"] = 'Domain';
+$wb["type_txt"] = 'Type';
+$wb["active_txt"] = 'Active';
+$wb["client_txt"] = 'Client';
+$wb["management_method_txt"] = 'Management of user accounts';
+$wb["public_registration_txt"] = 'Enable public registration';
+$wb["registration_url_txt"] = 'Registration URL';
+$wb["registration_message_txt"] = 'Registration Message';
+$wb["domain_admins_txt"] = 'Domain Admins (JIDs)';
+$wb["use_pubsub_txt"] = 'Enable Pubsub';
+$wb["use_proxy_txt"] = 'Enable Bytestream Proxy';
+$wb["use_anon_host_txt"] = 'Enable Anonymous Host';
+$wb["use_vjud_txt"] = 'Enable VJUD User Directory';
+$wb["vjud_opt_mode_txt"] = 'VJUD Opt Mode';
+$wb["use_muc_host_txt"] = 'Enable Multi User Chatrooms';
+$wb["muc_name_txt"] = 'Name in MUC Service Discovery';
+$wb["muc_restrict_room_creation_txt"] = 'Permission to create chatrooms';
+$wb["muc_admins_txt"] = 'MUC Admins (JIDs)';
+$wb["use_pastebin_txt"] = 'Enable Pastebin';
+$wb["pastebin_expire_after_txt"] = 'Pastes expire after (hours)';
+$wb["pastebin_trigger_txt"] = 'Pastebin trigger';
+$wb["use_http_archive_txt"] = 'Enable HTTP chatroom archive';
+$wb["http_archive_show_join_txt"] = 'Show join messages in archive';
+$wb["http_archive_show_status_txt"] = 'Show status changes in archive';
+$wb["use_status_host_txt"] = 'Enable XML Status host';
+$wb["cant_change_domainname_txt"] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb["about_registration_url_txt"] = 'Link to your registration form.';
+$wb["about_registration_message_txt"] = 'Description about your account registration process.';
+$wb["no_corresponding_maildomain_txt"] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_email_txt'] = 'Email Address';
+$wb['ssl_txt'] = 'SSL';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['none_txt'] = 'None';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ssl_error_isemail'] = 'Please enter a valid email adress for generation of the SSL certificate';
+$wb["limit_xmppdomain_txt"] = 'The max. number of XMPP domains for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/bg_xmpp_domain_admin_list.lng b/interface/web/mail/lib/lang/bg_xmpp_domain_admin_list.lng
new file mode 100644
index 0000000000..a3d1736d7b
--- /dev/null
+++ b/interface/web/mail/lib/lang/bg_xmpp_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$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';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/bg_xmpp_domain_list.lng b/interface/web/mail/lib/lang/bg_xmpp_domain_list.lng
new file mode 100644
index 0000000000..f8c2fb9b8e
--- /dev/null
+++ b/interface/web/mail/lib/lang/bg_xmpp_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["add_new_record_txt"] = 'Add new Domain';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/bg_xmpp_user.lng b/interface/web/mail/lib/lang/bg_xmpp_user.lng
new file mode 100644
index 0000000000..1cc852e3cf
--- /dev/null
+++ b/interface/web/mail/lib/lang/bg_xmpp_user.lng
@@ -0,0 +1,15 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["active_txt"] = 'Active';
+$wb["cryptpwd_txt"] = 'Password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["error_no_pwd"] = 'Password is empty.';
+$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["no_domain_perm"] = 'You have no permission for this domain.';
+$wb["limit_xmpp_user_txt"] = 'The max. number of xmpp accounts for your account is reached.';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/bg_xmpp_user_list.lng b/interface/web/mail/lib/lang/bg_xmpp_user_list.lng
new file mode 100644
index 0000000000..db88b0d7e3
--- /dev/null
+++ b/interface/web/mail/lib/lang/bg_xmpp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["is_domain_admin_txt"] = 'Domain admin';
+$wb["is_muc_admin_txt"] = 'MUC admin';
+$wb["add_new_record_txt"] = 'Add new user';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/br_backup_stats_list.lng b/interface/web/mail/lib/lang/br_backup_stats_list.lng
index 9ae9658257..79cd6c9a63 100644
--- a/interface/web/mail/lib/lang/br_backup_stats_list.lng
+++ b/interface/web/mail/lib/lang/br_backup_stats_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Email';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Email';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/mail/lib/lang/br_mail_alias.lng b/interface/web/mail/lib/lang/br_mail_alias.lng
index fbb4def091..43e720d8ef 100644
--- a/interface/web/mail/lib/lang/br_mail_alias.lng
+++ b/interface/web/mail/lib/lang/br_mail_alias.lng
@@ -12,4 +12,6 @@ $wb['domain_txt'] = 'Domínio';
 $wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
 $wb['source_txt'] = 'Alias';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
 ?>
diff --git a/interface/web/mail/lib/lang/br_mail_domain.lng b/interface/web/mail/lib/lang/br_mail_domain.lng
index 456fb7d7dd..6606e1d5fa 100644
--- a/interface/web/mail/lib/lang/br_mail_domain.lng
+++ b/interface/web/mail/lib/lang/br_mail_domain.lng
@@ -10,13 +10,14 @@ $wb['client_txt'] = 'Cliente';
 $wb['limit_maildomain_txt'] = 'O número máximo de contas de correio eletrônico para este domínio foi atingido.';
 $wb['policy_txt'] = 'Filtro Anti-Spam';
 $wb['no_policy'] = '- desativado -';
-$wb["dkim_txt"] = 'enable DKIM';
-$wb["dkim_private_txt"] = 'DKIM Private-key';
-$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
-$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
-$wb["dkim_dns_txt"] = 'DNS-Record';
-$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
+$wb['dkim_txt'] = 'enable DKIM';
+$wb['dkim_private_txt'] = 'DKIM Private-key';
+$wb['dkim_public_txt'] = 'DKIM Public-key\nfor information only';
+$wb['dkim_generate_txt'] = 'Generate DKIM Private-key';
+$wb['dkim_dns_txt'] = 'DNS-Record';
+$wb['dkim_private_key_error'] = 'Invalid DKIM-Private key';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
-$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
+$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 ?>
diff --git a/interface/web/mail/lib/lang/br_mail_forward.lng b/interface/web/mail/lib/lang/br_mail_forward.lng
index 9c1c3cd6ed..63445c8ccd 100644
--- a/interface/web/mail/lib/lang/br_mail_forward.lng
+++ b/interface/web/mail/lib/lang/br_mail_forward.lng
@@ -7,4 +7,7 @@ $wb['duplicate_mailbox_txt'] = 'Já existe uma caixa de correio com este endere
 $wb['domain_txt'] = 'Domínio';
 $wb['source_txt'] = 'Source Email';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
 ?>
diff --git a/interface/web/mail/lib/lang/br_mail_user.lng b/interface/web/mail/lib/lang/br_mail_user.lng
index 2e88eba521..1df2985036 100644
--- a/interface/web/mail/lib/lang/br_mail_user.lng
+++ b/interface/web/mail/lib/lang/br_mail_user.lng
@@ -51,4 +51,14 @@ $wb['password_match_txt'] = 'The passwords do match.';
 $wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
 $wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
+$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
+$wb['sender_cc_txt'] = 'Send outgoing copy to';
+$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
+$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
diff --git a/interface/web/mail/lib/lang/br_mail_user_filter.lng b/interface/web/mail/lib/lang/br_mail_user_filter.lng
index 12418df1ca..315bbaebe4 100644
--- a/interface/web/mail/lib/lang/br_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/br_mail_user_filter.lng
@@ -15,6 +15,14 @@ $wb['contains_txt'] = 'Contém';
 $wb['is_txt'] = 'é';
 $wb['begins_with_txt'] = 'Começa com';
 $wb['ends_with_txt'] = 'Termina com';
-$wb['move_to_txt'] = 'Mover para';
 $wb['delete_txt'] = 'Deletar';
+$wb['move_stop_txt'] = 'Move to';
+$wb['header_txt'] = 'Header';
+$wb['size_over_txt'] = 'Email size over (KB)';
+$wb['size_under_txt'] = 'Email size under (KB)';
+$wb['localpart_txt'] = 'Localpart';
+$wb['domain_txt'] = 'Domain';
+$wb['keep_txt'] = 'Keep';
+$wb['reject_txt'] = 'Reject';
+$wb['stop_txt'] = 'Stop';
 ?>
diff --git a/interface/web/mail/lib/lang/br_mail_user_list.lng b/interface/web/mail/lib/lang/br_mail_user_list.lng
index 35f83f7cd1..d4fde5812a 100644
--- a/interface/web/mail/lib/lang/br_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/br_mail_user_list.lng
@@ -5,4 +5,8 @@ $wb['autoresponder_txt'] = 'Autoresponder';
 $wb['add_new_record_txt'] = 'Adcionar nova caixa de correio';
 $wb['name_txt'] = 'Realname';
 $wb['login_txt'] = 'Login';
+$wb['postfix_txt'] = 'Receiving';
+$wb['disablesmtp_txt'] = 'SMTP (sending)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
 ?>
diff --git a/interface/web/mail/lib/lang/br_xmpp_domain.lng b/interface/web/mail/lib/lang/br_xmpp_domain.lng
new file mode 100644
index 0000000000..f1da77ba29
--- /dev/null
+++ b/interface/web/mail/lib/lang/br_xmpp_domain.lng
@@ -0,0 +1,62 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["client_group_id_txt"] = 'Client';
+$wb["domain_txt"] = 'Domain';
+$wb["type_txt"] = 'Type';
+$wb["active_txt"] = 'Active';
+$wb["client_txt"] = 'Client';
+$wb["management_method_txt"] = 'Management of user accounts';
+$wb["public_registration_txt"] = 'Enable public registration';
+$wb["registration_url_txt"] = 'Registration URL';
+$wb["registration_message_txt"] = 'Registration Message';
+$wb["domain_admins_txt"] = 'Domain Admins (JIDs)';
+$wb["use_pubsub_txt"] = 'Enable Pubsub';
+$wb["use_proxy_txt"] = 'Enable Bytestream Proxy';
+$wb["use_anon_host_txt"] = 'Enable Anonymous Host';
+$wb["use_vjud_txt"] = 'Enable VJUD User Directory';
+$wb["vjud_opt_mode_txt"] = 'VJUD Opt Mode';
+$wb["use_muc_host_txt"] = 'Enable Multi User Chatrooms';
+$wb["muc_name_txt"] = 'Name in MUC Service Discovery';
+$wb["muc_restrict_room_creation_txt"] = 'Permission to create chatrooms';
+$wb["muc_admins_txt"] = 'MUC Admins (JIDs)';
+$wb["use_pastebin_txt"] = 'Enable Pastebin';
+$wb["pastebin_expire_after_txt"] = 'Pastes expire after (hours)';
+$wb["pastebin_trigger_txt"] = 'Pastebin trigger';
+$wb["use_http_archive_txt"] = 'Enable HTTP chatroom archive';
+$wb["http_archive_show_join_txt"] = 'Show join messages in archive';
+$wb["http_archive_show_status_txt"] = 'Show status changes in archive';
+$wb["use_status_host_txt"] = 'Enable XML Status host';
+$wb["cant_change_domainname_txt"] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb["about_registration_url_txt"] = 'Link to your registration form.';
+$wb["about_registration_message_txt"] = 'Description about your account registration process.';
+$wb["no_corresponding_maildomain_txt"] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_email_txt'] = 'Email Address';
+$wb['ssl_txt'] = 'SSL';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['none_txt'] = 'None';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ssl_error_isemail'] = 'Please enter a valid email adress for generation of the SSL certificate';
+$wb["limit_xmppdomain_txt"] = 'The max. number of XMPP domains for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/br_xmpp_domain_admin_list.lng b/interface/web/mail/lib/lang/br_xmpp_domain_admin_list.lng
new file mode 100644
index 0000000000..a3d1736d7b
--- /dev/null
+++ b/interface/web/mail/lib/lang/br_xmpp_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$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';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/br_xmpp_domain_list.lng b/interface/web/mail/lib/lang/br_xmpp_domain_list.lng
new file mode 100644
index 0000000000..f8c2fb9b8e
--- /dev/null
+++ b/interface/web/mail/lib/lang/br_xmpp_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["add_new_record_txt"] = 'Add new Domain';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/br_xmpp_user.lng b/interface/web/mail/lib/lang/br_xmpp_user.lng
new file mode 100644
index 0000000000..1cc852e3cf
--- /dev/null
+++ b/interface/web/mail/lib/lang/br_xmpp_user.lng
@@ -0,0 +1,15 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["active_txt"] = 'Active';
+$wb["cryptpwd_txt"] = 'Password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["error_no_pwd"] = 'Password is empty.';
+$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["no_domain_perm"] = 'You have no permission for this domain.';
+$wb["limit_xmpp_user_txt"] = 'The max. number of xmpp accounts for your account is reached.';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/br_xmpp_user_list.lng b/interface/web/mail/lib/lang/br_xmpp_user_list.lng
new file mode 100644
index 0000000000..db88b0d7e3
--- /dev/null
+++ b/interface/web/mail/lib/lang/br_xmpp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["is_domain_admin_txt"] = 'Domain admin';
+$wb["is_muc_admin_txt"] = 'MUC admin';
+$wb["add_new_record_txt"] = 'Add new user';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/ca.lng b/interface/web/mail/lib/lang/ca.lng
new file mode 100644
index 0000000000..1665346a82
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca.lng
@@ -0,0 +1,48 @@
+<?php
+$wb['Email Alias'] = 'Alias de courriels';
+$wb['Email Blacklist'] = 'Liste noire de courriels';
+$wb['Blacklist'] = 'Liste noire';
+$wb['Mail Content Filter'] = 'Filtre de contenu des courriels';
+$wb['Filter'] = 'Filtre';
+$wb['Mail Domain'] = 'Domaine courriel';
+$wb['Domain'] = 'Domaine';
+$wb['Email Catchall'] = 'Courriel collecteur';
+$wb['Email Forward'] = 'Courriel de transfert';
+$wb['Get Email'] = 'Obtenir un courreil';
+$wb['Spamfilter'] = 'Filtre antispam';
+$wb['Email Routing'] = 'Routage d\'emails';
+$wb['Email transport'] = 'Transport d\'emails';
+$wb['Mailbox'] = 'Boîte courriel';
+$wb['Autoresponder'] = 'Répondeur automatique';
+$wb['Mail Filter'] = 'Filtre courriel';
+$wb['Custom Rules'] = 'Règles personnalisées';
+$wb['Email filter'] = 'Filtre courriel';
+$wb['Email Whitelist'] = 'Liste blanche d\'emails';
+$wb['Whitelist'] = 'Liste blanche';
+$wb['Spamfilter blacklist'] = 'Liste noire de l\'anti-spam';
+$wb['Spamfilter Config'] = 'Configuration de l\'anti-spam';
+$wb['Server'] = 'Serveur';
+$wb['Spamfilter policy'] = 'Stratégie de l\'anti-spam';
+$wb['Policy'] = 'Stratégie';
+$wb['Quarantine'] = 'Quarantaine';
+$wb['Tag-Level'] = 'Niveau du tag';
+$wb['Other'] = 'Autre';
+$wb['Spamfilter users'] = 'Utilisateurs de l\'anti-spam';
+$wb['Users'] = 'Utilisateurs';
+$wb['Spamfilter Whitelist'] = 'Liste blanche de l\'anti-spam';
+$wb['Email'] = 'Courriel';
+$wb['Email Mailbox'] = 'Boîte courriel';
+$wb['Email Accounts'] = 'Comptes courriel';
+$wb['User / Domain'] = 'Utilisateur / Domaine';
+$wb['Server Settings'] = 'Paramètres du serveur';
+$wb['Fetchmail'] = 'Récupérateur courriel';
+$wb['Statistics'] = 'Statistiques';
+$wb['Postfix Whitelist'] = 'Liste blanche de Postfix';
+$wb['Postfix Blacklist'] = 'Liste noire de Postfix';
+$wb['Content Filter'] = 'Filtre de contenu';
+$wb['Global Filters'] = 'Filtres globaux';
+$wb['Mailbox traffic'] = 'Trafic de la boite courriels';
+$wb['Domain Alias'] = 'Alias de domaine';
+$wb['Relay Recipients'] = 'Destinataires de relais';
+$wb['Mailbox quota'] = 'Quota courriel';
+?>
diff --git a/interface/web/mail/lib/lang/ca_backup_stats_list.lng b/interface/web/mail/lib/lang/ca_backup_stats_list.lng
new file mode 100644
index 0000000000..79cd6c9a63
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_backup_stats_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Email';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
+$wb['backup_interval_txt'] = 'Interval / cnt.';
+$wb['backup_size_txt'] = 'Backupsize';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_alias.lng b/interface/web/mail/lib/lang/ca_mail_alias.lng
new file mode 100644
index 0000000000..a1c3eacb67
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_alias.lng
@@ -0,0 +1,17 @@
+<?php
+$wb['email_txt'] = 'Courriel';
+$wb['destination_txt'] = 'Destination';
+$wb['active_txt'] = 'Actif';
+$wb['email_error_isemail'] = 'L\'adresse courriel est invalide.';
+$wb['email_error_unique'] = 'Dupliquer l\'adresse courriel.';
+$wb['no_domain_perm'] = 'Vous n\'avez pas de permission pour ce domaine.';
+$wb['destination_error_isemail'] = 'L\'adresse courriel de destination est invalide.';
+$wb['limit_mailalias_txt'] = 'Le nombre maximal d\'alias de courriel pour votre compte a été atteint.';
+$wb['duplicate_mailbox_txt'] = 'Il y a déja une boîte courriel avec cette adresse';
+$wb['domain_txt'] = 'Domaine';
+$wb['duplicate_email_alias_txt'] = 'L\'alias existe déjà';
+$wb['source_txt'] = 'Alias';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
+$wb['greylisting_txt'] = 'Enable greylisting';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_alias_list.lng b/interface/web/mail/lib/lang/ca_mail_alias_list.lng
new file mode 100644
index 0000000000..eefd00b111
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_alias_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Alias de courriel';
+$wb['active_txt'] = 'Actif';
+$wb['source_txt'] = 'source';
+$wb['destination_txt'] = 'Destination';
+$wb['email_txt'] = 'Courriel';
+$wb['add_new_record_txt'] = 'Ajouter un nouvel alias de courriel';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_aliasdomain.lng b/interface/web/mail/lib/lang/ca_mail_aliasdomain.lng
new file mode 100644
index 0000000000..c0493fd238
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_aliasdomain.lng
@@ -0,0 +1,11 @@
+<?php
+$wb['source_txt'] = 'Source';
+$wb['destination_txt'] = 'Destination';
+$wb['active_txt'] = 'Actif';
+$wb['no_domain_perm'] = 'Vous n\'avez pas de permission pour ce domaine.';
+$wb['limit_mailaliasdomain_txt'] = 'Le nombre maximal d\'alias de domaine pour votre compte est atteint.';
+$wb['source_destination_identical_txt'] = 'Les domaines source et cible sont identiques.';
+$wb['source_error_empty'] = 'Le domaine source est vide.';
+$wb['source_error_unique'] = 'Domaine source dupliqué.';
+$wb['source_error_regex'] = 'Nom de domaine source invalide.';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/ca_mail_aliasdomain_list.lng
new file mode 100644
index 0000000000..f377975355
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_aliasdomain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Alias de domaine';
+$wb['active_txt'] = 'Actif';
+$wb['source_txt'] = 'Source';
+$wb['destination_txt'] = 'Destination';
+$wb['add_new_record_txt'] = 'Ajouter un alias de domaine';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_backup_list.lng b/interface/web/mail/lib/lang/ca_mail_backup_list.lng
new file mode 100644
index 0000000000..73286a0737
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_backup_list.lng
@@ -0,0 +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';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring may overwrite existing files in your mailbox. 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['delete_backup_txt'] = 'Delete Backup';
+$wb['delete_info_txt'] = 'Delete of the backup has been started. This action takes several minutes to be completed.';
+$wb['delete_confirm_txt'] = 'Really delete this backup?';
+$wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
+$wb['filesize_txt'] = 'Filesize';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_blacklist.lng b/interface/web/mail/lib/lang/ca_mail_blacklist.lng
new file mode 100644
index 0000000000..3f5f9709e8
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_blacklist.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['source_txt'] = 'Adresse de la liste noire';
+$wb['recipient_txt'] = 'Destinataire';
+$wb['active_txt'] = 'Actif';
+$wb['source_error_notempty'] = 'L\'adresse est vide.';
+$wb['type_txt'] = 'Type';
+$wb['limit_mailfilter_txt'] = 'Le nombre maximal de filtres d\'email pour votre compte a été atteint.';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_blacklist_list.lng b/interface/web/mail/lib/lang/ca_mail_blacklist_list.lng
new file mode 100644
index 0000000000..a740f38fee
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_blacklist_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'Liste noire d\'emails';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['source_txt'] = 'Adresse de la liste noire';
+$wb['type_txt'] = 'Type';
+$wb['recipient_txt'] = 'Destinataire';
+$wb['add_new_record_txt'] = 'Ajouter un nouvel enregistrement';
+$wb['access_txt'] = 'accès';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_content_filter.lng b/interface/web/mail/lib/lang/ca_mail_content_filter.lng
new file mode 100644
index 0000000000..5aa0caac01
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_content_filter.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['type_txt'] = 'Filtre';
+$wb['pattern_txt'] = 'Schéma Regexp';
+$wb['data_txt'] = 'Données';
+$wb['action_txt'] = 'Action';
+$wb['active_txt'] = 'Actif';
+$wb['pattern_error_empty'] = 'Le schéma est vide.';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_content_filter_list.lng b/interface/web/mail/lib/lang/ca_mail_content_filter_list.lng
new file mode 100644
index 0000000000..2011396cb3
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_content_filter_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Entête de Postfix';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['pattern_txt'] = 'Schéma';
+$wb['action_txt'] = 'Action';
+$wb['add_new_record_txt'] = 'Ajouter un nouveau filtre de contenu';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_domain.lng b/interface/web/mail/lib/lang/ca_mail_domain.lng
new file mode 100644
index 0000000000..65d664cf3a
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_domain.lng
@@ -0,0 +1,23 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['domain_txt'] = 'Domaine';
+$wb['type_txt'] = 'Type';
+$wb['active_txt'] = 'Actif';
+$wb['domain_error_empty'] = 'Le domaine est vide.';
+$wb['domain_error_unique'] = 'Dupliquer le domaine.';
+$wb['domain_error_regex'] = 'Le domaine est invalide.';
+$wb['client_txt'] = 'Client';
+$wb['limit_maildomain_txt'] = 'Le nombre maximal de domaines d\'email pour votre compte a été atteint.';
+$wb['policy_txt'] = 'Filtre antispam';
+$wb['no_policy'] = '- inactif -';
+$wb['dkim_txt'] = 'enable DKIM';
+$wb['dkim_private_txt'] = 'DKIM Private-key';
+$wb['dkim_public_txt'] = 'DKIM Public-key\nfor information only';
+$wb['dkim_generate_txt'] = 'Generate DKIM Private-key';
+$wb['dkim_dns_txt'] = 'DNS-Record';
+$wb['dkim_private_key_error'] = 'Invalid DKIM-Private key';
+$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
+$wb['dkim_selector_txt'] = 'DKIM-Selector';
+$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/ca_mail_domain_admin_list.lng
new file mode 100644
index 0000000000..8ae49b71f2
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Domaine de courriel';
+$wb['server_id_txt'] = 'Serveur';
+$wb['domain_txt'] = 'Domaine';
+$wb['add_new_record_txt'] = 'Ajouter un domaine';
+$wb['active_txt'] = 'Actif';
+$wb['sys_groupid_txt'] = 'Client';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_domain_catchall.lng b/interface/web/mail/lib/lang/ca_mail_domain_catchall.lng
new file mode 100644
index 0000000000..7e82c34ca2
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_domain_catchall.lng
@@ -0,0 +1,11 @@
+<?php
+$wb['domain_txt'] = 'Domaine';
+$wb['destination_txt'] = 'Destination';
+$wb['active_txt'] = 'Actif';
+$wb['domain_error_unique'] = 'Il y a déja un enregistrement collecteur pour ce domaine.';
+$wb['no_domain_perm'] = 'Vous n\'avez pas de permission pour ce domaine.';
+$wb['domain_error_regex'] = 'Nom de domaine invalide, ou contient des caractères invalides.';
+$wb['limit_mailcatchall_txt'] = 'Le nombre maximal de comptes collecteurs pour votre compte a été atteint.';
+$wb['source_txt'] = 'Source';
+$wb['destination_error_isemail'] = 'La destination n\'est pas valide.';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/ca_mail_domain_catchall_list.lng
new file mode 100644
index 0000000000..185d796e7f
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_domain_catchall_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Collecteur Email';
+$wb['active_txt'] = 'Actif';
+$wb['source_txt'] = 'source';
+$wb['destination_txt'] = 'Adresse courriel de destination';
+$wb['server_id_txt'] = 'Serveur';
+$wb['domain_txt'] = 'Domaine';
+$wb['add_new_record_txt'] = 'Ajouter un nouveau collecteur';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_domain_list.lng b/interface/web/mail/lib/lang/ca_mail_domain_list.lng
new file mode 100644
index 0000000000..bc7c8deb76
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Domaine courriel';
+$wb['server_id_txt'] = 'Serveur';
+$wb['domain_txt'] = 'Domaine';
+$wb['add_new_record_txt'] = 'Ajouter un nouveau domaine';
+$wb['active_txt'] = 'Actif';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_forward.lng b/interface/web/mail/lib/lang/ca_mail_forward.lng
new file mode 100644
index 0000000000..c4a6c1ea26
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_forward.lng
@@ -0,0 +1,13 @@
+<?php
+$wb['email_txt'] = 'Courriel';
+$wb['destination_txt'] = 'Courriel de destination';
+$wb['active_txt'] = 'Actif';
+$wb['limit_mailforward_txt'] = 'Le nombre maximal de transferts d\'email pour votre compte a été atteint.';
+$wb['duplicate_mailbox_txt'] = 'Il y a déja une boite courriel avec cette adresse courriel';
+$wb['domain_txt'] = 'Domaine';
+$wb['source_txt'] = 'Source courriel';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
+$wb['greylisting_txt'] = 'Enable greylisting';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_forward_list.lng b/interface/web/mail/lib/lang/ca_mail_forward_list.lng
new file mode 100644
index 0000000000..8874953a18
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_forward_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Transfert de courriel';
+$wb['active_txt'] = 'Actif';
+$wb['source_txt'] = 'source';
+$wb['destination_txt'] = 'Destination';
+$wb['email_txt'] = 'Courriel';
+$wb['add_new_record_txt'] = 'Ajouter un nouveau transfert de courriel';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_get.lng b/interface/web/mail/lib/lang/ca_mail_get.lng
new file mode 100644
index 0000000000..a13a1b03f6
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_get.lng
@@ -0,0 +1,19 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['type_txt'] = 'Type';
+$wb['source_server_txt'] = 'Serveur POP3 / IMAP';
+$wb['source_username_txt'] = 'Utilisateur';
+$wb['source_password_txt'] = 'Mot de passe';
+$wb['source_delete_txt'] = 'Supprimer les courriels après récupération';
+$wb['destination_txt'] = 'Destination';
+$wb['active_txt'] = 'Actif';
+$wb['limit_fetchmail_txt'] = 'Le nombre maximal d\'enregistrements récupérateur courriel pour votre compte a été atteint.';
+$wb['source_server_error_isempty'] = 'Le serveur est vide.';
+$wb['source_username_error_isempty'] = 'l\'utilisateur est vide.';
+$wb['source_password_error_isempty'] = 'Le mot de passe est vide.';
+$wb['destination_error_isemail'] = 'Pas de destination sélectionnée.';
+$wb['source_server_error_regex'] = 'Le serveur POP3 / IMAP n\'est pas un nom de domaine valide.';
+$wb['source_read_all_txt'] = 'Récupérer tous les courriels (incl. les courriels lus)';
+$wb['error_delete_read_all_combination'] = 'Combinaison d\'options non autorisée. Vous ne pouvez pas utiliser \\"Supprimer les courriels après récupération\\" = non avec \\"Récupérer tous les courriels\\" = oui';
+$wb['source_delete_note_txt'] = 'Please check first if courriel retrieval works, before you activate this option.';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_get_list.lng b/interface/web/mail/lib/lang/ca_mail_get_list.lng
new file mode 100644
index 0000000000..5c2928dbd4
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_get_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Récupérer les courriels depuis des serveurs POP3/IMAP externes';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['source_server_txt'] = 'Serveur externe';
+$wb['source_username_txt'] = 'Utilisateur';
+$wb['destination_txt'] = 'Destination';
+$wb['add_new_record_txt'] = 'Ajouter un nouveau compte';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_mailinglist.lng b/interface/web/mail/lib/lang/ca_mail_mailinglist.lng
new file mode 100644
index 0000000000..ee818cc914
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_mailinglist.lng
@@ -0,0 +1,22 @@
+<?php
+$wb['limit_mailmailinglist_txt'] = 'Limite atteinte';
+$wb['domain_error_empty'] = 'Le domain est vide.';
+$wb['listname_error_empty'] = 'Le nom de la liste est vide.';
+$wb['domain_error_regex'] = 'Nom de domaine invalide.';
+$wb['email_in_use_txt'] = 'L\'email est en cours d\'utilisation';
+$wb['no_domain_perm'] = 'Vous n\'avez pas la permission pour ce domain.';
+$wb['password_strength_txt'] = 'Force du mot de passe';
+$wb['server_id_txt'] = 'Serveur';
+$wb['domain_txt'] = 'Domaine';
+$wb['listname_txt'] = 'Nom de la liste';
+$wb['client_txt'] = 'Client';
+$wb['email_txt'] = 'Courriel';
+$wb['password_txt'] = 'Mot de passe';
+$wb['generate_password_txt'] = 'Générer mot de passe';
+$wb['repeat_password_txt'] = 'Retaper le mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas';
+$wb['password_match_txt'] = 'Les mots de passe correspondent';
+$wb['listname_error_unique'] = 'There is already a mailinlist with name on the server. Please choose a different listname.';
+$wb['email_error_isemail'] = 'Courriel non valide';
+$wb['mailinglist_txt'] = 'Liste de diffusion';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/ca_mail_mailinglist_list.lng
new file mode 100644
index 0000000000..bf25d31c31
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_mailinglist_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb['list_head_txt'] = 'Liste de diffusion';
+$wb['domain_txt'] = 'Domaine';
+$wb['listname_txt'] = 'Nom de la liste';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_relay_recipient.lng b/interface/web/mail/lib/lang/ca_mail_relay_recipient.lng
new file mode 100644
index 0000000000..4851835abf
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_relay_recipient.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['source_txt'] = 'Relayer le destinataire';
+$wb['recipient_txt'] = 'Destinataire';
+$wb['active_txt'] = 'Actif';
+$wb['source_error_notempty'] = 'L\'adresse est vide';
+$wb['type_txt'] = 'Type';
+$wb['limit_mailfilter_txt'] = 'Le nombre maximal de filtres pour votre compte est atteint.';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/ca_mail_relay_recipient_list.lng
new file mode 100644
index 0000000000..27353debf0
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_relay_recipient_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Relayer les destinataires';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['source_txt'] = 'Adresse du destinataire';
+$wb['recipient_txt'] = 'Destinataire';
+$wb['add_new_record_txt'] = 'Ajouter un relai de destinataire';
+$wb['access_txt'] = 'accès';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_spamfilter.lng b/interface/web/mail/lib/lang/ca_mail_spamfilter.lng
new file mode 100644
index 0000000000..155702d19b
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_spamfilter.lng
@@ -0,0 +1,17 @@
+<?php
+$wb['email_txt'] = 'Courriel';
+$wb['spam_rewrite_score_int_txt'] = 'Réécrire le score';
+$wb['spam_redirect_score_int_txt'] = 'Réorienter le score';
+$wb['spam_delete_score_int_txt'] = 'Supprimer le score';
+$wb['spam_rewrite_subject_txt'] = 'Réécrire le sujet';
+$wb['spam_redirect_maildir_txt'] = 'Réorienter la boîte mail';
+$wb['active_txt'] = 'Actif';
+$wb['spam_rewrite_txt'] = 'Réécrire l\'objet de l\'email ci-dessus.';
+$wb['spam_redirect_txt'] = 'Réorienter l\'email à la boîte courriel sélectionnée ci-dessus.';
+$wb['spam_delete_txt'] = 'Supprimer l\'email ci-dessus.';
+$wb['disable_txt'] = 'Astuce : Pour désactiver une option de filtrage, mettez le score à 0.00.';
+$wb['email_error_isemail'] = 'L\'adresse courriel est invalide.';
+$wb['email_error_unique'] = 'Il y a déja un enregistrement de filtre antispam avec cette adresse courriel.';
+$wb['spam_redirect_maildir_purge_txt'] = 'Purger le répertoire de mail après';
+$wb['days_txt'] = 'Jours.';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/ca_mail_spamfilter_list.lng
new file mode 100644
index 0000000000..576cd04615
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_spamfilter_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Filtre antispam';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['server_name_txt'] = 'Nom du serveur';
+$wb['email_txt'] = 'Courriel';
+$wb['add_new_record_txt'] = 'Ajouter un nouvel enregistrement';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_transport.lng b/interface/web/mail/lib/lang/ca_mail_transport.lng
new file mode 100644
index 0000000000..f8a5536560
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_transport.lng
@@ -0,0 +1,11 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['domain_txt'] = 'Domaine';
+$wb['destination_txt'] = 'Destination';
+$wb['type_txt'] = 'Type';
+$wb['mx_txt'] = 'Pas de résolution MX';
+$wb['sort_order_txt'] = 'Trier par';
+$wb['active_txt'] = 'Actif';
+$wb['limit_mailrouting_txt'] = 'Le nombre maximal de routes pour votre compte a été atteint.';
+$wb['transport_txt'] = 'Transport';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_transport_list.lng b/interface/web/mail/lib/lang/ca_mail_transport_list.lng
new file mode 100644
index 0000000000..60c51c3a48
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_transport_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Routage d\'email avancé';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['domain_txt'] = 'Domaine';
+$wb['transport_txt'] = 'Déplacement';
+$wb['sort_order_txt'] = 'Trier par';
+$wb['add_new_record_txt'] = 'Ajouter un nouveau déplacement';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_user.lng b/interface/web/mail/lib/lang/ca_mail_user.lng
new file mode 100644
index 0000000000..c33a27a6ef
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_user.lng
@@ -0,0 +1,64 @@
+<?php
+$wb['custom_mailfilter_txt'] = 'Filtre d\'email personnalisé';
+$wb['email_txt'] = 'Courriel';
+$wb['cryptpwd_txt'] = 'Mot de passe';
+$wb['password_strength_txt'] = 'Force du mot de passe';
+$wb['active_txt'] = 'Actif';
+$wb['email_error_isemail'] = 'L\'adresse courriel est invalide.';
+$wb['email_error_unique'] = 'Dupliquer l\'adresse courriel.';
+$wb['autoresponder_text_txt'] = 'Texte';
+$wb['autoresponder_txt'] = 'Auto répondeur';
+$wb['no_domain_perm'] = 'Vous n\'avez pas de permission sur ce domaine.';
+$wb['error_no_pwd'] = 'Le mot de passe est vide.';
+$wb['quota_error_isint'] = 'La taille de la boîte à mail doit être en Mo.';
+$wb['quota_txt'] = 'Quota en Mo';
+$wb['server_id_txt'] = 'ID Serveur';
+$wb['password_txt'] = 'Mot de passe';
+$wb['maildir_txt'] = 'Maildir';
+$wb['postfix_txt'] = 'Activer la réception';
+$wb['access_txt'] = 'Activer l\'accès';
+$wb['policy_txt'] = 'Filtre antispam';
+$wb['no_policy'] = '- inactif -';
+$wb['limit_mailbox_txt'] = 'Le nombre maximal de boites courriel pour votre compte est atteint..';
+$wb['limit_mailquota_txt'] = 'Lespace maximal pour les boites courriel est atteint. Lespace maximal disponible est de ';
+$wb['disableimap_txt'] = 'Désactiver IMAP';
+$wb['disablepop3_txt'] = 'Désactiver POP3';
+$wb['duplicate_alias_or_forward_txt'] = 'Il y a déja un alias ou un transfert d\'email sur cette adresse.';
+$wb['autoresponder_start_date_txt'] = 'Démarrer le';
+$wb['autoresponder_start_date_ispast'] = 'La date de démarrage ne peut être une date passée.';
+$wb['autoresponder_end_date_txt'] = 'Terminer le';
+$wb['autoresponder_end_date_isgreater'] = 'La date de fin doit être saisie et doit être ultérieure à la date de début.';
+$wb['quota_error_value'] = 'Valeur de quota invalide. Les valeurs de quota autorisées sont : 0 pour illimité ou nombres > 1';
+$wb['move_junk_txt'] = 'Déplacer le spam vers le dossier Junk';
+$wb['name_txt'] = 'Nom véritable';
+$wb['name_optional_txt'] = '(Optionnel)';
+$wb['autoresponder_active'] = 'Activer le répondeur automatique';
+$wb['cc_txt'] = 'Envoyer une copie à';
+$wb['cc_error_isemail'] = 'Le champ Envoyer une copie ne contient pas une adresse courriel valide';
+$wb['domain_txt'] = 'Domaine';
+$wb['now_txt'] = 'Maintenant';
+$wb['login_error_unique'] = 'Ce nom d\'utilisateur est déjà pris.';
+$wb['login_error_regex'] = 'Les caractères valides sont A-Z, a-z, 0-9, ., _ et -.';
+$wb['login_txt'] = 'Nom d\'utilisateur (optionnel)';
+$wb['error_login_email_txt'] = 'Ce nom d\'utilisaeur n\'est pas autorisé. Veuilez entrer un nom différent ou utiliser l\'adresse courriel comme nom d\'utilisateur.';
+$wb['autoresponder_subject_txt'] = 'Sujet';
+$wb['autoresponder_subject'] = 'Hors du bureau';
+$wb['generate_password_txt'] = 'Générer mot de passe';
+$wb['repeat_password_txt'] = 'Retaper le mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['disablesmtp_txt'] = 'Désactiver SMTP (envoi)';
+$wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
+$wb['cc_note_txt'] = '(Séparer chaque adresses par une virgule)';
+$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
+$wb['greylisting_txt'] = 'Enable greylisting';
+$wb['sender_cc_txt'] = 'Send outgoing copy to';
+$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
+$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_user_filter.lng b/interface/web/mail/lib/lang/ca_mail_user_filter.lng
new file mode 100644
index 0000000000..64fb019686
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_user_filter.lng
@@ -0,0 +1,28 @@
+<?php
+$wb['rulename_txt'] = 'Nom';
+$wb['action_txt'] = 'Action';
+$wb['target_txt'] = 'Répertoire';
+$wb['active_txt'] = 'Actif';
+$wb['rulename_error_empty'] = 'Le nom est vide.';
+$wb['searchterm_is_empty'] = 'Le terme recherché est vide.';
+$wb['source_txt'] = 'Source';
+$wb['target_error_regex'] = 'La cible ne peut contenir que ces caractères : a-z, 0-9, -, ., _, et {espace}';
+$wb['limit_mailfilter_txt'] = 'Le nombre max de filtres courriel est atteint.';
+$wb['subject_txt'] = 'Sujet';
+$wb['from_txt'] = 'De';
+$wb['to_txt'] = 'Pour';
+$wb['contains_txt'] = 'Contient';
+$wb['is_txt'] = 'Est';
+$wb['begins_with_txt'] = 'Commence par';
+$wb['ends_with_txt'] = 'Fini par';
+$wb['delete_txt'] = 'Supprimer';
+$wb['move_stop_txt'] = 'Move to';
+$wb['header_txt'] = 'Header';
+$wb['size_over_txt'] = 'Email size over (KB)';
+$wb['size_under_txt'] = 'Email size under (KB)';
+$wb['localpart_txt'] = 'Localpart';
+$wb['domain_txt'] = 'Domain';
+$wb['keep_txt'] = 'Keep';
+$wb['reject_txt'] = 'Reject';
+$wb['stop_txt'] = 'Stop';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_user_filter_list.lng b/interface/web/mail/lib/lang/ca_mail_user_filter_list.lng
new file mode 100644
index 0000000000..96bde24ea7
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_user_filter_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['rulename_txt'] = 'Nom';
+$wb['add_new_record_txt'] = 'Ajouter un nouveau filtre';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'de';
+$wb['delete_confirmation'] = 'Voulez-vous vraiment supprimer ce filtre';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_user_list.lng b/interface/web/mail/lib/lang/ca_mail_user_list.lng
new file mode 100644
index 0000000000..c3b79e38be
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_user_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Boîte mail';
+$wb['email_txt'] = 'Courriel';
+$wb['autoresponder_txt'] = 'Répondeur automatique';
+$wb['add_new_record_txt'] = 'Ajouter une nouvelle boîte courriel';
+$wb['name_txt'] = 'Nom véritable';
+$wb['login_txt'] = 'Nom d\'utilisateur';
+$wb['postfix_txt'] = 'Receiving';
+$wb['disablesmtp_txt'] = 'SMTP (sending)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_user_stats_list.lng b/interface/web/mail/lib/lang/ca_mail_user_stats_list.lng
new file mode 100644
index 0000000000..665605599b
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_user_stats_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Trafic courriel';
+$wb['email_txt'] = 'Courriel';
+$wb['this_month_txt'] = 'Le mois en cours';
+$wb['last_month_txt'] = 'Le mois dernier';
+$wb['this_year_txt'] = 'L\'année en cours';
+$wb['last_year_txt'] = 'L\'année dernière';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_whitelist.lng b/interface/web/mail/lib/lang/ca_mail_whitelist.lng
new file mode 100644
index 0000000000..0d621c95f3
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_whitelist.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['source_txt'] = 'Adresse de la liste blanche';
+$wb['recipient_txt'] = 'Destinataire';
+$wb['active_txt'] = 'Actif';
+$wb['source_error_notempty'] = 'L\'adresse est vide.';
+$wb['type_txt'] = 'Type';
+$wb['limit_mailfilter_txt'] = 'Le nombre maximal de filtres à mails pour votre compte a été atteint.';
+?>
diff --git a/interface/web/mail/lib/lang/ca_mail_whitelist_list.lng b/interface/web/mail/lib/lang/ca_mail_whitelist_list.lng
new file mode 100644
index 0000000000..244c2b36b9
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_mail_whitelist_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'Liste blanche d\'emails';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['source_txt'] = 'Adresse de la liste blanche';
+$wb['type_txt'] = 'Type';
+$wb['recipient_txt'] = 'Destinataire';
+$wb['add_new_record_txt'] = 'Ajouter un nouvel enregistrement';
+$wb['access_txt'] = 'accès';
+?>
diff --git a/interface/web/mail/lib/lang/ca_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/ca_spamfilter_blacklist.lng
new file mode 100644
index 0000000000..da14c8b302
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_spamfilter_blacklist.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['wb_txt'] = 'wb';
+$wb['rid_txt'] = 'Utilisateur';
+$wb['email_txt'] = 'Courriels';
+$wb['priority_txt'] = 'Priorité';
+$wb['active_txt'] = 'Actif';
+$wb['limit_spamfilter_wblist_txt'] = 'Le nombre maximal d\'enregistrements dans votre liste blanche/noire pour votre compte a été atteint.';
+$wb['10 - highest'] = '10 - highest';
+$wb['5 - medium'] = '5 - medium';
+$wb['1 - lowest'] = '1 - lowest';
+?>
diff --git a/interface/web/mail/lib/lang/ca_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/ca_spamfilter_blacklist_list.lng
new file mode 100644
index 0000000000..7758b12e91
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_spamfilter_blacklist_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Liste noire du filtre antispam';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['priority_txt'] = 'Priorité';
+$wb['rid_txt'] = 'Utilisateur';
+$wb['email_txt'] = 'Email en liste blanche';
+$wb['add_new_record_txt'] = 'Ajouter un enregistrement';
+?>
diff --git a/interface/web/mail/lib/lang/ca_spamfilter_config.lng b/interface/web/mail/lib/lang/ca_spamfilter_config.lng
new file mode 100644
index 0000000000..c4ca8850f4
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_spamfilter_config.lng
@@ -0,0 +1,20 @@
+<?php
+$wb['getmail_config_dir_txt'] = 'Chemin de configuration Getmail';
+$wb['ip_address_txt'] = 'Adresse IP';
+$wb['netmask_txt'] = 'Masque réseau';
+$wb['gateway_txt'] = 'Passerelle';
+$wb['hostname_txt'] = 'Nom dhôte';
+$wb['nameservers_txt'] = 'Serveurs de nom';
+$wb['module_txt'] = 'Module serveur';
+$wb['maildir_path_txt'] = 'Chemin du dossier de mails';
+$wb['homedir_path_txt'] = 'Chemin dossier home';
+$wb['mailuser_uid_txt'] = 'UID utilisateur mail';
+$wb['mailuser_gid_txt'] = 'GID utilisateur mail';
+$wb['mailuser_name_txt'] = 'Nom utilisateur mail';
+$wb['mailuser_group_txt'] = 'Groupe utilisateur mail';
+$wb['relayhost_txt'] = 'Hôte de relais';
+$wb['relayhost_user_txt'] = 'Utilisateur hôte de relais';
+$wb['relayhost_password_txt'] = 'Mot de passe hôte de relais';
+$wb['mailbox_size_limit_txt'] = 'Limite de taille de la boite courriel';
+$wb['message_size_limit_txt'] = 'Limite de taille des messages';
+?>
diff --git a/interface/web/mail/lib/lang/ca_spamfilter_config_list.lng b/interface/web/mail/lib/lang/ca_spamfilter_config_list.lng
new file mode 100644
index 0000000000..d59ed84c2c
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_spamfilter_config_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb['list_head_txt'] = 'Configuration du serveur';
+$wb['server_name_txt'] = 'Serveur';
+$wb['server_id_txt'] = 'ID Serveur';
+?>
diff --git a/interface/web/mail/lib/lang/ca_spamfilter_policy.lng b/interface/web/mail/lib/lang/ca_spamfilter_policy.lng
new file mode 100644
index 0000000000..e23c90127e
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_spamfilter_policy.lng
@@ -0,0 +1,38 @@
+<?php
+$wb['policy_name_txt'] = 'Nom de la stratégie';
+$wb['virus_lover_txt'] = 'Aime les virus';
+$wb['spam_lover_txt'] = 'Aime le spam';
+$wb['banned_files_lover_txt'] = 'Aime les fichiers bannis';
+$wb['bad_header_lover_txt'] = 'Aime les mauvaises entêtes';
+$wb['bypass_virus_checks_txt'] = 'Contourner la vérification des virus';
+$wb['bypass_banned_checks_txt'] = 'Contourner la vérification des bannissements.';
+$wb['bypass_header_checks_txt'] = 'Contourner la vérification des entêtes';
+$wb['virus_quarantine_to_txt'] = 'Faire suivre les virus vers lemail';
+$wb['spam_quarantine_to_txt'] = 'Faire suivre le spam vers lemail';
+$wb['banned_quarantine_to_txt'] = 'Faire suivre les bannis vers lemail';
+$wb['bad_header_quarantine_to_txt'] = 'Faire suivre les mauvaises entêtes vers lemail';
+$wb['clean_quarantine_to_txt'] = 'Faire suivre ce qui est propre vers lemail';
+$wb['other_quarantine_to_txt'] = 'Faire suivre les autres vers lemail';
+$wb['spam_tag_level_txt'] = 'Niveau du tag de SPAM';
+$wb['spam_tag2_level_txt'] = 'Niveau du tag2 de SPAM';
+$wb['spam_kill_level_txt'] = 'Niveau du kill de SPAM';
+$wb['spam_dsn_cutoff_level_txt'] = 'Seuil dsn du SPAM';
+$wb['spam_quarantine_cutoff_level_txt'] = 'Seuil quarantaine du SPAM';
+$wb['spam_modifies_subj_txt'] = 'SPAM modifie le sujet';
+$wb['spam_subject_tag_txt'] = 'SPAM tag dans le sujet';
+$wb['spam_subject_tag2_txt'] = 'SPAM tag dans le sujet 2';
+$wb['addr_extension_virus_txt'] = 'Adresse extension virus';
+$wb['addr_extension_spam_txt'] = 'Adresse extension SPAM';
+$wb['addr_extension_banned_txt'] = 'Adresse extension bannir';
+$wb['addr_extension_bad_header_txt'] = 'Adresse extension mauvais entête';
+$wb['warnvirusrecip_txt'] = 'Avertir destinataire des virus';
+$wb['warnbannedrecip_txt'] = 'Avertir destinataire banni';
+$wb['warnbadhrecip_txt'] = 'Avertir destinataire mauvais entête';
+$wb['newvirus_admin_txt'] = 'Admin nouveau virus';
+$wb['virus_admin_txt'] = 'Admin virus';
+$wb['banned_admin_txt'] = 'Admin bannissement';
+$wb['bad_header_admin_txt'] = 'Admin mauvais entête';
+$wb['spam_admin_txt'] = 'Admin SPAM';
+$wb['message_size_limit_txt'] = 'Limite de taille de message';
+$wb['banned_rulenames_txt'] = 'Noms des règles bannir';
+?>
diff --git a/interface/web/mail/lib/lang/ca_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/ca_spamfilter_policy_list.lng
new file mode 100644
index 0000000000..3a0e77fba1
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_spamfilter_policy_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Stratégie du filtre antispam';
+$wb['policy_name_txt'] = 'Nom';
+$wb['virus_lover_txt'] = 'Aime les virus';
+$wb['spam_lover_txt'] = 'Aime le spam';
+$wb['banned_files_lover_txt'] = 'Aime les fichiers bannis';
+$wb['bad_header_lover_txt'] = 'Aime les mauvaises entêtes';
+$wb['add_new_record_txt'] = 'Ajouter une entrée à la politique';
+?>
diff --git a/interface/web/mail/lib/lang/ca_spamfilter_users.lng b/interface/web/mail/lib/lang/ca_spamfilter_users.lng
new file mode 100644
index 0000000000..9c7d5bbe7a
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_spamfilter_users.lng
@@ -0,0 +1,13 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['priority_txt'] = 'Priorité';
+$wb['policy_id_txt'] = 'Politique';
+$wb['email_txt'] = 'Email (Schéma)';
+$wb['fullname_txt'] = 'Nom';
+$wb['local_txt'] = 'Local';
+$wb['email_error_notempty'] = 'The courriel address must not be empty.';
+$wb['fullname_error_notempty'] = 'The name must not be empty.';
+$wb['10 - highest'] = '10 - highest';
+$wb['5 - medium'] = '5 - medium';
+$wb['1 - lowest'] = '1 - lowest';
+?>
diff --git a/interface/web/mail/lib/lang/ca_spamfilter_users_list.lng b/interface/web/mail/lib/lang/ca_spamfilter_users_list.lng
new file mode 100644
index 0000000000..daa29d68d6
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_spamfilter_users_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'Utilisateurs de l\'anti-spam';
+$wb['local_txt'] = 'Local';
+$wb['server_id_txt'] = 'Serveur';
+$wb['priority_txt'] = 'Priorité';
+$wb['policy_id_txt'] = 'Politique';
+$wb['fullname_txt'] = 'Nom';
+$wb['email_txt'] = 'Courriel';
+$wb['add_new_record_txt'] = 'Ajouter un utilisateur de l\'anti-spam';
+?>
diff --git a/interface/web/mail/lib/lang/ca_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/ca_spamfilter_whitelist.lng
new file mode 100644
index 0000000000..ab8dbe2c64
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_spamfilter_whitelist.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['wb_txt'] = 'wb';
+$wb['rid_txt'] = 'Utilisateur';
+$wb['email_txt'] = 'Courriel';
+$wb['priority_txt'] = 'Priorité';
+$wb['active_txt'] = 'Actif';
+$wb['limit_spamfilter_wblist_txt'] = 'Le nombre maximal d\'enregistrements de liste blanche ou noire est atteint pour votre compte.';
+$wb['10 - highest'] = '10 - highest';
+$wb['5 - medium'] = '5 - medium';
+$wb['1 - lowest'] = '1 - lowest';
+?>
diff --git a/interface/web/mail/lib/lang/ca_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/ca_spamfilter_whitelist_list.lng
new file mode 100644
index 0000000000..5c0fab1e95
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_spamfilter_whitelist_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Liste blanche de l\'anti-spam';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['priority_txt'] = 'Priorité';
+$wb['rid_txt'] = 'Utilisateur';
+$wb['email_txt'] = 'Email en liste blanche';
+$wb['add_new_record_txt'] = 'Ajouter des enregistrements en liste blanche';
+?>
diff --git a/interface/web/mail/lib/lang/ca_user_quota_stats_list.lng b/interface/web/mail/lib/lang/ca_user_quota_stats_list.lng
new file mode 100644
index 0000000000..460d7fa426
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_user_quota_stats_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Quota des boîtes courriel';
+$wb['quota_txt'] = 'Quota';
+$wb['name_txt'] = 'Nom';
+$wb['email_txt'] = 'Adresse courriel';
+$wb['used_txt'] = 'Espace utilisé';
+$wb['percentage_txt'] = 'Utilisation %';
+?>
diff --git a/interface/web/mail/lib/lang/ca_xmpp_domain.lng b/interface/web/mail/lib/lang/ca_xmpp_domain.lng
new file mode 100644
index 0000000000..0541203b2e
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_xmpp_domain.lng
@@ -0,0 +1,62 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['client_group_id_txt'] = 'Client';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Type';
+$wb['active_txt'] = 'Active';
+$wb['client_txt'] = 'Client';
+$wb['management_method_txt'] = 'Management of user accounts';
+$wb['public_registration_txt'] = 'Enable public registration';
+$wb['registration_url_txt'] = 'Registration URL';
+$wb['registration_message_txt'] = 'Registration Message';
+$wb['domain_admins_txt'] = 'Domain Admins (JIDs)';
+$wb['use_pubsub_txt'] = 'Enable Pubsub';
+$wb['use_proxy_txt'] = 'Enable Bytestream Proxy';
+$wb['use_anon_host_txt'] = 'Enable Anonymous Host';
+$wb['use_vjud_txt'] = 'Enable VJUD User Directory';
+$wb['vjud_opt_mode_txt'] = 'VJUD Opt Mode';
+$wb['use_muc_host_txt'] = 'Enable Multi User Chatrooms';
+$wb['muc_name_txt'] = 'Name in MUC Service Discovery';
+$wb['muc_restrict_room_creation_txt'] = 'Permission to create chatrooms';
+$wb['muc_admins_txt'] = 'MUC Admins (JIDs)';
+$wb['use_pastebin_txt'] = 'Enable Pastebin';
+$wb['pastebin_expire_after_txt'] = 'Pastes expire after (hours)';
+$wb['pastebin_trigger_txt'] = 'Pastebin trigger';
+$wb['use_http_archive_txt'] = 'Enable HTTP chatroom archive';
+$wb['http_archive_show_join_txt'] = 'Show join messages in archive';
+$wb['http_archive_show_status_txt'] = 'Show status changes in archive';
+$wb['use_status_host_txt'] = 'Enable XML Status host';
+$wb['cant_change_domainname_txt'] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb['about_registration_url_txt'] = 'Link to your registration form.';
+$wb['about_registration_message_txt'] = 'Description about your account registration process.';
+$wb['no_corresponding_maildomain_txt'] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_email_txt'] = 'Email Address';
+$wb['ssl_txt'] = 'SSL';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['none_txt'] = 'None';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ssl_error_isemail'] = 'Please enter a valid email adress for generation of the SSL certificate';
+$wb['limit_xmppdomain_txt'] = 'The max. number of XMPP domains for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/ca_xmpp_domain_admin_list.lng b/interface/web/mail/lib/lang/ca_xmpp_domain_admin_list.lng
new file mode 100644
index 0000000000..af643eab5a
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_xmpp_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'XMPP Domain';
+$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';
+?>
diff --git a/interface/web/mail/lib/lang/ca_xmpp_domain_list.lng b/interface/web/mail/lib/lang/ca_xmpp_domain_list.lng
new file mode 100644
index 0000000000..ebfebab7d5
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_xmpp_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'XMPP Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Add new Domain';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/mail/lib/lang/ca_xmpp_user.lng b/interface/web/mail/lib/lang/ca_xmpp_user.lng
new file mode 100644
index 0000000000..6ab739d98b
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_xmpp_user.lng
@@ -0,0 +1,15 @@
+<?php
+$wb['list_head_txt'] = 'XMPP User Accounts';
+$wb['jid_txt'] = 'Jabber ID';
+$wb['active_txt'] = 'Active';
+$wb['cryptpwd_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['error_no_pwd'] = 'Password is empty.';
+$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['no_domain_perm'] = 'You have no permission for this domain.';
+$wb['limit_xmpp_user_txt'] = 'The max. number of xmpp accounts for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/ca_xmpp_user_list.lng b/interface/web/mail/lib/lang/ca_xmpp_user_list.lng
new file mode 100644
index 0000000000..f2651cb62b
--- /dev/null
+++ b/interface/web/mail/lib/lang/ca_xmpp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'XMPP User Accounts';
+$wb['jid_txt'] = 'Jabber ID';
+$wb['is_domain_admin_txt'] = 'Domain admin';
+$wb['is_muc_admin_txt'] = 'MUC admin';
+$wb['add_new_record_txt'] = 'Add new user';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/mail/lib/lang/cz.lng b/interface/web/mail/lib/lang/cz.lng
index 360d2cc091..a0c670ee85 100644
--- a/interface/web/mail/lib/lang/cz.lng
+++ b/interface/web/mail/lib/lang/cz.lng
@@ -46,5 +46,3 @@ $wb['Relay Recipients'] = 'Relay adresáti';
 $wb['Statistics'] = 'Statistiky';
 $wb['Mailbox quota'] = 'Kvóty pro e-mailové schránky';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_backup_stats_list.lng b/interface/web/mail/lib/lang/cz_backup_stats_list.lng
index 9ae9658257..79cd6c9a63 100644
--- a/interface/web/mail/lib/lang/cz_backup_stats_list.lng
+++ b/interface/web/mail/lib/lang/cz_backup_stats_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Email';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Email';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/mail/lib/lang/cz_mail_alias.lng b/interface/web/mail/lib/lang/cz_mail_alias.lng
index e38c800784..57194944a9 100644
--- a/interface/web/mail/lib/lang/cz_mail_alias.lng
+++ b/interface/web/mail/lib/lang/cz_mail_alias.lng
@@ -12,6 +12,6 @@ $wb['domain_txt'] = 'Doména';
 $wb['duplicate_email_alias_txt'] = 'Tento e-mail alias již existuje.';
 $wb['source_txt'] = 'Alias';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_alias_list.lng b/interface/web/mail/lib/lang/cz_mail_alias_list.lng
index 4bb0bc71d6..5eba688e40 100644
--- a/interface/web/mail/lib/lang/cz_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_alias_list.lng
@@ -6,5 +6,3 @@ $wb['destination_txt'] = 'Cíl';
 $wb['email_txt'] = 'E-mail';
 $wb['add_new_record_txt'] = 'Přidat nový e-mailový alias';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng b/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng
index e0cde68350..74611c2de0 100644
--- a/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng
+++ b/interface/web/mail/lib/lang/cz_mail_aliasdomain.lng
@@ -9,5 +9,3 @@ $wb['source_error_empty'] = 'Zdrojová doména je prázdná.';
 $wb['source_error_unique'] = 'Duplikování zdrojové domény.';
 $wb['source_error_regex'] = 'Chybná zdrojová doména.';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng
index 69988d3adf..29d3355f70 100644
--- a/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_aliasdomain_list.lng
@@ -5,5 +5,3 @@ $wb['source_txt'] = 'Zdroj';
 $wb['destination_txt'] = 'Cíl';
 $wb['add_new_record_txt'] = 'Přidat doménový alias';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_blacklist.lng b/interface/web/mail/lib/lang/cz_mail_blacklist.lng
index 4719142aff..e1e6dab48f 100644
--- a/interface/web/mail/lib/lang/cz_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_blacklist.lng
@@ -7,5 +7,3 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng b/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
index 5d86b4ee8a..62d6a35071 100644
--- a/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_blacklist_list.lng
@@ -8,5 +8,3 @@ $wb['recipient_txt'] = 'Příjemce (adresát)';
 $wb['add_new_record_txt'] = 'Přidat záznam na černou listinu';
 $wb['access_txt'] = 'Přístup';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_content_filter.lng b/interface/web/mail/lib/lang/cz_mail_content_filter.lng
index 1405881fbb..459ca228a2 100644
--- a/interface/web/mail/lib/lang/cz_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/cz_mail_content_filter.lng
@@ -7,5 +7,3 @@ $wb['action_txt'] = 'Akce';
 $wb['active_txt'] = 'Aktivní';
 $wb['pattern_error_empty'] = 'Vzor je prázdný.';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng b/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng
index 6e7ebf5186..da9709e7f9 100644
--- a/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_content_filter_list.lng
@@ -6,5 +6,3 @@ $wb['pattern_txt'] = 'Vzor';
 $wb['action_txt'] = 'Akce';
 $wb['add_new_record_txt'] = 'Přidat obsahový filtr';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_domain.lng b/interface/web/mail/lib/lang/cz_mail_domain.lng
index b6c1d0b83c..3a5212a66e 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain.lng
@@ -21,5 +21,3 @@ $wb['policy_txt'] = 'Spamový filtr';
 $wb['no_policy'] = '- nepovoleno -';
 $wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng
index 99f6005c52..76d17e1eef 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_admin_list.lng
@@ -6,5 +6,3 @@ $wb['add_new_record_txt'] = 'Přidat doménu';
 $wb['active_txt'] = 'Aktivní';
 $wb['sys_groupid_txt'] = 'Klient';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng b/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
index 57f2d226be..1bb4a04577 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_catchall.lng
@@ -9,5 +9,3 @@ $wb['limit_mailcatchall_txt'] = 'Dosažen maximální počet košů účtů pro
 $wb['source_txt'] = 'Zdroj';
 $wb['destination_error_isemail'] = 'Cílová e-mailová adresa není platná.';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng
index 29b28af924..4f1a205aae 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_catchall_list.lng
@@ -7,5 +7,3 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'E-malová doména';
 $wb['add_new_record_txt'] = 'Přidat e-mailový koš';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_domain_list.lng b/interface/web/mail/lib/lang/cz_mail_domain_list.lng
index 05bb747530..2abb05cf74 100644
--- a/interface/web/mail/lib/lang/cz_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_domain_list.lng
@@ -5,5 +5,3 @@ $wb['domain_txt'] = 'Doména';
 $wb['add_new_record_txt'] = 'Přidat doménu';
 $wb['active_txt'] = 'Aktivní';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_forward.lng b/interface/web/mail/lib/lang/cz_mail_forward.lng
index ac9361a1f2..e95b40c88c 100644
--- a/interface/web/mail/lib/lang/cz_mail_forward.lng
+++ b/interface/web/mail/lib/lang/cz_mail_forward.lng
@@ -7,6 +7,7 @@ $wb['duplicate_mailbox_txt'] = 'Mailbox s touto adresou již existuje';
 $wb['domain_txt'] = 'Doména';
 $wb['source_txt'] = 'Zdrojový e-mail';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_forward_list.lng b/interface/web/mail/lib/lang/cz_mail_forward_list.lng
index bdbff701e1..e5381fe5f8 100644
--- a/interface/web/mail/lib/lang/cz_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_forward_list.lng
@@ -6,5 +6,3 @@ $wb['destination_txt'] = 'Cíl';
 $wb['email_txt'] = 'E-mail';
 $wb['add_new_record_txt'] = 'Přidat nové přesměrování';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_get.lng b/interface/web/mail/lib/lang/cz_mail_get.lng
index b42b814320..68a4412960 100644
--- a/interface/web/mail/lib/lang/cz_mail_get.lng
+++ b/interface/web/mail/lib/lang/cz_mail_get.lng
@@ -17,5 +17,3 @@ $wb['source_read_all_txt'] = 'Načíst všechny e-maily (včetně již přečten
 $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'] = 'Prosím, zkontrolujte nejprve, zda příjímaní e-mailů funguje, než aktivujete tuto možnost.';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_get_list.lng b/interface/web/mail/lib/lang/cz_mail_get_list.lng
index 824205f00a..9ca8b86dcb 100644
--- a/interface/web/mail/lib/lang/cz_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_get_list.lng
@@ -7,5 +7,3 @@ $wb['source_username_txt'] = 'Uživatelské jméno';
 $wb['destination_txt'] = 'Cíl';
 $wb['add_new_record_txt'] = 'Přidat účet';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_mailinglist.lng b/interface/web/mail/lib/lang/cz_mail_mailinglist.lng
index fadf17329f..e1f7dfbfa5 100644
--- a/interface/web/mail/lib/lang/cz_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_mailinglist.lng
@@ -20,5 +20,3 @@ $wb['listname_error_unique'] = 'Na serveru je již shodný \\"název seznamu\\".
 $wb['email_error_isemail'] = 'E-mailová adresa je neplatná.';
 $wb['mailinglist_txt'] = 'E-mailové konference';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
index b3e2cf85ac..db31273f59 100644
--- a/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_mailinglist_list.lng
@@ -3,5 +3,3 @@ $wb['list_head_txt'] = 'E-mailové konference';
 $wb['domain_txt'] = 'Doména';
 $wb['listname_txt'] = 'Název seznamu';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng b/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng
index 6eb374e847..1928c31e14 100644
--- a/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng
+++ b/interface/web/mail/lib/lang/cz_mail_relay_recipient.lng
@@ -7,5 +7,3 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Dosažen maximální počet e-mail filtrů pro Váš účet.';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng
index bf34af6ec3..1af959966c 100644
--- a/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_relay_recipient_list.lng
@@ -7,5 +7,3 @@ $wb['recipient_txt'] = 'Příjemce (adresát)';
 $wb['add_new_record_txt'] = 'Přidat relay adresáta';
 $wb['access_txt'] = 'Přístup';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_spamfilter.lng b/interface/web/mail/lib/lang/cz_mail_spamfilter.lng
index f19706dc3a..4b6cc2b5d8 100644
--- a/interface/web/mail/lib/lang/cz_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/cz_mail_spamfilter.lng
@@ -15,5 +15,3 @@ $wb['email_error_unique'] = 'Pro tuto email adresu již existuje filtrovací zá
 $wb['spam_redirect_maildir_purge_txt'] = 'Vyčistit poté mailový adresář';
 $wb['days_txt'] = 'Dny.';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng
index f6170c6355..7560b570da 100644
--- a/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_spamfilter_list.lng
@@ -6,5 +6,3 @@ $wb['server_name_txt'] = 'server_name';
 $wb['email_txt'] = 'E-mail';
 $wb['add_new_record_txt'] = 'Přidat nový záznam spamfiltru';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_transport.lng b/interface/web/mail/lib/lang/cz_mail_transport.lng
index 533d362a3e..508ca764b6 100644
--- a/interface/web/mail/lib/lang/cz_mail_transport.lng
+++ b/interface/web/mail/lib/lang/cz_mail_transport.lng
@@ -9,5 +9,3 @@ $wb['active_txt'] = 'Aktivní';
 $wb['limit_mailrouting_txt'] = 'Dosažen maximální počet e-mail směrování pro Váš účet.';
 $wb['transport_txt'] = 'Transport';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_transport_list.lng b/interface/web/mail/lib/lang/cz_mail_transport_list.lng
index 643875da55..4261abccc2 100644
--- a/interface/web/mail/lib/lang/cz_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_transport_list.lng
@@ -7,5 +7,3 @@ $wb['transport_txt'] = 'Transport';
 $wb['sort_order_txt'] = 'Třídit podle';
 $wb['add_new_record_txt'] = 'Přidat transport';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_user.lng b/interface/web/mail/lib/lang/cz_mail_user.lng
index 0402eaf4d9..7e51195c49 100644
--- a/interface/web/mail/lib/lang/cz_mail_user.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user.lng
@@ -48,8 +48,8 @@ $wb['generate_password_txt'] = 'Generovat heslo';
 $wb['repeat_password_txt'] = 'Opakujte heslo';
 $wb['password_mismatch_txt'] = 'Hesla se neshodují.';
 $wb['password_match_txt'] = 'Hesla se shodují.';
-$wb["backup_interval_txt"] = 'Backup interval';
-$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['no_backup_txt'] = 'No backup';
 $wb['daily_backup_txt'] = 'Daily';
 $wb['weekly_backup_txt'] = 'Weekly';
@@ -57,6 +57,8 @@ $wb['monthly_backup_txt'] = 'Monthly';
 $wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
 $wb['cc_note_txt'] = '(Při přeposílání na více e-mailových adres, oddělte čárkami.)';
 $wb['disablesmtp_txt'] = 'Zakázat SMTP (pouze odesílání)';
+$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
+$wb['sender_cc_txt'] = 'Send outgoing copy to';
+$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
+$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_user_filter.lng b/interface/web/mail/lib/lang/cz_mail_user_filter.lng
index 0973856843..f611ded30a 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_filter.lng
@@ -15,8 +15,14 @@ $wb['contains_txt'] = 'Obsahuje';
 $wb['is_txt'] = 'Je';
 $wb['begins_with_txt'] = 'Začíná na';
 $wb['ends_with_txt'] = 'Končí na';
-$wb['move_to_txt'] = 'Přesunout do';
 $wb['delete_txt'] = 'Smazat';
+$wb['move_stop_txt'] = 'Move to';
+$wb['header_txt'] = 'Header';
+$wb['size_over_txt'] = 'Email size over (KB)';
+$wb['size_under_txt'] = 'Email size under (KB)';
+$wb['localpart_txt'] = 'Localpart';
+$wb['domain_txt'] = 'Domain';
+$wb['keep_txt'] = 'Keep';
+$wb['reject_txt'] = 'Reject';
+$wb['stop_txt'] = 'Stop';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng b/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng
index d9f6748c19..60229ce3b5 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_filter_list.lng
@@ -5,5 +5,3 @@ $wb['page_txt'] = 'Stránka';
 $wb['page_of_txt'] = 'z';
 $wb['delete_confirmation'] = 'Opravdu smazat mailový filtr?';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_user_list.lng b/interface/web/mail/lib/lang/cz_mail_user_list.lng
index 08d28fbc02..3e3cb3a8a7 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_list.lng
@@ -5,6 +5,8 @@ $wb['autoresponder_txt'] = 'Automatická odpověď';
 $wb['add_new_record_txt'] = 'Přidat e-mailovou schránku';
 $wb['name_txt'] = 'Skutečný název';
 $wb['login_txt'] = 'Přihlášení';
+$wb['postfix_txt'] = 'Receiving';
+$wb['disablesmtp_txt'] = 'SMTP (sending)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng b/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng
index 92600a17d9..50cbc31d5c 100644
--- a/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_user_stats_list.lng
@@ -6,5 +6,3 @@ $wb['last_month_txt'] = 'Minulý měsíc';
 $wb['this_year_txt'] = 'Tento rok';
 $wb['last_year_txt'] = 'Minulý rok';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_whitelist.lng b/interface/web/mail/lib/lang/cz_mail_whitelist.lng
index cd5d032953..db55c18a0b 100644
--- a/interface/web/mail/lib/lang/cz_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/cz_mail_whitelist.lng
@@ -7,5 +7,3 @@ $wb['source_error_notempty'] = 'Adresa je prázdná.';
 $wb['type_txt'] = 'Typ';
 $wb['limit_mailfilter_txt'] = 'Dosažen maximální počet email filtrů pro Váš účet.';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng b/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
index 5efb81d37e..8bd58bfcc7 100644
--- a/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/cz_mail_whitelist_list.lng
@@ -8,5 +8,3 @@ $wb['recipient_txt'] = 'Příjemce (adresát)';
 $wb['add_new_record_txt'] = 'Přidat záznam na bílou listinu';
 $wb['access_txt'] = 'Přístup';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
index 5824fb7bb5..4d47c28671 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_blacklist.lng
@@ -10,5 +10,3 @@ $wb['10 - highest'] = '10 - nejvyšší';
 $wb['5 - medium'] = '5 - střední';
 $wb['1 - lowest'] = '1 - nejnižší';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng
index 60e8f44077..854eb92bbb 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_blacklist_list.lng
@@ -7,5 +7,3 @@ $wb['rid_txt'] = 'Uživatel';
 $wb['email_txt'] = 'E-maily na černé listině';
 $wb['add_new_record_txt'] = 'Přidat záznam na černou listinu';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_config.lng b/interface/web/mail/lib/lang/cz_spamfilter_config.lng
index e54887bc7e..5258364566 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_config.lng
@@ -18,5 +18,3 @@ $wb['relayhost_password_txt'] = 'Relayhost heslo';
 $wb['mailbox_size_limit_txt'] = 'Limit velikosti e-mailové schránky';
 $wb['message_size_limit_txt'] = 'Limit velikosti zprávy';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng
index 8b5b1e758d..fe2ee8d51c 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_config_list.lng
@@ -3,5 +3,3 @@ $wb['list_head_txt'] = 'Konfigurace serveru';
 $wb['server_name_txt'] = 'Server';
 $wb['server_id_txt'] = 'server_id';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_policy.lng b/interface/web/mail/lib/lang/cz_spamfilter_policy.lng
index 024821bf20..c5765e807f 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_policy.lng
@@ -36,5 +36,3 @@ $wb['spam_admin_txt'] = 'SPAM admin';
 $wb['message_size_limit_txt'] = 'Limit velikosti zprávy';
 $wb['banned_rulenames_txt'] = 'Název pravidel zabanované';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng
index 37f41d3ace..9a0c361997 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_policy_list.lng
@@ -7,5 +7,3 @@ $wb['banned_files_lover_txt'] = 'Zabanované soubory';
 $wb['bad_header_lover_txt'] = 'Špatné hlavičky';
 $wb['add_new_record_txt'] = 'Přidat záznam politiky';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_users.lng b/interface/web/mail/lib/lang/cz_spamfilter_users.lng
index 63a5fcf78d..3473064e21 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_users.lng
@@ -11,5 +11,3 @@ $wb['10 - highest'] = '10 - nejvyšší';
 $wb['5 - medium'] = '5 - střední';
 $wb['1 - lowest'] = '1 - nejnižší';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng
index 26c4df143f..36bf3409e3 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_users_list.lng
@@ -8,5 +8,3 @@ $wb['fullname_txt'] = 'Jméno';
 $wb['email_txt'] = 'E-mail';
 $wb['add_new_record_txt'] = 'Přidat spamfiltr uživatele';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
index 5824fb7bb5..4d47c28671 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_whitelist.lng
@@ -10,5 +10,3 @@ $wb['10 - highest'] = '10 - nejvyšší';
 $wb['5 - medium'] = '5 - střední';
 $wb['1 - lowest'] = '1 - nejnižší';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng
index c63a8c05de..1b95524e18 100644
--- a/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/cz_spamfilter_whitelist_list.lng
@@ -7,5 +7,3 @@ $wb['rid_txt'] = 'Uživatel';
 $wb['email_txt'] = 'E-maily na bílé listině';
 $wb['add_new_record_txt'] = 'Přidat záznam na bílou listinu';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng b/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng
index bc771c7e2d..b55af94171 100755
--- a/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng
+++ b/interface/web/mail/lib/lang/cz_user_quota_stats_list.lng
@@ -6,5 +6,3 @@ $wb['email_txt'] = 'E-mailová adresa';
 $wb['used_txt'] = 'Využité místo';
 $wb['percentage_txt'] = 'Využité místo v %';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/cz_xmpp_domain.lng b/interface/web/mail/lib/lang/cz_xmpp_domain.lng
new file mode 100644
index 0000000000..f1da77ba29
--- /dev/null
+++ b/interface/web/mail/lib/lang/cz_xmpp_domain.lng
@@ -0,0 +1,62 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["client_group_id_txt"] = 'Client';
+$wb["domain_txt"] = 'Domain';
+$wb["type_txt"] = 'Type';
+$wb["active_txt"] = 'Active';
+$wb["client_txt"] = 'Client';
+$wb["management_method_txt"] = 'Management of user accounts';
+$wb["public_registration_txt"] = 'Enable public registration';
+$wb["registration_url_txt"] = 'Registration URL';
+$wb["registration_message_txt"] = 'Registration Message';
+$wb["domain_admins_txt"] = 'Domain Admins (JIDs)';
+$wb["use_pubsub_txt"] = 'Enable Pubsub';
+$wb["use_proxy_txt"] = 'Enable Bytestream Proxy';
+$wb["use_anon_host_txt"] = 'Enable Anonymous Host';
+$wb["use_vjud_txt"] = 'Enable VJUD User Directory';
+$wb["vjud_opt_mode_txt"] = 'VJUD Opt Mode';
+$wb["use_muc_host_txt"] = 'Enable Multi User Chatrooms';
+$wb["muc_name_txt"] = 'Name in MUC Service Discovery';
+$wb["muc_restrict_room_creation_txt"] = 'Permission to create chatrooms';
+$wb["muc_admins_txt"] = 'MUC Admins (JIDs)';
+$wb["use_pastebin_txt"] = 'Enable Pastebin';
+$wb["pastebin_expire_after_txt"] = 'Pastes expire after (hours)';
+$wb["pastebin_trigger_txt"] = 'Pastebin trigger';
+$wb["use_http_archive_txt"] = 'Enable HTTP chatroom archive';
+$wb["http_archive_show_join_txt"] = 'Show join messages in archive';
+$wb["http_archive_show_status_txt"] = 'Show status changes in archive';
+$wb["use_status_host_txt"] = 'Enable XML Status host';
+$wb["cant_change_domainname_txt"] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb["about_registration_url_txt"] = 'Link to your registration form.';
+$wb["about_registration_message_txt"] = 'Description about your account registration process.';
+$wb["no_corresponding_maildomain_txt"] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_email_txt'] = 'Email Address';
+$wb['ssl_txt'] = 'SSL';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['none_txt'] = 'None';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ssl_error_isemail'] = 'Please enter a valid email adress for generation of the SSL certificate';
+$wb["limit_xmppdomain_txt"] = 'The max. number of XMPP domains for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/cz_xmpp_domain_admin_list.lng b/interface/web/mail/lib/lang/cz_xmpp_domain_admin_list.lng
new file mode 100644
index 0000000000..a3d1736d7b
--- /dev/null
+++ b/interface/web/mail/lib/lang/cz_xmpp_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$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';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/cz_xmpp_domain_list.lng b/interface/web/mail/lib/lang/cz_xmpp_domain_list.lng
new file mode 100644
index 0000000000..f8c2fb9b8e
--- /dev/null
+++ b/interface/web/mail/lib/lang/cz_xmpp_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["add_new_record_txt"] = 'Add new Domain';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/cz_xmpp_user.lng b/interface/web/mail/lib/lang/cz_xmpp_user.lng
new file mode 100644
index 0000000000..1cc852e3cf
--- /dev/null
+++ b/interface/web/mail/lib/lang/cz_xmpp_user.lng
@@ -0,0 +1,15 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["active_txt"] = 'Active';
+$wb["cryptpwd_txt"] = 'Password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["error_no_pwd"] = 'Password is empty.';
+$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["no_domain_perm"] = 'You have no permission for this domain.';
+$wb["limit_xmpp_user_txt"] = 'The max. number of xmpp accounts for your account is reached.';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/cz_xmpp_user_list.lng b/interface/web/mail/lib/lang/cz_xmpp_user_list.lng
new file mode 100644
index 0000000000..db88b0d7e3
--- /dev/null
+++ b/interface/web/mail/lib/lang/cz_xmpp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["is_domain_admin_txt"] = 'Domain admin';
+$wb["is_muc_admin_txt"] = 'MUC admin';
+$wb["add_new_record_txt"] = 'Add new user';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/de_backup_stats_list.lng b/interface/web/mail/lib/lang/de_backup_stats_list.lng
index e3b3fd6f34..9e14533068 100644
--- a/interface/web/mail/lib/lang/de_backup_stats_list.lng
+++ b/interface/web/mail/lib/lang/de_backup_stats_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Statistiken';
-$wb['active_txt']          = 'Aktiv';
-$wb['domain_txt']          = 'Email';
-$wb['backup_count_txt']    = 'Anz. Backups';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Statistiken';
+$wb['active_txt'] = 'Aktiv';
+$wb['domain_txt'] = 'Email';
+$wb['backup_count_txt'] = 'Anz. Backups';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Intervall / Anz.';
 $wb['backup_size_txt'] = 'Backupgrösse';
 ?>
diff --git a/interface/web/mail/lib/lang/de_mail_domain.lng b/interface/web/mail/lib/lang/de_mail_domain.lng
index 94c1bbede3..13aac42c79 100644
--- a/interface/web/mail/lib/lang/de_mail_domain.lng
+++ b/interface/web/mail/lib/lang/de_mail_domain.lng
@@ -3,12 +3,12 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domain';
 $wb['type_txt'] = 'Typ';
 $wb['active_txt'] = 'Aktiv';
-$wb["dkim_txt"] = 'DKIM aktivieren';
-$wb["dkim_private_txt"] = 'DKIM privater Schlüssel';
-$wb["dkim_public_txt"] = 'DKIM öffentlicher Schlüssel';
-$wb["dkim_generate_txt"] = 'erstelle DKIM Schlüssel';
-$wb["dkim_dns_txt"] = 'DNS Eintrag';
-$wb["dkim_private_key_error"] = 'ungueltiger DKIM-Private key';
+$wb['dkim_txt'] = 'DKIM aktivieren';
+$wb['dkim_private_txt'] = 'DKIM privater Schlüssel';
+$wb['dkim_public_txt'] = 'DKIM öffentlicher Schlüssel';
+$wb['dkim_generate_txt'] = 'erstelle DKIM Schlüssel';
+$wb['dkim_dns_txt'] = 'DNS Eintrag';
+$wb['dkim_private_key_error'] = 'ungueltiger DKIM-Private key';
 $wb['domain_error_empty'] = 'Domain ist leer';
 $wb['domain_error_unique'] = 'Doppelte Domain.';
 $wb['domain_error_regex'] = 'Ungültiger Domainname.';
@@ -18,5 +18,6 @@ $wb['policy_txt'] = 'Spamfilter';
 $wb['no_policy'] = '- nicht aktiviert -';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Ungültiger DKIM-Selector.  Verwenden Sie nur max. 63 alphanumerische Zeichen (a-z oder 0-9)';
-$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
+$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 ?>
diff --git a/interface/web/mail/lib/lang/de_mail_user.lng b/interface/web/mail/lib/lang/de_mail_user.lng
index 33c08b089d..85ca3d18eb 100644
--- a/interface/web/mail/lib/lang/de_mail_user.lng
+++ b/interface/web/mail/lib/lang/de_mail_user.lng
@@ -50,11 +50,15 @@ $wb['repeat_password_txt'] = 'Passwort wiederholen';
 $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
 $wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
 $wb['email_error_isascii'] = 'Bitte verwenden Sie keine Umlaute im Passwort. Dies kann zu Problemen mit Ihrem E-Mail-Programm führen.';
-$wb["backup_interval_txt"] = 'Backup interval';
-$wb["backup_copies_txt"] = 'Anzahl der Backups';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Anzahl der Backups';
 $wb['no_backup_txt'] = 'inaktiv';
 $wb['daily_backup_txt'] = 'taeglich';
 $wb['weekly_backup_txt'] = 'woechentlich';
 $wb['monthly_backup_txt'] = 'monatlich';
 $wb['cc_note_txt'] = '(Mehrere E-Mail-Adressen mit Kommas trennen)';
+$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
+$wb['sender_cc_txt'] = 'Send outgoing copy to';
+$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
+$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
diff --git a/interface/web/mail/lib/lang/de_mail_user_list.lng b/interface/web/mail/lib/lang/de_mail_user_list.lng
index a56fb6da14..5eeff280c2 100644
--- a/interface/web/mail/lib/lang/de_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/de_mail_user_list.lng
@@ -5,4 +5,8 @@ $wb['autoresponder_txt'] = 'Autoresponder';
 $wb['add_new_record_txt'] = 'Neues E-Mail Konto hinzufügen';
 $wb['name_txt'] = 'Realname';
 $wb['login_txt'] = 'Anmelden';
+$wb['postfix_txt'] = 'Receiving';
+$wb['disablesmtp_txt'] = 'SMTP (sending)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
 ?>
diff --git a/interface/web/mail/lib/lang/de_xmpp_domain.lng b/interface/web/mail/lib/lang/de_xmpp_domain.lng
new file mode 100644
index 0000000000..f1da77ba29
--- /dev/null
+++ b/interface/web/mail/lib/lang/de_xmpp_domain.lng
@@ -0,0 +1,62 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["client_group_id_txt"] = 'Client';
+$wb["domain_txt"] = 'Domain';
+$wb["type_txt"] = 'Type';
+$wb["active_txt"] = 'Active';
+$wb["client_txt"] = 'Client';
+$wb["management_method_txt"] = 'Management of user accounts';
+$wb["public_registration_txt"] = 'Enable public registration';
+$wb["registration_url_txt"] = 'Registration URL';
+$wb["registration_message_txt"] = 'Registration Message';
+$wb["domain_admins_txt"] = 'Domain Admins (JIDs)';
+$wb["use_pubsub_txt"] = 'Enable Pubsub';
+$wb["use_proxy_txt"] = 'Enable Bytestream Proxy';
+$wb["use_anon_host_txt"] = 'Enable Anonymous Host';
+$wb["use_vjud_txt"] = 'Enable VJUD User Directory';
+$wb["vjud_opt_mode_txt"] = 'VJUD Opt Mode';
+$wb["use_muc_host_txt"] = 'Enable Multi User Chatrooms';
+$wb["muc_name_txt"] = 'Name in MUC Service Discovery';
+$wb["muc_restrict_room_creation_txt"] = 'Permission to create chatrooms';
+$wb["muc_admins_txt"] = 'MUC Admins (JIDs)';
+$wb["use_pastebin_txt"] = 'Enable Pastebin';
+$wb["pastebin_expire_after_txt"] = 'Pastes expire after (hours)';
+$wb["pastebin_trigger_txt"] = 'Pastebin trigger';
+$wb["use_http_archive_txt"] = 'Enable HTTP chatroom archive';
+$wb["http_archive_show_join_txt"] = 'Show join messages in archive';
+$wb["http_archive_show_status_txt"] = 'Show status changes in archive';
+$wb["use_status_host_txt"] = 'Enable XML Status host';
+$wb["cant_change_domainname_txt"] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb["about_registration_url_txt"] = 'Link to your registration form.';
+$wb["about_registration_message_txt"] = 'Description about your account registration process.';
+$wb["no_corresponding_maildomain_txt"] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_email_txt'] = 'Email Address';
+$wb['ssl_txt'] = 'SSL';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['none_txt'] = 'None';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ssl_error_isemail'] = 'Please enter a valid email adress for generation of the SSL certificate';
+$wb["limit_xmppdomain_txt"] = 'The max. number of XMPP domains for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/de_xmpp_domain_admin_list.lng b/interface/web/mail/lib/lang/de_xmpp_domain_admin_list.lng
new file mode 100644
index 0000000000..a3d1736d7b
--- /dev/null
+++ b/interface/web/mail/lib/lang/de_xmpp_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$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';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/de_xmpp_domain_list.lng b/interface/web/mail/lib/lang/de_xmpp_domain_list.lng
new file mode 100644
index 0000000000..f8c2fb9b8e
--- /dev/null
+++ b/interface/web/mail/lib/lang/de_xmpp_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["add_new_record_txt"] = 'Add new Domain';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/de_xmpp_user.lng b/interface/web/mail/lib/lang/de_xmpp_user.lng
new file mode 100644
index 0000000000..1cc852e3cf
--- /dev/null
+++ b/interface/web/mail/lib/lang/de_xmpp_user.lng
@@ -0,0 +1,15 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["active_txt"] = 'Active';
+$wb["cryptpwd_txt"] = 'Password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["error_no_pwd"] = 'Password is empty.';
+$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["no_domain_perm"] = 'You have no permission for this domain.';
+$wb["limit_xmpp_user_txt"] = 'The max. number of xmpp accounts for your account is reached.';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/de_xmpp_user_list.lng b/interface/web/mail/lib/lang/de_xmpp_user_list.lng
new file mode 100644
index 0000000000..db88b0d7e3
--- /dev/null
+++ b/interface/web/mail/lib/lang/de_xmpp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["is_domain_admin_txt"] = 'Domain admin';
+$wb["is_muc_admin_txt"] = 'MUC admin';
+$wb["add_new_record_txt"] = 'Add new user';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/el_backup_stats_list.lng b/interface/web/mail/lib/lang/el_backup_stats_list.lng
index 9ae9658257..79cd6c9a63 100644
--- a/interface/web/mail/lib/lang/el_backup_stats_list.lng
+++ b/interface/web/mail/lib/lang/el_backup_stats_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Email';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Email';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/mail/lib/lang/el_mail_alias.lng b/interface/web/mail/lib/lang/el_mail_alias.lng
index 6902b50422..5663822ce0 100644
--- a/interface/web/mail/lib/lang/el_mail_alias.lng
+++ b/interface/web/mail/lib/lang/el_mail_alias.lng
@@ -12,4 +12,6 @@ $wb['domain_txt'] = 'Domain';
 $wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
 $wb['source_txt'] = 'Alias';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
 ?>
diff --git a/interface/web/mail/lib/lang/el_mail_domain.lng b/interface/web/mail/lib/lang/el_mail_domain.lng
index b40973438f..3973746dfd 100644
--- a/interface/web/mail/lib/lang/el_mail_domain.lng
+++ b/interface/web/mail/lib/lang/el_mail_domain.lng
@@ -10,13 +10,14 @@ $wb['client_txt'] = 'Πελάτης';
 $wb['limit_maildomain_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των email domains για τον λογαριασμό σας.';
 $wb['policy_txt'] = 'Spamfilter';
 $wb['no_policy'] = '- ανενεργό -';
-$wb["dkim_txt"] = 'enable DKIM';
-$wb["dkim_private_txt"] = 'DKIM Private-key';
-$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
-$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
-$wb["dkim_dns_txt"] = 'DNS-Record';
-$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
-$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
+$wb['dkim_txt'] = 'enable DKIM';
+$wb['dkim_private_txt'] = 'DKIM Private-key';
+$wb['dkim_public_txt'] = 'DKIM Public-key\nfor information only';
+$wb['dkim_generate_txt'] = 'Generate DKIM Private-key';
+$wb['dkim_dns_txt'] = 'DNS-Record';
+$wb['dkim_private_key_error'] = 'Invalid DKIM-Private key';
+$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 ?>
diff --git a/interface/web/mail/lib/lang/el_mail_forward.lng b/interface/web/mail/lib/lang/el_mail_forward.lng
index e4f2f64f37..9a316c3018 100644
--- a/interface/web/mail/lib/lang/el_mail_forward.lng
+++ b/interface/web/mail/lib/lang/el_mail_forward.lng
@@ -7,4 +7,7 @@ $wb['duplicate_mailbox_txt'] = 'Υπάρχει ήδη μια θυρίδα με 
 $wb['domain_txt'] = 'Domain';
 $wb['source_txt'] = 'Source Email';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
 ?>
diff --git a/interface/web/mail/lib/lang/el_mail_user.lng b/interface/web/mail/lib/lang/el_mail_user.lng
index 0e9db8c46c..8f364c5045 100644
--- a/interface/web/mail/lib/lang/el_mail_user.lng
+++ b/interface/web/mail/lib/lang/el_mail_user.lng
@@ -51,4 +51,14 @@ $wb['password_match_txt'] = 'The passwords do match.';
 $wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
 $wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
+$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
+$wb['sender_cc_txt'] = 'Send outgoing copy to';
+$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
+$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
diff --git a/interface/web/mail/lib/lang/el_mail_user_filter.lng b/interface/web/mail/lib/lang/el_mail_user_filter.lng
index fb9508c4f6..eb59e561bf 100644
--- a/interface/web/mail/lib/lang/el_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/el_mail_user_filter.lng
@@ -15,6 +15,14 @@ $wb['contains_txt'] = 'Περιλαμβάνει';
 $wb['is_txt'] = 'είναι';
 $wb['begins_with_txt'] = 'Ξεκινά με';
 $wb['ends_with_txt'] = 'Τελειώνει σε';
-$wb['move_to_txt'] = 'Μετακίνηση σε';
 $wb['delete_txt'] = 'Διαγραφή';
+$wb['move_stop_txt'] = 'Move to';
+$wb['header_txt'] = 'Header';
+$wb['size_over_txt'] = 'Email size over (KB)';
+$wb['size_under_txt'] = 'Email size under (KB)';
+$wb['localpart_txt'] = 'Localpart';
+$wb['domain_txt'] = 'Domain';
+$wb['keep_txt'] = 'Keep';
+$wb['reject_txt'] = 'Reject';
+$wb['stop_txt'] = 'Stop';
 ?>
diff --git a/interface/web/mail/lib/lang/el_mail_user_list.lng b/interface/web/mail/lib/lang/el_mail_user_list.lng
index 7e3f57bb72..98cf9c200d 100644
--- a/interface/web/mail/lib/lang/el_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/el_mail_user_list.lng
@@ -5,4 +5,8 @@ $wb['autoresponder_txt'] = 'Αυτόματη απάντηση';
 $wb['add_new_record_txt'] = 'Νέα Θυρίδα';
 $wb['name_txt'] = 'Πραγματικό Όνομα';
 $wb['login_txt'] = 'Login';
+$wb['postfix_txt'] = 'Receiving';
+$wb['disablesmtp_txt'] = 'SMTP (sending)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
 ?>
diff --git a/interface/web/mail/lib/lang/el_xmpp_domain.lng b/interface/web/mail/lib/lang/el_xmpp_domain.lng
new file mode 100644
index 0000000000..f1da77ba29
--- /dev/null
+++ b/interface/web/mail/lib/lang/el_xmpp_domain.lng
@@ -0,0 +1,62 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["client_group_id_txt"] = 'Client';
+$wb["domain_txt"] = 'Domain';
+$wb["type_txt"] = 'Type';
+$wb["active_txt"] = 'Active';
+$wb["client_txt"] = 'Client';
+$wb["management_method_txt"] = 'Management of user accounts';
+$wb["public_registration_txt"] = 'Enable public registration';
+$wb["registration_url_txt"] = 'Registration URL';
+$wb["registration_message_txt"] = 'Registration Message';
+$wb["domain_admins_txt"] = 'Domain Admins (JIDs)';
+$wb["use_pubsub_txt"] = 'Enable Pubsub';
+$wb["use_proxy_txt"] = 'Enable Bytestream Proxy';
+$wb["use_anon_host_txt"] = 'Enable Anonymous Host';
+$wb["use_vjud_txt"] = 'Enable VJUD User Directory';
+$wb["vjud_opt_mode_txt"] = 'VJUD Opt Mode';
+$wb["use_muc_host_txt"] = 'Enable Multi User Chatrooms';
+$wb["muc_name_txt"] = 'Name in MUC Service Discovery';
+$wb["muc_restrict_room_creation_txt"] = 'Permission to create chatrooms';
+$wb["muc_admins_txt"] = 'MUC Admins (JIDs)';
+$wb["use_pastebin_txt"] = 'Enable Pastebin';
+$wb["pastebin_expire_after_txt"] = 'Pastes expire after (hours)';
+$wb["pastebin_trigger_txt"] = 'Pastebin trigger';
+$wb["use_http_archive_txt"] = 'Enable HTTP chatroom archive';
+$wb["http_archive_show_join_txt"] = 'Show join messages in archive';
+$wb["http_archive_show_status_txt"] = 'Show status changes in archive';
+$wb["use_status_host_txt"] = 'Enable XML Status host';
+$wb["cant_change_domainname_txt"] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb["about_registration_url_txt"] = 'Link to your registration form.';
+$wb["about_registration_message_txt"] = 'Description about your account registration process.';
+$wb["no_corresponding_maildomain_txt"] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_email_txt'] = 'Email Address';
+$wb['ssl_txt'] = 'SSL';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['none_txt'] = 'None';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ssl_error_isemail'] = 'Please enter a valid email adress for generation of the SSL certificate';
+$wb["limit_xmppdomain_txt"] = 'The max. number of XMPP domains for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/el_xmpp_domain_admin_list.lng b/interface/web/mail/lib/lang/el_xmpp_domain_admin_list.lng
new file mode 100644
index 0000000000..a3d1736d7b
--- /dev/null
+++ b/interface/web/mail/lib/lang/el_xmpp_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$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';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/el_xmpp_domain_list.lng b/interface/web/mail/lib/lang/el_xmpp_domain_list.lng
new file mode 100644
index 0000000000..f8c2fb9b8e
--- /dev/null
+++ b/interface/web/mail/lib/lang/el_xmpp_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["add_new_record_txt"] = 'Add new Domain';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/el_xmpp_user.lng b/interface/web/mail/lib/lang/el_xmpp_user.lng
new file mode 100644
index 0000000000..1cc852e3cf
--- /dev/null
+++ b/interface/web/mail/lib/lang/el_xmpp_user.lng
@@ -0,0 +1,15 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["active_txt"] = 'Active';
+$wb["cryptpwd_txt"] = 'Password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["error_no_pwd"] = 'Password is empty.';
+$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["no_domain_perm"] = 'You have no permission for this domain.';
+$wb["limit_xmpp_user_txt"] = 'The max. number of xmpp accounts for your account is reached.';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/el_xmpp_user_list.lng b/interface/web/mail/lib/lang/el_xmpp_user_list.lng
new file mode 100644
index 0000000000..db88b0d7e3
--- /dev/null
+++ b/interface/web/mail/lib/lang/el_xmpp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["is_domain_admin_txt"] = 'Domain admin';
+$wb["is_muc_admin_txt"] = 'MUC admin';
+$wb["add_new_record_txt"] = 'Add new user';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/es.lng b/interface/web/mail/lib/lang/es.lng
index ad03e9db5c..cdd821ceeb 100644
--- a/interface/web/mail/lib/lang/es.lng
+++ b/interface/web/mail/lib/lang/es.lng
@@ -43,7 +43,6 @@ $wb['Postfix Blacklist'] = 'Lista negra de Postfix';
 $wb['Content Filter'] = 'Filtro de contenido';
 $wb['Global Filters'] = 'Filtros globales';
 $wb['Domain Alias'] = 'Alias de dominio';
-$wb['Mailing List'] = 'Listas de correo';
 $wb['Relay Recipients'] = 'Recipientes de retransmisión';
 $wb['Mailbox quota'] = 'Cuota de los buzones';
 ?>
diff --git a/interface/web/mail/lib/lang/es_backup_stats_list.lng b/interface/web/mail/lib/lang/es_backup_stats_list.lng
index 9ae9658257..79cd6c9a63 100644
--- a/interface/web/mail/lib/lang/es_backup_stats_list.lng
+++ b/interface/web/mail/lib/lang/es_backup_stats_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Email';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Email';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/mail/lib/lang/es_mail_alias.lng b/interface/web/mail/lib/lang/es_mail_alias.lng
index 99709504e4..6d2ca10764 100644
--- a/interface/web/mail/lib/lang/es_mail_alias.lng
+++ b/interface/web/mail/lib/lang/es_mail_alias.lng
@@ -12,4 +12,6 @@ $wb['domain_txt'] = 'Dominio';
 $wb['duplicate_email_alias_txt'] = 'Este alias de correo ya existe.';
 $wb['source_txt'] = 'Alias';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
 ?>
diff --git a/interface/web/mail/lib/lang/es_mail_domain.lng b/interface/web/mail/lib/lang/es_mail_domain.lng
index b87ddbc9d5..3d98c3f8e6 100644
--- a/interface/web/mail/lib/lang/es_mail_domain.lng
+++ b/interface/web/mail/lib/lang/es_mail_domain.lng
@@ -9,14 +9,15 @@ $wb['domain_error_regex'] = 'Nombre de dominio inválido.';
 $wb['client_txt'] = 'Cliente';
 $wb['limit_maildomain_txt'] = 'Ha alcanzado en su cuenta el número máx. de dominios para correo.';
 $wb['policy_txt'] = 'Filtro de spam';
-$wb["dkim_txt"] = 'Activar DKIM';
-$wb["dkim_private_txt"] = 'Clave privada DKIM';
-$wb["dkim_public_txt"] = 'Clave pública DKIM\nsólo para información';
-$wb["dkim_generate_txt"] = 'Generar clave privada DKIM';
-$wb["dkim_dns_txt"] = 'Registro DNS';
-$wb["dkim_private_key_error"] = 'Clave privada DKIM no válida';
+$wb['dkim_txt'] = 'Activar DKIM';
+$wb['dkim_private_txt'] = 'Clave privada DKIM';
+$wb['dkim_public_txt'] = 'Clave pública DKIM\nsólo para información';
+$wb['dkim_generate_txt'] = 'Generar clave privada DKIM';
+$wb['dkim_dns_txt'] = 'Registro DNS';
+$wb['dkim_private_key_error'] = 'Clave privada DKIM no válida';
 $wb['dkim_selector_txt'] = 'Selector DKIM';
 $wb['dkim_selector_error'] = 'Selector DKIM no válido. Usar sólo caracteres alfanuméricos en minúsculas (a-z o 0-9) up to 63 chars';
-$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
+$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['no_policy'] = '- no habilitado -';
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 ?>
diff --git a/interface/web/mail/lib/lang/es_mail_forward.lng b/interface/web/mail/lib/lang/es_mail_forward.lng
index f5c918ed73..12fbeefa99 100644
--- a/interface/web/mail/lib/lang/es_mail_forward.lng
+++ b/interface/web/mail/lib/lang/es_mail_forward.lng
@@ -7,4 +7,7 @@ $wb['duplicate_mailbox_txt'] = 'Ya existe un buzón con esta cuenta de correo.';
 $wb['domain_txt'] = 'Dominio';
 $wb['greylisting_txt'] = 'Enable greylisting';
 $wb['source_txt'] = 'Origen del correo';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
 ?>
diff --git a/interface/web/mail/lib/lang/es_mail_get.lng b/interface/web/mail/lib/lang/es_mail_get.lng
index d6e48025c8..e8a40e4b28 100644
--- a/interface/web/mail/lib/lang/es_mail_get.lng
+++ b/interface/web/mail/lib/lang/es_mail_get.lng
@@ -14,6 +14,6 @@ $wb['source_username_error_isempty'] = 'El nombre de usuario está vacío.';
 $wb['source_password_error_isempty'] = 'La contraseña está vacía.';
 $wb['destination_error_isemail'] = 'No ha seleccionado un destinatario.';
 $wb['source_server_error_regex'] = 'El servidor Pop3/Imap no es un nombre de dominio válido.';
-$wb['error_delete_read_all_combination'] = 'Combinación incorrecta de opciones. No puede usar \"Borrar correos después de recuperarlos\" = NO junto con \"Recuperar todos los correos\" = SI';
+$wb['error_delete_read_all_combination'] = 'Combinación incorrecta de opciones. No puede usar \\"Borrar correos después de recuperarlos\\" = NO junto con \\"Recuperar todos los correos\\" = SI';
 $wb['source_delete_note_txt'] = 'Por favor, verifique que funcione la recuperación de correos antes de activar esta opción.';
 ?>
diff --git a/interface/web/mail/lib/lang/es_mail_mailinglist.lng b/interface/web/mail/lib/lang/es_mail_mailinglist.lng
index 93a6071b69..2229533bce 100644
--- a/interface/web/mail/lib/lang/es_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/es_mail_mailinglist.lng
@@ -17,7 +17,6 @@ $wb['generate_password_txt'] = 'Generar contraseña';
 $wb['repeat_password_txt'] = 'Repetir contraseña';
 $wb['password_mismatch_txt'] = 'Las contraseñas no coinciden.';
 $wb['password_match_txt'] = 'Las contraseñas coinciden.';
-$wb['mailinglist_txt'] = 'Lista de correo';
 $wb['listname_error_unique'] = 'Ya existe en el servidor un lista de correos con ese nombre. Por favor elija otro.';
 $wb['email_error_isemail'] = 'Dirección de correo inválida.';
 ?>
diff --git a/interface/web/mail/lib/lang/es_mail_user.lng b/interface/web/mail/lib/lang/es_mail_user.lng
index 8b566b21dd..4739fd9692 100644
--- a/interface/web/mail/lib/lang/es_mail_user.lng
+++ b/interface/web/mail/lib/lang/es_mail_user.lng
@@ -50,4 +50,15 @@ $wb['password_match_txt'] = 'Las contraseñas coinciden.';
 $wb['disablesmtp_txt'] = 'Deshabilitar SMTP (envío)';
 $wb['email_error_isascii'] = 'Por favor, no use caracteres unicode especiales en su contraseña. Esto puede conllevar a errores en su cliente de correo.';
 $wb['cc_note_txt'] = '(Separe múltiples cuentas de correo con una coma)';
+$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
+$wb['greylisting_txt'] = 'Enable greylisting';
+$wb['sender_cc_txt'] = 'Send outgoing copy to';
+$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['no_backup_txt'] = 'No backup';
+$wb['daily_backup_txt'] = 'Daily';
+$wb['weekly_backup_txt'] = 'Weekly';
+$wb['monthly_backup_txt'] = 'Monthly';
+$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
diff --git a/interface/web/mail/lib/lang/es_xmpp_domain.lng b/interface/web/mail/lib/lang/es_xmpp_domain.lng
new file mode 100644
index 0000000000..f1da77ba29
--- /dev/null
+++ b/interface/web/mail/lib/lang/es_xmpp_domain.lng
@@ -0,0 +1,62 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["client_group_id_txt"] = 'Client';
+$wb["domain_txt"] = 'Domain';
+$wb["type_txt"] = 'Type';
+$wb["active_txt"] = 'Active';
+$wb["client_txt"] = 'Client';
+$wb["management_method_txt"] = 'Management of user accounts';
+$wb["public_registration_txt"] = 'Enable public registration';
+$wb["registration_url_txt"] = 'Registration URL';
+$wb["registration_message_txt"] = 'Registration Message';
+$wb["domain_admins_txt"] = 'Domain Admins (JIDs)';
+$wb["use_pubsub_txt"] = 'Enable Pubsub';
+$wb["use_proxy_txt"] = 'Enable Bytestream Proxy';
+$wb["use_anon_host_txt"] = 'Enable Anonymous Host';
+$wb["use_vjud_txt"] = 'Enable VJUD User Directory';
+$wb["vjud_opt_mode_txt"] = 'VJUD Opt Mode';
+$wb["use_muc_host_txt"] = 'Enable Multi User Chatrooms';
+$wb["muc_name_txt"] = 'Name in MUC Service Discovery';
+$wb["muc_restrict_room_creation_txt"] = 'Permission to create chatrooms';
+$wb["muc_admins_txt"] = 'MUC Admins (JIDs)';
+$wb["use_pastebin_txt"] = 'Enable Pastebin';
+$wb["pastebin_expire_after_txt"] = 'Pastes expire after (hours)';
+$wb["pastebin_trigger_txt"] = 'Pastebin trigger';
+$wb["use_http_archive_txt"] = 'Enable HTTP chatroom archive';
+$wb["http_archive_show_join_txt"] = 'Show join messages in archive';
+$wb["http_archive_show_status_txt"] = 'Show status changes in archive';
+$wb["use_status_host_txt"] = 'Enable XML Status host';
+$wb["cant_change_domainname_txt"] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb["about_registration_url_txt"] = 'Link to your registration form.';
+$wb["about_registration_message_txt"] = 'Description about your account registration process.';
+$wb["no_corresponding_maildomain_txt"] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_email_txt'] = 'Email Address';
+$wb['ssl_txt'] = 'SSL';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['none_txt'] = 'None';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ssl_error_isemail'] = 'Please enter a valid email adress for generation of the SSL certificate';
+$wb["limit_xmppdomain_txt"] = 'The max. number of XMPP domains for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/es_xmpp_domain_admin_list.lng b/interface/web/mail/lib/lang/es_xmpp_domain_admin_list.lng
new file mode 100644
index 0000000000..a3d1736d7b
--- /dev/null
+++ b/interface/web/mail/lib/lang/es_xmpp_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$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';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/es_xmpp_domain_list.lng b/interface/web/mail/lib/lang/es_xmpp_domain_list.lng
new file mode 100644
index 0000000000..f8c2fb9b8e
--- /dev/null
+++ b/interface/web/mail/lib/lang/es_xmpp_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["add_new_record_txt"] = 'Add new Domain';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/es_xmpp_user.lng b/interface/web/mail/lib/lang/es_xmpp_user.lng
new file mode 100644
index 0000000000..1cc852e3cf
--- /dev/null
+++ b/interface/web/mail/lib/lang/es_xmpp_user.lng
@@ -0,0 +1,15 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["active_txt"] = 'Active';
+$wb["cryptpwd_txt"] = 'Password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["error_no_pwd"] = 'Password is empty.';
+$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["no_domain_perm"] = 'You have no permission for this domain.';
+$wb["limit_xmpp_user_txt"] = 'The max. number of xmpp accounts for your account is reached.';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/es_xmpp_user_list.lng b/interface/web/mail/lib/lang/es_xmpp_user_list.lng
new file mode 100644
index 0000000000..db88b0d7e3
--- /dev/null
+++ b/interface/web/mail/lib/lang/es_xmpp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["is_domain_admin_txt"] = 'Domain admin';
+$wb["is_muc_admin_txt"] = 'MUC admin';
+$wb["add_new_record_txt"] = 'Add new user';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/fi_backup_stats_list.lng b/interface/web/mail/lib/lang/fi_backup_stats_list.lng
index 9ae9658257..79cd6c9a63 100644
--- a/interface/web/mail/lib/lang/fi_backup_stats_list.lng
+++ b/interface/web/mail/lib/lang/fi_backup_stats_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Email';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Email';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/mail/lib/lang/fi_mail_alias.lng b/interface/web/mail/lib/lang/fi_mail_alias.lng
index d40380604e..918db07761 100755
--- a/interface/web/mail/lib/lang/fi_mail_alias.lng
+++ b/interface/web/mail/lib/lang/fi_mail_alias.lng
@@ -12,4 +12,6 @@ $wb['domain_txt'] = 'Domain';
 $wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
 $wb['source_txt'] = 'Alias';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
 ?>
diff --git a/interface/web/mail/lib/lang/fi_mail_domain.lng b/interface/web/mail/lib/lang/fi_mail_domain.lng
index dc7041dbf0..088c768091 100755
--- a/interface/web/mail/lib/lang/fi_mail_domain.lng
+++ b/interface/web/mail/lib/lang/fi_mail_domain.lng
@@ -10,13 +10,14 @@ $wb['client_txt'] = 'Asiakastunnus';
 $wb['limit_maildomain_txt'] = 'Käyttäjatunnuksella on jo sallittu määrä postiverkkotunnuksia.';
 $wb['policy_txt'] = 'Roskapostisuodatin';
 $wb['no_policy'] = '- ei käytössä -';
-$wb["dkim_txt"] = 'enable DKIM';
-$wb["dkim_private_txt"] = 'DKIM Private-key';
-$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
-$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
-$wb["dkim_dns_txt"] = 'DNS-Record';
-$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
+$wb['dkim_txt'] = 'enable DKIM';
+$wb['dkim_private_txt'] = 'DKIM Private-key';
+$wb['dkim_public_txt'] = 'DKIM Public-key\nfor information only';
+$wb['dkim_generate_txt'] = 'Generate DKIM Private-key';
+$wb['dkim_dns_txt'] = 'DNS-Record';
+$wb['dkim_private_key_error'] = 'Invalid DKIM-Private key';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
-$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
+$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 ?>
diff --git a/interface/web/mail/lib/lang/fi_mail_forward.lng b/interface/web/mail/lib/lang/fi_mail_forward.lng
index d314beed21..8f201579ec 100755
--- a/interface/web/mail/lib/lang/fi_mail_forward.lng
+++ b/interface/web/mail/lib/lang/fi_mail_forward.lng
@@ -7,4 +7,7 @@ $wb['duplicate_mailbox_txt'] = 'Edelleenlähetyssääntö osoitteelle on jo olem
 $wb['domain_txt'] = 'Domain';
 $wb['source_txt'] = 'Source Email';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
 ?>
diff --git a/interface/web/mail/lib/lang/fi_mail_user.lng b/interface/web/mail/lib/lang/fi_mail_user.lng
index 68ca4d8314..ebda8f5c38 100755
--- a/interface/web/mail/lib/lang/fi_mail_user.lng
+++ b/interface/web/mail/lib/lang/fi_mail_user.lng
@@ -48,8 +48,8 @@ $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["backup_interval_txt"] = 'Backup interval';
-$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['no_backup_txt'] = 'No backup';
 $wb['daily_backup_txt'] = 'Daily';
 $wb['weekly_backup_txt'] = 'Weekly';
@@ -57,4 +57,8 @@ $wb['monthly_backup_txt'] = 'Monthly';
 $wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
 $wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
+$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
+$wb['sender_cc_txt'] = 'Send outgoing copy to';
+$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
+$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
diff --git a/interface/web/mail/lib/lang/fi_mail_user_filter.lng b/interface/web/mail/lib/lang/fi_mail_user_filter.lng
index 1c3b7455cc..44435c30b7 100755
--- a/interface/web/mail/lib/lang/fi_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/fi_mail_user_filter.lng
@@ -15,6 +15,14 @@ $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['move_stop_txt'] = 'Move to';
+$wb['header_txt'] = 'Header';
+$wb['size_over_txt'] = 'Email size over (KB)';
+$wb['size_under_txt'] = 'Email size under (KB)';
+$wb['localpart_txt'] = 'Localpart';
+$wb['domain_txt'] = 'Domain';
+$wb['keep_txt'] = 'Keep';
+$wb['reject_txt'] = 'Reject';
+$wb['stop_txt'] = 'Stop';
 ?>
diff --git a/interface/web/mail/lib/lang/fi_mail_user_list.lng b/interface/web/mail/lib/lang/fi_mail_user_list.lng
index 121c59842b..ee3f2cec45 100755
--- a/interface/web/mail/lib/lang/fi_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/fi_mail_user_list.lng
@@ -5,4 +5,8 @@ $wb['autoresponder_txt'] = 'Lomavastaaja';
 $wb['add_new_record_txt'] = 'Lisää uusi postilaatikko';
 $wb['name_txt'] = 'Oikea nimi';
 $wb['login_txt'] = 'Login';
+$wb['postfix_txt'] = 'Receiving';
+$wb['disablesmtp_txt'] = 'SMTP (sending)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
 ?>
diff --git a/interface/web/mail/lib/lang/fi_xmpp_domain.lng b/interface/web/mail/lib/lang/fi_xmpp_domain.lng
new file mode 100644
index 0000000000..f1da77ba29
--- /dev/null
+++ b/interface/web/mail/lib/lang/fi_xmpp_domain.lng
@@ -0,0 +1,62 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["client_group_id_txt"] = 'Client';
+$wb["domain_txt"] = 'Domain';
+$wb["type_txt"] = 'Type';
+$wb["active_txt"] = 'Active';
+$wb["client_txt"] = 'Client';
+$wb["management_method_txt"] = 'Management of user accounts';
+$wb["public_registration_txt"] = 'Enable public registration';
+$wb["registration_url_txt"] = 'Registration URL';
+$wb["registration_message_txt"] = 'Registration Message';
+$wb["domain_admins_txt"] = 'Domain Admins (JIDs)';
+$wb["use_pubsub_txt"] = 'Enable Pubsub';
+$wb["use_proxy_txt"] = 'Enable Bytestream Proxy';
+$wb["use_anon_host_txt"] = 'Enable Anonymous Host';
+$wb["use_vjud_txt"] = 'Enable VJUD User Directory';
+$wb["vjud_opt_mode_txt"] = 'VJUD Opt Mode';
+$wb["use_muc_host_txt"] = 'Enable Multi User Chatrooms';
+$wb["muc_name_txt"] = 'Name in MUC Service Discovery';
+$wb["muc_restrict_room_creation_txt"] = 'Permission to create chatrooms';
+$wb["muc_admins_txt"] = 'MUC Admins (JIDs)';
+$wb["use_pastebin_txt"] = 'Enable Pastebin';
+$wb["pastebin_expire_after_txt"] = 'Pastes expire after (hours)';
+$wb["pastebin_trigger_txt"] = 'Pastebin trigger';
+$wb["use_http_archive_txt"] = 'Enable HTTP chatroom archive';
+$wb["http_archive_show_join_txt"] = 'Show join messages in archive';
+$wb["http_archive_show_status_txt"] = 'Show status changes in archive';
+$wb["use_status_host_txt"] = 'Enable XML Status host';
+$wb["cant_change_domainname_txt"] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb["about_registration_url_txt"] = 'Link to your registration form.';
+$wb["about_registration_message_txt"] = 'Description about your account registration process.';
+$wb["no_corresponding_maildomain_txt"] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_email_txt'] = 'Email Address';
+$wb['ssl_txt'] = 'SSL';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['none_txt'] = 'None';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ssl_error_isemail'] = 'Please enter a valid email adress for generation of the SSL certificate';
+$wb["limit_xmppdomain_txt"] = 'The max. number of XMPP domains for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/fi_xmpp_domain_admin_list.lng b/interface/web/mail/lib/lang/fi_xmpp_domain_admin_list.lng
new file mode 100644
index 0000000000..a3d1736d7b
--- /dev/null
+++ b/interface/web/mail/lib/lang/fi_xmpp_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$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';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/fi_xmpp_domain_list.lng b/interface/web/mail/lib/lang/fi_xmpp_domain_list.lng
new file mode 100644
index 0000000000..f8c2fb9b8e
--- /dev/null
+++ b/interface/web/mail/lib/lang/fi_xmpp_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["add_new_record_txt"] = 'Add new Domain';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/fi_xmpp_user.lng b/interface/web/mail/lib/lang/fi_xmpp_user.lng
new file mode 100644
index 0000000000..1cc852e3cf
--- /dev/null
+++ b/interface/web/mail/lib/lang/fi_xmpp_user.lng
@@ -0,0 +1,15 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["active_txt"] = 'Active';
+$wb["cryptpwd_txt"] = 'Password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["error_no_pwd"] = 'Password is empty.';
+$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["no_domain_perm"] = 'You have no permission for this domain.';
+$wb["limit_xmpp_user_txt"] = 'The max. number of xmpp accounts for your account is reached.';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/fi_xmpp_user_list.lng b/interface/web/mail/lib/lang/fi_xmpp_user_list.lng
new file mode 100644
index 0000000000..db88b0d7e3
--- /dev/null
+++ b/interface/web/mail/lib/lang/fi_xmpp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["is_domain_admin_txt"] = 'Domain admin';
+$wb["is_muc_admin_txt"] = 'MUC admin';
+$wb["add_new_record_txt"] = 'Add new user';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/fr.lng b/interface/web/mail/lib/lang/fr.lng
index a9d7cd8c64..26d75ba4cb 100644
--- a/interface/web/mail/lib/lang/fr.lng
+++ b/interface/web/mail/lib/lang/fr.lng
@@ -1,48 +1,48 @@
 <?php
-$wb['Email Alias'] = 'Alias d\'emails';
-$wb['Email Blacklist'] = 'Liste noire d\'emails';
+$wb['Email Alias'] = 'Alias d’e-mails';
+$wb['Email Blacklist'] = 'Liste noire d’e-mails';
 $wb['Blacklist'] = 'Liste noire';
 $wb['Mail Content Filter'] = 'Filtre de contenu des mails';
 $wb['Filter'] = 'Filtre';
-$wb['Mail Domain'] = 'Domaine email';
+$wb['Mail Domain'] = 'Domaine e-mail';
 $wb['Domain'] = 'Domaine';
 $wb['Email Catchall'] = 'Email collecteur';
 $wb['Email Forward'] = 'Email de transfert';
 $wb['Get Email'] = 'Obtenir un Email';
 $wb['Spamfilter'] = 'Filtre antispam';
-$wb['Email Routing'] = 'Routage d\'emails';
-$wb['Email transport'] = 'Transport d\'emails';
-$wb['Mailbox'] = 'Boîte email';
+$wb['Email Routing'] = 'Routage d’e-mails';
+$wb['Email transport'] = 'Transport d’e-mails';
+$wb['Mailbox'] = 'boîtes aux lettres';
 $wb['Autoresponder'] = 'Répondeur automatique';
-$wb['Mail Filter'] = 'Filtre email';
+$wb['Mail Filter'] = 'Filtre e-mail';
 $wb['Custom Rules'] = 'Règles personnalisées';
-$wb['Email filter'] = 'Filtre email';
-$wb['Email Whitelist'] = 'Liste blanche d\'emails';
+$wb['Email filter'] = 'Filtre e-mail';
+$wb['Email Whitelist'] = 'Liste blanche d’e-mails';
 $wb['Whitelist'] = 'Liste blanche';
-$wb['Spamfilter blacklist'] = 'Liste noire de l\'anti-spam';
-$wb['Spamfilter Config'] = 'Configuration de l\'anti-spam';
+$wb['Spamfilter blacklist'] = 'Liste noire de l’anti-spam';
+$wb['Spamfilter Config'] = 'Configuration de l’anti-spam';
 $wb['Server'] = 'Serveur';
-$wb['Spamfilter policy'] = 'Stratégie de l\'anti-spam';
+$wb['Spamfilter policy'] = 'Stratégie de l’anti-spam';
 $wb['Policy'] = 'Stratégie';
 $wb['Quarantine'] = 'Quarantaine';
 $wb['Tag-Level'] = 'Niveau du tag';
 $wb['Other'] = 'Autre';
-$wb['Spamfilter users'] = 'Utilisateurs de l\'anti-spam';
+$wb['Spamfilter users'] = 'Utilisateurs de l’anti-spam';
 $wb['Users'] = 'Utilisateurs';
-$wb['Spamfilter Whitelist'] = 'Liste blanche de l\'anti-spam';
-$wb['Email'] = 'Email';
-$wb['Email Mailbox'] = 'Boîte email';
-$wb['Email Accounts'] = 'Comptes email';
+$wb['Spamfilter Whitelist'] = 'Liste blanche de l’anti-spam';
+$wb['Email Mailbox'] = 'boîtes aux lettres';
+$wb['Email Accounts'] = 'Comptes e-mail';
 $wb['User / Domain'] = 'Utilisateur / Domaine';
 $wb['Server Settings'] = 'Paramètres du serveur';
-$wb['Fetchmail'] = 'Récupérateur email';
+$wb['Fetchmail'] = 'Récupérateur e-mail';
 $wb['Statistics'] = 'Statistiques';
 $wb['Postfix Whitelist'] = 'Liste blanche de Postfix';
 $wb['Postfix Blacklist'] = 'Liste noire de Postfix';
 $wb['Content Filter'] = 'Filtre de contenu';
 $wb['Global Filters'] = 'Filtres globaux';
-$wb['Mailbox traffic'] = 'Trafic de la boite email';
+$wb['Mailbox traffic'] = 'Trafic de la boîte e-mail';
 $wb['Domain Alias'] = 'Alias de domaine';
 $wb['Relay Recipients'] = 'Destinataires de relais';
 $wb['Mailbox quota'] = 'Mailbox quota';
+$wb['Email'] = 'Email';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_backup_stats_list.lng b/interface/web/mail/lib/lang/fr_backup_stats_list.lng
index 9ae9658257..79cd6c9a63 100644
--- a/interface/web/mail/lib/lang/fr_backup_stats_list.lng
+++ b/interface/web/mail/lib/lang/fr_backup_stats_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Email';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Email';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_mail_alias.lng b/interface/web/mail/lib/lang/fr_mail_alias.lng
index 22e7e51df4..2baa476c65 100644
--- a/interface/web/mail/lib/lang/fr_mail_alias.lng
+++ b/interface/web/mail/lib/lang/fr_mail_alias.lng
@@ -1,15 +1,17 @@
 <?php
-$wb['email_txt'] = 'Email';
+$wb['email_txt'] = 'E-mail';
 $wb['destination_txt'] = 'Destination';
 $wb['active_txt'] = 'Actif';
-$wb['email_error_isemail'] = 'L\'adresse email est invalide.';
-$wb['email_error_unique'] = 'Dupliquer l\'adresse email.';
-$wb['no_domain_perm'] = 'Vous n\'avez pas de permission pour ce domaine.';
-$wb['destination_error_isemail'] = 'L\'adresse email de destination est invalide.';
-$wb['limit_mailalias_txt'] = 'Le nombre maximal d\'alias d\'email pour votre compte a été atteint.';
-$wb['duplicate_mailbox_txt'] = 'Il y a déja une boîte mail avec cette adresse email';
+$wb['email_error_isemail'] = 'L’adresse e-mail est invalide.';
+$wb['email_error_unique'] = 'Dupliquer l’adresse e-mail.';
+$wb['no_domain_perm'] = 'Vous n’avez pas de permission pour ce domaine.';
+$wb['destination_error_isemail'] = 'L’adresse e-mail de destination est invalide.';
+$wb['limit_mailalias_txt'] = 'Le nombre maximal d’alias d’e-mail pour votre compte a été atteint.';
+$wb['duplicate_mailbox_txt'] = 'Il y a déja une boîte mail avec cette adresse e-mail';
 $wb['domain_txt'] = 'Domaine';
-$wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
+$wb['duplicate_email_alias_txt'] = 'This e-mail alias does already exist.';
 $wb['source_txt'] = 'Alias';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
 $wb['greylisting_txt'] = 'Enable greylisting';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_mail_alias_list.lng b/interface/web/mail/lib/lang/fr_mail_alias_list.lng
index 406d52a330..71370b9836 100644
--- a/interface/web/mail/lib/lang/fr_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/fr_mail_alias_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Alias d\'email';
+$wb['list_head_txt'] = 'Alias d’e-mail';
 $wb['active_txt'] = 'Actif';
 $wb['source_txt'] = 'source';
 $wb['destination_txt'] = 'Destination';
-$wb['email_txt'] = 'Email';
-$wb['add_new_record_txt'] = 'Ajouter un nouvel alias d\'email';
+$wb['email_txt'] = 'E-mail';
+$wb['add_new_record_txt'] = 'Ajouter un nouvel alias d’e-mail';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_mail_aliasdomain.lng b/interface/web/mail/lib/lang/fr_mail_aliasdomain.lng
index c0493fd238..24a722e9d2 100644
--- a/interface/web/mail/lib/lang/fr_mail_aliasdomain.lng
+++ b/interface/web/mail/lib/lang/fr_mail_aliasdomain.lng
@@ -2,8 +2,8 @@
 $wb['source_txt'] = 'Source';
 $wb['destination_txt'] = 'Destination';
 $wb['active_txt'] = 'Actif';
-$wb['no_domain_perm'] = 'Vous n\'avez pas de permission pour ce domaine.';
-$wb['limit_mailaliasdomain_txt'] = 'Le nombre maximal d\'alias de domaine pour votre compte est atteint.';
+$wb['no_domain_perm'] = 'Vous n’avez pas de permission pour ce domaine.';
+$wb['limit_mailaliasdomain_txt'] = 'Le nombre maximal d’alias de domaine pour votre compte est atteint.';
 $wb['source_destination_identical_txt'] = 'Les domaines source et cible sont identiques.';
 $wb['source_error_empty'] = 'Le domaine source est vide.';
 $wb['source_error_unique'] = 'Domaine source dupliqué.';
diff --git a/interface/web/mail/lib/lang/fr_mail_blacklist.lng b/interface/web/mail/lib/lang/fr_mail_blacklist.lng
index 3f5f9709e8..161acd632d 100644
--- a/interface/web/mail/lib/lang/fr_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/fr_mail_blacklist.lng
@@ -3,7 +3,7 @@ $wb['server_id_txt'] = 'Serveur';
 $wb['source_txt'] = 'Adresse de la liste noire';
 $wb['recipient_txt'] = 'Destinataire';
 $wb['active_txt'] = 'Actif';
-$wb['source_error_notempty'] = 'L\'adresse est vide.';
+$wb['source_error_notempty'] = 'L’adresse est vide.';
 $wb['type_txt'] = 'Type';
-$wb['limit_mailfilter_txt'] = 'Le nombre maximal de filtres d\'email pour votre compte a été atteint.';
+$wb['limit_mailfilter_txt'] = 'Le nombre maximal de filtres d’e-mail pour votre compte a été atteint.';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_mail_blacklist_list.lng b/interface/web/mail/lib/lang/fr_mail_blacklist_list.lng
index a740f38fee..c7e2332fba 100644
--- a/interface/web/mail/lib/lang/fr_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/fr_mail_blacklist_list.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['list_head_txt'] = 'Liste noire d\'emails';
+$wb['list_head_txt'] = 'Liste noire d’e-mails';
 $wb['active_txt'] = 'Actif';
 $wb['server_id_txt'] = 'Serveur';
 $wb['source_txt'] = 'Adresse de la liste noire';
diff --git a/interface/web/mail/lib/lang/fr_mail_domain.lng b/interface/web/mail/lib/lang/fr_mail_domain.lng
index bf12c5f415..eebbdc02b1 100644
--- a/interface/web/mail/lib/lang/fr_mail_domain.lng
+++ b/interface/web/mail/lib/lang/fr_mail_domain.lng
@@ -3,22 +3,21 @@ $wb['server_id_txt'] = 'Serveur';
 $wb['domain_txt'] = 'Domaine';
 $wb['type_txt'] = 'Type';
 $wb['active_txt'] = 'Actif';
-$wb['dkim_txt'] = 'Activer DKIM';
-$wb['dkim_private_txt'] = 'ClérivéDKIM';
-$wb['dkim_public_txt'] = 'Cléublique DKIM\npour information seulement';
-$wb['dkim_generate_txt'] = 'Gérer la clérivéDKIM';
-$wb['dkim_dns_txt'] = 'Enregistrement DNS';
-$wb['dkim_private_key_error'] = 'ClérivéDKIM invalide';
-$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['domain_error_empty'] = 'Le domaine est vide.';
 $wb['domain_error_unique'] = 'Dupliquer le domaine.';
 $wb['domain_error_regex'] = 'Le domaine est invalide.';
 $wb['client_txt'] = 'Client';
-$wb['limit_maildomain_txt'] = 'Le nombre maximal de domaines d\'email pour votre compte a é atteint.';
+$wb['limit_maildomain_txt'] = 'Le nombre maximal de domaines d’e-mail pour votre compte a été atteint.';
 $wb['policy_txt'] = 'Filtre antispam';
 $wb['no_policy'] = '- inactif -';
-$wb['error_not_allowed_server_id'] = 'Le serveur choisi n\'est pas autoriséour ce compte.';
+$wb['dkim_txt'] = 'enable DKIM';
+$wb['dkim_private_txt'] = 'DKIM Private-key';
+$wb['dkim_public_txt'] = 'DKIM Public-key\nfor information only';
+$wb['dkim_generate_txt'] = 'Generate DKIM Private-key';
+$wb['dkim_dns_txt'] = 'DNS-Record';
+$wb['dkim_private_key_error'] = 'Invalid DKIM-Private key';
+$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
-$wb['dkim_selector_error'] = 'Selecteur DKIM non valide. Utiliser que des caractès alphanuméques minuscules (a-z et/oo 0-9) up to 63 chars';
+$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
 ?>
-
diff --git a/interface/web/mail/lib/lang/fr_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/fr_mail_domain_admin_list.lng
index 11a957b889..d5a6b1bd49 100644
--- a/interface/web/mail/lib/lang/fr_mail_domain_admin_list.lng
+++ b/interface/web/mail/lib/lang/fr_mail_domain_admin_list.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['list_head_txt'] = 'Domaine d\'email';
+$wb['list_head_txt'] = 'Domaine d’e-mail';
 $wb['server_id_txt'] = 'Serveur';
 $wb['domain_txt'] = 'Domaine';
 $wb['add_new_record_txt'] = 'Ajouter un domaine';
diff --git a/interface/web/mail/lib/lang/fr_mail_domain_catchall.lng b/interface/web/mail/lib/lang/fr_mail_domain_catchall.lng
index f9e77b3a2c..b7c4b60760 100644
--- a/interface/web/mail/lib/lang/fr_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/fr_mail_domain_catchall.lng
@@ -3,9 +3,9 @@ $wb['domain_txt'] = 'Domaine';
 $wb['destination_txt'] = 'Destination';
 $wb['active_txt'] = 'Actif';
 $wb['domain_error_unique'] = 'Il y a déja un enregistrement collecteur pour ce domaine.';
-$wb['no_domain_perm'] = 'Vous n\'avez pas de permission pour ce domaine.';
+$wb['no_domain_perm'] = 'Vous n’avez pas de permission pour ce domaine.';
 $wb['domain_error_regex'] = 'Nom de domaine invalide, ou contient des caractères invalides.';
 $wb['limit_mailcatchall_txt'] = 'Le nombre maximal de comptes collecteurs pour votre compte a été atteint.';
 $wb['source_txt'] = 'Source';
-$wb['destination_error_isemail'] = 'Destination is no valid email address.';
+$wb['destination_error_isemail'] = 'Destination is no valid e-mail address.';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/fr_mail_domain_catchall_list.lng
index 51f21be82e..7375a4b599 100644
--- a/interface/web/mail/lib/lang/fr_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/fr_mail_domain_catchall_list.lng
@@ -2,7 +2,7 @@
 $wb['list_head_txt'] = 'Collecteur Email';
 $wb['active_txt'] = 'Actif';
 $wb['source_txt'] = 'source';
-$wb['destination_txt'] = 'Adresse email de destination';
+$wb['destination_txt'] = 'Adresse e-mail de destination';
 $wb['server_id_txt'] = 'Serveur';
 $wb['domain_txt'] = 'Domaine';
 $wb['add_new_record_txt'] = 'Ajouter un nouveau collecteur';
diff --git a/interface/web/mail/lib/lang/fr_mail_domain_list.lng b/interface/web/mail/lib/lang/fr_mail_domain_list.lng
index dca99fbc59..52eb56a483 100644
--- a/interface/web/mail/lib/lang/fr_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/fr_mail_domain_list.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['list_head_txt'] = 'Domaine email';
+$wb['list_head_txt'] = 'Domaine e-mail';
 $wb['server_id_txt'] = 'Serveur';
 $wb['domain_txt'] = 'Domaine';
 $wb['add_new_record_txt'] = 'Ajouter un nouveau domaine';
diff --git a/interface/web/mail/lib/lang/fr_mail_forward.lng b/interface/web/mail/lib/lang/fr_mail_forward.lng
index e484cb31f9..4c40b19419 100644
--- a/interface/web/mail/lib/lang/fr_mail_forward.lng
+++ b/interface/web/mail/lib/lang/fr_mail_forward.lng
@@ -1,10 +1,13 @@
 <?php
-$wb['email_txt'] = 'Email';
+$wb['email_txt'] = 'E-mail';
 $wb['destination_txt'] = 'Email de destination';
 $wb['active_txt'] = 'Actif';
-$wb['limit_mailforward_txt'] = 'Le nombre maximal de transferts d\'email pour votre compte a été atteint.';
-$wb['duplicate_mailbox_txt'] = 'Il y a déja une boite email avec cette adresse email';
+$wb['limit_mailforward_txt'] = 'Le nombre maximal de transferts d’e-mail pour votre compte a été atteint.';
+$wb['duplicate_mailbox_txt'] = 'Il y a déja une boîte e-mail avec cette adresse e-mail';
 $wb['domain_txt'] = 'Domaine';
 $wb['source_txt'] = 'Source Email';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
 $wb['greylisting_txt'] = 'Enable greylisting';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_mail_forward_list.lng b/interface/web/mail/lib/lang/fr_mail_forward_list.lng
index e901ddeeb1..23d2e242ef 100644
--- a/interface/web/mail/lib/lang/fr_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/fr_mail_forward_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Transfert d\'email';
+$wb['list_head_txt'] = 'Transfert d’e-mail';
 $wb['active_txt'] = 'Actif';
 $wb['source_txt'] = 'source';
 $wb['destination_txt'] = 'Destination';
-$wb['email_txt'] = 'Email';
-$wb['add_new_record_txt'] = 'Ajouter un nouveau transfert d\'email';
+$wb['email_txt'] = 'E-mail';
+$wb['add_new_record_txt'] = 'Ajouter un nouveau transfert d’e-mail';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_mail_get.lng b/interface/web/mail/lib/lang/fr_mail_get.lng
index 934af5e2e7..00f72f0c8b 100644
--- a/interface/web/mail/lib/lang/fr_mail_get.lng
+++ b/interface/web/mail/lib/lang/fr_mail_get.lng
@@ -7,13 +7,13 @@ $wb['source_password_txt'] = 'Mot de passe';
 $wb['source_delete_txt'] = 'Supprimer les emails après récupération';
 $wb['destination_txt'] = 'Destination';
 $wb['active_txt'] = 'Actif';
-$wb['limit_fetchmail_txt'] = 'Le nombre maximal d\'enregistrements récupérateur email pour votre compte a été atteint.';
+$wb['limit_fetchmail_txt'] = 'Le nombre maximal d’enregistrements récupérateur e-mail pour votre compte a été atteint.';
 $wb['source_server_error_isempty'] = 'Le serveur est vide.';
-$wb['source_username_error_isempty'] = 'l\'utilisateur est vide.';
+$wb['source_username_error_isempty'] = 'l’utilisateur est vide.';
 $wb['source_password_error_isempty'] = 'Le mot de passe est vide.';
 $wb['destination_error_isemail'] = 'Pas de destination sélectionnée.';
-$wb['source_server_error_regex'] = 'Le serveur POP3 / IMAP n\'est pas un nom de domaine valide.';
+$wb['source_server_error_regex'] = 'Le serveur POP3 / IMAP n’est pas un nom de domaine valide.';
 $wb['source_read_all_txt'] = 'Récupérer tous les emails (incl. les emails lus)';
-$wb['error_delete_read_all_combination'] = 'Combinaison d\'options non autorisée. Vous ne pouvez pas utiliser \\"Supprimer les emails après récupération\\" = non avec \\"Récupérer tous les emails\\" = oui';
-$wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
+$wb['error_delete_read_all_combination'] = 'Combinaison d’options non autorisée. Vous ne pouvez pas utiliser \\"Supprimer les emails après récupération\\" = non avec \\"Récupérer tous les emails\\" = oui';
+$wb['source_delete_note_txt'] = 'Please check first if e-mail retrieval works, before you activate this option.';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_mail_mailinglist.lng b/interface/web/mail/lib/lang/fr_mail_mailinglist.lng
index c9ae61945f..057a32731f 100644
--- a/interface/web/mail/lib/lang/fr_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/fr_mail_mailinglist.lng
@@ -3,20 +3,20 @@ $wb['limit_mailmailinglist_txt'] = 'Limite atteinte';
 $wb['domain_error_empty'] = 'Le domain est vide.';
 $wb['listname_error_empty'] = 'Le nom de la liste est vide.';
 $wb['domain_error_regex'] = 'Nom de domaine invalide.';
-$wb['email_in_use_txt'] = 'L\'email est en cours d\'utilisation';
-$wb['no_domain_perm'] = 'Vous n\'avez pas la permission pour ce domain.';
+$wb['email_in_use_txt'] = 'L’email est en cours d’utilisation';
+$wb['no_domain_perm'] = 'Vous n’avez pas la permission pour ce domain.';
 $wb['password_strength_txt'] = 'Force du mot de passe';
 $wb['server_id_txt'] = 'Serveur';
 $wb['domain_txt'] = 'Domaine';
 $wb['listname_txt'] = 'Nom de la liste';
 $wb['client_txt'] = 'Client';
-$wb['email_txt'] = 'Email';
+$wb['email_txt'] = 'E-mail';
 $wb['password_txt'] = 'Mot de passe';
-$wb['generate_password_txt'] = 'Generate Password';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
 $wb['repeat_password_txt'] = 'Repeat Password';
 $wb['password_mismatch_txt'] = 'The passwords do not match.';
 $wb['password_match_txt'] = 'The passwords do match.';
 $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['mailinglist_txt'] = 'Liste de distribution';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_mail_relay_recipient.lng b/interface/web/mail/lib/lang/fr_mail_relay_recipient.lng
index 4851835abf..908700074c 100644
--- a/interface/web/mail/lib/lang/fr_mail_relay_recipient.lng
+++ b/interface/web/mail/lib/lang/fr_mail_relay_recipient.lng
@@ -3,7 +3,7 @@ $wb['server_id_txt'] = 'Serveur';
 $wb['source_txt'] = 'Relayer le destinataire';
 $wb['recipient_txt'] = 'Destinataire';
 $wb['active_txt'] = 'Actif';
-$wb['source_error_notempty'] = 'L\'adresse est vide';
+$wb['source_error_notempty'] = 'L’adresse est vide';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'Le nombre maximal de filtres pour votre compte est atteint.';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_mail_spamfilter.lng b/interface/web/mail/lib/lang/fr_mail_spamfilter.lng
index a312fadd51..412eab9c06 100644
--- a/interface/web/mail/lib/lang/fr_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/fr_mail_spamfilter.lng
@@ -1,17 +1,17 @@
 <?php
-$wb['email_txt'] = 'Email';
+$wb['email_txt'] = 'E-mail';
 $wb['spam_rewrite_score_int_txt'] = 'Réécrire le score';
 $wb['spam_redirect_score_int_txt'] = 'Réorienter le score';
 $wb['spam_delete_score_int_txt'] = 'Supprimer le score';
 $wb['spam_rewrite_subject_txt'] = 'Réécrire le sujet';
 $wb['spam_redirect_maildir_txt'] = 'Réorienter la boîte mail';
 $wb['active_txt'] = 'Actif';
-$wb['spam_rewrite_txt'] = 'Réécrire l\'objet de l\'email ci-dessus.';
-$wb['spam_redirect_txt'] = 'Réorienter l\'email à la boîte email sélectionnée ci-dessus.';
-$wb['spam_delete_txt'] = 'Supprimer l\'email ci-dessus.';
-$wb['disable_txt'] = 'Astuce : Pour désactiver une option de filtrage, mettez le score à 0.00.';
-$wb['email_error_isemail'] = 'L\'adresse email est invalide.';
-$wb['email_error_unique'] = 'Il y a déja un enregistrement de filtre antispam avec cette adresse email.';
+$wb['spam_rewrite_txt'] = 'Réécrire l’objet de l’email ci-dessus.';
+$wb['spam_redirect_txt'] = 'Réorienter l’email à la boîte e-mail sélectionnée ci-dessus.';
+$wb['spam_delete_txt'] = 'Supprimer l’email ci-dessus.';
+$wb['disable_txt'] = 'Astuce : Pour désactiver une option de filtrage, mettez le score à 0.00.';
+$wb['email_error_isemail'] = 'L’adresse e-mail est invalide.';
+$wb['email_error_unique'] = 'Il y a déja un enregistrement de filtre antispam avec cette adresse e-mail.';
 $wb['spam_redirect_maildir_purge_txt'] = 'Purger le répertoire de mail après';
 $wb['days_txt'] = 'Jours.';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/fr_mail_spamfilter_list.lng
index 1be0c0ef04..f8546f9faa 100644
--- a/interface/web/mail/lib/lang/fr_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/fr_mail_spamfilter_list.lng
@@ -3,6 +3,6 @@ $wb['list_head_txt'] = 'Filtre antispam';
 $wb['active_txt'] = 'Actif';
 $wb['server_id_txt'] = 'Serveur';
 $wb['server_name_txt'] = 'Nom du serveur';
-$wb['email_txt'] = 'Email';
+$wb['email_txt'] = 'E-mail';
 $wb['add_new_record_txt'] = 'Ajouter un nouvel enregistrement';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_mail_transport_list.lng b/interface/web/mail/lib/lang/fr_mail_transport_list.lng
index 60c51c3a48..ff8a6c16d2 100644
--- a/interface/web/mail/lib/lang/fr_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/fr_mail_transport_list.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['list_head_txt'] = 'Routage d\'email avancé';
+$wb['list_head_txt'] = 'Routage d’e-mail avancé';
 $wb['active_txt'] = 'Actif';
 $wb['server_id_txt'] = 'Serveur';
 $wb['domain_txt'] = 'Domaine';
diff --git a/interface/web/mail/lib/lang/fr_mail_user.lng b/interface/web/mail/lib/lang/fr_mail_user.lng
index 1f60f96830..775b425cf5 100644
--- a/interface/web/mail/lib/lang/fr_mail_user.lng
+++ b/interface/web/mail/lib/lang/fr_mail_user.lng
@@ -1,14 +1,14 @@
 <?php
-$wb['custom_mailfilter_txt'] = 'Filtre d\'email personnalisé';
-$wb['email_txt'] = 'Email';
+$wb['custom_mailfilter_txt'] = 'Filtre d’e-mail personnalisé';
+$wb['email_txt'] = 'E-mail';
 $wb['cryptpwd_txt'] = 'Mot de passe';
 $wb['password_strength_txt'] = 'Force du mot de passe';
 $wb['active_txt'] = 'Actif';
-$wb['email_error_isemail'] = 'L\'adresse email est invalide.';
-$wb['email_error_unique'] = 'Dupliquer l\'adresse email.';
+$wb['email_error_isemail'] = 'L’adresse e-mail est invalide.';
+$wb['email_error_unique'] = 'Dupliquer l’adresse e-mail.';
 $wb['autoresponder_text_txt'] = 'Texte';
 $wb['autoresponder_txt'] = 'Auto répondeur';
-$wb['no_domain_perm'] = 'Vous n\'avez pas de permission sur ce domaine.';
+$wb['no_domain_perm'] = 'Vous n’avez pas de permission sur ce domaine.';
 $wb['error_no_pwd'] = 'Le mot de passe est vide.';
 $wb['quota_error_isint'] = 'La taille de la boîte à mail doit être en Mo.';
 $wb['quota_txt'] = 'Quota en Mo';
@@ -16,45 +16,49 @@ $wb['server_id_txt'] = 'ID Serveur';
 $wb['password_txt'] = 'Mot de passe';
 $wb['maildir_txt'] = 'Maildir';
 $wb['postfix_txt'] = 'Activer la réception';
-$wb['greylisting_txt'] = 'Enable greylisting';
-$wb['access_txt'] = 'Activer l\'accès';
+$wb['access_txt'] = 'Activer l’accès';
 $wb['policy_txt'] = 'Filtre antispam';
 $wb['no_policy'] = '- inactif -';
-$wb['limit_mailbox_txt'] = 'Le nombre maximal de boites email pour votre compte est atteint..';
-$wb['limit_mailquota_txt'] = 'Lespace maximal pour les boites email est atteint. Lespace maximal disponible est de ';
+$wb['limit_mailbox_txt'] = 'Le nombre maximal de boîtes aux lettres pour votre compte est atteint..';
+$wb['limit_mailquota_txt'] = 'Lespace maximal pour les boîtes aux lettres est atteint. Lespace maximal disponible est de ';
 $wb['disableimap_txt'] = 'Désactiver IMAP';
 $wb['disablepop3_txt'] = 'Désactiver POP3';
-$wb['duplicate_alias_or_forward_txt'] = 'Il y a déja un alias ou un transfert d\'email sur cette adresse.';
+$wb['duplicate_alias_or_forward_txt'] = 'Il y a déja un alias ou un transfert d’e-mail sur cette adresse.';
 $wb['autoresponder_start_date_txt'] = 'Démarrer le';
 $wb['autoresponder_start_date_ispast'] = 'La date de démarrage ne peut être une date passée.';
 $wb['autoresponder_end_date_txt'] = 'Terminer le';
 $wb['autoresponder_end_date_isgreater'] = 'La date de fin doit être saisie et doit être ultérieure à la date de début.';
-$wb['quota_error_value'] = 'Valeur de quota invalide. Les valeurs de quota autorisées sont : 0 pour illimité ou nombres > 1';
+$wb['quota_error_value'] = 'Valeur de quota invalide. Les valeurs de quota autorisées sont : 0 pour illimité ou nombres > 1';
 $wb['move_junk_txt'] = 'Déplacer le spam vers le dossier Junk';
 $wb['name_txt'] = 'Nom véritable';
 $wb['name_optional_txt'] = '(Optionnel)';
 $wb['autoresponder_active'] = 'Activer le répondeur automatique';
 $wb['cc_txt'] = 'Envoyer une copie à';
-$wb['cc_error_isemail'] = 'Le champ Envoyer une copie ne contient pas une adresse email valide';
+$wb['cc_error_isemail'] = 'Le champ Envoyer une copie ne contient pas une adresse e-mail valide';
 $wb['domain_txt'] = 'Domaine';
 $wb['now_txt'] = 'Maintenant';
-$wb['login_error_unique'] = 'Ce nom d\'utilisateur est déjà pris.';
+$wb['login_error_unique'] = 'Ce nom d’utilisateur est déjà pris.';
 $wb['login_error_regex'] = 'Les caractères valides sont A-Z, a-z, 0-9, ., _ et -.';
-$wb['login_txt'] = 'Nom d\'utilisateur (optionnel)';
-$wb['error_login_email_txt'] = 'Ce nom d\'utilisaeur n\'est pas autorisé. Veuilez entrer un nom différent ou utiliser l\'adresse email comme nom d\'utilisateur.';
+$wb['login_txt'] = 'Nom d’utilisateur (optionnel)';
+$wb['error_login_email_txt'] = 'Ce nom d’utilisaeur n’est pas autorisé. Veuilez entrer un nom différent ou utiliser l’adresse e-mail comme nom d’utilisateur.';
 $wb['autoresponder_subject_txt'] = 'Email Subject';
 $wb['autoresponder_subject'] = 'Out of office reply';
-$wb['generate_password_txt'] = 'Generate Password';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
 $wb['repeat_password_txt'] = 'Repeat Password';
 $wb['password_mismatch_txt'] = 'The passwords do not match.';
 $wb['password_match_txt'] = 'The passwords do match.';
-$wb["backup_interval_txt"] = 'Backup interval';
-$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
+$wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
+$wb['cc_note_txt'] = '(Separate multiple e-mail addresses with commas)';
+$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
+$wb['greylisting_txt'] = 'Enable greylisting';
+$wb['sender_cc_txt'] = 'Send outgoing copy to';
+$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['no_backup_txt'] = 'No backup';
 $wb['daily_backup_txt'] = 'Daily';
 $wb['weekly_backup_txt'] = 'Weekly';
 $wb['monthly_backup_txt'] = 'Monthly';
-$wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
-$wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
-$wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
+$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_mail_user_filter.lng b/interface/web/mail/lib/lang/fr_mail_user_filter.lng
index b847c9077e..0de090b6b1 100644
--- a/interface/web/mail/lib/lang/fr_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/fr_mail_user_filter.lng
@@ -6,8 +6,8 @@ $wb['active_txt'] = 'Actif';
 $wb['rulename_error_empty'] = 'Le nom est vide.';
 $wb['searchterm_is_empty'] = 'Le terme recherché est vide.';
 $wb['source_txt'] = 'Source';
-$wb['target_error_regex'] = 'La cible ne peut contenir que ces caractères : a-z, 0-9, -, ., _, et {espace}';
-$wb['limit_mailfilter_txt'] = 'Le nombre max de filtres email est atteint.';
+$wb['target_error_regex'] = 'La cible ne peut contenir que ces caractères : a-z, 0-9, -, ., _, et {espace}';
+$wb['limit_mailfilter_txt'] = 'Le nombre max de filtres e-mail est atteint.';
 $wb['subject_txt'] = 'Sujet';
 $wb['from_txt'] = 'De';
 $wb['to_txt'] = 'Pour';
@@ -15,6 +15,14 @@ $wb['contains_txt'] = 'Contient';
 $wb['is_txt'] = 'Est';
 $wb['begins_with_txt'] = 'Commence par';
 $wb['ends_with_txt'] = 'Fini par';
-$wb['move_to_txt'] = 'Déplacer vers';
 $wb['delete_txt'] = 'Supprimer';
+$wb['move_stop_txt'] = 'Move to';
+$wb['header_txt'] = 'Header';
+$wb['size_over_txt'] = 'Email size over (KB)';
+$wb['size_under_txt'] = 'Email size under (KB)';
+$wb['localpart_txt'] = 'Localpart';
+$wb['domain_txt'] = 'Domain';
+$wb['keep_txt'] = 'Keep';
+$wb['reject_txt'] = 'Reject';
+$wb['stop_txt'] = 'Stop';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_mail_user_list.lng b/interface/web/mail/lib/lang/fr_mail_user_list.lng
index 59652ba26e..0d4152913a 100644
--- a/interface/web/mail/lib/lang/fr_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/fr_mail_user_list.lng
@@ -1,8 +1,12 @@
 <?php
 $wb['list_head_txt'] = 'Boîte mail';
-$wb['email_txt'] = 'Email';
+$wb['email_txt'] = 'E-mail';
 $wb['autoresponder_txt'] = 'Répondeur automatique';
-$wb['add_new_record_txt'] = 'Ajouter une nouvelle boîte email';
+$wb['add_new_record_txt'] = 'Ajouter une nouvelle boîte e-mail';
 $wb['name_txt'] = 'Nom véritable';
-$wb['login_txt'] = 'Nom d\'utilisateur';
+$wb['login_txt'] = 'Nom d’utilisateur';
+$wb['postfix_txt'] = 'Receiving';
+$wb['disablesmtp_txt'] = 'SMTP (sending)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_mail_user_stats_list.lng b/interface/web/mail/lib/lang/fr_mail_user_stats_list.lng
index 8d32083501..0adbaf623b 100644
--- a/interface/web/mail/lib/lang/fr_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/fr_mail_user_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Trafic email';
-$wb['email_txt'] = 'Email';
+$wb['list_head_txt'] = 'Trafic e-mail';
+$wb['email_txt'] = 'E-mail';
 $wb['this_month_txt'] = 'Le mois en cours';
 $wb['last_month_txt'] = 'Le mois dernier';
-$wb['this_year_txt'] = 'L\'année en cours';
-$wb['last_year_txt'] = 'L\'année dernière';
+$wb['this_year_txt'] = 'L’année en cours';
+$wb['last_year_txt'] = 'L’année dernière';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_mail_whitelist.lng b/interface/web/mail/lib/lang/fr_mail_whitelist.lng
index 0d621c95f3..f11d0b76a7 100644
--- a/interface/web/mail/lib/lang/fr_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/fr_mail_whitelist.lng
@@ -3,7 +3,7 @@ $wb['server_id_txt'] = 'Serveur';
 $wb['source_txt'] = 'Adresse de la liste blanche';
 $wb['recipient_txt'] = 'Destinataire';
 $wb['active_txt'] = 'Actif';
-$wb['source_error_notempty'] = 'L\'adresse est vide.';
+$wb['source_error_notempty'] = 'L’adresse est vide.';
 $wb['type_txt'] = 'Type';
 $wb['limit_mailfilter_txt'] = 'Le nombre maximal de filtres à mails pour votre compte a été atteint.';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_mail_whitelist_list.lng b/interface/web/mail/lib/lang/fr_mail_whitelist_list.lng
index 244c2b36b9..8535c404fa 100644
--- a/interface/web/mail/lib/lang/fr_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/fr_mail_whitelist_list.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['list_head_txt'] = 'Liste blanche d\'emails';
+$wb['list_head_txt'] = 'Liste blanche d’e-mails';
 $wb['active_txt'] = 'Actif';
 $wb['server_id_txt'] = 'Serveur';
 $wb['source_txt'] = 'Adresse de la liste blanche';
diff --git a/interface/web/mail/lib/lang/fr_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/fr_spamfilter_blacklist.lng
index 046a73da7c..c201403459 100644
--- a/interface/web/mail/lib/lang/fr_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/fr_spamfilter_blacklist.lng
@@ -2,10 +2,10 @@
 $wb['server_id_txt'] = 'Serveur';
 $wb['wb_txt'] = 'wb';
 $wb['rid_txt'] = 'Utilisateur';
-$wb['email_txt'] = 'Email';
+$wb['email_txt'] = 'E-mail';
 $wb['priority_txt'] = 'Priorité';
 $wb['active_txt'] = 'Actif';
-$wb['limit_spamfilter_wblist_txt'] = 'Le nombre maximal d\'enregistrements dans votre liste blanche/noire pour votre compte a été atteint.';
+$wb['limit_spamfilter_wblist_txt'] = 'Le nombre maximal d’enregistrements dans votre liste blanche/noire pour votre compte a été atteint.';
 $wb['10 - highest'] = '10 - highest';
 $wb['5 - medium'] = '5 - medium';
 $wb['1 - lowest'] = '1 - lowest';
diff --git a/interface/web/mail/lib/lang/fr_spamfilter_config.lng b/interface/web/mail/lib/lang/fr_spamfilter_config.lng
index 081594c437..f71f08cf3c 100644
--- a/interface/web/mail/lib/lang/fr_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/fr_spamfilter_config.lng
@@ -3,7 +3,7 @@ $wb['getmail_config_dir_txt'] = 'Chemin de configuration Getmail';
 $wb['ip_address_txt'] = 'Adresse IP';
 $wb['netmask_txt'] = 'Masque réseau';
 $wb['gateway_txt'] = 'Passerelle';
-$wb['hostname_txt'] = 'Nom dhôte';
+$wb['hostname_txt'] = 'Nom d’hôte';
 $wb['nameservers_txt'] = 'Serveurs de nom';
 $wb['module_txt'] = 'Module serveur';
 $wb['maildir_path_txt'] = 'Chemin du dossier de mails';
@@ -15,6 +15,6 @@ $wb['mailuser_group_txt'] = 'Groupe utilisateur mail';
 $wb['relayhost_txt'] = 'Hôte de relais';
 $wb['relayhost_user_txt'] = 'Utilisateur hôte de relais';
 $wb['relayhost_password_txt'] = 'Mot de passe hôte de relais';
-$wb['mailbox_size_limit_txt'] = 'Limite de taille de la boite email';
+$wb['mailbox_size_limit_txt'] = 'Limite de taille de la boîte e-mail';
 $wb['message_size_limit_txt'] = 'Limite de taille des messages';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_spamfilter_users.lng b/interface/web/mail/lib/lang/fr_spamfilter_users.lng
index 5a6cf82e36..e8936b0183 100644
--- a/interface/web/mail/lib/lang/fr_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/fr_spamfilter_users.lng
@@ -5,7 +5,7 @@ $wb['policy_id_txt'] = 'Politique';
 $wb['email_txt'] = 'Email (Schéma)';
 $wb['fullname_txt'] = 'Nom';
 $wb['local_txt'] = 'Local';
-$wb['email_error_notempty'] = 'The email address must not be empty.';
+$wb['email_error_notempty'] = 'The e-mail address must not be empty.';
 $wb['fullname_error_notempty'] = 'The name must not be empty.';
 $wb['10 - highest'] = '10 - highest';
 $wb['5 - medium'] = '5 - medium';
diff --git a/interface/web/mail/lib/lang/fr_spamfilter_users_list.lng b/interface/web/mail/lib/lang/fr_spamfilter_users_list.lng
index f7047b1033..40776a5edb 100644
--- a/interface/web/mail/lib/lang/fr_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/fr_spamfilter_users_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb['list_head_txt'] = 'Utilisateurs de l\'anti-spam';
+$wb['list_head_txt'] = 'Utilisateurs de l’anti-spam';
 $wb['local_txt'] = 'Local';
 $wb['server_id_txt'] = 'Serveur';
 $wb['priority_txt'] = 'Priorité';
 $wb['policy_id_txt'] = 'Politique';
 $wb['fullname_txt'] = 'Nom';
-$wb['email_txt'] = 'Email';
-$wb['add_new_record_txt'] = 'Ajouter un utilisateur de l\'anti-spam';
+$wb['email_txt'] = 'E-mail';
+$wb['add_new_record_txt'] = 'Ajouter un utilisateur de l’anti-spam';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/fr_spamfilter_whitelist.lng
index 30c5c6b0e2..1e0360b4ce 100644
--- a/interface/web/mail/lib/lang/fr_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/fr_spamfilter_whitelist.lng
@@ -2,10 +2,10 @@
 $wb['server_id_txt'] = 'Serveur';
 $wb['wb_txt'] = 'wb';
 $wb['rid_txt'] = 'Utilisateur';
-$wb['email_txt'] = 'Email';
+$wb['email_txt'] = 'E-mail';
 $wb['priority_txt'] = 'Priorité';
 $wb['active_txt'] = 'Actif';
-$wb['limit_spamfilter_wblist_txt'] = 'Le nombre maximal d\'enregistrements de liste blanche ou noire est atteint pour votre compte.';
+$wb['limit_spamfilter_wblist_txt'] = 'Le nombre maximal d’enregistrements de liste blanche ou noire est atteint pour votre compte.';
 $wb['10 - highest'] = '10 - highest';
 $wb['5 - medium'] = '5 - medium';
 $wb['1 - lowest'] = '1 - lowest';
diff --git a/interface/web/mail/lib/lang/fr_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/fr_spamfilter_whitelist_list.lng
index 5c0fab1e95..da98f74edf 100644
--- a/interface/web/mail/lib/lang/fr_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/fr_spamfilter_whitelist_list.lng
@@ -1,5 +1,5 @@
 <?php
-$wb['list_head_txt'] = 'Liste blanche de l\'anti-spam';
+$wb['list_head_txt'] = 'Liste blanche de l’anti-spam';
 $wb['active_txt'] = 'Actif';
 $wb['server_id_txt'] = 'Serveur';
 $wb['priority_txt'] = 'Priorité';
diff --git a/interface/web/mail/lib/lang/fr_user_quota_stats_list.lng b/interface/web/mail/lib/lang/fr_user_quota_stats_list.lng
index 06931edb1d..ccaa29ed25 100755
--- a/interface/web/mail/lib/lang/fr_user_quota_stats_list.lng
+++ b/interface/web/mail/lib/lang/fr_user_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Quota des boîtes email';
+$wb['list_head_txt'] = 'Quota des boîtes aux lettres';
 $wb['quota_txt'] = 'Quota';
 $wb['name_txt'] = 'Nom';
-$wb['email_txt'] = 'Adresse email';
+$wb['email_txt'] = 'Adresse e-mail';
 $wb['used_txt'] = 'Espace utilisé';
 $wb['percentage_txt'] = 'Used %';
 ?>
diff --git a/interface/web/mail/lib/lang/fr_xmpp_domain.lng b/interface/web/mail/lib/lang/fr_xmpp_domain.lng
new file mode 100644
index 0000000000..0541203b2e
--- /dev/null
+++ b/interface/web/mail/lib/lang/fr_xmpp_domain.lng
@@ -0,0 +1,62 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['client_group_id_txt'] = 'Client';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Type';
+$wb['active_txt'] = 'Active';
+$wb['client_txt'] = 'Client';
+$wb['management_method_txt'] = 'Management of user accounts';
+$wb['public_registration_txt'] = 'Enable public registration';
+$wb['registration_url_txt'] = 'Registration URL';
+$wb['registration_message_txt'] = 'Registration Message';
+$wb['domain_admins_txt'] = 'Domain Admins (JIDs)';
+$wb['use_pubsub_txt'] = 'Enable Pubsub';
+$wb['use_proxy_txt'] = 'Enable Bytestream Proxy';
+$wb['use_anon_host_txt'] = 'Enable Anonymous Host';
+$wb['use_vjud_txt'] = 'Enable VJUD User Directory';
+$wb['vjud_opt_mode_txt'] = 'VJUD Opt Mode';
+$wb['use_muc_host_txt'] = 'Enable Multi User Chatrooms';
+$wb['muc_name_txt'] = 'Name in MUC Service Discovery';
+$wb['muc_restrict_room_creation_txt'] = 'Permission to create chatrooms';
+$wb['muc_admins_txt'] = 'MUC Admins (JIDs)';
+$wb['use_pastebin_txt'] = 'Enable Pastebin';
+$wb['pastebin_expire_after_txt'] = 'Pastes expire after (hours)';
+$wb['pastebin_trigger_txt'] = 'Pastebin trigger';
+$wb['use_http_archive_txt'] = 'Enable HTTP chatroom archive';
+$wb['http_archive_show_join_txt'] = 'Show join messages in archive';
+$wb['http_archive_show_status_txt'] = 'Show status changes in archive';
+$wb['use_status_host_txt'] = 'Enable XML Status host';
+$wb['cant_change_domainname_txt'] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb['about_registration_url_txt'] = 'Link to your registration form.';
+$wb['about_registration_message_txt'] = 'Description about your account registration process.';
+$wb['no_corresponding_maildomain_txt'] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_email_txt'] = 'Email Address';
+$wb['ssl_txt'] = 'SSL';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['none_txt'] = 'None';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ssl_error_isemail'] = 'Please enter a valid email adress for generation of the SSL certificate';
+$wb['limit_xmppdomain_txt'] = 'The max. number of XMPP domains for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/fr_xmpp_domain_admin_list.lng b/interface/web/mail/lib/lang/fr_xmpp_domain_admin_list.lng
new file mode 100644
index 0000000000..af643eab5a
--- /dev/null
+++ b/interface/web/mail/lib/lang/fr_xmpp_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'XMPP Domain';
+$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';
+?>
diff --git a/interface/web/mail/lib/lang/fr_xmpp_domain_list.lng b/interface/web/mail/lib/lang/fr_xmpp_domain_list.lng
new file mode 100644
index 0000000000..ebfebab7d5
--- /dev/null
+++ b/interface/web/mail/lib/lang/fr_xmpp_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'XMPP Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Add new Domain';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/mail/lib/lang/fr_xmpp_user.lng b/interface/web/mail/lib/lang/fr_xmpp_user.lng
new file mode 100644
index 0000000000..6ab739d98b
--- /dev/null
+++ b/interface/web/mail/lib/lang/fr_xmpp_user.lng
@@ -0,0 +1,15 @@
+<?php
+$wb['list_head_txt'] = 'XMPP User Accounts';
+$wb['jid_txt'] = 'Jabber ID';
+$wb['active_txt'] = 'Active';
+$wb['cryptpwd_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['error_no_pwd'] = 'Password is empty.';
+$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['no_domain_perm'] = 'You have no permission for this domain.';
+$wb['limit_xmpp_user_txt'] = 'The max. number of xmpp accounts for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/fr_xmpp_user_list.lng b/interface/web/mail/lib/lang/fr_xmpp_user_list.lng
new file mode 100644
index 0000000000..f2651cb62b
--- /dev/null
+++ b/interface/web/mail/lib/lang/fr_xmpp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'XMPP User Accounts';
+$wb['jid_txt'] = 'Jabber ID';
+$wb['is_domain_admin_txt'] = 'Domain admin';
+$wb['is_muc_admin_txt'] = 'MUC admin';
+$wb['add_new_record_txt'] = 'Add new user';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/mail/lib/lang/hr.lng b/interface/web/mail/lib/lang/hr.lng
index 96cb6e472d..882f6d2b7e 100644
--- a/interface/web/mail/lib/lang/hr.lng
+++ b/interface/web/mail/lib/lang/hr.lng
@@ -5,7 +5,6 @@ $wb['Blacklist'] = 'Blacklista';
 $wb['Mail Content Filter'] = 'Sadržaj mail filtera';
 $wb['Filter'] = 'Filter';
 $wb['Mail Domain'] = 'Mail domena';
-$wb['Domena'] = 'Domena';
 $wb['Email Catchall'] = 'Email catchall';
 $wb['Email Forward'] = 'Email proslijeđivanje';
 $wb['Get Email'] = 'Primi poštu';
@@ -45,6 +44,5 @@ $wb['Global Filters'] = 'Globalni filter';
 $wb['Domain Alias'] = 'Alias domena';
 $wb['Relay Recipients'] = 'Relay primatelji';
 $wb['Mailbox quota'] = 'Mailbox quota';
+$wb['Domain'] = 'Domain';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_backup_stats_list.lng b/interface/web/mail/lib/lang/hr_backup_stats_list.lng
index 9ae9658257..79cd6c9a63 100644
--- a/interface/web/mail/lib/lang/hr_backup_stats_list.lng
+++ b/interface/web/mail/lib/lang/hr_backup_stats_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Email';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Email';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/mail/lib/lang/hr_mail_alias.lng b/interface/web/mail/lib/lang/hr_mail_alias.lng
index 06dc4cd6fb..180bcbeacd 100644
--- a/interface/web/mail/lib/lang/hr_mail_alias.lng
+++ b/interface/web/mail/lib/lang/hr_mail_alias.lng
@@ -12,6 +12,6 @@ $wb['domain_txt'] = 'Domena';
 $wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
 $wb['source_txt'] = 'Alias';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_alias_list.lng b/interface/web/mail/lib/lang/hr_mail_alias_list.lng
index ba1bd7bb9b..2790cb345d 100644
--- a/interface/web/mail/lib/lang/hr_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_alias_list.lng
@@ -6,5 +6,3 @@ $wb['destination_txt'] = 'Odredište';
 $wb['email_txt'] = 'Email';
 $wb['add_new_record_txt'] = 'Dodaj email alias';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_aliasdomain.lng b/interface/web/mail/lib/lang/hr_mail_aliasdomain.lng
index 9797edbf4e..fc77f6c739 100644
--- a/interface/web/mail/lib/lang/hr_mail_aliasdomain.lng
+++ b/interface/web/mail/lib/lang/hr_mail_aliasdomain.lng
@@ -9,5 +9,3 @@ $wb['source_error_empty'] = 'Izvorna domena je prazna.';
 $wb['source_error_unique'] = 'Duplicirana izvorna domena.';
 $wb['source_error_regex'] = 'Neispravan naziv izvorne domene.';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/hr_mail_aliasdomain_list.lng
index b9551d2f79..3aa5514916 100644
--- a/interface/web/mail/lib/lang/hr_mail_aliasdomain_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_aliasdomain_list.lng
@@ -5,5 +5,3 @@ $wb['source_txt'] = 'Izvor';
 $wb['destination_txt'] = 'Destinacija';
 $wb['add_new_record_txt'] = 'Add new Domain alias';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_blacklist.lng b/interface/web/mail/lib/lang/hr_mail_blacklist.lng
index 722f56b9bf..dbce8de10d 100644
--- a/interface/web/mail/lib/lang/hr_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/hr_mail_blacklist.lng
@@ -7,5 +7,3 @@ $wb['source_error_notempty'] = 'Adresa je prazna';
 $wb['type_txt'] = 'Vrsta';
 $wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_blacklist_list.lng b/interface/web/mail/lib/lang/hr_mail_blacklist_list.lng
index f600904bf1..8cbb63a3bd 100644
--- a/interface/web/mail/lib/lang/hr_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_blacklist_list.lng
@@ -8,5 +8,3 @@ $wb['recipient_txt'] = 'Primatelj';
 $wb['add_new_record_txt'] = 'Dodaj novi zapis na blacklistu';
 $wb['access_txt'] = 'pristup';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_content_filter.lng b/interface/web/mail/lib/lang/hr_mail_content_filter.lng
index 75e0e1f0a3..f012957a76 100644
--- a/interface/web/mail/lib/lang/hr_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/hr_mail_content_filter.lng
@@ -7,5 +7,3 @@ $wb['action_txt'] = 'Akcija';
 $wb['active_txt'] = 'Aktivno';
 $wb['pattern_error_empty'] = 'Postupak je prazan.';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_content_filter_list.lng b/interface/web/mail/lib/lang/hr_mail_content_filter_list.lng
index d712e753f3..2657227009 100644
--- a/interface/web/mail/lib/lang/hr_mail_content_filter_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_content_filter_list.lng
@@ -6,5 +6,3 @@ $wb['pattern_txt'] = 'Pattern';
 $wb['action_txt'] = 'Akcija';
 $wb['add_new_record_txt'] = 'Add new Content Filter';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_domain.lng b/interface/web/mail/lib/lang/hr_mail_domain.lng
index 4958936e1a..eb91862b31 100644
--- a/interface/web/mail/lib/lang/hr_mail_domain.lng
+++ b/interface/web/mail/lib/lang/hr_mail_domain.lng
@@ -10,15 +10,14 @@ $wb['client_txt'] = 'Klijent';
 $wb['limit_maildomain_txt'] = 'Iskorišten je maksimalan broj email domena.';
 $wb['policy_txt'] = 'Spamfilter';
 $wb['no_policy'] = '- nema pravila -';
-$wb["dkim_txt"] = 'enable DKIM';
-$wb["dkim_private_txt"] = 'DKIM Private-key';
-$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
-$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
-$wb["dkim_dns_txt"] = 'DNS-Record';
-$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
+$wb['dkim_txt'] = 'enable DKIM';
+$wb['dkim_private_txt'] = 'DKIM Private-key';
+$wb['dkim_public_txt'] = 'DKIM Public-key\nfor information only';
+$wb['dkim_generate_txt'] = 'Generate DKIM Private-key';
+$wb['dkim_dns_txt'] = 'DNS-Record';
+$wb['dkim_private_key_error'] = 'Invalid DKIM-Private key';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
-$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
+$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_domain_admin_list.lng b/interface/web/mail/lib/lang/hr_mail_domain_admin_list.lng
index c8dc1bf798..4d13ef314f 100644
--- a/interface/web/mail/lib/lang/hr_mail_domain_admin_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_domain_admin_list.lng
@@ -6,5 +6,3 @@ $wb['add_new_record_txt'] = 'Dodaj domenu';
 $wb['active_txt'] = 'Aktivno';
 $wb['sys_groupid_txt'] = 'Klijent';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_domain_catchall.lng b/interface/web/mail/lib/lang/hr_mail_domain_catchall.lng
index cf6624c840..2c8d23e218 100644
--- a/interface/web/mail/lib/lang/hr_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/hr_mail_domain_catchall.lng
@@ -9,5 +9,3 @@ $wb['limit_mailcatchall_txt'] = 'Iskorišten ja maksimalan broj email catchall r
 $wb['source_txt'] = 'Source';
 $wb['destination_error_isemail'] = 'Destination is no valid email address.';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/hr_mail_domain_catchall_list.lng
index a11e2a3648..81108fa9e0 100644
--- a/interface/web/mail/lib/lang/hr_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_domain_catchall_list.lng
@@ -7,5 +7,3 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domena';
 $wb['add_new_record_txt'] = 'Dodaj catchall';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_domain_list.lng b/interface/web/mail/lib/lang/hr_mail_domain_list.lng
index 8102d1a61c..e078c283cb 100644
--- a/interface/web/mail/lib/lang/hr_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_domain_list.lng
@@ -5,5 +5,3 @@ $wb['domain_txt'] = 'Domena';
 $wb['add_new_record_txt'] = 'Dodaj domenu';
 $wb['active_txt'] = 'Aktivno';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_forward.lng b/interface/web/mail/lib/lang/hr_mail_forward.lng
index a4026e1196..3d815230ab 100644
--- a/interface/web/mail/lib/lang/hr_mail_forward.lng
+++ b/interface/web/mail/lib/lang/hr_mail_forward.lng
@@ -7,6 +7,7 @@ $wb['duplicate_mailbox_txt'] = 'Već postoji mailbox sa tom email adresom';
 $wb['domain_txt'] = 'Domena';
 $wb['source_txt'] = 'Izvorni email';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_forward_list.lng b/interface/web/mail/lib/lang/hr_mail_forward_list.lng
index ad29df2e6d..895fafb6db 100644
--- a/interface/web/mail/lib/lang/hr_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_forward_list.lng
@@ -6,5 +6,3 @@ $wb['destination_txt'] = 'Destinacija';
 $wb['email_txt'] = 'Email';
 $wb['add_new_record_txt'] = 'Add new Email forward';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_get.lng b/interface/web/mail/lib/lang/hr_mail_get.lng
index 4d5cb02213..18c53a4d53 100644
--- a/interface/web/mail/lib/lang/hr_mail_get.lng
+++ b/interface/web/mail/lib/lang/hr_mail_get.lng
@@ -17,5 +17,3 @@ $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.';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_get_list.lng b/interface/web/mail/lib/lang/hr_mail_get_list.lng
index bdd21ab6ae..9cd92dd970 100644
--- a/interface/web/mail/lib/lang/hr_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_get_list.lng
@@ -7,5 +7,3 @@ $wb['source_username_txt'] = 'Korisničko ime';
 $wb['destination_txt'] = 'Destinacija';
 $wb['add_new_record_txt'] = 'Dodaj novi račun';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_mailinglist.lng b/interface/web/mail/lib/lang/hr_mail_mailinglist.lng
index f800382b13..40f4629618 100644
--- a/interface/web/mail/lib/lang/hr_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/hr_mail_mailinglist.lng
@@ -20,5 +20,3 @@ $wb['listname_error_unique'] = 'There is already a mailinlist with name on the s
 $wb['email_error_isemail'] = 'Email adresa je neispravna.';
 $wb['mailinglist_txt'] = 'Email lista';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/hr_mail_mailinglist_list.lng
index 8550dedef4..48b8c8b323 100644
--- a/interface/web/mail/lib/lang/hr_mail_mailinglist_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_mailinglist_list.lng
@@ -3,5 +3,3 @@ $wb['list_head_txt'] = 'Mailing lista';
 $wb['domain_txt'] = 'Domena';
 $wb['listname_txt'] = 'Naziv liste';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_relay_recipient.lng b/interface/web/mail/lib/lang/hr_mail_relay_recipient.lng
index 73f4d78c54..3555ed250c 100644
--- a/interface/web/mail/lib/lang/hr_mail_relay_recipient.lng
+++ b/interface/web/mail/lib/lang/hr_mail_relay_recipient.lng
@@ -7,5 +7,3 @@ $wb['source_error_notempty'] = 'Adresa je prazna';
 $wb['type_txt'] = 'Vrsta';
 $wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/hr_mail_relay_recipient_list.lng
index f6ed8e0c2e..ad15e008b1 100644
--- a/interface/web/mail/lib/lang/hr_mail_relay_recipient_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_relay_recipient_list.lng
@@ -7,5 +7,3 @@ $wb['recipient_txt'] = 'Pimatelj';
 $wb['add_new_record_txt'] = 'Add new relay recipient';
 $wb['access_txt'] = 'pristup';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_spamfilter.lng b/interface/web/mail/lib/lang/hr_mail_spamfilter.lng
index 8024069091..90321d0d86 100644
--- a/interface/web/mail/lib/lang/hr_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/hr_mail_spamfilter.lng
@@ -15,5 +15,3 @@ $wb['email_error_unique'] = 'There is already an spamfilter record for this emai
 $wb['spam_redirect_maildir_purge_txt'] = 'Purge Maildir after';
 $wb['days_txt'] = 'Days.';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/hr_mail_spamfilter_list.lng
index 988fbf4bc1..654bc339e2 100644
--- a/interface/web/mail/lib/lang/hr_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_spamfilter_list.lng
@@ -6,5 +6,3 @@ $wb['server_name_txt'] = 'server_name';
 $wb['email_txt'] = 'Email';
 $wb['add_new_record_txt'] = 'Add new Spamfilter record';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_transport.lng b/interface/web/mail/lib/lang/hr_mail_transport.lng
index 93c2f01a00..c27687f956 100644
--- a/interface/web/mail/lib/lang/hr_mail_transport.lng
+++ b/interface/web/mail/lib/lang/hr_mail_transport.lng
@@ -9,5 +9,3 @@ $wb['active_txt'] = 'Aktivno';
 $wb['limit_mailrouting_txt'] = 'Iskorišten je maksimalan broj ruta.';
 $wb['transport_txt'] = 'Transport';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_transport_list.lng b/interface/web/mail/lib/lang/hr_mail_transport_list.lng
index 012786468a..d86d9e5516 100644
--- a/interface/web/mail/lib/lang/hr_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_transport_list.lng
@@ -7,5 +7,3 @@ $wb['transport_txt'] = 'Transport';
 $wb['sort_order_txt'] = 'Sort by';
 $wb['add_new_record_txt'] = 'Add new transport';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_user.lng b/interface/web/mail/lib/lang/hr_mail_user.lng
index 83464c3d73..b8d541faa4 100644
--- a/interface/web/mail/lib/lang/hr_mail_user.lng
+++ b/interface/web/mail/lib/lang/hr_mail_user.lng
@@ -44,8 +44,8 @@ $wb['error_login_email_txt'] = 'This login is not allowed. Please enter a differ
 $wb['autoresponder_start_date_ispast'] = 'Start date cannot be in the past.';
 $wb['autoresponder_subject_txt'] = 'Email Subject';
 $wb['autoresponder_subject'] = 'Out of office reply';
-$wb["backup_interval_txt"] = 'Backup interval';
-$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['no_backup_txt'] = 'No backup';
 $wb['daily_backup_txt'] = 'Daily';
 $wb['weekly_backup_txt'] = 'Weekly';
@@ -53,6 +53,12 @@ $wb['monthly_backup_txt'] = 'Monthly';
 $wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
 $wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
+$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
+$wb['sender_cc_txt'] = 'Send outgoing copy to';
+$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
+$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['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_user_filter.lng b/interface/web/mail/lib/lang/hr_mail_user_filter.lng
index acc99b2565..359a09a66f 100644
--- a/interface/web/mail/lib/lang/hr_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/hr_mail_user_filter.lng
@@ -15,8 +15,14 @@ $wb['contains_txt'] = 'Sadrži';
 $wb['is_txt'] = 'Is';
 $wb['begins_with_txt'] = 'Počinje sa';
 $wb['ends_with_txt'] = 'Završava sa';
-$wb['move_to_txt'] = 'Prebaci u';
 $wb['delete_txt'] = 'Obriši';
+$wb['move_stop_txt'] = 'Move to';
+$wb['header_txt'] = 'Header';
+$wb['size_over_txt'] = 'Email size over (KB)';
+$wb['size_under_txt'] = 'Email size under (KB)';
+$wb['localpart_txt'] = 'Localpart';
+$wb['domain_txt'] = 'Domain';
+$wb['keep_txt'] = 'Keep';
+$wb['reject_txt'] = 'Reject';
+$wb['stop_txt'] = 'Stop';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_user_filter_list.lng b/interface/web/mail/lib/lang/hr_mail_user_filter_list.lng
index 1cad4871e3..883ba5cdeb 100644
--- a/interface/web/mail/lib/lang/hr_mail_user_filter_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_user_filter_list.lng
@@ -5,5 +5,3 @@ $wb['page_txt'] = 'Stranica';
 $wb['page_of_txt'] = 'od';
 $wb['delete_confirmation'] = 'Da li stvarno želite obrisati email filter?';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_user_list.lng b/interface/web/mail/lib/lang/hr_mail_user_list.lng
index b56aa47172..498570c344 100644
--- a/interface/web/mail/lib/lang/hr_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_user_list.lng
@@ -5,6 +5,8 @@ $wb['autoresponder_txt'] = 'Automatski odgovor';
 $wb['add_new_record_txt'] = 'Dodaj email sandučić';
 $wb['name_txt'] = 'Ime';
 $wb['login_txt'] = 'Prijava';
+$wb['postfix_txt'] = 'Receiving';
+$wb['disablesmtp_txt'] = 'SMTP (sending)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_user_stats_list.lng b/interface/web/mail/lib/lang/hr_mail_user_stats_list.lng
index df269d69aa..edde65bd7a 100644
--- a/interface/web/mail/lib/lang/hr_mail_user_stats_list.lng
+++ b/interface/web/mail/lib/lang/hr_mail_user_stats_list.lng
@@ -6,5 +6,3 @@ $wb['last_month_txt'] = 'Last month';
 $wb['this_year_txt'] = 'This year';
 $wb['last_year_txt'] = 'Last year';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_mail_whitelist.lng b/interface/web/mail/lib/lang/hr_mail_whitelist.lng
index bd01a3c86a..a43e8eef46 100644
--- a/interface/web/mail/lib/lang/hr_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/hr_mail_whitelist.lng
@@ -7,5 +7,3 @@ $wb['source_error_notempty'] = 'Adresa je prazna';
 $wb['type_txt'] = 'Vrsta';
 $wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/hr_spamfilter_blacklist.lng
index 94f7c92742..d1562e6ce5 100644
--- a/interface/web/mail/lib/lang/hr_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/hr_spamfilter_blacklist.lng
@@ -10,5 +10,3 @@ $wb['10 - highest'] = '10 - highest';
 $wb['5 - medium'] = '5 - medium';
 $wb['1 - lowest'] = '1 - lowest';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/hr_spamfilter_blacklist_list.lng
index c704b2a578..8a21dd6689 100644
--- a/interface/web/mail/lib/lang/hr_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/hr_spamfilter_blacklist_list.lng
@@ -7,5 +7,3 @@ $wb['rid_txt'] = 'User';
 $wb['email_txt'] = 'Blacklisted Email';
 $wb['add_new_record_txt'] = 'Add Blacklist record';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_spamfilter_config.lng b/interface/web/mail/lib/lang/hr_spamfilter_config.lng
index d531cc14e8..2843133ca3 100644
--- a/interface/web/mail/lib/lang/hr_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/hr_spamfilter_config.lng
@@ -18,5 +18,3 @@ $wb['relayhost_password_txt'] = 'Relayhost Password';
 $wb['mailbox_size_limit_txt'] = 'Mailbox Size Limit';
 $wb['message_size_limit_txt'] = 'Message Size Limit';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_spamfilter_config_list.lng b/interface/web/mail/lib/lang/hr_spamfilter_config_list.lng
index f18951240b..ac925e4ee9 100644
--- a/interface/web/mail/lib/lang/hr_spamfilter_config_list.lng
+++ b/interface/web/mail/lib/lang/hr_spamfilter_config_list.lng
@@ -3,5 +3,3 @@ $wb['list_head_txt'] = 'Konfiguracija servera';
 $wb['server_name_txt'] = 'Server';
 $wb['server_id_txt'] = 'server_id';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_spamfilter_policy.lng b/interface/web/mail/lib/lang/hr_spamfilter_policy.lng
index 877c431b17..e876330a68 100644
--- a/interface/web/mail/lib/lang/hr_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/hr_spamfilter_policy.lng
@@ -36,5 +36,3 @@ $wb['spam_admin_txt'] = 'SPAM admin';
 $wb['message_size_limit_txt'] = 'Message size limit';
 $wb['banned_rulenames_txt'] = 'Banned rulenames';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/hr_spamfilter_policy_list.lng
index c984e4190b..84381b241e 100644
--- a/interface/web/mail/lib/lang/hr_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/hr_spamfilter_policy_list.lng
@@ -7,5 +7,3 @@ $wb['banned_files_lover_txt'] = 'Zabranjene datoteke';
 $wb['bad_header_lover_txt'] = 'Neispravan header';
 $wb['add_new_record_txt'] = 'Dodaj pravilo';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_spamfilter_users.lng b/interface/web/mail/lib/lang/hr_spamfilter_users.lng
index 24d7c783c2..9969ef421d 100644
--- a/interface/web/mail/lib/lang/hr_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/hr_spamfilter_users.lng
@@ -11,5 +11,3 @@ $wb['10 - highest'] = '10 - highest';
 $wb['5 - medium'] = '5 - medium';
 $wb['1 - lowest'] = '1 - lowest';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_spamfilter_users_list.lng b/interface/web/mail/lib/lang/hr_spamfilter_users_list.lng
index d56e1c68db..99e4636f66 100644
--- a/interface/web/mail/lib/lang/hr_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/hr_spamfilter_users_list.lng
@@ -8,5 +8,3 @@ $wb['fullname_txt'] = 'Name';
 $wb['email_txt'] = 'Email';
 $wb['add_new_record_txt'] = 'Add Spamfilter User';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/hr_spamfilter_whitelist.lng
index 94f7c92742..d1562e6ce5 100644
--- a/interface/web/mail/lib/lang/hr_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/hr_spamfilter_whitelist.lng
@@ -10,5 +10,3 @@ $wb['10 - highest'] = '10 - highest';
 $wb['5 - medium'] = '5 - medium';
 $wb['1 - lowest'] = '1 - lowest';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/hr_spamfilter_whitelist_list.lng
index 9c8dd1ac29..7dd21f10a6 100644
--- a/interface/web/mail/lib/lang/hr_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/hr_spamfilter_whitelist_list.lng
@@ -7,5 +7,3 @@ $wb['rid_txt'] = 'Korisnik';
 $wb['email_txt'] = 'Whitelistani email';
 $wb['add_new_record_txt'] = 'Dodaj whitelistu';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_user_quota_stats_list.lng b/interface/web/mail/lib/lang/hr_user_quota_stats_list.lng
index 45139608f9..2ac8663861 100644
--- a/interface/web/mail/lib/lang/hr_user_quota_stats_list.lng
+++ b/interface/web/mail/lib/lang/hr_user_quota_stats_list.lng
@@ -6,5 +6,3 @@ $wb['email_txt'] = 'Email adresa';
 $wb['used_txt'] = 'Prostor';
 $wb['percentage_txt'] = 'Koristi %';
 ?>
-
-
diff --git a/interface/web/mail/lib/lang/hr_xmpp_domain.lng b/interface/web/mail/lib/lang/hr_xmpp_domain.lng
new file mode 100644
index 0000000000..0541203b2e
--- /dev/null
+++ b/interface/web/mail/lib/lang/hr_xmpp_domain.lng
@@ -0,0 +1,62 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['client_group_id_txt'] = 'Client';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Type';
+$wb['active_txt'] = 'Active';
+$wb['client_txt'] = 'Client';
+$wb['management_method_txt'] = 'Management of user accounts';
+$wb['public_registration_txt'] = 'Enable public registration';
+$wb['registration_url_txt'] = 'Registration URL';
+$wb['registration_message_txt'] = 'Registration Message';
+$wb['domain_admins_txt'] = 'Domain Admins (JIDs)';
+$wb['use_pubsub_txt'] = 'Enable Pubsub';
+$wb['use_proxy_txt'] = 'Enable Bytestream Proxy';
+$wb['use_anon_host_txt'] = 'Enable Anonymous Host';
+$wb['use_vjud_txt'] = 'Enable VJUD User Directory';
+$wb['vjud_opt_mode_txt'] = 'VJUD Opt Mode';
+$wb['use_muc_host_txt'] = 'Enable Multi User Chatrooms';
+$wb['muc_name_txt'] = 'Name in MUC Service Discovery';
+$wb['muc_restrict_room_creation_txt'] = 'Permission to create chatrooms';
+$wb['muc_admins_txt'] = 'MUC Admins (JIDs)';
+$wb['use_pastebin_txt'] = 'Enable Pastebin';
+$wb['pastebin_expire_after_txt'] = 'Pastes expire after (hours)';
+$wb['pastebin_trigger_txt'] = 'Pastebin trigger';
+$wb['use_http_archive_txt'] = 'Enable HTTP chatroom archive';
+$wb['http_archive_show_join_txt'] = 'Show join messages in archive';
+$wb['http_archive_show_status_txt'] = 'Show status changes in archive';
+$wb['use_status_host_txt'] = 'Enable XML Status host';
+$wb['cant_change_domainname_txt'] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb['about_registration_url_txt'] = 'Link to your registration form.';
+$wb['about_registration_message_txt'] = 'Description about your account registration process.';
+$wb['no_corresponding_maildomain_txt'] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_email_txt'] = 'Email Address';
+$wb['ssl_txt'] = 'SSL';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['none_txt'] = 'None';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ssl_error_isemail'] = 'Please enter a valid email adress for generation of the SSL certificate';
+$wb['limit_xmppdomain_txt'] = 'The max. number of XMPP domains for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/hr_xmpp_domain_admin_list.lng b/interface/web/mail/lib/lang/hr_xmpp_domain_admin_list.lng
new file mode 100644
index 0000000000..af643eab5a
--- /dev/null
+++ b/interface/web/mail/lib/lang/hr_xmpp_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'XMPP Domain';
+$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';
+?>
diff --git a/interface/web/mail/lib/lang/hr_xmpp_domain_list.lng b/interface/web/mail/lib/lang/hr_xmpp_domain_list.lng
new file mode 100644
index 0000000000..ebfebab7d5
--- /dev/null
+++ b/interface/web/mail/lib/lang/hr_xmpp_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'XMPP Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Add new Domain';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/mail/lib/lang/hr_xmpp_user.lng b/interface/web/mail/lib/lang/hr_xmpp_user.lng
new file mode 100644
index 0000000000..6ab739d98b
--- /dev/null
+++ b/interface/web/mail/lib/lang/hr_xmpp_user.lng
@@ -0,0 +1,15 @@
+<?php
+$wb['list_head_txt'] = 'XMPP User Accounts';
+$wb['jid_txt'] = 'Jabber ID';
+$wb['active_txt'] = 'Active';
+$wb['cryptpwd_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['error_no_pwd'] = 'Password is empty.';
+$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['no_domain_perm'] = 'You have no permission for this domain.';
+$wb['limit_xmpp_user_txt'] = 'The max. number of xmpp accounts for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/hr_xmpp_user_list.lng b/interface/web/mail/lib/lang/hr_xmpp_user_list.lng
new file mode 100644
index 0000000000..f2651cb62b
--- /dev/null
+++ b/interface/web/mail/lib/lang/hr_xmpp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'XMPP User Accounts';
+$wb['jid_txt'] = 'Jabber ID';
+$wb['is_domain_admin_txt'] = 'Domain admin';
+$wb['is_muc_admin_txt'] = 'MUC admin';
+$wb['add_new_record_txt'] = 'Add new user';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/mail/lib/lang/hu_backup_stats_list.lng b/interface/web/mail/lib/lang/hu_backup_stats_list.lng
index 9ae9658257..79cd6c9a63 100644
--- a/interface/web/mail/lib/lang/hu_backup_stats_list.lng
+++ b/interface/web/mail/lib/lang/hu_backup_stats_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Email';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Email';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/mail/lib/lang/hu_mail_alias.lng b/interface/web/mail/lib/lang/hu_mail_alias.lng
index 8eb1ab2d40..7fc9e7a1d3 100644
--- a/interface/web/mail/lib/lang/hu_mail_alias.lng
+++ b/interface/web/mail/lib/lang/hu_mail_alias.lng
@@ -12,4 +12,6 @@ $wb['domain_txt'] = 'Domain';
 $wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
 $wb['source_txt'] = 'Alias';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
 ?>
diff --git a/interface/web/mail/lib/lang/hu_mail_domain.lng b/interface/web/mail/lib/lang/hu_mail_domain.lng
index 6a4f58d829..431beb8a01 100644
--- a/interface/web/mail/lib/lang/hu_mail_domain.lng
+++ b/interface/web/mail/lib/lang/hu_mail_domain.lng
@@ -10,13 +10,14 @@ $wb['limit_maildomain_txt'] = 'Meghaladta az ön hozzáférésével elérhető d
 $wb['policy_txt'] = 'Spamszűrő';
 $wb['no_policy'] = '- nem engedélyezett -';
 $wb['client_txt'] = 'Client';
-$wb["dkim_txt"] = 'enable DKIM';
-$wb["dkim_private_txt"] = 'DKIM Private-key';
-$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
-$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
-$wb["dkim_dns_txt"] = 'DNS-Record';
-$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
+$wb['dkim_txt'] = 'enable DKIM';
+$wb['dkim_private_txt'] = 'DKIM Private-key';
+$wb['dkim_public_txt'] = 'DKIM Public-key\nfor information only';
+$wb['dkim_generate_txt'] = 'Generate DKIM Private-key';
+$wb['dkim_dns_txt'] = 'DNS-Record';
+$wb['dkim_private_key_error'] = 'Invalid DKIM-Private key';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
-$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
+$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 ?>
diff --git a/interface/web/mail/lib/lang/hu_mail_forward.lng b/interface/web/mail/lib/lang/hu_mail_forward.lng
index 85db8a88a3..7d46b784ab 100644
--- a/interface/web/mail/lib/lang/hu_mail_forward.lng
+++ b/interface/web/mail/lib/lang/hu_mail_forward.lng
@@ -7,4 +7,7 @@ $wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email addre
 $wb['domain_txt'] = 'Domain';
 $wb['source_txt'] = 'Source Email';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
 ?>
diff --git a/interface/web/mail/lib/lang/hu_mail_user.lng b/interface/web/mail/lib/lang/hu_mail_user.lng
index 0d1a5a7f2c..97b07798d1 100644
--- a/interface/web/mail/lib/lang/hu_mail_user.lng
+++ b/interface/web/mail/lib/lang/hu_mail_user.lng
@@ -48,8 +48,8 @@ $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["backup_interval_txt"] = 'Backup interval';
-$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['no_backup_txt'] = 'No backup';
 $wb['daily_backup_txt'] = 'Daily';
 $wb['weekly_backup_txt'] = 'Weekly';
@@ -57,4 +57,8 @@ $wb['monthly_backup_txt'] = 'Monthly';
 $wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
 $wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
+$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
+$wb['sender_cc_txt'] = 'Send outgoing copy to';
+$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
+$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
diff --git a/interface/web/mail/lib/lang/hu_mail_user_filter.lng b/interface/web/mail/lib/lang/hu_mail_user_filter.lng
index 67144b7c7c..494d35517f 100644
--- a/interface/web/mail/lib/lang/hu_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/hu_mail_user_filter.lng
@@ -13,8 +13,16 @@ $wb['contains_txt'] = 'Tartalmazza';
 $wb['is_txt'] = 'Is';
 $wb['begins_with_txt'] = 'Begins with';
 $wb['ends_with_txt'] = 'Ends with';
-$wb['move_to_txt'] = 'Áthelyezés';
 $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['delete_txt'] = 'Delete';
+$wb['move_stop_txt'] = 'Move to';
+$wb['header_txt'] = 'Header';
+$wb['size_over_txt'] = 'Email size over (KB)';
+$wb['size_under_txt'] = 'Email size under (KB)';
+$wb['localpart_txt'] = 'Localpart';
+$wb['domain_txt'] = 'Domain';
+$wb['keep_txt'] = 'Keep';
+$wb['reject_txt'] = 'Reject';
+$wb['stop_txt'] = 'Stop';
 ?>
diff --git a/interface/web/mail/lib/lang/hu_mail_user_list.lng b/interface/web/mail/lib/lang/hu_mail_user_list.lng
index ec23792431..8bf44e936c 100644
--- a/interface/web/mail/lib/lang/hu_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/hu_mail_user_list.lng
@@ -5,4 +5,8 @@ $wb['autoresponder_txt'] = 'Automatikus válasz';
 $wb['add_new_record_txt'] = 'Levelező fiók létrehozása';
 $wb['name_txt'] = 'Név';
 $wb['login_txt'] = 'Login';
+$wb['postfix_txt'] = 'Receiving';
+$wb['disablesmtp_txt'] = 'SMTP (sending)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
 ?>
diff --git a/interface/web/mail/lib/lang/hu_xmpp_domain.lng b/interface/web/mail/lib/lang/hu_xmpp_domain.lng
new file mode 100644
index 0000000000..f1da77ba29
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_xmpp_domain.lng
@@ -0,0 +1,62 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["client_group_id_txt"] = 'Client';
+$wb["domain_txt"] = 'Domain';
+$wb["type_txt"] = 'Type';
+$wb["active_txt"] = 'Active';
+$wb["client_txt"] = 'Client';
+$wb["management_method_txt"] = 'Management of user accounts';
+$wb["public_registration_txt"] = 'Enable public registration';
+$wb["registration_url_txt"] = 'Registration URL';
+$wb["registration_message_txt"] = 'Registration Message';
+$wb["domain_admins_txt"] = 'Domain Admins (JIDs)';
+$wb["use_pubsub_txt"] = 'Enable Pubsub';
+$wb["use_proxy_txt"] = 'Enable Bytestream Proxy';
+$wb["use_anon_host_txt"] = 'Enable Anonymous Host';
+$wb["use_vjud_txt"] = 'Enable VJUD User Directory';
+$wb["vjud_opt_mode_txt"] = 'VJUD Opt Mode';
+$wb["use_muc_host_txt"] = 'Enable Multi User Chatrooms';
+$wb["muc_name_txt"] = 'Name in MUC Service Discovery';
+$wb["muc_restrict_room_creation_txt"] = 'Permission to create chatrooms';
+$wb["muc_admins_txt"] = 'MUC Admins (JIDs)';
+$wb["use_pastebin_txt"] = 'Enable Pastebin';
+$wb["pastebin_expire_after_txt"] = 'Pastes expire after (hours)';
+$wb["pastebin_trigger_txt"] = 'Pastebin trigger';
+$wb["use_http_archive_txt"] = 'Enable HTTP chatroom archive';
+$wb["http_archive_show_join_txt"] = 'Show join messages in archive';
+$wb["http_archive_show_status_txt"] = 'Show status changes in archive';
+$wb["use_status_host_txt"] = 'Enable XML Status host';
+$wb["cant_change_domainname_txt"] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb["about_registration_url_txt"] = 'Link to your registration form.';
+$wb["about_registration_message_txt"] = 'Description about your account registration process.';
+$wb["no_corresponding_maildomain_txt"] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_email_txt'] = 'Email Address';
+$wb['ssl_txt'] = 'SSL';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['none_txt'] = 'None';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ssl_error_isemail'] = 'Please enter a valid email adress for generation of the SSL certificate';
+$wb["limit_xmppdomain_txt"] = 'The max. number of XMPP domains for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/hu_xmpp_domain_admin_list.lng b/interface/web/mail/lib/lang/hu_xmpp_domain_admin_list.lng
new file mode 100644
index 0000000000..a3d1736d7b
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_xmpp_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$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';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/hu_xmpp_domain_list.lng b/interface/web/mail/lib/lang/hu_xmpp_domain_list.lng
new file mode 100644
index 0000000000..f8c2fb9b8e
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_xmpp_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["add_new_record_txt"] = 'Add new Domain';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/hu_xmpp_user.lng b/interface/web/mail/lib/lang/hu_xmpp_user.lng
new file mode 100644
index 0000000000..1cc852e3cf
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_xmpp_user.lng
@@ -0,0 +1,15 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["active_txt"] = 'Active';
+$wb["cryptpwd_txt"] = 'Password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["error_no_pwd"] = 'Password is empty.';
+$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["no_domain_perm"] = 'You have no permission for this domain.';
+$wb["limit_xmpp_user_txt"] = 'The max. number of xmpp accounts for your account is reached.';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/hu_xmpp_user_list.lng b/interface/web/mail/lib/lang/hu_xmpp_user_list.lng
new file mode 100644
index 0000000000..db88b0d7e3
--- /dev/null
+++ b/interface/web/mail/lib/lang/hu_xmpp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["is_domain_admin_txt"] = 'Domain admin';
+$wb["is_muc_admin_txt"] = 'MUC admin';
+$wb["add_new_record_txt"] = 'Add new user';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/id_backup_stats_list.lng b/interface/web/mail/lib/lang/id_backup_stats_list.lng
index 9ae9658257..79cd6c9a63 100644
--- a/interface/web/mail/lib/lang/id_backup_stats_list.lng
+++ b/interface/web/mail/lib/lang/id_backup_stats_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Email';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Email';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/mail/lib/lang/id_mail_alias.lng b/interface/web/mail/lib/lang/id_mail_alias.lng
index 8a59091936..e0efdb1504 100644
--- a/interface/web/mail/lib/lang/id_mail_alias.lng
+++ b/interface/web/mail/lib/lang/id_mail_alias.lng
@@ -12,4 +12,6 @@ $wb['domain_txt'] = 'Domain';
 $wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
 $wb['source_txt'] = 'Alias';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
 ?>
diff --git a/interface/web/mail/lib/lang/id_mail_domain.lng b/interface/web/mail/lib/lang/id_mail_domain.lng
index 1bfe29408f..c13968dde8 100644
--- a/interface/web/mail/lib/lang/id_mail_domain.lng
+++ b/interface/web/mail/lib/lang/id_mail_domain.lng
@@ -10,13 +10,14 @@ $wb['client_txt'] = 'Klien';
 $wb['limit_maildomain_txt'] = 'Jumlah maks domain email untuk akun Anda telah tercapai.';
 $wb['policy_txt'] = 'Spamfilter';
 $wb['no_policy'] = '- tidak aktif -';
-$wb["dkim_txt"] = 'enable DKIM';
-$wb["dkim_private_txt"] = 'DKIM Private-key';
-$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
-$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
-$wb["dkim_dns_txt"] = 'DNS-Record';
-$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
+$wb['dkim_txt'] = 'enable DKIM';
+$wb['dkim_private_txt'] = 'DKIM Private-key';
+$wb['dkim_public_txt'] = 'DKIM Public-key\nfor information only';
+$wb['dkim_generate_txt'] = 'Generate DKIM Private-key';
+$wb['dkim_dns_txt'] = 'DNS-Record';
+$wb['dkim_private_key_error'] = 'Invalid DKIM-Private key';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
-$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
+$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 ?>
diff --git a/interface/web/mail/lib/lang/id_mail_forward.lng b/interface/web/mail/lib/lang/id_mail_forward.lng
index f1c1a7dfac..3db6c759c5 100644
--- a/interface/web/mail/lib/lang/id_mail_forward.lng
+++ b/interface/web/mail/lib/lang/id_mail_forward.lng
@@ -7,4 +7,7 @@ $wb['duplicate_mailbox_txt'] = 'Sudah ada mailbox untuk alamat email ini';
 $wb['domain_txt'] = 'Domain';
 $wb['source_txt'] = 'Source Email';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
 ?>
diff --git a/interface/web/mail/lib/lang/id_mail_user.lng b/interface/web/mail/lib/lang/id_mail_user.lng
index 896c3c499b..22b3b8140d 100644
--- a/interface/web/mail/lib/lang/id_mail_user.lng
+++ b/interface/web/mail/lib/lang/id_mail_user.lng
@@ -48,8 +48,8 @@ $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["backup_interval_txt"] = 'Backup interval';
-$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['no_backup_txt'] = 'No backup';
 $wb['daily_backup_txt'] = 'Daily';
 $wb['weekly_backup_txt'] = 'Weekly';
@@ -57,4 +57,8 @@ $wb['monthly_backup_txt'] = 'Monthly';
 $wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
 $wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
+$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
+$wb['sender_cc_txt'] = 'Send outgoing copy to';
+$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
+$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
diff --git a/interface/web/mail/lib/lang/id_mail_user_filter.lng b/interface/web/mail/lib/lang/id_mail_user_filter.lng
index e5517a0ded..371d5b772e 100644
--- a/interface/web/mail/lib/lang/id_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/id_mail_user_filter.lng
@@ -15,6 +15,14 @@ $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['move_stop_txt'] = 'Move to';
+$wb['header_txt'] = 'Header';
+$wb['size_over_txt'] = 'Email size over (KB)';
+$wb['size_under_txt'] = 'Email size under (KB)';
+$wb['localpart_txt'] = 'Localpart';
+$wb['domain_txt'] = 'Domain';
+$wb['keep_txt'] = 'Keep';
+$wb['reject_txt'] = 'Reject';
+$wb['stop_txt'] = 'Stop';
 ?>
diff --git a/interface/web/mail/lib/lang/id_mail_user_list.lng b/interface/web/mail/lib/lang/id_mail_user_list.lng
index e761f218ac..49a2afe943 100644
--- a/interface/web/mail/lib/lang/id_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/id_mail_user_list.lng
@@ -5,4 +5,8 @@ $wb['autoresponder_txt'] = 'Penjawab otomtatis';
 $wb['add_new_record_txt'] = 'Tambah Mailbox Baru';
 $wb['name_txt'] = 'Nama Lengkap';
 $wb['login_txt'] = 'Login';
+$wb['postfix_txt'] = 'Receiving';
+$wb['disablesmtp_txt'] = 'SMTP (sending)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
 ?>
diff --git a/interface/web/mail/lib/lang/id_xmpp_domain.lng b/interface/web/mail/lib/lang/id_xmpp_domain.lng
new file mode 100644
index 0000000000..f1da77ba29
--- /dev/null
+++ b/interface/web/mail/lib/lang/id_xmpp_domain.lng
@@ -0,0 +1,62 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["client_group_id_txt"] = 'Client';
+$wb["domain_txt"] = 'Domain';
+$wb["type_txt"] = 'Type';
+$wb["active_txt"] = 'Active';
+$wb["client_txt"] = 'Client';
+$wb["management_method_txt"] = 'Management of user accounts';
+$wb["public_registration_txt"] = 'Enable public registration';
+$wb["registration_url_txt"] = 'Registration URL';
+$wb["registration_message_txt"] = 'Registration Message';
+$wb["domain_admins_txt"] = 'Domain Admins (JIDs)';
+$wb["use_pubsub_txt"] = 'Enable Pubsub';
+$wb["use_proxy_txt"] = 'Enable Bytestream Proxy';
+$wb["use_anon_host_txt"] = 'Enable Anonymous Host';
+$wb["use_vjud_txt"] = 'Enable VJUD User Directory';
+$wb["vjud_opt_mode_txt"] = 'VJUD Opt Mode';
+$wb["use_muc_host_txt"] = 'Enable Multi User Chatrooms';
+$wb["muc_name_txt"] = 'Name in MUC Service Discovery';
+$wb["muc_restrict_room_creation_txt"] = 'Permission to create chatrooms';
+$wb["muc_admins_txt"] = 'MUC Admins (JIDs)';
+$wb["use_pastebin_txt"] = 'Enable Pastebin';
+$wb["pastebin_expire_after_txt"] = 'Pastes expire after (hours)';
+$wb["pastebin_trigger_txt"] = 'Pastebin trigger';
+$wb["use_http_archive_txt"] = 'Enable HTTP chatroom archive';
+$wb["http_archive_show_join_txt"] = 'Show join messages in archive';
+$wb["http_archive_show_status_txt"] = 'Show status changes in archive';
+$wb["use_status_host_txt"] = 'Enable XML Status host';
+$wb["cant_change_domainname_txt"] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb["about_registration_url_txt"] = 'Link to your registration form.';
+$wb["about_registration_message_txt"] = 'Description about your account registration process.';
+$wb["no_corresponding_maildomain_txt"] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_email_txt'] = 'Email Address';
+$wb['ssl_txt'] = 'SSL';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['none_txt'] = 'None';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ssl_error_isemail'] = 'Please enter a valid email adress for generation of the SSL certificate';
+$wb["limit_xmppdomain_txt"] = 'The max. number of XMPP domains for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/id_xmpp_domain_admin_list.lng b/interface/web/mail/lib/lang/id_xmpp_domain_admin_list.lng
new file mode 100644
index 0000000000..a3d1736d7b
--- /dev/null
+++ b/interface/web/mail/lib/lang/id_xmpp_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$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';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/id_xmpp_domain_list.lng b/interface/web/mail/lib/lang/id_xmpp_domain_list.lng
new file mode 100644
index 0000000000..f8c2fb9b8e
--- /dev/null
+++ b/interface/web/mail/lib/lang/id_xmpp_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["add_new_record_txt"] = 'Add new Domain';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/id_xmpp_user.lng b/interface/web/mail/lib/lang/id_xmpp_user.lng
new file mode 100644
index 0000000000..1cc852e3cf
--- /dev/null
+++ b/interface/web/mail/lib/lang/id_xmpp_user.lng
@@ -0,0 +1,15 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["active_txt"] = 'Active';
+$wb["cryptpwd_txt"] = 'Password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["error_no_pwd"] = 'Password is empty.';
+$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["no_domain_perm"] = 'You have no permission for this domain.';
+$wb["limit_xmpp_user_txt"] = 'The max. number of xmpp accounts for your account is reached.';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/id_xmpp_user_list.lng b/interface/web/mail/lib/lang/id_xmpp_user_list.lng
new file mode 100644
index 0000000000..db88b0d7e3
--- /dev/null
+++ b/interface/web/mail/lib/lang/id_xmpp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["is_domain_admin_txt"] = 'Domain admin';
+$wb["is_muc_admin_txt"] = 'MUC admin';
+$wb["add_new_record_txt"] = 'Add new user';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/it.lng b/interface/web/mail/lib/lang/it.lng
index 5c9de9625d..715e2efb8e 100644
--- a/interface/web/mail/lib/lang/it.lng
+++ b/interface/web/mail/lib/lang/it.lng
@@ -12,7 +12,7 @@ $wb['Get Email'] = 'Scarica email';
 $wb['Spamfilter'] = 'Spamfilter';
 $wb['Email Routing'] = 'Routing email';
 $wb['Email transport'] = 'Email transport';
-$wb['Mailbox'] = 'Mailbox';
+$wb['Mailbox'] = 'Casella di posta';
 $wb['Autoresponder'] = 'Autorisponditore';
 $wb['Mail Filter'] = 'Filtro posta';
 $wb['Custom Rules'] = 'Regole personalizzate';
@@ -44,5 +44,5 @@ $wb['Content Filter'] = 'Filtri contenuti';
 $wb['Global Filters'] = 'Filtri globali';
 $wb['Domain Alias'] = 'Alias dominio';
 $wb['Relay Recipients'] = 'Destinatari inoltro';
-$wb['Mailbox quota'] = 'Mailbox quota';
+$wb['Mailbox quota'] = 'Quota Casella di Posta';
 ?>
diff --git a/interface/web/mail/lib/lang/it_backup_stats_list.lng b/interface/web/mail/lib/lang/it_backup_stats_list.lng
index 9ae9658257..79cd6c9a63 100644
--- a/interface/web/mail/lib/lang/it_backup_stats_list.lng
+++ b/interface/web/mail/lib/lang/it_backup_stats_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Email';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Email';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_alias.lng b/interface/web/mail/lib/lang/it_mail_alias.lng
index 60efa1c007..fea4fe0c12 100644
--- a/interface/web/mail/lib/lang/it_mail_alias.lng
+++ b/interface/web/mail/lib/lang/it_mail_alias.lng
@@ -8,8 +8,10 @@ $wb['no_domain_perm'] = 'Permessi non sufficienti per questo dominio.';
 $wb['destination_error_isemail'] = 'Email destinatario non valida.';
 $wb['limit_mailalias_txt'] = 'Raggiunto numero massimo di alias email per questo account.';
 $wb['duplicate_mailbox_txt'] = 'Cé già una casella di posta con questo indirizzo email.';
-$wb['domain_txt'] = 'Domain';
+$wb['domain_txt'] = 'Dominio';
 $wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
 $wb['source_txt'] = 'Alias';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
 $wb['greylisting_txt'] = 'Enable greylisting';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_alias_list.lng b/interface/web/mail/lib/lang/it_mail_alias_list.lng
index 0a44ea4f72..0f77839b94 100644
--- a/interface/web/mail/lib/lang/it_mail_alias_list.lng
+++ b/interface/web/mail/lib/lang/it_mail_alias_list.lng
@@ -1,8 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Email Alias';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Attivo';
 $wb['source_txt'] = 'source';
-$wb['destination_txt'] = 'Destination';
+$wb['destination_txt'] = 'Destinazione';
 $wb['email_txt'] = 'Email';
-$wb['add_new_record_txt'] = 'Add new Email alias';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo  Email alias';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_aliasdomain.lng b/interface/web/mail/lib/lang/it_mail_aliasdomain.lng
index 5815d1e609..698582eddb 100644
--- a/interface/web/mail/lib/lang/it_mail_aliasdomain.lng
+++ b/interface/web/mail/lib/lang/it_mail_aliasdomain.lng
@@ -1,11 +1,11 @@
 <?php
 $wb['source_txt'] = 'Source';
-$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['destination_txt'] = 'Destinazione';
+$wb['active_txt'] = 'Attivo';
+$wb['no_domain_perm'] = 'Non hai i diritti per  this domain.';
+$wb['limit_mailaliasdomain_txt'] = 'The max. number of email alias domains raggiunto per il tuo account.';
 $wb['source_destination_identical_txt'] = 'Source and target Domain are the same.';
-$wb['source_error_empty'] = 'Source Domain is empty.';
+$wb['source_error_empty'] = 'Source Domain  vuoto.';
 $wb['source_error_unique'] = 'Duplicate source Domain.';
 $wb['source_error_regex'] = 'Invalid source domain name.';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/it_mail_aliasdomain_list.lng
index d96a63e2a4..176964e54a 100644
--- a/interface/web/mail/lib/lang/it_mail_aliasdomain_list.lng
+++ b/interface/web/mail/lib/lang/it_mail_aliasdomain_list.lng
@@ -1,7 +1,7 @@
 <?php
 $wb['list_head_txt'] = 'Domain alias';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Attivo';
 $wb['source_txt'] = 'Source';
-$wb['destination_txt'] = 'Destination';
-$wb['add_new_record_txt'] = 'Add new Domain alias';
+$wb['destination_txt'] = 'Destinazione';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo  Domain alias';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_blacklist.lng b/interface/web/mail/lib/lang/it_mail_blacklist.lng
index 5b2815c0d0..169015d658 100644
--- a/interface/web/mail/lib/lang/it_mail_blacklist.lng
+++ b/interface/web/mail/lib/lang/it_mail_blacklist.lng
@@ -2,8 +2,8 @@
 $wb['server_id_txt'] = 'Server';
 $wb['source_txt'] = 'Blacklist Address';
 $wb['recipient_txt'] = 'Recipient';
-$wb['active_txt'] = 'Active';
-$wb['source_error_notempty'] = 'Address is empty.';
+$wb['active_txt'] = 'Attivo';
+$wb['source_error_notempty'] = 'Address  vuoto.';
 $wb['type_txt'] = 'Type';
-$wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.';
+$wb['limit_mailfilter_txt'] = 'The max. number of email filters raggiunto per il tuo account.';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_blacklist_list.lng b/interface/web/mail/lib/lang/it_mail_blacklist_list.lng
index a72052f085..8840a270e4 100644
--- a/interface/web/mail/lib/lang/it_mail_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/it_mail_blacklist_list.lng
@@ -1,10 +1,10 @@
 <?php
 $wb['list_head_txt'] = 'Email Blacklist';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Attivo';
 $wb['server_id_txt'] = 'Server';
 $wb['source_txt'] = 'Blacklisted address';
 $wb['type_txt'] = 'Type';
 $wb['recipient_txt'] = 'Recipient';
-$wb['add_new_record_txt'] = 'Add new Blacklist record';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo  Blacklist record';
 $wb['access_txt'] = 'access';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_content_filter.lng b/interface/web/mail/lib/lang/it_mail_content_filter.lng
index 9d5e5f9baf..5169e7fd63 100644
--- a/interface/web/mail/lib/lang/it_mail_content_filter.lng
+++ b/interface/web/mail/lib/lang/it_mail_content_filter.lng
@@ -4,6 +4,6 @@ $wb['type_txt'] = 'Filter';
 $wb['pattern_txt'] = 'Regexp. Pattern';
 $wb['data_txt'] = 'Data';
 $wb['action_txt'] = 'Action';
-$wb['active_txt'] = 'Active';
-$wb['pattern_error_empty'] = 'Pattern is empty.';
+$wb['active_txt'] = 'Attivo';
+$wb['pattern_error_empty'] = 'Pattern  vuoto.';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_content_filter_list.lng b/interface/web/mail/lib/lang/it_mail_content_filter_list.lng
index 8c1e5e2e75..bfda794abf 100644
--- a/interface/web/mail/lib/lang/it_mail_content_filter_list.lng
+++ b/interface/web/mail/lib/lang/it_mail_content_filter_list.lng
@@ -1,8 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Postfix Header and Body Checks';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Attivo';
 $wb['server_id_txt'] = 'Server';
 $wb['pattern_txt'] = 'Pattern';
 $wb['action_txt'] = 'Action';
-$wb['add_new_record_txt'] = 'Add new Content Filter';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo  Content Filter';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_domain.lng b/interface/web/mail/lib/lang/it_mail_domain.lng
index cbbd9e6c83..46089adb90 100644
--- a/interface/web/mail/lib/lang/it_mail_domain.lng
+++ b/interface/web/mail/lib/lang/it_mail_domain.lng
@@ -8,15 +8,16 @@ $wb['domain_error_unique'] = 'Dominio duplicato.';
 $wb['domain_error_regex'] = 'Nome dominio non valido.';
 $wb['client_txt'] = 'Cleient';
 $wb['limit_maildomain_txt'] = 'Raggiunto numero massimo di domini email per questo account.';
-$wb['policy_txt'] = 'Spamfilter';
+$wb['policy_txt'] = 'Filtro Spam';
 $wb['no_policy'] = '- non abilitato -';
-$wb["dkim_txt"] = 'enable DKIM';
-$wb["dkim_private_txt"] = 'DKIM Private-key';
-$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
-$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
-$wb["dkim_dns_txt"] = 'DNS-Record';
-$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
+$wb['dkim_txt'] = 'enable DKIM';
+$wb['dkim_private_txt'] = 'DKIM Private-key';
+$wb['dkim_public_txt'] = 'DKIM Public-key\nfor information only';
+$wb['dkim_generate_txt'] = 'Generate DKIM Private-key';
+$wb['dkim_dns_txt'] = 'DNS-Record';
+$wb['dkim_private_key_error'] = 'Invalid DKIM-Private key';
+$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
-$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_domain_catchall.lng b/interface/web/mail/lib/lang/it_mail_domain_catchall.lng
index af8e42f24b..6ff4cbdf1c 100644
--- a/interface/web/mail/lib/lang/it_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/it_mail_domain_catchall.lng
@@ -1,11 +1,11 @@
 <?php
-$wb['domain_txt'] = 'Domain';
-$wb['destination_txt'] = 'Destination';
-$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Dominio';
+$wb['destination_txt'] = 'Destinazione';
+$wb['active_txt'] = 'Attivo';
 $wb['domain_error_unique'] = 'There is already a Catchall record for this domain.';
-$wb['no_domain_perm'] = 'You have no permission for this domain.';
-$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['no_domain_perm'] = 'Non hai i diritti per  this domain.';
+$wb['domain_error_regex'] = 'Invalid domain name od domain contiene caratteri non validi.';
+$wb['limit_mailcatchall_txt'] = 'The max. number of email catchall accounts raggiunto per il tuo account.';
 $wb['source_txt'] = 'Source';
 $wb['destination_error_isemail'] = 'Destination is no valid email address.';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_domain_catchall_list.lng b/interface/web/mail/lib/lang/it_mail_domain_catchall_list.lng
index 7d076dd4c4..78515acd8a 100644
--- a/interface/web/mail/lib/lang/it_mail_domain_catchall_list.lng
+++ b/interface/web/mail/lib/lang/it_mail_domain_catchall_list.lng
@@ -1,9 +1,9 @@
 <?php
 $wb['list_head_txt'] = 'Email Catchall';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Attivo';
 $wb['source_txt'] = 'source';
 $wb['destination_txt'] = 'Destination email address';
 $wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['add_new_record_txt'] = 'Add new Catchall';
+$wb['domain_txt'] = 'Dominio';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo  Catchall';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_domain_list.lng b/interface/web/mail/lib/lang/it_mail_domain_list.lng
index d844781311..fcdf0d2b55 100644
--- a/interface/web/mail/lib/lang/it_mail_domain_list.lng
+++ b/interface/web/mail/lib/lang/it_mail_domain_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb['list_head_txt'] = 'Email Domain';
+$wb['list_head_txt'] = 'Dominio di Posta';
 $wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['add_new_record_txt'] = 'Add new Domain';
-$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Dominio';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo  Domain';
+$wb['active_txt'] = 'Attivo';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_forward.lng b/interface/web/mail/lib/lang/it_mail_forward.lng
index 120ec98c3c..e71f91b434 100644
--- a/interface/web/mail/lib/lang/it_mail_forward.lng
+++ b/interface/web/mail/lib/lang/it_mail_forward.lng
@@ -1,10 +1,13 @@
 <?php
 $wb['email_txt'] = 'Email';
-$wb['destination_txt'] = 'Destination Email';
-$wb['active_txt'] = 'Active';
-$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['destination_txt'] = 'Destinazione Email';
+$wb['active_txt'] = 'Attivo';
+$wb['limit_mailforward_txt'] = 'Raggiunto il numero massimo di forwarders per il tuo account.';
+$wb['duplicate_mailbox_txt'] = 'Esiste già una casella email per questo indirizzo';
+$wb['domain_txt'] = 'Dominio';
 $wb['source_txt'] = 'Source Email';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
 $wb['greylisting_txt'] = 'Enable greylisting';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_forward_list.lng b/interface/web/mail/lib/lang/it_mail_forward_list.lng
index f4529440c1..46215c510c 100644
--- a/interface/web/mail/lib/lang/it_mail_forward_list.lng
+++ b/interface/web/mail/lib/lang/it_mail_forward_list.lng
@@ -1,8 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Mail Forward';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Attivo';
 $wb['source_txt'] = 'source';
-$wb['destination_txt'] = 'Destination';
+$wb['destination_txt'] = 'Destinazione';
 $wb['email_txt'] = 'Email';
-$wb['add_new_record_txt'] = 'Add new Email forward';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo  Email forward';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_get.lng b/interface/web/mail/lib/lang/it_mail_get.lng
index 8ae7712151..70770c22d4 100644
--- a/interface/web/mail/lib/lang/it_mail_get.lng
+++ b/interface/web/mail/lib/lang/it_mail_get.lng
@@ -2,18 +2,18 @@
 $wb['server_id_txt'] = 'Server';
 $wb['type_txt'] = 'Type';
 $wb['source_server_txt'] = 'Pop3/Imap Server';
-$wb['source_username_txt'] = 'Username';
+$wb['source_username_txt'] = 'Nome Utente';
 $wb['source_password_txt'] = 'Password';
-$wb['source_delete_txt'] = 'Delete emails after retrieval';
-$wb['destination_txt'] = 'Destination';
-$wb['active_txt'] = 'Active';
-$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_txt'] = 'Elimina emails dopo averle scaricate';
+$wb['destination_txt'] = 'Destinazione';
+$wb['active_txt'] = 'Attivo';
+$wb['limit_fetchmail_txt'] = 'Numero massimo di indirizzi Fetchmail per il tuo account raggiunti.';
+$wb['source_server_error_isempty'] = 'Valore Server  vuoto.';
+$wb['source_username_error_isempty'] = 'Valore Nome Utente  vuoto.';
+$wb['source_password_error_isempty'] = 'Valore Password  vuoto.';
+$wb['destination_error_isemail'] = 'Nessuna destinazione selezionata.';
+$wb['source_server_error_regex'] = 'Pop3/Imap Server non è un nome dominio valido.';
+$wb['source_read_all_txt'] = 'Recupera tutte le email (incluso mail lette)';
+$wb['error_delete_read_all_combination'] = 'Combinazione di opzioni non conforme. Non puoi utilizzare \\"Elimina mail dopo averle scaricate \\" = NO assieme a  \\"Recupera tutte le email\\" = SI';
 $wb['source_delete_note_txt'] = 'Please check first if email retrieval works, before you activate this option.';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_get_list.lng b/interface/web/mail/lib/lang/it_mail_get_list.lng
index 4baf67e025..839a076d67 100644
--- a/interface/web/mail/lib/lang/it_mail_get_list.lng
+++ b/interface/web/mail/lib/lang/it_mail_get_list.lng
@@ -1,9 +1,9 @@
 <?php
 $wb['list_head_txt'] = 'Fetch emails from external POP3 / IMAP servers';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Attivo';
 $wb['server_id_txt'] = 'Server';
 $wb['source_server_txt'] = 'External Server';
-$wb['source_username_txt'] = 'Username';
-$wb['destination_txt'] = 'Destination';
-$wb['add_new_record_txt'] = 'Add new Account';
+$wb['source_username_txt'] = 'Nome Utente';
+$wb['destination_txt'] = 'Destinazione';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo  Account';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_mailinglist.lng b/interface/web/mail/lib/lang/it_mail_mailinglist.lng
index b4570ef863..c04b999381 100644
--- a/interface/web/mail/lib/lang/it_mail_mailinglist.lng
+++ b/interface/web/mail/lib/lang/it_mail_mailinglist.lng
@@ -1,21 +1,21 @@
 <?php
 $wb['limit_mailmailinglist_txt'] = 'Limit reached';
-$wb['domain_error_empty'] = 'Domain is empty.';
-$wb['listname_error_empty'] = 'Listname is empty.';
+$wb['domain_error_empty'] = 'Domain  vuoto.';
+$wb['listname_error_empty'] = 'Listname  vuoto.';
 $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['no_domain_perm'] = 'Non hai i diritti per  this domain.';
+$wb['password_strength_txt'] = 'Livello sicurezza Password';
 $wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
+$wb['domain_txt'] = 'Dominio';
 $wb['listname_txt'] = 'Listname';
-$wb['client_txt'] = 'Client';
+$wb['client_txt'] = 'Cliente';
 $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['generate_password_txt'] = 'Genera Password';
+$wb['repeat_password_txt'] = 'Ripeti Password';
+$wb['password_mismatch_txt'] = 'Le password non coincidono.';
+$wb['password_match_txt'] = 'Le password coincidono.';
 $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';
diff --git a/interface/web/mail/lib/lang/it_mail_mailinglist_list.lng b/interface/web/mail/lib/lang/it_mail_mailinglist_list.lng
index dac225ad99..5b739908d5 100644
--- a/interface/web/mail/lib/lang/it_mail_mailinglist_list.lng
+++ b/interface/web/mail/lib/lang/it_mail_mailinglist_list.lng
@@ -1,5 +1,5 @@
 <?php
 $wb['list_head_txt'] = 'Mailing List';
-$wb['domain_txt'] = 'Domain';
+$wb['domain_txt'] = 'Dominio';
 $wb['listname_txt'] = 'Listname';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_relay_recipient.lng b/interface/web/mail/lib/lang/it_mail_relay_recipient.lng
index b5c8724da3..3bac79de1e 100644
--- a/interface/web/mail/lib/lang/it_mail_relay_recipient.lng
+++ b/interface/web/mail/lib/lang/it_mail_relay_recipient.lng
@@ -1,9 +1,9 @@
 <?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['recipient_txt'] = 'Destinatario';
+$wb['active_txt'] = 'Attivo';
+$wb['source_error_notempty'] = 'Indirizzo vuoto.';
 $wb['type_txt'] = 'Type';
-$wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.';
+$wb['limit_mailfilter_txt'] = 'Raggiunto numero massimo filtri emai per il tuo account.';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_relay_recipient_list.lng b/interface/web/mail/lib/lang/it_mail_relay_recipient_list.lng
index 36045f4e35..17a1fa008d 100644
--- a/interface/web/mail/lib/lang/it_mail_relay_recipient_list.lng
+++ b/interface/web/mail/lib/lang/it_mail_relay_recipient_list.lng
@@ -1,9 +1,9 @@
 <?php
 $wb['list_head_txt'] = 'Relay recipients';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Attivo';
 $wb['server_id_txt'] = 'Server';
 $wb['source_txt'] = 'Recipient address';
 $wb['recipient_txt'] = 'Recipient';
-$wb['add_new_record_txt'] = 'Add new relay recipient';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo  relay recipient';
 $wb['access_txt'] = 'access';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_spamfilter.lng b/interface/web/mail/lib/lang/it_mail_spamfilter.lng
index e0a2a2f9af..b229797832 100644
--- a/interface/web/mail/lib/lang/it_mail_spamfilter.lng
+++ b/interface/web/mail/lib/lang/it_mail_spamfilter.lng
@@ -1,17 +1,17 @@
 <?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['spam_rewrite_score_int_txt'] = 'Riscrivi punteggio';
+$wb['spam_redirect_score_int_txt'] = 'Reindirizza punteggio';
+$wb['spam_delete_score_int_txt'] = 'Elimina punteggio';
+$wb['spam_rewrite_subject_txt'] = 'RIscrivi oggetto';
+$wb['spam_redirect_maildir_txt'] = 'Reinderizza casella di posta';
+$wb['active_txt'] = 'Attivo';
+$wb['spam_rewrite_txt'] = 'Riscrivi oggetto email sopra questo punteggio';
+$wb['spam_redirect_txt'] = 'Reinderizza email sopra questo punteggioto alla seguente casella di posta.';
+$wb['spam_delete_txt'] = 'Elimina con punteggio superiore a questo';
+$wb['disable_txt'] = 'Suggerimento: Per disabilitare l opzione filtro, impostare a 0.00 il punteggio.';
+$wb['email_error_isemail'] = 'Indirizzo Email non valido.';
+$wb['email_error_unique'] = 'Esiste gia un record nel filtro spam per questo indirizzo email.';
+$wb['spam_redirect_maildir_purge_txt'] = 'Svuota Maildir dopo';
+$wb['days_txt'] = 'giorni.';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_spamfilter_list.lng b/interface/web/mail/lib/lang/it_mail_spamfilter_list.lng
index 728f3d365d..b7daa3eaad 100644
--- a/interface/web/mail/lib/lang/it_mail_spamfilter_list.lng
+++ b/interface/web/mail/lib/lang/it_mail_spamfilter_list.lng
@@ -1,8 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'Spamfilter';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Attivo';
 $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['add_new_record_txt'] = 'Aggiungi un nuovo  Spamfilter record';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_transport.lng b/interface/web/mail/lib/lang/it_mail_transport.lng
index c249863469..9273621ff1 100644
--- a/interface/web/mail/lib/lang/it_mail_transport.lng
+++ b/interface/web/mail/lib/lang/it_mail_transport.lng
@@ -1,11 +1,11 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
-$wb['destination_txt'] = 'Destination';
+$wb['domain_txt'] = 'Dominio';
+$wb['destination_txt'] = 'Destinazione';
 $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['sort_order_txt'] = 'Ordina per';
+$wb['active_txt'] = 'Attivo';
+$wb['limit_mailrouting_txt'] = 'The max. number of routes raggiunto per il tuo account.';
 $wb['transport_txt'] = 'Transport';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_transport_list.lng b/interface/web/mail/lib/lang/it_mail_transport_list.lng
index a96c081e63..c89bb9ff77 100644
--- a/interface/web/mail/lib/lang/it_mail_transport_list.lng
+++ b/interface/web/mail/lib/lang/it_mail_transport_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Advanced Email Routing';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Email Routing Avanzato';
+$wb['active_txt'] = 'Attivo';
 $wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
+$wb['domain_txt'] = 'Dominio';
 $wb['transport_txt'] = 'Transport';
-$wb['sort_order_txt'] = 'Sort by';
-$wb['add_new_record_txt'] = 'Add new transport';
+$wb['sort_order_txt'] = 'Ordina per';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo  transport';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_user.lng b/interface/web/mail/lib/lang/it_mail_user.lng
index 3ca8b77c12..76f3018123 100644
--- a/interface/web/mail/lib/lang/it_mail_user.lng
+++ b/interface/web/mail/lib/lang/it_mail_user.lng
@@ -2,59 +2,63 @@
 $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['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['password_strength_txt'] = 'Password livello sicurezza';
+$wb['active_txt'] = 'Attivo';
+$wb['email_error_isemail'] = 'Indirizzo Email non valido.';
+$wb['email_error_unique'] = 'Indirizzo Email duplicato.';
+$wb['autoresponder_text_txt'] = 'Testo';
+$wb['autoresponder_txt'] = 'Autorisponditore';
+$wb['no_domain_perm'] = 'Non hai i diritti per  questo dominio.';
+$wb['error_no_pwd'] = 'Valore Password  vuoto.';
+$wb['quota_error_isint'] = 'Il valore per la dimensione della casella di posta deve essere un numero.';
 $wb['quota_txt'] = 'quota in MB';
 $wb['server_id_txt'] = 'server_id';
 $wb['password_txt'] = 'password';
 $wb['maildir_txt'] = 'maildir';
-$wb['postfix_txt'] = 'Enable Receiving';
-$wb['greylisting_txt'] = 'Enable greylisting';
-$wb['access_txt'] = 'Enable Access';
+$wb['postfix_txt'] = 'Abilita ricezione';
+$wb['access_txt'] = 'Abilita indirizzo';
 $wb['policy_txt'] = 'Spamfilter';
-$wb['no_policy'] = '- not enabled -';
-$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['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_end_date_isgreater'] = 'End date must be set and be later than start date.';
-$wb['move_junk_txt'] = 'Move Spam Emails to Junk directory';
-$wb['name_txt'] = 'Realname';
-$wb['name_optional_txt'] = '(Optional)';
-$wb['autoresponder_active'] = 'Enable the autoresponder';
-$wb['cc_txt'] = 'Send copy to';
-$wb['cc_error_isemail'] = 'The Send copy to field does not conatin a valid email address';
-$wb['domain_txt'] = 'Domain';
-$wb['now_txt'] = 'Now';
-$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)';
-$wb['error_login_email_txt'] = 'This login is not allowed. Please enter a different login or use the mail address as login.';
-$wb['autoresponder_subject_txt'] = 'Email Subject';
+$wb['no_policy'] = '- non abilitato -';
+$wb['limit_mailbox_txt'] = 'Hai raggiungo il numero massimo di caselle per il tuo account.';
+$wb['limit_mailquota_txt'] = 'Hai raggiunto lo spazio massimo per le tue caselle di posta. Lo spazio massimo in MB è di';
+$wb['disableimap_txt'] = 'Disabilita IMAP';
+$wb['disablepop3_txt'] = 'Disabilita POP3';
+$wb['duplicate_alias_or_forward_txt'] = 'Esiste già un alias o un forward con questo indirizzo email.';
+$wb['quota_error_value'] = 'Valore quota non valido. I valori ammessi sono: 0 per nessun limite o numeri > 1';
+$wb['autoresponder_start_date_txt'] = 'Avvia il';
+$wb['autoresponder_start_date_ispast'] = 'La data di avvio no può essere antergata.';
+$wb['autoresponder_end_date_txt'] = 'Termina il';
+$wb['autoresponder_end_date_isgreater'] = 'La data termine deve essere impostata e successiva al giorno di inizio.';
+$wb['move_junk_txt'] = 'Sposta Email di Spam nella cartella di spam Junk';
+$wb['name_txt'] = 'Nome vero';
+$wb['name_optional_txt'] = '(Opzionale)';
+$wb['autoresponder_active'] = 'Abilita autorisponditore';
+$wb['cc_txt'] = 'Trasmetti copia a';
+$wb['cc_error_isemail'] = 'Il campo trasmetti copia a non contiene un indirizzo email valido';
+$wb['domain_txt'] = 'Dominio';
+$wb['now_txt'] = 'Ora';
+$wb['login_error_unique'] = 'Questo Login è già occupato.';
+$wb['login_error_regex'] = 'Caratteri ammessi sono A-Z, a-z, 0-9, ., _ e -.';
+$wb['login_txt'] = 'Login (opzionale)';
+$wb['error_login_email_txt'] = 'Questo login non è ammesso. Inserire un  login diverso o utilizzare un indirizzo email come login.';
+$wb['autoresponder_subject_txt'] = 'Oggetto Email';
 $wb['autoresponder_subject'] = 'Out of office reply';
-$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["backup_interval_txt"] = 'Backup interval';
-$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['generate_password_txt'] = 'Genera Password';
+$wb['repeat_password_txt'] = 'Ripeti Password';
+$wb['password_mismatch_txt'] = 'Le passwords non coincidono.';
+$wb['password_match_txt'] = 'Le passwords coincidono.';
+$wb['email_error_isascii'] = 'Non utilizzare caratteri speciali unicode per la password. Potresti avere problemi con il tuo client di psota.';
+$wb['cc_note_txt'] = '(Separa indirizzi email multipli con la virgola)';
+$wb['disablesmtp_txt'] = 'Disabilita SMTP (trasmissione)';
+$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
+$wb['greylisting_txt'] = 'Enable greylisting';
+$wb['sender_cc_txt'] = 'Send outgoing copy to';
+$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['no_backup_txt'] = 'No backup';
 $wb['daily_backup_txt'] = 'Daily';
 $wb['weekly_backup_txt'] = 'Weekly';
 $wb['monthly_backup_txt'] = 'Monthly';
-$wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
-$wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
-$wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
+$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_user_filter.lng b/interface/web/mail/lib/lang/it_mail_user_filter.lng
index 2e74ffd4f7..5319d91c4b 100644
--- a/interface/web/mail/lib/lang/it_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/it_mail_user_filter.lng
@@ -1,20 +1,28 @@
 <?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['rulename_txt'] = 'Nome';
+$wb['action_txt'] = 'Azione';
+$wb['target_txt'] = 'Cartella';
+$wb['active_txt'] = 'Attivo';
+$wb['rulename_error_empty'] = 'Nome  vuoto.';
+$wb['searchterm_is_empty'] = 'Termine ricerca vuoto.';
+$wb['source_txt'] = 'Origine';
 $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['subject_txt'] = 'Oggetto';
+$wb['from_txt'] = 'Da';
+$wb['to_txt'] = 'A';
+$wb['contains_txt'] = 'Contiene';
+$wb['is_txt'] = 'è';
+$wb['begins_with_txt'] = 'Inizia con';
+$wb['ends_with_txt'] = 'Termina con';
+$wb['delete_txt'] = 'Elimina';
+$wb['move_stop_txt'] = 'Move to';
+$wb['header_txt'] = 'Header';
+$wb['size_over_txt'] = 'Email size over (KB)';
+$wb['size_under_txt'] = 'Email size under (KB)';
+$wb['localpart_txt'] = 'Localpart';
+$wb['domain_txt'] = 'Domain';
+$wb['keep_txt'] = 'Keep';
+$wb['reject_txt'] = 'Reject';
+$wb['stop_txt'] = 'Stop';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_user_list.lng b/interface/web/mail/lib/lang/it_mail_user_list.lng
index 5d5bb3b1a9..098cb1a162 100644
--- a/interface/web/mail/lib/lang/it_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/it_mail_user_list.lng
@@ -4,5 +4,9 @@ $wb['email_txt'] = 'Email';
 $wb['autoresponder_txt'] = 'Autorisponditore';
 $wb['add_new_record_txt'] = 'Nuova casella email';
 $wb['name_txt'] = 'Nome reale';
-$wb['login_txt'] = 'Login';
+$wb['login_txt'] = 'Accedi';
+$wb['postfix_txt'] = 'Receiving';
+$wb['disablesmtp_txt'] = 'SMTP (sending)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_whitelist.lng b/interface/web/mail/lib/lang/it_mail_whitelist.lng
index 92c365ba2b..c63f5759f4 100644
--- a/interface/web/mail/lib/lang/it_mail_whitelist.lng
+++ b/interface/web/mail/lib/lang/it_mail_whitelist.lng
@@ -2,8 +2,8 @@
 $wb['server_id_txt'] = 'Server';
 $wb['source_txt'] = 'Witelist Address';
 $wb['recipient_txt'] = 'Recipient';
-$wb['active_txt'] = 'Active';
-$wb['source_error_notempty'] = 'Address is empty.';
+$wb['active_txt'] = 'Attivo';
+$wb['source_error_notempty'] = 'Address  vuoto.';
 $wb['type_txt'] = 'Type';
-$wb['limit_mailfilter_txt'] = 'The max. number of email filters for your account is reached.';
+$wb['limit_mailfilter_txt'] = 'The max. number of email filters raggiunto per il tuo account.';
 ?>
diff --git a/interface/web/mail/lib/lang/it_mail_whitelist_list.lng b/interface/web/mail/lib/lang/it_mail_whitelist_list.lng
index eaa7eb3fc5..1a5bbb6bb9 100644
--- a/interface/web/mail/lib/lang/it_mail_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/it_mail_whitelist_list.lng
@@ -1,10 +1,10 @@
 <?php
 $wb['list_head_txt'] = 'Email Whitelist';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Attivo';
 $wb['server_id_txt'] = 'Server';
 $wb['source_txt'] = 'Whitelisted address';
 $wb['type_txt'] = 'Type';
 $wb['recipient_txt'] = 'Recipient';
-$wb['add_new_record_txt'] = 'Add new Whitelist record';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo  Whitelist record';
 $wb['access_txt'] = 'access';
 ?>
diff --git a/interface/web/mail/lib/lang/it_spamfilter_blacklist.lng b/interface/web/mail/lib/lang/it_spamfilter_blacklist.lng
index 908b95f2b0..862999b00a 100644
--- a/interface/web/mail/lib/lang/it_spamfilter_blacklist.lng
+++ b/interface/web/mail/lib/lang/it_spamfilter_blacklist.lng
@@ -1,12 +1,12 @@
 <?php
 $wb['server_id_txt'] = 'Server';
 $wb['wb_txt'] = 'wb';
-$wb['rid_txt'] = 'User';
+$wb['rid_txt'] = 'Utente';
 $wb['email_txt'] = 'Email';
-$wb['priority_txt'] = 'Priority';
-$wb['active_txt'] = 'Active';
-$wb['limit_spamfilter_wblist_txt'] = 'The max. number of White- or Blacklist records for your account is reached.';
-$wb['10 - highest'] = '10 - highest';
-$wb['5 - medium'] = '5 - medium';
-$wb['1 - lowest'] = '1 - lowest';
+$wb['priority_txt'] = 'Priorita';
+$wb['active_txt'] = 'Attivo';
+$wb['limit_spamfilter_wblist_txt'] = 'E stato raggiunto il numero massimo di record per White- o Blacklist del tuo account.';
+$wb['10 - highest'] = '10 - elevato';
+$wb['5 - medium'] = '5 - medio';
+$wb['1 - lowest'] = '1 - minimo';
 ?>
diff --git a/interface/web/mail/lib/lang/it_spamfilter_blacklist_list.lng b/interface/web/mail/lib/lang/it_spamfilter_blacklist_list.lng
index 1b17e64425..2b7e2b9d56 100644
--- a/interface/web/mail/lib/lang/it_spamfilter_blacklist_list.lng
+++ b/interface/web/mail/lib/lang/it_spamfilter_blacklist_list.lng
@@ -1,9 +1,9 @@
 <?php
 $wb['list_head_txt'] = 'Spamfilter Blacklist';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Attivo';
 $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'] = 'Priorita';
+$wb['rid_txt'] = 'Utente';
+$wb['email_txt'] = 'Email in Whitelist';
+$wb['add_new_record_txt'] = 'Aggiungi record in Blacklist';
 ?>
diff --git a/interface/web/mail/lib/lang/it_spamfilter_config.lng b/interface/web/mail/lib/lang/it_spamfilter_config.lng
index 2843133ca3..05b1a3dacf 100644
--- a/interface/web/mail/lib/lang/it_spamfilter_config.lng
+++ b/interface/web/mail/lib/lang/it_spamfilter_config.lng
@@ -1,6 +1,6 @@
 <?php
 $wb['getmail_config_dir_txt'] = 'Getmail Config Path';
-$wb['ip_address_txt'] = 'IP Address';
+$wb['ip_address_txt'] = 'Indirizzo IP';
 $wb['netmask_txt'] = 'Netmask';
 $wb['gateway_txt'] = 'Gateway';
 $wb['hostname_txt'] = 'Hostname';
diff --git a/interface/web/mail/lib/lang/it_spamfilter_policy_list.lng b/interface/web/mail/lib/lang/it_spamfilter_policy_list.lng
index 04491ae4cd..7010d61471 100644
--- a/interface/web/mail/lib/lang/it_spamfilter_policy_list.lng
+++ b/interface/web/mail/lib/lang/it_spamfilter_policy_list.lng
@@ -1,6 +1,6 @@
 <?php
 $wb['list_head_txt'] = 'Spamfilter Policy';
-$wb['policy_name_txt'] = 'Name';
+$wb['policy_name_txt'] = 'Nome';
 $wb['virus_lover_txt'] = 'Virus lover';
 $wb['spam_lover_txt'] = 'Spam lover';
 $wb['banned_files_lover_txt'] = 'Banned Files lover';
diff --git a/interface/web/mail/lib/lang/it_spamfilter_users.lng b/interface/web/mail/lib/lang/it_spamfilter_users.lng
index efe95b5c7f..cebb20324e 100644
--- a/interface/web/mail/lib/lang/it_spamfilter_users.lng
+++ b/interface/web/mail/lib/lang/it_spamfilter_users.lng
@@ -1,13 +1,13 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['priority_txt'] = 'Priority';
+$wb['priority_txt'] = 'Priorita';
 $wb['policy_id_txt'] = 'Policy';
 $wb['email_txt'] = 'Email (Pattern)';
-$wb['fullname_txt'] = 'Name';
+$wb['fullname_txt'] = 'Nome';
 $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['5 - medium'] = '5 - medium';
-$wb['1 - lowest'] = '1 - lowest';
+$wb['email_error_notempty'] = 'The email address must not be vuoto.';
+$wb['fullname_error_notempty'] = 'The name must not be vuoto.';
+$wb['10 - highest'] = '10 - elevata';
+$wb['5 - medium'] = '5 - media';
+$wb['1 - lowest'] = '1 - minima';
 ?>
diff --git a/interface/web/mail/lib/lang/it_spamfilter_users_list.lng b/interface/web/mail/lib/lang/it_spamfilter_users_list.lng
index ed3d7a399d..3a70797550 100644
--- a/interface/web/mail/lib/lang/it_spamfilter_users_list.lng
+++ b/interface/web/mail/lib/lang/it_spamfilter_users_list.lng
@@ -2,9 +2,9 @@
 $wb['list_head_txt'] = 'Spamfilter Users';
 $wb['local_txt'] = 'Local';
 $wb['server_id_txt'] = 'Server';
-$wb['priority_txt'] = 'Priority';
+$wb['priority_txt'] = 'Priorita';
 $wb['policy_id_txt'] = 'Policy';
-$wb['fullname_txt'] = 'Name';
+$wb['fullname_txt'] = 'Nome';
 $wb['email_txt'] = 'Email';
 $wb['add_new_record_txt'] = 'Add Spamfilter User';
 ?>
diff --git a/interface/web/mail/lib/lang/it_spamfilter_whitelist.lng b/interface/web/mail/lib/lang/it_spamfilter_whitelist.lng
index 6d18150b19..a484eaf4f8 100644
--- a/interface/web/mail/lib/lang/it_spamfilter_whitelist.lng
+++ b/interface/web/mail/lib/lang/it_spamfilter_whitelist.lng
@@ -6,7 +6,7 @@ $wb['email_txt'] = 'Email';
 $wb['priority_txt'] = 'Priorità';
 $wb['active_txt'] = 'Attivo';
 $wb['limit_spamfilter_wblist_txt'] = 'Raggiunto numero massimo di record white/blacklist per questo account.';
-$wb['10 - highest'] = '10 - highest';
-$wb['5 - medium'] = '5 - medium';
-$wb['1 - lowest'] = '1 - lowest';
+$wb['10 - highest'] = '10 - elevata';
+$wb['5 - medium'] = '5 - media';
+$wb['1 - lowest'] = '1 - minima';
 ?>
diff --git a/interface/web/mail/lib/lang/it_spamfilter_whitelist_list.lng b/interface/web/mail/lib/lang/it_spamfilter_whitelist_list.lng
index d209d17a4c..1b75490065 100644
--- a/interface/web/mail/lib/lang/it_spamfilter_whitelist_list.lng
+++ b/interface/web/mail/lib/lang/it_spamfilter_whitelist_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Spamfilter Whitelist';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Whitelist Filtro Spam ';
+$wb['active_txt'] = 'Activo';
 $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'] = 'Priorita';
+$wb['rid_txt'] = 'Utente';
+$wb['email_txt'] = 'Email in Whitelist';
+$wb['add_new_record_txt'] = 'Adggiungi record Whitelist';
 ?>
diff --git a/interface/web/mail/lib/lang/it_user_quota_stats_list.lng b/interface/web/mail/lib/lang/it_user_quota_stats_list.lng
index 394e97c5c7..b21e37778f 100755
--- a/interface/web/mail/lib/lang/it_user_quota_stats_list.lng
+++ b/interface/web/mail/lib/lang/it_user_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Mailbox quota';
+$wb['list_head_txt'] = 'Quota Casella di Posta';
 $wb['quota_txt'] = 'Quota';
-$wb['name_txt'] = 'Name';
-$wb['email_txt'] = 'Email Address';
-$wb['used_txt'] = 'Used space';
-$wb['percentage_txt'] = 'Used %';
+$wb['name_txt'] = 'Nome';
+$wb['email_txt'] = 'Indirizzo Email ';
+$wb['used_txt'] = 'Spazio Utilizzato';
+$wb['percentage_txt'] = 'Percentuale usata %';
 ?>
diff --git a/interface/web/mail/lib/lang/it_xmpp_domain.lng b/interface/web/mail/lib/lang/it_xmpp_domain.lng
new file mode 100644
index 0000000000..f1da77ba29
--- /dev/null
+++ b/interface/web/mail/lib/lang/it_xmpp_domain.lng
@@ -0,0 +1,62 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["client_group_id_txt"] = 'Client';
+$wb["domain_txt"] = 'Domain';
+$wb["type_txt"] = 'Type';
+$wb["active_txt"] = 'Active';
+$wb["client_txt"] = 'Client';
+$wb["management_method_txt"] = 'Management of user accounts';
+$wb["public_registration_txt"] = 'Enable public registration';
+$wb["registration_url_txt"] = 'Registration URL';
+$wb["registration_message_txt"] = 'Registration Message';
+$wb["domain_admins_txt"] = 'Domain Admins (JIDs)';
+$wb["use_pubsub_txt"] = 'Enable Pubsub';
+$wb["use_proxy_txt"] = 'Enable Bytestream Proxy';
+$wb["use_anon_host_txt"] = 'Enable Anonymous Host';
+$wb["use_vjud_txt"] = 'Enable VJUD User Directory';
+$wb["vjud_opt_mode_txt"] = 'VJUD Opt Mode';
+$wb["use_muc_host_txt"] = 'Enable Multi User Chatrooms';
+$wb["muc_name_txt"] = 'Name in MUC Service Discovery';
+$wb["muc_restrict_room_creation_txt"] = 'Permission to create chatrooms';
+$wb["muc_admins_txt"] = 'MUC Admins (JIDs)';
+$wb["use_pastebin_txt"] = 'Enable Pastebin';
+$wb["pastebin_expire_after_txt"] = 'Pastes expire after (hours)';
+$wb["pastebin_trigger_txt"] = 'Pastebin trigger';
+$wb["use_http_archive_txt"] = 'Enable HTTP chatroom archive';
+$wb["http_archive_show_join_txt"] = 'Show join messages in archive';
+$wb["http_archive_show_status_txt"] = 'Show status changes in archive';
+$wb["use_status_host_txt"] = 'Enable XML Status host';
+$wb["cant_change_domainname_txt"] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb["about_registration_url_txt"] = 'Link to your registration form.';
+$wb["about_registration_message_txt"] = 'Description about your account registration process.';
+$wb["no_corresponding_maildomain_txt"] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_email_txt'] = 'Email Address';
+$wb['ssl_txt'] = 'SSL';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['none_txt'] = 'None';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ssl_error_isemail'] = 'Please enter a valid email adress for generation of the SSL certificate';
+$wb["limit_xmppdomain_txt"] = 'The max. number of XMPP domains for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/it_xmpp_domain_admin_list.lng b/interface/web/mail/lib/lang/it_xmpp_domain_admin_list.lng
new file mode 100644
index 0000000000..a3d1736d7b
--- /dev/null
+++ b/interface/web/mail/lib/lang/it_xmpp_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$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';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/it_xmpp_domain_list.lng b/interface/web/mail/lib/lang/it_xmpp_domain_list.lng
new file mode 100644
index 0000000000..f8c2fb9b8e
--- /dev/null
+++ b/interface/web/mail/lib/lang/it_xmpp_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["add_new_record_txt"] = 'Add new Domain';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/it_xmpp_user.lng b/interface/web/mail/lib/lang/it_xmpp_user.lng
new file mode 100644
index 0000000000..1cc852e3cf
--- /dev/null
+++ b/interface/web/mail/lib/lang/it_xmpp_user.lng
@@ -0,0 +1,15 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["active_txt"] = 'Active';
+$wb["cryptpwd_txt"] = 'Password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["error_no_pwd"] = 'Password is empty.';
+$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["no_domain_perm"] = 'You have no permission for this domain.';
+$wb["limit_xmpp_user_txt"] = 'The max. number of xmpp accounts for your account is reached.';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/it_xmpp_user_list.lng b/interface/web/mail/lib/lang/it_xmpp_user_list.lng
new file mode 100644
index 0000000000..db88b0d7e3
--- /dev/null
+++ b/interface/web/mail/lib/lang/it_xmpp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["is_domain_admin_txt"] = 'Domain admin';
+$wb["is_muc_admin_txt"] = 'MUC admin';
+$wb["add_new_record_txt"] = 'Add new user';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/ja_backup_stats_list.lng b/interface/web/mail/lib/lang/ja_backup_stats_list.lng
index 9ae9658257..79cd6c9a63 100644
--- a/interface/web/mail/lib/lang/ja_backup_stats_list.lng
+++ b/interface/web/mail/lib/lang/ja_backup_stats_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Email';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Email';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/mail/lib/lang/ja_mail_alias.lng b/interface/web/mail/lib/lang/ja_mail_alias.lng
index a2adf95fc0..c03bb825da 100644
--- a/interface/web/mail/lib/lang/ja_mail_alias.lng
+++ b/interface/web/mail/lib/lang/ja_mail_alias.lng
@@ -12,4 +12,6 @@ $wb['domain_txt'] = 'Domain';
 $wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
 $wb['source_txt'] = 'Alias';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
 ?>
diff --git a/interface/web/mail/lib/lang/ja_mail_domain.lng b/interface/web/mail/lib/lang/ja_mail_domain.lng
index 57d2aa63bb..787937668c 100644
--- a/interface/web/mail/lib/lang/ja_mail_domain.lng
+++ b/interface/web/mail/lib/lang/ja_mail_domain.lng
@@ -9,12 +9,15 @@ $wb['domain_error_regex'] = '不正なドメイン名です。';
 $wb['client_txt'] = 'クライアント';
 $wb['limit_maildomain_txt'] = 'メールドメインが最大数に達したため、これ以上追加できません。';
 $wb['policy_txt'] = 'スパムフィルター';
-$wb["dkim_txt"] = 'enable DKIM';
-$wb["dkim_private_txt"] = 'DKIM Private-key';
-$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
-$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
-$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
-$wb["dkim_dns_txt"] = 'DNS-Record';
-$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
+$wb['dkim_txt'] = 'enable DKIM';
+$wb['dkim_private_txt'] = 'DKIM Private-key';
+$wb['dkim_public_txt'] = 'DKIM Public-key\nfor information only';
+$wb['dkim_generate_txt'] = 'Generate DKIM Private-key';
+$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
+$wb['dkim_dns_txt'] = 'DNS-Record';
+$wb['dkim_private_key_error'] = 'Invalid DKIM-Private key';
 $wb['no_policy'] = '使わない';
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
+$wb['dkim_selector_txt'] = 'DKIM-Selector';
+$wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
 ?>
diff --git a/interface/web/mail/lib/lang/ja_mail_forward.lng b/interface/web/mail/lib/lang/ja_mail_forward.lng
index 0575498307..eb742ce426 100644
--- a/interface/web/mail/lib/lang/ja_mail_forward.lng
+++ b/interface/web/mail/lib/lang/ja_mail_forward.lng
@@ -7,4 +7,7 @@ $wb['duplicate_mailbox_txt'] = 'このメールアドレス向けのメールボ
 $wb['domain_txt'] = 'Domain';
 $wb['source_txt'] = 'Source Email';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
 ?>
diff --git a/interface/web/mail/lib/lang/ja_mail_user.lng b/interface/web/mail/lib/lang/ja_mail_user.lng
index 48399ce0b5..7e044b9a94 100644
--- a/interface/web/mail/lib/lang/ja_mail_user.lng
+++ b/interface/web/mail/lib/lang/ja_mail_user.lng
@@ -48,8 +48,8 @@ $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["backup_interval_txt"] = 'Backup interval';
-$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['no_backup_txt'] = 'No backup';
 $wb['daily_backup_txt'] = 'Daily';
 $wb['weekly_backup_txt'] = 'Weekly';
@@ -57,4 +57,8 @@ $wb['monthly_backup_txt'] = 'Monthly';
 $wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
 $wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
+$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
+$wb['sender_cc_txt'] = 'Send outgoing copy to';
+$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
+$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
diff --git a/interface/web/mail/lib/lang/ja_mail_user_filter.lng b/interface/web/mail/lib/lang/ja_mail_user_filter.lng
index cabfad1365..71dfd93a87 100644
--- a/interface/web/mail/lib/lang/ja_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/ja_mail_user_filter.lng
@@ -15,6 +15,14 @@ $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['move_stop_txt'] = 'Move to';
+$wb['header_txt'] = 'Header';
+$wb['size_over_txt'] = 'Email size over (KB)';
+$wb['size_under_txt'] = 'Email size under (KB)';
+$wb['localpart_txt'] = 'Localpart';
+$wb['domain_txt'] = 'Domain';
+$wb['keep_txt'] = 'Keep';
+$wb['reject_txt'] = 'Reject';
+$wb['stop_txt'] = 'Stop';
 ?>
diff --git a/interface/web/mail/lib/lang/ja_mail_user_list.lng b/interface/web/mail/lib/lang/ja_mail_user_list.lng
index 3417eaacfd..0bb531f785 100644
--- a/interface/web/mail/lib/lang/ja_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/ja_mail_user_list.lng
@@ -5,4 +5,8 @@ $wb['autoresponder_txt'] = 'Autoresponder';
 $wb['add_new_record_txt'] = 'Add new Mailbox';
 $wb['name_txt'] = 'Realname';
 $wb['login_txt'] = 'Login';
+$wb['postfix_txt'] = 'Receiving';
+$wb['disablesmtp_txt'] = 'SMTP (sending)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
 ?>
diff --git a/interface/web/mail/lib/lang/ja_xmpp_domain.lng b/interface/web/mail/lib/lang/ja_xmpp_domain.lng
new file mode 100644
index 0000000000..f1da77ba29
--- /dev/null
+++ b/interface/web/mail/lib/lang/ja_xmpp_domain.lng
@@ -0,0 +1,62 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["client_group_id_txt"] = 'Client';
+$wb["domain_txt"] = 'Domain';
+$wb["type_txt"] = 'Type';
+$wb["active_txt"] = 'Active';
+$wb["client_txt"] = 'Client';
+$wb["management_method_txt"] = 'Management of user accounts';
+$wb["public_registration_txt"] = 'Enable public registration';
+$wb["registration_url_txt"] = 'Registration URL';
+$wb["registration_message_txt"] = 'Registration Message';
+$wb["domain_admins_txt"] = 'Domain Admins (JIDs)';
+$wb["use_pubsub_txt"] = 'Enable Pubsub';
+$wb["use_proxy_txt"] = 'Enable Bytestream Proxy';
+$wb["use_anon_host_txt"] = 'Enable Anonymous Host';
+$wb["use_vjud_txt"] = 'Enable VJUD User Directory';
+$wb["vjud_opt_mode_txt"] = 'VJUD Opt Mode';
+$wb["use_muc_host_txt"] = 'Enable Multi User Chatrooms';
+$wb["muc_name_txt"] = 'Name in MUC Service Discovery';
+$wb["muc_restrict_room_creation_txt"] = 'Permission to create chatrooms';
+$wb["muc_admins_txt"] = 'MUC Admins (JIDs)';
+$wb["use_pastebin_txt"] = 'Enable Pastebin';
+$wb["pastebin_expire_after_txt"] = 'Pastes expire after (hours)';
+$wb["pastebin_trigger_txt"] = 'Pastebin trigger';
+$wb["use_http_archive_txt"] = 'Enable HTTP chatroom archive';
+$wb["http_archive_show_join_txt"] = 'Show join messages in archive';
+$wb["http_archive_show_status_txt"] = 'Show status changes in archive';
+$wb["use_status_host_txt"] = 'Enable XML Status host';
+$wb["cant_change_domainname_txt"] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb["about_registration_url_txt"] = 'Link to your registration form.';
+$wb["about_registration_message_txt"] = 'Description about your account registration process.';
+$wb["no_corresponding_maildomain_txt"] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_email_txt'] = 'Email Address';
+$wb['ssl_txt'] = 'SSL';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['none_txt'] = 'None';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ssl_error_isemail'] = 'Please enter a valid email adress for generation of the SSL certificate';
+$wb["limit_xmppdomain_txt"] = 'The max. number of XMPP domains for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/ja_xmpp_domain_admin_list.lng b/interface/web/mail/lib/lang/ja_xmpp_domain_admin_list.lng
new file mode 100644
index 0000000000..a3d1736d7b
--- /dev/null
+++ b/interface/web/mail/lib/lang/ja_xmpp_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$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';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/ja_xmpp_domain_list.lng b/interface/web/mail/lib/lang/ja_xmpp_domain_list.lng
new file mode 100644
index 0000000000..f8c2fb9b8e
--- /dev/null
+++ b/interface/web/mail/lib/lang/ja_xmpp_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["add_new_record_txt"] = 'Add new Domain';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/ja_xmpp_user.lng b/interface/web/mail/lib/lang/ja_xmpp_user.lng
new file mode 100644
index 0000000000..1cc852e3cf
--- /dev/null
+++ b/interface/web/mail/lib/lang/ja_xmpp_user.lng
@@ -0,0 +1,15 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["active_txt"] = 'Active';
+$wb["cryptpwd_txt"] = 'Password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["error_no_pwd"] = 'Password is empty.';
+$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["no_domain_perm"] = 'You have no permission for this domain.';
+$wb["limit_xmpp_user_txt"] = 'The max. number of xmpp accounts for your account is reached.';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/ja_xmpp_user_list.lng b/interface/web/mail/lib/lang/ja_xmpp_user_list.lng
new file mode 100644
index 0000000000..db88b0d7e3
--- /dev/null
+++ b/interface/web/mail/lib/lang/ja_xmpp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["is_domain_admin_txt"] = 'Domain admin';
+$wb["is_muc_admin_txt"] = 'MUC admin';
+$wb["add_new_record_txt"] = 'Add new user';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/nl_backup_stats_list.lng b/interface/web/mail/lib/lang/nl_backup_stats_list.lng
index 9ae9658257..79cd6c9a63 100644
--- a/interface/web/mail/lib/lang/nl_backup_stats_list.lng
+++ b/interface/web/mail/lib/lang/nl_backup_stats_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Email';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Email';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/mail/lib/lang/nl_mail_alias.lng b/interface/web/mail/lib/lang/nl_mail_alias.lng
index fd1d2de24c..d327afa90c 100644
--- a/interface/web/mail/lib/lang/nl_mail_alias.lng
+++ b/interface/web/mail/lib/lang/nl_mail_alias.lng
@@ -12,4 +12,6 @@ $wb['domain_txt'] = 'Domain';
 $wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
 $wb['source_txt'] = 'Alias';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
 ?>
diff --git a/interface/web/mail/lib/lang/nl_mail_domain.lng b/interface/web/mail/lib/lang/nl_mail_domain.lng
index 4833475b9a..c4fe53c718 100644
--- a/interface/web/mail/lib/lang/nl_mail_domain.lng
+++ b/interface/web/mail/lib/lang/nl_mail_domain.lng
@@ -10,13 +10,14 @@ $wb['client_txt'] = 'Klant';
 $wb['limit_maildomain_txt'] = 'Het max. aantal e-mail domainen voor uw account is bereikt.';
 $wb['policy_txt'] = 'Spamfilter';
 $wb['no_policy'] = '- niet ingeschakeld -';
-$wb["dkim_txt"] = 'enable DKIM';
-$wb["dkim_private_txt"] = 'DKIM Private-key';
-$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
-$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
-$wb["dkim_dns_txt"] = 'DNS-Record';
-$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
+$wb['dkim_txt'] = 'enable DKIM';
+$wb['dkim_private_txt'] = 'DKIM Private-key';
+$wb['dkim_public_txt'] = 'DKIM Public-key\nfor information only';
+$wb['dkim_generate_txt'] = 'Generate DKIM Private-key';
+$wb['dkim_dns_txt'] = 'DNS-Record';
+$wb['dkim_private_key_error'] = 'Invalid DKIM-Private key';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
-$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
+$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 ?>
diff --git a/interface/web/mail/lib/lang/nl_mail_forward.lng b/interface/web/mail/lib/lang/nl_mail_forward.lng
index 8b34daa3ed..4fa4422178 100644
--- a/interface/web/mail/lib/lang/nl_mail_forward.lng
+++ b/interface/web/mail/lib/lang/nl_mail_forward.lng
@@ -7,4 +7,7 @@ $wb['duplicate_mailbox_txt'] = 'Er is al een mailbox met dit e-mailadres';
 $wb['domain_txt'] = 'Domain';
 $wb['source_txt'] = 'Source Email';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
 ?>
diff --git a/interface/web/mail/lib/lang/nl_mail_user.lng b/interface/web/mail/lib/lang/nl_mail_user.lng
index 4a814b0b7f..4c0eed548a 100644
--- a/interface/web/mail/lib/lang/nl_mail_user.lng
+++ b/interface/web/mail/lib/lang/nl_mail_user.lng
@@ -48,8 +48,8 @@ $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["backup_interval_txt"] = 'Backup interval';
-$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['no_backup_txt'] = 'No backup';
 $wb['daily_backup_txt'] = 'Daily';
 $wb['weekly_backup_txt'] = 'Weekly';
@@ -57,4 +57,8 @@ $wb['monthly_backup_txt'] = 'Monthly';
 $wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
 $wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
+$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
+$wb['sender_cc_txt'] = 'Send outgoing copy to';
+$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
+$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
diff --git a/interface/web/mail/lib/lang/nl_mail_user_filter.lng b/interface/web/mail/lib/lang/nl_mail_user_filter.lng
index ec5be03873..cc57bb7af7 100644
--- a/interface/web/mail/lib/lang/nl_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/nl_mail_user_filter.lng
@@ -15,6 +15,14 @@ $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['move_stop_txt'] = 'Move to';
+$wb['header_txt'] = 'Header';
+$wb['size_over_txt'] = 'Email size over (KB)';
+$wb['size_under_txt'] = 'Email size under (KB)';
+$wb['localpart_txt'] = 'Localpart';
+$wb['domain_txt'] = 'Domain';
+$wb['keep_txt'] = 'Keep';
+$wb['reject_txt'] = 'Reject';
+$wb['stop_txt'] = 'Stop';
 ?>
diff --git a/interface/web/mail/lib/lang/nl_mail_user_list.lng b/interface/web/mail/lib/lang/nl_mail_user_list.lng
index c758d82930..e421af0ecc 100644
--- a/interface/web/mail/lib/lang/nl_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/nl_mail_user_list.lng
@@ -5,4 +5,8 @@ $wb['autoresponder_txt'] = 'Autoresponder';
 $wb['add_new_record_txt'] = 'Toevoegen mailbox';
 $wb['name_txt'] = 'Echte naam';
 $wb['login_txt'] = 'Login';
+$wb['postfix_txt'] = 'Receiving';
+$wb['disablesmtp_txt'] = 'SMTP (sending)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
 ?>
diff --git a/interface/web/mail/lib/lang/nl_xmpp_domain.lng b/interface/web/mail/lib/lang/nl_xmpp_domain.lng
new file mode 100644
index 0000000000..f1da77ba29
--- /dev/null
+++ b/interface/web/mail/lib/lang/nl_xmpp_domain.lng
@@ -0,0 +1,62 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["client_group_id_txt"] = 'Client';
+$wb["domain_txt"] = 'Domain';
+$wb["type_txt"] = 'Type';
+$wb["active_txt"] = 'Active';
+$wb["client_txt"] = 'Client';
+$wb["management_method_txt"] = 'Management of user accounts';
+$wb["public_registration_txt"] = 'Enable public registration';
+$wb["registration_url_txt"] = 'Registration URL';
+$wb["registration_message_txt"] = 'Registration Message';
+$wb["domain_admins_txt"] = 'Domain Admins (JIDs)';
+$wb["use_pubsub_txt"] = 'Enable Pubsub';
+$wb["use_proxy_txt"] = 'Enable Bytestream Proxy';
+$wb["use_anon_host_txt"] = 'Enable Anonymous Host';
+$wb["use_vjud_txt"] = 'Enable VJUD User Directory';
+$wb["vjud_opt_mode_txt"] = 'VJUD Opt Mode';
+$wb["use_muc_host_txt"] = 'Enable Multi User Chatrooms';
+$wb["muc_name_txt"] = 'Name in MUC Service Discovery';
+$wb["muc_restrict_room_creation_txt"] = 'Permission to create chatrooms';
+$wb["muc_admins_txt"] = 'MUC Admins (JIDs)';
+$wb["use_pastebin_txt"] = 'Enable Pastebin';
+$wb["pastebin_expire_after_txt"] = 'Pastes expire after (hours)';
+$wb["pastebin_trigger_txt"] = 'Pastebin trigger';
+$wb["use_http_archive_txt"] = 'Enable HTTP chatroom archive';
+$wb["http_archive_show_join_txt"] = 'Show join messages in archive';
+$wb["http_archive_show_status_txt"] = 'Show status changes in archive';
+$wb["use_status_host_txt"] = 'Enable XML Status host';
+$wb["cant_change_domainname_txt"] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb["about_registration_url_txt"] = 'Link to your registration form.';
+$wb["about_registration_message_txt"] = 'Description about your account registration process.';
+$wb["no_corresponding_maildomain_txt"] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_email_txt'] = 'Email Address';
+$wb['ssl_txt'] = 'SSL';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['none_txt'] = 'None';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ssl_error_isemail'] = 'Please enter a valid email adress for generation of the SSL certificate';
+$wb["limit_xmppdomain_txt"] = 'The max. number of XMPP domains for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/nl_xmpp_domain_admin_list.lng b/interface/web/mail/lib/lang/nl_xmpp_domain_admin_list.lng
new file mode 100644
index 0000000000..a3d1736d7b
--- /dev/null
+++ b/interface/web/mail/lib/lang/nl_xmpp_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$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';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/nl_xmpp_domain_list.lng b/interface/web/mail/lib/lang/nl_xmpp_domain_list.lng
new file mode 100644
index 0000000000..f8c2fb9b8e
--- /dev/null
+++ b/interface/web/mail/lib/lang/nl_xmpp_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["add_new_record_txt"] = 'Add new Domain';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/nl_xmpp_user.lng b/interface/web/mail/lib/lang/nl_xmpp_user.lng
new file mode 100644
index 0000000000..1cc852e3cf
--- /dev/null
+++ b/interface/web/mail/lib/lang/nl_xmpp_user.lng
@@ -0,0 +1,15 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["active_txt"] = 'Active';
+$wb["cryptpwd_txt"] = 'Password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["error_no_pwd"] = 'Password is empty.';
+$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["no_domain_perm"] = 'You have no permission for this domain.';
+$wb["limit_xmpp_user_txt"] = 'The max. number of xmpp accounts for your account is reached.';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/nl_xmpp_user_list.lng b/interface/web/mail/lib/lang/nl_xmpp_user_list.lng
new file mode 100644
index 0000000000..db88b0d7e3
--- /dev/null
+++ b/interface/web/mail/lib/lang/nl_xmpp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["is_domain_admin_txt"] = 'Domain admin';
+$wb["is_muc_admin_txt"] = 'MUC admin';
+$wb["add_new_record_txt"] = 'Add new user';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/pl_backup_stats_list.lng b/interface/web/mail/lib/lang/pl_backup_stats_list.lng
index 9ae9658257..79cd6c9a63 100644
--- a/interface/web/mail/lib/lang/pl_backup_stats_list.lng
+++ b/interface/web/mail/lib/lang/pl_backup_stats_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Email';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Email';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/mail/lib/lang/pl_mail_alias.lng b/interface/web/mail/lib/lang/pl_mail_alias.lng
index 87c2e091c8..4833383342 100644
--- a/interface/web/mail/lib/lang/pl_mail_alias.lng
+++ b/interface/web/mail/lib/lang/pl_mail_alias.lng
@@ -12,4 +12,6 @@ $wb['domain_txt'] = 'Domena';
 $wb['duplicate_email_alias_txt'] = 'Istnieje już taki alias email.';
 $wb['source_txt'] = 'Alias';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
 ?>
diff --git a/interface/web/mail/lib/lang/pl_mail_backup_list.lng b/interface/web/mail/lib/lang/pl_mail_backup_list.lng
new file mode 100644
index 0000000000..73286a0737
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_mail_backup_list.lng
@@ -0,0 +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';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring may overwrite existing files in your mailbox. 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['delete_backup_txt'] = 'Delete Backup';
+$wb['delete_info_txt'] = 'Delete of the backup has been started. This action takes several minutes to be completed.';
+$wb['delete_confirm_txt'] = 'Really delete this backup?';
+$wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
+$wb['filesize_txt'] = 'Filesize';
+?>
diff --git a/interface/web/mail/lib/lang/pl_mail_domain.lng b/interface/web/mail/lib/lang/pl_mail_domain.lng
index 3b0b6b9ff4..e4483a0d64 100644
--- a/interface/web/mail/lib/lang/pl_mail_domain.lng
+++ b/interface/web/mail/lib/lang/pl_mail_domain.lng
@@ -10,13 +10,14 @@ $wb['client_txt'] = 'Klient';
 $wb['limit_maildomain_txt'] = 'Maksymalna ilość domen e-mail dla Twojego konta została perzekroczona.';
 $wb['policy_txt'] = 'Filtr spamu';
 $wb['no_policy'] = '-nie używane-';
-$wb["dkim_txt"] = 'enable DKIM';
-$wb["dkim_private_txt"] = 'DKIM Private-key';
-$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
-$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
-$wb["dkim_dns_txt"] = 'DNS-Record';
-$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
+$wb['dkim_txt'] = 'enable DKIM';
+$wb['dkim_private_txt'] = 'DKIM Private-key';
+$wb['dkim_public_txt'] = 'DKIM Public-key\nfor information only';
+$wb['dkim_generate_txt'] = 'Generate DKIM Private-key';
+$wb['dkim_dns_txt'] = 'DNS-Record';
+$wb['dkim_private_key_error'] = 'Invalid DKIM-Private key';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
-$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
+$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 ?>
diff --git a/interface/web/mail/lib/lang/pl_mail_forward.lng b/interface/web/mail/lib/lang/pl_mail_forward.lng
index d0d57f2aa5..42ba61e373 100644
--- a/interface/web/mail/lib/lang/pl_mail_forward.lng
+++ b/interface/web/mail/lib/lang/pl_mail_forward.lng
@@ -7,4 +7,7 @@ $wb['duplicate_mailbox_txt'] = 'Istnieje już skrzynka pocztowa o podanym adresi
 $wb['domain_txt'] = 'Domena';
 $wb['source_txt'] = 'E-mail źródłowy';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
 ?>
diff --git a/interface/web/mail/lib/lang/pl_mail_user.lng b/interface/web/mail/lib/lang/pl_mail_user.lng
index 7eb7b6d520..58e5aba9d6 100644
--- a/interface/web/mail/lib/lang/pl_mail_user.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user.lng
@@ -48,8 +48,8 @@ $wb['generate_password_txt'] = 'Generuj hasło';
 $wb['repeat_password_txt'] = 'Powtórz hasło';
 $wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
 $wb['password_match_txt'] = 'Hasła pasują';
-$wb["backup_interval_txt"] = 'Backup interval';
-$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['no_backup_txt'] = 'No backup';
 $wb['daily_backup_txt'] = 'Daily';
 $wb['weekly_backup_txt'] = 'Weekly';
@@ -57,4 +57,8 @@ $wb['monthly_backup_txt'] = 'Monthly';
 $wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
 $wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
+$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
+$wb['sender_cc_txt'] = 'Send outgoing copy to';
+$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
+$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
diff --git a/interface/web/mail/lib/lang/pl_mail_user_filter.lng b/interface/web/mail/lib/lang/pl_mail_user_filter.lng
index 99ac6a9e78..403023e143 100644
--- a/interface/web/mail/lib/lang/pl_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user_filter.lng
@@ -15,6 +15,14 @@ $wb['contains_txt'] = 'Zawiera';
 $wb['is_txt'] = 'Jest';
 $wb['begins_with_txt'] = 'Zaczyna się od';
 $wb['ends_with_txt'] = 'Kończy się na';
-$wb['move_to_txt'] = 'Przenieś do';
 $wb['delete_txt'] = 'Usuń';
+$wb['move_stop_txt'] = 'Move to';
+$wb['header_txt'] = 'Header';
+$wb['size_over_txt'] = 'Email size over (KB)';
+$wb['size_under_txt'] = 'Email size under (KB)';
+$wb['localpart_txt'] = 'Localpart';
+$wb['domain_txt'] = 'Domain';
+$wb['keep_txt'] = 'Keep';
+$wb['reject_txt'] = 'Reject';
+$wb['stop_txt'] = 'Stop';
 ?>
diff --git a/interface/web/mail/lib/lang/pl_mail_user_list.lng b/interface/web/mail/lib/lang/pl_mail_user_list.lng
index 7c13db38d1..74ca840e30 100644
--- a/interface/web/mail/lib/lang/pl_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/pl_mail_user_list.lng
@@ -5,4 +5,8 @@ $wb['autoresponder_txt'] = 'Autoresponder';
 $wb['add_new_record_txt'] = 'Dodaj nową skrzynkę pocztową';
 $wb['name_txt'] = 'Nazwa rzeczywista';
 $wb['login_txt'] = 'Login';
+$wb['postfix_txt'] = 'Receiving';
+$wb['disablesmtp_txt'] = 'SMTP (sending)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
 ?>
diff --git a/interface/web/mail/lib/lang/pl_xmpp_domain.lng b/interface/web/mail/lib/lang/pl_xmpp_domain.lng
new file mode 100644
index 0000000000..f1da77ba29
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_xmpp_domain.lng
@@ -0,0 +1,62 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["client_group_id_txt"] = 'Client';
+$wb["domain_txt"] = 'Domain';
+$wb["type_txt"] = 'Type';
+$wb["active_txt"] = 'Active';
+$wb["client_txt"] = 'Client';
+$wb["management_method_txt"] = 'Management of user accounts';
+$wb["public_registration_txt"] = 'Enable public registration';
+$wb["registration_url_txt"] = 'Registration URL';
+$wb["registration_message_txt"] = 'Registration Message';
+$wb["domain_admins_txt"] = 'Domain Admins (JIDs)';
+$wb["use_pubsub_txt"] = 'Enable Pubsub';
+$wb["use_proxy_txt"] = 'Enable Bytestream Proxy';
+$wb["use_anon_host_txt"] = 'Enable Anonymous Host';
+$wb["use_vjud_txt"] = 'Enable VJUD User Directory';
+$wb["vjud_opt_mode_txt"] = 'VJUD Opt Mode';
+$wb["use_muc_host_txt"] = 'Enable Multi User Chatrooms';
+$wb["muc_name_txt"] = 'Name in MUC Service Discovery';
+$wb["muc_restrict_room_creation_txt"] = 'Permission to create chatrooms';
+$wb["muc_admins_txt"] = 'MUC Admins (JIDs)';
+$wb["use_pastebin_txt"] = 'Enable Pastebin';
+$wb["pastebin_expire_after_txt"] = 'Pastes expire after (hours)';
+$wb["pastebin_trigger_txt"] = 'Pastebin trigger';
+$wb["use_http_archive_txt"] = 'Enable HTTP chatroom archive';
+$wb["http_archive_show_join_txt"] = 'Show join messages in archive';
+$wb["http_archive_show_status_txt"] = 'Show status changes in archive';
+$wb["use_status_host_txt"] = 'Enable XML Status host';
+$wb["cant_change_domainname_txt"] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb["about_registration_url_txt"] = 'Link to your registration form.';
+$wb["about_registration_message_txt"] = 'Description about your account registration process.';
+$wb["no_corresponding_maildomain_txt"] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_email_txt'] = 'Email Address';
+$wb['ssl_txt'] = 'SSL';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['none_txt'] = 'None';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ssl_error_isemail'] = 'Please enter a valid email adress for generation of the SSL certificate';
+$wb["limit_xmppdomain_txt"] = 'The max. number of XMPP domains for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/pl_xmpp_domain_admin_list.lng b/interface/web/mail/lib/lang/pl_xmpp_domain_admin_list.lng
new file mode 100644
index 0000000000..a3d1736d7b
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_xmpp_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$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';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/pl_xmpp_domain_list.lng b/interface/web/mail/lib/lang/pl_xmpp_domain_list.lng
new file mode 100644
index 0000000000..f8c2fb9b8e
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_xmpp_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["add_new_record_txt"] = 'Add new Domain';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/pl_xmpp_user.lng b/interface/web/mail/lib/lang/pl_xmpp_user.lng
new file mode 100644
index 0000000000..1cc852e3cf
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_xmpp_user.lng
@@ -0,0 +1,15 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["active_txt"] = 'Active';
+$wb["cryptpwd_txt"] = 'Password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["error_no_pwd"] = 'Password is empty.';
+$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["no_domain_perm"] = 'You have no permission for this domain.';
+$wb["limit_xmpp_user_txt"] = 'The max. number of xmpp accounts for your account is reached.';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/pl_xmpp_user_list.lng b/interface/web/mail/lib/lang/pl_xmpp_user_list.lng
new file mode 100644
index 0000000000..db88b0d7e3
--- /dev/null
+++ b/interface/web/mail/lib/lang/pl_xmpp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["is_domain_admin_txt"] = 'Domain admin';
+$wb["is_muc_admin_txt"] = 'MUC admin';
+$wb["add_new_record_txt"] = 'Add new user';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/pt_backup_stats_list.lng b/interface/web/mail/lib/lang/pt_backup_stats_list.lng
index 9ae9658257..79cd6c9a63 100644
--- a/interface/web/mail/lib/lang/pt_backup_stats_list.lng
+++ b/interface/web/mail/lib/lang/pt_backup_stats_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Email';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Email';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/mail/lib/lang/pt_mail_alias.lng b/interface/web/mail/lib/lang/pt_mail_alias.lng
index f8694132fd..91736e3020 100644
--- a/interface/web/mail/lib/lang/pt_mail_alias.lng
+++ b/interface/web/mail/lib/lang/pt_mail_alias.lng
@@ -12,4 +12,6 @@ $wb['domain_txt'] = 'Domain';
 $wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
 $wb['source_txt'] = 'Alias';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
 ?>
diff --git a/interface/web/mail/lib/lang/pt_mail_backup_list.lng b/interface/web/mail/lib/lang/pt_mail_backup_list.lng
new file mode 100644
index 0000000000..73286a0737
--- /dev/null
+++ b/interface/web/mail/lib/lang/pt_mail_backup_list.lng
@@ -0,0 +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';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring may overwrite existing files in your mailbox. 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['delete_backup_txt'] = 'Delete Backup';
+$wb['delete_info_txt'] = 'Delete of the backup has been started. This action takes several minutes to be completed.';
+$wb['delete_confirm_txt'] = 'Really delete this backup?';
+$wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
+$wb['filesize_txt'] = 'Filesize';
+?>
diff --git a/interface/web/mail/lib/lang/pt_mail_domain.lng b/interface/web/mail/lib/lang/pt_mail_domain.lng
index 3d83145368..224a38a2e1 100644
--- a/interface/web/mail/lib/lang/pt_mail_domain.lng
+++ b/interface/web/mail/lib/lang/pt_mail_domain.lng
@@ -10,13 +10,14 @@ $wb['client_txt'] = 'Cliente';
 $wb['limit_maildomain_txt'] = 'O número máximo de contas de correio eletrônico para este domínio foi atingido.';
 $wb['policy_txt'] = 'Filtro Anti-Spam';
 $wb['no_policy'] = '- desactivado -';
-$wb["dkim_txt"] = 'enable DKIM';
-$wb["dkim_private_txt"] = 'DKIM Private-key';
-$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
-$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
-$wb["dkim_dns_txt"] = 'DNS-Record';
-$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
+$wb['dkim_txt'] = 'enable DKIM';
+$wb['dkim_private_txt'] = 'DKIM Private-key';
+$wb['dkim_public_txt'] = 'DKIM Public-key\nfor information only';
+$wb['dkim_generate_txt'] = 'Generate DKIM Private-key';
+$wb['dkim_dns_txt'] = 'DNS-Record';
+$wb['dkim_private_key_error'] = 'Invalid DKIM-Private key';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
-$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
+$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 ?>
diff --git a/interface/web/mail/lib/lang/pt_mail_forward.lng b/interface/web/mail/lib/lang/pt_mail_forward.lng
index 38569afdde..784acfa1d3 100644
--- a/interface/web/mail/lib/lang/pt_mail_forward.lng
+++ b/interface/web/mail/lib/lang/pt_mail_forward.lng
@@ -7,4 +7,7 @@ $wb['duplicate_mailbox_txt'] = 'Já existe uma caixa de correio com este endere
 $wb['domain_txt'] = 'Domain';
 $wb['source_txt'] = 'Source Email';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
 ?>
diff --git a/interface/web/mail/lib/lang/pt_mail_user.lng b/interface/web/mail/lib/lang/pt_mail_user.lng
index 7a385d1a9f..4e7934af9c 100644
--- a/interface/web/mail/lib/lang/pt_mail_user.lng
+++ b/interface/web/mail/lib/lang/pt_mail_user.lng
@@ -48,8 +48,8 @@ $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["backup_interval_txt"] = 'Backup interval';
-$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['no_backup_txt'] = 'No backup';
 $wb['daily_backup_txt'] = 'Daily';
 $wb['weekly_backup_txt'] = 'Weekly';
@@ -57,4 +57,8 @@ $wb['monthly_backup_txt'] = 'Monthly';
 $wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
 $wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
+$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
+$wb['sender_cc_txt'] = 'Send outgoing copy to';
+$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
+$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
diff --git a/interface/web/mail/lib/lang/pt_mail_user_filter.lng b/interface/web/mail/lib/lang/pt_mail_user_filter.lng
index e73c776495..579dd82e3c 100644
--- a/interface/web/mail/lib/lang/pt_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/pt_mail_user_filter.lng
@@ -15,6 +15,14 @@ $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['move_stop_txt'] = 'Move to';
+$wb['header_txt'] = 'Header';
+$wb['size_over_txt'] = 'Email size over (KB)';
+$wb['size_under_txt'] = 'Email size under (KB)';
+$wb['localpart_txt'] = 'Localpart';
+$wb['domain_txt'] = 'Domain';
+$wb['keep_txt'] = 'Keep';
+$wb['reject_txt'] = 'Reject';
+$wb['stop_txt'] = 'Stop';
 ?>
diff --git a/interface/web/mail/lib/lang/pt_mail_user_list.lng b/interface/web/mail/lib/lang/pt_mail_user_list.lng
index 6caf6d63ff..fe89939e2b 100644
--- a/interface/web/mail/lib/lang/pt_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/pt_mail_user_list.lng
@@ -5,4 +5,8 @@ $wb['autoresponder_txt'] = 'Autoresponder';
 $wb['add_new_record_txt'] = 'Adicionar nova caixa de correio';
 $wb['name_txt'] = 'Realname';
 $wb['login_txt'] = 'Login';
+$wb['postfix_txt'] = 'Receiving';
+$wb['disablesmtp_txt'] = 'SMTP (sending)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
 ?>
diff --git a/interface/web/mail/lib/lang/pt_xmpp_domain.lng b/interface/web/mail/lib/lang/pt_xmpp_domain.lng
new file mode 100644
index 0000000000..f1da77ba29
--- /dev/null
+++ b/interface/web/mail/lib/lang/pt_xmpp_domain.lng
@@ -0,0 +1,62 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["client_group_id_txt"] = 'Client';
+$wb["domain_txt"] = 'Domain';
+$wb["type_txt"] = 'Type';
+$wb["active_txt"] = 'Active';
+$wb["client_txt"] = 'Client';
+$wb["management_method_txt"] = 'Management of user accounts';
+$wb["public_registration_txt"] = 'Enable public registration';
+$wb["registration_url_txt"] = 'Registration URL';
+$wb["registration_message_txt"] = 'Registration Message';
+$wb["domain_admins_txt"] = 'Domain Admins (JIDs)';
+$wb["use_pubsub_txt"] = 'Enable Pubsub';
+$wb["use_proxy_txt"] = 'Enable Bytestream Proxy';
+$wb["use_anon_host_txt"] = 'Enable Anonymous Host';
+$wb["use_vjud_txt"] = 'Enable VJUD User Directory';
+$wb["vjud_opt_mode_txt"] = 'VJUD Opt Mode';
+$wb["use_muc_host_txt"] = 'Enable Multi User Chatrooms';
+$wb["muc_name_txt"] = 'Name in MUC Service Discovery';
+$wb["muc_restrict_room_creation_txt"] = 'Permission to create chatrooms';
+$wb["muc_admins_txt"] = 'MUC Admins (JIDs)';
+$wb["use_pastebin_txt"] = 'Enable Pastebin';
+$wb["pastebin_expire_after_txt"] = 'Pastes expire after (hours)';
+$wb["pastebin_trigger_txt"] = 'Pastebin trigger';
+$wb["use_http_archive_txt"] = 'Enable HTTP chatroom archive';
+$wb["http_archive_show_join_txt"] = 'Show join messages in archive';
+$wb["http_archive_show_status_txt"] = 'Show status changes in archive';
+$wb["use_status_host_txt"] = 'Enable XML Status host';
+$wb["cant_change_domainname_txt"] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb["about_registration_url_txt"] = 'Link to your registration form.';
+$wb["about_registration_message_txt"] = 'Description about your account registration process.';
+$wb["no_corresponding_maildomain_txt"] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_email_txt'] = 'Email Address';
+$wb['ssl_txt'] = 'SSL';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['none_txt'] = 'None';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ssl_error_isemail'] = 'Please enter a valid email adress for generation of the SSL certificate';
+$wb["limit_xmppdomain_txt"] = 'The max. number of XMPP domains for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/pt_xmpp_domain_admin_list.lng b/interface/web/mail/lib/lang/pt_xmpp_domain_admin_list.lng
new file mode 100644
index 0000000000..a3d1736d7b
--- /dev/null
+++ b/interface/web/mail/lib/lang/pt_xmpp_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$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';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/pt_xmpp_domain_list.lng b/interface/web/mail/lib/lang/pt_xmpp_domain_list.lng
new file mode 100644
index 0000000000..f8c2fb9b8e
--- /dev/null
+++ b/interface/web/mail/lib/lang/pt_xmpp_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["add_new_record_txt"] = 'Add new Domain';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/pt_xmpp_user.lng b/interface/web/mail/lib/lang/pt_xmpp_user.lng
new file mode 100644
index 0000000000..1cc852e3cf
--- /dev/null
+++ b/interface/web/mail/lib/lang/pt_xmpp_user.lng
@@ -0,0 +1,15 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["active_txt"] = 'Active';
+$wb["cryptpwd_txt"] = 'Password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["error_no_pwd"] = 'Password is empty.';
+$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["no_domain_perm"] = 'You have no permission for this domain.';
+$wb["limit_xmpp_user_txt"] = 'The max. number of xmpp accounts for your account is reached.';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/pt_xmpp_user_list.lng b/interface/web/mail/lib/lang/pt_xmpp_user_list.lng
new file mode 100644
index 0000000000..db88b0d7e3
--- /dev/null
+++ b/interface/web/mail/lib/lang/pt_xmpp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["is_domain_admin_txt"] = 'Domain admin';
+$wb["is_muc_admin_txt"] = 'MUC admin';
+$wb["add_new_record_txt"] = 'Add new user';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/ro_backup_stats_list.lng b/interface/web/mail/lib/lang/ro_backup_stats_list.lng
index 9ae9658257..79cd6c9a63 100644
--- a/interface/web/mail/lib/lang/ro_backup_stats_list.lng
+++ b/interface/web/mail/lib/lang/ro_backup_stats_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Email';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Email';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/mail/lib/lang/ro_mail_alias.lng b/interface/web/mail/lib/lang/ro_mail_alias.lng
index c67dd5b521..d5e8e0fb0f 100644
--- a/interface/web/mail/lib/lang/ro_mail_alias.lng
+++ b/interface/web/mail/lib/lang/ro_mail_alias.lng
@@ -12,4 +12,6 @@ $wb['domain_txt'] = 'Domain';
 $wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
 $wb['source_txt'] = 'Alias';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
 ?>
diff --git a/interface/web/mail/lib/lang/ro_mail_backup_list.lng b/interface/web/mail/lib/lang/ro_mail_backup_list.lng
new file mode 100644
index 0000000000..73286a0737
--- /dev/null
+++ b/interface/web/mail/lib/lang/ro_mail_backup_list.lng
@@ -0,0 +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';
+$wb['restore_info_txt'] = 'Restore of the backup has been started. This action takes several minutes to be completed.';
+$wb['restore_confirm_txt'] = 'Restoring may overwrite existing files in your mailbox. 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['delete_backup_txt'] = 'Delete Backup';
+$wb['delete_info_txt'] = 'Delete of the backup has been started. This action takes several minutes to be completed.';
+$wb['delete_confirm_txt'] = 'Really delete this backup?';
+$wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
+$wb['filesize_txt'] = 'Filesize';
+?>
diff --git a/interface/web/mail/lib/lang/ro_mail_domain.lng b/interface/web/mail/lib/lang/ro_mail_domain.lng
index d48e4e9761..ede56e351e 100644
--- a/interface/web/mail/lib/lang/ro_mail_domain.lng
+++ b/interface/web/mail/lib/lang/ro_mail_domain.lng
@@ -10,13 +10,14 @@ $wb['client_txt'] = 'Client';
 $wb['limit_maildomain_txt'] = 'Numarul maxuim de conturi email-uri pe contul dumenavoastra a fost atins The max. number of email domains for your account is reached.';
 $wb['policy_txt'] = 'Spamfilter';
 $wb['no_policy'] = '- not enabled -';
-$wb["dkim_txt"] = 'enable DKIM';
-$wb["dkim_private_txt"] = 'DKIM Private-key';
-$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
-$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
-$wb["dkim_dns_txt"] = 'DNS-Record';
-$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
+$wb['dkim_txt'] = 'enable DKIM';
+$wb['dkim_private_txt'] = 'DKIM Private-key';
+$wb['dkim_public_txt'] = 'DKIM Public-key\nfor information only';
+$wb['dkim_generate_txt'] = 'Generate DKIM Private-key';
+$wb['dkim_dns_txt'] = 'DNS-Record';
+$wb['dkim_private_key_error'] = 'Invalid DKIM-Private key';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
-$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
+$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 ?>
diff --git a/interface/web/mail/lib/lang/ro_mail_forward.lng b/interface/web/mail/lib/lang/ro_mail_forward.lng
index 5bea201165..8e2ed55d74 100644
--- a/interface/web/mail/lib/lang/ro_mail_forward.lng
+++ b/interface/web/mail/lib/lang/ro_mail_forward.lng
@@ -7,4 +7,7 @@ $wb['duplicate_mailbox_txt'] = 'There is already a mailbox with this email addre
 $wb['domain_txt'] = 'Domain';
 $wb['source_txt'] = 'Source Email';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
 ?>
diff --git a/interface/web/mail/lib/lang/ro_mail_user.lng b/interface/web/mail/lib/lang/ro_mail_user.lng
index 77971955df..46938cd80e 100644
--- a/interface/web/mail/lib/lang/ro_mail_user.lng
+++ b/interface/web/mail/lib/lang/ro_mail_user.lng
@@ -48,8 +48,8 @@ $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["backup_interval_txt"] = 'Backup interval';
-$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['no_backup_txt'] = 'No backup';
 $wb['daily_backup_txt'] = 'Daily';
 $wb['weekly_backup_txt'] = 'Weekly';
@@ -57,4 +57,8 @@ $wb['monthly_backup_txt'] = 'Monthly';
 $wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
 $wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
+$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
+$wb['sender_cc_txt'] = 'Send outgoing copy to';
+$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
+$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
diff --git a/interface/web/mail/lib/lang/ro_mail_user_filter.lng b/interface/web/mail/lib/lang/ro_mail_user_filter.lng
index 76578fe6e7..4919c047a5 100644
--- a/interface/web/mail/lib/lang/ro_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/ro_mail_user_filter.lng
@@ -15,6 +15,14 @@ $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['move_stop_txt'] = 'Move to';
+$wb['header_txt'] = 'Header';
+$wb['size_over_txt'] = 'Email size over (KB)';
+$wb['size_under_txt'] = 'Email size under (KB)';
+$wb['localpart_txt'] = 'Localpart';
+$wb['domain_txt'] = 'Domain';
+$wb['keep_txt'] = 'Keep';
+$wb['reject_txt'] = 'Reject';
+$wb['stop_txt'] = 'Stop';
 ?>
diff --git a/interface/web/mail/lib/lang/ro_mail_user_list.lng b/interface/web/mail/lib/lang/ro_mail_user_list.lng
index 8d920ed3be..f55f8647a8 100644
--- a/interface/web/mail/lib/lang/ro_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/ro_mail_user_list.lng
@@ -5,4 +5,8 @@ $wb['autoresponder_txt'] = 'Autoresponder';
 $wb['add_new_record_txt'] = 'Adauga Mailbox (casuta postala)';
 $wb['name_txt'] = 'Realname';
 $wb['login_txt'] = 'Login';
+$wb['postfix_txt'] = 'Receiving';
+$wb['disablesmtp_txt'] = 'SMTP (sending)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
 ?>
diff --git a/interface/web/mail/lib/lang/ro_xmpp_domain.lng b/interface/web/mail/lib/lang/ro_xmpp_domain.lng
new file mode 100644
index 0000000000..0541203b2e
--- /dev/null
+++ b/interface/web/mail/lib/lang/ro_xmpp_domain.lng
@@ -0,0 +1,62 @@
+<?php
+$wb['server_id_txt'] = 'Server';
+$wb['client_group_id_txt'] = 'Client';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Type';
+$wb['active_txt'] = 'Active';
+$wb['client_txt'] = 'Client';
+$wb['management_method_txt'] = 'Management of user accounts';
+$wb['public_registration_txt'] = 'Enable public registration';
+$wb['registration_url_txt'] = 'Registration URL';
+$wb['registration_message_txt'] = 'Registration Message';
+$wb['domain_admins_txt'] = 'Domain Admins (JIDs)';
+$wb['use_pubsub_txt'] = 'Enable Pubsub';
+$wb['use_proxy_txt'] = 'Enable Bytestream Proxy';
+$wb['use_anon_host_txt'] = 'Enable Anonymous Host';
+$wb['use_vjud_txt'] = 'Enable VJUD User Directory';
+$wb['vjud_opt_mode_txt'] = 'VJUD Opt Mode';
+$wb['use_muc_host_txt'] = 'Enable Multi User Chatrooms';
+$wb['muc_name_txt'] = 'Name in MUC Service Discovery';
+$wb['muc_restrict_room_creation_txt'] = 'Permission to create chatrooms';
+$wb['muc_admins_txt'] = 'MUC Admins (JIDs)';
+$wb['use_pastebin_txt'] = 'Enable Pastebin';
+$wb['pastebin_expire_after_txt'] = 'Pastes expire after (hours)';
+$wb['pastebin_trigger_txt'] = 'Pastebin trigger';
+$wb['use_http_archive_txt'] = 'Enable HTTP chatroom archive';
+$wb['http_archive_show_join_txt'] = 'Show join messages in archive';
+$wb['http_archive_show_status_txt'] = 'Show status changes in archive';
+$wb['use_status_host_txt'] = 'Enable XML Status host';
+$wb['cant_change_domainname_txt'] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb['about_registration_url_txt'] = 'Link to your registration form.';
+$wb['about_registration_message_txt'] = 'Description about your account registration process.';
+$wb['no_corresponding_maildomain_txt'] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_email_txt'] = 'Email Address';
+$wb['ssl_txt'] = 'SSL';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['none_txt'] = 'None';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ssl_error_isemail'] = 'Please enter a valid email adress for generation of the SSL certificate';
+$wb['limit_xmppdomain_txt'] = 'The max. number of XMPP domains for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/ro_xmpp_domain_admin_list.lng b/interface/web/mail/lib/lang/ro_xmpp_domain_admin_list.lng
new file mode 100644
index 0000000000..af643eab5a
--- /dev/null
+++ b/interface/web/mail/lib/lang/ro_xmpp_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'XMPP Domain';
+$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';
+?>
diff --git a/interface/web/mail/lib/lang/ro_xmpp_domain_list.lng b/interface/web/mail/lib/lang/ro_xmpp_domain_list.lng
new file mode 100644
index 0000000000..ebfebab7d5
--- /dev/null
+++ b/interface/web/mail/lib/lang/ro_xmpp_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'XMPP Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Add new Domain';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/mail/lib/lang/ro_xmpp_user.lng b/interface/web/mail/lib/lang/ro_xmpp_user.lng
new file mode 100644
index 0000000000..6ab739d98b
--- /dev/null
+++ b/interface/web/mail/lib/lang/ro_xmpp_user.lng
@@ -0,0 +1,15 @@
+<?php
+$wb['list_head_txt'] = 'XMPP User Accounts';
+$wb['jid_txt'] = 'Jabber ID';
+$wb['active_txt'] = 'Active';
+$wb['cryptpwd_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['error_no_pwd'] = 'Password is empty.';
+$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['no_domain_perm'] = 'You have no permission for this domain.';
+$wb['limit_xmpp_user_txt'] = 'The max. number of xmpp accounts for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/ro_xmpp_user_list.lng b/interface/web/mail/lib/lang/ro_xmpp_user_list.lng
new file mode 100644
index 0000000000..f2651cb62b
--- /dev/null
+++ b/interface/web/mail/lib/lang/ro_xmpp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'XMPP User Accounts';
+$wb['jid_txt'] = 'Jabber ID';
+$wb['is_domain_admin_txt'] = 'Domain admin';
+$wb['is_muc_admin_txt'] = 'MUC admin';
+$wb['add_new_record_txt'] = 'Add new user';
+$wb['active_txt'] = 'Active';
+?>
diff --git a/interface/web/mail/lib/lang/ru_backup_stats_list.lng b/interface/web/mail/lib/lang/ru_backup_stats_list.lng
index 9ae9658257..79cd6c9a63 100644
--- a/interface/web/mail/lib/lang/ru_backup_stats_list.lng
+++ b/interface/web/mail/lib/lang/ru_backup_stats_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Email';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Email';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/mail/lib/lang/ru_mail_alias.lng b/interface/web/mail/lib/lang/ru_mail_alias.lng
index f5f8c7d587..3cccd02a1c 100644
--- a/interface/web/mail/lib/lang/ru_mail_alias.lng
+++ b/interface/web/mail/lib/lang/ru_mail_alias.lng
@@ -12,4 +12,6 @@ $wb['domain_txt'] = 'Domain';
 $wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
 $wb['source_txt'] = 'Alias';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
 ?>
diff --git a/interface/web/mail/lib/lang/ru_mail_domain.lng b/interface/web/mail/lib/lang/ru_mail_domain.lng
index f67242d6ec..128485d87e 100644
--- a/interface/web/mail/lib/lang/ru_mail_domain.lng
+++ b/interface/web/mail/lib/lang/ru_mail_domain.lng
@@ -10,13 +10,14 @@ $wb['client_txt'] = 'Клиент';
 $wb['limit_maildomain_txt'] = 'Максимальное число почтовых доменов, достигнуто.';
 $wb['policy_txt'] = 'Спам-фильтр';
 $wb['no_policy'] = '- не включено -';
-$wb["dkim_txt"] = 'enable DKIM';
-$wb["dkim_private_txt"] = 'DKIM Private-key';
-$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
-$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
-$wb["dkim_dns_txt"] = 'DNS-Record';
-$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
-$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
+$wb['dkim_txt'] = 'enable DKIM';
+$wb['dkim_private_txt'] = 'DKIM Private-key';
+$wb['dkim_public_txt'] = 'DKIM Public-key\nfor information only';
+$wb['dkim_generate_txt'] = 'Generate DKIM Private-key';
+$wb['dkim_dns_txt'] = 'DNS-Record';
+$wb['dkim_private_key_error'] = 'Invalid DKIM-Private key';
+$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 ?>
diff --git a/interface/web/mail/lib/lang/ru_mail_forward.lng b/interface/web/mail/lib/lang/ru_mail_forward.lng
index fcfbec175a..efc8f33f95 100644
--- a/interface/web/mail/lib/lang/ru_mail_forward.lng
+++ b/interface/web/mail/lib/lang/ru_mail_forward.lng
@@ -7,4 +7,7 @@ $wb['duplicate_mailbox_txt'] = 'Ящик с таким именем уже су
 $wb['domain_txt'] = 'Domain';
 $wb['source_txt'] = 'Source Email';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
 ?>
diff --git a/interface/web/mail/lib/lang/ru_mail_user.lng b/interface/web/mail/lib/lang/ru_mail_user.lng
index 1032b30d57..5ed8b07f5d 100644
--- a/interface/web/mail/lib/lang/ru_mail_user.lng
+++ b/interface/web/mail/lib/lang/ru_mail_user.lng
@@ -48,8 +48,8 @@ $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["backup_interval_txt"] = 'Backup interval';
-$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['no_backup_txt'] = 'No backup';
 $wb['daily_backup_txt'] = 'Daily';
 $wb['weekly_backup_txt'] = 'Weekly';
@@ -57,4 +57,8 @@ $wb['monthly_backup_txt'] = 'Monthly';
 $wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
 $wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
+$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
+$wb['sender_cc_txt'] = 'Send outgoing copy to';
+$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
+$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
diff --git a/interface/web/mail/lib/lang/ru_mail_user_filter.lng b/interface/web/mail/lib/lang/ru_mail_user_filter.lng
index 6b5426009e..5f6571ed9f 100644
--- a/interface/web/mail/lib/lang/ru_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/ru_mail_user_filter.lng
@@ -15,6 +15,14 @@ $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['move_stop_txt'] = 'Move to';
+$wb['header_txt'] = 'Header';
+$wb['size_over_txt'] = 'Email size over (KB)';
+$wb['size_under_txt'] = 'Email size under (KB)';
+$wb['localpart_txt'] = 'Localpart';
+$wb['domain_txt'] = 'Domain';
+$wb['keep_txt'] = 'Keep';
+$wb['reject_txt'] = 'Reject';
+$wb['stop_txt'] = 'Stop';
 ?>
diff --git a/interface/web/mail/lib/lang/ru_mail_user_list.lng b/interface/web/mail/lib/lang/ru_mail_user_list.lng
index 7acd56e848..93b4b6e4ac 100644
--- a/interface/web/mail/lib/lang/ru_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/ru_mail_user_list.lng
@@ -5,4 +5,8 @@ $wb['autoresponder_txt'] = 'Автоответчик';
 $wb['add_new_record_txt'] = 'Добавить новый ящик';
 $wb['name_txt'] = 'Realname';
 $wb['login_txt'] = 'Login';
+$wb['postfix_txt'] = 'Receiving';
+$wb['disablesmtp_txt'] = 'SMTP (sending)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
 ?>
diff --git a/interface/web/mail/lib/lang/ru_xmpp_domain.lng b/interface/web/mail/lib/lang/ru_xmpp_domain.lng
new file mode 100644
index 0000000000..f1da77ba29
--- /dev/null
+++ b/interface/web/mail/lib/lang/ru_xmpp_domain.lng
@@ -0,0 +1,62 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["client_group_id_txt"] = 'Client';
+$wb["domain_txt"] = 'Domain';
+$wb["type_txt"] = 'Type';
+$wb["active_txt"] = 'Active';
+$wb["client_txt"] = 'Client';
+$wb["management_method_txt"] = 'Management of user accounts';
+$wb["public_registration_txt"] = 'Enable public registration';
+$wb["registration_url_txt"] = 'Registration URL';
+$wb["registration_message_txt"] = 'Registration Message';
+$wb["domain_admins_txt"] = 'Domain Admins (JIDs)';
+$wb["use_pubsub_txt"] = 'Enable Pubsub';
+$wb["use_proxy_txt"] = 'Enable Bytestream Proxy';
+$wb["use_anon_host_txt"] = 'Enable Anonymous Host';
+$wb["use_vjud_txt"] = 'Enable VJUD User Directory';
+$wb["vjud_opt_mode_txt"] = 'VJUD Opt Mode';
+$wb["use_muc_host_txt"] = 'Enable Multi User Chatrooms';
+$wb["muc_name_txt"] = 'Name in MUC Service Discovery';
+$wb["muc_restrict_room_creation_txt"] = 'Permission to create chatrooms';
+$wb["muc_admins_txt"] = 'MUC Admins (JIDs)';
+$wb["use_pastebin_txt"] = 'Enable Pastebin';
+$wb["pastebin_expire_after_txt"] = 'Pastes expire after (hours)';
+$wb["pastebin_trigger_txt"] = 'Pastebin trigger';
+$wb["use_http_archive_txt"] = 'Enable HTTP chatroom archive';
+$wb["http_archive_show_join_txt"] = 'Show join messages in archive';
+$wb["http_archive_show_status_txt"] = 'Show status changes in archive';
+$wb["use_status_host_txt"] = 'Enable XML Status host';
+$wb["cant_change_domainname_txt"] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb["about_registration_url_txt"] = 'Link to your registration form.';
+$wb["about_registration_message_txt"] = 'Description about your account registration process.';
+$wb["no_corresponding_maildomain_txt"] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_email_txt'] = 'Email Address';
+$wb['ssl_txt'] = 'SSL';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['none_txt'] = 'None';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ssl_error_isemail'] = 'Please enter a valid email adress for generation of the SSL certificate';
+$wb["limit_xmppdomain_txt"] = 'The max. number of XMPP domains for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/ru_xmpp_domain_admin_list.lng b/interface/web/mail/lib/lang/ru_xmpp_domain_admin_list.lng
new file mode 100644
index 0000000000..a3d1736d7b
--- /dev/null
+++ b/interface/web/mail/lib/lang/ru_xmpp_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$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';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/ru_xmpp_domain_list.lng b/interface/web/mail/lib/lang/ru_xmpp_domain_list.lng
new file mode 100644
index 0000000000..f8c2fb9b8e
--- /dev/null
+++ b/interface/web/mail/lib/lang/ru_xmpp_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["add_new_record_txt"] = 'Add new Domain';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/ru_xmpp_user.lng b/interface/web/mail/lib/lang/ru_xmpp_user.lng
new file mode 100644
index 0000000000..1cc852e3cf
--- /dev/null
+++ b/interface/web/mail/lib/lang/ru_xmpp_user.lng
@@ -0,0 +1,15 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["active_txt"] = 'Active';
+$wb["cryptpwd_txt"] = 'Password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["error_no_pwd"] = 'Password is empty.';
+$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["no_domain_perm"] = 'You have no permission for this domain.';
+$wb["limit_xmpp_user_txt"] = 'The max. number of xmpp accounts for your account is reached.';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/ru_xmpp_user_list.lng b/interface/web/mail/lib/lang/ru_xmpp_user_list.lng
new file mode 100644
index 0000000000..db88b0d7e3
--- /dev/null
+++ b/interface/web/mail/lib/lang/ru_xmpp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["is_domain_admin_txt"] = 'Domain admin';
+$wb["is_muc_admin_txt"] = 'MUC admin';
+$wb["add_new_record_txt"] = 'Add new user';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/se_backup_stats_list.lng b/interface/web/mail/lib/lang/se_backup_stats_list.lng
index 9ae9658257..79cd6c9a63 100644
--- a/interface/web/mail/lib/lang/se_backup_stats_list.lng
+++ b/interface/web/mail/lib/lang/se_backup_stats_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Email';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Email';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/mail/lib/lang/se_mail_alias.lng b/interface/web/mail/lib/lang/se_mail_alias.lng
index bc30c0ae5b..441e33eac2 100644
--- a/interface/web/mail/lib/lang/se_mail_alias.lng
+++ b/interface/web/mail/lib/lang/se_mail_alias.lng
@@ -12,4 +12,6 @@ $wb['domain_txt'] = 'Domän';
 $wb['duplicate_email_alias_txt'] = 'Detta epostalias finns redan';
 $wb['source_txt'] = 'Alias';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
 ?>
diff --git a/interface/web/mail/lib/lang/se_mail_domain.lng b/interface/web/mail/lib/lang/se_mail_domain.lng
index 7e3853e7e4..fcd87813ba 100644
--- a/interface/web/mail/lib/lang/se_mail_domain.lng
+++ b/interface/web/mail/lib/lang/se_mail_domain.lng
@@ -9,14 +9,15 @@ $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["dkim_txt"] = 'enable DKIM';
-$wb["dkim_private_txt"] = 'DKIM Private-key';
-$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
-$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
-$wb["dkim_dns_txt"] = 'DNS-Record';
-$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
+$wb['dkim_txt'] = 'enable DKIM';
+$wb['dkim_private_txt'] = 'DKIM Private-key';
+$wb['dkim_public_txt'] = 'DKIM Public-key\nfor information only';
+$wb['dkim_generate_txt'] = 'Generate DKIM Private-key';
+$wb['dkim_dns_txt'] = 'DNS-Record';
+$wb['dkim_private_key_error'] = 'Invalid DKIM-Private key';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
-$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
+$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['no_policy'] = '- ej aktiverat -';
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 ?>
diff --git a/interface/web/mail/lib/lang/se_mail_forward.lng b/interface/web/mail/lib/lang/se_mail_forward.lng
index 627d6eb57f..d49fd63ace 100644
--- a/interface/web/mail/lib/lang/se_mail_forward.lng
+++ b/interface/web/mail/lib/lang/se_mail_forward.lng
@@ -7,4 +7,7 @@ $wb['duplicate_mailbox_txt'] = 'Det finns redan ett epostkonto med denna adress'
 $wb['domain_txt'] = 'Domän';
 $wb['source_txt'] = 'Källadress';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
 ?>
diff --git a/interface/web/mail/lib/lang/se_mail_user.lng b/interface/web/mail/lib/lang/se_mail_user.lng
index 119a3df441..7dcdca3e68 100644
--- a/interface/web/mail/lib/lang/se_mail_user.lng
+++ b/interface/web/mail/lib/lang/se_mail_user.lng
@@ -48,8 +48,8 @@ $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["backup_interval_txt"] = 'Backup interval';
-$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['no_backup_txt'] = 'No backup';
 $wb['daily_backup_txt'] = 'Daily';
 $wb['weekly_backup_txt'] = 'Weekly';
@@ -57,4 +57,8 @@ $wb['monthly_backup_txt'] = 'Monthly';
 $wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
 $wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
+$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
+$wb['sender_cc_txt'] = 'Send outgoing copy to';
+$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
+$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
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 e6e62decf6..0bbda8a142 100644
--- a/interface/web/mail/lib/lang/se_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/se_mail_user_filter.lng
@@ -15,6 +15,14 @@ $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';
+$wb['move_stop_txt'] = 'Move to';
+$wb['header_txt'] = 'Header';
+$wb['size_over_txt'] = 'Email size over (KB)';
+$wb['size_under_txt'] = 'Email size under (KB)';
+$wb['localpart_txt'] = 'Localpart';
+$wb['domain_txt'] = 'Domain';
+$wb['keep_txt'] = 'Keep';
+$wb['reject_txt'] = 'Reject';
+$wb['stop_txt'] = 'Stop';
 ?>
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 af96af83ce..65c724c292 100644
--- a/interface/web/mail/lib/lang/se_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/se_mail_user_list.lng
@@ -5,4 +5,8 @@ $wb['autoresponder_txt'] = 'Autosvar';
 $wb['add_new_record_txt'] = 'Lägg till nytt epostkonto';
 $wb['name_txt'] = 'Riktigt namn';
 $wb['login_txt'] = 'Logga in';
+$wb['postfix_txt'] = 'Receiving';
+$wb['disablesmtp_txt'] = 'SMTP (sending)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
 ?>
diff --git a/interface/web/mail/lib/lang/se_xmpp_domain.lng b/interface/web/mail/lib/lang/se_xmpp_domain.lng
new file mode 100644
index 0000000000..f1da77ba29
--- /dev/null
+++ b/interface/web/mail/lib/lang/se_xmpp_domain.lng
@@ -0,0 +1,62 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["client_group_id_txt"] = 'Client';
+$wb["domain_txt"] = 'Domain';
+$wb["type_txt"] = 'Type';
+$wb["active_txt"] = 'Active';
+$wb["client_txt"] = 'Client';
+$wb["management_method_txt"] = 'Management of user accounts';
+$wb["public_registration_txt"] = 'Enable public registration';
+$wb["registration_url_txt"] = 'Registration URL';
+$wb["registration_message_txt"] = 'Registration Message';
+$wb["domain_admins_txt"] = 'Domain Admins (JIDs)';
+$wb["use_pubsub_txt"] = 'Enable Pubsub';
+$wb["use_proxy_txt"] = 'Enable Bytestream Proxy';
+$wb["use_anon_host_txt"] = 'Enable Anonymous Host';
+$wb["use_vjud_txt"] = 'Enable VJUD User Directory';
+$wb["vjud_opt_mode_txt"] = 'VJUD Opt Mode';
+$wb["use_muc_host_txt"] = 'Enable Multi User Chatrooms';
+$wb["muc_name_txt"] = 'Name in MUC Service Discovery';
+$wb["muc_restrict_room_creation_txt"] = 'Permission to create chatrooms';
+$wb["muc_admins_txt"] = 'MUC Admins (JIDs)';
+$wb["use_pastebin_txt"] = 'Enable Pastebin';
+$wb["pastebin_expire_after_txt"] = 'Pastes expire after (hours)';
+$wb["pastebin_trigger_txt"] = 'Pastebin trigger';
+$wb["use_http_archive_txt"] = 'Enable HTTP chatroom archive';
+$wb["http_archive_show_join_txt"] = 'Show join messages in archive';
+$wb["http_archive_show_status_txt"] = 'Show status changes in archive';
+$wb["use_status_host_txt"] = 'Enable XML Status host';
+$wb["cant_change_domainname_txt"] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb["about_registration_url_txt"] = 'Link to your registration form.';
+$wb["about_registration_message_txt"] = 'Description about your account registration process.';
+$wb["no_corresponding_maildomain_txt"] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_email_txt'] = 'Email Address';
+$wb['ssl_txt'] = 'SSL';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['none_txt'] = 'None';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ssl_error_isemail'] = 'Please enter a valid email adress for generation of the SSL certificate';
+$wb["limit_xmppdomain_txt"] = 'The max. number of XMPP domains for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/se_xmpp_domain_admin_list.lng b/interface/web/mail/lib/lang/se_xmpp_domain_admin_list.lng
new file mode 100644
index 0000000000..a3d1736d7b
--- /dev/null
+++ b/interface/web/mail/lib/lang/se_xmpp_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$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';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/se_xmpp_domain_list.lng b/interface/web/mail/lib/lang/se_xmpp_domain_list.lng
new file mode 100644
index 0000000000..f8c2fb9b8e
--- /dev/null
+++ b/interface/web/mail/lib/lang/se_xmpp_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["add_new_record_txt"] = 'Add new Domain';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/se_xmpp_user.lng b/interface/web/mail/lib/lang/se_xmpp_user.lng
new file mode 100644
index 0000000000..1cc852e3cf
--- /dev/null
+++ b/interface/web/mail/lib/lang/se_xmpp_user.lng
@@ -0,0 +1,15 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["active_txt"] = 'Active';
+$wb["cryptpwd_txt"] = 'Password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["error_no_pwd"] = 'Password is empty.';
+$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["no_domain_perm"] = 'You have no permission for this domain.';
+$wb["limit_xmpp_user_txt"] = 'The max. number of xmpp accounts for your account is reached.';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/se_xmpp_user_list.lng b/interface/web/mail/lib/lang/se_xmpp_user_list.lng
new file mode 100644
index 0000000000..db88b0d7e3
--- /dev/null
+++ b/interface/web/mail/lib/lang/se_xmpp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["is_domain_admin_txt"] = 'Domain admin';
+$wb["is_muc_admin_txt"] = 'MUC admin';
+$wb["add_new_record_txt"] = 'Add new user';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/sk_backup_stats_list.lng b/interface/web/mail/lib/lang/sk_backup_stats_list.lng
index 9ae9658257..79cd6c9a63 100644
--- a/interface/web/mail/lib/lang/sk_backup_stats_list.lng
+++ b/interface/web/mail/lib/lang/sk_backup_stats_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Email';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Email';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/mail/lib/lang/sk_mail_alias.lng b/interface/web/mail/lib/lang/sk_mail_alias.lng
index bfd67e55f1..70b6b1c246 100644
--- a/interface/web/mail/lib/lang/sk_mail_alias.lng
+++ b/interface/web/mail/lib/lang/sk_mail_alias.lng
@@ -12,4 +12,6 @@ $wb['domain_txt'] = 'Domain';
 $wb['duplicate_email_alias_txt'] = 'This email alias does already exist.';
 $wb['source_txt'] = 'Alias';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
 ?>
diff --git a/interface/web/mail/lib/lang/sk_mail_domain.lng b/interface/web/mail/lib/lang/sk_mail_domain.lng
index ca4e753db0..dfe8ce8899 100644
--- a/interface/web/mail/lib/lang/sk_mail_domain.lng
+++ b/interface/web/mail/lib/lang/sk_mail_domain.lng
@@ -8,14 +8,16 @@ $wb['domain_error_unique'] = 'Duplicitná Doména.';
 $wb['domain_error_regex'] = 'Zlé doménové meno.';
 $wb['client_txt'] = 'Klient';
 $wb['limit_maildomain_txt'] = 'Max. počet e-mailových domén pre váš účet je dosiahnutý.';
-$wb["dkim_txt"] = 'enable DKIM';
-$wb["dkim_private_txt"] = 'DKIM Private-key';
-$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
-$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
-$wb["dkim_dns_txt"] = 'DNS-Record';
-$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
+$wb['dkim_txt'] = 'enable DKIM';
+$wb['dkim_private_txt'] = 'DKIM Private-key';
+$wb['dkim_public_txt'] = 'DKIM Public-key\nfor information only';
+$wb['dkim_generate_txt'] = 'Generate DKIM Private-key';
+$wb['dkim_dns_txt'] = 'DNS-Record';
+$wb['dkim_private_key_error'] = 'Invalid DKIM-Private key';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
-
 $wb['policy_txt'] = 'Spamfilter';
 $wb['no_policy'] = '- Nie je aktivovaný -';
+$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
+$wb['dkim_selector_txt'] = 'DKIM-Selector';
 ?>
diff --git a/interface/web/mail/lib/lang/sk_mail_forward.lng b/interface/web/mail/lib/lang/sk_mail_forward.lng
index 41444a6829..8932dc9ac5 100644
--- a/interface/web/mail/lib/lang/sk_mail_forward.lng
+++ b/interface/web/mail/lib/lang/sk_mail_forward.lng
@@ -7,4 +7,7 @@ $wb['duplicate_mailbox_txt'] = 'Existuje už schránku s touto e-mailovou adreso
 $wb['domain_txt'] = 'Domain';
 $wb['source_txt'] = 'Source Email';
 $wb['greylisting_txt'] = 'Enable greylisting';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
 ?>
diff --git a/interface/web/mail/lib/lang/sk_mail_user.lng b/interface/web/mail/lib/lang/sk_mail_user.lng
index 07a90c5321..115cab9aa9 100644
--- a/interface/web/mail/lib/lang/sk_mail_user.lng
+++ b/interface/web/mail/lib/lang/sk_mail_user.lng
@@ -48,8 +48,8 @@ $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["backup_interval_txt"] = 'Backup interval';
-$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['no_backup_txt'] = 'No backup';
 $wb['daily_backup_txt'] = 'Daily';
 $wb['weekly_backup_txt'] = 'Weekly';
@@ -57,4 +57,8 @@ $wb['monthly_backup_txt'] = 'Monthly';
 $wb['email_error_isascii'] = 'Please do not use special unicode characters for your password. This could lead to problems with your mail client.';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
 $wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
+$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
+$wb['sender_cc_txt'] = 'Send outgoing copy to';
+$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
+$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
diff --git a/interface/web/mail/lib/lang/sk_mail_user_filter.lng b/interface/web/mail/lib/lang/sk_mail_user_filter.lng
index c7628de45f..980b6a5ae9 100644
--- a/interface/web/mail/lib/lang/sk_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/sk_mail_user_filter.lng
@@ -15,6 +15,14 @@ $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['move_stop_txt'] = 'Move to';
+$wb['header_txt'] = 'Header';
+$wb['size_over_txt'] = 'Email size over (KB)';
+$wb['size_under_txt'] = 'Email size under (KB)';
+$wb['localpart_txt'] = 'Localpart';
+$wb['domain_txt'] = 'Domain';
+$wb['keep_txt'] = 'Keep';
+$wb['reject_txt'] = 'Reject';
+$wb['stop_txt'] = 'Stop';
 ?>
diff --git a/interface/web/mail/lib/lang/sk_mail_user_list.lng b/interface/web/mail/lib/lang/sk_mail_user_list.lng
index 767c7bf4b2..3d18ad41f6 100644
--- a/interface/web/mail/lib/lang/sk_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/sk_mail_user_list.lng
@@ -5,4 +5,8 @@ $wb['autoresponder_txt'] = 'Automatická odpove?';
 $wb['add_new_record_txt'] = 'Pridať novú schránku';
 $wb['name_txt'] = 'Realname';
 $wb['login_txt'] = 'Login';
+$wb['postfix_txt'] = 'Receiving';
+$wb['disablesmtp_txt'] = 'SMTP (sending)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
 ?>
diff --git a/interface/web/mail/lib/lang/sk_xmpp_domain.lng b/interface/web/mail/lib/lang/sk_xmpp_domain.lng
new file mode 100644
index 0000000000..f1da77ba29
--- /dev/null
+++ b/interface/web/mail/lib/lang/sk_xmpp_domain.lng
@@ -0,0 +1,62 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["client_group_id_txt"] = 'Client';
+$wb["domain_txt"] = 'Domain';
+$wb["type_txt"] = 'Type';
+$wb["active_txt"] = 'Active';
+$wb["client_txt"] = 'Client';
+$wb["management_method_txt"] = 'Management of user accounts';
+$wb["public_registration_txt"] = 'Enable public registration';
+$wb["registration_url_txt"] = 'Registration URL';
+$wb["registration_message_txt"] = 'Registration Message';
+$wb["domain_admins_txt"] = 'Domain Admins (JIDs)';
+$wb["use_pubsub_txt"] = 'Enable Pubsub';
+$wb["use_proxy_txt"] = 'Enable Bytestream Proxy';
+$wb["use_anon_host_txt"] = 'Enable Anonymous Host';
+$wb["use_vjud_txt"] = 'Enable VJUD User Directory';
+$wb["vjud_opt_mode_txt"] = 'VJUD Opt Mode';
+$wb["use_muc_host_txt"] = 'Enable Multi User Chatrooms';
+$wb["muc_name_txt"] = 'Name in MUC Service Discovery';
+$wb["muc_restrict_room_creation_txt"] = 'Permission to create chatrooms';
+$wb["muc_admins_txt"] = 'MUC Admins (JIDs)';
+$wb["use_pastebin_txt"] = 'Enable Pastebin';
+$wb["pastebin_expire_after_txt"] = 'Pastes expire after (hours)';
+$wb["pastebin_trigger_txt"] = 'Pastebin trigger';
+$wb["use_http_archive_txt"] = 'Enable HTTP chatroom archive';
+$wb["http_archive_show_join_txt"] = 'Show join messages in archive';
+$wb["http_archive_show_status_txt"] = 'Show status changes in archive';
+$wb["use_status_host_txt"] = 'Enable XML Status host';
+$wb["cant_change_domainname_txt"] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb["about_registration_url_txt"] = 'Link to your registration form.';
+$wb["about_registration_message_txt"] = 'Description about your account registration process.';
+$wb["no_corresponding_maildomain_txt"] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_email_txt'] = 'Email Address';
+$wb['ssl_txt'] = 'SSL';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['none_txt'] = 'None';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ssl_error_isemail'] = 'Please enter a valid email adress for generation of the SSL certificate';
+$wb["limit_xmppdomain_txt"] = 'The max. number of XMPP domains for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/sk_xmpp_domain_admin_list.lng b/interface/web/mail/lib/lang/sk_xmpp_domain_admin_list.lng
new file mode 100644
index 0000000000..a3d1736d7b
--- /dev/null
+++ b/interface/web/mail/lib/lang/sk_xmpp_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$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';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/sk_xmpp_domain_list.lng b/interface/web/mail/lib/lang/sk_xmpp_domain_list.lng
new file mode 100644
index 0000000000..f8c2fb9b8e
--- /dev/null
+++ b/interface/web/mail/lib/lang/sk_xmpp_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["add_new_record_txt"] = 'Add new Domain';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/sk_xmpp_user.lng b/interface/web/mail/lib/lang/sk_xmpp_user.lng
new file mode 100644
index 0000000000..1cc852e3cf
--- /dev/null
+++ b/interface/web/mail/lib/lang/sk_xmpp_user.lng
@@ -0,0 +1,15 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["active_txt"] = 'Active';
+$wb["cryptpwd_txt"] = 'Password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["error_no_pwd"] = 'Password is empty.';
+$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["no_domain_perm"] = 'You have no permission for this domain.';
+$wb["limit_xmpp_user_txt"] = 'The max. number of xmpp accounts for your account is reached.';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/sk_xmpp_user_list.lng b/interface/web/mail/lib/lang/sk_xmpp_user_list.lng
new file mode 100644
index 0000000000..db88b0d7e3
--- /dev/null
+++ b/interface/web/mail/lib/lang/sk_xmpp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["is_domain_admin_txt"] = 'Domain admin';
+$wb["is_muc_admin_txt"] = 'MUC admin';
+$wb["add_new_record_txt"] = 'Add new user';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/tr.lng b/interface/web/mail/lib/lang/tr.lng
index 154f767e1d..e2deaca006 100644
--- a/interface/web/mail/lib/lang/tr.lng
+++ b/interface/web/mail/lib/lang/tr.lng
@@ -20,7 +20,6 @@ $wb['Email filter'] = 'E-posta Süzgeci';
 $wb['Email Whitelist'] = 'E-posta Beyaz Listesi';
 $wb['Whitelist'] = 'Beyaz Liste';
 $wb['Spamfilter blacklist'] = 'Önemsiz Posta Süzgeci Kara Listesi';
-$wb['Blacklist'] = 'Kara Liste';
 $wb['Spamfilter Config'] = 'Önemsiz Posta Süzgeci Ayarları';
 $wb['Server'] = 'Sunucu';
 $wb['Spamfilter policy'] = 'Önemsiz Posta Süzgeci Kuralları';
@@ -31,13 +30,11 @@ $wb['Other'] = 'Diğer';
 $wb['Spamfilter users'] = 'Önemsiz Posta Süzgeci Kullanıcıları';
 $wb['Users'] = 'Kullanıcılar';
 $wb['Spamfilter Whitelist'] = 'Önemsiz Posta Beyaz Listesi';
-$wb['Whitelist'] = 'Beyaz Liste';
 $wb['Email'] = 'E-posta';
 $wb['Email Mailbox'] = 'E-posta Kutusu';
 $wb['Email Accounts'] = 'E-posta Hesapları';
 $wb['User / Domain'] = 'Kullanıcı / Alan Adı';
 $wb['Server Settings'] = 'Sunucu Ayarları';
-$wb['Spamfilter'] = 'Önemsiz Posta Süzgeci';
 $wb['Fetchmail'] = 'Posta Alma';
 $wb['Mailbox traffic'] = 'Posta Kutusu Trafiği';
 $wb['Statistics'] = 'İstatistikler';
diff --git a/interface/web/mail/lib/lang/tr_backup_stats_list.lng b/interface/web/mail/lib/lang/tr_backup_stats_list.lng
index 9ae9658257..79cd6c9a63 100644
--- a/interface/web/mail/lib/lang/tr_backup_stats_list.lng
+++ b/interface/web/mail/lib/lang/tr_backup_stats_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Email';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Email';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/mail/lib/lang/tr_mail_alias.lng b/interface/web/mail/lib/lang/tr_mail_alias.lng
index 5ab741c95f..5132969edb 100644
--- a/interface/web/mail/lib/lang/tr_mail_alias.lng
+++ b/interface/web/mail/lib/lang/tr_mail_alias.lng
@@ -12,5 +12,6 @@ $wb['duplicate_mailbox_txt'] = 'Bu e-posta adresini kullanan bir posta kutusu za
 $wb['domain_txt'] = 'Alan Adı';
 $wb['duplicate_email_alias_txt'] = 'Bu takma e-posta adresi zaten var.';
 $wb['source_txt'] = 'Takma Ad';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this alias as origin';
 ?>
-
diff --git a/interface/web/mail/lib/lang/tr_mail_aliasdomain_list.lng b/interface/web/mail/lib/lang/tr_mail_aliasdomain_list.lng
index b169aa8ee5..a6d3dfc3b9 100644
--- a/interface/web/mail/lib/lang/tr_mail_aliasdomain_list.lng
+++ b/interface/web/mail/lib/lang/tr_mail_aliasdomain_list.lng
@@ -3,6 +3,5 @@ $wb['list_head_txt'] = 'Takma Alan Adı';
 $wb['active_txt'] = 'Etkin';
 $wb['source_txt'] = 'Kaynak';
 $wb['destination_txt'] = 'Hedef';
-$wb['source_txt'] = 'Kaynak';
 $wb['add_new_record_txt'] = 'Takma Alan Adı Ekle';
 ?>
diff --git a/interface/web/mail/lib/lang/tr_mail_domain.lng b/interface/web/mail/lib/lang/tr_mail_domain.lng
index 81ec5f9500..069efee9ce 100644
--- a/interface/web/mail/lib/lang/tr_mail_domain.lng
+++ b/interface/web/mail/lib/lang/tr_mail_domain.lng
@@ -7,16 +7,17 @@ $wb['domain_error_empty'] = 'Alan adı boş olamaz.';
 $wb['domain_error_unique'] = 'Bu alan adı zaten var.';
 $wb['domain_error_regex'] = 'Alan adı geçersiz.';
 $wb['client_txt'] = 'Müşteri';
-$wb["dkim_txt"] = 'enable DKIM';
-$wb["dkim_private_txt"] = 'DKIM Private-key';
-$wb["dkim_public_txt"] = 'DKIM Public-key\nfor information only';
-$wb["dkim_generate_txt"] = 'Generate DKIM Private-key';
-$wb["dkim_dns_txt"] = 'DNS-Record';
-$wb["dkim_private_key_error"] = 'Invalid DKIM-Private key';
+$wb['dkim_txt'] = 'enable DKIM';
+$wb['dkim_private_txt'] = 'DKIM Private-key';
+$wb['dkim_public_txt'] = 'DKIM Public-key\nfor information only';
+$wb['dkim_generate_txt'] = 'Generate DKIM Private-key';
+$wb['dkim_dns_txt'] = 'DNS-Record';
+$wb['dkim_private_key_error'] = 'Invalid DKIM-Private key';
 $wb['dkim_selector_txt'] = 'DKIM-Selector';
 $wb['dkim_selector_error'] = 'Invalid DKIM-Selector. Use only lower-case alphanumeric characters (a-z or 0-9) up to 63 chars';
-$wb["dkim_settings_txt"] = 'DomainKeys Identified Mail (DKIM)';
+$wb['dkim_settings_txt'] = 'DomainKeys Identified Mail (DKIM)';
 $wb['limit_maildomain_txt'] = 'Hesabınıza ekleyebileceğiniz en fazla alan adı sayısına ulaştınız.';
 $wb['policy_txt'] = 'Önemsiz Posta Süzgeci';
 $wb['no_policy'] = '- devre dışı -';
+$wb['error_not_allowed_server_id'] = 'Chosen server is not allowed for this account.';
 ?>
diff --git a/interface/web/mail/lib/lang/tr_mail_domain_catchall.lng b/interface/web/mail/lib/lang/tr_mail_domain_catchall.lng
index 7d3c296482..037d2ad16e 100644
--- a/interface/web/mail/lib/lang/tr_mail_domain_catchall.lng
+++ b/interface/web/mail/lib/lang/tr_mail_domain_catchall.lng
@@ -6,8 +6,6 @@ $wb['domain_error_unique'] = 'Bu alan adı için zaten bir tümünü al kayıdı
 $wb['no_domain_perm'] = 'Bu alan adı için izniniz yok.';
 $wb['domain_error_regex'] = 'Alan adı geçersiz ya da geçersiz karakterler içeriyor.';
 $wb['limit_mailcatchall_txt'] = 'Hesabınıza ekleyebileceğiniz en fazla tümünü al hesabı sayısına ulaştınız.';
-$wb['domain_txt'] = 'Alan Adı';
 $wb['source_txt'] = 'Kaynak';
 $wb['destination_error_isemail'] = 'Hedef e-posta adresi geçersiz.';
 ?>
-
diff --git a/interface/web/mail/lib/lang/tr_mail_forward.lng b/interface/web/mail/lib/lang/tr_mail_forward.lng
index a0fe1339d6..aee530ca0a 100644
--- a/interface/web/mail/lib/lang/tr_mail_forward.lng
+++ b/interface/web/mail/lib/lang/tr_mail_forward.lng
@@ -7,5 +7,7 @@ $wb['limit_mailforward_txt'] = 'Hesabınıza ekleyebileceğiniz en fazla e-posta
 $wb['duplicate_mailbox_txt'] = 'Bu e-posta adresini kullanan bir posta kutusu zaten var';
 $wb['domain_txt'] = 'Alan Adı';
 $wb['source_txt'] = 'Kaynak E-posta';
+$wb['email_error_isemail'] = 'Please enter a valid email address.';
+$wb['send_as_txt'] = 'Send as';
+$wb['send_as_exp'] = 'Allow target to send mail using this address as origin (if target is internal)';
 ?>
-
diff --git a/interface/web/mail/lib/lang/tr_mail_get.lng b/interface/web/mail/lib/lang/tr_mail_get.lng
index de3a625e51..3e29c26a71 100644
--- a/interface/web/mail/lib/lang/tr_mail_get.lng
+++ b/interface/web/mail/lib/lang/tr_mail_get.lng
@@ -15,5 +15,5 @@ $wb['source_username_error_isempty'] = 'Kullanıcı adı boş olamaz.';
 $wb['source_password_error_isempty'] = 'Parola boş olamaz.';
 $wb['destination_error_isemail'] = 'Hedef seçilmemiş.';
 $wb['source_server_error_regex'] = 'POP3/IMAP Sunucu alan adı geçersiz.';
-$wb['error_delete_read_all_combination'] = 'Seçenek kombinasyonu geçersiz. You can not use "E-postalar alındıktan sonra silinsin" = Hayır iken "Tüm e-postalar alınsın" = Evet olamaz';
+$wb['error_delete_read_all_combination'] = 'Seçenek kombinasyonu geçersiz. You can not use \"E-postalar alındıktan sonra silinsin\" = Hayır iken \"Tüm e-postalar alınsın\" = Evet olamaz';
 ?>
diff --git a/interface/web/mail/lib/lang/tr_mail_user.lng b/interface/web/mail/lib/lang/tr_mail_user.lng
index d3457599a9..ebdcce2a92 100644
--- a/interface/web/mail/lib/lang/tr_mail_user.lng
+++ b/interface/web/mail/lib/lang/tr_mail_user.lng
@@ -9,29 +9,6 @@ $wb['email_error_unique'] = 'Bu e-posta adresi zaten var.';
 $wb['autoresponder_subject_txt'] = 'E-posta Konusu';
 $wb['autoresponder_subject'] = 'Ofis dışında yanıtı';
 $wb['autoresponder_text_txt'] = 'Metin';
-$wb['no_domain_perm'] = 'Bu domain için yetkiniz yok.';
-$wb['error_no_pwd'] = 'Şifre boş.';
-$wb['quota_error_isint'] = 'Mail kutusu boyutu sayı olmak zorunda.';
-$wb['quota_txt'] = 'Kota';
-$wb['server_id_txt'] = 'Server_id';
-$wb['password_txt'] = 'Şifre';
-$wb['maildir_txt'] = 'Mail dizini';
-$wb['postfix_txt'] = 'Alış Aktif';
-$wb['greylisting_txt'] = 'Enable greylisting';
-$wb['access_txt'] = 'Erişim Aktif';
-$wb['policy_txt'] = 'Spam filtresi';
-$wb['no_policy'] = '- aktif değil -';
-$wb['limit_mailbox_txt'] = 'Hesabınızdaki mail kutusu limiti sayısına ulaştınız.';
-$wb['limit_mailquota_txt'] = 'Mail kutunuz için max. alana ulaştınız. Max. kullanılabilir alan MB:';
-$wb['disableimap_txt'] = 'IMAP Devre Dışı';
-$wb['disablepop3_txt'] = 'POP3 Devre Dışı';
-$wb['duplicate_alias_or_forward_txt'] = 'Bu email adresinde alias veya yönlendirme zaten var.';
-$wb['quota_error_value'] = 'Geçersiz kota değeri. İzin verilen değerler: Limitsiz için 0 veya 1den büyük';
-$wb['autoresponder_txt'] = 'Etkin';
-$wb['autoresponder_start_date_txt'] = 'Başlangıç';
-$wb['autoresponder_start_date_ispast'] = 'Başlangıç zamanı geçmişte olamaz.';
-$wb['autoresponder_end_date_txt'] = 'Bitiş';
-$wb['autoresponder_end_date_isgreater'] = 'Bitiş zamanı başlangıç zamanından sonra olmalıdır.';
 $wb['no_domain_perm'] = 'Bu alan adı için izniniz yok.';
 $wb['error_no_pwd'] = 'Parola boş olamaz.';
 $wb['quota_error_isint'] = 'Posta kutusunun boyutu bir sayı olmalıdır.';
@@ -40,26 +17,31 @@ $wb['server_id_txt'] = 'Sunucu kodu';
 $wb['password_txt'] = 'Parola';
 $wb['maildir_txt'] = 'Posta Klasörü';
 $wb['postfix_txt'] = 'Alım Etkin';
+$wb['greylisting_txt'] = 'Enable greylisting';
 $wb['access_txt'] = 'Erişim Etkin';
 $wb['policy_txt'] = 'Önemsiz Posta Süzgeci';
 $wb['no_policy'] = '- devre dışı -';
 $wb['limit_mailbox_txt'] = 'Hesabınıza ekleyebileceğiniz en fazla posta kutusu sayısına ulaştınız.';
 $wb['limit_mailquota_txt'] = 'Posta kutularınız için kullanabileceğiniz en fazla boyuta ulaştınız. Kullanılabilecek alan MB:';
-$wb['disablesmtp_txt'] = 'SMTP Kullanılmasın (gönderim)';
 $wb['disableimap_txt'] = 'IMAP Kullanılmasın';
 $wb['disablepop3_txt'] = 'POP3 Kullanılmasın';
 $wb['duplicate_alias_or_forward_txt'] = 'Bu e-posta adresi zaten takma ya da yönlendirilmiş.';
 $wb['quota_error_value'] = 'Kota değeri geçersiz. Değer sınırsız için 0 ya da 1 değerinden büyük olmalı';
+$wb['autoresponder_txt'] = 'Etkin';
+$wb['autoresponder_start_date_txt'] = 'Başlangıç';
+$wb['autoresponder_start_date_ispast'] = 'Başlangıç zamanı geçmişte olamaz.';
+$wb['autoresponder_end_date_txt'] = 'Bitiş';
+$wb['autoresponder_end_date_isgreater'] = 'Bitiş zamanı başlangıç zamanından sonra olmalıdır.';
+$wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
 $wb['move_junk_txt'] = 'Önemsiz Epostalar Junk Klasörüne Taşınsın';
 $wb['name_txt'] = 'Ad';
 $wb['name_optional_txt'] = '(İsteğe bağlı)';
-$wb["backup_interval_txt"] = 'Backup interval';
-$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['no_backup_txt'] = 'No backup';
 $wb['daily_backup_txt'] = 'Daily';
 $wb['weekly_backup_txt'] = 'Weekly';
 $wb['monthly_backup_txt'] = 'Monthly';
-$wb['disablesmtp_txt'] = 'Disable SMTP (sending)';
 $wb['autoresponder_active'] = 'Otoyanıtlayıcı kullanılsın';
 $wb['cc_txt'] = 'Kopyası şuraya gönderilsin';
 $wb['cc_error_isemail'] = 'Kopyası şuraya gönderilsin alanına geçerli bir e-posta adresi yazılmalı';
@@ -75,5 +57,8 @@ $wb['password_mismatch_txt'] = 'Parola ile onayı aynı değil.';
 $wb['password_match_txt'] = 'Parola ile onayı aynı.';
 $wb['email_error_isascii'] = 'E-posta istemcinizde sorun yaşamamak için lütfen parolanızda dile özel unikod karakterler kullanmayın.';
 $wb['cc_note_txt'] = '(Birden çok e-posta adresini virgül ile ayırarak yazın)';
+$wb['autoresponder_start_date_is_required'] = 'Start date must be set when Autoresponder is enabled.';
+$wb['sender_cc_txt'] = 'Send outgoing copy to';
+$wb['sender_cc_error_isemail'] = 'The -Send outgoing copy to- field does not contain a valid email address';
+$wb['sender_cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
-
diff --git a/interface/web/mail/lib/lang/tr_mail_user_filter.lng b/interface/web/mail/lib/lang/tr_mail_user_filter.lng
index 2d67501d8e..2faa508ed0 100644
--- a/interface/web/mail/lib/lang/tr_mail_user_filter.lng
+++ b/interface/web/mail/lib/lang/tr_mail_user_filter.lng
@@ -15,7 +15,14 @@ $wb['contains_txt'] = 'Şunu içeren';
 $wb['is_txt'] = 'Şununla aynı';
 $wb['begins_with_txt'] = 'Şununla başlayan';
 $wb['ends_with_txt'] = 'Şununla biten';
-$wb['move_to_txt'] = 'Şuraya taşı';
 $wb['delete_txt'] = 'Sil';
+$wb['move_stop_txt'] = 'Move to';
+$wb['header_txt'] = 'Header';
+$wb['size_over_txt'] = 'Email size over (KB)';
+$wb['size_under_txt'] = 'Email size under (KB)';
+$wb['localpart_txt'] = 'Localpart';
+$wb['domain_txt'] = 'Domain';
+$wb['keep_txt'] = 'Keep';
+$wb['reject_txt'] = 'Reject';
+$wb['stop_txt'] = 'Stop';
 ?>
-
diff --git a/interface/web/mail/lib/lang/tr_mail_user_list.lng b/interface/web/mail/lib/lang/tr_mail_user_list.lng
index 45cef78805..6310ce4038 100644
--- a/interface/web/mail/lib/lang/tr_mail_user_list.lng
+++ b/interface/web/mail/lib/lang/tr_mail_user_list.lng
@@ -5,4 +5,8 @@ $wb['autoresponder_txt'] = 'Otomatik Yanıtlayıcı';
 $wb['add_new_record_txt'] = 'Posta Kutusu Ekle';
 $wb['name_txt'] = 'Gerçek Ad';
 $wb['login_txt'] = 'Oturum Aç';
+$wb['postfix_txt'] = 'Receiving';
+$wb['disablesmtp_txt'] = 'SMTP (sending)';
+$wb['disableimap_txt'] = 'IMAP';
+$wb['disablepop3_txt'] = 'POP3';
 ?>
diff --git a/interface/web/mail/lib/lang/tr_spamfilter_policy.lng b/interface/web/mail/lib/lang/tr_spamfilter_policy.lng
index 94503d46d9..721b0490f7 100644
--- a/interface/web/mail/lib/lang/tr_spamfilter_policy.lng
+++ b/interface/web/mail/lib/lang/tr_spamfilter_policy.lng
@@ -36,4 +36,3 @@ $wb['spam_admin_txt'] = 'Önemsiz posta yönetici';
 $wb['message_size_limit_txt'] = 'İleti boyutu sınırı';
 $wb['banned_rulenames_txt'] = 'Yasak kural adları';
 ?>
-
diff --git a/interface/web/mail/lib/lang/tr_user_quota_stats_list.lng b/interface/web/mail/lib/lang/tr_user_quota_stats_list.lng
index ea9f16fea0..d97ab317f6 100755
--- a/interface/web/mail/lib/lang/tr_user_quota_stats_list.lng
+++ b/interface/web/mail/lib/lang/tr_user_quota_stats_list.lng
@@ -6,4 +6,3 @@ $wb['email_txt'] = 'E-posta Adresi';
 $wb['used_txt'] = 'Kullanılan Alan';
 $wb['percentage_txt'] = 'Kullanılan %';
 ?>
-
diff --git a/interface/web/mail/lib/lang/tr_xmpp_domain.lng b/interface/web/mail/lib/lang/tr_xmpp_domain.lng
new file mode 100644
index 0000000000..f1da77ba29
--- /dev/null
+++ b/interface/web/mail/lib/lang/tr_xmpp_domain.lng
@@ -0,0 +1,62 @@
+<?php
+$wb["server_id_txt"] = 'Server';
+$wb["client_group_id_txt"] = 'Client';
+$wb["domain_txt"] = 'Domain';
+$wb["type_txt"] = 'Type';
+$wb["active_txt"] = 'Active';
+$wb["client_txt"] = 'Client';
+$wb["management_method_txt"] = 'Management of user accounts';
+$wb["public_registration_txt"] = 'Enable public registration';
+$wb["registration_url_txt"] = 'Registration URL';
+$wb["registration_message_txt"] = 'Registration Message';
+$wb["domain_admins_txt"] = 'Domain Admins (JIDs)';
+$wb["use_pubsub_txt"] = 'Enable Pubsub';
+$wb["use_proxy_txt"] = 'Enable Bytestream Proxy';
+$wb["use_anon_host_txt"] = 'Enable Anonymous Host';
+$wb["use_vjud_txt"] = 'Enable VJUD User Directory';
+$wb["vjud_opt_mode_txt"] = 'VJUD Opt Mode';
+$wb["use_muc_host_txt"] = 'Enable Multi User Chatrooms';
+$wb["muc_name_txt"] = 'Name in MUC Service Discovery';
+$wb["muc_restrict_room_creation_txt"] = 'Permission to create chatrooms';
+$wb["muc_admins_txt"] = 'MUC Admins (JIDs)';
+$wb["use_pastebin_txt"] = 'Enable Pastebin';
+$wb["pastebin_expire_after_txt"] = 'Pastes expire after (hours)';
+$wb["pastebin_trigger_txt"] = 'Pastebin trigger';
+$wb["use_http_archive_txt"] = 'Enable HTTP chatroom archive';
+$wb["http_archive_show_join_txt"] = 'Show join messages in archive';
+$wb["http_archive_show_status_txt"] = 'Show status changes in archive';
+$wb["use_status_host_txt"] = 'Enable XML Status host';
+$wb["cant_change_domainname_txt"] = 'The Domain name of existing XMPP domain cannot be changed.';
+$wb["about_registration_url_txt"] = 'Link to your registration form.';
+$wb["about_registration_message_txt"] = 'Description about your account registration process.';
+$wb["no_corresponding_maildomain_txt"] = 'Corresponding mail domain for user management not found. Please create the mail domain first.';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_email_txt'] = 'Email Address';
+$wb['ssl_txt'] = 'SSL';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['none_txt'] = 'None';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ssl_error_isemail'] = 'Please enter a valid email adress for generation of the SSL certificate';
+$wb["limit_xmppdomain_txt"] = 'The max. number of XMPP domains for your account is reached.';
+?>
diff --git a/interface/web/mail/lib/lang/tr_xmpp_domain_admin_list.lng b/interface/web/mail/lib/lang/tr_xmpp_domain_admin_list.lng
new file mode 100644
index 0000000000..a3d1736d7b
--- /dev/null
+++ b/interface/web/mail/lib/lang/tr_xmpp_domain_admin_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$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';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/tr_xmpp_domain_list.lng b/interface/web/mail/lib/lang/tr_xmpp_domain_list.lng
new file mode 100644
index 0000000000..f8c2fb9b8e
--- /dev/null
+++ b/interface/web/mail/lib/lang/tr_xmpp_domain_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb["list_head_txt"] = 'XMPP Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["add_new_record_txt"] = 'Add new Domain';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/tr_xmpp_user.lng b/interface/web/mail/lib/lang/tr_xmpp_user.lng
new file mode 100644
index 0000000000..1cc852e3cf
--- /dev/null
+++ b/interface/web/mail/lib/lang/tr_xmpp_user.lng
@@ -0,0 +1,15 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["active_txt"] = 'Active';
+$wb["cryptpwd_txt"] = 'Password';
+$wb["password_strength_txt"] = 'Password strength';
+$wb["error_no_pwd"] = 'Password is empty.';
+$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["no_domain_perm"] = 'You have no permission for this domain.';
+$wb["limit_xmpp_user_txt"] = 'The max. number of xmpp accounts for your account is reached.';
+?>
\ No newline at end of file
diff --git a/interface/web/mail/lib/lang/tr_xmpp_user_list.lng b/interface/web/mail/lib/lang/tr_xmpp_user_list.lng
new file mode 100644
index 0000000000..db88b0d7e3
--- /dev/null
+++ b/interface/web/mail/lib/lang/tr_xmpp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'XMPP User Accounts';
+$wb["jid_txt"] = 'Jabber ID';
+$wb["is_domain_admin_txt"] = 'Domain admin';
+$wb["is_muc_admin_txt"] = 'MUC admin';
+$wb["add_new_record_txt"] = 'Add new user';
+$wb["active_txt"] = 'Active';
+?>
\ No newline at end of file
diff --git a/interface/web/mailuser/lib/lang/ca.lng b/interface/web/mailuser/lib/lang/ca.lng
new file mode 100644
index 0000000000..114dec9b91
--- /dev/null
+++ b/interface/web/mailuser/lib/lang/ca.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['Email Account'] = 'Email Account';
+$wb['Overview'] = 'Overview';
+$wb['Password'] = 'Password';
+$wb['Autoresponder'] = 'Autoresponder';
+$wb['Send copy'] = 'Send copy';
+$wb['Spamfilter'] = 'Spamfilter';
+$wb['Email Filters'] = 'Email Filters';
+?>
diff --git a/interface/web/mailuser/lib/lang/ca_index.lng b/interface/web/mailuser/lib/lang/ca_index.lng
new file mode 100644
index 0000000000..d1ca539e9d
--- /dev/null
+++ b/interface/web/mailuser/lib/lang/ca_index.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['page_head_txt'] = 'Mailbox settings';
+$wb['page_desc_txt'] = 'Here you can edit the settings for the courriel account.';
+$wb['email_txt'] = 'Adresse courriel';
+$wb['login_txt'] = 'Connexion';
+$wb['server_address_txt'] = 'Mailserver address';
+$wb['cc_txt'] = 'Send copy to (CC)';
+$wb['quota_txt'] = 'Mailbox size';
+$wb['unlimited_txt'] = 'Illimité';
+$wb['mb_txt'] = 'MB';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/mailuser/lib/lang/ca_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/ca_mail_user_autoresponder.lng
new file mode 100644
index 0000000000..79f386a7dc
--- /dev/null
+++ b/interface/web/mailuser/lib/lang/ca_mail_user_autoresponder.lng
@@ -0,0 +1,13 @@
+<?php
+$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
+$wb['autoresponder_subject'] = 'Out of office reply';
+$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';
+?>
diff --git a/interface/web/mailuser/lib/lang/ca_mail_user_cc.lng b/interface/web/mailuser/lib/lang/ca_mail_user_cc.lng
new file mode 100644
index 0000000000..90cc6622de
--- /dev/null
+++ b/interface/web/mailuser/lib/lang/ca_mail_user_cc.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['mailbox_cc_txt'] = 'Send copy to courriel address';
+$wb['cc_txt'] = 'Envoyer une copie à';
+$wb['email_txt'] = 'Courriel';
+$wb['cc_error_isemail'] = 'Courriel invalide dans le champ - copie conforme -';
+$wb['email_is_cc_error'] = 'Coipe conforme invalide.';
+$wb['name_optional_txt'] = '(Optionnel)';
+$wb['cc_note_txt'] = '(Séparer chaque adresses par une virgule)';
+?>
diff --git a/interface/web/mailuser/lib/lang/ca_mail_user_filter.lng b/interface/web/mailuser/lib/lang/ca_mail_user_filter.lng
new file mode 100644
index 0000000000..2e74ffd4f7
--- /dev/null
+++ b/interface/web/mailuser/lib/lang/ca_mail_user_filter.lng
@@ -0,0 +1,20 @@
+<?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';
+?>
diff --git a/interface/web/mailuser/lib/lang/ca_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/ca_mail_user_filter_list.lng
new file mode 100644
index 0000000000..f3ea9d1ee5
--- /dev/null
+++ b/interface/web/mailuser/lib/lang/ca_mail_user_filter_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Règles des filtres';
+$wb['rulename_txt'] = 'Nom';
+$wb['add_new_record_txt'] = 'Ajuter un nouveau filtre';
+$wb['page_txt'] = 'Page';
+$wb['page_of_txt'] = 'de';
+$wb['delete_confirmation'] = 'Voulez vous vraiment supprimer ce filtre?';
+?>
diff --git a/interface/web/mailuser/lib/lang/ca_mail_user_password.lng b/interface/web/mailuser/lib/lang/ca_mail_user_password.lng
new file mode 100644
index 0000000000..d52786ce07
--- /dev/null
+++ b/interface/web/mailuser/lib/lang/ca_mail_user_password.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['mailbox_password_txt'] = 'Mailbox password';
+$wb['password_txt'] = 'Password';
+$wb['password_strength_txt'] = 'Password strength';
+$wb['email_txt'] = 'Courriel';
+$wb['generate_password_txt'] = 'Générer mot de passe';
+$wb['repeat_password_txt'] = 'Retaper le mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+?>
diff --git a/interface/web/mailuser/lib/lang/ca_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/ca_mail_user_spamfilter.lng
new file mode 100644
index 0000000000..2b29913e5f
--- /dev/null
+++ b/interface/web/mailuser/lib/lang/ca_mail_user_spamfilter.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
+$wb['spamfilter_txt'] = 'Spamfilter';
+$wb['email_txt'] = 'Courriel';
+$wb['no_policy'] = '- not enabled -';
+$wb['policy_txt'] = 'Policy';
+?>
diff --git a/interface/web/mailuser/lib/lang/cz.lng b/interface/web/mailuser/lib/lang/cz.lng
index 12f1bd72cc..8b4b58bc42 100644
--- a/interface/web/mailuser/lib/lang/cz.lng
+++ b/interface/web/mailuser/lib/lang/cz.lng
@@ -7,5 +7,3 @@ $wb['Send copy'] = 'Poslat kopii na e-mail';
 $wb['Spamfilter'] = 'Spamový filtr';
 $wb['Email Filters'] = 'E-mailové filtry';
 ?>
-
-
diff --git a/interface/web/mailuser/lib/lang/cz_index.lng b/interface/web/mailuser/lib/lang/cz_index.lng
index 9b820cdee6..45af56ee8d 100644
--- a/interface/web/mailuser/lib/lang/cz_index.lng
+++ b/interface/web/mailuser/lib/lang/cz_index.lng
@@ -10,5 +10,3 @@ $wb['unlimited_txt'] = 'Neomezený';
 $wb['mb_txt'] = 'MB';
 $wb['none_txt'] = 'Nenastaveno';
 ?>
-
-
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
index f8d331b557..ef3aeb42da 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_autoresponder.lng
@@ -11,5 +11,3 @@ $wb['autoresponder_active'] = 'Povolit automatický odpovídač';
 $wb['now_txt'] = 'Nyní';
 $wb['autoresponder_subject_txt'] = 'Předmět e-mailu';
 ?>
-
-
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng b/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
index 780d3f6035..0d9a7f53c3 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_cc.lng
@@ -7,5 +7,3 @@ $wb['email_is_cc_error'] = 'Vyplněná e-mailová adresa a poslat kopii na e-mai
 $wb['name_optional_txt'] = '(Volitelné)';
 $wb['cc_note_txt'] = '(Při přeposílání na více e-mailových adres, oddělte čárkami.)';
 ?>
-
-
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng b/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
index 65300b6d95..3df9d38c72 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_filter.lng
@@ -18,5 +18,3 @@ $wb['ends_with_txt'] = 'Končí na';
 $wb['move_to_txt'] = 'Přesunout do';
 $wb['delete_txt'] = 'Smazat';
 ?>
-
-
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng
index 4b64af9205..3c2593d6d4 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_filter_list.lng
@@ -6,5 +6,3 @@ $wb['page_txt'] = 'Stránka';
 $wb['page_of_txt'] = 'z';
 $wb['delete_confirmation'] = 'Opravdu chcete odstranit e-mail filter?';
 ?>
-
-
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_password.lng b/interface/web/mailuser/lib/lang/cz_mail_user_password.lng
index 21357c7286..4f914cdfc6 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_password.lng
@@ -8,5 +8,3 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
 $wb['password_mismatch_txt'] = 'Hesla se neshodují.';
 $wb['password_match_txt'] = 'Hesla se shodují.';
 ?>
-
-
diff --git a/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
index c6345567b0..2a53036be6 100644
--- a/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/cz_mail_user_spamfilter.lng
@@ -5,5 +5,3 @@ $wb['email_txt'] = 'E-mail';
 $wb['no_policy'] = '- nepovoleno -';
 $wb['policy_txt'] = 'Politika';
 ?>
-
-
diff --git a/interface/web/mailuser/lib/lang/fr.lng b/interface/web/mailuser/lib/lang/fr.lng
index 114dec9b91..8337fcb4e2 100644
--- a/interface/web/mailuser/lib/lang/fr.lng
+++ b/interface/web/mailuser/lib/lang/fr.lng
@@ -1,9 +1,9 @@
 <?php
-$wb['Email Account'] = 'Email Account';
-$wb['Overview'] = 'Overview';
-$wb['Password'] = 'Password';
-$wb['Autoresponder'] = 'Autoresponder';
-$wb['Send copy'] = 'Send copy';
-$wb['Spamfilter'] = 'Spamfilter';
-$wb['Email Filters'] = 'Email Filters';
+$wb['Email Account'] = 'Compte de messagerie';
+$wb['Overview'] = 'Vue d’ensemble';
+$wb['Password'] = 'Mot de passe';
+$wb['Autoresponder'] = 'Réponse automatique';
+$wb['Send copy'] = 'Envoyer une copie';
+$wb['Spamfilter'] = 'Filtre anti-spam';
+$wb['Email Filters'] = 'Filtre de messagerie';
 ?>
diff --git a/interface/web/mailuser/lib/lang/fr_index.lng b/interface/web/mailuser/lib/lang/fr_index.lng
index 29fe9ea4f3..ab4b235772 100644
--- a/interface/web/mailuser/lib/lang/fr_index.lng
+++ b/interface/web/mailuser/lib/lang/fr_index.lng
@@ -1,12 +1,12 @@
 <?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['mb_txt'] = 'MB';
-$wb['none_txt'] = 'None';
+$wb['page_head_txt'] = 'Paramètres des boîtes aux lettres';
+$wb['page_desc_txt'] = 'Ici vous pouvez modifier les paramètres des comptes de messagerie.';
+$wb['email_txt'] = 'Adresse e-mail';
+$wb['login_txt'] = 'Nom d’utilisateur';
+$wb['server_address_txt'] = 'Adresse du serveur de messagerie';
+$wb['cc_txt'] = 'Envoyer une copie à (CC)';
+$wb['quota_txt'] = 'Taille de la boîte aux lettres';
+$wb['unlimited_txt'] = 'Illimité';
+$wb['mb_txt'] = 'Mo';
+$wb['none_txt'] = 'Aucune';
 ?>
diff --git a/interface/web/mailuser/lib/lang/fr_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/fr_mail_user_autoresponder.lng
index 79f386a7dc..24252bebc0 100644
--- a/interface/web/mailuser/lib/lang/fr_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/fr_mail_user_autoresponder.lng
@@ -1,13 +1,13 @@
 <?php
-$wb['mailbox_autoresponder_txt'] = 'Autoresponder';
-$wb['autoresponder_subject'] = 'Out of office reply';
-$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['mailbox_autoresponder_txt'] = 'Réponse automatique';
+$wb['autoresponder_subject'] = 'Absent du bureau';
+$wb['autoresponder_text_txt'] = 'Texte';
+$wb['autoresponder_txt'] = 'Actif';
+$wb['autoresponder_start_date_txt'] = 'Débute le';
+$wb['autoresponder_start_date_isfuture'] = 'La date de début ne pas être antérieure à la date du jour.';
+$wb['autoresponder_end_date_txt'] = 'Fini le';
+$wb['autoresponder_end_date_isgreater'] = 'La date de fin doit être définie et être après la date de début.';
+$wb['autoresponder_active'] = 'Activer la réponse automatique';
+$wb['now_txt'] = 'Maintenant';
+$wb['autoresponder_subject_txt'] = 'Cordialement.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/fr_mail_user_cc.lng b/interface/web/mailuser/lib/lang/fr_mail_user_cc.lng
index 81877884cc..d29dacd830 100644
--- a/interface/web/mailuser/lib/lang/fr_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/fr_mail_user_cc.lng
@@ -1,9 +1,9 @@
 <?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'] = 'Envoyer une copie à l’adresse e-mail';
+$wb['cc_txt'] = 'Envoyer une copie à';
+$wb['email_txt'] = 'E-mail';
+$wb['cc_error_isemail'] = 'Adresse e-mail invalide dans le champ - Envoyer une copie à -';
+$wb['email_is_cc_error'] = 'L’adresse e-mail principale et l’addresse de copie ne peuvent pas être identiques.';
+$wb['name_optional_txt'] = '(Optionel)';
+$wb['cc_note_txt'] = '(Séparer les addresses e-mail multiples avec une virgule)';
 ?>
diff --git a/interface/web/mailuser/lib/lang/fr_mail_user_filter.lng b/interface/web/mailuser/lib/lang/fr_mail_user_filter.lng
index 2e74ffd4f7..273805486f 100644
--- a/interface/web/mailuser/lib/lang/fr_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/fr_mail_user_filter.lng
@@ -1,20 +1,20 @@
 <?php
-$wb['rulename_txt'] = 'Name';
+$wb['rulename_txt'] = 'Nom';
 $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['target_txt'] = 'Dossier';
+$wb['active_txt'] = 'Actif';
+$wb['rulename_error_empty'] = 'Le nom est vide.';
+$wb['searchterm_is_empty'] = 'Le terme recherché est vide.';
 $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['target_error_regex'] = 'La cible ne peut contenir que les caratères suivants : a-z, 0-9, -, ., _, et {espace}';
+$wb['limit_mailfilter_txt'] = 'Le nombre maximum de filtre e-mail a été atteint.';
+$wb['subject_txt'] = 'Objet';
+$wb['from_txt'] = 'De';
+$wb['to_txt'] = 'À';
+$wb['contains_txt'] = 'Contient';
+$wb['is_txt'] = 'est';
+$wb['begins_with_txt'] = 'Commence par';
+$wb['ends_with_txt'] = 'Fini par';
+$wb['move_to_txt'] = 'Déplacer vers';
+$wb['delete_txt'] = 'Supprimer';
 ?>
diff --git a/interface/web/mailuser/lib/lang/fr_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/fr_mail_user_filter_list.lng
index fb6b9dfa5d..73cbe1b7b2 100644
--- a/interface/web/mailuser/lib/lang/fr_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/fr_mail_user_filter_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Email filter rules';
-$wb['rulename_txt'] = 'Name';
-$wb['add_new_record_txt'] = 'Add new Filter';
+$wb['list_head_txt'] = 'Règles de filtre e-mail';
+$wb['rulename_txt'] = 'Nom';
+$wb['add_new_record_txt'] = 'Ajouter un nouveau filtre';
 $wb['page_txt'] = 'Page';
-$wb['page_of_txt'] = 'of';
-$wb['delete_confirmation'] = 'Do you really want to delete the mailfilter?';
+$wb['page_of_txt'] = 'de';
+$wb['delete_confirmation'] = 'Voulez-vous vraiment supprimer ce filter ?';
 ?>
diff --git a/interface/web/mailuser/lib/lang/fr_mail_user_password.lng b/interface/web/mailuser/lib/lang/fr_mail_user_password.lng
index cdf9674e70..273740074d 100644
--- a/interface/web/mailuser/lib/lang/fr_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/fr_mail_user_password.lng
@@ -1,10 +1,10 @@
 <?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'] = 'Mot de passe de la boîte aux lettres';
+$wb['password_txt'] = 'Mot de passe';
+$wb['password_strength_txt'] = 'Compléxité du mot de passe';
+$wb['email_txt'] = 'E-mail';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Répéter le mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/fr_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/fr_mail_user_spamfilter.lng
index be4bad9050..f6bcd5d32d 100644
--- a/interface/web/mailuser/lib/lang/fr_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/fr_mail_user_spamfilter.lng
@@ -1,7 +1,7 @@
 <?php
-$wb['mailbox_spamfilter_txt'] = 'Spamfilter';
-$wb['spamfilter_txt'] = 'Spamfilter';
-$wb['email_txt'] = 'Email';
-$wb['no_policy'] = '- not enabled -';
-$wb['policy_txt'] = 'Policy';
+$wb['mailbox_spamfilter_txt'] = 'Filtre anti-spam';
+$wb['spamfilter_txt'] = 'Filtre anti-spam';
+$wb['email_txt'] = 'E-mail';
+$wb['no_policy'] = '- non activé -';
+$wb['policy_txt'] = 'Stratégie';
 ?>
diff --git a/interface/web/mailuser/lib/lang/hr.lng b/interface/web/mailuser/lib/lang/hr.lng
index 2113122875..0b1a365a98 100644
--- a/interface/web/mailuser/lib/lang/hr.lng
+++ b/interface/web/mailuser/lib/lang/hr.lng
@@ -7,5 +7,3 @@ $wb['Send copy'] = 'Pošalji kopiju';
 $wb['Spamfilter'] = 'Spamfilter';
 $wb['Email Filters'] = 'Email filteri';
 ?>
-
-
diff --git a/interface/web/mailuser/lib/lang/hr_index.lng b/interface/web/mailuser/lib/lang/hr_index.lng
index 5daeff1eef..b8e00140e8 100644
--- a/interface/web/mailuser/lib/lang/hr_index.lng
+++ b/interface/web/mailuser/lib/lang/hr_index.lng
@@ -10,5 +10,3 @@ $wb['unlimited_txt'] = 'Neograničeno';
 $wb['mb_txt'] = 'MB';
 $wb['none_txt'] = 'Ništa';
 ?>
-
-
diff --git a/interface/web/mailuser/lib/lang/hr_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/hr_mail_user_autoresponder.lng
index 6cf47669f0..bbb3b79bc4 100644
--- a/interface/web/mailuser/lib/lang/hr_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/hr_mail_user_autoresponder.lng
@@ -11,5 +11,3 @@ $wb['autoresponder_active'] = 'Enable the autoresponder';
 $wb['now_txt'] = 'Sada';
 $wb['autoresponder_subject_txt'] = 'Betreff';
 ?>
-
-
diff --git a/interface/web/mailuser/lib/lang/hr_mail_user_cc.lng b/interface/web/mailuser/lib/lang/hr_mail_user_cc.lng
index 4c54745302..81877884cc 100644
--- a/interface/web/mailuser/lib/lang/hr_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/hr_mail_user_cc.lng
@@ -7,5 +7,3 @@ $wb['email_is_cc_error'] = 'Email address and send copy to address can not be th
 $wb['name_optional_txt'] = '(Optional)';
 $wb['cc_note_txt'] = '(Separate multiple email addresses with commas)';
 ?>
-
-
diff --git a/interface/web/mailuser/lib/lang/hr_mail_user_filter.lng b/interface/web/mailuser/lib/lang/hr_mail_user_filter.lng
index 33679318d7..5512bac57b 100644
--- a/interface/web/mailuser/lib/lang/hr_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/hr_mail_user_filter.lng
@@ -18,5 +18,3 @@ $wb['ends_with_txt'] = 'Završava sa';
 $wb['move_to_txt'] = 'Prebaci u ';
 $wb['delete_txt'] = 'Obriši';
 ?>
-
-
diff --git a/interface/web/mailuser/lib/lang/hr_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/hr_mail_user_filter_list.lng
index 640365998b..a5116893fc 100644
--- a/interface/web/mailuser/lib/lang/hr_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/hr_mail_user_filter_list.lng
@@ -6,5 +6,3 @@ $wb['page_txt'] = 'Stranica';
 $wb['page_of_txt'] = 'od';
 $wb['delete_confirmation'] = 'Da li stvarno želite obrisati ovaj mail filter?';
 ?>
-
-
diff --git a/interface/web/mailuser/lib/lang/hr_mail_user_password.lng b/interface/web/mailuser/lib/lang/hr_mail_user_password.lng
index 73d6c7dfb0..ec61583f0d 100644
--- a/interface/web/mailuser/lib/lang/hr_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/hr_mail_user_password.lng
@@ -8,5 +8,3 @@ $wb['repeat_password_txt'] = 'Ponovi šifru';
 $wb['password_mismatch_txt'] = 'Šifre nisu identične.';
 $wb['password_match_txt'] = 'Šifre su identične.';
 ?>
-
-
diff --git a/interface/web/mailuser/lib/lang/hr_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/hr_mail_user_spamfilter.lng
index 0f82f0aa94..7d7130e816 100644
--- a/interface/web/mailuser/lib/lang/hr_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/hr_mail_user_spamfilter.lng
@@ -5,5 +5,3 @@ $wb['email_txt'] = 'Email';
 $wb['no_policy'] = '- isključeno -';
 $wb['policy_txt'] = 'Pravila';
 ?>
-
-
diff --git a/interface/web/mailuser/lib/lang/it_index.lng b/interface/web/mailuser/lib/lang/it_index.lng
index 29fe9ea4f3..b0d9555d65 100644
--- a/interface/web/mailuser/lib/lang/it_index.lng
+++ b/interface/web/mailuser/lib/lang/it_index.lng
@@ -1,12 +1,12 @@
 <?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'] = 'Impostazioni casela di posta';
+$wb['page_desc_txt'] = 'Qui puoi editare le impostazioni per gli account email.';
+$wb['email_txt'] = 'Indirizzo Email ';
+$wb['login_txt'] = 'Accedi';
+$wb['server_address_txt'] = 'Indirizzo server di posta';
+$wb['cc_txt'] = 'Manda copia a (CC)';
+$wb['quota_txt'] = 'Dimensione casella di posta';
+$wb['unlimited_txt'] = 'Illimitato';
 $wb['mb_txt'] = 'MB';
-$wb['none_txt'] = 'None';
+$wb['none_txt'] = 'Nessuno';
 ?>
diff --git a/interface/web/mailuser/lib/lang/it_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/it_mail_user_autoresponder.lng
index 79f386a7dc..caaac2e7c4 100644
--- a/interface/web/mailuser/lib/lang/it_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/it_mail_user_autoresponder.lng
@@ -2,7 +2,7 @@
 $wb['mailbox_autoresponder_txt'] = 'Autoresponder';
 $wb['autoresponder_subject'] = 'Out of office reply';
 $wb['autoresponder_text_txt'] = 'Text';
-$wb['autoresponder_txt'] = 'Active';
+$wb['autoresponder_txt'] = 'Attivo';
 $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';
diff --git a/interface/web/mailuser/lib/lang/it_mail_user_cc.lng b/interface/web/mailuser/lib/lang/it_mail_user_cc.lng
index 81877884cc..01f22f5fc8 100644
--- a/interface/web/mailuser/lib/lang/it_mail_user_cc.lng
+++ b/interface/web/mailuser/lib/lang/it_mail_user_cc.lng
@@ -1,6 +1,6 @@
 <?php
-$wb['mailbox_cc_txt'] = 'Send copy to email address';
-$wb['cc_txt'] = 'Send copy to';
+$wb['mailbox_cc_txt'] = 'Trasmetti copia all indirizzo  email';
+$wb['cc_txt'] = 'Manda copia a';
 $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.';
diff --git a/interface/web/mailuser/lib/lang/it_mail_user_filter.lng b/interface/web/mailuser/lib/lang/it_mail_user_filter.lng
index 2e74ffd4f7..76bb1f9d94 100644
--- a/interface/web/mailuser/lib/lang/it_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/it_mail_user_filter.lng
@@ -1,20 +1,20 @@
 <?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'] = 'Nome';
+$wb['action_txt'] = 'Azione';
+$wb['target_txt'] = 'Cartella';
+$wb['active_txt'] = 'Attivo';
+$wb['rulename_error_empty'] = 'Nome vuoto.';
+$wb['searchterm_is_empty'] = 'Termine di ricerca vuoto.';
+$wb['source_txt'] = 'Sorgente';
+$wb['target_error_regex'] = 'Il target può contenere solo i seguenti caratteri: a-z, 0-9, -, ., _, e {space}';
+$wb['limit_mailfilter_txt'] = 'Numero filtri mail raggiunto.';
+$wb['subject_txt'] = 'Soggetto';
+$wb['from_txt'] = 'Da';
+$wb['to_txt'] = 'A';
+$wb['contains_txt'] = 'Contiene';
+$wb['is_txt'] = 'è';
+$wb['begins_with_txt'] = 'Inizia con';
+$wb['ends_with_txt'] = 'Termina con';
+$wb['move_to_txt'] = 'Sposta in';
+$wb['delete_txt'] = 'Elimina';
 ?>
diff --git a/interface/web/mailuser/lib/lang/it_mail_user_filter_list.lng b/interface/web/mailuser/lib/lang/it_mail_user_filter_list.lng
index fb6b9dfa5d..e391368e09 100644
--- a/interface/web/mailuser/lib/lang/it_mail_user_filter_list.lng
+++ b/interface/web/mailuser/lib/lang/it_mail_user_filter_list.lng
@@ -1,7 +1,7 @@
 <?php
 $wb['list_head_txt'] = 'Email filter rules';
-$wb['rulename_txt'] = 'Name';
-$wb['add_new_record_txt'] = 'Add new Filter';
+$wb['rulename_txt'] = 'Nome';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo  Filter';
 $wb['page_txt'] = 'Page';
 $wb['page_of_txt'] = 'of';
 $wb['delete_confirmation'] = 'Do you really want to delete the mailfilter?';
diff --git a/interface/web/mailuser/lib/lang/it_mail_user_password.lng b/interface/web/mailuser/lib/lang/it_mail_user_password.lng
index cdf9674e70..4c6fca355d 100644
--- a/interface/web/mailuser/lib/lang/it_mail_user_password.lng
+++ b/interface/web/mailuser/lib/lang/it_mail_user_password.lng
@@ -1,10 +1,10 @@
 <?php
-$wb['mailbox_password_txt'] = 'Mailbox password';
+$wb['mailbox_password_txt'] = 'Password Casella di posta';
 $wb['password_txt'] = 'Password';
-$wb['password_strength_txt'] = 'Password strength';
+$wb['password_strength_txt'] = 'Livello sicurezza Password';
 $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['generate_password_txt'] = 'Genera Password';
+$wb['repeat_password_txt'] = 'Ripeti Password';
+$wb['password_mismatch_txt'] = 'Le password non coincidono.';
+$wb['password_match_txt'] = 'Le password coincidono.';
 ?>
diff --git a/interface/web/mailuser/lib/lang/it_mail_user_spamfilter.lng b/interface/web/mailuser/lib/lang/it_mail_user_spamfilter.lng
index be4bad9050..9d4c5496ea 100644
--- a/interface/web/mailuser/lib/lang/it_mail_user_spamfilter.lng
+++ b/interface/web/mailuser/lib/lang/it_mail_user_spamfilter.lng
@@ -2,6 +2,6 @@
 $wb['mailbox_spamfilter_txt'] = 'Spamfilter';
 $wb['spamfilter_txt'] = 'Spamfilter';
 $wb['email_txt'] = 'Email';
-$wb['no_policy'] = '- not enabled -';
+$wb['no_policy'] = '- non abilitato -';
 $wb['policy_txt'] = 'Policy';
 ?>
diff --git a/interface/web/mailuser/lib/lang/tr_mail_user_autoresponder.lng b/interface/web/mailuser/lib/lang/tr_mail_user_autoresponder.lng
index 7187a301db..ab776ef945 100644
--- a/interface/web/mailuser/lib/lang/tr_mail_user_autoresponder.lng
+++ b/interface/web/mailuser/lib/lang/tr_mail_user_autoresponder.lng
@@ -11,4 +11,3 @@ $wb['autoresponder_active'] = 'Etkinleştir';
 $wb['now_txt'] = 'Şimdi';
 $wb['autoresponder_subject_txt'] = 'Otoyanıt';
 ?>
-
diff --git a/interface/web/mailuser/lib/lang/tr_mail_user_filter.lng b/interface/web/mailuser/lib/lang/tr_mail_user_filter.lng
index e0e72a40d4..8e7245adb4 100644
--- a/interface/web/mailuser/lib/lang/tr_mail_user_filter.lng
+++ b/interface/web/mailuser/lib/lang/tr_mail_user_filter.lng
@@ -18,4 +18,3 @@ $wb['ends_with_txt'] = 'Şununla biten';
 $wb['move_to_txt'] = 'Şuraya taşı';
 $wb['delete_txt'] = 'Sil';
 ?>
-
diff --git a/interface/web/monitor/lib/lang/ar.lng b/interface/web/monitor/lib/lang/ar.lng
index 5fd407e340..7b7f741598 100644
--- a/interface/web/monitor/lib/lang/ar.lng
+++ b/interface/web/monitor/lib/lang/ar.lng
@@ -157,4 +157,7 @@ $wb['monitor_database_name_txt'] = 'Database';
 $wb['monitor_database_size_txt'] = 'Size';
 $wb['monitor_database_client_txt'] = 'Client';
 $wb['monitor_database_domain_txt'] = 'Domain';
+$wb['Show MongoDB-Log'] = 'Show MongoDB-Log';
+$wb['monitor_services_mongodb_txt'] = 'MongoDB-Server:';
+$wb['monitor_title_mongodb_txt'] = 'MongoDB Log';
 ?>
diff --git a/interface/web/monitor/lib/lang/bg.lng b/interface/web/monitor/lib/lang/bg.lng
index 0c49338d27..526646bb5f 100644
--- a/interface/web/monitor/lib/lang/bg.lng
+++ b/interface/web/monitor/lib/lang/bg.lng
@@ -157,4 +157,7 @@ $wb['monitor_database_name_txt'] = 'Database';
 $wb['monitor_database_size_txt'] = 'Size';
 $wb['monitor_database_client_txt'] = 'Client';
 $wb['monitor_database_domain_txt'] = 'Domain';
+$wb['Show MongoDB-Log'] = 'Show MongoDB-Log';
+$wb['monitor_services_mongodb_txt'] = 'MongoDB-Server:';
+$wb['monitor_title_mongodb_txt'] = 'MongoDB Log';
 ?>
diff --git a/interface/web/monitor/lib/lang/br.lng b/interface/web/monitor/lib/lang/br.lng
index 672ec4b6f8..1e54f2ee4e 100644
--- a/interface/web/monitor/lib/lang/br.lng
+++ b/interface/web/monitor/lib/lang/br.lng
@@ -157,4 +157,7 @@ $wb['monitor_database_name_txt'] = 'Database';
 $wb['monitor_database_size_txt'] = 'Size';
 $wb['monitor_database_client_txt'] = 'Client';
 $wb['monitor_database_domain_txt'] = 'Domain';
+$wb['Show MongoDB-Log'] = 'Show MongoDB-Log';
+$wb['monitor_services_mongodb_txt'] = 'MongoDB-Server:';
+$wb['monitor_title_mongodb_txt'] = 'MongoDB Log';
 ?>
diff --git a/interface/web/monitor/lib/lang/ca.lng b/interface/web/monitor/lib/lang/ca.lng
new file mode 100644
index 0000000000..29859cfae4
--- /dev/null
+++ b/interface/web/monitor/lib/lang/ca.lng
@@ -0,0 +1,163 @@
+<?php
+$wb['Server online since'] = 'Serveur en ligne depuis';
+$wb['Users online'] = 'Utilisateurs en ligne';
+$wb['System load 1 minute'] = 'Charge du système sur 1 minute';
+$wb['System load 5 minutes'] = 'Charge du système sur 5 minutes';
+$wb['System load 15 minutes'] = 'Charge du système sur 15 minutes';
+$wb['Server Load'] = 'Charge du serveur';
+$wb['Disk usage'] = 'Utilisation du disque';
+$wb['Memory usage'] = 'Utilisation de la mémoire';
+$wb['no_data_serverload_txt'] = 'Aucune donnée concernant la charge du serveur actuellement. Réésayez plus tard.';
+$wb['no_data_memusage_txt'] = 'Aucune donnée concernant lutilisation mémoire actuellement. Réésayez plus tard.';
+$wb['no_data_diskusage_txt'] = 'Aucune donnée concernant lusage disque actuellement. Réésayez plus tard.';
+$wb['no_data_cpuinfo_txt'] = 'Aucune donnée concernant la charge CPU actuellement. Réésayez plus tard.';
+$wb['no_data_services_txt'] = 'Aucune donnée concernant les services actuellement. Réésayez plus tard.';
+$wb['no_data_updates_txt'] = 'Aucune donnée concernant les mises à jour actuellement. Réésayez plus tard.';
+$wb['no_data_raid_txt'] = 'Aucune donnée concernant le RAID actuellement. Réésayez plus tard.';
+$wb['no_data_rkhunter_txt'] = 'Aucune donnée concernant RKHunter actuellement. Réésayez plus tard.';
+$wb['no_data_mailq_txt'] = 'Aucune donnée concernant la queue de mails actuellement. Réésayez plus tard.';
+$wb['no_logdata_txt'] = 'Pas de logs disponibles actuellement. Réésayez plus tard.';
+$wb['Monitoring'] = 'Surveillance';
+$wb['Server to Monitor'] = 'Serveur à surveiller';
+$wb['Logfiles'] = 'Fichiers de logs';
+$wb['Status of services'] = 'Statut des services';
+$wb['No Refresh'] = 'Pas de rafraichissement';
+$wb['minutes'] = 'minutes';
+$wb['Show Overview'] = 'Vue générale';
+$wb['System State (All Servers)'] = 'Etat du système (Tous les serveurs)';
+$wb['Hardware-Information'] = 'Informations sur le matériel';
+$wb['Show CPU info'] = 'Voir les informations CPU';
+$wb['Server State'] = 'Etat du serveur';
+$wb['Show Update State'] = 'Voir l\'état de la mise à jour';
+$wb['Show RAID state'] = 'Voir l\'état du RAID';
+$wb['Show Server load'] = 'Voir la charge du serveur';
+$wb['Show Disk usage'] = 'Voir l\'usage disque';
+$wb['Show Memory usage'] = 'Voir l\'utilisation mémoire';
+$wb['Show Services'] = 'Voir les services';
+$wb['Show Mail-Queue'] = 'Voir la Mail Queue';
+$wb['Show Mail-Log'] = 'Voir les logs mails';
+$wb['Show Mail warn-Log'] = 'Voir les logs mails d\'avertissement';
+$wb['Show Mail err-Log'] = 'Voir les logs mails d\'erreur';
+$wb['Show System-Log'] = 'Voir les logs système';
+$wb['Show ISPC Cron-Log'] = 'Voir les logs des crons ISPC';
+$wb['Show Freshclam-Log'] = 'Voir les logs de Freshclam';
+$wb['Show Clamav-Log'] = 'Voir les logs de Clamav';
+$wb['Show ISPConfig-Log'] = 'Voir les logs dISPConfig';
+$wb['Show RKHunter-Log'] = 'Voir les logs de RKHunter';
+$wb['Show Jobqueue'] = 'Voir la file d\'attente';
+$wb['Show fail2ban-Log'] = 'Voir les logs de fail2ban';
+$wb['Show IPTables'] = 'Voir les IPTables';
+$wb['Show OpenVz VE BeanCounter'] = 'Voir OpenVz VE BeanCounter';
+$wb['monitor_general_serverstate_txt'] = 'Statut du serveur';
+$wb['monitor_general_systemstate_txt'] = 'Statut du système';
+$wb['monitor_diskusage_filesystem_txt'] = 'Système de fichiers';
+$wb['monitor_diskusage_type_txt'] = 'Type';
+$wb['monitor_diskusage_size_txt'] = 'Taille';
+$wb['monitor_diskusage_used_txt'] = 'Utilisé';
+$wb['monitor_diskusage_available_txt'] = 'Disponible';
+$wb['monitor_diskusage_usage_txt'] = 'Utilisé%';
+$wb['monitor_diskusage_mounted_txt'] = 'Monté sur';
+$wb['monitor_logs_mail_txt'] = 'Mail - Log';
+$wb['monitor_logs_mailwarn_txt'] = 'Avertissements Mail - Log';
+$wb['monitor_logs_mailerr_txt'] = 'Erreurs Mail - Log';
+$wb['monitor_logs_messages_txt'] = 'Messages Système - 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_nosupportedraid1_txt'] = 'Pour le moment, seuls mdadm ou mpt-status sont supportés pour surveiller le RAID.<br>Aucun des deux n\'a été trouvé sur votre serveur.<br><br>Nous ne supportons donc pas votre RAID.';
+$wb['monitor_norkhunter_txt'] = 'RKHunter nest pas installé, il ny a donc pas de logs';
+$wb['monitor_serverstate_server_txt'] = 'Serveur';
+$wb['monitor_serverstate_state_txt'] = 'Etat';
+$wb['monitor_serverstate_unknown_txt'] = 'inconnu';
+$wb['monitor_serverstate_info_txt'] = 'info';
+$wb['monitor_serverstate_warning_txt'] = 'avertissement';
+$wb['monitor_serverstate_critical_txt'] = 'critique';
+$wb['monitor_serverstate_error_txt'] = 'erreur';
+$wb['monitor_serverstate_moreinfo_txt'] = 'Plus dinformations...';
+$wb['monitor_serverstate_more_txt'] = 'Plus...';
+$wb['monitor_serverstate_fclamok_txt'] = 'Votre protection virus est OK';
+$wb['monitor_serverstate_fclamoutdated_txt'] = 'Votre protection virus est PERIMEE';
+$wb['monitor_serverstate_fclamunknown_txt'] = 'Freshclam : ???!';
+$wb['monitor_serverstate_hdok_txt'] = 'L\'état de l\'usage de votre disque est correcte';
+$wb['monitor_serverstate_hdgoingfull_txt'] = 'Votre disque commence à être chargé';
+$wb['monitor_serverstate_hdnearlyfull_txt'] = 'Votre disque est très chargé';
+$wb['monitor_serverstate_hdveryfull_txt'] = 'Votre disque est bientôt plein';
+$wb['monitor_serverstate_hdfull_txt'] = 'Votre disque est plein';
+$wb['monitor_serverstate_hdunknown_txt'] = 'Disque dur : ???';
+$wb['monitor_serverstate_listok_txt'] = 'ok';
+$wb['monitor_serverstate_listinfo_txt'] = 'info';
+$wb['monitor_serverstate_listwarning_txt'] = 'avertissement';
+$wb['monitor_serverstate_listcritical_txt'] = 'critique';
+$wb['monitor_serverstate_listerror_txt'] = 'erreur';
+$wb['monitor_serverstate_listunknown_txt'] = 'inconnu';
+$wb['monitor_serverstate_loadok_txt'] = 'La charge de votre serveur est correcte';
+$wb['monitor_serverstate_loadheavy_txt'] = 'La charge de votre serveur est légèrement élevée';
+$wb['monitor_serverstate_loadhigh_txt'] = 'La charge de votre serveur est élevée';
+$wb['monitor_serverstate_loaghigher_txt'] = 'La charge de votre serveur est très élevée';
+$wb['monitor_serverstate_loadhighest_txt'] = 'La charge de votre serveur est extrèmement élevée';
+$wb['monitor_serverstate_loadunknown_txt'] = 'Charge du serveur : ???';
+$wb['monitor_serverstate_mailqok_txt'] = 'La charge de votre Mail Queue est correcte';
+$wb['monitor_serverstate_mailqheavy_txt'] = 'La charge de votre Mail Queue est légèrement élevée';
+$wb['monitor_serverstate_mailqhigh_txt'] = 'La charge de votre Mail Queue est élevée';
+$wb['monitor_serverstate_mailqhigher_txt'] = 'La charge de votre Mail Queue est très élevée';
+$wb['monitor_serverstate_mailqhighest_txt'] = 'La charge de votre Mail Queue est extrèmement élevée';
+$wb['monitor_serverstate_mailqunknown_txt'] = 'Mail Queue : ???';
+$wb['monitor_serverstate_raidok_txt'] = 'Votre RAID est ok';
+$wb['monitor_serverstate_raidresync_txt'] = 'Votre RAID est en mode RESYNC';
+$wb['monitor_serverstate_raidfault_txt'] = 'Votre RAID a une erreur FAULT de disque. Remplacez le rapidement !';
+$wb['monitor_serverstate_raiderror_txt'] = 'Votre RAID n\'est pas fonctionnel';
+$wb['monitor_serverstate_raidunknown_txt'] = 'Etat RAID : ???';
+$wb['monitor_serverstate_servicesonline_txt'] = 'Tous les services nécessaires sont en ligne';
+$wb['monitor_serverstate_servicesoffline_txt'] = 'Un ou plusieurs services sont hors-ligne';
+$wb['monitor_serverstate_servicesunknown_txt'] = 'Services : ???';
+$wb['monitor_serverstate_syslogok_txt'] = 'Votre log système est OK';
+$wb['monitor_serverstate_syslogwarning_txt'] = 'Il y a des avertissements dans votre log système';
+$wb['monitor_serverstate_syslogerror_txt'] = 'Il y a des erreurs dans votre log système';
+$wb['monitor_serverstate_syslogunknown_txt'] = 'Log système : ???';
+$wb['monitor_serverstate_updatesok_txt'] = 'Votre système est à jour.';
+$wb['monitor_serverstate_updatesneeded_txt'] = 'Un ou plusieurs composants nécessitent une mise à jour';
+$wb['monitor_serverstate_updatesunknown_txt'] = 'Mise à jour du système : ???';
+$wb['monitor_serverstate_beancounterok_txt'] = 'Le compteur est correcte';
+$wb['monitor_serverstate_beancounterinfo_txt'] = 'Il y a quelques échecs dans le compteur';
+$wb['monitor_serverstate_beancounterwarning_txt'] = 'Il y a des échecs dans le compteur';
+$wb['monitor_serverstate_beancountercritical_txt'] = 'Il y a beaucoup déchecs dans le compteur';
+$wb['monitor_serverstate_beancountererror_txt'] = 'Il y a trop d\'échecs dans le compteur';
+$wb['monitor_services_online_txt'] = 'En ligne';
+$wb['monitor_services_offline_txt'] = 'Hors-ligne';
+$wb['monitor_services_web_txt'] = 'Serveur Web :';
+$wb['monitor_services_ftp_txt'] = 'Serveur FTP :';
+$wb['monitor_services_smtp_txt'] = 'Serveur SMTP :';
+$wb['monitor_services_pop_txt'] = 'Serveur POP3 :';
+$wb['monitor_services_imap_txt'] = 'Serveur IMAP :';
+$wb['monitor_services_mydns_txt'] = 'Serveur DNS :';
+$wb['monitor_services_mysql_txt'] = 'Serveur MySQL :';
+$wb['monitor_settings_datafromdate_txt'] = 'Données du : ';
+$wb['monitor_settings_datetimeformat_txt'] = 'd-m-Y H:i';
+$wb['monitor_settings_refreshsq_txt'] = 'Séquence de rafraichissement:';
+$wb['monitor_settings_server_txt'] = 'Serveur';
+$wb['monitor_title_cpuinfo_txt'] = 'Informations CPU';
+$wb['monitor_title_updatestate_txt'] = 'Statut de mise à jour';
+$wb['monitor_title_mailq_txt'] = 'Mail Queue';
+$wb['monitor_title_raidstate_txt'] = 'Statut RAID';
+$wb['monitor_title_rkhunterlog_txt'] = 'Log RKHunter';
+$wb['monitor_title_fail2ban_txt'] = 'Log Fail2Ban';
+$wb['monitor_title_iptables_txt'] = 'Règles IPTables';
+$wb['monitor_title_beancounter_txt'] = 'Compteur OpenVz VE';
+$wb['monitor_updates_nosupport_txt'] = 'Votre distribution nest pas supportée par le moniteur';
+$wb['monitor_beancounter_nosupport_txt'] = 'Ce serveur n\'est pas un VE OpenVz et n\'a pas d\'information de compteur';
+$wb['Show Monit'] = 'Afficher Monit';
+$wb['no_monit_url_defined_txt'] = 'Aucune URL définie pour Monit.';
+$wb['no_permissions_to_view_monit_txt'] = 'Vous n\'avez pas la permission d\'accéder à Monit.';
+$wb['Show Munin'] = 'Afficher Munin';
+$wb['no_munin_url_defined_txt'] = 'Aucune URL définie pour Munin.';
+$wb['no_permissions_to_view_munin_txt'] = 'Vous n\'avez pas la permission d\'accéder à Munin.';
+$wb['no_data_database_size_txt'] = 'No data about the database usage available at the moment. Please check again later.';
+$wb['Show MongoDB-Log'] = 'Show MongoDB-Log';
+$wb['monitor_database_name_txt'] = 'Database';
+$wb['monitor_database_size_txt'] = 'Size';
+$wb['monitor_database_client_txt'] = 'Client';
+$wb['monitor_database_domain_txt'] = 'Domain';
+$wb['monitor_services_mongodb_txt'] = 'MongoDB-Server:';
+$wb['monitor_title_mongodb_txt'] = 'MongoDB Log';
+?>
diff --git a/interface/web/monitor/lib/lang/ca_datalog_list.lng b/interface/web/monitor/lib/lang/ca_datalog_list.lng
new file mode 100644
index 0000000000..32fd5d9427
--- /dev/null
+++ b/interface/web/monitor/lib/lang/ca_datalog_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Processus en attente';
+$wb['tstamp_txt'] = 'Date';
+$wb['server_id_txt'] = 'Serveur';
+$wb['dbtable_txt'] = 'Table DB';
+$wb['action_txt'] = 'Action';
+$wb['status_txt'] = 'Statut';
+?>
diff --git a/interface/web/monitor/lib/lang/ca_syslog_list.lng b/interface/web/monitor/lib/lang/ca_syslog_list.lng
new file mode 100644
index 0000000000..1b01a35df7
--- /dev/null
+++ b/interface/web/monitor/lib/lang/ca_syslog_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Log ISPConfig';
+$wb['tstamp_txt'] = 'Date';
+$wb['server_id_txt'] = 'Serveur';
+$wb['loglevel_txt'] = 'Niveau de log ';
+$wb['message_txt'] = 'Message';
+?>
diff --git a/interface/web/monitor/lib/lang/cz.lng b/interface/web/monitor/lib/lang/cz.lng
index 7d0daf4446..8cb07c3256 100644
--- a/interface/web/monitor/lib/lang/cz.lng
+++ b/interface/web/monitor/lib/lang/cz.lng
@@ -157,6 +157,7 @@ $wb['monitor_database_name_txt'] = 'Database';
 $wb['monitor_database_size_txt'] = 'Size';
 $wb['monitor_database_client_txt'] = 'Client';
 $wb['monitor_database_domain_txt'] = 'Domain';
+$wb['Show MongoDB-Log'] = 'Show MongoDB-Log';
+$wb['monitor_services_mongodb_txt'] = 'MongoDB-Server:';
+$wb['monitor_title_mongodb_txt'] = 'MongoDB Log';
 ?>
-
-
diff --git a/interface/web/monitor/lib/lang/cz_datalog_list.lng b/interface/web/monitor/lib/lang/cz_datalog_list.lng
index 70adcad1ab..c9e9a86555 100644
--- a/interface/web/monitor/lib/lang/cz_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/cz_datalog_list.lng
@@ -6,5 +6,3 @@ $wb['dbtable_txt'] = 'DB tabulka';
 $wb['action_txt'] = 'Akce';
 $wb['status_txt'] = 'Stav';
 ?>
-
-
diff --git a/interface/web/monitor/lib/lang/cz_syslog_list.lng b/interface/web/monitor/lib/lang/cz_syslog_list.lng
index 85cd4b3b01..990662552b 100644
--- a/interface/web/monitor/lib/lang/cz_syslog_list.lng
+++ b/interface/web/monitor/lib/lang/cz_syslog_list.lng
@@ -5,5 +5,3 @@ $wb['server_id_txt'] = 'Server';
 $wb['loglevel_txt'] = 'Logovací úroveň';
 $wb['message_txt'] = 'Zpráva';
 ?>
-
-
diff --git a/interface/web/monitor/lib/lang/el.lng b/interface/web/monitor/lib/lang/el.lng
index d840b6bb68..1df1652047 100644
--- a/interface/web/monitor/lib/lang/el.lng
+++ b/interface/web/monitor/lib/lang/el.lng
@@ -152,4 +152,12 @@ $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['no_data_database_size_txt'] = 'No data about the database usage available at the moment. Please check again later.';
+$wb['Show MongoDB-Log'] = 'Show MongoDB-Log';
+$wb['monitor_database_name_txt'] = 'Database';
+$wb['monitor_database_size_txt'] = 'Size';
+$wb['monitor_database_client_txt'] = 'Client';
+$wb['monitor_database_domain_txt'] = 'Domain';
+$wb['monitor_services_mongodb_txt'] = 'MongoDB-Server:';
+$wb['monitor_title_mongodb_txt'] = 'MongoDB Log';
 ?>
diff --git a/interface/web/monitor/lib/lang/es.lng b/interface/web/monitor/lib/lang/es.lng
index 75527e5691..6fc2a5c100 100644
--- a/interface/web/monitor/lib/lang/es.lng
+++ b/interface/web/monitor/lib/lang/es.lng
@@ -157,4 +157,7 @@ $wb['no_permissions_to_view_monit_txt'] = 'Usted no tiene permisos para acceder
 $wb['Show Munin'] = 'Mostrar Munin';
 $wb['no_munin_url_defined_txt'] = 'No se ha definido la URL a Munin.';
 $wb['no_permissions_to_view_munin_txt'] = 'Usted no tiene permisos para acceder a Munin.';
+$wb['Show MongoDB-Log'] = 'Show MongoDB-Log';
+$wb['monitor_services_mongodb_txt'] = 'MongoDB-Server:';
+$wb['monitor_title_mongodb_txt'] = 'MongoDB Log';
 ?>
diff --git a/interface/web/monitor/lib/lang/fi.lng b/interface/web/monitor/lib/lang/fi.lng
index b2d7e37aa7..73653e84b7 100755
--- a/interface/web/monitor/lib/lang/fi.lng
+++ b/interface/web/monitor/lib/lang/fi.lng
@@ -157,4 +157,7 @@ $wb['monitor_database_name_txt'] = 'Database';
 $wb['monitor_database_size_txt'] = 'Size';
 $wb['monitor_database_client_txt'] = 'Client';
 $wb['monitor_database_domain_txt'] = 'Domain';
+$wb['Show MongoDB-Log'] = 'Show MongoDB-Log';
+$wb['monitor_services_mongodb_txt'] = 'MongoDB-Server:';
+$wb['monitor_title_mongodb_txt'] = 'MongoDB Log';
 ?>
diff --git a/interface/web/monitor/lib/lang/fr.lng b/interface/web/monitor/lib/lang/fr.lng
index 16d12d427d..49d118f34d 100644
--- a/interface/web/monitor/lib/lang/fr.lng
+++ b/interface/web/monitor/lib/lang/fr.lng
@@ -28,23 +28,23 @@ $wb['System State (All Servers)'] = 'Etat du système (Tous les serveurs)';
 $wb['Hardware-Information'] = 'Informations sur le matériel';
 $wb['Show CPU info'] = 'Voir les informations CPU';
 $wb['Server State'] = 'Etat du serveur';
-$wb['Show Update State'] = 'Voir l\'état de la mise à jour';
-$wb['Show RAID state'] = 'Voir l\'état du RAID';
+$wb['Show Update State'] = 'Voir l’état de la mise à jour';
+$wb['Show RAID state'] = 'Voir l’état du RAId';
 $wb['Show Server load'] = 'Voir la charge du serveur';
-$wb['Show Disk usage'] = 'Voir l\'usage disque';
-$wb['Show Memory usage'] = 'Voir l\'utilisation mémoire';
+$wb['Show Disk usage'] = 'Voir l’usage disque';
+$wb['Show Memory usage'] = 'Voir l’utilisation mémoire';
 $wb['Show Services'] = 'Voir les services';
 $wb['Show Mail-Queue'] = 'Voir la Mail Queue';
 $wb['Show Mail-Log'] = 'Voir les logs mails';
-$wb['Show Mail warn-Log'] = 'Voir les logs mails d\'avertissement';
-$wb['Show Mail err-Log'] = 'Voir les logs mails d\'erreur';
+$wb['Show Mail warn-Log'] = 'Voir les logs mails d’avertissement';
+$wb['Show Mail err-Log'] = 'Voir les logs mails d’erreur';
 $wb['Show System-Log'] = 'Voir les logs système';
 $wb['Show ISPC Cron-Log'] = 'Voir les logs des crons ISPC';
 $wb['Show Freshclam-Log'] = 'Voir les logs de Freshclam';
 $wb['Show Clamav-Log'] = 'Voir les logs de Clamav';
 $wb['Show ISPConfig-Log'] = 'Voir les logs dISPConfig';
 $wb['Show RKHunter-Log'] = 'Voir les logs de RKHunter';
-$wb['Show Jobqueue'] = 'Voir la file d\'attente';
+$wb['Show Jobqueue'] = 'Voir la file d’attente';
 $wb['Show fail2ban-Log'] = 'Voir les logs de fail2ban';
 $wb['Show IPTables'] = 'Voir les IPTables';
 $wb['Show OpenVz VE BeanCounter'] = 'Voir OpenVz VE BeanCounter';
@@ -65,7 +65,7 @@ $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_nosupportedraid1_txt'] = 'Pour le moment, seuls mdadm ou mpt-status sont supportés pour surveiller le RAID.<br>Aucun des deux n\'a été trouvé sur votre serveur.<br><br>Nous ne supportons donc pas votre RAID.';
+$wb['monitor_nosupportedraid1_txt'] = 'Pour le moment, seuls mdadm ou mpt-status sont supportés pour surveiller le RAID.<br>Aucun des deux n’a été trouvé sur votre serveur.<br><br>Nous ne supportons donc pas votre RAID.';
 $wb['monitor_norkhunter_txt'] = 'RKHunter nest pas installé, il ny a donc pas de logs';
 $wb['monitor_serverstate_server_txt'] = 'Serveur';
 $wb['monitor_serverstate_state_txt'] = 'Etat';
@@ -78,13 +78,13 @@ $wb['monitor_serverstate_moreinfo_txt'] = 'Plus dinformations...';
 $wb['monitor_serverstate_more_txt'] = 'Plus...';
 $wb['monitor_serverstate_fclamok_txt'] = 'Votre protection virus est OK';
 $wb['monitor_serverstate_fclamoutdated_txt'] = 'Votre protection virus est PERIMEE';
-$wb['monitor_serverstate_fclamunknown_txt'] = 'Freshclam : ???!';
-$wb['monitor_serverstate_hdok_txt'] = 'L\'état de l\'usage de votre disque est correcte';
+$wb['monitor_serverstate_fclamunknown_txt'] = 'Freshclam : ???!';
+$wb['monitor_serverstate_hdok_txt'] = 'L’état de l’usage de votre disque est correcte';
 $wb['monitor_serverstate_hdgoingfull_txt'] = 'Votre disque commence à être chargé';
 $wb['monitor_serverstate_hdnearlyfull_txt'] = 'Votre disque est très chargé';
 $wb['monitor_serverstate_hdveryfull_txt'] = 'Votre disque est bientôt plein';
 $wb['monitor_serverstate_hdfull_txt'] = 'Votre disque est plein';
-$wb['monitor_serverstate_hdunknown_txt'] = 'Disque dur : ???';
+$wb['monitor_serverstate_hdunknown_txt'] = 'Disque dur : ???';
 $wb['monitor_serverstate_listok_txt'] = 'ok';
 $wb['monitor_serverstate_listinfo_txt'] = 'info';
 $wb['monitor_serverstate_listwarning_txt'] = 'avertissement';
@@ -96,65 +96,68 @@ $wb['monitor_serverstate_loadheavy_txt'] = 'La charge de votre serveur est lég
 $wb['monitor_serverstate_loadhigh_txt'] = 'La charge de votre serveur est élevée';
 $wb['monitor_serverstate_loaghigher_txt'] = 'La charge de votre serveur est très élevée';
 $wb['monitor_serverstate_loadhighest_txt'] = 'La charge de votre serveur est extrèmement élevée';
-$wb['monitor_serverstate_loadunknown_txt'] = 'Charge du serveur : ???';
+$wb['monitor_serverstate_loadunknown_txt'] = 'Charge du serveur : ???';
 $wb['monitor_serverstate_mailqok_txt'] = 'La charge de votre Mail Queue est correcte';
 $wb['monitor_serverstate_mailqheavy_txt'] = 'La charge de votre Mail Queue est légèrement élevée';
 $wb['monitor_serverstate_mailqhigh_txt'] = 'La charge de votre Mail Queue est élevée';
 $wb['monitor_serverstate_mailqhigher_txt'] = 'La charge de votre Mail Queue est très élevée';
 $wb['monitor_serverstate_mailqhighest_txt'] = 'La charge de votre Mail Queue est extrèmement élevée';
-$wb['monitor_serverstate_mailqunknown_txt'] = 'Mail Queue : ???';
+$wb['monitor_serverstate_mailqunknown_txt'] = 'Mail Queue : ???';
 $wb['monitor_serverstate_raidok_txt'] = 'Votre RAID est ok';
 $wb['monitor_serverstate_raidresync_txt'] = 'Votre RAID est en mode RESYNC';
-$wb['monitor_serverstate_raidfault_txt'] = 'Votre RAID a une erreur FAULT de disque. Remplacez le rapidement !';
-$wb['monitor_serverstate_raiderror_txt'] = 'Votre RAID n\'est pas fonctionnel';
-$wb['monitor_serverstate_raidunknown_txt'] = 'Etat RAID : ???';
+$wb['monitor_serverstate_raidfault_txt'] = 'Votre RAID a une erreur FAULT de disque. Remplacez le rapidement !';
+$wb['monitor_serverstate_raiderror_txt'] = 'Votre RAID n’est pas fonctionnel';
+$wb['monitor_serverstate_raidunknown_txt'] = 'Etat RAID : ???';
 $wb['monitor_serverstate_servicesonline_txt'] = 'Tous les services nécessaires sont en ligne';
 $wb['monitor_serverstate_servicesoffline_txt'] = 'Un ou plusieurs services sont hors-ligne';
-$wb['monitor_serverstate_servicesunknown_txt'] = 'Services : ???';
+$wb['monitor_serverstate_servicesunknown_txt'] = 'Services : ???';
 $wb['monitor_serverstate_syslogok_txt'] = 'Votre log système est OK';
 $wb['monitor_serverstate_syslogwarning_txt'] = 'Il y a des avertissements dans votre log système';
 $wb['monitor_serverstate_syslogerror_txt'] = 'Il y a des erreurs dans votre log système';
-$wb['monitor_serverstate_syslogunknown_txt'] = 'Log système : ???';
+$wb['monitor_serverstate_syslogunknown_txt'] = 'Log système : ???';
 $wb['monitor_serverstate_updatesok_txt'] = 'Votre système est à jour.';
 $wb['monitor_serverstate_updatesneeded_txt'] = 'Un ou plusieurs composants nécessitent une mise à jour';
-$wb['monitor_serverstate_updatesunknown_txt'] = 'Mise à jour du système : ???';
+$wb['monitor_serverstate_updatesunknown_txt'] = 'Mise à jour du système : ???';
 $wb['monitor_serverstate_beancounterok_txt'] = 'Le compteur est correcte';
 $wb['monitor_serverstate_beancounterinfo_txt'] = 'Il y a quelques échecs dans le compteur';
 $wb['monitor_serverstate_beancounterwarning_txt'] = 'Il y a des échecs dans le compteur';
 $wb['monitor_serverstate_beancountercritical_txt'] = 'Il y a beaucoup déchecs dans le compteur';
-$wb['monitor_serverstate_beancountererror_txt'] = 'Il y a trop d\'échecs dans le compteur';
+$wb['monitor_serverstate_beancountererror_txt'] = 'Il y a trop d’échecs dans le compteur';
 $wb['monitor_services_online_txt'] = 'En ligne';
 $wb['monitor_services_offline_txt'] = 'Hors-ligne';
-$wb['monitor_services_web_txt'] = 'Serveur Web :';
-$wb['monitor_services_ftp_txt'] = 'Serveur FTP :';
-$wb['monitor_services_smtp_txt'] = 'Serveur SMTP :';
-$wb['monitor_services_pop_txt'] = 'Serveur POP3 :';
-$wb['monitor_services_imap_txt'] = 'Serveur IMAP :';
-$wb['monitor_services_mydns_txt'] = 'Serveur DNS :';
-$wb['monitor_services_mysql_txt'] = 'Serveur MySQL :';
-$wb['monitor_settings_datafromdate_txt'] = 'Données du : ';
+$wb['monitor_services_web_txt'] = 'Serveur Web :';
+$wb['monitor_services_ftp_txt'] = 'Serveur FTP :';
+$wb['monitor_services_smtp_txt'] = 'Serveur SMTP :';
+$wb['monitor_services_pop_txt'] = 'Serveur POP3 :';
+$wb['monitor_services_imap_txt'] = 'Serveur IMAP :';
+$wb['monitor_services_mydns_txt'] = 'Serveur DNS :';
+$wb['monitor_services_mysql_txt'] = 'Serveur MySQL :';
+$wb['monitor_settings_datafromdate_txt'] = 'Données du : ';
 $wb['monitor_settings_datetimeformat_txt'] = 'd-m-Y H:i';
 $wb['monitor_settings_refreshsq_txt'] = 'Séquence de rafraichissement:';
 $wb['monitor_settings_server_txt'] = 'Serveur';
 $wb['monitor_title_cpuinfo_txt'] = 'Informations CPU';
 $wb['monitor_title_updatestate_txt'] = 'Statut de mise à jour';
 $wb['monitor_title_mailq_txt'] = 'Mail Queue';
-$wb['monitor_title_raidstate_txt'] = 'Statut RAID';
+$wb['monitor_title_raidstate_txt'] = 'Statut RAId';
 $wb['monitor_title_rkhunterlog_txt'] = 'Log RKHunter';
 $wb['monitor_title_fail2ban_txt'] = 'Log Fail2Ban';
 $wb['monitor_title_iptables_txt'] = 'Règles IPTables';
 $wb['monitor_title_beancounter_txt'] = 'Compteur OpenVz VE';
 $wb['monitor_updates_nosupport_txt'] = 'Votre distribution nest pas supportée par le moniteur';
-$wb['monitor_beancounter_nosupport_txt'] = 'Ce serveur n\'est pas un VE OpenVz et n\'a pas d\'information de compteur';
+$wb['monitor_beancounter_nosupport_txt'] = 'Ce serveur n’est pas un VE OpenVz et n’a pas d’information de compteur';
+$wb['Show Monit'] = 'Afficher Monit';
+$wb['no_monit_url_defined_txt'] = 'Aucune URL définie pour Monit.';
+$wb['no_permissions_to_view_monit_txt'] = 'Vous n’avez pas la permission d’accéder à Monit.';
+$wb['Show Munin'] = 'Afficher Munin';
+$wb['no_munin_url_defined_txt'] = 'Aucune URL définie pour Munin.';
+$wb['no_permissions_to_view_munin_txt'] = 'Vous n’avez pas la permission d’accéder à Munin.';
 $wb['no_data_database_size_txt'] = 'No data about the database usage available at the moment. Please check again later.';
+$wb['Show MongoDB-Log'] = 'Show MongoDB-Log';
 $wb['monitor_database_name_txt'] = 'Database';
 $wb['monitor_database_size_txt'] = 'Size';
 $wb['monitor_database_client_txt'] = 'Client';
 $wb['monitor_database_domain_txt'] = 'Domain';
-$wb['Show Monit'] = 'Afficher Monit';
-$wb['no_monit_url_defined_txt'] = 'Aucune URL définie pour Monit.';
-$wb['no_permissions_to_view_monit_txt'] = 'Vous n\'avez pas la permission d\'accéder à Monit.';
-$wb['Show Munin'] = 'Afficher Munin';
-$wb['no_munin_url_defined_txt'] = 'Aucune URL définie pour Munin.';
-$wb['no_permissions_to_view_munin_txt'] = 'Vous n\'avez pas la permission d\'accéder à Munin.';
+$wb['monitor_services_mongodb_txt'] = 'MongoDB-Server:';
+$wb['monitor_title_mongodb_txt'] = 'MongoDB Log';
 ?>
diff --git a/interface/web/monitor/lib/lang/hr.lng b/interface/web/monitor/lib/lang/hr.lng
index 7924392541..923b68d006 100644
--- a/interface/web/monitor/lib/lang/hr.lng
+++ b/interface/web/monitor/lib/lang/hr.lng
@@ -152,6 +152,12 @@ $wb['no_permissions_to_view_monit_txt'] = 'Nemate dozvolu za pristup Monit-u.';
 $wb['Show Munin'] = 'Prikaži Munin';
 $wb['no_munin_url_defined_txt'] = 'No Munin URL defined.';
 $wb['no_permissions_to_view_munin_txt'] = 'Nemate dozvolu za pristup Munin-u.';
+$wb['no_data_database_size_txt'] = 'No data about the database usage available at the moment. Please check again later.';
+$wb['Show MongoDB-Log'] = 'Show MongoDB-Log';
+$wb['monitor_database_name_txt'] = 'Database';
+$wb['monitor_database_size_txt'] = 'Size';
+$wb['monitor_database_client_txt'] = 'Client';
+$wb['monitor_database_domain_txt'] = 'Domain';
+$wb['monitor_services_mongodb_txt'] = 'MongoDB-Server:';
+$wb['monitor_title_mongodb_txt'] = 'MongoDB Log';
 ?>
-
-
diff --git a/interface/web/monitor/lib/lang/hr_datalog_list.lng b/interface/web/monitor/lib/lang/hr_datalog_list.lng
index 46b0c64a0f..e6e8f86529 100644
--- a/interface/web/monitor/lib/lang/hr_datalog_list.lng
+++ b/interface/web/monitor/lib/lang/hr_datalog_list.lng
@@ -6,5 +6,3 @@ $wb['dbtable_txt'] = 'Tablica u bazi';
 $wb['action_txt'] = 'Akcija';
 $wb['status_txt'] = 'Status';
 ?>
-
-
diff --git a/interface/web/monitor/lib/lang/hr_syslog_list.lng b/interface/web/monitor/lib/lang/hr_syslog_list.lng
index 2193d38c36..83c5fcdf49 100644
--- a/interface/web/monitor/lib/lang/hr_syslog_list.lng
+++ b/interface/web/monitor/lib/lang/hr_syslog_list.lng
@@ -5,5 +5,3 @@ $wb['server_id_txt'] = 'Server';
 $wb['loglevel_txt'] = 'Logovi';
 $wb['message_txt'] = 'Poruka';
 ?>
-
-
diff --git a/interface/web/monitor/lib/lang/hu.lng b/interface/web/monitor/lib/lang/hu.lng
index 6c4d3bed04..acf7b40b40 100644
--- a/interface/web/monitor/lib/lang/hu.lng
+++ b/interface/web/monitor/lib/lang/hu.lng
@@ -157,4 +157,7 @@ $wb['monitor_database_name_txt'] = 'Database';
 $wb['monitor_database_size_txt'] = 'Size';
 $wb['monitor_database_client_txt'] = 'Client';
 $wb['monitor_database_domain_txt'] = 'Domain';
+$wb['Show MongoDB-Log'] = 'Show MongoDB-Log';
+$wb['monitor_services_mongodb_txt'] = 'MongoDB-Server:';
+$wb['monitor_title_mongodb_txt'] = 'MongoDB Log';
 ?>
diff --git a/interface/web/monitor/lib/lang/id.lng b/interface/web/monitor/lib/lang/id.lng
index e62738fad0..ffb5a79c33 100644
--- a/interface/web/monitor/lib/lang/id.lng
+++ b/interface/web/monitor/lib/lang/id.lng
@@ -157,4 +157,7 @@ $wb['monitor_database_name_txt'] = 'Database';
 $wb['monitor_database_size_txt'] = 'Size';
 $wb['monitor_database_client_txt'] = 'Client';
 $wb['monitor_database_domain_txt'] = 'Domain';
+$wb['Show MongoDB-Log'] = 'Show MongoDB-Log';
+$wb['monitor_services_mongodb_txt'] = 'MongoDB-Server:';
+$wb['monitor_title_mongodb_txt'] = 'MongoDB Log';
 ?>
diff --git a/interface/web/monitor/lib/lang/it.lng b/interface/web/monitor/lib/lang/it.lng
index 7e0519915e..47d9c4da02 100644
--- a/interface/web/monitor/lib/lang/it.lng
+++ b/interface/web/monitor/lib/lang/it.lng
@@ -128,7 +128,7 @@ $wb['monitor_settings_datetimeformat_txt'] = 'd-m-Y H:i';
 $wb['monitor_settings_refreshsq_txt'] = 'Refresh sequence:';
 $wb['monitor_settings_server_txt'] = 'Server';
 $wb['monitor_title_cpuinfo_txt'] = 'CPU Info';
-$wb['monitor_title_updatestate_txt'] = 'Update State';
+$wb['monitor_title_updatestate_txt'] = 'Aggiorna   State';
 $wb['monitor_title_mailq_txt'] = 'Mailqueue';
 $wb['monitor_title_raidstate_txt'] = 'RAID-State';
 $wb['monitor_title_rkhunterlog_txt'] = 'RKHunter-Log';
@@ -153,8 +153,11 @@ $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['no_data_database_size_txt'] = 'No data about the database usage available at the moment. Please check again later.';
+$wb['Show MongoDB-Log'] = 'Show MongoDB-Log';
 $wb['monitor_database_name_txt'] = 'Database';
 $wb['monitor_database_size_txt'] = 'Size';
 $wb['monitor_database_client_txt'] = 'Client';
 $wb['monitor_database_domain_txt'] = 'Domain';
+$wb['monitor_services_mongodb_txt'] = 'MongoDB-Server:';
+$wb['monitor_title_mongodb_txt'] = 'MongoDB Log';
 ?>
diff --git a/interface/web/monitor/lib/lang/ja.lng b/interface/web/monitor/lib/lang/ja.lng
index d7b945568b..22d3b272eb 100644
--- a/interface/web/monitor/lib/lang/ja.lng
+++ b/interface/web/monitor/lib/lang/ja.lng
@@ -157,4 +157,7 @@ $wb['monitor_database_name_txt'] = 'Database';
 $wb['monitor_database_size_txt'] = 'Size';
 $wb['monitor_database_client_txt'] = 'Client';
 $wb['monitor_database_domain_txt'] = 'Domain';
+$wb['Show MongoDB-Log'] = 'Show MongoDB-Log';
+$wb['monitor_services_mongodb_txt'] = 'MongoDB-Server:';
+$wb['monitor_title_mongodb_txt'] = 'MongoDB Log';
 ?>
diff --git a/interface/web/monitor/lib/lang/nl.lng b/interface/web/monitor/lib/lang/nl.lng
index 46db223b30..760803a5d5 100644
--- a/interface/web/monitor/lib/lang/nl.lng
+++ b/interface/web/monitor/lib/lang/nl.lng
@@ -157,4 +157,7 @@ $wb['monitor_database_name_txt'] = 'Database';
 $wb['monitor_database_size_txt'] = 'Size';
 $wb['monitor_database_client_txt'] = 'Client';
 $wb['monitor_database_domain_txt'] = 'Domain';
+$wb['Show MongoDB-Log'] = 'Show MongoDB-Log';
+$wb['monitor_services_mongodb_txt'] = 'MongoDB-Server:';
+$wb['monitor_title_mongodb_txt'] = 'MongoDB Log';
 ?>
diff --git a/interface/web/monitor/lib/lang/pl.lng b/interface/web/monitor/lib/lang/pl.lng
index 3207c1bb85..c2629c4187 100644
--- a/interface/web/monitor/lib/lang/pl.lng
+++ b/interface/web/monitor/lib/lang/pl.lng
@@ -157,4 +157,7 @@ $wb['monitor_database_name_txt'] = 'Database';
 $wb['monitor_database_size_txt'] = 'Size';
 $wb['monitor_database_client_txt'] = 'Client';
 $wb['monitor_database_domain_txt'] = 'Domain';
+$wb['Show MongoDB-Log'] = 'Show MongoDB-Log';
+$wb['monitor_services_mongodb_txt'] = 'MongoDB-Server:';
+$wb['monitor_title_mongodb_txt'] = 'MongoDB Log';
 ?>
diff --git a/interface/web/monitor/lib/lang/pt.lng b/interface/web/monitor/lib/lang/pt.lng
index a4e18f693b..6ad8038b95 100644
--- a/interface/web/monitor/lib/lang/pt.lng
+++ b/interface/web/monitor/lib/lang/pt.lng
@@ -157,4 +157,7 @@ $wb['monitor_database_name_txt'] = 'Database';
 $wb['monitor_database_size_txt'] = 'Size';
 $wb['monitor_database_client_txt'] = 'Client';
 $wb['monitor_database_domain_txt'] = 'Domain';
+$wb['Show MongoDB-Log'] = 'Show MongoDB-Log';
+$wb['monitor_services_mongodb_txt'] = 'MongoDB-Server:';
+$wb['monitor_title_mongodb_txt'] = 'MongoDB Log';
 ?>
diff --git a/interface/web/monitor/lib/lang/ro.lng b/interface/web/monitor/lib/lang/ro.lng
index 2d7cfb9faa..85063a047d 100644
--- a/interface/web/monitor/lib/lang/ro.lng
+++ b/interface/web/monitor/lib/lang/ro.lng
@@ -157,4 +157,7 @@ $wb['monitor_database_name_txt'] = 'Database';
 $wb['monitor_database_size_txt'] = 'Size';
 $wb['monitor_database_client_txt'] = 'Client';
 $wb['monitor_database_domain_txt'] = 'Domain';
+$wb['Show MongoDB-Log'] = 'Show MongoDB-Log';
+$wb['monitor_services_mongodb_txt'] = 'MongoDB-Server:';
+$wb['monitor_title_mongodb_txt'] = 'MongoDB Log';
 ?>
diff --git a/interface/web/monitor/lib/lang/ru.lng b/interface/web/monitor/lib/lang/ru.lng
index bfa6ca7808..f8ef6c0725 100644
--- a/interface/web/monitor/lib/lang/ru.lng
+++ b/interface/web/monitor/lib/lang/ru.lng
@@ -157,4 +157,7 @@ $wb['monitor_database_name_txt'] = 'Database';
 $wb['monitor_database_size_txt'] = 'Size';
 $wb['monitor_database_client_txt'] = 'Client';
 $wb['monitor_database_domain_txt'] = 'Domain';
+$wb['Show MongoDB-Log'] = 'Show MongoDB-Log';
+$wb['monitor_services_mongodb_txt'] = 'MongoDB-Server:';
+$wb['monitor_title_mongodb_txt'] = 'MongoDB Log';
 ?>
diff --git a/interface/web/monitor/lib/lang/se.lng b/interface/web/monitor/lib/lang/se.lng
index cbc57c1a66..4d3e8d7277 100644
--- a/interface/web/monitor/lib/lang/se.lng
+++ b/interface/web/monitor/lib/lang/se.lng
@@ -157,4 +157,7 @@ $wb['no_permissions_to_view_monit_txt'] = 'Du har inte behörighet att visa  Mon
 $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.';
+$wb['Show MongoDB-Log'] = 'Show MongoDB-Log';
+$wb['monitor_services_mongodb_txt'] = 'MongoDB-Server:';
+$wb['monitor_title_mongodb_txt'] = 'MongoDB Log';
 ?>
diff --git a/interface/web/monitor/lib/lang/sk.lng b/interface/web/monitor/lib/lang/sk.lng
index da4e04c706..c74508a1ff 100644
--- a/interface/web/monitor/lib/lang/sk.lng
+++ b/interface/web/monitor/lib/lang/sk.lng
@@ -157,4 +157,7 @@ $wb['monitor_database_name_txt'] = 'Database';
 $wb['monitor_database_size_txt'] = 'Size';
 $wb['monitor_database_client_txt'] = 'Client';
 $wb['monitor_database_domain_txt'] = 'Domain';
+$wb['Show MongoDB-Log'] = 'Show MongoDB-Log';
+$wb['monitor_services_mongodb_txt'] = 'MongoDB-Server:';
+$wb['monitor_title_mongodb_txt'] = 'MongoDB Log';
 ?>
diff --git a/interface/web/monitor/lib/lang/tr.lng b/interface/web/monitor/lib/lang/tr.lng
index b1c8f9d665..091b95900f 100644
--- a/interface/web/monitor/lib/lang/tr.lng
+++ b/interface/web/monitor/lib/lang/tr.lng
@@ -117,7 +117,6 @@ $wb['monitor_serverstate_syslogerror_txt'] = 'Sistem günlüğünde hatalar var'
 $wb['monitor_serverstate_syslogunknown_txt'] = 'Sistem Günlüğü: ???';
 $wb['monitor_serverstate_updatesok_txt'] = 'Sistem güncel';
 $wb['monitor_serverstate_updatesneeded_txt'] = 'Bir ya da daha fazla bileşenin güncellenmesi gerekiyor';
-$wb['monitor_serxverstate_updatesunknown_txt'] = 'Sistem Güncelliği:???';
 $wb['monitor_serverstate_beancounterok_txt'] = 'Beancounter sorunsuz';
 $wb['monitor_serverstate_beancounterinfo_txt'] = 'Beancounter kayıtlarında az sayıda hata var';
 $wb['monitor_serverstate_beancounterwarning_txt'] = 'Beancounter kayıtlarında ortalama sayıda hata var';
@@ -152,5 +151,13 @@ $wb['no_permissions_to_view_monit_txt'] = 'Monit erişimi izniniz yok.';
 $wb['Show Munin'] = 'Munin Durumu';
 $wb['no_munin_url_defined_txt'] = 'Munin adresi belirtilmemiş.';
 $wb['no_permissions_to_view_munin_txt'] = 'Munin erişimi izniniz yok.';
+$wb['no_data_database_size_txt'] = 'No data about the database usage available at the moment. Please check again later.';
+$wb['Show MongoDB-Log'] = 'Show MongoDB-Log';
+$wb['monitor_database_name_txt'] = 'Database';
+$wb['monitor_database_size_txt'] = 'Size';
+$wb['monitor_database_client_txt'] = 'Client';
+$wb['monitor_database_domain_txt'] = 'Domain';
+$wb['monitor_serverstate_updatesunknown_txt'] = 'System Update: ???';
+$wb['monitor_services_mongodb_txt'] = 'MongoDB-Server:';
+$wb['monitor_title_mongodb_txt'] = 'MongoDB Log';
 ?>
-
diff --git a/interface/web/sites/lib/lang/ar_backup_stats_list.lng b/interface/web/sites/lib/lang/ar_backup_stats_list.lng
index 0f3803f56a..65792aa591 100644
--- a/interface/web/sites/lib/lang/ar_backup_stats_list.lng
+++ b/interface/web/sites/lib/lang/ar_backup_stats_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb["database_name_txt"]   = '';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Domain';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['database_name_txt'] = '';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/sites/lib/lang/ar_cron.lng b/interface/web/sites/lib/lang/ar_cron.lng
index 369c3b8bbd..13bd5afb07 100644
--- a/interface/web/sites/lib/lang/ar_cron.lng
+++ b/interface/web/sites/lib/lang/ar_cron.lng
@@ -21,4 +21,6 @@ $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
 $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_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
+$wb['log_output_txt'] = 'Log output';
 ?>
diff --git a/interface/web/sites/lib/lang/ar_database.lng b/interface/web/sites/lib/lang/ar_database.lng
index 7fcdf24fc4..bfd17a693c 100644
--- a/interface/web/sites/lib/lang/ar_database.lng
+++ b/interface/web/sites/lib/lang/ar_database.lng
@@ -43,4 +43,7 @@ $wb['select_dbuser_txt'] = 'Select database user';
 $wb['no_dbuser_txt'] = 'None';
 $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['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
 ?>
diff --git a/interface/web/sites/lib/lang/ar_database_admin_list.lng b/interface/web/sites/lib/lang/ar_database_admin_list.lng
index 27e62b9ac6..333a5357c6 100644
--- a/interface/web/sites/lib/lang/ar_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/ar_database_admin_list.lng
@@ -8,4 +8,5 @@ $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['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/ar_database_list.lng b/interface/web/sites/lib/lang/ar_database_list.lng
index 6039a9e0f9..2379607af5 100644
--- a/interface/web/sites/lib/lang/ar_database_list.lng
+++ b/interface/web/sites/lib/lang/ar_database_list.lng
@@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Database user';
 $wb['database_name_txt'] = 'Database name';
 $wb['add_new_record_txt'] = 'Add new Database';
 $wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/ar_database_quota_stats_list.lng b/interface/web/sites/lib/lang/ar_database_quota_stats_list.lng
index e1de70accf..4f92576007 100644
--- a/interface/web/sites/lib/lang/ar_database_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/ar_database_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["database_txt"] = 'Database';
-$wb["server_name_txt"] = 'Server';
-$wb["client_txt"] = 'Client';
-$wb["used_txt"] = 'Used space';
-$wb["quota_txt"] = 'Quota';
-$wb["percentage_txt"] = 'Used in %';
+$wb['database_txt'] = 'Database';
+$wb['server_name_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb['used_txt'] = 'Used space';
+$wb['quota_txt'] = 'Quota';
+$wb['percentage_txt'] = 'Used in %';
 ?>
diff --git a/interface/web/sites/lib/lang/ar_ftp_sites_stats_list.lng b/interface/web/sites/lib/lang/ar_ftp_sites_stats_list.lng
new file mode 100644
index 0000000000..e44025a715
--- /dev/null
+++ b/interface/web/sites/lib/lang/ar_ftp_sites_stats_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'FTP 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 (Download + Upload)';
+$wb['in_out_txt'] = 'DL/UL';
+?>
diff --git a/interface/web/sites/lib/lang/ar_ftp_user.lng b/interface/web/sites/lib/lang/ar_ftp_user.lng
index 42b8c4dea6..6059bbe31f 100644
--- a/interface/web/sites/lib/lang/ar_ftp_user.lng
+++ b/interface/web/sites/lib/lang/ar_ftp_user.lng
@@ -31,6 +31,5 @@ $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['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['directory_error_regex'] = 'Invalid directory';
+$wb['expires_txt'] = 'Expire at';
 ?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain.lng b/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
new file mode 100644
index 0000000000..4149c71149
--- /dev/null
+++ b/interface/web/sites/lib/lang/ar_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['Domain'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/ar_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/ar_web_aliasdomain_list.lng
new file mode 100644
index 0000000000..8ea34c4409
--- /dev/null
+++ b/interface/web/sites/lib/lang/ar_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Aliasdomain';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['add_new_record_txt'] = 'Add new aliasdomain';
+$wb['domain_error_empty'] = 'Domain is empty.';
+$wb['domain_error_unique'] = 'Domain must be unique.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/sites/lib/lang/ar_web_backup_list.lng b/interface/web/sites/lib/lang/ar_web_backup_list.lng
index fa4a59b403..d1133334f0 100644
--- a/interface/web/sites/lib/lang/ar_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/ar_web_backup_list.lng
@@ -16,4 +16,6 @@ $wb['delete_confirm_txt'] = 'Really delete this backup?';
 $wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
 $wb['backup_type_mysql'] = 'MySQL Database';
 $wb['backup_type_web'] = 'Website files';
+$wb['filesize_txt'] = 'Filesize';
+$wb['backup_type_mongodb'] = 'MongoDB Database';
 ?>
diff --git a/interface/web/sites/lib/lang/ar_web_childdomain.lng b/interface/web/sites/lib/lang/ar_web_childdomain.lng
index 85aef91916..fe6eae5074 100644
--- a/interface/web/sites/lib/lang/ar_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/ar_web_childdomain.lng
@@ -42,7 +42,7 @@ $wb['no_flag_txt'] = 'No flag';
 $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.';
 $wb['backup_interval_txt'] = 'Backup interval';
 $wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['ssl_key_txt'] = 'SSL Key';
@@ -115,5 +115,4 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
-
 ?>
diff --git a/interface/web/sites/lib/lang/ar_web_childdomain_list.lng b/interface/web/sites/lib/lang/ar_web_childdomain_list.lng
index 9853f4a37b..2db2e12bd6 100644
--- a/interface/web/sites/lib/lang/ar_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/ar_web_childdomain_list.lng
@@ -4,11 +4,12 @@ $wb['active_txt'] = 'Active';
 $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Website';
 $wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'Domain must be unique.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
 $wb['no_redirect_txt'] = 'No redirect';
 $wb['no_flag_txt'] = 'No flag';
 $wb['none_txt'] = 'None';
+$wb['add_new_subdomain_txt'] = 'Add new Subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/ar_web_directive_snippets.lng b/interface/web/sites/lib/lang/ar_web_directive_snippets.lng
new file mode 100644
index 0000000000..d2590e53cf
--- /dev/null
+++ b/interface/web/sites/lib/lang/ar_web_directive_snippets.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['directive_snippets_id_txt'] = 'Desired configuration';
+?>
diff --git a/interface/web/sites/lib/lang/ar_web_domain.lng b/interface/web/sites/lib/lang/ar_web_domain.lng
new file mode 100644
index 0000000000..1714b64177
--- /dev/null
+++ b/interface/web/sites/lib/lang/ar_web_domain.lng
@@ -0,0 +1,132 @@
+<?php
+$wb['ssl_state_txt'] = 'State';
+$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_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$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['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Allow Override';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['perl_txt'] = 'Perl';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['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['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_system_user_or_group_txt'] = 'Invalid system user or group';
+$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
+?>
diff --git a/interface/web/sites/lib/lang/ar_web_domain_admin_list.lng b/interface/web/sites/lib/lang/ar_web_domain_admin_list.lng
new file mode 100644
index 0000000000..b460e27100
--- /dev/null
+++ b/interface/web/sites/lib/lang/ar_web_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['sys_groupid_txt'] = 'Client';
+$wb['list_head_txt'] = 'Websites';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Add new website';
+?>
diff --git a/interface/web/sites/lib/lang/ar_web_domain_list.lng b/interface/web/sites/lib/lang/ar_web_domain_list.lng
new file mode 100644
index 0000000000..88ec412daa
--- /dev/null
+++ b/interface/web/sites/lib/lang/ar_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Websites';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Add new website';
+?>
diff --git a/interface/web/sites/lib/lang/ar_web_subdomain.lng b/interface/web/sites/lib/lang/ar_web_subdomain.lng
new file mode 100644
index 0000000000..fc21378f22
--- /dev/null
+++ b/interface/web/sites/lib/lang/ar_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['ssl_state_txt'] = 'State';
+$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_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['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quaota';
+$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['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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$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['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.';
+?>
diff --git a/interface/web/sites/lib/lang/ar_web_subdomain_list.lng b/interface/web/sites/lib/lang/ar_web_subdomain_list.lng
new file mode 100644
index 0000000000..1c16bcda28
--- /dev/null
+++ b/interface/web/sites/lib/lang/ar_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
+?>
diff --git a/interface/web/sites/lib/lang/ar_web_vhost_domain.lng b/interface/web/sites/lib/lang/ar_web_vhost_domain.lng
index c19d470b33..a07f787b7d 100644
--- a/interface/web/sites/lib/lang/ar_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/ar_web_vhost_domain.lng
@@ -16,7 +16,7 @@ $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['document_root_txt'] = 'Document Root';
 $wb['system_user_txt'] = 'Linux User';
 $wb['system_group_txt'] = 'Linux Group';
 $wb['ip_address_txt'] = 'IP-Address';
@@ -132,8 +132,14 @@ $wb['added_date_txt'] = 'Added date';
 $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_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
-$wb["document_root_txt"] = "Document Root";
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['load_client_data_txt'] = 'Load client details';
+$wb['load_my_data_txt'] = 'Load my contact details';
+$wb['reset_client_data_txt'] = 'Reset data';
+$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
diff --git a/interface/web/sites/lib/lang/ar_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/ar_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..c0ca93b570
--- /dev/null
+++ b/interface/web/sites/lib/lang/ar_web_vhost_subdomain.lng
@@ -0,0 +1,127 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Variables';
+$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['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+?>
diff --git a/interface/web/sites/lib/lang/ar_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/ar_web_vhost_subdomain_list.lng
new file mode 100644
index 0000000000..1c16bcda28
--- /dev/null
+++ b/interface/web/sites/lib/lang/ar_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
+?>
diff --git a/interface/web/sites/lib/lang/bg_backup_stats_list.lng b/interface/web/sites/lib/lang/bg_backup_stats_list.lng
index 0f3803f56a..65792aa591 100644
--- a/interface/web/sites/lib/lang/bg_backup_stats_list.lng
+++ b/interface/web/sites/lib/lang/bg_backup_stats_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb["database_name_txt"]   = '';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Domain';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['database_name_txt'] = '';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/sites/lib/lang/bg_cron.lng b/interface/web/sites/lib/lang/bg_cron.lng
index e44f26cce5..c382019943 100644
--- a/interface/web/sites/lib/lang/bg_cron.lng
+++ b/interface/web/sites/lib/lang/bg_cron.lng
@@ -21,4 +21,6 @@ $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
 $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_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
+$wb['log_output_txt'] = 'Log output';
 ?>
diff --git a/interface/web/sites/lib/lang/bg_database.lng b/interface/web/sites/lib/lang/bg_database.lng
index 56d9cf5e59..a6afea58ba 100644
--- a/interface/web/sites/lib/lang/bg_database.lng
+++ b/interface/web/sites/lib/lang/bg_database.lng
@@ -43,4 +43,7 @@ $wb['select_dbuser_txt'] = 'Select database user';
 $wb['no_dbuser_txt'] = 'None';
 $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['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
 ?>
diff --git a/interface/web/sites/lib/lang/bg_database_admin_list.lng b/interface/web/sites/lib/lang/bg_database_admin_list.lng
index ce6887654e..871b4b4662 100644
--- a/interface/web/sites/lib/lang/bg_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/bg_database_admin_list.lng
@@ -8,4 +8,5 @@ $wb['database_name_txt'] = 'Име на базата данни';
 $wb['add_new_record_txt'] = 'Добави нова база данни';
 $wb['sys_groupid_txt'] = 'Клиент';
 $wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/bg_database_list.lng b/interface/web/sites/lib/lang/bg_database_list.lng
index 01d4d83c69..a56b48702b 100644
--- a/interface/web/sites/lib/lang/bg_database_list.lng
+++ b/interface/web/sites/lib/lang/bg_database_list.lng
@@ -7,4 +7,5 @@ $wb['database_name_txt'] = 'База данни';
 $wb['add_new_record_txt'] = 'Нова база данни';
 $wb['database_user_txt'] = 'Database user';
 $wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/bg_database_quota_stats_list.lng b/interface/web/sites/lib/lang/bg_database_quota_stats_list.lng
index e1de70accf..4f92576007 100644
--- a/interface/web/sites/lib/lang/bg_database_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/bg_database_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["database_txt"] = 'Database';
-$wb["server_name_txt"] = 'Server';
-$wb["client_txt"] = 'Client';
-$wb["used_txt"] = 'Used space';
-$wb["quota_txt"] = 'Quota';
-$wb["percentage_txt"] = 'Used in %';
+$wb['database_txt'] = 'Database';
+$wb['server_name_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb['used_txt'] = 'Used space';
+$wb['quota_txt'] = 'Quota';
+$wb['percentage_txt'] = 'Used in %';
 ?>
diff --git a/interface/web/sites/lib/lang/bg_ftp_sites_stats_list.lng b/interface/web/sites/lib/lang/bg_ftp_sites_stats_list.lng
new file mode 100644
index 0000000000..03894607db
--- /dev/null
+++ b/interface/web/sites/lib/lang/bg_ftp_sites_stats_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb["list_head_txt"] = 'FTP 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 (Download + Upload)';
+$wb["in_out_txt"] = 'DL/UL';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/bg_ftp_user.lng b/interface/web/sites/lib/lang/bg_ftp_user.lng
index 4d5cef7339..f4187c59b2 100644
--- a/interface/web/sites/lib/lang/bg_ftp_user.lng
+++ b/interface/web/sites/lib/lang/bg_ftp_user.lng
@@ -31,6 +31,5 @@ $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['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['directory_error_regex'] = 'Invalid directory';
+$wb['expires_txt'] = 'Expire at';
 ?>
diff --git a/interface/web/sites/lib/lang/bg_web_aliasdomain.lng b/interface/web/sites/lib/lang/bg_web_aliasdomain.lng
new file mode 100644
index 0000000000..4149c71149
--- /dev/null
+++ b/interface/web/sites/lib/lang/bg_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['Domain'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/bg_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/bg_web_aliasdomain_list.lng
new file mode 100644
index 0000000000..975d75e3bb
--- /dev/null
+++ b/interface/web/sites/lib/lang/bg_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Aliasdomain';
+$wb['active_txt'] = 'Активен';
+$wb['server_id_txt'] = 'Сървър';
+$wb['parent_domain_id_txt'] = 'Сайт';
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['add_new_record_txt'] = 'Нов aliasdomain';
+$wb['domain_error_empty'] = 'Не е посочен домейн.';
+$wb['domain_error_unique'] = 'Домейнът вече съществува.';
+$wb['domain_error_regex'] = 'Невалдно име на домейн.';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/sites/lib/lang/bg_web_backup_list.lng b/interface/web/sites/lib/lang/bg_web_backup_list.lng
index fa4a59b403..d1133334f0 100644
--- a/interface/web/sites/lib/lang/bg_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/bg_web_backup_list.lng
@@ -16,4 +16,6 @@ $wb['delete_confirm_txt'] = 'Really delete this backup?';
 $wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
 $wb['backup_type_mysql'] = 'MySQL Database';
 $wb['backup_type_web'] = 'Website files';
+$wb['filesize_txt'] = 'Filesize';
+$wb['backup_type_mongodb'] = 'MongoDB Database';
 ?>
diff --git a/interface/web/sites/lib/lang/bg_web_childdomain.lng b/interface/web/sites/lib/lang/bg_web_childdomain.lng
index 4ff2ccb60f..0d185de238 100644
--- a/interface/web/sites/lib/lang/bg_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/bg_web_childdomain.lng
@@ -42,7 +42,7 @@ $wb['no_flag_txt'] = 'No flag';
 $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.';
 $wb['backup_interval_txt'] = 'Backup interval';
 $wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['ssl_key_txt'] = 'SSL Key';
@@ -115,5 +115,4 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
-
 ?>
diff --git a/interface/web/sites/lib/lang/bg_web_childdomain_list.lng b/interface/web/sites/lib/lang/bg_web_childdomain_list.lng
index 5c9d215e2b..202de8d396 100644
--- a/interface/web/sites/lib/lang/bg_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/bg_web_childdomain_list.lng
@@ -4,12 +4,12 @@ $wb['active_txt'] = 'Активен';
 $wb['server_id_txt'] = 'Сървър';
 $wb['parent_domain_id_txt'] = 'Сайт';
 $wb['domain_txt'] = 'Поддомейн';
-$wb['add_new_record_txt'] = 'Нов поддомейн';
 $wb['domain_error_empty'] = 'Не е посочен домейн.';
 $wb['domain_error_unique'] = 'Домейнът вече съществува.';
 $wb['domain_error_regex'] = 'Невалдно име на домейн.';
 $wb['no_redirect_txt'] = 'No redirect';
 $wb['no_flag_txt'] = 'No flag';
 $wb['none_txt'] = 'None';
-
+$wb['add_new_subdomain_txt'] = 'Add new Subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/bg_web_directive_snippets.lng b/interface/web/sites/lib/lang/bg_web_directive_snippets.lng
new file mode 100644
index 0000000000..05a004f654
--- /dev/null
+++ b/interface/web/sites/lib/lang/bg_web_directive_snippets.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['directive_snippets_id_txt'] = 'Desired configuration';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/bg_web_domain.lng b/interface/web/sites/lib/lang/bg_web_domain.lng
new file mode 100644
index 0000000000..594b6f2c7c
--- /dev/null
+++ b/interface/web/sites/lib/lang/bg_web_domain.lng
@@ -0,0 +1,132 @@
+<?php
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Организация';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Държава';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['server_id_txt'] = 'Сървър';
+$wb['domain_txt'] = 'Домейн';
+$wb['type_txt'] = 'Тип';
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['redirect_type_txt'] = 'Redirect Type';
+$wb['redirect_path_txt'] = 'Redirect Path';
+$wb['active_txt'] = 'Активен';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux потребител';
+$wb['system_group_txt'] = 'Linux група';
+$wb['ip_address_txt'] = 'IP адрес';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Трафик квота';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Собствени страници за грешки';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Клиент';
+$wb['limit_web_domain_txt'] = 'Достигнат е максималният разрешен брой домейни.';
+$wb['limit_web_aliasdomain_txt'] = 'Достигнат е максималният разрешен брой aliasdomains.';
+$wb['limit_web_subdomain_txt'] = 'Достигнат е максималният разрешен брой поддомейни.';
+$wb['apache_directives_txt'] = 'Apache директиви';
+$wb['domain_error_empty'] = 'Не е посочен домейн.';
+$wb['domain_error_unique'] = 'Вече съществува такъв домейн.';
+$wb['domain_error_regex'] = 'Невалидно име на домейн.';
+$wb['hd_quota_error_empty'] = 'Не е посочена Harddisk.';
+$wb['traffic_quota_error_empty'] = 'Не е посочена Трафик квота.';
+$wb['error_ssl_state_empty'] = 'Не е посочен SSL State.';
+$wb['error_ssl_locality_empty'] = 'Не е посочен SSL Locality.';
+$wb['error_ssl_organisation_empty'] = 'Не е посочена SSL организация.';
+$wb['error_ssl_organisation_unit_empty'] = 'Не е посочен SSL Organisation Unit.';
+$wb['error_ssl_country_empty'] = 'Не е посочена SSL държава.';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['client_group_id_txt'] = 'Клиент';
+$wb['stats_password_txt'] = 'Парола за уеб статистика';
+$wb['ssl_domain_txt'] = 'SSL Домейн';
+$wb['allow_override_txt'] = 'Allow Override';
+$wb['limit_web_quota_free_txt'] = 'Максимална квота за дисково пространсво';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Трафик квота';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Трафик квота exceeded';
+$wb['backup_interval_txt'] = 'Интервал за бекъп';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics Потребителско име';
+$wb['stats_type_txt'] = 'Webstatistics програма';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ipv6_address_txt'] = 'IPv6-адрес';
+$wb['none_txt'] = 'Нищо';
+$wb['disabled_txt'] = 'Забранен';
+$wb['no_redirect_txt'] = 'Без редирект';
+$wb['no_flag_txt'] = 'Без флаг';
+$wb['save_certificate_txt'] = 'Запиши сертификат';
+$wb['create_certificate_txt'] = 'Направи сертификат';
+$wb['delete_certificate_txt'] = 'Изтрий сертификат';
+$wb['nginx_directives_txt'] = 'nginx директиви';
+$wb['seo_redirect_txt'] = 'SEO редирект';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Използвай сокет за PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'квотата за дисковото пространство е грешна.';
+$wb['traffic_quota_error_regex'] = 'Трафик квота е грешна.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['ssl_key_txt'] = 'SSL Key';
+$wb['perl_txt'] = 'Perl';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['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['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_system_user_or_group_txt'] = 'Invalid system user or group';
+$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
+?>
diff --git a/interface/web/sites/lib/lang/bg_web_domain_admin_list.lng b/interface/web/sites/lib/lang/bg_web_domain_admin_list.lng
new file mode 100644
index 0000000000..a5f7551850
--- /dev/null
+++ b/interface/web/sites/lib/lang/bg_web_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['sys_groupid_txt'] = 'Клиент';
+$wb['list_head_txt'] = 'Уебсайтове';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Активен';
+$wb['server_id_txt'] = 'Сървър';
+$wb['domain_txt'] = 'Домейн';
+$wb['add_new_record_txt'] = 'Добави нов сайт';
+?>
diff --git a/interface/web/sites/lib/lang/bg_web_domain_list.lng b/interface/web/sites/lib/lang/bg_web_domain_list.lng
new file mode 100644
index 0000000000..57d63e5618
--- /dev/null
+++ b/interface/web/sites/lib/lang/bg_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Сайтове';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Активен';
+$wb['server_id_txt'] = 'Сървър';
+$wb['domain_txt'] = 'Домейн';
+$wb['add_new_record_txt'] = 'Нов сайт';
+?>
diff --git a/interface/web/sites/lib/lang/bg_web_subdomain.lng b/interface/web/sites/lib/lang/bg_web_subdomain.lng
new file mode 100644
index 0000000000..3beb3d2a5c
--- /dev/null
+++ b/interface/web/sites/lib/lang/bg_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Организация';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Държава';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['server_id_txt'] = 'Сървър';
+$wb['domain_txt'] = 'Домейн';
+$wb['type_txt'] = 'Тип';
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['redirect_type_txt'] = 'Redirect Type';
+$wb['redirect_path_txt'] = 'Redirect Path';
+$wb['active_txt'] = 'Активен';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux потребител';
+$wb['system_group_txt'] = 'Linux група';
+$wb['ip_address_txt'] = 'IP адрес';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Трафик квота';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Клиент';
+$wb['limit_web_domain_txt'] = 'Достигнат е максималният разрешен брой домейни.';
+$wb['limit_web_aliasdomain_txt'] = 'Достигнат е максималният разрешен брой aliasdomains.';
+$wb['limit_web_subdomain_txt'] = 'Достигнат е максималният разрешен брой поддомейни.';
+$wb['apache_directives_txt'] = 'Apache директиви';
+$wb['domain_error_empty'] = 'Не е посочен домейн.';
+$wb['domain_error_unique'] = 'Вече съществува такъв домейн.';
+$wb['domain_error_regex'] = 'Невалидно име на домейн.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Грешен път за редирект. Валидният адрес трябва да бъде примерно: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'Без редирект';
+$wb['no_flag_txt'] = 'No flag';
+$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.';
+?>
diff --git a/interface/web/sites/lib/lang/bg_web_subdomain_list.lng b/interface/web/sites/lib/lang/bg_web_subdomain_list.lng
new file mode 100644
index 0000000000..d08e40579f
--- /dev/null
+++ b/interface/web/sites/lib/lang/bg_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Поддомейни';
+$wb['active_txt'] = 'Активен';
+$wb['server_id_txt'] = 'Сървър';
+$wb['parent_domain_id_txt'] = 'Сайт';
+$wb['domain_txt'] = 'Поддомейн';
+$wb['add_new_record_txt'] = 'Нов поддомейн';
+?>
diff --git a/interface/web/sites/lib/lang/bg_web_vhost_domain.lng b/interface/web/sites/lib/lang/bg_web_vhost_domain.lng
index 5f9075035e..37930d05ca 100644
--- a/interface/web/sites/lib/lang/bg_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/bg_web_vhost_domain.lng
@@ -15,7 +15,7 @@ $wb['parent_domain_id_txt'] = 'Parent Website';
 $wb['redirect_type_txt'] = 'Redirect Type';
 $wb['redirect_path_txt'] = 'Redirect Path';
 $wb['active_txt'] = 'Активен';
-$wb['document_root_txt'] = 'Documentroot';
+$wb['document_root_txt'] = 'Document Root';
 $wb['system_user_txt'] = 'Linux потребител';
 $wb['system_group_txt'] = 'Linux група';
 $wb['ip_address_txt'] = 'IP адрес';
@@ -126,15 +126,20 @@ $wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a diff
 $wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
 $wb['host_txt'] = 'Hostname';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-
 $wb['variables_txt'] = 'Variables';
 $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $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_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
-$wb["document_root_txt"] = "Document Root";
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['load_client_data_txt'] = 'Load client details';
+$wb['load_my_data_txt'] = 'Load my contact details';
+$wb['reset_client_data_txt'] = 'Reset data';
+$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
diff --git a/interface/web/sites/lib/lang/bg_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/bg_web_vhost_domain_list.lng
index a6a351b06f..8cdaf9f829 100644
--- a/interface/web/sites/lib/lang/bg_web_vhost_domain_list.lng
+++ b/interface/web/sites/lib/lang/bg_web_vhost_domain_list.lng
@@ -6,5 +6,4 @@ $wb['server_id_txt'] = 'Сървър';
 $wb['domain_txt'] = 'Домейн';
 $wb['add_new_record_txt'] = 'Нов сайт';
 $wb['parent_domain_id_txt'] = 'Website';
-
 ?>
diff --git a/interface/web/sites/lib/lang/bg_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/bg_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..c0ca93b570
--- /dev/null
+++ b/interface/web/sites/lib/lang/bg_web_vhost_subdomain.lng
@@ -0,0 +1,127 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Variables';
+$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['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+?>
diff --git a/interface/web/sites/lib/lang/bg_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/bg_web_vhost_subdomain_list.lng
new file mode 100644
index 0000000000..1c16bcda28
--- /dev/null
+++ b/interface/web/sites/lib/lang/bg_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
+?>
diff --git a/interface/web/sites/lib/lang/br_backup_stats_list.lng b/interface/web/sites/lib/lang/br_backup_stats_list.lng
index 0f3803f56a..65792aa591 100644
--- a/interface/web/sites/lib/lang/br_backup_stats_list.lng
+++ b/interface/web/sites/lib/lang/br_backup_stats_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb["database_name_txt"]   = '';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Domain';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['database_name_txt'] = '';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/sites/lib/lang/br_cron.lng b/interface/web/sites/lib/lang/br_cron.lng
index dc7b49b7b4..a897090954 100644
--- a/interface/web/sites/lib/lang/br_cron.lng
+++ b/interface/web/sites/lib/lang/br_cron.lng
@@ -21,4 +21,6 @@ $wb['unknown_fieldtype_error'] = 'Um tipo desconhecido de campo foi usado.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
 $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_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
+$wb['log_output_txt'] = 'Log output';
 ?>
diff --git a/interface/web/sites/lib/lang/br_database.lng b/interface/web/sites/lib/lang/br_database.lng
index 252324e579..50d50ed96b 100644
--- a/interface/web/sites/lib/lang/br_database.lng
+++ b/interface/web/sites/lib/lang/br_database.lng
@@ -43,4 +43,7 @@ $wb['select_dbuser_txt'] = 'Select database user';
 $wb['no_dbuser_txt'] = 'None';
 $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['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
 ?>
diff --git a/interface/web/sites/lib/lang/br_database_admin_list.lng b/interface/web/sites/lib/lang/br_database_admin_list.lng
index 27e62b9ac6..333a5357c6 100644
--- a/interface/web/sites/lib/lang/br_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/br_database_admin_list.lng
@@ -8,4 +8,5 @@ $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['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/br_database_list.lng b/interface/web/sites/lib/lang/br_database_list.lng
index 51c43bfc16..2edb9d25f8 100644
--- a/interface/web/sites/lib/lang/br_database_list.lng
+++ b/interface/web/sites/lib/lang/br_database_list.lng
@@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Usuário do Banco';
 $wb['database_name_txt'] = 'Nome do banco';
 $wb['add_new_record_txt'] = 'Adcionar um novo banco';
 $wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/br_database_quota_stats_list.lng b/interface/web/sites/lib/lang/br_database_quota_stats_list.lng
index e1de70accf..4f92576007 100644
--- a/interface/web/sites/lib/lang/br_database_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/br_database_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["database_txt"] = 'Database';
-$wb["server_name_txt"] = 'Server';
-$wb["client_txt"] = 'Client';
-$wb["used_txt"] = 'Used space';
-$wb["quota_txt"] = 'Quota';
-$wb["percentage_txt"] = 'Used in %';
+$wb['database_txt'] = 'Database';
+$wb['server_name_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb['used_txt'] = 'Used space';
+$wb['quota_txt'] = 'Quota';
+$wb['percentage_txt'] = 'Used in %';
 ?>
diff --git a/interface/web/sites/lib/lang/br_ftp_sites_stats_list.lng b/interface/web/sites/lib/lang/br_ftp_sites_stats_list.lng
new file mode 100644
index 0000000000..03894607db
--- /dev/null
+++ b/interface/web/sites/lib/lang/br_ftp_sites_stats_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb["list_head_txt"] = 'FTP 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 (Download + Upload)';
+$wb["in_out_txt"] = 'DL/UL';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/br_ftp_user.lng b/interface/web/sites/lib/lang/br_ftp_user.lng
index f46b94fe92..ac5393508b 100644
--- a/interface/web/sites/lib/lang/br_ftp_user.lng
+++ b/interface/web/sites/lib/lang/br_ftp_user.lng
@@ -31,6 +31,5 @@ $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['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['directory_error_regex'] = 'Invalid directory';
+$wb['expires_txt'] = 'Expire at';
 ?>
diff --git a/interface/web/sites/lib/lang/br_web_aliasdomain.lng b/interface/web/sites/lib/lang/br_web_aliasdomain.lng
new file mode 100644
index 0000000000..4149c71149
--- /dev/null
+++ b/interface/web/sites/lib/lang/br_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['Domain'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/br_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/br_web_aliasdomain_list.lng
new file mode 100644
index 0000000000..d75bddde38
--- /dev/null
+++ b/interface/web/sites/lib/lang/br_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Domínio Alias';
+$wb['active_txt'] = 'Ativo';
+$wb['server_id_txt'] = 'Servidor';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Domínio Alias';
+$wb['add_new_record_txt'] = 'Adcionar novo domínio alias';
+$wb['domain_error_empty'] = 'Domínio em branco.';
+$wb['domain_error_unique'] = 'O domínio deve ser único.';
+$wb['domain_error_regex'] = 'Nome de domínio inválido.';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['none_txt'] = 'Em Branco';
+?>
diff --git a/interface/web/sites/lib/lang/br_web_backup_list.lng b/interface/web/sites/lib/lang/br_web_backup_list.lng
index fa4a59b403..d1133334f0 100644
--- a/interface/web/sites/lib/lang/br_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/br_web_backup_list.lng
@@ -16,4 +16,6 @@ $wb['delete_confirm_txt'] = 'Really delete this backup?';
 $wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
 $wb['backup_type_mysql'] = 'MySQL Database';
 $wb['backup_type_web'] = 'Website files';
+$wb['filesize_txt'] = 'Filesize';
+$wb['backup_type_mongodb'] = 'MongoDB Database';
 ?>
diff --git a/interface/web/sites/lib/lang/br_web_childdomain.lng b/interface/web/sites/lib/lang/br_web_childdomain.lng
index 07a1f3fd68..eac125971b 100644
--- a/interface/web/sites/lib/lang/br_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/br_web_childdomain.lng
@@ -42,7 +42,7 @@ $wb['no_flag_txt'] = 'No flag';
 $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.';
 $wb['backup_interval_txt'] = 'Backup interval';
 $wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['ssl_key_txt'] = 'SSL Key';
@@ -115,5 +115,4 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
-
 ?>
diff --git a/interface/web/sites/lib/lang/br_web_childdomain_list.lng b/interface/web/sites/lib/lang/br_web_childdomain_list.lng
index b0e962ba7a..d3d2c2fd32 100644
--- a/interface/web/sites/lib/lang/br_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/br_web_childdomain_list.lng
@@ -4,12 +4,12 @@ $wb['active_txt'] = 'Ativo';
 $wb['server_id_txt'] = 'Servidor';
 $wb['parent_domain_id_txt'] = 'Website';
 $wb['domain_txt'] = 'Sub-domínio';
-$wb['add_new_record_txt'] = 'Adcionar um novo sub-domínio';
 $wb['domain_error_empty'] = 'Domínio em branco.';
 $wb['domain_error_unique'] = 'O domínio deve ser único.';
 $wb['domain_error_regex'] = 'Nome de domínio inválido.';
 $wb['no_redirect_txt'] = 'No redirect';
 $wb['no_flag_txt'] = 'No flag';
 $wb['none_txt'] = 'Em Branco';
-
+$wb['add_new_subdomain_txt'] = 'Add new Subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/br_web_directive_snippets.lng b/interface/web/sites/lib/lang/br_web_directive_snippets.lng
new file mode 100644
index 0000000000..05a004f654
--- /dev/null
+++ b/interface/web/sites/lib/lang/br_web_directive_snippets.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['directive_snippets_id_txt'] = 'Desired configuration';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/br_web_domain.lng b/interface/web/sites/lib/lang/br_web_domain.lng
new file mode 100644
index 0000000000..21525c5d95
--- /dev/null
+++ b/interface/web/sites/lib/lang/br_web_domain.lng
@@ -0,0 +1,132 @@
+<?php
+$wb['ssl_state_txt'] = 'Estado';
+$wb['ssl_locality_txt'] = 'Localização';
+$wb['ssl_organisation_txt'] = 'Empresa';
+$wb['ssl_organisation_unit_txt'] = 'Departamento';
+$wb['ssl_country_txt'] = 'País';
+$wb['ssl_request_txt'] = 'Requisição SSL';
+$wb['ssl_cert_txt'] = 'Certificado SSL';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['server_id_txt'] = 'Servidor';
+$wb['domain_txt'] = 'Domínio';
+$wb['type_txt'] = 'Tipo';
+$wb['parent_domain_id_txt'] = 'Site Parente';
+$wb['redirect_type_txt'] = 'Tipo Redirecionamento';
+$wb['redirect_path_txt'] = 'Caminho de redirecionamento';
+$wb['active_txt'] = 'Ativo';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Usuário Linux';
+$wb['system_group_txt'] = 'Groupo Linux';
+$wb['ip_address_txt'] = 'Endereço-IP';
+$wb['vhost_type_txt'] = 'Tipo de VHost';
+$wb['hd_quota_txt'] = 'Cota de Disco';
+$wb['traffic_quota_txt'] = 'Cota de Tráfego';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Suas Páginas de  Erro';
+$wb['subdomain_txt'] = 'Auto-Subdomínio';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Cliente';
+$wb['limit_web_domain_txt'] = 'O número máximo de domínios web para sua conta foi atingido.';
+$wb['limit_web_aliasdomain_txt'] = 'O número máximo de aliases domínio para sua conta foi atingido.';
+$wb['limit_web_subdomain_txt'] = 'O número máximo de sub-domínios para sua conta foi atingido.';
+$wb['apache_directives_txt'] = 'Diretivas do Apache';
+$wb['domain_error_empty'] = 'Domínio em branco.';
+$wb['domain_error_unique'] = 'Já existe site, alias ou sub-domínio com este nome';
+$wb['domain_error_regex'] = 'Nome de domínio inválido.';
+$wb['hd_quota_error_empty'] = 'Quota de disco está em branco.';
+$wb['traffic_quota_error_empty'] = 'Quota de tráfego está em branco.';
+$wb['error_ssl_state_empty'] = 'Estado do SSL está em branco.';
+$wb['error_ssl_locality_empty'] = 'Localização do SSL está em branco.';
+$wb['error_ssl_organisation_empty'] = 'Empresa do SSL está em branco.';
+$wb['error_ssl_organisation_unit_empty'] = 'Departamento do SSL está em branco.';
+$wb['error_ssl_country_empty'] = 'País do SSL em branco.';
+$wb['client_group_id_txt'] = 'Cliente';
+$wb['stats_password_txt'] = 'Senha do diretório de estatísticas';
+$wb['ssl_domain_txt'] = 'Domínio SSL';
+$wb['allow_override_txt'] = 'Permitir Sobrescrever';
+$wb['limit_web_quota_free_txt'] = 'Cota Max. de disco disponível';
+$wb['ssl_state_error_regex'] = 'Estado inválido para SSL. São caracteres válidos: a-z, 0-9 e .,-_';
+$wb['ssl_locality_error_regex'] = 'Localidade inválida para SSL. São caracteres válidos: a-z, 0-9 e .,-_';
+$wb['ssl_organisation_error_regex'] = 'Empresa inválida para SSL. São caracteres válidos: a-z, 0-9 e .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Departamento inválido para SSL. São caracteres válidos: a-z, 0-9 e .,-_';
+$wb['ssl_country_error_regex'] = 'País inválido para SSL. São caracteres válidos: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Cota máxima de Tráfego disponível';
+$wb['redirect_error_regex'] = 'Caminho de redirecionamento inválido. Exemplos de caminhos válidos: /test/ ou http://www.dominio.ext/test/';
+$wb['php_open_basedir_txt'] = 'open_basedir do PHP';
+$wb['traffic_quota_exceeded_txt'] = 'Cota de tráfego excedida';
+$wb['backup_interval_txt'] = 'Intervalo de Backup';
+$wb['backup_copies_txt'] = 'Número de cópias';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Estátisticas Web usuário';
+$wb['stats_type_txt'] = 'Tipo de Estatística Web';
+$wb['custom_php_ini_txt'] = 'php.ini personalizado';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['none_txt'] = 'Não';
+$wb['disabled_txt'] = 'Desativado';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Salvar certificado';
+$wb['create_certificate_txt'] = 'Criar certificado';
+$wb['delete_certificate_txt'] = 'Deletar certificado';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['perl_txt'] = 'Perl';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['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['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_system_user_or_group_txt'] = 'Invalid system user or group';
+$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
+?>
diff --git a/interface/web/sites/lib/lang/br_web_domain_admin_list.lng b/interface/web/sites/lib/lang/br_web_domain_admin_list.lng
new file mode 100644
index 0000000000..b460e27100
--- /dev/null
+++ b/interface/web/sites/lib/lang/br_web_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['sys_groupid_txt'] = 'Client';
+$wb['list_head_txt'] = 'Websites';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Add new website';
+?>
diff --git a/interface/web/sites/lib/lang/br_web_domain_list.lng b/interface/web/sites/lib/lang/br_web_domain_list.lng
new file mode 100644
index 0000000000..dc52003875
--- /dev/null
+++ b/interface/web/sites/lib/lang/br_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Websites';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Ativo';
+$wb['server_id_txt'] = 'Servidor';
+$wb['domain_txt'] = 'Domínio';
+$wb['add_new_record_txt'] = 'Adcionar um novo site';
+?>
diff --git a/interface/web/sites/lib/lang/br_web_subdomain.lng b/interface/web/sites/lib/lang/br_web_subdomain.lng
new file mode 100644
index 0000000000..340735adfb
--- /dev/null
+++ b/interface/web/sites/lib/lang/br_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['ssl_state_txt'] = 'Estado';
+$wb['ssl_locality_txt'] = 'Localidade';
+$wb['ssl_organisation_txt'] = 'Empresa';
+$wb['ssl_organisation_unit_txt'] = 'Departamento';
+$wb['ssl_country_txt'] = 'País';
+$wb['ssl_request_txt'] = 'Requisição SSL';
+$wb['ssl_cert_txt'] = 'Certificado SSL';
+$wb['ssl_bundle_txt'] = 'Pacote SSL';
+$wb['ssl_action_txt'] = 'Ação SSL';
+$wb['server_id_txt'] = 'Servidor';
+$wb['domain_txt'] = 'Domínio';
+$wb['type_txt'] = 'Tipo';
+$wb['parent_domain_id_txt'] = 'Site Parente';
+$wb['redirect_type_txt'] = 'Tipo do Redirecionamento';
+$wb['redirect_path_txt'] = 'Caminho do Redirecionamento';
+$wb['active_txt'] = 'Ativo';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Usuário no Linux';
+$wb['system_group_txt'] = 'Grupo no Linux';
+$wb['ip_address_txt'] = 'Endereço-IP';
+$wb['vhost_type_txt'] = 'Tipo de VHost';
+$wb['hd_quota_txt'] = 'Cota de Disco';
+$wb['traffic_quota_txt'] = 'Cota de Tráfico';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Cliente';
+$wb['limit_web_domain_txt'] = 'O número máximo de domínios web para esta conta foi atingido.';
+$wb['limit_web_aliasdomain_txt'] = 'O número máximo de aliases para esta conta foi atingido.';
+$wb['limit_web_subdomain_txt'] = 'O número máximo de sub-domínios para esta conta foi atingido.';
+$wb['apache_directives_txt'] = 'Diretivas apache';
+$wb['domain_error_empty'] = 'Domínio em branco.';
+$wb['domain_error_unique'] = 'Já existe alias ou sub-domínio com este nome.';
+$wb['domain_error_regex'] = 'Nome de domínio inválido.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Caminho de redirecionamento inválido. Exemplo de caminho válido: /test/ ou http://www.dominio.ext/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$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.';
+?>
diff --git a/interface/web/sites/lib/lang/br_web_subdomain_list.lng b/interface/web/sites/lib/lang/br_web_subdomain_list.lng
new file mode 100644
index 0000000000..83511672af
--- /dev/null
+++ b/interface/web/sites/lib/lang/br_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Sub-domínios';
+$wb['active_txt'] = 'Ativo';
+$wb['server_id_txt'] = 'Servidor';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Sub-domínio';
+$wb['add_new_record_txt'] = 'Adcionar um novo sub-domínio';
+?>
diff --git a/interface/web/sites/lib/lang/br_web_vhost_domain.lng b/interface/web/sites/lib/lang/br_web_vhost_domain.lng
index 9f4f1f9c1e..cacc0033ca 100644
--- a/interface/web/sites/lib/lang/br_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/br_web_vhost_domain.lng
@@ -15,7 +15,7 @@ $wb['parent_domain_id_txt'] = 'Site Parente';
 $wb['redirect_type_txt'] = 'Tipo Redirecionamento';
 $wb['redirect_path_txt'] = 'Caminho de redirecionamento';
 $wb['active_txt'] = 'Ativo';
-$wb['document_root_txt'] = 'Documentroot';
+$wb['document_root_txt'] = 'Document Root';
 $wb['system_user_txt'] = 'Usuário Linux';
 $wb['system_group_txt'] = 'Groupo Linux';
 $wb['ip_address_txt'] = 'Endereço-IP';
@@ -126,15 +126,20 @@ $wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a diff
 $wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
 $wb['host_txt'] = 'Hostname';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-
 $wb['variables_txt'] = 'Variables';
 $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $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_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
-$wb["document_root_txt"] = "Document Root";
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['load_client_data_txt'] = 'Load client details';
+$wb['load_my_data_txt'] = 'Load my contact details';
+$wb['reset_client_data_txt'] = 'Reset data';
+$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
diff --git a/interface/web/sites/lib/lang/br_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/br_web_vhost_domain_list.lng
index b65a3caf8f..832e70921a 100644
--- a/interface/web/sites/lib/lang/br_web_vhost_domain_list.lng
+++ b/interface/web/sites/lib/lang/br_web_vhost_domain_list.lng
@@ -6,5 +6,4 @@ $wb['server_id_txt'] = 'Servidor';
 $wb['domain_txt'] = 'Domínio';
 $wb['add_new_record_txt'] = 'Adcionar um novo site';
 $wb['parent_domain_id_txt'] = 'Website';
-
 ?>
diff --git a/interface/web/sites/lib/lang/br_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/br_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..c0ca93b570
--- /dev/null
+++ b/interface/web/sites/lib/lang/br_web_vhost_subdomain.lng
@@ -0,0 +1,127 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Variables';
+$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['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+?>
diff --git a/interface/web/sites/lib/lang/br_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/br_web_vhost_subdomain_list.lng
new file mode 100644
index 0000000000..1c16bcda28
--- /dev/null
+++ b/interface/web/sites/lib/lang/br_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
+?>
diff --git a/interface/web/sites/lib/lang/ca.lng b/interface/web/sites/lib/lang/ca.lng
new file mode 100644
index 0000000000..9acee9d061
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca.lng
@@ -0,0 +1,35 @@
+<?php
+$wb['Websites'] = 'Sites web';
+$wb['Website'] = 'Sites web';
+$wb['Subdomain'] = 'Sous-domaine';
+$wb['Aliasdomain'] = 'Alias';
+$wb['Database'] = 'Base de données';
+$wb['Web Access'] = 'Accès aux sites Web';
+$wb['FTP-User'] = 'Utilisateur FTP';
+$wb['Webdav-User'] = 'Utilisateur WebDav';
+$wb['Folder'] = 'Dossiers protégés';
+$wb['Folder users'] = 'Utilisateurs de dossiers protégés';
+$wb['Command Line'] = 'Ligne de commande';
+$wb['Shell-User'] = 'Utilisateur Shell';
+$wb['Cron Jobs'] = 'Tâches cron';
+$wb['Statistics'] = 'Statistiques';
+$wb['Web traffic'] = 'Trafic web';
+$wb['Website quota (Harddisk)'] = 'Quota du site web (disque dur)';
+$wb['Cron'] = 'Cron';
+$wb['Stats'] = 'Statistiques';
+$wb['Shell'] = 'Shell';
+$wb['Webdav'] = 'WebDAV';
+$wb['FTP'] = 'FTP';
+$wb['Options'] = 'Options';
+$wb['Domain'] = 'Domaine';
+$wb['Redirect'] = 'Redirection';
+$wb['SSL'] = 'SSL';
+$wb['Sites'] = 'Sites';
+$wb['Database User'] = 'Utilisateurs de bases de données';
+$wb['APS Installer'] = 'Installeur APS';
+$wb['Available packages'] = 'Packages disponibles';
+$wb['Installed packages'] = 'Packages installés';
+$wb['Update Packagelist'] = 'Mise à jour de la liste des packages';
+$wb['Subdomain (Vhost)'] = 'Sous-domaine (Vhost)';
+$wb['error_proxy_requires_url'] = 'Type de redirection \\"proxy\\" nécessite une URL comme chemin de redirection.';
+?>
diff --git a/interface/web/sites/lib/lang/ca_aps.lng b/interface/web/sites/lib/lang/ca_aps.lng
new file mode 100644
index 0000000000..2c90556d66
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_aps.lng
@@ -0,0 +1,58 @@
+<?php
+$wb['overview_txt'] = 'Vue d\'ensemble';
+$wb['administration_txt'] = 'Administration';
+$wb['available_packages_txt'] = 'Packages disponibles';
+$wb['installed_packages_txt'] = 'Packages installés';
+$wb['yes_txt'] = 'Oui';
+$wb['no_txt'] = 'Non';
+$wb['invalid_id_txt'] = 'Aucun ID valide n\'a été fourni.';
+$wb['details_txt'] = 'Details';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Categorie';
+$wb['homepage_txt'] = 'Page d\'accueil';
+$wb['supported_languages_txt'] = 'Langues supportées';
+$wb['description_txt'] = 'Description';
+$wb['config_script_txt'] = 'Script de configuration';
+$wb['installed_size_txt'] = 'Taille après installation';
+$wb['license_txt'] = 'Licence';
+$wb['screenshots_txt'] = 'Screenshots';
+$wb['changelog_txt'] = 'Changelog';
+$wb['server_requirements_txt'] = 'Configuration serveur requise';
+$wb['php_extensions_txt'] = 'Extensions PHP';
+$wb['php_settings_txt'] = 'Configuration PHP';
+$wb['supported_php_versions_txt'] = 'Versions PHP supportées';
+$wb['database_txt'] = 'Base de données';
+$wb['settings_txt'] = 'Configuration';
+$wb['install_package_txt'] = 'Installer ce package';
+$wb['installation_txt'] = 'Installation';
+$wb['install_location_txt'] = 'Chemin d\'installation';
+$wb['acceptance_txt'] = 'Conditions d\'utilisation (licence)';
+$wb['acceptance_text_txt'] = 'Oui, j\'ai lu les conditions d\'utilisation (licence) et les accepte.';
+$wb['install_language_txt'] = 'Langue de l\'interface';
+$wb['new_database_password_txt'] = 'Nouveau mot de passe BDD';
+$wb['basic_settings_txt'] = 'Configuration de base';
+$wb['package_settings_txt'] = 'Configuration du package';
+$wb['error_main_domain'] = 'Le domaine du chemin d\'installation est invalide.';
+$wb['error_no_main_location'] = 'Vous n\'avez fourni aucun chemin d\'installation valide.';
+$wb['error_inv_main_location'] = 'Le dossier d\'installation choisi est invalide.';
+$wb['error_license_agreement'] = 'Avant de continuer, vous devez accepter les conditions d\'utilisation (licence).';
+$wb['error_no_database_pw'] = 'Vous n\'avez pas renseigné de mot de passe BDD valide.';
+$wb['error_short_database_pw'] = 'Veuillez saisir un mot de passe BDD plus long.';
+$wb['error_no_value_for'] = 'Le champ \\"%s\\" ne peut pas être vide.';
+$wb['error_short_value_for'] = 'Le champ \\"%s\\" nécessite une valeur plus longue.';
+$wb['error_long_value_for'] = 'Le champ \\"%s\\" nécessite une valeur plus courte.';
+$wb['error_inv_value_for'] = 'Vous avez saisi une valeur invalide pour le champ \\"%s\\".';
+$wb['error_inv_email_for'] = 'L\'adresse courriel saisie pour le champ \\"%s\\" est invalide.';
+$wb['error_inv_domain_for'] = 'Le domaine saisi pour le champ \\"%s\\" est invalide.';
+$wb['error_inv_integer_for'] = 'Le nombre saisi pour le champ \\"%s\\" est invalide.';
+$wb['error_inv_float_for'] = 'La décimale saisie pour le champ \\"%s\\" est invalide.';
+$wb['error_used_location'] = 'Le chemin de destination contient déjà un package d\'installation.';
+$wb['installation_task_txt'] = 'Installation prévue';
+$wb['installation_error_txt'] = 'Erreur d\'installation';
+$wb['installation_success_txt'] = 'Installé';
+$wb['installation_remove_txt'] = 'Désinstallation prévue';
+$wb['packagelist_update_finished_txt'] = 'Mise à jour APS Packagelist terminée.';
+$wb['btn_install_txt'] = 'Installer';
+$wb['btn_cancel_txt'] = 'Annuler';
+$wb['limit_aps_txt'] = 'Le nombre max d\'instances APS pour votre compte a été atteint.';
+?>
diff --git a/interface/web/sites/lib/lang/ca_aps_instances_list.lng b/interface/web/sites/lib/lang/ca_aps_instances_list.lng
new file mode 100644
index 0000000000..63145b04f3
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_aps_instances_list.lng
@@ -0,0 +1,11 @@
+<?php
+$wb['list_head_txt'] = 'Packages installés';
+$wb['name_txt'] = 'Nom';
+$wb['version_txt'] = 'Version';
+$wb['customer_txt'] = 'Client';
+$wb['status_txt'] = 'Statut';
+$wb['install_location_txt'] = 'Chemin d\'installation';
+$wb['pkg_delete_confirmation'] = 'Etes-vous sûr de vouloir supprimer cette installation ?';
+$wb['filter_txt'] = 'Chercher';
+$wb['delete_txt'] = 'Supprimer';
+?>
diff --git a/interface/web/sites/lib/lang/ca_aps_packages_list.lng b/interface/web/sites/lib/lang/ca_aps_packages_list.lng
new file mode 100644
index 0000000000..24fb0b9c72
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_aps_packages_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Packages disponibles';
+$wb['name_txt'] = 'Nom';
+$wb['version_txt'] = 'Version';
+$wb['category_txt'] = 'Categorie';
+$wb['status_txt'] = 'Dévérouillé';
+$wb['filter_txt'] = 'Chercher';
+?>
diff --git a/interface/web/sites/lib/lang/ca_aps_update_packagelist.lng b/interface/web/sites/lib/lang/ca_aps_update_packagelist.lng
new file mode 100644
index 0000000000..ef8d67ccb8
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_aps_update_packagelist.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['head_txt'] = 'Update Packagelist';
+$wb['list_desc_txt'] = '';
+$wb['btn_start_txt'] = 'Update Packagelist';
+$wb['btn_cancel_txt'] = 'Annuler';
+$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/ca_backup_stats_list.lng b/interface/web/sites/lib/lang/ca_backup_stats_list.lng
new file mode 100644
index 0000000000..65792aa591
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_backup_stats_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['database_name_txt'] = '';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
+$wb['backup_interval_txt'] = 'Interval / cnt.';
+$wb['backup_size_txt'] = 'Backupsize';
+?>
diff --git a/interface/web/sites/lib/lang/ca_cron.lng b/interface/web/sites/lib/lang/ca_cron.lng
new file mode 100644
index 0000000000..a5388ffa90
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_cron.lng
@@ -0,0 +1,26 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['parent_domain_id_txt'] = 'Site Parent';
+$wb['active_txt'] = 'Actif';
+$wb['client_txt'] = 'Client';
+$wb['run_min_txt'] = 'Minutes';
+$wb['run_hour_txt'] = 'Heures';
+$wb['run_mday_txt'] = 'Jours du mois';
+$wb['run_month_txt'] = 'Mois';
+$wb['run_wday_txt'] = 'Jours de la semaine';
+$wb['command_txt'] = 'Commande à éxécuter (commandes via sh, URLs via wget)';
+$wb['limit_cron_txt'] = 'La nombre maximum de tâches cron autorisés a été atteint.';
+$wb['limit_cron_frequency_txt'] = 'La fréquence du cron excède la limite autorisée.';
+$wb['run_min_error_format'] = 'Format invalide pour les minutes.';
+$wb['run_hour_error_format'] = 'Format invalide pour les heures.';
+$wb['run_mday_error_format'] = 'Format invalide pour les jours du mois.';
+$wb['run_month_error_format'] = 'Format invalide pour les mois.';
+$wb['run_wday_error_format'] = 'Format invalide pour les jours du mois.';
+$wb['command_error_format'] = 'Format de la commande invalide.';
+$wb['unknown_fieldtype_error'] = 'Un champ inconnu a été utilisé';
+$wb['server_id_error_empty'] = 'ID serveur non renseigné';
+$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_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
+$wb['log_output_txt'] = 'Log output';
+?>
diff --git a/interface/web/sites/lib/lang/ca_cron_list.lng b/interface/web/sites/lib/lang/ca_cron_list.lng
new file mode 100644
index 0000000000..25fb854f6f
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_cron_list.lng
@@ -0,0 +1,13 @@
+<?php
+$wb['list_head_txt'] = 'Crons';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['run_min_txt'] = 'Minute';
+$wb['run_hour_txt'] = 'Heure';
+$wb['run_mday_txt'] = 'Jour du mois';
+$wb['run_month_txt'] = 'Mois';
+$wb['run_wday_txt'] = 'Jour de la semaine';
+$wb['command_txt'] = 'Commande';
+$wb['add_new_cron_txt'] = 'Nouveau Cron';
+$wb['parent_domain_id_txt'] = 'Site web';
+?>
diff --git a/interface/web/sites/lib/lang/ca_database.lng b/interface/web/sites/lib/lang/ca_database.lng
new file mode 100644
index 0000000000..9905e65d00
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_database.lng
@@ -0,0 +1,49 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['type_txt'] = 'Type';
+$wb['database_name_txt'] = 'Nom de la base';
+$wb['database_user_txt'] = 'Nom d\'utilisateur';
+$wb['database_password_txt'] = 'Mot de passe';
+$wb['password_strength_txt'] = 'Force du mot de passe';
+$wb['database_charset_txt'] = 'Jeu de caractères de la base';
+$wb['remote_access_txt'] = 'Accès à Distance';
+$wb['remote_ips_txt'] = 'IP d\'accès à distance (séparés par des virgules, ne rien mettre pour tout autoriser)';
+$wb['database_remote_error_ips'] = 'L\'une des IP entrées nest pas valide';
+$wb['client_txt'] = 'Client';
+$wb['active_txt'] = 'Actif';
+$wb['database_name_error_empty'] = 'Le nom de la base ne peut être vide.';
+$wb['database_name_error_unique'] = 'Il y a déja une base portant ce nom sur le serveur.';
+$wb['database_name_error_regex'] = 'Nom de la base incorrect. Le nom de la base peut uniquement contenir ces caractères: a-z, A-Z, 0-9 et le tiret bas. Taille: 2 - 64 caractères.';
+$wb['database_user_error_empty'] = 'Le nom d\'utilisateur ne peut être vide.';
+$wb['database_user_error_unique'] = 'Il y a déja un utilisateur de base avec ce nom.';
+$wb['database_user_error_regex'] = 'Nom d\'utilisateur incorrect. Le nom d\'utilisateur peut uniquement contenir ces caractères: a-z, A-Z, 0-9 et le tiret bas. Taille: 2 - 64 caractères.';
+$wb['limit_database_txt'] = 'Le nombre maximum de bases de données a été atteint.';
+$wb['database_name_change_txt'] = 'Le nom de la base ne peut être modifié';
+$wb['database_charset_change_txt'] = 'Le charset de la base ne peut être modifié';
+$wb['database_name_error_len'] = 'Nom de base de données - {db} - trop long. La longueur maximale incluant le préfixe est de 64 caractères.';
+$wb['database_user_error_len'] = 'Nom d\'utilisateur de base de données - {user}- trop long. La longueur maximale incluant le préfixe est de 16 caractères.';
+$wb['parent_domain_id_txt'] = 'Site';
+$wb['database_site_error_empty'] = 'Select the site to which the database belongs.';
+$wb['select_site_txt'] = '- Choisir un site -';
+$wb['btn_save_txt'] = 'Sauvegarder';
+$wb['btn_cancel_txt'] = 'Annuler';
+$wb['generate_password_txt'] = 'Générer mot de passe';
+$wb['repeat_password_txt'] = 'Retaper le mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$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'] = 'Utilisateur en lecture seule';
+$wb['optional_txt'] = 'optional';
+$wb['select_dbuser_txt'] = 'Select database user';
+$wb['no_dbuser_txt'] = 'None';
+$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['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
+?>
diff --git a/interface/web/sites/lib/lang/ca_database_admin_list.lng b/interface/web/sites/lib/lang/ca_database_admin_list.lng
new file mode 100644
index 0000000000..594406f114
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_database_admin_list.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['list_head_txt'] = 'Base de données';
+$wb['active_txt'] = 'Actif';
+$wb['remote_access_txt'] = 'Accès distant';
+$wb['server_id_txt'] = 'Serveur';
+$wb['database_user_txt'] = 'Utilisateur de la base de données';
+$wb['database_name_txt'] = 'Nom de la base de données';
+$wb['add_new_record_txt'] = 'Ajouter une base de données';
+$wb['sys_groupid_txt'] = 'Client';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
+?>
diff --git a/interface/web/sites/lib/lang/ca_database_list.lng b/interface/web/sites/lib/lang/ca_database_list.lng
new file mode 100644
index 0000000000..e8350ee57a
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_database_list.lng
@@ -0,0 +1,11 @@
+<?php
+$wb['list_head_txt'] = 'Base';
+$wb['active_txt'] = 'Actif';
+$wb['remote_access_txt'] = 'Accès à distance';
+$wb['server_id_txt'] = 'Serveur';
+$wb['database_name_txt'] = 'Nom de la base';
+$wb['add_new_record_txt'] = 'Nouvelle base de données';
+$wb['database_user_txt'] = 'Utilisateur BDD';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
+?>
diff --git a/interface/web/sites/lib/lang/ca_database_quota_stats_list.lng b/interface/web/sites/lib/lang/ca_database_quota_stats_list.lng
new file mode 100644
index 0000000000..4f92576007
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_database_quota_stats_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['database_txt'] = 'Database';
+$wb['server_name_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb['used_txt'] = 'Used space';
+$wb['quota_txt'] = 'Quota';
+$wb['percentage_txt'] = 'Used in %';
+?>
diff --git a/interface/web/sites/lib/lang/ca_database_user.lng b/interface/web/sites/lib/lang/ca_database_user.lng
new file mode 100644
index 0000000000..eca59800ec
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_database_user.lng
@@ -0,0 +1,23 @@
+<?php
+$wb['database_user_txt'] = 'Utilisateur de base de données';
+$wb['database_password_txt'] = 'Mot de passe';
+$wb['password_strength_txt'] = 'Force du mot de passe';
+$wb['client_txt'] = 'Client';
+$wb['active_txt'] = 'Active';
+$wb['database_user_error_empty'] = 'Utilisateur de base de données non rensigné.';
+$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'] = 'Sauvegarder';
+$wb['btn_cancel_txt'] = 'Annuler';
+$wb['generate_password_txt'] = 'Générer mot de passe';
+$wb['repeat_password_txt'] = 'Retaper le mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['globalsearch_resultslimit_of_txt'] = 'of';
+$wb['globalsearch_resultslimit_results_txt'] = 'results';
+$wb['globalsearch_noresults_text_txt'] = 'Pas de résultat.';
+$wb['globalsearch_noresults_limit_txt'] = '0 resultat';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
+$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+?>
diff --git a/interface/web/sites/lib/lang/ca_database_user_admin_list.lng b/interface/web/sites/lib/lang/ca_database_user_admin_list.lng
new file mode 100644
index 0000000000..1bace2a0e7
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_database_user_admin_list.lng
@@ -0,0 +1,6 @@
+<?php
+$wb['list_head_txt'] = 'Utilisateur de base de données';
+$wb['database_user_txt'] = 'Utilisateur de base de données';
+$wb['add_new_record_txt'] = 'Ajouter un utilisateur';
+$wb['sys_groupid_txt'] = 'Client';
+?>
diff --git a/interface/web/sites/lib/lang/ca_database_user_list.lng b/interface/web/sites/lib/lang/ca_database_user_list.lng
new file mode 100644
index 0000000000..46623bda88
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_database_user_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb['list_head_txt'] = 'Utilisateur de base de données';
+$wb['database_user_txt'] = 'Utilisateur de base de données';
+$wb['add_new_record_txt'] = 'Ajouter un utilisateur';
+?>
diff --git a/interface/web/sites/lib/lang/ca_ftp_sites_stats_list.lng b/interface/web/sites/lib/lang/ca_ftp_sites_stats_list.lng
new file mode 100644
index 0000000000..e44025a715
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_ftp_sites_stats_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'FTP 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 (Download + Upload)';
+$wb['in_out_txt'] = 'DL/UL';
+?>
diff --git a/interface/web/sites/lib/lang/ca_ftp_user.lng b/interface/web/sites/lib/lang/ca_ftp_user.lng
new file mode 100644
index 0000000000..d212705200
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_ftp_user.lng
@@ -0,0 +1,35 @@
+<?php
+$wb['uid_txt'] = 'UID';
+$wb['gid_txt'] = 'GID';
+$wb['dir_txt'] = 'Répertoire';
+$wb['quota_files_txt'] = 'Quota de fichiers';
+$wb['ul_ratio_txt'] = 'Ratio upload';
+$wb['dl_ratio_txt'] = 'Ratio download';
+$wb['ul_bandwidth_txt'] = 'Bande passante upload';
+$wb['dl_bandwidth_txt'] = 'Bande passante download';
+$wb['server_id_txt'] = 'Serveur';
+$wb['parent_domain_id_txt'] = 'Site web';
+$wb['username_txt'] = 'Nom d\'utilisateur';
+$wb['password_txt'] = 'Mot de passe';
+$wb['password_strength_txt'] = 'Force du mot de passe';
+$wb['quota_size_txt'] = 'Quota disque';
+$wb['active_txt'] = 'Actif';
+$wb['limit_ftp_user_txt'] = 'Le nombre maximum d\'utilisateurs FTP a été atteint.';
+$wb['username_error_empty'] = 'Le nom d\'utilisateur est vide.';
+$wb['username_error_unique'] = 'Le nom d\'utilisateur doit être unique.';
+$wb['username_error_regex'] = 'Le nom d\'utilisateur contient des caractères invalides.';
+$wb['quota_size_error_empty'] = 'Le quota est vide.';
+$wb['uid_error_empty'] = 'Le GID est vide.';
+$wb['directory_error_empty'] = 'Le répertoire est vide.';
+$wb['quota_files_unity_txt'] = 'Fichiers';
+$wb['directory_error_notinweb'] = 'Le répertoire nest pas dans la racine web.';
+$wb['parent_domain_id_error_empty'] = 'Pas de site web sélectionné.';
+$wb['quota_size_error_regex'] = 'Quota: entrez -1 pour illimité ou un nombre > 0';
+$wb['dir_dot_error'] = 'Les .. sont interdits.';
+$wb['dir_slashdot_error'] = 'Les ./ sont interdits.';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Vérification du mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['expires_txt'] = 'Expire at';
+?>
diff --git a/interface/web/sites/lib/lang/ca_ftp_user_list.lng b/interface/web/sites/lib/lang/ca_ftp_user_list.lng
new file mode 100644
index 0000000000..51c89069e9
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_ftp_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Utilisateur FTP';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['parent_domain_id_txt'] = 'Site web';
+$wb['username_txt'] = 'Nom d\'utilisateur';
+$wb['add_new_record_txt'] = 'Nouvel utilisateur FTP';
+?>
diff --git a/interface/web/sites/lib/lang/ca_shell_user.lng b/interface/web/sites/lib/lang/ca_shell_user.lng
new file mode 100644
index 0000000000..940a78070f
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_shell_user.lng
@@ -0,0 +1,36 @@
+<?php
+$wb['shell_txt'] = 'Shell';
+$wb['dir_txt'] = 'Répertoire';
+$wb['server_id_txt'] = 'Serveur';
+$wb['parent_domain_id_txt'] = 'Site';
+$wb['username_txt'] = 'Nom d\'utilisateur';
+$wb['password_txt'] = 'Mot de passe';
+$wb['password_strength_txt'] = 'Force du mot de passe';
+$wb['chroot_txt'] = 'Chrooter le shell';
+$wb['quota_size_txt'] = 'Quota';
+$wb['active_txt'] = 'Actif';
+$wb['username_error_empty'] = 'Le nom d\'utilisateur est vide.';
+$wb['username_error_unique'] = 'Le nom d\'utilisateur doit être unique.';
+$wb['username_error_regex'] = 'Le nom d\'utilisateur contient des caractères invalides.';
+$wb['quota_size_error_empty'] = 'Le quota est vide.';
+$wb['uid_error_empty'] = 'Le GID est vide.';
+$wb['directory_error_empty'] = 'Le répertoire est vide.';
+$wb['limit_shell_user_txt'] = 'Le nombre maximum d\'utilisateurs shell a été atteint..';
+$wb['parent_domain_id_error_empty'] = 'Aucun site web sélectionné.';
+$wb['puser_txt'] = 'Utilisateur web';
+$wb['pgroup_txt'] = 'Groupe web';
+$wb['ssh_rsa_txt'] = 'Clé publique SSH-RSA (pour les authentifications par clé)';
+$wb['dir_dot_error'] = 'Les .. sont interdits.';
+$wb['dir_slashdot_error'] = 'Les ./ sont interdits.';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Vérification du mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['username_must_not_exceed_32_chars_txt'] = 'Le nom d\'utilisateur ne doit pas dépasser 32 caractères.';
+$wb['username_not_allowed_txt'] = 'Le nom d\'utilisateur est interdit.';
+$wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
+$wb['directory_error_regex'] = 'Invalid directory';
+$wb['shell_error_regex'] = 'Invalid shell';
+$wb['invalid_username_txt'] = 'Invalid Username';
+$wb['directory_error_notinweb'] = 'The directory has to be inside the web root.';
+?>
diff --git a/interface/web/sites/lib/lang/ca_shell_user_list.lng b/interface/web/sites/lib/lang/ca_shell_user_list.lng
new file mode 100644
index 0000000000..ccad82ef0c
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_shell_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Utilisateur Shell';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['parent_domain_id_txt'] = 'Site web';
+$wb['username_txt'] = 'Nom d\'utilisateur';
+$wb['add_new_record_txt'] = 'Nouvel utilisateur Shell';
+?>
diff --git a/interface/web/sites/lib/lang/ca_user_quota_stats_list.lng b/interface/web/sites/lib/lang/ca_user_quota_stats_list.lng
new file mode 100644
index 0000000000..2d8f4962d9
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_user_quota_stats_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Quota disque du site';
+$wb['domain_txt'] = 'Domaine / Site web';
+$wb['system_user_txt'] = 'Utilisateur Linux';
+$wb['used_txt'] = 'Espace utilisé';
+$wb['hard_txt'] = 'Limite dure';
+$wb['soft_txt'] = 'Limite douce';
+$wb['files_txt'] = 'Fichiers individuels';
+?>
diff --git a/interface/web/sites/lib/lang/ca_web_aliasdomain.lng b/interface/web/sites/lib/lang/ca_web_aliasdomain.lng
new file mode 100644
index 0000000000..92c9c35538
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['backup_interval_txt'] = 'Intervalle de Backup';
+$wb['backup_copies_txt'] = 'Nombre de copies de Backup';
+$wb['ssl_state_txt'] = 'Etat';
+$wb['ssl_locality_txt'] = 'Localité';
+$wb['ssl_organisation_txt'] = 'Entreprise';
+$wb['ssl_organisation_unit_txt'] = 'Service dans l\'entreprise';
+$wb['ssl_country_txt'] = 'Pays';
+$wb['ssl_key_txt'] = 'Clé SSL';
+$wb['ssl_request_txt'] = 'Requête SSL';
+$wb['ssl_cert_txt'] = 'Certificat SSL';
+$wb['ssl_bundle_txt'] = 'Bundle SSL';
+$wb['ssl_action_txt'] = 'Action SSL';
+$wb['ssl_domain_txt'] = 'Domaine SSL';
+$wb['server_id_txt'] = 'Serveur';
+$wb['web_folder_error_regex'] = 'Dossier invalide. Ne saisissez pas de ./ (slash).';
+$wb['type_txt'] = 'Type';
+$wb['parent_domain_id_txt'] = 'Site Web parent';
+$wb['redirect_type_txt'] = 'Type de redirection';
+$wb['redirect_path_txt'] = 'Chemin de redirection';
+$wb['active_txt'] = 'Actif';
+$wb['document_root_txt'] = 'Dossier racine';
+$wb['system_user_txt'] = 'Utilisateur Linux';
+$wb['system_group_txt'] = 'Groupe Linux';
+$wb['ip_address_txt'] = 'Adresse IPv4';
+$wb['ipv6_address_txt'] = 'Adresse IPv6';
+$wb['vhost_type_txt'] = 'Type de VHost';
+$wb['hd_quota_txt'] = 'Quota disque dur';
+$wb['traffic_quota_txt'] = 'Quota de trafic';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Documents d\'erreur personnalisés';
+$wb['subdomain_txt'] = 'Sous-domaine auto';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$wb['limit_web_domain_txt'] = 'Le nombre maximum de domaines Web pour votre compte est atteint.';
+$wb['limit_web_aliasdomain_txt'] = 'Le nombre maximum d\'alias de domaines pour votre compte est atteint.';
+$wb['limit_web_subdomain_txt'] = 'Le nombre maximum de sous-domaines pour votre compte est atteint.';
+$wb['apache_directives_txt'] = 'Directives Apache';
+$wb['domain_error_empty'] = 'Le domaine est vide.';
+$wb['domain_error_unique'] = 'Ce nom de domaine est déjà utilisé.';
+$wb['domain_error_regex'] = 'Nom de domaine invalide.';
+$wb['domain_error_autosub'] = 'Il existe déjà un sous-domaine avec cette configuration.';
+$wb['hd_quota_error_empty'] = 'Le quota de disque dur est à 0 ou vide.';
+$wb['traffic_quota_error_empty'] = 'Le quota de trafic est vide.';
+$wb['error_ssl_state_empty'] = 'Le statut SSL est vide.';
+$wb['error_ssl_locality_empty'] = 'La localité SSL est vide.';
+$wb['error_ssl_organisation_empty'] = 'L\'entreprise SSL est vide.';
+$wb['error_ssl_organisation_unit_empty'] = 'Le service dans l\'entreprise SSL est vide.';
+$wb['error_ssl_country_empty'] = 'Le pays SSL est vide.';
+$wb['error_ssl_cert_empty'] = 'Le champ certificat SSL est vide.';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Définir un mot de passe Webstatistics';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Quota disque dur maximal disponible';
+$wb['ssl_state_error_regex'] = 'Statut SSL invalide. Les caractères valides sont : a-z, 0-9 et .,-_';
+$wb['ssl_locality_error_regex'] = 'La localité SSL est invalide. Les caractères valides sont : a-z, 0-9 et .,-_';
+$wb['ssl_organisation_error_regex'] = 'L\'entreprise SSL est invalide. Les caractères valides sont : a-z, 0-9 et .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Le service d\'entreprise SSL est invalide. Les caractères valides sont : a-z, 0-9 et .,-_';
+$wb['ssl_country_error_regex'] = 'Pays SSL invalide. Les caractères valides sont : A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Quota de trafic maximal disponible';
+$wb['redirect_error_regex'] = 'Chemin de redirection invalide. Exemple de chemins de redirection valides : /test/ ou http://www.domaine.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Quota de trafic dépassé';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Nom d\'utilisateur Webstatistics';
+$wb['stats_type_txt'] = 'Programme Webstatistics';
+$wb['custom_php_ini_txt'] = 'Configuration php.ini personnalisée';
+$wb['none_txt'] = 'Aucun';
+$wb['disabled_txt'] = 'Désactivé';
+$wb['no_redirect_txt'] = 'Pas de redirection';
+$wb['no_flag_txt'] = 'Pas de flag';
+$wb['save_certificate_txt'] = 'Sauvergarder le certificat';
+$wb['create_certificate_txt'] = 'Créer un certificat';
+$wb['delete_certificate_txt'] = 'Supprimer le certificat';
+$wb['nginx_directives_txt'] = 'Directives nginx';
+$wb['seo_redirect_txt'] = 'Redirection SEO';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Utiliser Socket pour PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI pour SSL n\'est pas activé sur ce serveur. Vous ne pouvez activer qu\'un seul certificat SSL par adresse IP.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Les valeurs de configuration de PHP-FPM pm  doivent être comme suit : pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'La valeur de PHP-FPM pm.max_children doit être un entier positif.';
+$wb['pm_start_servers_error_regex'] = 'La valeur de PHP-FPM pm.start_servers doit être un entier positif.';
+$wb['pm_min_spare_servers_error_regex'] = 'La valeur de PHP-FPM pm.min_spare_servers doit être un entier positif.';
+$wb['pm_max_spare_servers_error_regex'] = 'La valeur de PHP-FPM pm.max_spare_servers doit être un entier positif.';
+$wb['hd_quota_error_regex'] = 'Le quota de disque dur est invalide.';
+$wb['traffic_quota_error_regex'] = 'Le quota de trafic est invalide.';
+$wb['fastcgi_php_version_txt'] = 'Version de PHP';
+$wb['pm_txt'] = 'Manager de process PHP-FPM';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'La valeur de PHP-FPM pm.process_idle_timeout doit être un entier positif.';
+$wb['pm_max_requests_error_regex'] = 'La valeur de PHP-FPM pm.max_requests doit être un entier positif >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Vous devez avoir une version de PHP >= 5.3.9 pour pouvoir utiliser le manager process ondemand. Si vous choisissez ondemand avec une ancienne version de PHP, PHP ne pourra pas démarrer !';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Vérification du mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['available_php_directive_snippets_txt'] = 'Directives PHP Snippets disponibles :';
+$wb['available_apache_directive_snippets_txt'] = 'Directives Apache Snippets disponibles :';
+$wb['available_nginx_directive_snippets_txt'] = 'Directives nginx Snippets disponibles :';
+$wb['proxy_directives_txt'] = 'Directives Proxy';
+$wb['available_proxy_directive_snippets_txt'] = 'Directives Proxy Snippets disponibles :';
+$wb['Domain'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/ca_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/ca_web_aliasdomain_list.lng
new file mode 100644
index 0000000000..5837931f69
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Alias de domaine';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['parent_domain_id_txt'] = 'Site web';
+$wb['domain_txt'] = 'Alias de domaine';
+$wb['add_new_record_txt'] = 'Nouvel alias de domaine';
+$wb['domain_error_empty'] = 'Le nom de domaine est vide.';
+$wb['domain_error_unique'] = 'Le nom de domaine doit être unique.';
+$wb['domain_error_regex'] = 'Le nom de domaine est invalide.';
+$wb['no_redirect_txt'] = 'Aucune redirection';
+$wb['no_flag_txt'] = 'Aucun flag';
+$wb['none_txt'] = 'Aucun';
+?>
diff --git a/interface/web/sites/lib/lang/ca_web_backup_list.lng b/interface/web/sites/lib/lang/ca_web_backup_list.lng
new file mode 100644
index 0000000000..97b04a0c05
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_web_backup_list.lng
@@ -0,0 +1,21 @@
+<?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['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['filesize_txt'] = 'Filesize';
+$wb['delete_backup_txt'] = 'Delete Backup';
+$wb['delete_info_txt'] = 'Delete of the backup has been started. This action takes several minutes to be completed.';
+$wb['delete_confirm_txt'] = 'Really delete this backup?';
+$wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
+$wb['backup_type_mongodb'] = 'MongoDB Database';
+?>
diff --git a/interface/web/sites/lib/lang/ca_web_childdomain.lng b/interface/web/sites/lib/lang/ca_web_childdomain.lng
new file mode 100644
index 0000000000..19a11efdc4
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_web_childdomain.lng
@@ -0,0 +1,118 @@
+<?php
+$wb['ssl_state_txt'] = 'State';
+$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_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['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quaota';
+$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['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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$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['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['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
+$wb['Domain'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/ca_web_childdomain_list.lng b/interface/web/sites/lib/lang/ca_web_childdomain_list.lng
new file mode 100644
index 0000000000..ad228802bf
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_web_childdomain_list.lng
@@ -0,0 +1,15 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_subdomain_txt'] = 'Add new Subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
+$wb['domain_error_empty'] = 'Domain is empty.';
+$wb['domain_error_unique'] = 'Domain must be unique.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/sites/lib/lang/ca_web_directive_snippets.lng b/interface/web/sites/lib/lang/ca_web_directive_snippets.lng
new file mode 100644
index 0000000000..d2590e53cf
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_web_directive_snippets.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['directive_snippets_id_txt'] = 'Desired configuration';
+?>
diff --git a/interface/web/sites/lib/lang/ca_web_domain.lng b/interface/web/sites/lib/lang/ca_web_domain.lng
new file mode 100644
index 0000000000..973ab381c4
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_web_domain.lng
@@ -0,0 +1,132 @@
+<?php
+$wb['ssl_state_txt'] = 'Pays';
+$wb['ssl_locality_txt'] = 'Localité';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Unité d\'organisation';
+$wb['ssl_country_txt'] = 'Pays';
+$wb['ssl_request_txt'] = 'Requête SSL';
+$wb['ssl_cert_txt'] = 'Certificat SSL';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'Action SSL';
+$wb['server_id_txt'] = 'Serveur';
+$wb['domain_txt'] = 'Domaine';
+$wb['type_txt'] = 'Type';
+$wb['parent_domain_id_txt'] = 'Site web parent';
+$wb['redirect_type_txt'] = 'Type de redirection';
+$wb['redirect_path_txt'] = 'Chemin de redirection';
+$wb['active_txt'] = 'Actif';
+$wb['document_root_txt'] = 'Racine du document';
+$wb['system_user_txt'] = 'Utilisateur Linux';
+$wb['system_group_txt'] = 'Groupe Linux';
+$wb['ip_address_txt'] = 'Adresse IP';
+$wb['vhost_type_txt'] = 'Type de VHost';
+$wb['hd_quota_txt'] = 'Quota disque';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Pages derreurs personnalisées';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$wb['limit_web_domain_txt'] = 'Le nombre maximum de noms de domaine pour votre compte a été atteint.';
+$wb['limit_web_aliasdomain_txt'] = 'Le nombre maximum d\'alias de domaine pour votre compte a été atteint.';
+$wb['limit_web_subdomain_txt'] = 'Le nombre maximum de sous-domaines pour votre compte a été atteint.';
+$wb['apache_directives_txt'] = 'Directives Apache';
+$wb['domain_error_empty'] = 'Le nom de domaine est vide.';
+$wb['domain_error_unique'] = 'Le nom de domaine doit être unique.';
+$wb['domain_error_regex'] = 'Le nom de domaine est invalide.';
+$wb['hd_quota_error_empty'] = 'Le quota disque est vide.';
+$wb['error_ssl_state_empty'] = 'Létat du SSL est vide.';
+$wb['error_ssl_locality_empty'] = 'La localité du SSL est vide.';
+$wb['error_ssl_organisation_empty'] = 'L\'organisation du SSL est vide.';
+$wb['error_ssl_organisation_unit_empty'] = 'L\'unité d\'organisation du SSL est vide.';
+$wb['error_ssl_country_empty'] = 'Le pays du SSL est vide.';
+$wb['subdomain_txt'] = 'Auto sous-domaine';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Mot de passe statistiques web';
+$wb['backup_interval_txt'] = 'Intervalle de sauvegarde';
+$wb['backup_copies_txt'] = 'Nombre de copies de sauvegarde';
+$wb['ssl_domain_txt'] = 'Domaine SSL';
+$wb['traffic_quota_txt'] = 'Quota de trafic';
+$wb['traffic_quota_error_empty'] = 'Le quota de trafic est vide.';
+$wb['error_ssl_cert_empty'] = 'Le champ certificat SSL est vide';
+$wb['allow_override_txt'] = 'AllowOverride Apache';
+$wb['limit_web_quota_free_txt'] = 'Quota max espace disque disponible';
+$wb['ssl_state_error_regex'] = 'Etat SSL invalide. Les caractères valides sont: a-z, 0-9 et .,-_';
+$wb['ssl_locality_error_regex'] = 'Localité SSL invalide. Les caractères valides sont: a-z, 0-9 et .,-_';
+$wb['ssl_organisation_error_regex'] = 'Organisation SSL invalide. Les caractères valides sont: a-z, 0-9 et .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Unité dorganisation SSL invalide. Les caractères valides sont: a-z, 0-9 et .,-_';
+$wb['ssl_country_error_regex'] = 'Pays SSL invalide. Les caractères valides sont: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Quota de trafic max disponible';
+$wb['redirect_error_regex'] = 'Chemin de redirection invalide. Exemple de redirections valides: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'open_basedir PHP';
+$wb['traffic_quota_exceeded_txt'] = 'Quota de trafic dépassé';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Nom d\'utilisateur statistiques web';
+$wb['stats_type_txt'] = 'Programme de  statistiques web';
+$wb['custom_php_ini_txt'] = 'Paramètres php.ini personnalisés';
+$wb['ipv6_address_txt'] = 'Adresse IPv6';
+$wb['none_txt'] = 'Aucun';
+$wb['disabled_txt'] = 'Désactivé';
+$wb['no_redirect_txt'] = 'Aucune redirection';
+$wb['no_flag_txt'] = 'Aucun flag';
+$wb['save_certificate_txt'] = 'Enregister le certificat';
+$wb['create_certificate_txt'] = 'Créer le certificat';
+$wb['delete_certificate_txt'] = 'Supprimer le certificat';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'Redirection SEO';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Utiliser Socket pour PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI pour SSL n\'est pas activé sur ce serveur. Vous ne pouvez activer qu\'un seul certificat SSL par adresse IP.';
+$wb['python_txt'] = 'Python';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Les valeurs de configuration de PHP-FPM pm doivent être comme suit : pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'La valeur PHP-FPM pm.max_children doit être un entier positif.';
+$wb['pm_start_servers_error_regex'] = 'La valeur de PHP-FPM pm.start_servers doit être un entier positif.';
+$wb['pm_min_spare_servers_error_regex'] = 'La valeur de PHP-FPM pm.min_spare_servers doit être un entier positif.';
+$wb['pm_max_spare_servers_error_regex'] = 'La valeur de PHP-FPM pm.max_spare_servers doit être un entier positif.';
+$wb['hd_quota_error_regex'] = 'Le quota de disque dur est invalide.';
+$wb['traffic_quota_error_regex'] = 'Le quota de trafic est invalide.';
+$wb['ssl_key_txt'] = 'Clé SSL';
+$wb['perl_txt'] = 'Perl';
+$wb['fastcgi_php_version_txt'] = 'Version de PHP';
+$wb['pm_txt'] = 'Manager de process PHP-FPM';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'La valeur de PHP-FPM pm.process_idle_timeout doit être un entier positif.';
+$wb['pm_max_requests_error_regex'] = 'La valeur de PHP-FPM pm.max_requests doit être un entier positif >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Votre version de PHP doit être >= 5.3.9 pour utiliser le manager de process ondemand. Si vous choisissez ondemand avec une version de PHP plus ancienne, PHP ne pourra plus démarrer !';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Vérification du mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['web_folder_error_regex'] = 'Le dossier saisi est invalide. Ne saisissez pas de ./ (slash).';
+$wb['domain_error_autosub'] = 'Un sous-domaine avec cette configuration existe déjà.';
+$wb['available_php_directive_snippets_txt'] = 'Directives PHP Snippets disponibles :';
+$wb['available_apache_directive_snippets_txt'] = 'Directives Apache Snippets disponibles :';
+$wb['available_nginx_directive_snippets_txt'] = 'Directives nginx Snippets disponibles :';
+$wb['proxy_directives_txt'] = 'Directives Proxy';
+$wb['available_proxy_directive_snippets_txt'] = 'Directives Proxy Snippets disponibles :';
+$wb['no_server_error'] = 'Aucun serveur sélectionné.';
+$wb['no_backup_txt'] = 'Pas de Backup';
+$wb['daily_backup_txt'] = 'Quotidien';
+$wb['weekly_backup_txt'] = 'Hebdomadaire';
+$wb['monthly_backup_txt'] = 'Mensuel';
+$wb['rewrite_rules_txt'] = 'Règles de réécriture';
+$wb['invalid_rewrite_rules_txt'] = 'Règles de réécriture incorrectes';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Directives autorisées :';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Variables';
+$wb['added_by_txt'] = 'Ajouté par';
+$wb['added_date_txt'] = 'Date d\'ajout';
+$wb['backup_excludes_txt'] = 'Dossier exclus';
+$wb['backup_excludes_note_txt'] = '(Séparer les dossier par une virgule. Exemple: web/cache/*,web/backup)';
+$wb['backup_excludes_error_regex'] = 'Caractères invalide dans le dossier exclus';
+$wb['invalid_custom_php_ini_settings_txt'] = 'Paraètre invalide dans les paramètres PHP';
+$wb['invalid_system_user_or_group_txt'] = 'Utilisateur et groupe invalide';
+$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
+?>
diff --git a/interface/web/sites/lib/lang/ca_web_domain_admin_list.lng b/interface/web/sites/lib/lang/ca_web_domain_admin_list.lng
new file mode 100644
index 0000000000..6706332f5b
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_web_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['sys_groupid_txt'] = 'Client';
+$wb['list_head_txt'] = 'Sites web';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['domain_txt'] = 'Domaine';
+$wb['add_new_record_txt'] = 'Ajouter un nouveau site';
+?>
diff --git a/interface/web/sites/lib/lang/ca_web_domain_list.lng b/interface/web/sites/lib/lang/ca_web_domain_list.lng
new file mode 100644
index 0000000000..ddf66f8d91
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Sites web';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['domain_txt'] = 'Domaine';
+$wb['add_new_record_txt'] = 'Nouveau site web';
+?>
diff --git a/interface/web/sites/lib/lang/ca_web_folder.lng b/interface/web/sites/lib/lang/ca_web_folder.lng
new file mode 100644
index 0000000000..8dbaf09bb0
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_web_folder.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['server_id_txt'] = 'Serveur';
+$wb['parent_domain_id_txt'] = 'Site web';
+$wb['path_txt'] = 'Chemin';
+$wb['active_txt'] = 'Actif';
+$wb['path_error_regex'] = 'Chemin de dossier invalide.';
+$wb['error_folder_already_protected_txt'] = 'There is already a record for this folder.';
+?>
diff --git a/interface/web/sites/lib/lang/ca_web_folder_list.lng b/interface/web/sites/lib/lang/ca_web_folder_list.lng
new file mode 100644
index 0000000000..0eed4fd8d6
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_web_folder_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Dossier';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['parent_domain_id_txt'] = 'Site web';
+$wb['path_txt'] = 'Chemin';
+$wb['add_new_record_txt'] = 'Add new Folder';
+?>
diff --git a/interface/web/sites/lib/lang/ca_web_folder_user.lng b/interface/web/sites/lib/lang/ca_web_folder_user.lng
new file mode 100644
index 0000000000..560d07ef2b
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_web_folder_user.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['web_folder_id_txt'] = 'Dossier';
+$wb['username_txt'] = 'Nom de \'utilisateur';
+$wb['password_txt'] = 'Mot de passe';
+$wb['active_txt'] = 'Actif';
+$wb['folder_error_empty'] = 'Aucun dossier web sélectionné.';
+$wb['password_strength_txt'] = 'Force du mot de passe';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Vérification du mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['no_folder_perm'] = 'Vous n\'avez pas les permissions pour ce dossier.';
+$wb['error_user_exists_already_txt'] = 'There is already a record for this user.';
+?>
diff --git a/interface/web/sites/lib/lang/ca_web_folder_user_list.lng b/interface/web/sites/lib/lang/ca_web_folder_user_list.lng
new file mode 100644
index 0000000000..9bccf9ed80
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_web_folder_user_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Utilisateur du dossier';
+$wb['active_txt'] = 'Actif';
+$wb['web_folder_id_txt'] = 'Dossier';
+$wb['username_txt'] = 'Nom de l\'utilisateur';
+$wb['add_new_record_txt'] = 'Ajouter un nouvel utilisateur';
+?>
diff --git a/interface/web/sites/lib/lang/ca_web_sites_stats_list.lng b/interface/web/sites/lib/lang/ca_web_sites_stats_list.lng
new file mode 100644
index 0000000000..553fa01e51
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_web_sites_stats_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Trafic Web';
+$wb['domain_txt'] = 'Domaine';
+$wb['this_month_txt'] = 'Le mois en cours';
+$wb['last_month_txt'] = 'Le mois précédent';
+$wb['this_year_txt'] = 'L\'année en cours';
+$wb['last_year_txt'] = 'L\'année précédente';
+$wb['sum_txt'] = 'Sum';
+?>
diff --git a/interface/web/sites/lib/lang/ca_web_subdomain.lng b/interface/web/sites/lib/lang/ca_web_subdomain.lng
new file mode 100644
index 0000000000..edc7be0c14
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['ssl_state_txt'] = 'Pays';
+$wb['ssl_locality_txt'] = 'Lieu';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Unité dorganisation';
+$wb['ssl_country_txt'] = 'Pays';
+$wb['ssl_request_txt'] = 'Requête SSL';
+$wb['ssl_cert_txt'] = 'Certificat SSL';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'Action SSL';
+$wb['server_id_txt'] = 'Serveur';
+$wb['domain_txt'] = 'Domaine';
+$wb['type_txt'] = 'Type';
+$wb['parent_domain_id_txt'] = 'Site web parent';
+$wb['redirect_type_txt'] = 'Type de redirection';
+$wb['redirect_path_txt'] = 'Chemin de redirection';
+$wb['active_txt'] = 'Actif';
+$wb['document_root_txt'] = 'Racine du document';
+$wb['system_user_txt'] = 'Utilisateur Linux';
+$wb['system_group_txt'] = 'Groupe Linux';
+$wb['ip_address_txt'] = 'Adresse IP';
+$wb['vhost_type_txt'] = 'Type de VHost';
+$wb['hd_quota_txt'] = 'Quota disque';
+$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['limit_web_domain_txt'] = 'Le nombre maximum de noms de domaine pour votre compte a été atteint.';
+$wb['limit_web_aliasdomain_txt'] = 'Le nombre maximum d\'alias de domaine pour votre compte a été atteint.';
+$wb['limit_web_subdomain_txt'] = 'Le nombre maximum de sous-domaines pour votre compte a été atteint.';
+$wb['apache_directives_txt'] = 'Directives Apache';
+$wb['domain_error_empty'] = 'Le nom de domaine est vide.';
+$wb['domain_error_unique'] = 'Le nom de domaine doit être unique.';
+$wb['domain_error_regex'] = 'Le nom de domaine est invalide.';
+$wb['host_txt'] = 'Hôte';
+$wb['traffic_quota_txt'] = 'Quota de trafic';
+$wb['redirect_error_regex'] = 'Chemin de redirection invalide. Exemples de redirections valides: /test/ ou http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'Aucune redirecton';
+$wb['no_flag_txt'] = 'Aucun flag';
+$wb['domain_error_wildcard'] = 'Les sous-domaines joker ne sont pas autorisés.';
+$wb['proxy_directives_txt'] = 'Directives pour les Proxy';
+$wb['available_proxy_directive_snippets_txt'] = 'Directives pour les Proxy Snippets disponibles :';
+$wb['error_proxy_requires_url'] = 'Les redirections de type \\"proxy\\" nécessitent une URL comme chemin de redirection.';
+?>
diff --git a/interface/web/sites/lib/lang/ca_web_subdomain_list.lng b/interface/web/sites/lib/lang/ca_web_subdomain_list.lng
new file mode 100644
index 0000000000..9bfbd30f2e
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Sous-domaines';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['parent_domain_id_txt'] = 'Site web';
+$wb['domain_txt'] = 'Sous-domaine';
+$wb['add_new_record_txt'] = 'Nouveau sous-domaine';
+?>
diff --git a/interface/web/sites/lib/lang/ca_web_vhost_domain.lng b/interface/web/sites/lib/lang/ca_web_vhost_domain.lng
new file mode 100644
index 0000000000..9594f71e01
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_web_vhost_domain.lng
@@ -0,0 +1,145 @@
+<?php
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$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'] = 'Document Root';
+$wb['system_user_txt'] = 'Linux User';
+$wb['system_group_txt'] = 'Linux Group';
+$wb['ip_address_txt'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
+$wb['variables_txt'] = 'Variables';
+$wb['added_by_txt'] = 'Added by';
+$wb['added_date_txt'] = 'Added date';
+$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['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['host_txt'] = 'Hostname';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['load_client_data_txt'] = 'Load client details';
+$wb['load_my_data_txt'] = 'Load my contact details';
+$wb['reset_client_data_txt'] = 'Reset data';
+$wb['ssl_letsencrypt_txt'] = 'Let\'s Encrypt SSL';
+$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
+$wb['password_strength_txt'] = 'Password strength';
+?>
diff --git a/interface/web/sites/lib/lang/ca_web_vhost_domain_admin_list.lng b/interface/web/sites/lib/lang/ca_web_vhost_domain_admin_list.lng
new file mode 100644
index 0000000000..b460e27100
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_web_vhost_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['sys_groupid_txt'] = 'Client';
+$wb['list_head_txt'] = 'Websites';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Add new website';
+?>
diff --git a/interface/web/sites/lib/lang/ca_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/ca_web_vhost_domain_list.lng
new file mode 100644
index 0000000000..5d27a57cdc
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_web_vhost_domain_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['list_head_txt'] = 'Websites';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Add new website';
+$wb['parent_domain_id_txt'] = 'Website';
+?>
diff --git a/interface/web/sites/lib/lang/ca_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/ca_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..40ec6af556
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_web_vhost_subdomain.lng
@@ -0,0 +1,127 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Interval de sauvegarde';
+$wb['backup_copies_txt'] = 'Retention';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Générer mot de passe';
+$wb['repeat_password_txt'] = 'Retaper le mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Variables';
+$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['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+?>
diff --git a/interface/web/sites/lib/lang/ca_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/ca_web_vhost_subdomain_list.lng
new file mode 100644
index 0000000000..0a0c7c2d1e
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Sous-domaines';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['parent_domain_id_txt'] = 'Site Web';
+$wb['domain_txt'] = 'Sous-domaine';
+$wb['add_new_record_txt'] = 'Ajouter un sous-domaine';
+?>
diff --git a/interface/web/sites/lib/lang/ca_webdav_user.lng b/interface/web/sites/lib/lang/ca_webdav_user.lng
new file mode 100644
index 0000000000..e8bf197bd3
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_webdav_user.lng
@@ -0,0 +1,21 @@
+<?php
+$wb['dir_txt'] = 'Dossier';
+$wb['server_id_txt'] = 'Serveur';
+$wb['parent_domain_id_txt'] = 'Site web';
+$wb['username_txt'] = 'Nom d\'utilisateur';
+$wb['password_txt'] = 'Mot de passe';
+$wb['password_strength_txt'] = 'Force du mot de passe';
+$wb['active_txt'] = 'Actif';
+$wb['limit_webdav_user_txt'] = 'Le nombre maximal d\'utilisateurs WebDAV pour votre compte est atteint.';
+$wb['username_error_empty'] = 'Le nom d\'utilisateur est vide';
+$wb['username_error_unique'] = 'Le nom d\'utilisateur doit être unique';
+$wb['username_error_regex'] = 'Le nom d\'utilisateur contient des caractères non autorisés.';
+$wb['directory_error_empty'] = 'Dossier vide.';
+$wb['parent_domain_id_error_empty'] = 'Aucun site web sélectionné.';
+$wb['dir_dot_error'] = 'Les .. ne sont pas autorisés.';
+$wb['dir_slashdot_error'] = 'Les ./ ne sont pas autorisés.';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Vérification du mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+?>
diff --git a/interface/web/sites/lib/lang/ca_webdav_user_list.lng b/interface/web/sites/lib/lang/ca_webdav_user_list.lng
new file mode 100644
index 0000000000..1a2bebebeb
--- /dev/null
+++ b/interface/web/sites/lib/lang/ca_webdav_user_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Utilisateur WebDAV';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['parent_domain_id_txt'] = 'Site web';
+$wb['username_txt'] = 'Nom d\'utilisateur';
+$wb['add_new_record_txt'] = 'Ajouter un utilisateur WebDAV';
+?>
diff --git a/interface/web/sites/lib/lang/cz.lng b/interface/web/sites/lib/lang/cz.lng
index 899f4f7edb..5bd3d5163f 100644
--- a/interface/web/sites/lib/lang/cz.lng
+++ b/interface/web/sites/lib/lang/cz.lng
@@ -33,5 +33,3 @@ $wb['Update Packagelist'] = 'Aktualizace seznamu balíčků';
 $wb['Subdomain (Vhost)'] = 'Subdoména (Vhost)';
 $wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_aps.lng b/interface/web/sites/lib/lang/cz_aps.lng
index 3134022bd5..e6616393c9 100644
--- a/interface/web/sites/lib/lang/cz_aps.lng
+++ b/interface/web/sites/lib/lang/cz_aps.lng
@@ -56,5 +56,3 @@ $wb['btn_install_txt'] = 'Instalovat';
 $wb['btn_cancel_txt'] = 'Zrušit';
 $wb['limit_aps_txt'] = 'Max. počet APS  instancí u vašeho účtu je dosaženo.';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_aps_instances_list.lng b/interface/web/sites/lib/lang/cz_aps_instances_list.lng
index fd988aeb55..8d712878d7 100644
--- a/interface/web/sites/lib/lang/cz_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/cz_aps_instances_list.lng
@@ -9,5 +9,3 @@ $wb['pkg_delete_confirmation'] = 'Opravdu chcete smazat tuto instalaci ?';
 $wb['filter_txt'] = 'Hledat';
 $wb['delete_txt'] = 'Smazat';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_aps_packages_list.lng b/interface/web/sites/lib/lang/cz_aps_packages_list.lng
index b74dfc8882..52ef6ebcd9 100644
--- a/interface/web/sites/lib/lang/cz_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/cz_aps_packages_list.lng
@@ -6,5 +6,3 @@ $wb['category_txt'] = 'Kategorie';
 $wb['status_txt'] = 'Odemčený';
 $wb['filter_txt'] = 'Hledat';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_aps_update_packagelist.lng b/interface/web/sites/lib/lang/cz_aps_update_packagelist.lng
index 8fb678d7f2..8f4124b47e 100644
--- a/interface/web/sites/lib/lang/cz_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/cz_aps_update_packagelist.lng
@@ -5,5 +5,3 @@ $wb['btn_start_txt'] = 'Aktualizace seznamu balíčků';
 $wb['btn_cancel_txt'] = 'Zrušit';
 $wb['legend_txt'] = 'Zde si můžete aktualizovat seznam dostupných balíčků. Vezměte prosím na vědomí, že aktualizace může trvat až několik minut. Po spuštění aktualizace můžete následně opustit tuto sekci. Tento proces bude pokračovat na pozadí.';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_backup_stats_list.lng b/interface/web/sites/lib/lang/cz_backup_stats_list.lng
index 0f3803f56a..65792aa591 100644
--- a/interface/web/sites/lib/lang/cz_backup_stats_list.lng
+++ b/interface/web/sites/lib/lang/cz_backup_stats_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb["database_name_txt"]   = '';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Domain';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['database_name_txt'] = '';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/sites/lib/lang/cz_cron.lng b/interface/web/sites/lib/lang/cz_cron.lng
index 80036851fd..05c62e7f01 100644
--- a/interface/web/sites/lib/lang/cz_cron.lng
+++ b/interface/web/sites/lib/lang/cz_cron.lng
@@ -21,6 +21,6 @@ $wb['unknown_fieldtype_error'] = 'Bylo použito pole neznámého typu.';
 $wb['server_id_error_empty'] = 'ID serveru je prázdné.';
 $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_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
+$wb['log_output_txt'] = 'Log output';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_cron_list.lng b/interface/web/sites/lib/lang/cz_cron_list.lng
index 0ca6dc3b87..f50dee2faf 100644
--- a/interface/web/sites/lib/lang/cz_cron_list.lng
+++ b/interface/web/sites/lib/lang/cz_cron_list.lng
@@ -11,5 +11,3 @@ $wb['command_txt'] = 'Příkaz';
 $wb['add_new_cron_txt'] = 'Přidat novou cron úlohu';
 $wb['parent_domain_id_txt'] = 'Webové stránky';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_database.lng b/interface/web/sites/lib/lang/cz_database.lng
index 7d5babaad9..5bb2630c6d 100644
--- a/interface/web/sites/lib/lang/cz_database.lng
+++ b/interface/web/sites/lib/lang/cz_database.lng
@@ -43,6 +43,7 @@ $wb['select_dbuser_txt'] = 'Vyberte uživatele databáze';
 $wb['no_dbuser_txt'] = 'Žádný';
 $wb['database_client_differs_txt'] = 'Klient mateřského webu a databáze se neshodují.';
 $wb['database_user_missing_txt'] = 'Prosím vyberte uživatele databáze pro tuto databázi.';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_database_admin_list.lng b/interface/web/sites/lib/lang/cz_database_admin_list.lng
index 887d729a27..eb7970af7f 100644
--- a/interface/web/sites/lib/lang/cz_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_admin_list.lng
@@ -8,6 +8,5 @@ $wb['database_name_txt'] = 'Jméno databáze';
 $wb['add_new_record_txt'] = 'Přidat nové databáze';
 $wb['sys_groupid_txt'] = 'Klient';
 $wb['parent_domain_id_txt'] = 'Webové stránky';
+$wb['type_txt'] = 'Type';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_database_list.lng b/interface/web/sites/lib/lang/cz_database_list.lng
index 87f01b1b2d..68640bff65 100644
--- a/interface/web/sites/lib/lang/cz_database_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_list.lng
@@ -7,6 +7,5 @@ $wb['database_user_txt'] = 'Uživatel databáze';
 $wb['database_name_txt'] = 'Název databáze';
 $wb['add_new_record_txt'] = 'Přidat databázi';
 $wb['parent_domain_id_txt'] = 'Webové stránky';
+$wb['type_txt'] = 'Type';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_database_quota_stats_list.lng b/interface/web/sites/lib/lang/cz_database_quota_stats_list.lng
index e1de70accf..4f92576007 100644
--- a/interface/web/sites/lib/lang/cz_database_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["database_txt"] = 'Database';
-$wb["server_name_txt"] = 'Server';
-$wb["client_txt"] = 'Client';
-$wb["used_txt"] = 'Used space';
-$wb["quota_txt"] = 'Quota';
-$wb["percentage_txt"] = 'Used in %';
+$wb['database_txt'] = 'Database';
+$wb['server_name_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb['used_txt'] = 'Used space';
+$wb['quota_txt'] = 'Quota';
+$wb['percentage_txt'] = 'Used in %';
 ?>
diff --git a/interface/web/sites/lib/lang/cz_database_user.lng b/interface/web/sites/lib/lang/cz_database_user.lng
index 2ccbfd2e14..13b87822c0 100644
--- a/interface/web/sites/lib/lang/cz_database_user.lng
+++ b/interface/web/sites/lib/lang/cz_database_user.lng
@@ -21,5 +21,3 @@ $wb['globalsearch_noresults_limit_txt'] = '0 výsledků';
 $wb['globalsearch_searchfield_watermark_txt'] = 'Hledat';
 $wb['globalsearch_suggestions_text_txt'] = 'Návrhy';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_database_user_admin_list.lng b/interface/web/sites/lib/lang/cz_database_user_admin_list.lng
index 30df066f76..df7bf45045 100644
--- a/interface/web/sites/lib/lang/cz_database_user_admin_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_user_admin_list.lng
@@ -4,5 +4,3 @@ $wb['database_user_txt'] = 'Uživatel databáze';
 $wb['add_new_record_txt'] = 'Vytvořit nového uživatele databáze';
 $wb['sys_groupid_txt'] = 'Klient';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_database_user_list.lng b/interface/web/sites/lib/lang/cz_database_user_list.lng
index 68cd34d2e4..42cf36d703 100644
--- a/interface/web/sites/lib/lang/cz_database_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_database_user_list.lng
@@ -3,5 +3,3 @@ $wb['list_head_txt'] = 'Uživatelé databáze';
 $wb['database_user_txt'] = 'Uživatelé databáze';
 $wb['add_new_record_txt'] = 'Přidat nového uživatele databáze';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_ftp_sites_stats_list.lng b/interface/web/sites/lib/lang/cz_ftp_sites_stats_list.lng
new file mode 100644
index 0000000000..03894607db
--- /dev/null
+++ b/interface/web/sites/lib/lang/cz_ftp_sites_stats_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb["list_head_txt"] = 'FTP 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 (Download + Upload)';
+$wb["in_out_txt"] = 'DL/UL';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/cz_ftp_user.lng b/interface/web/sites/lib/lang/cz_ftp_user.lng
index 659084c4f2..768a05ae62 100644
--- a/interface/web/sites/lib/lang/cz_ftp_user.lng
+++ b/interface/web/sites/lib/lang/cz_ftp_user.lng
@@ -31,8 +31,5 @@ $wb['generate_password_txt'] = 'Generovat heslo';
 $wb['repeat_password_txt'] = 'Opakujte heslo';
 $wb['password_mismatch_txt'] = 'Hesla se neshodují.';
 $wb['password_match_txt'] = 'Hesla se shodují.';
-$wb['invalid_system_user_or_group_txt'] = 'Neplatný systémový uživatel nebo skupina';
-$wb['directory_error_regex'] = 'Neplatný adresář';
+$wb['expires_txt'] = 'Expire at';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_ftp_user_list.lng b/interface/web/sites/lib/lang/cz_ftp_user_list.lng
index ea4a7f8dfb..79ec083d49 100644
--- a/interface/web/sites/lib/lang/cz_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_ftp_user_list.lng
@@ -6,5 +6,3 @@ $wb['parent_domain_id_txt'] = 'Webové stránky';
 $wb['username_txt'] = 'Uživatelské jméno';
 $wb['add_new_record_txt'] = 'Přidat FTP uživatele';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_shell_user.lng b/interface/web/sites/lib/lang/cz_shell_user.lng
index e6db3df783..eb66108057 100644
--- a/interface/web/sites/lib/lang/cz_shell_user.lng
+++ b/interface/web/sites/lib/lang/cz_shell_user.lng
@@ -34,5 +34,3 @@ $wb['shell_error_regex'] = 'Invalid shell';
 $wb['invalid_username_txt'] = 'Invalid Username';
 $wb['directory_error_notinweb'] = 'The directory has to be inside the web root.';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_shell_user_list.lng b/interface/web/sites/lib/lang/cz_shell_user_list.lng
index 6ff5396695..8a4ea407c0 100644
--- a/interface/web/sites/lib/lang/cz_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_shell_user_list.lng
@@ -6,5 +6,3 @@ $wb['parent_domain_id_txt'] = 'Stránka';
 $wb['username_txt'] = 'Uživatelské jméno';
 $wb['add_new_record_txt'] = 'Přidat shell uživatele';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng b/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng
index 00d81e1a88..8e3a8ccd4b 100644
--- a/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/cz_user_quota_stats_list.lng
@@ -7,5 +7,3 @@ $wb['hard_txt'] = 'Kvóta max. obsazení';
 $wb['soft_txt'] = 'Kvóta pro upozornění';
 $wb['files_txt'] = 'Jednotlivé soubory';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain.lng b/interface/web/sites/lib/lang/cz_web_aliasdomain.lng
new file mode 100644
index 0000000000..1b9fc20c3a
--- /dev/null
+++ b/interface/web/sites/lib/lang/cz_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Alias domény pro webové stránky';
+$wb['backup_interval_txt'] = 'Interval zálohování';
+$wb['backup_copies_txt'] = 'Počet kopií zálohy';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$wb['parent_domain_id_txt'] = 'Rodičovské webové stránky';
+$wb['redirect_type_txt'] = 'Typ přesměrování';
+$wb['redirect_path_txt'] = 'Cesta přesměrování';
+$wb['active_txt'] = 'Aktivní';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux User';
+$wb['system_group_txt'] = 'Linux Group';
+$wb['ip_address_txt'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Automatická subdoména';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Klient';
+$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'] = 'Doména je prázdná.';
+$wb['domain_error_unique'] = 'Webové stránky nebo sub-doména / alias-domény již existuje s tímto doménovým jménem.';
+$wb['domain_error_regex'] = 'Neplatné doménové jméno.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Klient';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Vlastní nastavení php.ini';
+$wb['none_txt'] = 'Žádný';
+$wb['disabled_txt'] = 'Vypnuto';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO přesměrování';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['Domain'] = 'Alias domény pro webové stránky';
+?>
diff --git a/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
new file mode 100644
index 0000000000..a20b415efc
--- /dev/null
+++ b/interface/web/sites/lib/lang/cz_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Alias domény pro webové stránky';
+$wb['active_txt'] = 'Aktivní';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Webové stránky';
+$wb['domain_txt'] = 'Alias doména';
+$wb['add_new_record_txt'] = 'Přidat alias doménu';
+$wb['domain_error_empty'] = 'Doména je prázdná.';
+$wb['domain_error_unique'] = 'Doména musí být unkátní.';
+$wb['domain_error_regex'] = 'Doménové jméno je chybné.';
+$wb['no_redirect_txt'] = 'Žádné přesměrování';
+$wb['no_flag_txt'] = 'Žádný příznak';
+$wb['none_txt'] = 'Žádná';
+?>
diff --git a/interface/web/sites/lib/lang/cz_web_backup_list.lng b/interface/web/sites/lib/lang/cz_web_backup_list.lng
index c0db5aee77..48dbd1f019 100644
--- a/interface/web/sites/lib/lang/cz_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_backup_list.lng
@@ -16,6 +16,6 @@ $wb['delete_confirm_txt'] = 'Really delete this backup?';
 $wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
 $wb['backup_type_mysql'] = 'MySQL Databáze';
 $wb['backup_type_web'] = 'Soubory webových stránek';
+$wb['filesize_txt'] = 'Filesize';
+$wb['backup_type_mongodb'] = 'MongoDB Database';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_childdomain.lng b/interface/web/sites/lib/lang/cz_web_childdomain.lng
index 8eb46597d4..a33ab1a8f4 100644
--- a/interface/web/sites/lib/lang/cz_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/cz_web_childdomain.lng
@@ -30,7 +30,7 @@ $wb['traffic_quota_txt'] = 'Přenosová kvóta';
 $wb['cgi_txt'] = 'CGI';
 $wb['ssi_txt'] = 'SSI';
 $wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Automatická subdoména';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
 $wb['ssl_txt'] = 'SSL';
 $wb['suexec_txt'] = 'SuEXEC';
 $wb['php_txt'] = 'PHP';
@@ -44,20 +44,13 @@ $wb['domain_error_unique'] = 'Webová stránka nebo sub / alias doména s tímto
 $wb['domain_error_regex'] = 'Neplatné doménové jméno.';
 $wb['host_txt'] = 'Host';
 $wb['redirect_error_regex'] = 'Neplatná cesta přesměrování. Platné přesměrování je například: /test/ nebo http://www.domain.tld/test/';
-$wb['no_redirect_txt'] = 'Žádné přesměrování';
-$wb['no_flag_txt'] = 'Žádný příznak';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
 $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['backup_interval_txt'] = 'Interval zálohování';
-$wb['backup_copies_txt'] = 'Počet kopií zálohy';
-$wb['ssl_key_txt'] = 'SSL Key';
-$wb['ssl_domain_txt'] = 'SSL Domain';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['error_proxy_requires_url'] = 'Redirect Type \\"proxy\\" requires a URL as the redirect path.';
 $wb['ipv6_address_txt'] = 'IPv6-Address';
-$wb['errordocs_txt'] = 'Own Error-Documents';
-$wb['subdomain_txt'] = 'Auto-Subdomain';
 $wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
 $wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
 $wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
@@ -85,8 +78,6 @@ $wb['stats_type_txt'] = 'Webstatistics program';
 $wb['custom_php_ini_txt'] = 'Custom php.ini settings';
 $wb['none_txt'] = 'None';
 $wb['disabled_txt'] = 'Vypnuto';
-$wb['no_redirect_txt'] = 'No redirect';
-$wb['no_flag_txt'] = 'No flag';
 $wb['save_certificate_txt'] = 'Save certificate';
 $wb['create_certificate_txt'] = 'Create certificate';
 $wb['delete_certificate_txt'] = 'Delete certificate';
@@ -123,9 +114,5 @@ $wb['password_match_txt'] = 'The passwords do match.';
 $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $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['Domain'] = 'Alias domény pro webové stránky';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_childdomain_list.lng b/interface/web/sites/lib/lang/cz_web_childdomain_list.lng
index aa3c3d63d8..94831d30ad 100644
--- a/interface/web/sites/lib/lang/cz_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_childdomain_list.lng
@@ -4,14 +4,12 @@ $wb['active_txt'] = 'Aktivní';
 $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Webové stránky';
 $wb['domain_txt'] = 'Alias doména';
-$wb['add_new_record_txt'] = 'Přidat alias doménu';
 $wb['domain_error_empty'] = 'Doména je prázdná.';
 $wb['domain_error_unique'] = 'Doména musí být unkátní.';
 $wb['domain_error_regex'] = 'Doménové jméno je chybné.';
 $wb['no_redirect_txt'] = 'Žádné přesměrování';
 $wb['no_flag_txt'] = 'Žádný příznak';
 $wb['none_txt'] = 'Žádná';
-
+$wb['add_new_subdomain_txt'] = 'Add new Subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_directive_snippets.lng b/interface/web/sites/lib/lang/cz_web_directive_snippets.lng
new file mode 100644
index 0000000000..05a004f654
--- /dev/null
+++ b/interface/web/sites/lib/lang/cz_web_directive_snippets.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['directive_snippets_id_txt'] = 'Desired configuration';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/cz_web_domain.lng b/interface/web/sites/lib/lang/cz_web_domain.lng
index 7c1e910975..db8f37f9db 100644
--- a/interface/web/sites/lib/lang/cz_web_domain.lng
+++ b/interface/web/sites/lib/lang/cz_web_domain.lng
@@ -27,7 +27,6 @@ $wb['cgi_txt'] = 'CGI';
 $wb['ssi_txt'] = 'SSI';
 $wb['subdomain_txt'] = 'Automatická subdoména';
 $wb['ssl_txt'] = 'SSL';
-$wb['ssl_letsencrypt_txt'] = 'Let\'s Encrypt';
 $wb['suexec_txt'] = 'SuEXEC';
 $wb['php_txt'] = 'PHP';
 $wb['client_txt'] = 'Klient';
@@ -131,5 +130,3 @@ $wb['invalid_custom_php_ini_settings_txt'] = 'Neplatné nastavení php.ini';
 $wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
 $wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng b/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng
index c79a51beb9..e52a794428 100644
--- a/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_domain_admin_list.lng
@@ -7,5 +7,3 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Doména';
 $wb['add_new_record_txt'] = 'Přidat webovou stránku';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_domain_list.lng b/interface/web/sites/lib/lang/cz_web_domain_list.lng
index af0947c9fc..cbf025e79b 100644
--- a/interface/web/sites/lib/lang/cz_web_domain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_domain_list.lng
@@ -6,5 +6,3 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Doména';
 $wb['add_new_record_txt'] = 'Přidat webovou stránku';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_folder.lng b/interface/web/sites/lib/lang/cz_web_folder.lng
index 4a4c7aca46..69310b5558 100644
--- a/interface/web/sites/lib/lang/cz_web_folder.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder.lng
@@ -6,5 +6,3 @@ $wb['active_txt'] = 'Aktivní';
 $wb['path_error_regex'] = 'Neplatná cesta ke složce.';
 $wb['error_folder_already_protected_txt'] = 'Záznam pro tuto složku již existuje';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_folder_list.lng b/interface/web/sites/lib/lang/cz_web_folder_list.lng
index d2797e7780..d7c39c0308 100644
--- a/interface/web/sites/lib/lang/cz_web_folder_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder_list.lng
@@ -6,5 +6,3 @@ $wb['parent_domain_id_txt'] = 'Webové stránky';
 $wb['path_txt'] = 'Cesta';
 $wb['add_new_record_txt'] = 'Přidat novou složku';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_folder_user.lng b/interface/web/sites/lib/lang/cz_web_folder_user.lng
index caf8f9054f..ca4cf5d9a6 100644
--- a/interface/web/sites/lib/lang/cz_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder_user.lng
@@ -12,5 +12,3 @@ $wb['password_match_txt'] = 'Hesla se shodují.';
 $wb['no_folder_perm'] = 'Nemáte oprávnění pro tuto složku.';
 $wb['error_user_exists_already_txt'] = 'There is already a record for this user.';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_folder_user_list.lng b/interface/web/sites/lib/lang/cz_web_folder_user_list.lng
index 10003d6567..1f09657560 100644
--- a/interface/web/sites/lib/lang/cz_web_folder_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_folder_user_list.lng
@@ -5,5 +5,3 @@ $wb['web_folder_id_txt'] = 'Složka';
 $wb['username_txt'] = 'Uživatelské jméno';
 $wb['add_new_record_txt'] = 'Přidat nového uživatele složky';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng b/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng
index ffab544669..ed93596824 100644
--- a/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_sites_stats_list.lng
@@ -7,5 +7,3 @@ $wb['this_year_txt'] = 'Tento rok';
 $wb['last_year_txt'] = 'Minulý rok';
 $wb['sum_txt'] = 'Součet';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_subdomain.lng b/interface/web/sites/lib/lang/cz_web_subdomain.lng
new file mode 100644
index 0000000000..de1445f5de
--- /dev/null
+++ b/interface/web/sites/lib/lang/cz_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['ssl_state_txt'] = 'Stát';
+$wb['ssl_locality_txt'] = 'Lokalita';
+$wb['ssl_organisation_txt'] = 'Organizace';
+$wb['ssl_organisation_unit_txt'] = 'Organizační jednotka';
+$wb['ssl_country_txt'] = 'Země';
+$wb['ssl_request_txt'] = 'SSL požadavek';
+$wb['ssl_cert_txt'] = 'SSL certifikát';
+$wb['ssl_bundle_txt'] = 'SSL bundle';
+$wb['ssl_action_txt'] = 'SSL akce';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Doména';
+$wb['type_txt'] = 'Typ';
+$wb['parent_domain_id_txt'] = 'Rodičovská web stránka';
+$wb['redirect_type_txt'] = 'Typ přesměrování';
+$wb['redirect_path_txt'] = 'Cesta přesměrování';
+$wb['active_txt'] = 'Aktivní';
+$wb['document_root_txt'] = 'Kořenový adresář dokumentů';
+$wb['system_user_txt'] = 'Linuxový uživatel';
+$wb['system_group_txt'] = 'Linuxová skupina';
+$wb['ip_address_txt'] = 'IP adresa';
+$wb['vhost_type_txt'] = 'VHost typ';
+$wb['hd_quota_txt'] = 'Disková kvóta';
+$wb['traffic_quota_txt'] = 'Přenosová kvóta';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Klient';
+$wb['limit_web_domain_txt'] = 'Dosažen maximální počet web domén pro Váš účet.';
+$wb['limit_web_aliasdomain_txt'] = 'Dosažen maximální počet alias domén pro Váš účet.';
+$wb['limit_web_subdomain_txt'] = 'Dosažen maximální počet subdomén pro Váš účet.';
+$wb['apache_directives_txt'] = 'Apache direktivy';
+$wb['domain_error_empty'] = 'Doména je prázdná.';
+$wb['domain_error_unique'] = 'Webová stránka nebo sub / alias doména s tímto doménovým jménem již existuje.';
+$wb['domain_error_regex'] = 'Neplatné doménové jméno.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Neplatná cesta přesměrování. Platné přesměrování je například: /test/ nebo http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'Žádné přesměrování';
+$wb['no_flag_txt'] = 'Žádný příznak';
+$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.';
+?>
diff --git a/interface/web/sites/lib/lang/cz_web_subdomain_list.lng b/interface/web/sites/lib/lang/cz_web_subdomain_list.lng
new file mode 100644
index 0000000000..cfe56c1990
--- /dev/null
+++ b/interface/web/sites/lib/lang/cz_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomény pro webové stránky';
+$wb['active_txt'] = 'Aktivní';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Webové stránky';
+$wb['domain_txt'] = 'Subdoména';
+$wb['add_new_record_txt'] = 'Přidat subdoménu';
+?>
diff --git a/interface/web/sites/lib/lang/cz_web_vhost_domain.lng b/interface/web/sites/lib/lang/cz_web_vhost_domain.lng
index 3c28292ce2..e786fad79a 100644
--- a/interface/web/sites/lib/lang/cz_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/cz_web_vhost_domain.lng
@@ -1,10 +1,10 @@
 <?php
-$wb['parent_domain_id_txt'] = 'Rodičovské webové stránky';
-$wb['web_folder_txt'] = 'Webová složka';
+$wb['parent_domain_id_txt'] = 'Rodičovská webová stránka';
+$wb['web_folder_txt'] = 'Web folder';
 $wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
 $wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
 $wb['backup_interval_txt'] = 'Interval zálohování';
-$wb['backup_copies_txt'] = 'Počet záložních kopií';
+$wb['backup_copies_txt'] = 'Počet kopií zálohy';
 $wb['ssl_state_txt'] = 'Stát';
 $wb['ssl_locality_txt'] = 'Lokalita';
 $wb['ssl_organisation_txt'] = 'Organizace';
@@ -17,15 +17,13 @@ $wb['ssl_action_txt'] = 'SSL akce';
 $wb['ssl_domain_txt'] = 'SSL doména';
 $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Doména';
-$wb['type_txt'] = 'Typ';
-$wb['parent_domain_id_txt'] = 'Rodičovská webová stránka';
-$wb['host_txt'] = 'Název hostitele';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
 $wb['type_txt'] = 'Verze';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
 $wb['redirect_type_txt'] = 'Typ přesměrování';
 $wb['redirect_path_txt'] = 'Cesta přesměrování';
 $wb['active_txt'] = 'Aktivní';
-$wb['document_root_txt'] = 'Kořenový adresář dokumentů';
+$wb['document_root_txt'] = 'Document Root';
 $wb['system_user_txt'] = 'Linuxový uživatel';
 $wb['system_group_txt'] = 'Linuxová skupina';
 $wb['ip_address_txt'] = 'IP adresa';
@@ -66,8 +64,6 @@ $wb['limit_traffic_quota_free_txt'] = 'Max. dostupná přenosová kvóta';
 $wb['redirect_error_regex'] = 'Neplatná cesta přesměrování. Platné přesměrování je například: /test/ nebo http://www.domain.tld/test/';
 $wb['php_open_basedir_txt'] = 'PHP open_basedir';
 $wb['traffic_quota_exceeded_txt'] = 'Přenosová kvóta překročena';
-$wb['backup_interval_txt'] = 'Interval zálohování';
-$wb['backup_copies_txt'] = 'Počet kopií zálohy';
 $wb['errordocs_txt'] = 'Vlastní Error (chybové) dokumenty';
 $wb['ruby_txt'] = 'Ruby';
 $wb['stats_user_txt'] = 'Webové statistiky: uživatelské jméno';
@@ -113,7 +109,6 @@ $wb['generate_password_txt'] = 'Generovat heslo';
 $wb['repeat_password_txt'] = 'Opakujte heslo';
 $wb['password_mismatch_txt'] = 'Hesla se neshodují.';
 $wb['password_match_txt'] = 'Hesla se shodují.';
-$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
 $wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
 $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
@@ -129,10 +124,6 @@ $wb['rewrite_rules_txt'] = 'Rewrite Rules';
 $wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
 $wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
 $wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
-$wb['web_folder_txt'] = 'Web folder';
-$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
-$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
-$wb['host_txt'] = 'Hostname';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['variables_txt'] = 'Proměnné';
 $wb['added_by_txt'] = 'Kdo vytvořil účet';
@@ -140,8 +131,15 @@ $wb['added_date_txt'] = 'Datum vytvoření účtu';
 $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["document_root_txt"] = "Document Root";
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['load_client_data_txt'] = 'Load client details';
+$wb['load_my_data_txt'] = 'Load my contact details';
+$wb['reset_client_data_txt'] = 'Reset data';
+$wb['ssl_letsencrypt_txt'] = 'Let\'s Encrypt SSL';
+$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_web_vhost_domain_admin_list.lng b/interface/web/sites/lib/lang/cz_web_vhost_domain_admin_list.lng
new file mode 100644
index 0000000000..e8825ae321
--- /dev/null
+++ b/interface/web/sites/lib/lang/cz_web_vhost_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb["sys_groupid_txt"] = 'Client';
+$wb["list_head_txt"] = 'Websites';
+$wb["domain_id_txt"] = 'ID';
+$wb["active_txt"] = 'Active';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["add_new_record_txt"] = 'Add new website';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/cz_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/cz_web_vhost_domain_list.lng
index 1c3a0c952c..d691664a5b 100644
--- a/interface/web/sites/lib/lang/cz_web_vhost_domain_list.lng
+++ b/interface/web/sites/lib/lang/cz_web_vhost_domain_list.lng
@@ -6,5 +6,4 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Doména';
 $wb['add_new_record_txt'] = 'Přidat webovou stránku';
 $wb['parent_domain_id_txt'] = 'Webové stránky';
-
 ?>
diff --git a/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..9401e97198
--- /dev/null
+++ b/interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
@@ -0,0 +1,127 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Rodičovské webové stránky';
+$wb['web_folder_txt'] = 'Webová složka';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Interval zálohování';
+$wb['backup_copies_txt'] = 'Počet záložních kopií';
+$wb['ssl_state_txt'] = 'Stát';
+$wb['ssl_locality_txt'] = 'Lokalita';
+$wb['ssl_organisation_txt'] = 'Organizace';
+$wb['ssl_organisation_unit_txt'] = 'Organizační jednotka';
+$wb['ssl_country_txt'] = 'Země';
+$wb['ssl_key_txt'] = 'SSL klíč';
+$wb['ssl_request_txt'] = 'SSL požadavek';
+$wb['ssl_cert_txt'] = 'SSL certifikát';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL akce';
+$wb['ssl_domain_txt'] = 'SSL Doména';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Doména';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Verze';
+$wb['redirect_type_txt'] = 'Typ přesměrování';
+$wb['redirect_path_txt'] = 'Cesta přesměrování';
+$wb['active_txt'] = 'Aktivní';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux User';
+$wb['system_group_txt'] = 'Linux Group';
+$wb['ip_address_txt'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Automatická subdoména';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Klient';
+$wb['limit_web_domain_txt'] = 'The max. Počet webových stránek 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'] = 'Doména je prázdná.';
+$wb['domain_error_unique'] = 'Webové stránky nebo sub-doména / alias-domény již existuje s tímto doménovým jménem.';
+$wb['domain_error_regex'] = 'Neplatné doménové jméno.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Klient';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffik kvóta překročena';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Vlastní nastavení php.ini';
+$wb['none_txt'] = 'Žádný';
+$wb['disabled_txt'] = 'Vypnuto';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Uložit certifikát';
+$wb['create_certificate_txt'] = 'Vytvořit certifikát';
+$wb['delete_certificate_txt'] = 'Smazat certifikát';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO přesměrování';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Kvóta pevného disku je neplatná.';
+$wb['traffic_quota_error_regex'] = 'Traffik kvóta je neplatná.';
+$wb['fastcgi_php_version_txt'] = 'PHP verze';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generovat heslo';
+$wb['repeat_password_txt'] = 'Opakujte heslo';
+$wb['password_mismatch_txt'] = 'Hesla se neshodují.';
+$wb['password_match_txt'] = 'Hesla se shodují.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Proměnné';
+$wb['backup_excludes_txt'] = 'Vyloučené adresáře';
+$wb['backup_excludes_note_txt'] = '(Oddělte více adresářů čárkami. Vzor: web/cache/*,web/backup)';
+$wb['backup_excludes_error_regex'] = 'Vyloučené adresáře obsahují neplatné znaky.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+?>
diff --git a/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
new file mode 100644
index 0000000000..a54e19a5ad
--- /dev/null
+++ b/interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomény';
+$wb['active_txt'] = 'Aktivní';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Webové stránky';
+$wb['domain_txt'] = 'Subdoména';
+$wb['add_new_record_txt'] = 'Přidat novou poddoménu';
+?>
diff --git a/interface/web/sites/lib/lang/cz_webdav_user.lng b/interface/web/sites/lib/lang/cz_webdav_user.lng
index 5cdbf7adcf..659cf3e8cc 100644
--- a/interface/web/sites/lib/lang/cz_webdav_user.lng
+++ b/interface/web/sites/lib/lang/cz_webdav_user.lng
@@ -19,5 +19,3 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
 $wb['password_mismatch_txt'] = 'Hesla se neshodují.';
 $wb['password_match_txt'] = 'Hesla se shodují.';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/cz_webdav_user_list.lng b/interface/web/sites/lib/lang/cz_webdav_user_list.lng
index 46e2b64a0c..7bb8017254 100644
--- a/interface/web/sites/lib/lang/cz_webdav_user_list.lng
+++ b/interface/web/sites/lib/lang/cz_webdav_user_list.lng
@@ -6,5 +6,3 @@ $wb['parent_domain_id_txt'] = 'Webové stránky';
 $wb['username_txt'] = 'Uživatelské jméno';
 $wb['add_new_record_txt'] = 'Přidat nového WebDAV uživatele';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/de_backup_stats_list.lng b/interface/web/sites/lib/lang/de_backup_stats_list.lng
index a2a124ae60..01797ea9c4 100644
--- a/interface/web/sites/lib/lang/de_backup_stats_list.lng
+++ b/interface/web/sites/lib/lang/de_backup_stats_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Statistiken';
-$wb["database_name_txt"]   = '';
-$wb['active_txt']          = 'Aktiv';
-$wb['domain_txt']          = 'Domain';
-$wb['backup_count_txt']    = 'Anz. Backups';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Statistiken';
+$wb['database_name_txt'] = '';
+$wb['active_txt'] = 'Aktiv';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_count_txt'] = 'Anz. Backups';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Intervall / Anz.';
 $wb['backup_size_txt'] = 'Backupgrösse';
 ?>
diff --git a/interface/web/sites/lib/lang/de_database.lng b/interface/web/sites/lib/lang/de_database.lng
index 0136d5a81a..891306c485 100644
--- a/interface/web/sites/lib/lang/de_database.lng
+++ b/interface/web/sites/lib/lang/de_database.lng
@@ -43,4 +43,7 @@ $wb['globalsearch_noresults_text_txt'] = 'Keine Treffer.';
 $wb['globalsearch_noresults_limit_txt'] = '0 Treffer';
 $wb['globalsearch_searchfield_watermark_txt'] = 'Suche';
 $wb['globalsearch_suggestions_text_txt'] = 'Vorschläge';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
 ?>
diff --git a/interface/web/sites/lib/lang/de_database_admin_list.lng b/interface/web/sites/lib/lang/de_database_admin_list.lng
index d15d2583c1..d7aa0e1703 100644
--- a/interface/web/sites/lib/lang/de_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/de_database_admin_list.lng
@@ -8,4 +8,5 @@ $wb['database_name_txt'] = 'Datenbank-Name';
 $wb['add_new_record_txt'] = 'Neue Datenbank hinzufügen';
 $wb['sys_groupid_txt'] = 'Kunde';
 $wb['parent_domain_id_txt'] = 'Domain';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/de_database_quota_stats_list.lng b/interface/web/sites/lib/lang/de_database_quota_stats_list.lng
index 4d1a367d94..f9be70788d 100644
--- a/interface/web/sites/lib/lang/de_database_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/de_database_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["database_txt"] = 'Datenbank';
-$wb["server_name_txt"] = 'Server';
-$wb["client_txt"] = 'Kunde';
-$wb["used_txt"] = 'Verwendeter Speicherplatz';
-$wb["quota_txt"] = 'Quota';
-$wb["percentage_txt"] = 'Verbraucht in %';
+$wb['database_txt'] = 'Datenbank';
+$wb['server_name_txt'] = 'Server';
+$wb['client_txt'] = 'Kunde';
+$wb['used_txt'] = 'Verwendeter Speicherplatz';
+$wb['quota_txt'] = 'Quota';
+$wb['percentage_txt'] = 'Verbraucht in %';
 ?>
diff --git a/interface/web/sites/lib/lang/de_ftp_sites_stats_list.lng b/interface/web/sites/lib/lang/de_ftp_sites_stats_list.lng
new file mode 100644
index 0000000000..03894607db
--- /dev/null
+++ b/interface/web/sites/lib/lang/de_ftp_sites_stats_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb["list_head_txt"] = 'FTP 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 (Download + Upload)';
+$wb["in_out_txt"] = 'DL/UL';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/de_ftp_user.lng b/interface/web/sites/lib/lang/de_ftp_user.lng
index 2f1417fa54..6c6cddaf88 100644
--- a/interface/web/sites/lib/lang/de_ftp_user.lng
+++ b/interface/web/sites/lib/lang/de_ftp_user.lng
@@ -32,6 +32,4 @@ $wb['repeat_password_txt'] = 'Passwort wiederholen';
 $wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
 $wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
 $wb['expires_txt'] = 'Zugang läuft ab';
-$wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['directory_error_regex'] = 'Invalid directory';
 ?>
diff --git a/interface/web/sites/lib/lang/de_web_aliasdomain.lng b/interface/web/sites/lib/lang/de_web_aliasdomain.lng
new file mode 100644
index 0000000000..5889b17d57
--- /dev/null
+++ b/interface/web/sites/lib/lang/de_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['backup_interval_txt'] = 'Backup-Intervall';
+$wb['backup_copies_txt'] = 'Anzahl der Backups';
+$wb['ssl_state_txt'] = 'Bundesland';
+$wb['ssl_locality_txt'] = 'Ort';
+$wb['ssl_organisation_txt'] = 'Firma';
+$wb['ssl_organisation_unit_txt'] = 'Abteilung';
+$wb['ssl_country_txt'] = 'Land';
+$wb['ssl_key_txt'] = 'SSL-Schlüssel';
+$wb['ssl_request_txt'] = 'SSL-Anfrage';
+$wb['ssl_cert_txt'] = 'SSL-Zertifikat';
+$wb['ssl_bundle_txt'] = 'SSL-Bundle';
+$wb['ssl_action_txt'] = 'SSL-Aktion';
+$wb['ssl_domain_txt'] = 'SSL-Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['web_folder_error_regex'] = 'Ungültige Ordnerangabe. Bitte geben Sie keinen Schrägstrich ein.';
+$wb['type_txt'] = 'Typ';
+$wb['parent_domain_id_txt'] = 'Hauptwebseite';
+$wb['redirect_type_txt'] = 'Weiterleitungstyp';
+$wb['redirect_path_txt'] = 'Weiterleitungsziel';
+$wb['active_txt'] = 'Aktiv';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'System-Benutzer';
+$wb['system_group_txt'] = 'System-Gruppe';
+$wb['ip_address_txt'] = 'IPv4-Adresse';
+$wb['ipv6_address_txt'] = 'IPv6-Adresse';
+$wb['vhost_type_txt'] = 'vHost-Typ';
+$wb['hd_quota_txt'] = 'Speicherplatz-Beschränkung';
+$wb['traffic_quota_txt'] = 'Datentransfer-Beschränkung';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Eigene Fehlerseiten';
+$wb['subdomain_txt'] = 'Automatische Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Kunde';
+$wb['limit_web_domain_txt'] = 'Die max. Anzahl an Webdomains für Ihr Konto ist erreicht.';
+$wb['limit_web_aliasdomain_txt'] = 'Die max. Anzahl an Aliasdomains für Ihr Konto ist erreicht.';
+$wb['limit_web_subdomain_txt'] = 'Die max. Anzahl an Web Subdomains für Ihr Konto ist erreicht.';
+$wb['apache_directives_txt'] = 'Apache-Direktiven';
+$wb['domain_error_empty'] = 'Domain ist leer.';
+$wb['domain_error_unique'] = 'Es existiert bereits eine Webseite oder Sub- Aliasdomain mit diesem Domain-Namen.';
+$wb['domain_error_regex'] = 'Domain-Name ungültig.';
+$wb['domain_error_autosub'] = 'Es existiert bereits eine Subdomain mit diesen Einstellungen.';
+$wb['hd_quota_error_empty'] = 'Speicherplatz-Beschränkung ist 0 oder leer.';
+$wb['traffic_quota_error_empty'] = 'Datentransfer-Beschränkung ist leer.';
+$wb['error_ssl_state_empty'] = 'SSL-Bundesland ist leer.';
+$wb['error_ssl_locality_empty'] = 'SSL-Ort ist leer.';
+$wb['error_ssl_organisation_empty'] = 'SSL-Firma ist leer.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL-Abteilung ist leer.';
+$wb['error_ssl_country_empty'] = 'SSL-Land ist leer.';
+$wb['error_ssl_cert_empty'] = 'SSL-Zertifikat-Feld ist leer.';
+$wb['client_group_id_txt'] = 'Kunde';
+$wb['stats_password_txt'] = 'Webstatistiken-Passwort';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. verfügbarer Speicherplatz';
+$wb['ssl_state_error_regex'] = 'Ungültiges SSL-Bundesland. Mögliche Zeichen sind: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Ungültiger SSL-Ort. Mögliche Zeichen sind: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Ungültige SSL-Firma. Mögliche Zeichen sind: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Ungültige SSL-Abteilung. Mögliche Zeichen sind: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Ungültiges SSL-Land. Mögliche Zeichen sind: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. verfügbarer Datentransfer';
+$wb['redirect_error_regex'] = 'Ungültiges Weiterleitungsziel. Gültige Weiterleitungsziele sind zum Beispiel: /test/ oder http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Datentransfervolumen überschritten';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistiken-Benutzername';
+$wb['stats_type_txt'] = 'Webstatistiken-Programm';
+$wb['custom_php_ini_txt'] = 'Benutzerdefinierte php.ini-Einstellungen';
+$wb['none_txt'] = 'Keine';
+$wb['disabled_txt'] = 'Deaktiviert';
+$wb['no_redirect_txt'] = 'Keine Weiterleitung';
+$wb['no_flag_txt'] = 'Kein Flag';
+$wb['save_certificate_txt'] = 'Zertifikat speichern';
+$wb['create_certificate_txt'] = 'Zertifikat erstellen';
+$wb['delete_certificate_txt'] = 'Zertifikat löschen';
+$wb['nginx_directives_txt'] = 'nginx-Direktiven';
+$wb['seo_redirect_txt'] = 'SEO Weiterleitung';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Verwende Socket für PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI ist für SSL ist auf diesem Server nicht aktiviert. Sie können nur ein SSL Zertifikat pro IP Adresse aktivieren.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Werte von PHP-FPM pm Einstellungen müßen folgendermaßen aussehen: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children muss ein positiver integer Wert sein.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers muss ein positiver integer Wert sein.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers muss ein positiver integer Wert sein.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers muss ein positiver integer Wert sein.';
+$wb['hd_quota_error_regex'] = 'Speicherplatz-Beschränkung ist ungültig.';
+$wb['traffic_quota_error_regex'] = 'Datentransfer-Beschränkung ist ungültig.';
+$wb['fastcgi_php_version_txt'] = 'PHP-Version';
+$wb['pm_txt'] = 'PHP-FPM Prozess Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout muss ein positiver Integer-Wert sein.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests muss ein Integer-Wert >= 0 sein.';
+$wb['pm_ondemand_hint_txt'] = 'Bitte beachten Sie, dass Sie mindestens PHP Version >= 5.3.9 verwenden um den Ondemand Prozess Manager zu verwenden. Wenn Sie Ondemand für eine ältere PHP Version aktivieren wird PHP nicht mehr funktionieren!';
+$wb['generate_password_txt'] = 'Passwort generieren';
+$wb['repeat_password_txt'] = 'Passwort wiederholen';
+$wb['password_mismatch_txt'] = 'Die Passwörter stimmer nicht überein.';
+$wb['password_match_txt'] = 'Die Passwörter stimmer überein.';
+$wb['available_php_directive_snippets_txt'] = 'Verfügbare PHP-Direktiven-Schnipsel:';
+$wb['available_apache_directive_snippets_txt'] = 'Verfügbare Apache-Direktiven-Schnipsel:';
+$wb['available_nginx_directive_snippets_txt'] = 'Verfügbare nginx-Direktiven-Schnipsel:';
+$wb['proxy_directives_txt'] = 'Proxy-Direktiven';
+$wb['available_proxy_directive_snippets_txt'] = 'Verfügbare Proxy-Direktiven-Schnipsel:';
+$wb['Domain'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/de_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/de_web_aliasdomain_list.lng
new file mode 100644
index 0000000000..df8ebc683e
--- /dev/null
+++ b/interface/web/sites/lib/lang/de_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Aliasdomain';
+$wb['active_txt'] = 'Aktiv';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Domain';
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['add_new_record_txt'] = 'Neue Aliasdomain hinzufügen';
+$wb['domain_error_empty'] = 'Domain ist leer.';
+$wb['domain_error_unique'] = 'Domain muss eindeutig sein.';
+$wb['domain_error_regex'] = 'Domain Name ist ungültig.';
+$wb['no_redirect_txt'] = 'Kein Redirect';
+$wb['no_flag_txt'] = 'Kein Flag';
+$wb['none_txt'] = 'keine';
+?>
diff --git a/interface/web/sites/lib/lang/de_web_backup_list.lng b/interface/web/sites/lib/lang/de_web_backup_list.lng
index c08d2a0a7b..63b27051bb 100644
--- a/interface/web/sites/lib/lang/de_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/de_web_backup_list.lng
@@ -17,4 +17,5 @@ $wb['delete_confirm_txt'] = 'Möchten Sie dieses Backup wirklich löschen?';
 $wb['delete_pending_txt'] = 'Es liegt bereits ein Backup-Lösch-Job an.';
 $wb['backup_type_mysql'] = 'MySQL-Datenbank';
 $wb['backup_type_web'] = 'Webseiten-Dateien';
+$wb['filesize_txt'] = 'Filesize';
 ?>
diff --git a/interface/web/sites/lib/lang/de_web_childdomain.lng b/interface/web/sites/lib/lang/de_web_childdomain.lng
index 435beae5a3..bb17039fbe 100644
--- a/interface/web/sites/lib/lang/de_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/de_web_childdomain.lng
@@ -42,7 +42,7 @@ $wb['no_redirect_txt'] = 'Kein Redirect';
 $wb['no_flag_txt'] = 'Kein Flag';
 $wb['proxy_directives_txt'] = 'Proxy-Direktiven';
 $wb['available_proxy_directive_snippets_txt'] = 'Verfügbare Proxy Direktiven Schnipsel:';
-$wb['error_proxy_requires_url'] = 'Weiterleitungstyp \"proxy\" erfordert eine URL als Weiterleitungspfad.';
+$wb['error_proxy_requires_url'] = 'Weiterleitungstyp \\"proxy\\" erfordert eine URL als Weiterleitungspfad.';
 $wb['backup_interval_txt'] = 'Backup-Intervall';
 $wb['backup_copies_txt'] = 'Anzahl der Backups';
 $wb['ssl_key_txt'] = 'SSL-Schlüssel';
@@ -115,5 +115,4 @@ $wb['available_php_directive_snippets_txt'] = 'Verfügbare PHP-Direktiven-Schnip
 $wb['available_apache_directive_snippets_txt'] = 'Verfügbare Apache-Direktiven-Schnipsel:';
 $wb['available_nginx_directive_snippets_txt'] = 'Verfügbare nginx-Direktiven-Schnipsel:';
 $wb['Domain'] = 'Aliasdomain';
-
 ?>
diff --git a/interface/web/sites/lib/lang/de_web_childdomain_list.lng b/interface/web/sites/lib/lang/de_web_childdomain_list.lng
index 836bf8f221..0513afe8d6 100644
--- a/interface/web/sites/lib/lang/de_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/de_web_childdomain_list.lng
@@ -4,12 +4,12 @@ $wb['active_txt'] = 'Aktiv';
 $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Webseite';
 $wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Neue Subdomain hinzufügen';
 $wb['domain_error_empty'] = 'Domain ist leer.';
 $wb['domain_error_unique'] = 'Domain muss eindeutig sein.';
 $wb['domain_error_regex'] = 'Domain Name ist ungültig.';
 $wb['no_redirect_txt'] = 'Keine Weiterleitung';
 $wb['no_flag_txt'] = 'Keine Optionen';
 $wb['none_txt'] = 'Keine';
-
+$wb['add_new_subdomain_txt'] = 'Add new Subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/de_web_directive_snippets.lng b/interface/web/sites/lib/lang/de_web_directive_snippets.lng
index b6d898496e..1398769a4e 100644
--- a/interface/web/sites/lib/lang/de_web_directive_snippets.lng
+++ b/interface/web/sites/lib/lang/de_web_directive_snippets.lng
@@ -1,3 +1,3 @@
-<?php
-$wb['directive_snippets_id_txt'] = 'Gewünschte Konfiguration';
-?>
\ No newline at end of file
+<?php
+$wb['directive_snippets_id_txt'] = 'Gewünschte Konfiguration';
+?>
diff --git a/interface/web/sites/lib/lang/de_web_domain.lng b/interface/web/sites/lib/lang/de_web_domain.lng
new file mode 100644
index 0000000000..b90ff9a53a
--- /dev/null
+++ b/interface/web/sites/lib/lang/de_web_domain.lng
@@ -0,0 +1,132 @@
+<?php
+$wb['ssl_state_txt'] = 'Bundesland';
+$wb['ssl_locality_txt'] = 'Ort';
+$wb['ssl_organisation_txt'] = 'Firma';
+$wb['ssl_organisation_unit_txt'] = 'Abteilung';
+$wb['ssl_country_txt'] = 'Land';
+$wb['ssl_key_txt'] = 'SSL-Key';
+$wb['ssl_request_txt'] = 'SSL-Request';
+$wb['ssl_cert_txt'] = 'SSL-Zertifikat';
+$wb['ssl_bundle_txt'] = 'SSL-Bundle';
+$wb['ssl_action_txt'] = 'SSL-Aktion';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Typ';
+$wb['parent_domain_id_txt'] = 'Zugehörige Webseite';
+$wb['web_folder_error_regex'] = 'Ungültige Verzeichnisangabe, bitte keinen / eingeben.';
+$wb['redirect_type_txt'] = 'Weiterleitungstyp';
+$wb['redirect_path_txt'] = 'Weiterleitungspfad';
+$wb['active_txt'] = 'Aktiv';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux-Benutzer';
+$wb['system_group_txt'] = 'Linux-Gruppe';
+$wb['ip_address_txt'] = 'IP-Adresse';
+$wb['vhost_type_txt'] = 'vHost-Typ';
+$wb['hd_quota_txt'] = 'Speicherplatzbeschränkung';
+$wb['traffic_quota_txt'] = 'Transfervolumenbeschränkung';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Kunde';
+$wb['limit_web_domain_txt'] = 'Die maximale Anzahl an Webdomains für Ihr Konto wurde erreicht.';
+$wb['limit_web_aliasdomain_txt'] = 'Die maximale Anzahl an Aliasdomains für Ihr Konto wurde erreicht.';
+$wb['limit_web_subdomain_txt'] = 'Die maximale Anzahl an Subdomains für Ihr Konto wurde erreicht.';
+$wb['apache_directives_txt'] = 'Apache Direktiven';
+$wb['domain_error_empty'] = 'Domain ist leer.';
+$wb['domain_error_unique'] = 'Domain muss eindeutig sein';
+$wb['domain_error_regex'] = 'Domain Name ungültig.';
+$wb['domain_error_autosub'] = 'Es existiert bereits eine Subdomain mit diesen Einstellungen.';
+$wb['hd_quota_error_empty'] = 'Speicherplatzbeschränkung ist leer.';
+$wb['traffic_quota_error_empty'] = 'Transfervolumenbeschränkung ist leer.';
+$wb['errordocs_txt'] = 'Eigene Fehlerseiten';
+$wb['error_ssl_state_empty'] = 'Bundesland (SSL) ist leer.';
+$wb['error_ssl_locality_empty'] = 'Ort (SSL) ist leer.';
+$wb['error_ssl_organisation_empty'] = 'Organisation (SSL) ist leer.';
+$wb['error_ssl_organisation_unit_empty'] = 'Abteilung (SSL) ist leer.';
+$wb['error_ssl_country_empty'] = 'Land (SSL) ist leer.';
+$wb['subdomain_txt'] = 'Auto Subdomain';
+$wb['client_group_id_txt'] = 'Kunde';
+$wb['stats_password_txt'] = 'Webstatistik Passwort';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['allow_override_txt'] = 'Allow Override';
+$wb['limit_web_quota_free_txt'] = 'Max. mögliche Speicherplatzbeschränkung';
+$wb['ssl_state_error_regex'] = 'Ungültiges SSL-Bundesland. Gültige Zeichen sind: a-z, 0-9 und .,-_&äöüÄÖÜ';
+$wb['ssl_locality_error_regex'] = 'Ungültiger SSL-Ort. Gülige Zeichen sind: a-z, 0-9 und .,-_&äöüÄÖÜ';
+$wb['ssl_organisation_error_regex'] = 'Ungültige SSL-Firma. Gültige Zeichen sind: a-z, 0-9 und .,-_&äöüÄÖÜ';
+$wb['ssl_organistaion_unit_error_regex'] = 'Ungültige SSL-Abteilung. Gültige Zeichen sind: a-z, 0-9 und .,-_&äöüÄÖÜ';
+$wb['ssl_country_error_regex'] = 'Ungültiges SSL-Land. Gültige Zeichen sind: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. mögliche Transfervolumenbeschränkung';
+$wb['redirect_error_regex'] = 'Ungültiger Weiterleitungspfad. Gültige Angaben sind beispielsweise: /test/ oder http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['backup_interval_txt'] = 'Backup Intervall';
+$wb['backup_copies_txt'] = 'Anzahl an Backups';
+$wb['traffic_quota_exceeded_txt'] = 'Transfervolumen verbraucht.';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistik Benutzername';
+$wb['stats_type_txt'] = 'Webstatistik Programm';
+$wb['custom_php_ini_txt'] = 'Individuelle php.ini Einstellungen';
+$wb['error_ssl_cert_empty'] = 'SSL Zertifikat Feld ist leer.';
+$wb['none_txt'] = 'Keine';
+$wb['disabled_txt'] = 'Deaktiviert';
+$wb['no_redirect_txt'] = 'Kein Redirect';
+$wb['no_flag_txt'] = 'Kein Flag';
+$wb['save_certificate_txt'] = 'Zertifikat speichern';
+$wb['create_certificate_txt'] = 'Zertifikat erstellen';
+$wb['delete_certificate_txt'] = 'Zertifikat löschen';
+$wb['nginx_directives_txt'] = 'nginx Direktiven';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Nicht-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> Nicht-www';
+$wb['php_fpm_use_socket_txt'] = 'Benutze Socket für PHP-FPM';
+$wb['ipv6_address_txt'] = 'IPv6 Adresse';
+$wb['error_no_sni_txt'] = 'SNI für SSL ist auf diesem Server nicht aktiviert. Sie können daher nur ein SSL Zertifikat pro IP Adresse eintragen.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Die Werte der PHP-FPM pm Einstellungen müssen wie folgt sein: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children muß eine positive ganze Zahl sein.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers muß eine positive ganze Zahl sein.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers muß eine positive ganze Zahl sein.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers muß eine positive ganze Zahl sein.';
+$wb['hd_quota_error_regex'] = 'Speicherplatzbeschränkung ist ungültig.';
+$wb['traffic_quota_error_regex'] = 'Transfervolumenbeschränkung ist ungültig.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM FastCGI Prozess Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout muß eine positive ganze Zahl sein.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests muß eine ganze Zahl >= 0 sein.';
+$wb['pm_ondemand_hint_txt'] = 'Bitte beachten Sie, daß Ihre PHP Version >= 5.3.9 sein muß, wenn Sie den ondemand Process-Manager nutzen möchten. Wenn Sie ondemand für eine ältere PHP Version auswählen, wird PHP nicht mehr starten!';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
+$wb['repeat_password_txt'] = 'Passwort wiederholen';
+$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
+$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
+$wb['available_php_directive_snippets_txt'] = 'Verfügbare PHP Direktiven Schnipsel:';
+$wb['available_apache_directive_snippets_txt'] = 'Verfügbare Apache Direktiven Schnipsel:';
+$wb['available_nginx_directive_snippets_txt'] = 'Verfügbare nginx Direktiven Schnipsel:';
+$wb['proxy_directives_txt'] = 'Proxy Direktiven';
+$wb['available_proxy_directive_snippets_txt'] = 'Verfügbare Proxy Direktiven Schnipsel:';
+$wb['no_server_error'] = 'Kein Server ausgewählt.';
+$wb['no_backup_txt'] = 'Kein Backup';
+$wb['daily_backup_txt'] = 'Täglich';
+$wb['weekly_backup_txt'] = 'Wöchentlich';
+$wb['monthly_backup_txt'] = 'Monatlich';
+$wb['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Unzulässige Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Erlaubte Direktiven:';
+$wb['configuration_error_txt'] = 'KONFIGURATIONSFEHLER';
+$wb['variables_txt'] = 'Variablen';
+$wb['added_by_txt'] = 'Hinzugefügt von';
+$wb['added_date_txt'] = 'Hinzugefügt am';
+$wb['backup_excludes_txt'] = 'Auszuschließende Verzeichnisse';
+$wb['backup_excludes_note_txt'] = '(Mehrere Verzeichnisse mit Kommas trennen. Beispiel: web/cache/*,web/backup)';
+$wb['backup_excludes_error_regex'] = 'Die auszuschließenden Verzeichnisse enthalten ungültige Zeichen.';
+$wb['invalid_custom_php_ini_settings_txt'] = 'Unzulässige php.ini-Einstellungen';
+$wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
+$wb['apache_directive_blocked_error'] = 'Die Apache Direktive wurde durch die Sicherheitsrichtline blockiert:';
+?>
diff --git a/interface/web/sites/lib/lang/de_web_domain_admin_list.lng b/interface/web/sites/lib/lang/de_web_domain_admin_list.lng
new file mode 100644
index 0000000000..d9dc65c6c0
--- /dev/null
+++ b/interface/web/sites/lib/lang/de_web_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['sys_groupid_txt'] = 'Kunde';
+$wb['list_head_txt'] = 'Webseiten';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Aktiv';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Neue Webseite hinzufügen';
+?>
diff --git a/interface/web/sites/lib/lang/de_web_domain_list.lng b/interface/web/sites/lib/lang/de_web_domain_list.lng
new file mode 100644
index 0000000000..ce56a1cd1f
--- /dev/null
+++ b/interface/web/sites/lib/lang/de_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Domains';
+$wb['domain_id_txt'] = 'Domain ID';
+$wb['active_txt'] = 'Aktiv';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Neue Domain hinzufügen';
+?>
diff --git a/interface/web/sites/lib/lang/de_web_subdomain.lng b/interface/web/sites/lib/lang/de_web_subdomain.lng
new file mode 100644
index 0000000000..5c23f08a4d
--- /dev/null
+++ b/interface/web/sites/lib/lang/de_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['ssl_state_txt'] = 'Bundesland';
+$wb['ssl_locality_txt'] = 'Ort';
+$wb['ssl_organisation_txt'] = 'Firma';
+$wb['ssl_organisation_unit_txt'] = 'Abteilung';
+$wb['ssl_country_txt'] = 'Land';
+$wb['ssl_request_txt'] = 'SSL Anfrage';
+$wb['ssl_cert_txt'] = 'SSL Zertifikat';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Aktion';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Typ';
+$wb['parent_domain_id_txt'] = 'Zugehörige Webseite';
+$wb['redirect_type_txt'] = 'Weiterleitungstyp';
+$wb['redirect_path_txt'] = 'Weiterleitungsziel';
+$wb['active_txt'] = 'Aktiv';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux-Benutzer';
+$wb['system_group_txt'] = 'Linux-Gruppe';
+$wb['ip_address_txt'] = 'IP-Adresse';
+$wb['vhost_type_txt'] = 'vHost-Typ';
+$wb['hd_quota_txt'] = 'Festplatten-Quota';
+$wb['traffic_quota_txt'] = 'Traffic-Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Kunde';
+$wb['limit_web_domain_txt'] = 'Die max. Anzahl an Webdomains für Ihr Konto wurde erreicht.';
+$wb['limit_web_aliasdomain_txt'] = 'Die max. Anzahl an Aliasdomains für Ihr Konto wurde erreicht.';
+$wb['limit_web_subdomain_txt'] = 'Die max. Anzahl an Web-Subdomains für Ihr Konto wurde erreicht.';
+$wb['apache_directives_txt'] = 'Apache-Direktiven';
+$wb['domain_error_empty'] = 'Domain ist leer.';
+$wb['domain_error_unique'] = 'Domain muss eindeutig sein.';
+$wb['domain_error_regex'] = 'Domain-Name ist ungültig.';
+$wb['domain_error_wildcard'] = 'Wildcard Subdomains sind nicht erlaubt.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Ungültiger Redirect-Pfad. Gültige Pfade sind beispielsweise: /test/ oder http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'Kein Redirect';
+$wb['no_flag_txt'] = 'Kein Flag';
+$wb['proxy_directives_txt'] = 'Proxy-Direktiven';
+$wb['available_proxy_directive_snippets_txt'] = 'Verfügbare Proxy Direktiven Schnipsel:';
+$wb['error_proxy_requires_url'] = 'Weiterleitungstyp \\"proxy\\" erfordert eine URL als Weiterleitungspfad.';
+?>
diff --git a/interface/web/sites/lib/lang/de_web_subdomain_list.lng b/interface/web/sites/lib/lang/de_web_subdomain_list.lng
new file mode 100644
index 0000000000..042b9f02c5
--- /dev/null
+++ b/interface/web/sites/lib/lang/de_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Aktiv';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Webseite';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Neue Subdomain hinzufügen';
+?>
diff --git a/interface/web/sites/lib/lang/de_web_vhost_domain.lng b/interface/web/sites/lib/lang/de_web_vhost_domain.lng
index c44830536d..e6bfb44999 100644
--- a/interface/web/sites/lib/lang/de_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/de_web_vhost_domain.lng
@@ -17,7 +17,7 @@ $wb['web_folder_error_regex'] = 'Ungültige Verzeichnisangabe, bitte keinen / ei
 $wb['redirect_type_txt'] = 'Weiterleitungstyp';
 $wb['redirect_path_txt'] = 'Weiterleitungspfad';
 $wb['active_txt'] = 'Aktiv';
-$wb['document_root_txt'] = 'Documentroot';
+$wb['document_root_txt'] = 'Document Root';
 $wb['system_user_txt'] = 'Linux-Benutzer';
 $wb['system_group_txt'] = 'Linux-Gruppe';
 $wb['ip_address_txt'] = 'IP-Adresse';
@@ -132,14 +132,14 @@ $wb['web_folder_invalid_txt'] = 'Dieser Ordner darf nicht als Basisordner verwen
 $wb['web_folder_unique_txt'] = 'Dieser Ordner wird bereits verwendet, bitte geben Sie einen anderen Basisordner an.';
 $wb['host_txt'] = 'Host';
 $wb['domain_error_wildcard'] = 'Wildcard-Subdomains sind nicht erlaubt.';
-$wb['invalid_custom_php_ini_settings_txt'] = 'Unzulässige php.ini-Einstellungen';
-$wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['apache_directive_blocked_error'] = 'Die Apache Direktive wurde durch die Sicherheitsrichtline blockiert:';
 $wb['btn_save_txt'] = 'Speichern';
 $wb['btn_cancel_txt'] = 'Abbrechen';
 $wb['enable_spdy_txt'] = 'Aktiviere SPDY';
 $wb['load_client_data_txt'] = 'Kundendaten übernehmen';
 $wb['load_my_data_txt'] = 'Meine Kontaktdaten laden';
 $wb['reset_client_data_txt'] = 'Daten verwerfen';
-$wb["document_root_txt"] = "Document Root";
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
diff --git a/interface/web/sites/lib/lang/de_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/de_web_vhost_domain_list.lng
index 4e3d99f8db..c2c291fdf3 100644
--- a/interface/web/sites/lib/lang/de_web_vhost_domain_list.lng
+++ b/interface/web/sites/lib/lang/de_web_vhost_domain_list.lng
@@ -6,5 +6,4 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domain';
 $wb['add_new_record_txt'] = 'Neue Domain hinzufügen';
 $wb['parent_domain_id_txt'] = 'Webseite';
-
 ?>
diff --git a/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..fa6b1aa174
--- /dev/null
+++ b/interface/web/sites/lib/lang/de_web_vhost_subdomain.lng
@@ -0,0 +1,127 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Zugehörige Webseite';
+$wb['web_folder_txt'] = 'Basisordner';
+$wb['web_folder_invalid_txt'] = 'Dieser Ordner darf nicht als Basisordner verwendet werden.';
+$wb['web_folder_unique_txt'] = 'Dieser Ordner wird bereits verwendet, bitte geben Sie einen anderen Basisordner an.';
+$wb['ssl_state_txt'] = 'Bundesland';
+$wb['ssl_locality_txt'] = 'Ort';
+$wb['ssl_organisation_txt'] = 'Firma';
+$wb['ssl_organisation_unit_txt'] = 'Abteilung';
+$wb['ssl_country_txt'] = 'Land';
+$wb['ssl_key_txt'] = 'SSL-Key';
+$wb['ssl_request_txt'] = 'SSL-Request';
+$wb['ssl_cert_txt'] = 'SSL-Zertifikat';
+$wb['ssl_bundle_txt'] = 'SSL-Bundle';
+$wb['ssl_action_txt'] = 'SSL-Aktion';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Host';
+$wb['type_txt'] = 'Typ';
+$wb['web_folder_error_regex'] = 'Ungültige Ordnerangabe, bitte keinen / eingeben.';
+$wb['redirect_type_txt'] = 'Redirect-Typ';
+$wb['redirect_path_txt'] = 'Redirect-Pfad';
+$wb['active_txt'] = 'Aktiv';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux-Benutzer';
+$wb['system_group_txt'] = 'Linux-Gruppe';
+$wb['ip_address_txt'] = 'IP Adresse';
+$wb['vhost_type_txt'] = 'vHost-Typ';
+$wb['hd_quota_txt'] = 'Festplatten-Quota';
+$wb['traffic_quota_txt'] = 'Traffic-Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Kunde';
+$wb['limit_web_domain_txt'] = 'Die max. Anzahl an Webdomains für Ihr Konto wurde erreicht.';
+$wb['limit_web_aliasdomain_txt'] = 'Die max. Anzahl an Aliasdomains für Ihr Konto wurde erreicht.';
+$wb['limit_web_subdomain_txt'] = 'Die max. Anzahl an Subdomains für Ihr Konto wurde erreicht.';
+$wb['apache_directives_txt'] = 'Apache-Direktiven';
+$wb['domain_error_empty'] = 'Domain ist leer.';
+$wb['domain_error_unique'] = 'Domain muss eindeutig sein';
+$wb['domain_error_regex'] = 'Domain-Name ungültig.';
+$wb['domain_error_wildcard'] = 'Wildcard-Subdomains sind nicht erlaubt.';
+$wb['hd_quota_error_empty'] = 'Harddisk-Quota ist leer.';
+$wb['traffic_quota_error_empty'] = 'Traffic-Quota ist leer.';
+$wb['errordocs_txt'] = 'Eigene Fehlerseiten';
+$wb['error_ssl_state_empty'] = 'Bundesland (SSL) ist leer.';
+$wb['error_ssl_locality_empty'] = 'Ort (SSL) ist leer.';
+$wb['error_ssl_organisation_empty'] = 'Organisation (SSL) ist leer.';
+$wb['error_ssl_organisation_unit_empty'] = 'Abteilung (SSL) ist leer.';
+$wb['error_ssl_country_empty'] = 'Land (SSL) ist leer.';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['client_group_id_txt'] = 'Kunde';
+$wb['stats_password_txt'] = 'Webstatistik-Passwort';
+$wb['ssl_domain_txt'] = 'SSL-Domain';
+$wb['allow_override_txt'] = 'Allow Override';
+$wb['limit_web_quota_free_txt'] = 'Max. mögliches Festplatten-Quota';
+$wb['ssl_state_error_regex'] = 'Ungültiges SSL-Bundesland. Gültige Zeichen sind: a-z, 0-9 und .,-_';
+$wb['ssl_locality_error_regex'] = 'Ungültiger SSL-Ort. Gülige Zeichen sind: a-z, 0-9 und .,-_';
+$wb['ssl_organisation_error_regex'] = 'Ungültige SSL-Firma. Gültige Zeichen sind: a-z, 0-9 und .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Ungültige SSL-Abteilung. Gültige Zeichen sind: a-z, 0-9 und .,-_';
+$wb['ssl_country_error_regex'] = 'Ungültiges SSL-Land. Gültige Zeichen sind: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. mögliches Traffic-Quota';
+$wb['redirect_error_regex'] = 'Ungültiger Redirect-Pfad. Gültige Angaben sind beispielsweise: /test/ oder http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['backup_interval_txt'] = 'Backup-Intervall';
+$wb['backup_copies_txt'] = 'Anzahl an Backups';
+$wb['traffic_quota_exceeded_txt'] = 'Max. Datentransfer verbraucht.';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistik-Benutzername';
+$wb['stats_type_txt'] = 'Webstatistik-Programm';
+$wb['custom_php_ini_txt'] = 'Individuelle php.ini-Einstellungen';
+$wb['error_ssl_cert_empty'] = 'SSL-Zertifikat-Feld ist leer.';
+$wb['none_txt'] = 'Keine';
+$wb['disabled_txt'] = 'Deaktiviert';
+$wb['no_redirect_txt'] = 'Kein Redirect';
+$wb['no_flag_txt'] = 'Kein Flag';
+$wb['save_certificate_txt'] = 'Zertifikat speichern';
+$wb['create_certificate_txt'] = 'Zertifikat erstellen';
+$wb['delete_certificate_txt'] = 'Zertifikat löschen';
+$wb['nginx_directives_txt'] = 'nginx-Direktiven';
+$wb['seo_redirect_txt'] = 'SEO-Redirect';
+$wb['non_www_to_www_txt'] = 'Nicht-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> Nicht-www';
+$wb['php_fpm_use_socket_txt'] = 'Benutze Socket für PHP-FPM';
+$wb['ipv6_address_txt'] = 'IPv6-Adresse';
+$wb['error_no_sni_txt'] = 'SNI für SSL ist auf diesem Server nicht aktiviert. Sie können daher nur ein SSL-Zertifikat pro IP-Adresse eintragen.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Die Werte der PHP-FPM pm Einstellungen müssen wie folgt sein: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children muß eine positive ganze Zahl sein.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers muß eine positive ganze Zahl sein.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers muß eine positive ganze Zahl sein.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers muß eine positive ganze Zahl sein.';
+$wb['hd_quota_error_regex'] = 'Harddisk-Quota ist ungültig.';
+$wb['traffic_quota_error_regex'] = 'Traffic-Quota ist ungültig.';
+$wb['fastcgi_php_version_txt'] = 'PHP-Version';
+$wb['pm_txt'] = 'PHP-FPM Prozess Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout muß eine positive ganze Zahl sein.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests muß eine ganze Zahl >= 0 sein.';
+$wb['pm_ondemand_hint_txt'] = 'Bitte beachten Sie, daß Ihre PHP Version >= 5.3.9 sein muß, wenn Sie den ondemand Prozess Manager nutzen möchten. Wenn Sie ondemand für eine ältere PHP-Version auswählen, wird PHP nicht mehr starten!';
+$wb['generate_password_txt'] = 'Passwort erzeugen';
+$wb['repeat_password_txt'] = 'Passwort wiederholen';
+$wb['password_mismatch_txt'] = 'Die Passwörter stimmen nicht überein.';
+$wb['password_match_txt'] = 'Die Passwörter stimmen überein.';
+$wb['available_php_directive_snippets_txt'] = 'Verfügbare PHP-Direktiven-Schnipsel:';
+$wb['available_apache_directive_snippets_txt'] = 'Verfügbare Apache-Direktiven-Schnipsel:';
+$wb['available_nginx_directive_snippets_txt'] = 'Verfügbare nginx-Direktiven-Schnipsel:';
+$wb['proxy_directives_txt'] = 'Proxy-Direktiven';
+$wb['available_proxy_directive_snippets_txt'] = 'Verfügbare Proxy-Direktiven-Schnipsel:';
+$wb['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Unzulässige Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Erlaubte Direktiven:';
+$wb['configuration_error_txt'] = 'KONFIGURATIONSFEHLER';
+$wb['variables_txt'] = 'Variablen';
+$wb['backup_excludes_txt'] = 'Auszuschließende Verzeichnisse';
+$wb['backup_excludes_note_txt'] = '(Mehrere Verzeichnisse mit Kommas trennen. Beispiel: web/cache/*,web/backup)';
+$wb['backup_excludes_error_regex'] = 'Die auszuschließenden Verzeichnisse enthalten ungültige Zeichen.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+?>
diff --git a/interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng
new file mode 100644
index 0000000000..042b9f02c5
--- /dev/null
+++ b/interface/web/sites/lib/lang/de_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Aktiv';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Webseite';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Neue Subdomain hinzufügen';
+?>
diff --git a/interface/web/sites/lib/lang/el_backup_stats_list.lng b/interface/web/sites/lib/lang/el_backup_stats_list.lng
index 0f3803f56a..65792aa591 100644
--- a/interface/web/sites/lib/lang/el_backup_stats_list.lng
+++ b/interface/web/sites/lib/lang/el_backup_stats_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb["database_name_txt"]   = '';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Domain';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['database_name_txt'] = '';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/sites/lib/lang/el_cron.lng b/interface/web/sites/lib/lang/el_cron.lng
index 0ee35b9047..cfdeec32da 100644
--- a/interface/web/sites/lib/lang/el_cron.lng
+++ b/interface/web/sites/lib/lang/el_cron.lng
@@ -21,4 +21,6 @@ $wb['unknown_fieldtype_error'] = 'Χρησιμοποιήθηκε άγνωστό
 $wb['server_id_error_empty'] = 'The server ID is empty.';
 $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_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
+$wb['log_output_txt'] = 'Log output';
 ?>
diff --git a/interface/web/sites/lib/lang/el_database.lng b/interface/web/sites/lib/lang/el_database.lng
index 14f05ea353..d64c194412 100644
--- a/interface/web/sites/lib/lang/el_database.lng
+++ b/interface/web/sites/lib/lang/el_database.lng
@@ -43,4 +43,7 @@ $wb['select_dbuser_txt'] = 'Select database user';
 $wb['no_dbuser_txt'] = 'None';
 $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['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
 ?>
diff --git a/interface/web/sites/lib/lang/el_database_admin_list.lng b/interface/web/sites/lib/lang/el_database_admin_list.lng
index c5d1992f76..8e132f3567 100644
--- a/interface/web/sites/lib/lang/el_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/el_database_admin_list.lng
@@ -8,4 +8,5 @@ $wb['database_name_txt'] = 'Όνομα βάσης';
 $wb['add_new_record_txt'] = 'Νέα βάση δεδομένων';
 $wb['sys_groupid_txt'] = 'Πελάτης';
 $wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/el_database_list.lng b/interface/web/sites/lib/lang/el_database_list.lng
index 246827506a..4bb2ce23f3 100644
--- a/interface/web/sites/lib/lang/el_database_list.lng
+++ b/interface/web/sites/lib/lang/el_database_list.lng
@@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Όνομα Χρήστη Βάσης Δεδομένω
 $wb['database_name_txt'] = 'Όνομα Βάσης Δεδομένων';
 $wb['add_new_record_txt'] = 'Νέα Βάσης Δεδομένων';
 $wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/el_database_quota_stats_list.lng b/interface/web/sites/lib/lang/el_database_quota_stats_list.lng
index e1de70accf..4f92576007 100644
--- a/interface/web/sites/lib/lang/el_database_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/el_database_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["database_txt"] = 'Database';
-$wb["server_name_txt"] = 'Server';
-$wb["client_txt"] = 'Client';
-$wb["used_txt"] = 'Used space';
-$wb["quota_txt"] = 'Quota';
-$wb["percentage_txt"] = 'Used in %';
+$wb['database_txt'] = 'Database';
+$wb['server_name_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb['used_txt'] = 'Used space';
+$wb['quota_txt'] = 'Quota';
+$wb['percentage_txt'] = 'Used in %';
 ?>
diff --git a/interface/web/sites/lib/lang/el_ftp_sites_stats_list.lng b/interface/web/sites/lib/lang/el_ftp_sites_stats_list.lng
new file mode 100644
index 0000000000..03894607db
--- /dev/null
+++ b/interface/web/sites/lib/lang/el_ftp_sites_stats_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb["list_head_txt"] = 'FTP 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 (Download + Upload)';
+$wb["in_out_txt"] = 'DL/UL';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/el_ftp_user.lng b/interface/web/sites/lib/lang/el_ftp_user.lng
index a77581db84..9576d24aec 100644
--- a/interface/web/sites/lib/lang/el_ftp_user.lng
+++ b/interface/web/sites/lib/lang/el_ftp_user.lng
@@ -31,6 +31,5 @@ $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['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['directory_error_regex'] = 'Invalid directory';
+$wb['expires_txt'] = 'Expire at';
 ?>
diff --git a/interface/web/sites/lib/lang/el_web_aliasdomain.lng b/interface/web/sites/lib/lang/el_web_aliasdomain.lng
new file mode 100644
index 0000000000..4149c71149
--- /dev/null
+++ b/interface/web/sites/lib/lang/el_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['Domain'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng
new file mode 100644
index 0000000000..b12aba2a56
--- /dev/null
+++ b/interface/web/sites/lib/lang/el_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Ψευδώνυμο domain';
+$wb['active_txt'] = 'Ενεργό';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Ψευδώνυμο domain';
+$wb['add_new_record_txt'] = 'Νέο ψευδωνύμο domain';
+$wb['domain_error_empty'] = 'Το Domain δεν έχει οριστεί.';
+$wb['domain_error_unique'] = 'Το Domain πρέπει να είναι μοναδικό.';
+$wb['domain_error_regex'] = 'Το όνομα Domain δεν είναι έγκυρο.';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/sites/lib/lang/el_web_backup_list.lng b/interface/web/sites/lib/lang/el_web_backup_list.lng
index fa4a59b403..d1133334f0 100644
--- a/interface/web/sites/lib/lang/el_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/el_web_backup_list.lng
@@ -16,4 +16,6 @@ $wb['delete_confirm_txt'] = 'Really delete this backup?';
 $wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
 $wb['backup_type_mysql'] = 'MySQL Database';
 $wb['backup_type_web'] = 'Website files';
+$wb['filesize_txt'] = 'Filesize';
+$wb['backup_type_mongodb'] = 'MongoDB Database';
 ?>
diff --git a/interface/web/sites/lib/lang/el_web_childdomain.lng b/interface/web/sites/lib/lang/el_web_childdomain.lng
index b9d97b7c97..43fb55160a 100644
--- a/interface/web/sites/lib/lang/el_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/el_web_childdomain.lng
@@ -4,16 +4,15 @@ $wb['ssl_locality_txt'] = 'Τοποθεσία';
 $wb['ssl_organisation_txt'] = 'Οργανισμός';
 $wb['ssl_organisation_unit_txt'] = 'Τμήμα οργανισμού';
 $wb['ssl_country_txt'] = 'Χώρα';
-$wb['domain_txt'] = 'Aliasdomain';
-$wb['backup_interval_txt'] = 'Backup interval';
-$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_interval_txt'] = 'Χρονικό διάστημα Αντιγράφων Ασφαλείας';
+$wb['backup_copies_txt'] = 'Πλήθος Αντιγράφων Ασφαλείας';
 $wb['ssl_key_txt'] = 'SSL Key';
 $wb['ssl_request_txt'] = 'SSL Request';
 $wb['ssl_cert_txt'] = 'SSL Certificate';
 $wb['ssl_bundle_txt'] = 'SSL Bundle';
 $wb['ssl_action_txt'] = 'SSL Action';
 $wb['server_id_txt'] = 'Server';
-$wb['domain_txt'] = 'Domain';
 $wb['type_txt'] = 'Τύπος';
 $wb['parent_domain_id_txt'] = 'Γονικό Website';
 $wb['redirect_type_txt'] = 'Τύπος ανακατεύθυνσης';
@@ -46,10 +45,7 @@ $wb['no_flag_txt'] = 'Χωρίς Σημαία';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains δεν επιτρέπονται.';
 $wb['proxy_directives_txt'] = 'Proxy Directives';
 $wb['available_proxy_directive_snippets_txt'] = 'Διαθέσιμα Proxy Directive Snippets:';
-$wb['error_proxy_requires_url'] = 'Ο τύπος ανακατεύθυνσης \"proxy\" απαιτεί ένα URL ως μονοπάτι ανακατεύθυνσης.';
-$wb['backup_interval_txt'] = 'Χρονικό διάστημα Αντιγράφων Ασφαλείας';
-$wb['backup_copies_txt'] = 'Πλήθος Αντιγράφων Ασφαλείας';
-$wb['ssl_key_txt'] = 'SSL Key';
+$wb['error_proxy_requires_url'] = 'Ο τύπος ανακατεύθυνσης \\"proxy\\" απαιτεί ένα URL ως μονοπάτι ανακατεύθυνσης.';
 $wb['ssl_domain_txt'] = 'SSL Domain';
 $wb['web_folder_error_regex'] = 'Εισάγατε μη έγκυρο φάκελο. Μην εισάγετε την κάθετο.';
 $wb['ipv6_address_txt'] = 'Διεύθυνση IPv6';
diff --git a/interface/web/sites/lib/lang/el_web_childdomain_list.lng b/interface/web/sites/lib/lang/el_web_childdomain_list.lng
index a868b5b772..577d60d0bf 100644
--- a/interface/web/sites/lib/lang/el_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/el_web_childdomain_list.lng
@@ -4,11 +4,12 @@ $wb['active_txt'] = 'Ενεργό';
 $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Website';
 $wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Νέο subdomain';
 $wb['domain_error_empty'] = 'Το Domain δεν έχει οριστεί.';
 $wb['domain_error_unique'] = 'Το Domain πρέπει να είναι μοναδικό.';
 $wb['domain_error_regex'] = 'Το όνομα Domain δεν είναι έγκυρο.';
 $wb['no_redirect_txt'] = 'Χωρίς Ανακατεύθυνση';
 $wb['no_flag_txt'] = 'Χωρίς σημαία';
 $wb['none_txt'] = 'Κανένα';
+$wb['add_new_subdomain_txt'] = 'Add new Subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/el_web_directive_snippets.lng b/interface/web/sites/lib/lang/el_web_directive_snippets.lng
new file mode 100644
index 0000000000..05a004f654
--- /dev/null
+++ b/interface/web/sites/lib/lang/el_web_directive_snippets.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['directive_snippets_id_txt'] = 'Desired configuration';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/el_web_domain.lng b/interface/web/sites/lib/lang/el_web_domain.lng
new file mode 100644
index 0000000000..b2792cefb7
--- /dev/null
+++ b/interface/web/sites/lib/lang/el_web_domain.lng
@@ -0,0 +1,132 @@
+<?php
+$wb['backup_interval_txt'] = 'Προγραμματισμός Backup';
+$wb['backup_copies_txt'] = 'Πλήθος αντιγράφων';
+$wb['ssl_state_txt'] = 'Κατάσταση';
+$wb['ssl_locality_txt'] = 'Τοποθεσία';
+$wb['ssl_organisation_txt'] = 'Οργανισμός';
+$wb['ssl_organisation_unit_txt'] = 'Τμήμα Οργανισμού';
+$wb['ssl_country_txt'] = 'Χώρα';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'Πιστοποιητικό SSL';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Τύπος';
+$wb['parent_domain_id_txt'] = 'Γονικό Website';
+$wb['redirect_type_txt'] = 'Τύπος Ανακατεύθυνσης';
+$wb['redirect_path_txt'] = 'Διαδρομή Ανακατεύθυνσης';
+$wb['active_txt'] = 'Ενεργό';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Χρήστης Linux';
+$wb['system_group_txt'] = 'Ομάδα Linux';
+$wb['ip_address_txt'] = 'Διεύθυνση IP';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Όριο αποθηκευτικού χώρου';
+$wb['traffic_quota_txt'] = 'Όριο κίνησης';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Προσωπικά έγγραφα σφάλματος';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Πελάτης';
+$wb['limit_web_domain_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των web domains για τον λογαριασμό σας.';
+$wb['limit_web_aliasdomain_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των aliasdomains για τον λογαριασμό σας.';
+$wb['limit_web_subdomain_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των web subdomains για τον λογαριασμό σας.';
+$wb['apache_directives_txt'] = 'Apache directives';
+$wb['domain_error_empty'] = 'Το Domain δεν έχει οριστεί.';
+$wb['domain_error_unique'] = 'Υπάρχει ήδη ένα website ή ένα sub / aliasdomain με αυτό το όνομα domain.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['hd_quota_error_empty'] = 'Το όριο αποθηκευτικού χώρου είναι 0 ή δεν έχει οριστεί.';
+$wb['traffic_quota_error_empty'] = 'Το όριο κίνησης δεν έχει οριστεί.';
+$wb['error_ssl_state_empty'] = 'Κενή περιφέρεια SSL.';
+$wb['error_ssl_locality_empty'] = 'Κενή τοποθεσία SSL.';
+$wb['error_ssl_organisation_empty'] = 'Ο Οργανισμός SSL δεν έχει οριστεί.';
+$wb['error_ssl_organisation_unit_empty'] = 'Το SSL τμήμα Οργανισμού δεν έχει οριστεί.';
+$wb['error_ssl_country_empty'] = 'Κενή χώρα SSL.';
+$wb['error_ssl_cert_empty'] = 'Το πεδίο SSL Certificate δεν έχει οριστεί';
+$wb['client_group_id_txt'] = 'Πελάτης';
+$wb['stats_password_txt'] = 'Συνθηματικο Στατιστικών Web';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Όριο αποθηκευτικού χώρου';
+$wb['ssl_state_error_regex'] = 'Άκυρη πολιτεία-περιφέρεια SSL. Έγκυροι χαρακτήρες: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Άκυρο SSL Locality. Έγκυροι χαρακτήρες: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Άκυρος Οργανισμός  SSL. Έγκυροι χαρακτήρες: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Άκυρη μονάδα οργανισμού SSL. Έγκυροι χαρακτήρες: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Άκυρη Χώρα SSL. Έγκυροι χαρακτήρες: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Όριο κίνησης';
+$wb['redirect_error_regex'] = 'Μη έγκυρη διαδρομή ανακατεύθυνσης. Έγκυρες τιμές είναι: /test/ ή http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Ξεπεράστηκε το όριο κίνησης δεδομένων';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Όνομα Χρήστη Στατιστικών Web';
+$wb['stats_type_txt'] = 'Πρόγραμμα Στατιστικών Web';
+$wb['custom_php_ini_txt'] = 'Προσαρμοσμένες ρυθμίσεις php.ini';
+$wb['none_txt'] = 'Καμία';
+$wb['disabled_txt'] = 'Απενεργοπ.';
+$wb['no_redirect_txt'] = 'Χωρίς Ανακατεύθυνση';
+$wb['no_flag_txt'] = 'Χωρίς Σημαία';
+$wb['save_certificate_txt'] = 'Αποθήκευση Πιστοποιητικού';
+$wb['create_certificate_txt'] = 'Δημιουργία Πιστοποιητικού';
+$wb['delete_certificate_txt'] = 'Διαγραφή Πιστοποιητικού';
+$wb['ipv6_address_txt'] = 'Διεύθυνση IPv6';
+$wb['nginx_directives_txt'] = 'Ντιρεκτίβες nginx';
+$wb['seo_redirect_txt'] = 'Ανακατεύθυνση SEO';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['perl_txt'] = 'Perl';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['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['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_system_user_or_group_txt'] = 'Invalid system user or group';
+$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
+?>
diff --git a/interface/web/sites/lib/lang/el_web_domain_admin_list.lng b/interface/web/sites/lib/lang/el_web_domain_admin_list.lng
new file mode 100644
index 0000000000..9b2091447e
--- /dev/null
+++ b/interface/web/sites/lib/lang/el_web_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['sys_groupid_txt'] = 'Πελάτης';
+$wb['list_head_txt'] = 'Websites';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Ενεργό';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Νέο website';
+?>
diff --git a/interface/web/sites/lib/lang/el_web_domain_list.lng b/interface/web/sites/lib/lang/el_web_domain_list.lng
new file mode 100644
index 0000000000..c3f42a94a5
--- /dev/null
+++ b/interface/web/sites/lib/lang/el_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Websites';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Ενεργό';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Νέο website';
+?>
diff --git a/interface/web/sites/lib/lang/el_web_subdomain.lng b/interface/web/sites/lib/lang/el_web_subdomain.lng
new file mode 100644
index 0000000000..8f5148b99d
--- /dev/null
+++ b/interface/web/sites/lib/lang/el_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['ssl_state_txt'] = 'Περιφέρεια';
+$wb['ssl_locality_txt'] = 'Τοποθεσία';
+$wb['ssl_organisation_txt'] = 'Οργανισμός';
+$wb['ssl_organisation_unit_txt'] = 'Τμήμα οργανισμού';
+$wb['ssl_country_txt'] = 'Χώρα';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Τύπος';
+$wb['parent_domain_id_txt'] = 'Γονικό Website';
+$wb['redirect_type_txt'] = 'Τύπος ανακατεύθυνσης';
+$wb['redirect_path_txt'] = 'Διαδρομή ανακατεύθυνσης';
+$wb['active_txt'] = 'Ενεργή';
+$wb['document_root_txt'] = 'Ριζικός φάκελος';
+$wb['system_user_txt'] = 'Όνομα χρήστη Linux';
+$wb['system_group_txt'] = 'Ομάδα Linux';
+$wb['ip_address_txt'] = 'Διεύθυνση IP';
+$wb['vhost_type_txt'] = 'Τύπος VHost';
+$wb['hd_quota_txt'] = 'Όριο αποθηκευτικού χώρου';
+$wb['traffic_quota_txt'] = 'Όριο κίνησης δεδομένων';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Πελάτης';
+$wb['limit_web_domain_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των web domains του λογαριασμού σας.';
+$wb['limit_web_aliasdomain_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των aliasdomains του λογαριασμού σας.';
+$wb['limit_web_subdomain_txt'] = 'Έχετε φτάσει το μέγιστο πλήθος των web subdomains του λογαριασμού σας.';
+$wb['apache_directives_txt'] = 'Apache directives';
+$wb['domain_error_empty'] = 'Το Domain δεν έχει οριστεί.';
+$wb['domain_error_unique'] = 'Υπάρχει ήδη ένα website ή sub / aliasdomain με αυτό το όνομα.';
+$wb['domain_error_regex'] = 'Το όνομα του Domain δεν είναι έγκυρο.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Η διαδρομή ανακατεύθυνσης δεν είναι έγκυρη. Έγκυρες διαδρομές είναι για παράδειγμα οι: /test/ ή http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'Χωρίς Ανακατεύθυνση';
+$wb['no_flag_txt'] = 'Χωρίς Σημαία';
+$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.';
+?>
diff --git a/interface/web/sites/lib/lang/el_web_subdomain_list.lng b/interface/web/sites/lib/lang/el_web_subdomain_list.lng
new file mode 100644
index 0000000000..a4426cf3ce
--- /dev/null
+++ b/interface/web/sites/lib/lang/el_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Ενεργό';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Νέο subdomain';
+?>
diff --git a/interface/web/sites/lib/lang/el_web_vhost_domain.lng b/interface/web/sites/lib/lang/el_web_vhost_domain.lng
index e97fcb63c7..d86e80d68c 100644
--- a/interface/web/sites/lib/lang/el_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/el_web_vhost_domain.lng
@@ -18,7 +18,7 @@ $wb['parent_domain_id_txt'] = 'Γονικό Website';
 $wb['redirect_type_txt'] = 'Τύπος Ανακατεύθυνσης';
 $wb['redirect_path_txt'] = 'Διαδρομή Ανακατεύθυνσης';
 $wb['active_txt'] = 'Ενεργό';
-$wb['document_root_txt'] = 'Documentroot';
+$wb['document_root_txt'] = 'Document Root';
 $wb['system_user_txt'] = 'Χρήστης Linux';
 $wb['system_group_txt'] = 'Ομάδα Linux';
 $wb['ip_address_txt'] = 'Διεύθυνση IP';
@@ -126,15 +126,20 @@ $wb['web_folder_invalid_txt'] = 'Ο Φάκελος Web δεν είναι έγκ
 $wb['web_folder_unique_txt'] = 'Ο Φάκελος Web χρησιμοποιείται ήδη, διαλέξτε κάποιον άλλο.';
 $wb['host_txt'] = 'Hostname';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-
 $wb['variables_txt'] = 'Variables';
 $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $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_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
-$wb["document_root_txt"] = "Document Root";
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['load_client_data_txt'] = 'Load client details';
+$wb['load_my_data_txt'] = 'Load my contact details';
+$wb['reset_client_data_txt'] = 'Reset data';
+$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
diff --git a/interface/web/sites/lib/lang/el_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/el_web_vhost_domain_list.lng
index 3232d46a44..169db9d9e7 100644
--- a/interface/web/sites/lib/lang/el_web_vhost_domain_list.lng
+++ b/interface/web/sites/lib/lang/el_web_vhost_domain_list.lng
@@ -6,5 +6,4 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domain';
 $wb['add_new_record_txt'] = 'Νέο website';
 $wb['parent_domain_id_txt'] = 'Website';
-
 ?>
diff --git a/interface/web/sites/lib/lang/el_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/el_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..c0ca93b570
--- /dev/null
+++ b/interface/web/sites/lib/lang/el_web_vhost_subdomain.lng
@@ -0,0 +1,127 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Variables';
+$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['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+?>
diff --git a/interface/web/sites/lib/lang/el_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/el_web_vhost_subdomain_list.lng
new file mode 100644
index 0000000000..1c16bcda28
--- /dev/null
+++ b/interface/web/sites/lib/lang/el_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
+?>
diff --git a/interface/web/sites/lib/lang/en_web_aliasdomain.lng b/interface/web/sites/lib/lang/en_web_aliasdomain.lng
new file mode 100644
index 0000000000..eeae6770c6
--- /dev/null
+++ b/interface/web/sites/lib/lang/en_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb["ssl_state_txt"] = 'State';
+$wb["ssl_locality_txt"] = 'Locality';
+$wb["ssl_organisation_txt"] = 'Organisation';
+$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
+$wb["ssl_country_txt"] = 'Country';
+$wb["ssl_key_txt"] = 'SSL Key';
+$wb["ssl_request_txt"] = 'SSL Request';
+$wb["ssl_cert_txt"] = 'SSL Certificate';
+$wb["ssl_bundle_txt"] = 'SSL Bundle';
+$wb["ssl_action_txt"] = 'SSL Action';
+$wb["ssl_domain_txt"] = 'SSL Domain';
+$wb["server_id_txt"] = 'Server';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$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"] = 'IPv4-Address';
+$wb["ipv6_address_txt"] = 'IPv6-Address';
+$wb["vhost_type_txt"] = 'VHost Type';
+$wb["hd_quota_txt"] = 'Harddisk Quota';
+$wb["traffic_quota_txt"] = 'Traffic Quota';
+$wb["cgi_txt"] = 'CGI';
+$wb["ssi_txt"] = 'SSI';
+$wb["errordocs_txt"] = 'Own Error-Documents';
+$wb["subdomain_txt"] = 'Auto-Subdomain';
+$wb["ssl_txt"] = 'SSL';
+$wb["suexec_txt"] = 'SuEXEC';
+$wb["php_txt"] = 'PHP';
+$wb["client_txt"] = 'Client';
+$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"] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb["domain_error_regex"] = 'Domain name invalid.';
+$wb["domain_error_autosub"] = 'There is already a subdomain with these settings.';
+$wb["hd_quota_error_empty"] = 'Harddisk quota is 0 or empty.';
+$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
+$wb["error_ssl_state_empty"] = 'SSL State is empty.';
+$wb["error_ssl_locality_empty"] = 'SSL Locality is empty.';
+$wb["error_ssl_organisation_empty"] = 'SSL Organisation is empty.';
+$wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.';
+$wb["error_ssl_country_empty"] = 'SSL Country is empty.';
+$wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty';
+$wb["client_group_id_txt"] = 'Client';
+$wb["stats_password_txt"] = 'Set Webstatistics password';
+$wb["allow_override_txt"] = 'Apache AllowOverride';
+$wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota';
+$wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_locality_error_regex"] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organisation_error_regex"] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organistaion_unit_error_regex"] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
+$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb["php_open_basedir_txt"] = 'PHP open_basedir';
+$wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
+$wb["ruby_txt"] = 'Ruby';
+$wb["stats_user_txt"] = 'Webstatistics username';
+$wb["stats_type_txt"] = 'Webstatistics program';
+$wb["custom_php_ini_txt"] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb["nginx_directives_txt"] = 'nginx Directives';
+$wb["seo_redirect_txt"] = 'SEO Redirect';
+$wb["non_www_to_www_txt"] = 'Non-www -&gt; www';
+$wb["www_to_non_www_txt"] = 'www -&gt; non-www';
+$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
+$wb["error_no_sni_txt"] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb["python_txt"] = 'Python';
+$wb["perl_txt"] = 'Perl';
+$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
+$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
+$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
+$wb["pm_max_spare_servers_txt"] = 'PHP-FPM pm.max_spare_servers';
+$wb["error_php_fpm_pm_settings_txt"] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb["pm_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.';
+$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.';
+$wb["fastcgi_php_version_txt"] = 'PHP Version';
+$wb["pm_txt"] = 'PHP-FPM Process Manager';
+$wb["pm_process_idle_timeout_txt"] = 'PHP-FPM pm.process_idle_timeout';
+$wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
+$wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['Domain'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/en_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/en_web_aliasdomain_list.lng
new file mode 100644
index 0000000000..0635583078
--- /dev/null
+++ b/interface/web/sites/lib/lang/en_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb["list_head_txt"] = 'Aliasdomain';
+$wb["active_txt"] = 'Active';
+$wb["server_id_txt"] = 'Server';
+$wb["parent_domain_id_txt"] = 'Website';
+$wb["domain_txt"] = 'Aliasdomain';
+$wb["add_new_record_txt"] = 'Add new aliasdomain';
+$wb["domain_error_empty"] = 'Domain is empty.';
+$wb["domain_error_unique"] = 'Domain must be unique.';
+$wb["domain_error_regex"] = 'Domain name invalid.';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/sites/lib/lang/en_web_domain.lng b/interface/web/sites/lib/lang/en_web_domain.lng
new file mode 100644
index 0000000000..14b3d526fd
--- /dev/null
+++ b/interface/web/sites/lib/lang/en_web_domain.lng
@@ -0,0 +1,132 @@
+<?php
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb["ssl_state_txt"] = 'State';
+$wb["ssl_locality_txt"] = 'Locality';
+$wb["ssl_organisation_txt"] = 'Organisation';
+$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
+$wb["ssl_country_txt"] = 'Country';
+$wb["ssl_key_txt"] = 'SSL Key';
+$wb["ssl_request_txt"] = 'SSL Request';
+$wb["ssl_cert_txt"] = 'SSL Certificate';
+$wb["ssl_bundle_txt"] = 'SSL Bundle';
+$wb["ssl_action_txt"] = 'SSL Action';
+$wb["ssl_domain_txt"] = 'SSL Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$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"] = 'IPv4-Address';
+$wb["ipv6_address_txt"] = 'IPv6-Address';
+$wb["vhost_type_txt"] = 'VHost Type';
+$wb["hd_quota_txt"] = 'Harddisk Quota';
+$wb["traffic_quota_txt"] = 'Traffic Quota';
+$wb["cgi_txt"] = 'CGI';
+$wb["ssi_txt"] = 'SSI';
+$wb["errordocs_txt"] = 'Own Error-Documents';
+$wb["subdomain_txt"] = 'Auto-Subdomain';
+$wb["ssl_txt"] = 'SSL';
+$wb["suexec_txt"] = 'SuEXEC';
+$wb["php_txt"] = 'PHP';
+$wb["client_txt"] = 'Client';
+$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"] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb["domain_error_regex"] = 'Domain name invalid.';
+$wb["domain_error_autosub"] = 'There is already a subdomain with these settings.';
+$wb["hd_quota_error_empty"] = 'Harddisk quota is 0 or empty.';
+$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
+$wb["error_ssl_state_empty"] = 'SSL State is empty.';
+$wb["error_ssl_locality_empty"] = 'SSL Locality is empty.';
+$wb["error_ssl_organisation_empty"] = 'SSL Organisation is empty.';
+$wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.';
+$wb["error_ssl_country_empty"] = 'SSL Country is empty.';
+$wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty';
+$wb["client_group_id_txt"] = 'Client';
+$wb["stats_password_txt"] = 'Set Webstatistics password';
+$wb["allow_override_txt"] = 'Apache AllowOverride';
+$wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota';
+$wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb["ssl_locality_error_regex"] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb["ssl_organisation_error_regex"] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb["ssl_organistaion_unit_error_regex"] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_&äöüÄÖÜ';
+$wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
+$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb["php_open_basedir_txt"] = 'PHP open_basedir';
+$wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
+$wb["ruby_txt"] = 'Ruby';
+$wb["stats_user_txt"] = 'Webstatistics username';
+$wb["stats_type_txt"] = 'Webstatistics program';
+$wb["custom_php_ini_txt"] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb["nginx_directives_txt"] = 'nginx Directives';
+$wb["seo_redirect_txt"] = 'SEO Redirect';
+$wb["non_www_to_www_txt"] = 'Non-www -&gt; www';
+$wb["www_to_non_www_txt"] = 'www -&gt; non-www';
+$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
+$wb["error_no_sni_txt"] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb["python_txt"] = 'Python';
+$wb["perl_txt"] = 'Perl';
+$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
+$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
+$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
+$wb["pm_max_spare_servers_txt"] = 'PHP-FPM pm.max_spare_servers';
+$wb["error_php_fpm_pm_settings_txt"] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb["pm_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.';
+$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.';
+$wb["fastcgi_php_version_txt"] = 'PHP Version';
+$wb["pm_txt"] = 'PHP-FPM Process Manager';
+$wb["pm_process_idle_timeout_txt"] = 'PHP-FPM pm.process_idle_timeout';
+$wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
+$wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['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['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_system_user_or_group_txt'] = 'Invalid system user or group';
+$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/en_web_domain_admin_list.lng b/interface/web/sites/lib/lang/en_web_domain_admin_list.lng
new file mode 100644
index 0000000000..e8825ae321
--- /dev/null
+++ b/interface/web/sites/lib/lang/en_web_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb["sys_groupid_txt"] = 'Client';
+$wb["list_head_txt"] = 'Websites';
+$wb["domain_id_txt"] = 'ID';
+$wb["active_txt"] = 'Active';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["add_new_record_txt"] = 'Add new website';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/en_web_domain_list.lng b/interface/web/sites/lib/lang/en_web_domain_list.lng
new file mode 100644
index 0000000000..493350e85c
--- /dev/null
+++ b/interface/web/sites/lib/lang/en_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'Websites';
+$wb["domain_id_txt"] = 'ID';
+$wb["active_txt"] = 'Active';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["add_new_record_txt"] = 'Add new website';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/en_web_subdomain.lng b/interface/web/sites/lib/lang/en_web_subdomain.lng
new file mode 100644
index 0000000000..cd1c1fbfac
--- /dev/null
+++ b/interface/web/sites/lib/lang/en_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb["ssl_state_txt"] = 'State';
+$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_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["vhost_type_txt"] = 'VHost Type';
+$wb["hd_quota_txt"] = 'Harddisk Quota';
+$wb["traffic_quota_txt"] = 'Traffic Quaota';
+$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["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"] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb["domain_error_regex"] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$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['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.';
+?>
diff --git a/interface/web/sites/lib/lang/en_web_subdomain_list.lng b/interface/web/sites/lib/lang/en_web_subdomain_list.lng
new file mode 100644
index 0000000000..8273dbd066
--- /dev/null
+++ b/interface/web/sites/lib/lang/en_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'Subdomains';
+$wb["active_txt"] = 'Active';
+$wb["server_id_txt"] = 'Server';
+$wb["parent_domain_id_txt"] = 'Website';
+$wb["domain_txt"] = 'Subdomain';
+$wb["add_new_record_txt"] = 'Add new subdomain';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/en_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/en_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..1322801700
--- /dev/null
+++ b/interface/web/sites/lib/lang/en_web_vhost_subdomain.lng
@@ -0,0 +1,128 @@
+<?php
+$wb["parent_domain_id_txt"] = 'Parent Website';
+$wb["web_folder_txt"] = 'Web folder';
+$wb["web_folder_invalid_txt"] = 'The web folder is invalid, please choose a different one.';
+$wb["web_folder_unique_txt"] = 'The web folder is already used, please choose a different one.';
+$wb["backup_interval_txt"] = 'Backup interval';
+$wb["backup_copies_txt"] = 'Number of backup copies';
+$wb["ssl_state_txt"] = 'State';
+$wb["ssl_locality_txt"] = 'Locality';
+$wb["ssl_organisation_txt"] = 'Organisation';
+$wb["ssl_organisation_unit_txt"] = 'Organisation Unit';
+$wb["ssl_country_txt"] = 'Country';
+$wb["ssl_key_txt"] = 'SSL Key';
+$wb["ssl_request_txt"] = 'SSL Request';
+$wb["ssl_cert_txt"] = 'SSL Certificate';
+$wb["ssl_bundle_txt"] = 'SSL Bundle';
+$wb["ssl_action_txt"] = 'SSL Action';
+$wb["ssl_domain_txt"] = 'SSL Domain';
+$wb["server_id_txt"] = 'Server';
+$wb["domain_txt"] = 'Domain';
+$wb["host_txt"] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$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"] = 'IPv4-Address';
+$wb["ipv6_address_txt"] = 'IPv6-Address';
+$wb["vhost_type_txt"] = 'VHost Type';
+$wb["hd_quota_txt"] = 'Harddisk Quota';
+$wb["traffic_quota_txt"] = 'Traffic Quota';
+$wb["cgi_txt"] = 'CGI';
+$wb["ssi_txt"] = 'SSI';
+$wb["errordocs_txt"] = 'Own Error-Documents';
+$wb["subdomain_txt"] = 'Auto-Subdomain';
+$wb["ssl_txt"] = 'SSL';
+$wb["suexec_txt"] = 'SuEXEC';
+$wb["php_txt"] = 'PHP';
+$wb["client_txt"] = 'Client';
+$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"] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb["domain_error_regex"] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb["hd_quota_error_empty"] = 'Harddisk quota is 0 or empty.';
+$wb["traffic_quota_error_empty"] = 'Traffic quota is empty.';
+$wb["error_ssl_state_empty"] = 'SSL State is empty.';
+$wb["error_ssl_locality_empty"] = 'SSL Locality is empty.';
+$wb["error_ssl_organisation_empty"] = 'SSL Organisation is empty.';
+$wb["error_ssl_organisation_unit_empty"] = 'SSL Organisation Unit is empty.';
+$wb["error_ssl_country_empty"] = 'SSL Country is empty.';
+$wb["error_ssl_cert_empty"] = 'SSL Certificate field is empty';
+$wb["client_group_id_txt"] = 'Client';
+$wb["stats_password_txt"] = 'Set Webstatistics password';
+$wb["allow_override_txt"] = 'Apache AllowOverride';
+$wb["limit_web_quota_free_txt"] = 'Max. available Harddisk Quota';
+$wb["ssl_state_error_regex"] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_locality_error_regex"] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organisation_error_regex"] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_organistaion_unit_error_regex"] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb["ssl_country_error_regex"] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb["limit_traffic_quota_free_txt"] = 'Max. available Traffic Quota';
+$wb["redirect_error_regex"] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb["php_open_basedir_txt"] = 'PHP open_basedir';
+$wb["traffic_quota_exceeded_txt"] = 'Traffic quota exceeded';
+$wb["ruby_txt"] = 'Ruby';
+$wb["stats_user_txt"] = 'Webstatistics username';
+$wb["stats_type_txt"] = 'Webstatistics program';
+$wb["custom_php_ini_txt"] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb["nginx_directives_txt"] = 'nginx Directives';
+$wb["seo_redirect_txt"] = 'SEO Redirect';
+$wb["non_www_to_www_txt"] = 'Non-www -&gt; www';
+$wb["www_to_non_www_txt"] = 'www -&gt; non-www';
+$wb["php_fpm_use_socket_txt"] = 'Use Socket For PHP-FPM';
+$wb["error_no_sni_txt"] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb["python_txt"] = 'Python';
+$wb["perl_txt"] = 'Perl';
+$wb["pm_max_children_txt"] = 'PHP-FPM pm.max_children';
+$wb["pm_start_servers_txt"] = 'PHP-FPM pm.start_servers';
+$wb["pm_min_spare_servers_txt"] = 'PHP-FPM pm.min_spare_servers';
+$wb["pm_max_spare_servers_txt"] = 'PHP-FPM pm.max_spare_servers';
+$wb["error_php_fpm_pm_settings_txt"] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb["pm_max_children_error_regex"] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb["pm_start_servers_error_regex"] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb["pm_min_spare_servers_error_regex"] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb["pm_max_spare_servers_error_regex"] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb["hd_quota_error_regex"] = 'Harddisk quota is invalid.';
+$wb["traffic_quota_error_regex"] = 'Traffic quota is invalid.';
+$wb["fastcgi_php_version_txt"] = 'PHP Version';
+$wb["pm_txt"] = 'PHP-FPM Process Manager';
+$wb["pm_process_idle_timeout_txt"] = 'PHP-FPM pm.process_idle_timeout';
+$wb["pm_max_requests_txt"] = 'PHP-FPM pm.max_requests';
+$wb["pm_process_idle_timeout_error_regex"] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb["pm_max_requests_error_regex"] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb["pm_ondemand_hint_txt"] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = "CONFIGURATION ERROR";
+$wb['variables_txt'] = 'Variables';
+$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['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/en_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/en_web_vhost_subdomain_list.lng
new file mode 100644
index 0000000000..8273dbd066
--- /dev/null
+++ b/interface/web/sites/lib/lang/en_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb["list_head_txt"] = 'Subdomains';
+$wb["active_txt"] = 'Active';
+$wb["server_id_txt"] = 'Server';
+$wb["parent_domain_id_txt"] = 'Website';
+$wb["domain_txt"] = 'Subdomain';
+$wb["add_new_record_txt"] = 'Add new subdomain';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/es.lng b/interface/web/sites/lib/lang/es.lng
index 529b95de9b..3c40dfe110 100644
--- a/interface/web/sites/lib/lang/es.lng
+++ b/interface/web/sites/lib/lang/es.lng
@@ -31,5 +31,5 @@ $wb['Available packages'] = 'Paquetes disponibles';
 $wb['Installed packages'] = 'Paquetes instalados';
 $wb['Update Packagelist'] = 'Actualizar lista de paquetes';
 $wb['Subdomain (Vhost)'] = 'Sub-dominios (Vhost)';
-$wb['error_proxy_requires_url'] = 'La redirección del tipo \"proxy\" requiere de una URL como ruta de redirección.';
+$wb['error_proxy_requires_url'] = 'La redirección del tipo \\"proxy\\" requiere de una URL como ruta de redirección.';
 ?>
diff --git a/interface/web/sites/lib/lang/es_aps.lng b/interface/web/sites/lib/lang/es_aps.lng
index 111fa6468f..562bfb896c 100644
--- a/interface/web/sites/lib/lang/es_aps.lng
+++ b/interface/web/sites/lib/lang/es_aps.lng
@@ -40,14 +40,14 @@ $wb['error_inv_main_location'] = 'La ubicación de la carpeta de instalación pr
 $wb['error_license_agreement'] = 'Para poder continuar debe aceptar el acuerdo de licencia.';
 $wb['error_no_database_pw'] = 'No ha proporcionado una contraseña válida para la base de datos.';
 $wb['error_short_database_pw'] = 'Por favor seleccione un contraseña más larga para la base de datos.';
-$wb['error_no_value_for'] = 'El campo \"%s\" no puede estar vacío.';
-$wb['error_short_value_for'] = 'El campo \"%s\" requiere una entrada más larga.';
-$wb['error_long_value_for'] = 'El campo \"%s\" requiere una entrada más corta.';
-$wb['error_inv_value_for'] = 'Ha ingresado un valor inválido en el campo \"%s\".';
-$wb['error_inv_email_for'] = 'Ha ingresado una dirección de correo inválida en el campo \"%s\".';
-$wb['error_inv_domain_for'] = 'Ha ingresado un dominio inválido en el campo \"%s\".';
-$wb['error_inv_integer_for'] = 'Ha ingresado un número inválido en el campo \"%s\".';
-$wb['error_inv_float_for'] = 'Ha introducido un número de punto flotante no válida para el campo \"%s\".';
+$wb['error_no_value_for'] = 'El campo \\"%s\\" no puede estar vacío.';
+$wb['error_short_value_for'] = 'El campo \\"%s\\" requiere una entrada más larga.';
+$wb['error_long_value_for'] = 'El campo \\"%s\\" requiere una entrada más corta.';
+$wb['error_inv_value_for'] = 'Ha ingresado un valor inválido en el campo \\"%s\\".';
+$wb['error_inv_email_for'] = 'Ha ingresado una dirección de correo inválida en el campo \\"%s\\".';
+$wb['error_inv_domain_for'] = 'Ha ingresado un dominio inválido en el campo \\"%s\\".';
+$wb['error_inv_integer_for'] = 'Ha ingresado un número inválido en el campo \\"%s\\".';
+$wb['error_inv_float_for'] = 'Ha introducido un número de punto flotante no válida para el campo \\"%s\\".';
 $wb['error_used_location'] = 'La ruta de instalación ya contiene un paquete instalado.';
 $wb['installation_task_txt'] = 'Instalación planificada';
 $wb['installation_error_txt'] = 'Error de instalación';
diff --git a/interface/web/sites/lib/lang/es_aps_instances_list.lng b/interface/web/sites/lib/lang/es_aps_instances_list.lng
index e2f322c915..a79f6b653a 100644
--- a/interface/web/sites/lib/lang/es_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/es_aps_instances_list.lng
@@ -6,8 +6,6 @@ $wb['customer_txt'] = 'Cliente';
 $wb['status_txt'] = 'Estado';
 $wb['install_location_txt'] = 'Ubicación de la instalación';
 $wb['pkg_delete_confirmation'] = 'Realmente desea eliminar esta instalación?';
-$wb['pkg_reinstall_confirmation'] = 'Realmente desea Reinstalar este paquete con la misma configuración?';
 $wb['filter_txt'] = 'Buscar';
 $wb['delete_txt'] = 'Borrar';
-$wb['reinstall_txt'] = 'Reinstalar';
 ?>
diff --git a/interface/web/sites/lib/lang/es_backup_stats_list.lng b/interface/web/sites/lib/lang/es_backup_stats_list.lng
index 0f3803f56a..65792aa591 100644
--- a/interface/web/sites/lib/lang/es_backup_stats_list.lng
+++ b/interface/web/sites/lib/lang/es_backup_stats_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb["database_name_txt"]   = '';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Domain';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['database_name_txt'] = '';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/sites/lib/lang/es_cron.lng b/interface/web/sites/lib/lang/es_cron.lng
index 3c7e0c88c5..8a860f8db8 100644
--- a/interface/web/sites/lib/lang/es_cron.lng
+++ b/interface/web/sites/lib/lang/es_cron.lng
@@ -21,4 +21,6 @@ $wb['unknown_fieldtype_error'] = 'Se ha usado un tipo de campo desconocido.';
 $wb['server_id_error_empty'] = 'La ID del servidor está vacía.';
 $wb['limit_cron_url_txt'] = 'Solo cron mediante URL. Por favor ingrese como comando para cron una URL precedida por http://.';
 $wb['command_error_empty'] = 'El comando está vacío.';
+$wb['command_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
+$wb['log_output_txt'] = 'Log output';
 ?>
diff --git a/interface/web/sites/lib/lang/es_database.lng b/interface/web/sites/lib/lang/es_database.lng
index 4169b1ecd0..0d89ef84fa 100644
--- a/interface/web/sites/lib/lang/es_database.lng
+++ b/interface/web/sites/lib/lang/es_database.lng
@@ -24,7 +24,7 @@ $wb['database_user_error_unique'] = 'Ya existe un usuario de base de datos con e
 $wb['database_user_error_regex'] = 'Nombre de usuario de base de datos inválido. El nombre de usuario debe contener estos caracteres: a-z, A-Z, 0-9 y guión bajo. Largo: 2 - 64 caracteres.';
 $wb['limit_database_txt'] = 'Ha alcanzado el número máx. de bases de dato.';
 $wb['database_name_change_txt'] = 'El nombre de la base de datos no se puede cambiar';
-$wb['database_user_missing_txt'] = 'Por favor seleccione un usuario de base de datos para esta base de datos.';
+$wb['database_user_missing_txt'] = 'Por favor selecciona un usuario de base de datos para esta base de datos.';
 $wb['database_charset_change_txt'] = 'La codificación de la base de datos no se puede cambiar';
 $wb['database_name_error_len'] = 'El nombre de la base de datos - {db} - es muy largo. El largo máx. incluyendo el prefijo es de 64 caracteres.';
 $wb['database_user_error_len'] = 'El nombre de usuario de base de datos - {user} - es muy largo. El largo máx. del nombre de usuario incluyendo el prefijo es de 16 caracteres.';
@@ -43,5 +43,7 @@ $wb['globalsearch_noresults_text_txt'] = 'Sin resultados.';
 $wb['globalsearch_noresults_limit_txt'] = '0 resultados';
 $wb['globalsearch_searchfield_watermark_txt'] = 'Buscar';
 $wb['globalsearch_suggestions_text_txt'] = 'Sugerencias';
-$wb['database_user_missing_txt'] = 'Por favor selecciona un usuario de base de datos para esta base de datos.';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
 ?>
diff --git a/interface/web/sites/lib/lang/es_database_admin_list.lng b/interface/web/sites/lib/lang/es_database_admin_list.lng
index 1992e2b84b..7a21bbcd67 100644
--- a/interface/web/sites/lib/lang/es_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/es_database_admin_list.lng
@@ -8,4 +8,5 @@ $wb['database_name_txt'] = 'Nombre de la base de datos';
 $wb['add_new_record_txt'] = 'Añadir base de datos';
 $wb['sys_groupid_txt'] = 'Cliente';
 $wb['parent_domain_id_txt'] = 'Sitio web';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/es_database_list.lng b/interface/web/sites/lib/lang/es_database_list.lng
index ab935a1644..06ccab2398 100644
--- a/interface/web/sites/lib/lang/es_database_list.lng
+++ b/interface/web/sites/lib/lang/es_database_list.lng
@@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Usuario de base de la datos';
 $wb['database_name_txt'] = 'Nombre de base de la datos';
 $wb['add_new_record_txt'] = 'Añadir base de datos';
 $wb['parent_domain_id_txt'] = 'Sitio web';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/es_database_quota_stats_list.lng b/interface/web/sites/lib/lang/es_database_quota_stats_list.lng
index e1de70accf..4f92576007 100644
--- a/interface/web/sites/lib/lang/es_database_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/es_database_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["database_txt"] = 'Database';
-$wb["server_name_txt"] = 'Server';
-$wb["client_txt"] = 'Client';
-$wb["used_txt"] = 'Used space';
-$wb["quota_txt"] = 'Quota';
-$wb["percentage_txt"] = 'Used in %';
+$wb['database_txt'] = 'Database';
+$wb['server_name_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb['used_txt'] = 'Used space';
+$wb['quota_txt'] = 'Quota';
+$wb['percentage_txt'] = 'Used in %';
 ?>
diff --git a/interface/web/sites/lib/lang/es_ftp_sites_stats_list.lng b/interface/web/sites/lib/lang/es_ftp_sites_stats_list.lng
new file mode 100644
index 0000000000..03894607db
--- /dev/null
+++ b/interface/web/sites/lib/lang/es_ftp_sites_stats_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb["list_head_txt"] = 'FTP 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 (Download + Upload)';
+$wb["in_out_txt"] = 'DL/UL';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/es_ftp_user.lng b/interface/web/sites/lib/lang/es_ftp_user.lng
index 93800f06b0..29019d392f 100644
--- a/interface/web/sites/lib/lang/es_ftp_user.lng
+++ b/interface/web/sites/lib/lang/es_ftp_user.lng
@@ -31,6 +31,5 @@ $wb['generate_password_txt'] = 'Generar contraseña';
 $wb['repeat_password_txt'] = 'Repetir contraseña';
 $wb['password_mismatch_txt'] = 'Las contraseñas no coinciden.';
 $wb['password_match_txt'] = 'Las contraseñas coinciden.';
-$wb['invalid_system_user_or_group_txt'] = 'Usuario o grupo de sistema inválido.';
-$wb['directory_error_regex'] = 'Directorio inválido.';
+$wb['expires_txt'] = 'Expire at';
 ?>
diff --git a/interface/web/sites/lib/lang/es_web_aliasdomain.lng b/interface/web/sites/lib/lang/es_web_aliasdomain.lng
new file mode 100644
index 0000000000..4149c71149
--- /dev/null
+++ b/interface/web/sites/lib/lang/es_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['Domain'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/es_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/es_web_aliasdomain_list.lng
new file mode 100644
index 0000000000..ba9cf8ec79
--- /dev/null
+++ b/interface/web/sites/lib/lang/es_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Alias de dominio';
+$wb['active_txt'] = 'Activar';
+$wb['server_id_txt'] = 'Servidor';
+$wb['parent_domain_id_txt'] = 'Sitio web';
+$wb['domain_txt'] = 'Alias de dominio';
+$wb['add_new_record_txt'] = 'Añadir nuevo alias de dominio';
+$wb['domain_error_empty'] = 'El dominio está vacío';
+$wb['domain_error_unique'] = 'El domino debe ser único';
+$wb['domain_error_regex'] = 'El nombre de dominio no es válido';
+$wb['no_redirect_txt'] = 'No redirigir';
+$wb['no_flag_txt'] = 'No flag';
+$wb['none_txt'] = 'Ninguno';
+?>
diff --git a/interface/web/sites/lib/lang/es_web_backup_list.lng b/interface/web/sites/lib/lang/es_web_backup_list.lng
index 81aeafdf21..04896d9eba 100644
--- a/interface/web/sites/lib/lang/es_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/es_web_backup_list.lng
@@ -16,4 +16,6 @@ $wb['delete_confirm_txt'] = 'Really delete this backup?';
 $wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
 $wb['backup_type_mysql'] = 'Base de datos MySQL';
 $wb['backup_type_web'] = 'Archivos del sitio web';
+$wb['filesize_txt'] = 'Filesize';
+$wb['backup_type_mongodb'] = 'MongoDB Database';
 ?>
diff --git a/interface/web/sites/lib/lang/es_web_childdomain.lng b/interface/web/sites/lib/lang/es_web_childdomain.lng
index d73874009d..db65d5ca11 100644
--- a/interface/web/sites/lib/lang/es_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/es_web_childdomain.lng
@@ -42,7 +42,7 @@ $wb['no_flag_txt'] = 'Sin flag';
 $wb['domain_error_wildcard'] = 'No se permiten subdominios comodín.';
 $wb['proxy_directives_txt'] = 'Directivas de Proxy';
 $wb['available_proxy_directive_snippets_txt'] = 'Fragmentos de directivas de proxy disponibles:';
-$wb['error_proxy_requires_url'] = 'Tipo de redirección "proxy" necesita una URL como ruta de redirección.';
+$wb['error_proxy_requires_url'] = 'Tipo de redirección \"proxy\" necesita una URL como ruta de redirección.';
 $wb['backup_interval_txt'] = 'Intervalo de copia de seguridad';
 $wb['backup_copies_txt'] = 'Número de copias de seguridad';
 $wb['ssl_key_txt'] = 'Clave SSL';
@@ -98,15 +98,13 @@ $wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children debe ser un valor
 $wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers debe ser un valor entero positivo.';
 $wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers debe ser un valor entero positivo.';
 $wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers debe ser un valor entero positivo.';
-$wb['hd_quota_error_regex'] = 'Cuota de disco no es válida.';
-$wb['traffic_quota_error_regex'] = 'Cuota de tráfico no es válida.';
 $wb['fastcgi_php_version_txt'] = 'Versión de PHP';
 $wb['pm_txt'] = 'PHP-FPM Gestor de Procesos';
 $wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
 $wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
 $wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout debe ser un valor entero positivo.';
 $wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests debe ser un valor entero >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Por favor ten en cuenta que debes tener una versión de PHP >= 5.3.9 para poder usar el gestor de procesos \"ondemand\". Si seleccionas \"ondemand\" para una versión de PHP anterior, ¡PHP dejará de funcionar!';
+$wb['pm_ondemand_hint_txt'] = 'Por favor ten en cuenta que debes tener una versión de PHP >= 5.3.9 para poder usar el gestor de procesos \\"ondemand\\". Si seleccionas \\"ondemand\\" para una versión de PHP anterior, ¡PHP dejará de funcionar!';
 $wb['generate_password_txt'] = 'Generar contraseña';
 $wb['repeat_password_txt'] = 'Repetir contraseña';
 $wb['password_mismatch_txt'] = 'Las contraseñas no coinciden.';
@@ -115,5 +113,6 @@ $wb['available_php_directive_snippets_txt'] = 'Fragmentos de directivas de PHP d
 $wb['available_apache_directive_snippets_txt'] = 'Fragmentos de directivas de Apache disponibles:';
 $wb['available_nginx_directive_snippets_txt'] = 'Fragmentos de directivas de nginx disponibles:';
 $wb['Domain'] = 'Alias de dominio';
-
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
 ?>
diff --git a/interface/web/sites/lib/lang/es_web_childdomain_list.lng b/interface/web/sites/lib/lang/es_web_childdomain_list.lng
index 806dcc1e2b..d12c7911e1 100644
--- a/interface/web/sites/lib/lang/es_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/es_web_childdomain_list.lng
@@ -4,12 +4,12 @@ $wb['active_txt'] = 'Habilitado';
 $wb['server_id_txt'] = 'Servidor';
 $wb['parent_domain_id_txt'] = 'Sitio web';
 $wb['domain_txt'] = 'Alias de dominio';
-$wb['add_new_record_txt'] = 'Añadir alias de dominio';
 $wb['domain_error_empty'] = 'El dominio está vacío.';
 $wb['domain_error_unique'] = 'El dominio debe ser único.';
 $wb['domain_error_regex'] = 'Nombre de dominio inválido.';
 $wb['no_redirect_txt'] = 'No redireccionar';
 $wb['no_flag_txt'] = 'Sin marcador';
 $wb['none_txt'] = 'Ninguno';
-
+$wb['add_new_subdomain_txt'] = 'Add new Subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/es_web_directive_snippets.lng b/interface/web/sites/lib/lang/es_web_directive_snippets.lng
new file mode 100644
index 0000000000..05a004f654
--- /dev/null
+++ b/interface/web/sites/lib/lang/es_web_directive_snippets.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['directive_snippets_id_txt'] = 'Desired configuration';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/es_web_domain.lng b/interface/web/sites/lib/lang/es_web_domain.lng
new file mode 100644
index 0000000000..48c37ffd8e
--- /dev/null
+++ b/interface/web/sites/lib/lang/es_web_domain.lng
@@ -0,0 +1,132 @@
+<?php
+$wb['backup_interval_txt'] = 'Intervalo de copia de seguridad';
+$wb['backup_copies_txt'] = 'Número de copias de seguridad';
+$wb['ssl_state_txt'] = 'Estado/Provincia';
+$wb['ssl_locality_txt'] = 'Localidad';
+$wb['ssl_organisation_txt'] = 'Organización';
+$wb['ssl_organisation_unit_txt'] = 'Departamento de la organización';
+$wb['ssl_country_txt'] = 'País';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Dominio';
+$wb['server_id_txt'] = 'Servidor';
+$wb['domain_txt'] = 'Dominio';
+$wb['type_txt'] = 'Tipo';
+$wb['parent_domain_id_txt'] = 'Sitio web padre';
+$wb['redirect_type_txt'] = 'Tipo redirección';
+$wb['redirect_path_txt'] = 'Ruta redirección';
+$wb['active_txt'] = 'Activar';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Usuario Linux';
+$wb['system_group_txt'] = 'Grupo Linux';
+$wb['ip_address_txt'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Tipo';
+$wb['hd_quota_txt'] = 'Couta disco duro';
+$wb['traffic_quota_txt'] = 'Cuota de tráfico';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Documentos propios de error';
+$wb['subdomain_txt'] = 'Auto-Subdominio';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Cliente';
+$wb['limit_web_domain_txt'] = 'Se ha alcanzado el número máximo de dominios web de esta cuenta';
+$wb['limit_web_aliasdomain_txt'] = 'Se ha alcanzado el número máximo de alias de dominios de esta cuenta';
+$wb['limit_web_subdomain_txt'] = 'Se ha alcanzado el número máximo de subdominios web de esta cuenta';
+$wb['apache_directives_txt'] = 'Directivas de Apache';
+$wb['domain_error_empty'] = 'El dominio está vacío.';
+$wb['domain_error_unique'] = 'Ya existe un sitio web o sub/aliasdominio  con este nombre de dominio.';
+$wb['domain_error_regex'] = 'El nombre de dominio no es válido';
+$wb['hd_quota_error_empty'] = 'Cuota de disco duro es 0 o vacío.';
+$wb['traffic_quota_error_empty'] = 'Cuota de tráfico está vacío.';
+$wb['error_ssl_state_empty'] = 'Estado SSL está vacío.';
+$wb['error_ssl_locality_empty'] = 'Sitio SSL está vacío.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organización está vacío.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Unidad de Organización está vacío.';
+$wb['error_ssl_country_empty'] = 'País SSL está vacío.';
+$wb['error_ssl_cert_empty'] = 'Campo de certificado SSL está vacío.';
+$wb['client_group_id_txt'] = 'Cliente';
+$wb['stats_password_txt'] = 'Contraseña de estadísticas Web ';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. cuota disco duro disponible';
+$wb['ssl_state_error_regex'] = 'Estado no válido de SSL. Los caracteres válidos son: a-z, 0-9 y,-_.';
+$wb['ssl_locality_error_regex'] = 'Invalid Sitio válido SSL. Los caracteres válidos son: a-z, 0-9 y,-_.';
+$wb['ssl_organisation_error_regex'] = 'Organización no válido SSL. Los caracteres válidos son: a-z, 0-9 y,-_.';
+$wb['ssl_organistaion_unit_error_regex'] = 'Unidad de Organización no válido SSL. Los caracteres válidos son: a-z, 0-9 y,-_.';
+$wb['ssl_country_error_regex'] = 'País no válido SSL. Los caracteres válidos son: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. Cuota de tráfico disponible';
+$wb['redirect_error_regex'] = 'Redirección no válida camino. Redirecciones válidos son, por ejemplo,: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Cuota de tráfico excedida';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Estadísticas Web nombre de usuario';
+$wb['stats_type_txt'] = 'Estadísticas Web del programa';
+$wb['custom_php_ini_txt'] = 'Configuración personalizada de php.ini';
+$wb['none_txt'] = 'Ninguno';
+$wb['disabled_txt'] = 'Desactivado';
+$wb['no_redirect_txt'] = 'No redirigir';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Guardar el certificado';
+$wb['create_certificate_txt'] = 'Crear el certificado';
+$wb['delete_certificate_txt'] = 'Eliminar certificado';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Usar Socket para PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI para SSL no está activado en este servidor. Sólo es posible activar un certificado SSL en cada dirección IP.';
+$wb['python_txt'] = 'Python';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Los valores de configuración de PHP-FPM pm debe ser como sigue: pm.max_children> = pm.max_spare_servers> = pm.start_servers> = pm.min_spare_servers> 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children debe ser un valor entero positivo.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers debe ser un valor entero positivo.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers debe ser un valor entero positivo.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers debe ser un valor entero positivo.';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['perl_txt'] = 'Perl';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['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['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_system_user_or_group_txt'] = 'Invalid system user or group';
+$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
+?>
diff --git a/interface/web/sites/lib/lang/es_web_domain_admin_list.lng b/interface/web/sites/lib/lang/es_web_domain_admin_list.lng
new file mode 100644
index 0000000000..fd0ba689f2
--- /dev/null
+++ b/interface/web/sites/lib/lang/es_web_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['sys_groupid_txt'] = 'Cliente';
+$wb['list_head_txt'] = 'Sitios de Web';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Activar';
+$wb['server_id_txt'] = 'Servidor';
+$wb['domain_txt'] = 'Dominio';
+$wb['add_new_record_txt'] = 'Añadir nuevo sitio web';
+?>
diff --git a/interface/web/sites/lib/lang/es_web_domain_list.lng b/interface/web/sites/lib/lang/es_web_domain_list.lng
new file mode 100644
index 0000000000..f0248c5fe8
--- /dev/null
+++ b/interface/web/sites/lib/lang/es_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Sitios web';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Activar';
+$wb['server_id_txt'] = 'Servidor';
+$wb['domain_txt'] = 'Dominio';
+$wb['add_new_record_txt'] = 'Añadir nuevo sitio web';
+?>
diff --git a/interface/web/sites/lib/lang/es_web_subdomain.lng b/interface/web/sites/lib/lang/es_web_subdomain.lng
new file mode 100644
index 0000000000..1fa75e51b5
--- /dev/null
+++ b/interface/web/sites/lib/lang/es_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['ssl_state_txt'] = 'Estado o provincia';
+$wb['ssl_locality_txt'] = 'Localidad';
+$wb['ssl_organisation_txt'] = 'Organización';
+$wb['ssl_organisation_unit_txt'] = 'Unidad de la organización';
+$wb['ssl_country_txt'] = 'País';
+$wb['ssl_request_txt'] = 'Solicitud SSL';
+$wb['ssl_cert_txt'] = 'Certificado SSL';
+$wb['ssl_bundle_txt'] = 'Paquete SSL (Bundle)';
+$wb['ssl_action_txt'] = 'Acción SSL';
+$wb['server_id_txt'] = 'Servidor';
+$wb['domain_txt'] = 'Dominio';
+$wb['type_txt'] = 'Tipo';
+$wb['parent_domain_id_txt'] = 'Sitio web padre';
+$wb['redirect_type_txt'] = 'Tipo de redirección';
+$wb['redirect_path_txt'] = 'Ruta de redirección';
+$wb['active_txt'] = 'Activar';
+$wb['document_root_txt'] = 'DocumentRoot';
+$wb['system_user_txt'] = 'Usuario Linux';
+$wb['system_group_txt'] = 'Grupo Linux';
+$wb['ip_address_txt'] = 'Dirección IP';
+$wb['vhost_type_txt'] = 'Tipo VHost';
+$wb['hd_quota_txt'] = 'Cuota de disco duro';
+$wb['traffic_quota_txt'] = 'Cuota de tráfico web';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Cliente';
+$wb['limit_web_domain_txt'] = 'Se ha alcanzado el número máximo de dominios web de su cuenta.';
+$wb['limit_web_aliasdomain_txt'] = 'Se ha alcanzado el número máximo de alias de dominio de su cuenta.';
+$wb['limit_web_subdomain_txt'] = 'Se ha alcanzado el número máximo de subdominios de su cuenta.';
+$wb['apache_directives_txt'] = 'Directivas de Apache';
+$wb['domain_error_empty'] = 'El dominio está vacío.';
+$wb['domain_error_unique'] = 'El dominio debe ser único.';
+$wb['domain_error_regex'] = 'El nombre de dominio no es válido.';
+$wb['host_txt'] = 'Alojamiento';
+$wb['redirect_error_regex'] = 'Redirección no válida ruta. Redirecciones válidos son por ejemplo: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirigir';
+$wb['no_flag_txt'] = 'No flag';
+$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.';
+?>
diff --git a/interface/web/sites/lib/lang/es_web_subdomain_list.lng b/interface/web/sites/lib/lang/es_web_subdomain_list.lng
new file mode 100644
index 0000000000..2b3afa50e7
--- /dev/null
+++ b/interface/web/sites/lib/lang/es_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdominio';
+$wb['active_txt'] = 'Activar';
+$wb['server_id_txt'] = 'Servidor';
+$wb['parent_domain_id_txt'] = 'Sitio web';
+$wb['domain_txt'] = 'Subdominio';
+$wb['add_new_record_txt'] = 'Añadir nuevo subdominio';
+?>
diff --git a/interface/web/sites/lib/lang/es_web_vhost_domain.lng b/interface/web/sites/lib/lang/es_web_vhost_domain.lng
index e74f21884f..e794df1ee4 100644
--- a/interface/web/sites/lib/lang/es_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/es_web_vhost_domain.lng
@@ -18,7 +18,7 @@ $wb['parent_domain_id_txt'] = 'Sitio web padre';
 $wb['redirect_type_txt'] = 'Tipo de redirección';
 $wb['redirect_path_txt'] = 'Ruta de redirección';
 $wb['active_txt'] = 'Activar';
-$wb['document_root_txt'] = 'Carpeta raíz';
+$wb['document_root_txt'] = 'Document Root';
 $wb['system_user_txt'] = 'Usuario Linux';
 $wb['system_group_txt'] = 'Grupo Linux';
 $wb['ip_address_txt'] = 'Dirección IPv4';
@@ -101,7 +101,7 @@ $wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
 $wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
 $wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout debe ser un valor entero positivo.';
 $wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests debe ser un valor entero >= 0.';
-$wb['pm_ondemand_hint_txt'] = 'Por favor ten en cuenta que debes tener una versión de PHP >= 5.3.9 para poder usar el gestor de procesos \"ondemand\". Si seleccionas \"ondemand\" para una versión de PHP anterior, ¡PHP dejará de funcionar!';
+$wb['pm_ondemand_hint_txt'] = 'Por favor ten en cuenta que debes tener una versión de PHP >= 5.3.9 para poder usar el gestor de procesos \\"ondemand\\". Si seleccionas \\"ondemand\\" para una versión de PHP anterior, ¡PHP dejará de funcionar!';
 $wb['generate_password_txt'] = 'Generar contraseña';
 $wb['repeat_password_txt'] = 'Repetir contraseña';
 $wb['password_mismatch_txt'] = 'Las contraseñas no coinciden.';
@@ -125,13 +125,21 @@ $wb['web_folder_invalid_txt'] = 'La carpeta web no es válida, por favor elige u
 $wb['web_folder_unique_txt'] = 'La carpeta web ya está en uso, por favor elige una diferente.';
 $wb['host_txt'] = 'Subdominio';
 $wb['domain_error_wildcard'] = 'No se permiten subdominios comodín.';
-
 $wb['variables_txt'] = 'Variables';
 $wb['added_by_txt'] = 'Añadido por';
 $wb['added_date_txt'] = 'Fecha de alta';
 $wb['backup_excludes_txt'] = 'Directorios excluídos';
 $wb['backup_excludes_note_txt'] = '(Separa múltiples directorios con comas. Ejemplo: web/cache/*,web/backup)';
 $wb['backup_excludes_error_regex'] = 'Los directorios excluídos contienen caracteres no válidos.';
-$wb['invalid_custom_php_ini_settings_txt'] = 'Configuración personalizada de php.ini no válida';
-$wb["document_root_txt"] = "Document Root";
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['load_client_data_txt'] = 'Load client details';
+$wb['load_my_data_txt'] = 'Load my contact details';
+$wb['reset_client_data_txt'] = 'Reset data';
+$wb['ssl_letsencrypt_txt'] = 'Let\'s Encrypt SSL';
+$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
diff --git a/interface/web/sites/lib/lang/es_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/es_web_vhost_domain_list.lng
index 75188cb385..9a78bbe7d0 100644
--- a/interface/web/sites/lib/lang/es_web_vhost_domain_list.lng
+++ b/interface/web/sites/lib/lang/es_web_vhost_domain_list.lng
@@ -5,4 +5,5 @@ $wb['active_txt'] = 'Habilitado';
 $wb['server_id_txt'] = 'Servidor';
 $wb['domain_txt'] = 'Dominio';
 $wb['add_new_record_txt'] = 'Añadir sitio web';
+$wb['parent_domain_id_txt'] = 'Website';
 ?>
diff --git a/interface/web/sites/lib/lang/es_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/es_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..c0ca93b570
--- /dev/null
+++ b/interface/web/sites/lib/lang/es_web_vhost_subdomain.lng
@@ -0,0 +1,127 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Variables';
+$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['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+?>
diff --git a/interface/web/sites/lib/lang/es_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/es_web_vhost_subdomain_list.lng
new file mode 100644
index 0000000000..1c16bcda28
--- /dev/null
+++ b/interface/web/sites/lib/lang/es_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
+?>
diff --git a/interface/web/sites/lib/lang/fi_backup_stats_list.lng b/interface/web/sites/lib/lang/fi_backup_stats_list.lng
index 0f3803f56a..65792aa591 100644
--- a/interface/web/sites/lib/lang/fi_backup_stats_list.lng
+++ b/interface/web/sites/lib/lang/fi_backup_stats_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb["database_name_txt"]   = '';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Domain';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['database_name_txt'] = '';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/sites/lib/lang/fi_cron.lng b/interface/web/sites/lib/lang/fi_cron.lng
index f07ea7bf06..28d04144dc 100644
--- a/interface/web/sites/lib/lang/fi_cron.lng
+++ b/interface/web/sites/lib/lang/fi_cron.lng
@@ -21,4 +21,6 @@ $wb['unknown_fieldtype_error'] = 'Käytetty tuntematonta kenttätyyppiä.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
 $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_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
+$wb['log_output_txt'] = 'Log output';
 ?>
diff --git a/interface/web/sites/lib/lang/fi_database.lng b/interface/web/sites/lib/lang/fi_database.lng
index fd64e4d5d9..846bb40f41 100755
--- a/interface/web/sites/lib/lang/fi_database.lng
+++ b/interface/web/sites/lib/lang/fi_database.lng
@@ -43,4 +43,7 @@ $wb['select_dbuser_txt'] = 'Select database user';
 $wb['no_dbuser_txt'] = 'None';
 $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['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
 ?>
diff --git a/interface/web/sites/lib/lang/fi_database_admin_list.lng b/interface/web/sites/lib/lang/fi_database_admin_list.lng
index 27e62b9ac6..333a5357c6 100644
--- a/interface/web/sites/lib/lang/fi_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/fi_database_admin_list.lng
@@ -8,4 +8,5 @@ $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['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/fi_database_list.lng b/interface/web/sites/lib/lang/fi_database_list.lng
index cf5e75ceca..256b0be453 100755
--- a/interface/web/sites/lib/lang/fi_database_list.lng
+++ b/interface/web/sites/lib/lang/fi_database_list.lng
@@ -7,4 +7,5 @@ $wb['database_name_txt'] = 'Tietokannnan nimi';
 $wb['add_new_record_txt'] = 'Lisää uusi tietokanta';
 $wb['database_user_txt'] = 'Tietokannan käyttäjä';
 $wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/fi_database_quota_stats_list.lng b/interface/web/sites/lib/lang/fi_database_quota_stats_list.lng
index e1de70accf..4f92576007 100644
--- a/interface/web/sites/lib/lang/fi_database_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/fi_database_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["database_txt"] = 'Database';
-$wb["server_name_txt"] = 'Server';
-$wb["client_txt"] = 'Client';
-$wb["used_txt"] = 'Used space';
-$wb["quota_txt"] = 'Quota';
-$wb["percentage_txt"] = 'Used in %';
+$wb['database_txt'] = 'Database';
+$wb['server_name_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb['used_txt'] = 'Used space';
+$wb['quota_txt'] = 'Quota';
+$wb['percentage_txt'] = 'Used in %';
 ?>
diff --git a/interface/web/sites/lib/lang/fi_ftp_sites_stats_list.lng b/interface/web/sites/lib/lang/fi_ftp_sites_stats_list.lng
new file mode 100644
index 0000000000..03894607db
--- /dev/null
+++ b/interface/web/sites/lib/lang/fi_ftp_sites_stats_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb["list_head_txt"] = 'FTP 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 (Download + Upload)';
+$wb["in_out_txt"] = 'DL/UL';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/fi_ftp_user.lng b/interface/web/sites/lib/lang/fi_ftp_user.lng
index 4cf718c286..64d0a49a2a 100755
--- a/interface/web/sites/lib/lang/fi_ftp_user.lng
+++ b/interface/web/sites/lib/lang/fi_ftp_user.lng
@@ -31,6 +31,5 @@ $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['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['directory_error_regex'] = 'Invalid directory';
+$wb['expires_txt'] = 'Expire at';
 ?>
diff --git a/interface/web/sites/lib/lang/fi_web_aliasdomain.lng b/interface/web/sites/lib/lang/fi_web_aliasdomain.lng
new file mode 100644
index 0000000000..4149c71149
--- /dev/null
+++ b/interface/web/sites/lib/lang/fi_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['Domain'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/fi_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/fi_web_aliasdomain_list.lng
new file mode 100644
index 0000000000..623b06f09a
--- /dev/null
+++ b/interface/web/sites/lib/lang/fi_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Aliasverkkotunnus';
+$wb['active_txt'] = 'Käytössä';
+$wb['server_id_txt'] = 'Palvelin';
+$wb['parent_domain_id_txt'] = 'Sivusto';
+$wb['domain_txt'] = 'Aliasverkkotunnus';
+$wb['add_new_record_txt'] = 'Lisää uusi aliasverkkotunnus';
+$wb['domain_error_empty'] = 'Aliasverkkotunnus on tyhjä.';
+$wb['domain_error_unique'] = 'Tämä aliasverkkotunnus on jo olemassa.';
+$wb['domain_error_regex'] = 'Aliasverkkotunnus on vääränlainen.';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/sites/lib/lang/fi_web_backup_list.lng b/interface/web/sites/lib/lang/fi_web_backup_list.lng
index fa4a59b403..d1133334f0 100644
--- a/interface/web/sites/lib/lang/fi_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/fi_web_backup_list.lng
@@ -16,4 +16,6 @@ $wb['delete_confirm_txt'] = 'Really delete this backup?';
 $wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
 $wb['backup_type_mysql'] = 'MySQL Database';
 $wb['backup_type_web'] = 'Website files';
+$wb['filesize_txt'] = 'Filesize';
+$wb['backup_type_mongodb'] = 'MongoDB Database';
 ?>
diff --git a/interface/web/sites/lib/lang/fi_web_childdomain.lng b/interface/web/sites/lib/lang/fi_web_childdomain.lng
index 6da7297b4d..3959fe53da 100755
--- a/interface/web/sites/lib/lang/fi_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/fi_web_childdomain.lng
@@ -42,7 +42,7 @@ $wb['no_flag_txt'] = 'No flag';
 $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.';
 $wb['backup_interval_txt'] = 'Backup interval';
 $wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['ssl_key_txt'] = 'SSL Key';
@@ -115,5 +115,4 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
-
 ?>
diff --git a/interface/web/sites/lib/lang/fi_web_childdomain_list.lng b/interface/web/sites/lib/lang/fi_web_childdomain_list.lng
index 97b62c6e80..0264fb6b08 100755
--- a/interface/web/sites/lib/lang/fi_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/fi_web_childdomain_list.lng
@@ -4,12 +4,12 @@ $wb['active_txt'] = 'Käytössä';
 $wb['server_id_txt'] = 'Palvelin';
 $wb['parent_domain_id_txt'] = 'Pääverkkotunnus';
 $wb['domain_txt'] = 'Aliverkkotunnus';
-$wb['add_new_record_txt'] = 'Lisää uusi aliverkkotunnus';
 $wb['domain_error_empty'] = 'Aliasverkkotunnus on tyhjä.';
 $wb['domain_error_unique'] = 'Tämä aliasverkkotunnus on jo olemassa.';
 $wb['domain_error_regex'] = 'Aliasverkkotunnus on vääränlainen.';
 $wb['no_redirect_txt'] = 'No redirect';
 $wb['no_flag_txt'] = 'No flag';
 $wb['none_txt'] = 'None';
-
+$wb['add_new_subdomain_txt'] = 'Add new Subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/fi_web_directive_snippets.lng b/interface/web/sites/lib/lang/fi_web_directive_snippets.lng
new file mode 100644
index 0000000000..05a004f654
--- /dev/null
+++ b/interface/web/sites/lib/lang/fi_web_directive_snippets.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['directive_snippets_id_txt'] = 'Desired configuration';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/fi_web_domain.lng b/interface/web/sites/lib/lang/fi_web_domain.lng
new file mode 100644
index 0000000000..e13fb8f54a
--- /dev/null
+++ b/interface/web/sites/lib/lang/fi_web_domain.lng
@@ -0,0 +1,132 @@
+<?php
+$wb['ssl_state_txt'] = 'Lääni';
+$wb['ssl_locality_txt'] = 'Lokaali';
+$wb['ssl_organisation_txt'] = 'Organisaatio';
+$wb['ssl_organisation_unit_txt'] = 'Organisaatioyksikkö';
+$wb['ssl_country_txt'] = 'Maa';
+$wb['ssl_request_txt'] = 'SSL-pyyntö';
+$wb['ssl_cert_txt'] = 'SSL-sertifikaatti';
+$wb['ssl_bundle_txt'] = 'SSL-paketti';
+$wb['ssl_action_txt'] = 'SSL-toiminto';
+$wb['server_id_txt'] = 'Palvelin';
+$wb['domain_txt'] = 'Verkkotunnus';
+$wb['type_txt'] = 'Tyyppi';
+$wb['parent_domain_id_txt'] = 'Pääsivusto';
+$wb['redirect_type_txt'] = 'Edelleenohjauksen tyyppi';
+$wb['redirect_path_txt'] = 'Edelleenohjausosoite';
+$wb['active_txt'] = 'Käytössä';
+$wb['document_root_txt'] = 'Dokumenttikansio';
+$wb['system_user_txt'] = 'Linux-käyttäjä';
+$wb['system_group_txt'] = 'Käyttäjäryhmä';
+$wb['ip_address_txt'] = 'IP-osoite';
+$wb['vhost_type_txt'] = 'Virtuaali-isännän tyyppi';
+$wb['hd_quota_txt'] = 'Levytila';
+$wb['traffic_quota_txt'] = 'Liikenneraja';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Asiakas';
+$wb['limit_web_domain_txt'] = 'Käyttäjätunnuksella on jo sallittu määrä verkkotunnuksia.';
+$wb['limit_web_aliasdomain_txt'] = 'Käyttäjätunnuksella on jo sallittu määrä aliasverkkotunnuksia.';
+$wb['limit_web_subdomain_txt'] = 'Käyttäjätunnuksella on jo sallittu määrä aliverkkotunnuksia.';
+$wb['apache_directives_txt'] = 'Apachen direktiivit';
+$wb['domain_error_empty'] = 'Verkkotunnus-kenttä on tyhjä.';
+$wb['domain_error_unique'] = 'Tämä verkkotunnus on jo olemassa.';
+$wb['domain_error_regex'] = 'Verkkotunnus on vääränlainen.';
+$wb['hd_quota_error_empty'] = 'Levytila-kenttä on tyhjä.';
+$wb['traffic_quota_error_empty'] = 'Liikenneraja-kenttä on tyhjä.';
+$wb['errordocs_txt'] = 'Omat virhesivut';
+$wb['subdomain_txt'] = 'Automaattinen aliverkkotunnus';
+$wb['error_ssl_state_empty'] = 'SSL-lääni-kenttä on tyhjä.';
+$wb['error_ssl_locality_empty'] = 'SSL-lokaali-kenttä on tyhjä.';
+$wb['error_ssl_organisation_empty'] = 'SSL-organisaatio-kenttä on tyhjä.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL-organisaatioyksikkö-kenttä on tyhjä.';
+$wb['error_ssl_country_empty'] = 'SSL-maa-kenttä on tyhjä.';
+$wb['client_group_id_txt'] = 'Asiakas';
+$wb['stats_password_txt'] = 'Tilastoinnin salasana';
+$wb['ssl_domain_txt'] = 'SSL-verkkotunnus';
+$wb['allow_override_txt'] = 'Salli ohitus';
+$wb['limit_web_quota_free_txt'] = 'Suurin sallittu levytila';
+$wb['ssl_state_error_regex'] = 'Virheellinen SSL-lääni. Kelvolliset merkit ovat: a-z, 0-9 js .,-_';
+$wb['ssl_locality_error_regex'] = 'Virheellinen SSL-llokaali. Kelvolliset merkit ovat: a-z, 0-9 js .,-_';
+$wb['ssl_organisation_error_regex'] = 'Virheellinen SSL-organisaatio. Kelvolliset merkit ovat: a-z, 0-9 js .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Virheellinen SSL-organisaatioyksikkö. Kelvolliset merkit ovat: a-z, 0-9 js .,-_';
+$wb['ssl_country_error_regex'] = 'Virheellinen SSL-lääni. Kelvolliset merkit ovat: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Suurin sallittu liikennemäärä';
+$wb['redirect_error_regex'] = 'VIrheellinen edelleenohjausosoite. Kelvollisia ovat esimerkiksi: /testi/ tai http://www.domain.tld/testi/';
+$wb['php_open_basedir_txt'] = 'PHP:n avoin peruskansio';
+$wb['traffic_quota_exceeded_txt'] = 'Liikenneraja ylitetty';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['perl_txt'] = 'Perl';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['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['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_system_user_or_group_txt'] = 'Invalid system user or group';
+$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
+?>
diff --git a/interface/web/sites/lib/lang/fi_web_domain_admin_list.lng b/interface/web/sites/lib/lang/fi_web_domain_admin_list.lng
new file mode 100644
index 0000000000..b460e27100
--- /dev/null
+++ b/interface/web/sites/lib/lang/fi_web_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['sys_groupid_txt'] = 'Client';
+$wb['list_head_txt'] = 'Websites';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Add new website';
+?>
diff --git a/interface/web/sites/lib/lang/fi_web_domain_list.lng b/interface/web/sites/lib/lang/fi_web_domain_list.lng
new file mode 100644
index 0000000000..8f5691c2f8
--- /dev/null
+++ b/interface/web/sites/lib/lang/fi_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Verkkotunnukset';
+$wb['active_txt'] = 'Käytössä';
+$wb['server_id_txt'] = 'Palvelin';
+$wb['domain_txt'] = 'Verkkotunnus';
+$wb['add_new_record_txt'] = 'Lisää uusi verkkotunnus';
+$wb['domain_id_txt'] = 'Verkkotunnus';
+?>
diff --git a/interface/web/sites/lib/lang/fi_web_subdomain.lng b/interface/web/sites/lib/lang/fi_web_subdomain.lng
new file mode 100644
index 0000000000..b2003f0cfe
--- /dev/null
+++ b/interface/web/sites/lib/lang/fi_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['ssl_state_txt'] = 'Lääni';
+$wb['ssl_locality_txt'] = 'Lokaali';
+$wb['ssl_organisation_txt'] = 'Organisaatio';
+$wb['ssl_organisation_unit_txt'] = 'Organisaatoyksikkö';
+$wb['ssl_country_txt'] = 'Maa';
+$wb['ssl_request_txt'] = 'SSL-pyyntö';
+$wb['ssl_cert_txt'] = 'SSL-sertifikaatti';
+$wb['ssl_bundle_txt'] = 'SSL-paketti';
+$wb['ssl_action_txt'] = 'SSL-toiminto';
+$wb['server_id_txt'] = 'Palvelin';
+$wb['domain_txt'] = 'Verkkotunnus';
+$wb['type_txt'] = 'Tyyppi';
+$wb['parent_domain_id_txt'] = 'Pääsivu';
+$wb['redirect_type_txt'] = 'Edelleenohjauksen tyyppi';
+$wb['redirect_path_txt'] = 'Edelleenohjausosoite';
+$wb['active_txt'] = 'Käytössä';
+$wb['document_root_txt'] = 'Dokumentikansio';
+$wb['system_user_txt'] = 'Linux-käyttäjä';
+$wb['system_group_txt'] = 'Käyttäjäryhmä';
+$wb['ip_address_txt'] = 'IP-osoite';
+$wb['vhost_type_txt'] = 'Virtuaali-isännän tyyppi';
+$wb['hd_quota_txt'] = 'Levytila';
+$wb['traffic_quota_txt'] = 'Liikenneraja';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Asiakas';
+$wb['limit_web_domain_txt'] = 'Käytttäjätunnuksella on jo sallittu määrä verkkotunnuksia.';
+$wb['limit_web_aliasdomain_txt'] = 'Käytttäjätunnuksella on jo sallittu määrä aliasverkkotunnuksia.';
+$wb['limit_web_subdomain_txt'] = 'Käytttäjätunnuksella on jo sallittu määrä aliverkkotunnuksia.';
+$wb['apache_directives_txt'] = 'Apachen direktiivit';
+$wb['domain_error_empty'] = 'Verkkotunnus-kenttä on tyhjä.';
+$wb['domain_error_unique'] = 'Tämä verkkotunnus on jo olemassa.';
+$wb['domain_error_regex'] = 'Verkkotunnus on vääränlainen.';
+$wb['host_txt'] = 'Isäntäkone';
+$wb['redirect_error_regex'] = 'VIrheellinen edelleenohjausosoite. Kelvollisia ovat esimerkiksi: /testi/ tai http://www.domain.tld/testi/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$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.';
+?>
diff --git a/interface/web/sites/lib/lang/fi_web_subdomain_list.lng b/interface/web/sites/lib/lang/fi_web_subdomain_list.lng
new file mode 100644
index 0000000000..31fb17028a
--- /dev/null
+++ b/interface/web/sites/lib/lang/fi_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Aliverkkotunnukset';
+$wb['active_txt'] = 'Käytössä';
+$wb['server_id_txt'] = 'Palvelin';
+$wb['parent_domain_id_txt'] = 'Pääverkkotunnus';
+$wb['domain_txt'] = 'Aliverkkotunnus';
+$wb['add_new_record_txt'] = 'Lisää uusi aliverkkotunnus';
+?>
diff --git a/interface/web/sites/lib/lang/fi_web_vhost_domain.lng b/interface/web/sites/lib/lang/fi_web_vhost_domain.lng
index 23b69737da..fa41bc4a15 100644
--- a/interface/web/sites/lib/lang/fi_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/fi_web_vhost_domain.lng
@@ -15,7 +15,7 @@ $wb['parent_domain_id_txt'] = 'Pääsivusto';
 $wb['redirect_type_txt'] = 'Edelleenohjauksen tyyppi';
 $wb['redirect_path_txt'] = 'Edelleenohjausosoite';
 $wb['active_txt'] = 'Käytössä';
-$wb['document_root_txt'] = 'Dokumenttikansio';
+$wb['document_root_txt'] = 'Document Root';
 $wb['system_user_txt'] = 'Linux-käyttäjä';
 $wb['system_group_txt'] = 'Käyttäjäryhmä';
 $wb['ip_address_txt'] = 'IP-osoite';
@@ -126,15 +126,20 @@ $wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a diff
 $wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
 $wb['host_txt'] = 'Hostname';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-
 $wb['variables_txt'] = 'Variables';
 $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $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_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
-$wb["document_root_txt"] = "Document Root";
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['load_client_data_txt'] = 'Load client details';
+$wb['load_my_data_txt'] = 'Load my contact details';
+$wb['reset_client_data_txt'] = 'Reset data';
+$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
diff --git a/interface/web/sites/lib/lang/fi_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/fi_web_vhost_domain_list.lng
index 52c238cb1b..e6c572d5dc 100755
--- a/interface/web/sites/lib/lang/fi_web_vhost_domain_list.lng
+++ b/interface/web/sites/lib/lang/fi_web_vhost_domain_list.lng
@@ -6,5 +6,4 @@ $wb['domain_txt'] = 'Verkkotunnus';
 $wb['add_new_record_txt'] = 'Lisää uusi verkkotunnus';
 $wb['domain_id_txt'] = 'Verkkotunnus';
 $wb['parent_domain_id_txt'] = 'Website';
-
 ?>
diff --git a/interface/web/sites/lib/lang/fi_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/fi_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..c0ca93b570
--- /dev/null
+++ b/interface/web/sites/lib/lang/fi_web_vhost_subdomain.lng
@@ -0,0 +1,127 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Variables';
+$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['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+?>
diff --git a/interface/web/sites/lib/lang/fi_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/fi_web_vhost_subdomain_list.lng
new file mode 100644
index 0000000000..1c16bcda28
--- /dev/null
+++ b/interface/web/sites/lib/lang/fi_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
+?>
diff --git a/interface/web/sites/lib/lang/fr_aps.lng b/interface/web/sites/lib/lang/fr_aps.lng
index 5d43e803dd..10b6edbcfd 100644
--- a/interface/web/sites/lib/lang/fr_aps.lng
+++ b/interface/web/sites/lib/lang/fr_aps.lng
@@ -1,15 +1,15 @@
 <?php
-$wb['overview_txt'] = 'Vue d\'ensemble';
+$wb['overview_txt'] = 'Vue d’ensemble';
 $wb['administration_txt'] = 'Administration';
 $wb['available_packages_txt'] = 'Packages disponibles';
 $wb['installed_packages_txt'] = 'Packages installés';
 $wb['yes_txt'] = 'Oui';
 $wb['no_txt'] = 'Non';
-$wb['invalid_id_txt'] = 'Aucun ID valide n\'a été fourni.';
+$wb['invalid_id_txt'] = 'Aucun ID valide n’a été fourni.';
 $wb['details_txt'] = 'Details';
 $wb['version_txt'] = 'Version';
 $wb['category_txt'] = 'Categorie';
-$wb['homepage_txt'] = 'Page d\'accueil';
+$wb['homepage_txt'] = 'Page d’accueil';
 $wb['supported_languages_txt'] = 'Langues supportées';
 $wb['description_txt'] = 'Description';
 $wb['config_script_txt'] = 'Script de configuration';
@@ -25,34 +25,34 @@ $wb['database_txt'] = 'Base de données';
 $wb['settings_txt'] = 'Configuration';
 $wb['install_package_txt'] = 'Installer ce package';
 $wb['installation_txt'] = 'Installation';
-$wb['install_location_txt'] = 'Chemin d\'installation';
-$wb['acceptance_txt'] = 'Conditions d\'utilisation (licence)';
-$wb['acceptance_text_txt'] = 'Oui, j\'ai lu les conditions d\'utilisation (licence) et les accepte.';
-$wb['install_language_txt'] = 'Langue de l\'interface';
-$wb['new_database_password_txt'] = 'Nouveau mot de passe BDD';
+$wb['install_location_txt'] = 'Chemin d’installation';
+$wb['acceptance_txt'] = 'Conditions d’utilisation (licence)';
+$wb['acceptance_text_txt'] = 'Oui, j’ai lu les conditions d’utilisation (licence) et les accepte.';
+$wb['install_language_txt'] = 'Langue de l’interface';
+$wb['new_database_password_txt'] = 'Nouveau mot de passe BDd';
 $wb['basic_settings_txt'] = 'Configuration de base';
 $wb['package_settings_txt'] = 'Configuration du package';
-$wb['error_main_domain'] = 'Le domaine du chemin d\'installation est invalide.';
-$wb['error_no_main_location'] = 'Vous n\'avez fourni aucun chemin d\'installation valide.';
-$wb['error_inv_main_location'] = 'Le dossier d\'installation choisi est invalide.';
-$wb['error_license_agreement'] = 'Avant de continuer, vous devez accepter les conditions d\'utilisation (licence).';
-$wb['error_no_database_pw'] = 'Vous n\'avez pas renseigné de mot de passe BDD valide.';
+$wb['error_main_domain'] = 'Le domaine du chemin d’installation est invalide.';
+$wb['error_no_main_location'] = 'Vous n’avez fourni aucun chemin d’installation valide.';
+$wb['error_inv_main_location'] = 'Le dossier d’installation choisi est invalide.';
+$wb['error_license_agreement'] = 'Avant de continuer, vous devez accepter les conditions d’utilisation (licence).';
+$wb['error_no_database_pw'] = 'Vous n’avez pas renseigné de mot de passe BDD valide.';
 $wb['error_short_database_pw'] = 'Veuillez saisir un mot de passe BDD plus long.';
 $wb['error_no_value_for'] = 'Le champ \\"%s\\" ne peut pas être vide.';
 $wb['error_short_value_for'] = 'Le champ \\"%s\\" nécessite une valeur plus longue.';
 $wb['error_long_value_for'] = 'Le champ \\"%s\\" nécessite une valeur plus courte.';
 $wb['error_inv_value_for'] = 'Vous avez saisi une valeur invalide pour le champ \\"%s\\".';
-$wb['error_inv_email_for'] = 'L\'adresse email saisie pour le champ \\"%s\\" est invalide.';
+$wb['error_inv_email_for'] = 'L’adresse e-mail saisie pour le champ \\"%s\\" est invalide.';
 $wb['error_inv_domain_for'] = 'Le domaine saisi pour le champ \\"%s\\" est invalide.';
 $wb['error_inv_integer_for'] = 'Le nombre saisi pour le champ \\"%s\\" est invalide.';
 $wb['error_inv_float_for'] = 'La décimale saisie pour le champ \\"%s\\" est invalide.';
-$wb['error_used_location'] = 'Le chemin de destination contient déjà un package d\'installation.';
+$wb['error_used_location'] = 'Le chemin de destination contient déjà un package d’installation.';
 $wb['installation_task_txt'] = 'Installation prévue';
-$wb['installation_error_txt'] = 'Erreur d\'installation';
+$wb['installation_error_txt'] = 'Erreur d’installation';
 $wb['installation_success_txt'] = 'Installé';
 $wb['installation_remove_txt'] = 'Désinstallation prévue';
 $wb['packagelist_update_finished_txt'] = 'Mise à jour APS Packagelist terminée.';
 $wb['btn_install_txt'] = 'Installer';
 $wb['btn_cancel_txt'] = 'Annuler';
-$wb['limit_aps_txt'] = 'Le nombre max d\'instances APS pour votre compte a été atteint.';
+$wb['limit_aps_txt'] = 'Le nombre max d’instances APS pour votre compte a été atteint.';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_aps_instances_list.lng b/interface/web/sites/lib/lang/fr_aps_instances_list.lng
index 63145b04f3..1cc3f2d47a 100644
--- a/interface/web/sites/lib/lang/fr_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/fr_aps_instances_list.lng
@@ -4,8 +4,8 @@ $wb['name_txt'] = 'Nom';
 $wb['version_txt'] = 'Version';
 $wb['customer_txt'] = 'Client';
 $wb['status_txt'] = 'Statut';
-$wb['install_location_txt'] = 'Chemin d\'installation';
-$wb['pkg_delete_confirmation'] = 'Etes-vous sûr de vouloir supprimer cette installation ?';
+$wb['install_location_txt'] = 'Chemin d’installation';
+$wb['pkg_delete_confirmation'] = 'Etes-vous sûr de vouloir supprimer cette installation ?';
 $wb['filter_txt'] = 'Chercher';
 $wb['delete_txt'] = 'Supprimer';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_backup_stats_list.lng b/interface/web/sites/lib/lang/fr_backup_stats_list.lng
index 0f3803f56a..65792aa591 100644
--- a/interface/web/sites/lib/lang/fr_backup_stats_list.lng
+++ b/interface/web/sites/lib/lang/fr_backup_stats_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb["database_name_txt"]   = '';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Domain';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['database_name_txt'] = '';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_cron.lng b/interface/web/sites/lib/lang/fr_cron.lng
index 41a0b82cf2..672efe500d 100644
--- a/interface/web/sites/lib/lang/fr_cron.lng
+++ b/interface/web/sites/lib/lang/fr_cron.lng
@@ -21,4 +21,6 @@ $wb['unknown_fieldtype_error'] = 'Un champ inconnu a été utilisé';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
 $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_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
+$wb['log_output_txt'] = 'Log output';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_database.lng b/interface/web/sites/lib/lang/fr_database.lng
index b718bcf595..d509e72016 100644
--- a/interface/web/sites/lib/lang/fr_database.lng
+++ b/interface/web/sites/lib/lang/fr_database.lng
@@ -2,32 +2,32 @@
 $wb['server_id_txt'] = 'Serveur';
 $wb['type_txt'] = 'Type';
 $wb['database_name_txt'] = 'Nom de la base';
-$wb['database_user_txt'] = 'Nom d\'utilisateur';
+$wb['database_user_txt'] = 'Nom d’utilisateur';
 $wb['database_password_txt'] = 'Mot de passe';
 $wb['password_strength_txt'] = 'Force du mot de passe';
 $wb['database_charset_txt'] = 'Jeu de caractères de la base';
 $wb['remote_access_txt'] = 'Accès à Distance';
-$wb['remote_ips_txt'] = 'IP d\'accès à distance (séparés par des virgules, ne rien mettre pour tout autoriser)';
+$wb['remote_ips_txt'] = 'IP d’accès à distance (séparés par des virgules, ne rien mettre pour tout autoriser)';
 $wb['database_remote_error_ips'] = 'Lune des IP entrées nest pas valide';
 $wb['client_txt'] = 'Client';
 $wb['active_txt'] = 'Actif';
 $wb['database_name_error_empty'] = 'Le nom de la base ne peut être vide.';
 $wb['database_name_error_unique'] = 'Il y a déja une base portant ce nom sur le serveur.';
 $wb['database_name_error_regex'] = 'Nom de la base incorrect. Le nom de la base peut uniquement contenir ces caractères: a-z, A-Z, 0-9 et le tiret bas. Taille: 2 - 64 caractères.';
-$wb['database_user_error_empty'] = 'Le nom d\'utilisateur ne peut être vide.';
+$wb['database_user_error_empty'] = 'Le nom d’utilisateur ne peut être vide.';
 $wb['database_user_error_unique'] = 'Il y a déja un utilisateur de base avec ce nom.';
-$wb['database_user_error_regex'] = 'Nom d\'utilisateur incorrect. Le nom d\'utilisateur peut uniquement contenir ces caractères: a-z, A-Z, 0-9 et le tiret bas. Taille: 2 - 64 caractères.';
+$wb['database_user_error_regex'] = 'Nom d’utilisateur incorrect. Le nom d’utilisateur peut uniquement contenir ces caractères: a-z, A-Z, 0-9 et le tiret bas. Taille: 2 - 64 caractères.';
 $wb['limit_database_txt'] = 'Le nombre maximum de bases de données a été atteint.';
 $wb['database_name_change_txt'] = 'Le nom de la base ne peut être modifié';
 $wb['database_charset_change_txt'] = 'Le charset de la base ne peut être modifié';
 $wb['database_name_error_len'] = 'Nom de base de données - {db} - trop long. La longueur maximale incluant le préfixe est de 64 caractères.';
-$wb['database_user_error_len'] = 'Nom d\'utilisateur de base de données - {user}- trop long. La longueur maximale incluant le préfixe est de 16 caractères.';
+$wb['database_user_error_len'] = 'Nom d’utilisateur de base de données - {user}- trop long. La longueur maximale incluant le préfixe est de 16 caractères.';
 $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['generate_password_txt'] = 'Générer un mot de passe';
 $wb['repeat_password_txt'] = 'Repeat Password';
 $wb['password_mismatch_txt'] = 'The passwords do not match.';
 $wb['password_match_txt'] = 'The passwords do match.';
@@ -43,4 +43,7 @@ $wb['select_dbuser_txt'] = 'Select database user';
 $wb['no_dbuser_txt'] = 'None';
 $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['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_database_admin_list.lng b/interface/web/sites/lib/lang/fr_database_admin_list.lng
index 651aa20fd1..594406f114 100644
--- a/interface/web/sites/lib/lang/fr_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/fr_database_admin_list.lng
@@ -8,4 +8,5 @@ $wb['database_name_txt'] = 'Nom de la base de données';
 $wb['add_new_record_txt'] = 'Ajouter une base de données';
 $wb['sys_groupid_txt'] = 'Client';
 $wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_database_list.lng b/interface/web/sites/lib/lang/fr_database_list.lng
index 3ff3eac31f..50d3a3e1d6 100644
--- a/interface/web/sites/lib/lang/fr_database_list.lng
+++ b/interface/web/sites/lib/lang/fr_database_list.lng
@@ -5,6 +5,7 @@ $wb['remote_access_txt'] = 'Accès à distance';
 $wb['server_id_txt'] = 'Serveur';
 $wb['database_name_txt'] = 'Nom de la base';
 $wb['add_new_record_txt'] = 'Nouvelle base de données';
-$wb['database_user_txt'] = 'Utilisateur BDD';
+$wb['database_user_txt'] = 'Utilisateur BDd';
 $wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_database_quota_stats_list.lng b/interface/web/sites/lib/lang/fr_database_quota_stats_list.lng
index e1de70accf..4f92576007 100644
--- a/interface/web/sites/lib/lang/fr_database_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/fr_database_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["database_txt"] = 'Database';
-$wb["server_name_txt"] = 'Server';
-$wb["client_txt"] = 'Client';
-$wb["used_txt"] = 'Used space';
-$wb["quota_txt"] = 'Quota';
-$wb["percentage_txt"] = 'Used in %';
+$wb['database_txt'] = 'Database';
+$wb['server_name_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb['used_txt'] = 'Used space';
+$wb['quota_txt'] = 'Quota';
+$wb['percentage_txt'] = 'Used in %';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_database_user.lng b/interface/web/sites/lib/lang/fr_database_user.lng
index 66a0718349..a904ad4bae 100644
--- a/interface/web/sites/lib/lang/fr_database_user.lng
+++ b/interface/web/sites/lib/lang/fr_database_user.lng
@@ -10,7 +10,7 @@ $wb['database_user_error_regex'] = 'Invalid database user name. The username may
 $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['generate_password_txt'] = 'Générer un mot de passe';
 $wb['repeat_password_txt'] = 'Repeat Password';
 $wb['password_mismatch_txt'] = 'The passwords do not match.';
 $wb['password_match_txt'] = 'The passwords do match.';
diff --git a/interface/web/sites/lib/lang/fr_ftp_sites_stats_list.lng b/interface/web/sites/lib/lang/fr_ftp_sites_stats_list.lng
index d83ee755d7..810004a72e 100644
--- a/interface/web/sites/lib/lang/fr_ftp_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/fr_ftp_sites_stats_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["list_head_txt"] = 'FTP trafic';
-$wb["domain_txt"] = 'Domaine';
-$wb["this_month_txt"] = 'Mois en cours';
-$wb["last_month_txt"] = 'Mois pr�c�dent';
-$wb["this_year_txt"] = 'Ann�e en cours';
-$wb["last_year_txt"] = 'Ann�e pr�c�dente';
-$wb["sum_txt"] = 'Total (Download + Upload)';
-$wb["in_out_txt"] = 'DL/UL';
-?>
\ No newline at end of file
+$wb['list_head_txt'] = 'FTP trafic';
+$wb['domain_txt'] = 'Domaine';
+$wb['this_month_txt'] = 'Mois en cours';
+$wb['last_month_txt'] = 'Mois pr�c�dent';
+$wb['this_year_txt'] = 'Ann�e en cours';
+$wb['last_year_txt'] = 'Ann�e pr�c�dente';
+$wb['sum_txt'] = 'Total (Download + Upload)';
+$wb['in_out_txt'] = 'DL/UL';
+?>
diff --git a/interface/web/sites/lib/lang/fr_ftp_user.lng b/interface/web/sites/lib/lang/fr_ftp_user.lng
index f73a81b1b3..5ff9cd517e 100644
--- a/interface/web/sites/lib/lang/fr_ftp_user.lng
+++ b/interface/web/sites/lib/lang/fr_ftp_user.lng
@@ -1,6 +1,6 @@
 <?php
-$wb['uid_txt'] = 'UID';
-$wb['gid_txt'] = 'GID';
+$wb['uid_txt'] = 'UId';
+$wb['gid_txt'] = 'GId';
 $wb['dir_txt'] = 'Répertoire';
 $wb['quota_files_txt'] = 'Quota de fichiers';
 $wb['ul_ratio_txt'] = 'Ratio upload';
@@ -9,15 +9,15 @@ $wb['ul_bandwidth_txt'] = 'Bande passante upload';
 $wb['dl_bandwidth_txt'] = 'Bande passante download';
 $wb['server_id_txt'] = 'Serveur';
 $wb['parent_domain_id_txt'] = 'Site web';
-$wb['username_txt'] = 'Nom d\'utilisateur';
+$wb['username_txt'] = 'Nom d’utilisateur';
 $wb['password_txt'] = 'Mot de passe';
 $wb['password_strength_txt'] = 'Force du mot de passe';
 $wb['quota_size_txt'] = 'Quota disque';
 $wb['active_txt'] = 'Actif';
-$wb['limit_ftp_user_txt'] = 'Le nombre maximum d\'utilisateurs FTP a été atteint.';
-$wb['username_error_empty'] = 'Le nom d\'utilisateur est vide.';
-$wb['username_error_unique'] = 'Le nom d\'utilisateur doit être unique.';
-$wb['username_error_regex'] = 'Le nom d\'utilisateur contient des caractères invalides.';
+$wb['limit_ftp_user_txt'] = 'Le nombre maximum d’utilisateurs FTP a été atteint.';
+$wb['username_error_empty'] = 'Le nom d’utilisateur est vide.';
+$wb['username_error_unique'] = 'Le nom d’utilisateur doit être unique.';
+$wb['username_error_regex'] = 'Le nom d’utilisateur contient des caractères invalides.';
 $wb['quota_size_error_empty'] = 'Le quota est vide.';
 $wb['uid_error_empty'] = 'Le GID est vide.';
 $wb['directory_error_empty'] = 'Le répertoire est vide.';
@@ -31,6 +31,5 @@ $wb['generate_password_txt'] = 'Générer un mot de passe';
 $wb['repeat_password_txt'] = 'Vérification du mot de passe';
 $wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
 $wb['password_match_txt'] = 'Les mots de passe correspondent.';
-$wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['directory_error_regex'] = 'Invalid directory';
+$wb['expires_txt'] = 'Expire at';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_ftp_user_list.lng b/interface/web/sites/lib/lang/fr_ftp_user_list.lng
index 51c89069e9..9d9f1ee2b8 100644
--- a/interface/web/sites/lib/lang/fr_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/fr_ftp_user_list.lng
@@ -3,6 +3,6 @@ $wb['list_head_txt'] = 'Utilisateur FTP';
 $wb['active_txt'] = 'Actif';
 $wb['server_id_txt'] = 'Serveur';
 $wb['parent_domain_id_txt'] = 'Site web';
-$wb['username_txt'] = 'Nom d\'utilisateur';
+$wb['username_txt'] = 'Nom d’utilisateur';
 $wb['add_new_record_txt'] = 'Nouvel utilisateur FTP';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_shell_user.lng b/interface/web/sites/lib/lang/fr_shell_user.lng
index 940a78070f..738f801475 100644
--- a/interface/web/sites/lib/lang/fr_shell_user.lng
+++ b/interface/web/sites/lib/lang/fr_shell_user.lng
@@ -3,19 +3,19 @@ $wb['shell_txt'] = 'Shell';
 $wb['dir_txt'] = 'Répertoire';
 $wb['server_id_txt'] = 'Serveur';
 $wb['parent_domain_id_txt'] = 'Site';
-$wb['username_txt'] = 'Nom d\'utilisateur';
+$wb['username_txt'] = 'Nom d’utilisateur';
 $wb['password_txt'] = 'Mot de passe';
 $wb['password_strength_txt'] = 'Force du mot de passe';
 $wb['chroot_txt'] = 'Chrooter le shell';
 $wb['quota_size_txt'] = 'Quota';
 $wb['active_txt'] = 'Actif';
-$wb['username_error_empty'] = 'Le nom d\'utilisateur est vide.';
-$wb['username_error_unique'] = 'Le nom d\'utilisateur doit être unique.';
-$wb['username_error_regex'] = 'Le nom d\'utilisateur contient des caractères invalides.';
+$wb['username_error_empty'] = 'Le nom d’utilisateur est vide.';
+$wb['username_error_unique'] = 'Le nom d’utilisateur doit être unique.';
+$wb['username_error_regex'] = 'Le nom d’utilisateur contient des caractères invalides.';
 $wb['quota_size_error_empty'] = 'Le quota est vide.';
 $wb['uid_error_empty'] = 'Le GID est vide.';
 $wb['directory_error_empty'] = 'Le répertoire est vide.';
-$wb['limit_shell_user_txt'] = 'Le nombre maximum d\'utilisateurs shell a été atteint..';
+$wb['limit_shell_user_txt'] = 'Le nombre maximum d’utilisateurs shell a été atteint..';
 $wb['parent_domain_id_error_empty'] = 'Aucun site web sélectionné.';
 $wb['puser_txt'] = 'Utilisateur web';
 $wb['pgroup_txt'] = 'Groupe web';
@@ -26,8 +26,8 @@ $wb['generate_password_txt'] = 'Générer un mot de passe';
 $wb['repeat_password_txt'] = 'Vérification du mot de passe';
 $wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
 $wb['password_match_txt'] = 'Les mots de passe correspondent.';
-$wb['username_must_not_exceed_32_chars_txt'] = 'Le nom d\'utilisateur ne doit pas dépasser 32 caractères.';
-$wb['username_not_allowed_txt'] = 'Le nom d\'utilisateur est interdit.';
+$wb['username_must_not_exceed_32_chars_txt'] = 'Le nom d’utilisateur ne doit pas dépasser 32 caractères.';
+$wb['username_not_allowed_txt'] = 'Le nom d’utilisateur est interdit.';
 $wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
 $wb['directory_error_regex'] = 'Invalid directory';
 $wb['shell_error_regex'] = 'Invalid shell';
diff --git a/interface/web/sites/lib/lang/fr_shell_user_list.lng b/interface/web/sites/lib/lang/fr_shell_user_list.lng
index ccad82ef0c..90e12f4390 100644
--- a/interface/web/sites/lib/lang/fr_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/fr_shell_user_list.lng
@@ -3,6 +3,6 @@ $wb['list_head_txt'] = 'Utilisateur Shell';
 $wb['active_txt'] = 'Actif';
 $wb['server_id_txt'] = 'Serveur';
 $wb['parent_domain_id_txt'] = 'Site web';
-$wb['username_txt'] = 'Nom d\'utilisateur';
+$wb['username_txt'] = 'Nom d’utilisateur';
 $wb['add_new_record_txt'] = 'Nouvel utilisateur Shell';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_web_aliasdomain.lng b/interface/web/sites/lib/lang/fr_web_aliasdomain.lng
new file mode 100644
index 0000000000..59a69d4f23
--- /dev/null
+++ b/interface/web/sites/lib/lang/fr_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['backup_interval_txt'] = 'Intervalle de Backup';
+$wb['backup_copies_txt'] = 'Nombre de copies de Backup';
+$wb['ssl_state_txt'] = 'Etat';
+$wb['ssl_locality_txt'] = 'Localité';
+$wb['ssl_organisation_txt'] = 'Entreprise';
+$wb['ssl_organisation_unit_txt'] = 'Service dans l’entreprise';
+$wb['ssl_country_txt'] = 'Pays';
+$wb['ssl_key_txt'] = 'Clé SSL';
+$wb['ssl_request_txt'] = 'Requête SSL';
+$wb['ssl_cert_txt'] = 'Certificat SSL';
+$wb['ssl_bundle_txt'] = 'Bundle SSL';
+$wb['ssl_action_txt'] = 'Action SSL';
+$wb['ssl_domain_txt'] = 'Domaine SSL';
+$wb['server_id_txt'] = 'Serveur';
+$wb['web_folder_error_regex'] = 'Dossier invalide. Ne saisissez pas de ./ (slash).';
+$wb['type_txt'] = 'Type';
+$wb['parent_domain_id_txt'] = 'Site Web parent';
+$wb['redirect_type_txt'] = 'Type de redirection';
+$wb['redirect_path_txt'] = 'Chemin de redirection';
+$wb['active_txt'] = 'Actif';
+$wb['document_root_txt'] = 'Dossier racine';
+$wb['system_user_txt'] = 'Utilisateur Linux';
+$wb['system_group_txt'] = 'Groupe Linux';
+$wb['ip_address_txt'] = 'Adresse IPv4';
+$wb['ipv6_address_txt'] = 'Adresse IPv6';
+$wb['vhost_type_txt'] = 'Type de VHost';
+$wb['hd_quota_txt'] = 'Quota disque dur';
+$wb['traffic_quota_txt'] = 'Quota de trafic';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Documents d’erreur personnalisés';
+$wb['subdomain_txt'] = 'Sous-domaine auto';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'suEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$wb['limit_web_domain_txt'] = 'Le nombre maximum de domaines Web pour votre compte est atteint.';
+$wb['limit_web_aliasdomain_txt'] = 'Le nombre maximum d’alias de domaines pour votre compte est atteint.';
+$wb['limit_web_subdomain_txt'] = 'Le nombre maximum de sous-domaines pour votre compte est atteint.';
+$wb['apache_directives_txt'] = 'Directives Apache';
+$wb['domain_error_empty'] = 'Le domaine est vide.';
+$wb['domain_error_unique'] = 'Ce nom de domaine est déjà utilisé.';
+$wb['domain_error_regex'] = 'Nom de domaine invalide.';
+$wb['domain_error_autosub'] = 'Il existe déjà un sous-domaine avec cette configuration.';
+$wb['hd_quota_error_empty'] = 'Le quota de disque dur est à 0 ou vide.';
+$wb['traffic_quota_error_empty'] = 'Le quota de trafic est vide.';
+$wb['error_ssl_state_empty'] = 'Le statut SSL est vide.';
+$wb['error_ssl_locality_empty'] = 'La localité SSL est vide.';
+$wb['error_ssl_organisation_empty'] = 'L’entreprise SSL est vide.';
+$wb['error_ssl_organisation_unit_empty'] = 'Le service dans l’entreprise SSL est vide.';
+$wb['error_ssl_country_empty'] = 'Le pays SSL est vide.';
+$wb['error_ssl_cert_empty'] = 'Le champ certificat SSL est vide.';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Définir un mot de passe Webstatistics';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Quota disque dur maximal disponible';
+$wb['ssl_state_error_regex'] = 'Statut SSL invalide. Les caractères valides sont : a-z, 0-9 et .,-_';
+$wb['ssl_locality_error_regex'] = 'La localité SSL est invalide. Les caractères valides sont : a-z, 0-9 et .,-_';
+$wb['ssl_organisation_error_regex'] = 'L’entreprise SSL est invalide. Les caractères valides sont : a-z, 0-9 et .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Le service d’entreprise SSL est invalide. Les caractères valides sont : a-z, 0-9 et .,-_';
+$wb['ssl_country_error_regex'] = 'Pays SSL invalide. Les caractères valides sont : A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Quota de trafic maximal disponible';
+$wb['redirect_error_regex'] = 'Chemin de redirection invalide. Exemple de chemins de redirection valides : /test/ ou http://www.domaine.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Quota de trafic dépassé';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Nom d’utilisateur Webstatistics';
+$wb['stats_type_txt'] = 'Programme Webstatistics';
+$wb['custom_php_ini_txt'] = 'Configuration php.ini personnalisée';
+$wb['none_txt'] = 'Aucun';
+$wb['disabled_txt'] = 'Désactivé';
+$wb['no_redirect_txt'] = 'Pas de redirection';
+$wb['no_flag_txt'] = 'Pas de flag';
+$wb['save_certificate_txt'] = 'Sauvergarder le certificat';
+$wb['create_certificate_txt'] = 'Créer un certificat';
+$wb['delete_certificate_txt'] = 'Supprimer le certificat';
+$wb['nginx_directives_txt'] = 'Directives nginx';
+$wb['seo_redirect_txt'] = 'Redirection SEO';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Utiliser Socket pour PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI pour SSL n’est pas activé sur ce serveur. Vous ne pouvez activer qu’un seul certificat SSL par adresse IP.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Les valeurs de configuration de PHP-FPM pm  doivent être comme suit : pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'La valeur de PHP-FPM pm.max_children doit être un entier positif.';
+$wb['pm_start_servers_error_regex'] = 'La valeur de PHP-FPM pm.start_servers doit être un entier positif.';
+$wb['pm_min_spare_servers_error_regex'] = 'La valeur de PHP-FPM pm.min_spare_servers doit être un entier positif.';
+$wb['pm_max_spare_servers_error_regex'] = 'La valeur de PHP-FPM pm.max_spare_servers doit être un entier positif.';
+$wb['hd_quota_error_regex'] = 'Le quota de disque dur est invalide.';
+$wb['traffic_quota_error_regex'] = 'Le quota de trafic est invalide.';
+$wb['fastcgi_php_version_txt'] = 'Version de PHP';
+$wb['pm_txt'] = 'Manager de process PHP-FPM';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'La valeur de PHP-FPM pm.process_idle_timeout doit être un entier positif.';
+$wb['pm_max_requests_error_regex'] = 'La valeur de PHP-FPM pm.max_requests doit être un entier positif >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Vous devez avoir une version de PHP >= 5.3.9 pour pouvoir utiliser le manager process ondemand. Si vous choisissez ondemand avec une ancienne version de PHP, PHP ne pourra pas démarrer !';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Vérification du mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['available_php_directive_snippets_txt'] = 'Directives PHP Snippets disponibles :';
+$wb['available_apache_directive_snippets_txt'] = 'Directives Apache Snippets disponibles :';
+$wb['available_nginx_directive_snippets_txt'] = 'Directives nginx Snippets disponibles :';
+$wb['proxy_directives_txt'] = 'Directives Proxy';
+$wb['available_proxy_directive_snippets_txt'] = 'Directives Proxy Snippets disponibles :';
+$wb['Domain'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/fr_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/fr_web_aliasdomain_list.lng
new file mode 100644
index 0000000000..5837931f69
--- /dev/null
+++ b/interface/web/sites/lib/lang/fr_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Alias de domaine';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['parent_domain_id_txt'] = 'Site web';
+$wb['domain_txt'] = 'Alias de domaine';
+$wb['add_new_record_txt'] = 'Nouvel alias de domaine';
+$wb['domain_error_empty'] = 'Le nom de domaine est vide.';
+$wb['domain_error_unique'] = 'Le nom de domaine doit être unique.';
+$wb['domain_error_regex'] = 'Le nom de domaine est invalide.';
+$wb['no_redirect_txt'] = 'Aucune redirection';
+$wb['no_flag_txt'] = 'Aucun flag';
+$wb['none_txt'] = 'Aucun';
+?>
diff --git a/interface/web/sites/lib/lang/fr_web_backup_list.lng b/interface/web/sites/lib/lang/fr_web_backup_list.lng
index fa4a59b403..97b04a0c05 100644
--- a/interface/web/sites/lib/lang/fr_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/fr_web_backup_list.lng
@@ -10,10 +10,12 @@ $wb['restore_info_txt'] = 'Restore of the backup has been started. This action t
 $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['filesize_txt'] = 'Filesize';
 $wb['delete_backup_txt'] = 'Delete Backup';
 $wb['delete_info_txt'] = 'Delete of the backup has been started. This action takes several minutes to be completed.';
 $wb['delete_confirm_txt'] = 'Really delete this backup?';
 $wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
-$wb['backup_type_mysql'] = 'MySQL Database';
-$wb['backup_type_web'] = 'Website files';
+$wb['backup_type_mongodb'] = 'MongoDB Database';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_web_childdomain.lng b/interface/web/sites/lib/lang/fr_web_childdomain.lng
index c7878b31a7..e8ae052924 100644
--- a/interface/web/sites/lib/lang/fr_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/fr_web_childdomain.lng
@@ -42,7 +42,7 @@ $wb['no_flag_txt'] = 'Aucun flag';
 $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.';
 $wb['backup_interval_txt'] = 'Backup interval';
 $wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['ssl_key_txt'] = 'SSL Key';
@@ -115,5 +115,4 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
-
-?>
\ No newline at end of file
+?>
diff --git a/interface/web/sites/lib/lang/fr_web_childdomain_list.lng b/interface/web/sites/lib/lang/fr_web_childdomain_list.lng
index 4f8768bac0..38c57df30d 100644
--- a/interface/web/sites/lib/lang/fr_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/fr_web_childdomain_list.lng
@@ -4,12 +4,12 @@ $wb['active_txt'] = 'Actif';
 $wb['server_id_txt'] = 'Serveur';
 $wb['parent_domain_id_txt'] = 'Site web';
 $wb['domain_txt'] = 'Sous-domaine';
-$wb['add_new_record_txt'] = 'Nouveau sous-domaine';
 $wb['domain_error_empty'] = 'Le nom de domaine est vide.';
 $wb['domain_error_unique'] = 'Le nom de domaine doit être unique.';
 $wb['domain_error_regex'] = 'Le nom de domaine est invalide.';
 $wb['no_redirect_txt'] = 'Aucune redirection';
 $wb['no_flag_txt'] = 'Aucun flag';
 $wb['none_txt'] = 'Aucun';
-
+$wb['add_new_subdomain_txt'] = 'Add new Subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_web_directive_snippets.lng b/interface/web/sites/lib/lang/fr_web_directive_snippets.lng
new file mode 100644
index 0000000000..d2590e53cf
--- /dev/null
+++ b/interface/web/sites/lib/lang/fr_web_directive_snippets.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['directive_snippets_id_txt'] = 'Desired configuration';
+?>
diff --git a/interface/web/sites/lib/lang/fr_web_domain.lng b/interface/web/sites/lib/lang/fr_web_domain.lng
new file mode 100644
index 0000000000..a68c595cef
--- /dev/null
+++ b/interface/web/sites/lib/lang/fr_web_domain.lng
@@ -0,0 +1,132 @@
+<?php
+$wb['ssl_state_txt'] = 'Pays';
+$wb['ssl_locality_txt'] = 'Localité';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Unité d’organisation';
+$wb['ssl_country_txt'] = 'Pays';
+$wb['ssl_request_txt'] = 'Requête SSL';
+$wb['ssl_cert_txt'] = 'Certificat SSL';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'Action SSL';
+$wb['server_id_txt'] = 'Serveur';
+$wb['domain_txt'] = 'Domaine';
+$wb['type_txt'] = 'Type';
+$wb['parent_domain_id_txt'] = 'Site web parent';
+$wb['redirect_type_txt'] = 'Type de redirection';
+$wb['redirect_path_txt'] = 'Chemin de redirection';
+$wb['active_txt'] = 'Actif';
+$wb['document_root_txt'] = 'Racine du document';
+$wb['system_user_txt'] = 'Utilisateur Linux';
+$wb['system_group_txt'] = 'Groupe Linux';
+$wb['ip_address_txt'] = 'Adresse IP';
+$wb['vhost_type_txt'] = 'Type de VHost';
+$wb['hd_quota_txt'] = 'Quota disque';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Pages derreurs personnalisées';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'suEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$wb['limit_web_domain_txt'] = 'Le nombre maximum de noms de domaine pour votre compte a été atteint.';
+$wb['limit_web_aliasdomain_txt'] = 'Le nombre maximum d’alias de domaine pour votre compte a été atteint.';
+$wb['limit_web_subdomain_txt'] = 'Le nombre maximum de sous-domaines pour votre compte a été atteint.';
+$wb['apache_directives_txt'] = 'Directives Apache';
+$wb['domain_error_empty'] = 'Le nom de domaine est vide.';
+$wb['domain_error_unique'] = 'Le nom de domaine doit être unique.';
+$wb['domain_error_regex'] = 'Le nom de domaine est invalide.';
+$wb['hd_quota_error_empty'] = 'Le quota disque est vide.';
+$wb['error_ssl_state_empty'] = 'L’état du SSL est vide.';
+$wb['error_ssl_locality_empty'] = 'La localité du SSL est vide.';
+$wb['error_ssl_organisation_empty'] = 'L’organisation du SSL est vide.';
+$wb['error_ssl_organisation_unit_empty'] = 'L’unité d’organisation du SSL est vide.';
+$wb['error_ssl_country_empty'] = 'Le pays du SSL est vide.';
+$wb['subdomain_txt'] = 'Auto sous-domaine';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Mot de passe statistiques web';
+$wb['backup_interval_txt'] = 'Intervalle de sauvegarde';
+$wb['backup_copies_txt'] = 'Nombre de copies de sauvegarde';
+$wb['ssl_domain_txt'] = 'Domaine SSL';
+$wb['traffic_quota_txt'] = 'Quota de trafic';
+$wb['traffic_quota_error_empty'] = 'Le quota de trafic est vide.';
+$wb['error_ssl_cert_empty'] = 'Le champ certificat SSL est vide';
+$wb['allow_override_txt'] = 'AllowOverride Apache';
+$wb['limit_web_quota_free_txt'] = 'Quota max espace disque disponible';
+$wb['ssl_state_error_regex'] = 'Etat SSL invalide. Les caractères valides sont: a-z, 0-9 et .,-_';
+$wb['ssl_locality_error_regex'] = 'Localité SSL invalide. Les caractères valides sont: a-z, 0-9 et .,-_';
+$wb['ssl_organisation_error_regex'] = 'Organisation SSL invalide. Les caractères valides sont: a-z, 0-9 et .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Unité dorganisation SSL invalide. Les caractères valides sont: a-z, 0-9 et .,-_';
+$wb['ssl_country_error_regex'] = 'Pays SSL invalide. Les caractères valides sont: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Quota de trafic max disponible';
+$wb['redirect_error_regex'] = 'Chemin de redirection invalide. Exemple de redirections valides: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'open_basedir PHP';
+$wb['traffic_quota_exceeded_txt'] = 'Quota de trafic dépassé';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Nom d’utilisateur statistiques web';
+$wb['stats_type_txt'] = 'Programme de  statistiques web';
+$wb['custom_php_ini_txt'] = 'Paramètres php.ini personnalisés';
+$wb['ipv6_address_txt'] = 'Adresse IPv6';
+$wb['none_txt'] = 'Aucun';
+$wb['disabled_txt'] = 'Désactivé';
+$wb['no_redirect_txt'] = 'Aucune redirection';
+$wb['no_flag_txt'] = 'Aucun flag';
+$wb['save_certificate_txt'] = 'Enregister le certificat';
+$wb['create_certificate_txt'] = 'Créer le certificat';
+$wb['delete_certificate_txt'] = 'Supprimer le certificat';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'Redirection SEO';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Utiliser Socket pour PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI pour SSL n’est pas activé sur ce serveur. Vous ne pouvez activer qu’un seul certificat SSL par adresse IP.';
+$wb['python_txt'] = 'Python';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Les valeurs de configuration de PHP-FPM pm doivent être comme suit : pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'La valeur PHP-FPM pm.max_children doit être un entier positif.';
+$wb['pm_start_servers_error_regex'] = 'La valeur de PHP-FPM pm.start_servers doit être un entier positif.';
+$wb['pm_min_spare_servers_error_regex'] = 'La valeur de PHP-FPM pm.min_spare_servers doit être un entier positif.';
+$wb['pm_max_spare_servers_error_regex'] = 'La valeur de PHP-FPM pm.max_spare_servers doit être un entier positif.';
+$wb['hd_quota_error_regex'] = 'Le quota de disque dur est invalide.';
+$wb['traffic_quota_error_regex'] = 'Le quota de trafic est invalide.';
+$wb['ssl_key_txt'] = 'Clé SSL';
+$wb['perl_txt'] = 'Perl';
+$wb['fastcgi_php_version_txt'] = 'Version de PHP';
+$wb['pm_txt'] = 'Manager de process PHP-FPM';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'La valeur de PHP-FPM pm.process_idle_timeout doit être un entier positif.';
+$wb['pm_max_requests_error_regex'] = 'La valeur de PHP-FPM pm.max_requests doit être un entier positif >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Votre version de PHP doit être >= 5.3.9 pour utiliser le manager de process ondemand. Si vous choisissez ondemand avec une version de PHP plus ancienne, PHP ne pourra plus démarrer !';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Vérification du mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+$wb['web_folder_error_regex'] = 'Le dossier saisi est invalide. Ne saisissez pas de ./ (slash).';
+$wb['domain_error_autosub'] = 'Un sous-domaine avec cette configuration existe déjà.';
+$wb['available_php_directive_snippets_txt'] = 'Directives PHP Snippets disponibles :';
+$wb['available_apache_directive_snippets_txt'] = 'Directives Apache Snippets disponibles :';
+$wb['available_nginx_directive_snippets_txt'] = 'Directives nginx Snippets disponibles :';
+$wb['proxy_directives_txt'] = 'Directives Proxy';
+$wb['available_proxy_directive_snippets_txt'] = 'Directives Proxy Snippets disponibles :';
+$wb['no_server_error'] = 'Aucun serveur sélectionné.';
+$wb['no_backup_txt'] = 'Pas de Backup';
+$wb['daily_backup_txt'] = 'Quotidien';
+$wb['weekly_backup_txt'] = 'Hebdomadaire';
+$wb['monthly_backup_txt'] = 'Mensuel';
+$wb['rewrite_rules_txt'] = 'Règles de réécriture';
+$wb['invalid_rewrite_rules_txt'] = 'Règles de réécriture incorrectes';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Directives autorisées :';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Variables';
+$wb['added_by_txt'] = 'Added by';
+$wb['added_date_txt'] = 'Added date';
+$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_system_user_or_group_txt'] = 'Invalid system user or group';
+$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
+?>
diff --git a/interface/web/sites/lib/lang/fr_web_domain_admin_list.lng b/interface/web/sites/lib/lang/fr_web_domain_admin_list.lng
new file mode 100644
index 0000000000..22f7a012a8
--- /dev/null
+++ b/interface/web/sites/lib/lang/fr_web_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['sys_groupid_txt'] = 'Client';
+$wb['list_head_txt'] = 'Sites web';
+$wb['domain_id_txt'] = 'Id';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['domain_txt'] = 'Domaine';
+$wb['add_new_record_txt'] = 'Ajouter un nouveau site';
+?>
diff --git a/interface/web/sites/lib/lang/fr_web_domain_list.lng b/interface/web/sites/lib/lang/fr_web_domain_list.lng
new file mode 100644
index 0000000000..752ecccc00
--- /dev/null
+++ b/interface/web/sites/lib/lang/fr_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Sites web';
+$wb['domain_id_txt'] = 'Id';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['domain_txt'] = 'Domaine';
+$wb['add_new_record_txt'] = 'Nouveau site web';
+?>
diff --git a/interface/web/sites/lib/lang/fr_web_folder_user.lng b/interface/web/sites/lib/lang/fr_web_folder_user.lng
index 560d07ef2b..145628d589 100644
--- a/interface/web/sites/lib/lang/fr_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/fr_web_folder_user.lng
@@ -1,6 +1,6 @@
 <?php
 $wb['web_folder_id_txt'] = 'Dossier';
-$wb['username_txt'] = 'Nom de \'utilisateur';
+$wb['username_txt'] = 'Nom de ’utilisateur';
 $wb['password_txt'] = 'Mot de passe';
 $wb['active_txt'] = 'Actif';
 $wb['folder_error_empty'] = 'Aucun dossier web sélectionné.';
@@ -9,6 +9,6 @@ $wb['generate_password_txt'] = 'Générer un mot de passe';
 $wb['repeat_password_txt'] = 'Vérification du mot de passe';
 $wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
 $wb['password_match_txt'] = 'Les mots de passe correspondent.';
-$wb['no_folder_perm'] = 'Vous n\'avez pas les permissions pour ce dossier.';
+$wb['no_folder_perm'] = 'Vous n’avez pas les permissions pour ce dossier.';
 $wb['error_user_exists_already_txt'] = 'There is already a record for this user.';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_web_folder_user_list.lng b/interface/web/sites/lib/lang/fr_web_folder_user_list.lng
index 663c6d2a7b..974a7a2af2 100644
--- a/interface/web/sites/lib/lang/fr_web_folder_user_list.lng
+++ b/interface/web/sites/lib/lang/fr_web_folder_user_list.lng
@@ -2,6 +2,6 @@
 $wb['list_head_txt'] = 'Utilisateur du dossier';
 $wb['active_txt'] = 'Actif';
 $wb['web_folder_id_txt'] = 'Dossier';
-$wb['username_txt'] = 'Nom de l\'utilisateur';
+$wb['username_txt'] = 'Nom de l’utilisateur';
 $wb['add_new_record_txt'] = 'Add new Folder User';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_web_sites_stats_list.lng b/interface/web/sites/lib/lang/fr_web_sites_stats_list.lng
index 553fa01e51..09d5e16570 100644
--- a/interface/web/sites/lib/lang/fr_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/fr_web_sites_stats_list.lng
@@ -3,7 +3,7 @@ $wb['list_head_txt'] = 'Trafic Web';
 $wb['domain_txt'] = 'Domaine';
 $wb['this_month_txt'] = 'Le mois en cours';
 $wb['last_month_txt'] = 'Le mois précédent';
-$wb['this_year_txt'] = 'L\'année en cours';
-$wb['last_year_txt'] = 'L\'année précédente';
+$wb['this_year_txt'] = 'L’année en cours';
+$wb['last_year_txt'] = 'L’année précédente';
 $wb['sum_txt'] = 'Sum';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_web_subdomain.lng b/interface/web/sites/lib/lang/fr_web_subdomain.lng
new file mode 100644
index 0000000000..3f76d35f87
--- /dev/null
+++ b/interface/web/sites/lib/lang/fr_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['ssl_state_txt'] = 'Pays';
+$wb['ssl_locality_txt'] = 'Lieu';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Unité dorganisation';
+$wb['ssl_country_txt'] = 'Pays';
+$wb['ssl_request_txt'] = 'Requête SSL';
+$wb['ssl_cert_txt'] = 'Certificat SSL';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'Action SSL';
+$wb['server_id_txt'] = 'Serveur';
+$wb['domain_txt'] = 'Domaine';
+$wb['type_txt'] = 'Type';
+$wb['parent_domain_id_txt'] = 'Site web parent';
+$wb['redirect_type_txt'] = 'Type de redirection';
+$wb['redirect_path_txt'] = 'Chemin de redirection';
+$wb['active_txt'] = 'Actif';
+$wb['document_root_txt'] = 'Racine du document';
+$wb['system_user_txt'] = 'Utilisateur Linux';
+$wb['system_group_txt'] = 'Groupe Linux';
+$wb['ip_address_txt'] = 'Adresse IP';
+$wb['vhost_type_txt'] = 'Type de VHost';
+$wb['hd_quota_txt'] = 'Quota disque';
+$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['limit_web_domain_txt'] = 'Le nombre maximum de noms de domaine pour votre compte a été atteint.';
+$wb['limit_web_aliasdomain_txt'] = 'Le nombre maximum d’alias de domaine pour votre compte a été atteint.';
+$wb['limit_web_subdomain_txt'] = 'Le nombre maximum de sous-domaines pour votre compte a été atteint.';
+$wb['apache_directives_txt'] = 'Directives Apache';
+$wb['domain_error_empty'] = 'Le nom de domaine est vide.';
+$wb['domain_error_unique'] = 'Le nom de domaine doit être unique.';
+$wb['domain_error_regex'] = 'Le nom de domaine est invalide.';
+$wb['host_txt'] = 'Hôte';
+$wb['traffic_quota_txt'] = 'Quota de trafic';
+$wb['redirect_error_regex'] = 'Chemin de redirection invalide. Exemples de redirections valides: /test/ ou http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'Aucune redirecton';
+$wb['no_flag_txt'] = 'Aucun flag';
+$wb['domain_error_wildcard'] = 'Les sous-domaines joker ne sont pas autorisés.';
+$wb['proxy_directives_txt'] = 'Directives pour les Proxy';
+$wb['available_proxy_directive_snippets_txt'] = 'Directives pour les Proxy Snippets disponibles :';
+$wb['error_proxy_requires_url'] = 'Les redirections de type \\"proxy\\" nécessitent une URL comme chemin de redirection.';
+?>
diff --git a/interface/web/sites/lib/lang/fr_web_subdomain_list.lng b/interface/web/sites/lib/lang/fr_web_subdomain_list.lng
new file mode 100644
index 0000000000..9bfbd30f2e
--- /dev/null
+++ b/interface/web/sites/lib/lang/fr_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Sous-domaines';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['parent_domain_id_txt'] = 'Site web';
+$wb['domain_txt'] = 'Sous-domaine';
+$wb['add_new_record_txt'] = 'Nouveau sous-domaine';
+?>
diff --git a/interface/web/sites/lib/lang/fr_web_vhost_domain.lng b/interface/web/sites/lib/lang/fr_web_vhost_domain.lng
index bb472b01d0..8cd1e9c6da 100644
--- a/interface/web/sites/lib/lang/fr_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/fr_web_vhost_domain.lng
@@ -15,7 +15,7 @@ $wb['parent_domain_id_txt'] = 'Site web parent';
 $wb['redirect_type_txt'] = 'Type de redirection';
 $wb['redirect_path_txt'] = 'Chemin de redirection';
 $wb['active_txt'] = 'Actif';
-$wb['document_root_txt'] = 'Racine du document';
+$wb['document_root_txt'] = 'Document Root';
 $wb['system_user_txt'] = 'Utilisateur Linux';
 $wb['system_group_txt'] = 'Groupe Linux';
 $wb['ip_address_txt'] = 'Adresse IP';
@@ -127,15 +127,19 @@ $wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a diff
 $wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
 $wb['host_txt'] = 'Hostname';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-
 $wb['variables_txt'] = 'Variables';
 $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $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_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
-$wb["document_root_txt"] = "Document Root";
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['load_client_data_txt'] = 'Load client details';
+$wb['load_my_data_txt'] = 'Load my contact details';
+$wb['reset_client_data_txt'] = 'Reset data';
+$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
diff --git a/interface/web/sites/lib/lang/fr_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/fr_web_vhost_domain_list.lng
index ba3584b27b..2d8ba32a11 100644
--- a/interface/web/sites/lib/lang/fr_web_vhost_domain_list.lng
+++ b/interface/web/sites/lib/lang/fr_web_vhost_domain_list.lng
@@ -6,5 +6,4 @@ $wb['server_id_txt'] = 'Serveur';
 $wb['domain_txt'] = 'Domaine';
 $wb['add_new_record_txt'] = 'Nouveau site web';
 $wb['parent_domain_id_txt'] = 'Website';
-
 ?>
diff --git a/interface/web/sites/lib/lang/fr_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/fr_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..f9e0d50f77
--- /dev/null
+++ b/interface/web/sites/lib/lang/fr_web_vhost_subdomain.lng
@@ -0,0 +1,127 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'suEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
+$wb['repeat_password_txt'] = 'Repeat Password';
+$wb['password_mismatch_txt'] = 'The passwords do not match.';
+$wb['password_match_txt'] = 'The passwords do match.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Variables';
+$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['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+?>
diff --git a/interface/web/sites/lib/lang/fr_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/fr_web_vhost_subdomain_list.lng
new file mode 100644
index 0000000000..0a0c7c2d1e
--- /dev/null
+++ b/interface/web/sites/lib/lang/fr_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Sous-domaines';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Serveur';
+$wb['parent_domain_id_txt'] = 'Site Web';
+$wb['domain_txt'] = 'Sous-domaine';
+$wb['add_new_record_txt'] = 'Ajouter un sous-domaine';
+?>
diff --git a/interface/web/sites/lib/lang/fr_webdav_user.lng b/interface/web/sites/lib/lang/fr_webdav_user.lng
index e8bf197bd3..3a20d36c31 100644
--- a/interface/web/sites/lib/lang/fr_webdav_user.lng
+++ b/interface/web/sites/lib/lang/fr_webdav_user.lng
@@ -2,14 +2,14 @@
 $wb['dir_txt'] = 'Dossier';
 $wb['server_id_txt'] = 'Serveur';
 $wb['parent_domain_id_txt'] = 'Site web';
-$wb['username_txt'] = 'Nom d\'utilisateur';
+$wb['username_txt'] = 'Nom d’utilisateur';
 $wb['password_txt'] = 'Mot de passe';
 $wb['password_strength_txt'] = 'Force du mot de passe';
 $wb['active_txt'] = 'Actif';
-$wb['limit_webdav_user_txt'] = 'Le nombre maximal d\'utilisateurs WebDAV pour votre compte est atteint.';
-$wb['username_error_empty'] = 'Le nom d\'utilisateur est vide';
-$wb['username_error_unique'] = 'Le nom d\'utilisateur doit être unique';
-$wb['username_error_regex'] = 'Le nom d\'utilisateur contient des caractères non autorisés.';
+$wb['limit_webdav_user_txt'] = 'Le nombre maximal d’utilisateurs WebDAV pour votre compte est atteint.';
+$wb['username_error_empty'] = 'Le nom d’utilisateur est vide';
+$wb['username_error_unique'] = 'Le nom d’utilisateur doit être unique';
+$wb['username_error_regex'] = 'Le nom d’utilisateur contient des caractères non autorisés.';
 $wb['directory_error_empty'] = 'Dossier vide.';
 $wb['parent_domain_id_error_empty'] = 'Aucun site web sélectionné.';
 $wb['dir_dot_error'] = 'Les .. ne sont pas autorisés.';
diff --git a/interface/web/sites/lib/lang/fr_webdav_user_list.lng b/interface/web/sites/lib/lang/fr_webdav_user_list.lng
index 1a2bebebeb..438416aaf2 100644
--- a/interface/web/sites/lib/lang/fr_webdav_user_list.lng
+++ b/interface/web/sites/lib/lang/fr_webdav_user_list.lng
@@ -3,6 +3,6 @@ $wb['list_head_txt'] = 'Utilisateur WebDAV';
 $wb['active_txt'] = 'Actif';
 $wb['server_id_txt'] = 'Serveur';
 $wb['parent_domain_id_txt'] = 'Site web';
-$wb['username_txt'] = 'Nom d\'utilisateur';
+$wb['username_txt'] = 'Nom d’utilisateur';
 $wb['add_new_record_txt'] = 'Ajouter un utilisateur WebDAV';
 ?>
diff --git a/interface/web/sites/lib/lang/hr.lng b/interface/web/sites/lib/lang/hr.lng
index 4105a59f01..b6af1225ac 100644
--- a/interface/web/sites/lib/lang/hr.lng
+++ b/interface/web/sites/lib/lang/hr.lng
@@ -21,7 +21,6 @@ $wb['Shell'] = 'Shell';
 $wb['Webdav'] = 'WebDAV';
 $wb['FTP'] = 'FTP';
 $wb['Options'] = 'Opcije';
-$wb['Domena'] = 'Domena';
 $wb['Redirect'] = 'Preusmjeravanje';
 $wb['SSL'] = 'SSL';
 $wb['Sites'] = 'Stranice';
@@ -32,6 +31,5 @@ $wb['Installed packages'] = 'Instalirani paketi';
 $wb['Update Packagelist'] = 'Osvježi listu paketa';
 $wb['Subdomain (Vhost)'] = 'Poddomena (Vhost)';
 $wb['error_proxy_requires_url'] = '\\"proxy\\" redirekcija zahtijeva URL za redirekcijsku putanju.';
+$wb['Domain'] = 'Domain';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_aps.lng b/interface/web/sites/lib/lang/hr_aps.lng
index 799e3370f8..8b2fa6450e 100644
--- a/interface/web/sites/lib/lang/hr_aps.lng
+++ b/interface/web/sites/lib/lang/hr_aps.lng
@@ -56,5 +56,3 @@ $wb['btn_install_txt'] = 'Instaliraj';
 $wb['btn_cancel_txt'] = 'Odustani';
 $wb['limit_aps_txt'] = 'Iskoristili ste maksimalan broj APS instanci za vaš račun.';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_aps_instances_list.lng b/interface/web/sites/lib/lang/hr_aps_instances_list.lng
index 5215f3596c..7d19787ed7 100644
--- a/interface/web/sites/lib/lang/hr_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/hr_aps_instances_list.lng
@@ -9,5 +9,3 @@ $wb['pkg_delete_confirmation'] = 'Da li stvarno želite obrisati ovu instalaciju
 $wb['filter_txt'] = 'Traži';
 $wb['delete_txt'] = 'Obriši';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_aps_packages_list.lng b/interface/web/sites/lib/lang/hr_aps_packages_list.lng
index 7e7b6b30df..68c378085f 100644
--- a/interface/web/sites/lib/lang/hr_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/hr_aps_packages_list.lng
@@ -6,5 +6,3 @@ $wb['category_txt'] = 'Category';
 $wb['status_txt'] = 'Unlocked';
 $wb['filter_txt'] = 'Search';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_aps_update_packagelist.lng b/interface/web/sites/lib/lang/hr_aps_update_packagelist.lng
index 591c49ccf7..cb12fbd60e 100644
--- a/interface/web/sites/lib/lang/hr_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/hr_aps_update_packagelist.lng
@@ -5,5 +5,3 @@ $wb['btn_start_txt'] = 'Osvježi listu paketa';
 $wb['btn_cancel_txt'] = 'Odustani';
 $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/hr_backup_stats_list.lng b/interface/web/sites/lib/lang/hr_backup_stats_list.lng
index 0f3803f56a..65792aa591 100644
--- a/interface/web/sites/lib/lang/hr_backup_stats_list.lng
+++ b/interface/web/sites/lib/lang/hr_backup_stats_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb["database_name_txt"]   = '';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Domain';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['database_name_txt'] = '';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/sites/lib/lang/hr_cron.lng b/interface/web/sites/lib/lang/hr_cron.lng
index 2bc8fb7d3f..d52de9a83f 100644
--- a/interface/web/sites/lib/lang/hr_cron.lng
+++ b/interface/web/sites/lib/lang/hr_cron.lng
@@ -21,6 +21,6 @@ $wb['unknown_fieldtype_error'] = 'Koristi se nepoznata vrsta polja.';
 $wb['server_id_error_empty'] = 'ID servera je preazan.';
 $wb['limit_cron_url_txt'] = 'Samo za URL cron. Unesite URL koji počinje sa http:// kao cron naredba.';
 $wb['command_error_empty'] = 'Naredba je prazna.';
+$wb['command_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
+$wb['log_output_txt'] = 'Log output';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_cron_list.lng b/interface/web/sites/lib/lang/hr_cron_list.lng
index bf448ec0df..c0107df637 100644
--- a/interface/web/sites/lib/lang/hr_cron_list.lng
+++ b/interface/web/sites/lib/lang/hr_cron_list.lng
@@ -11,5 +11,3 @@ $wb['command_txt'] = 'Komanda';
 $wb['add_new_cron_txt'] = 'Dodaj novi cron zadatak';
 $wb['parent_domain_id_txt'] = 'Web stranica';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_database.lng b/interface/web/sites/lib/lang/hr_database.lng
index 06e0d919d6..1afaa78e87 100644
--- a/interface/web/sites/lib/lang/hr_database.lng
+++ b/interface/web/sites/lib/lang/hr_database.lng
@@ -43,6 +43,7 @@ $wb['select_dbuser_txt'] = 'Select database user';
 $wb['no_dbuser_txt'] = 'None';
 $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['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_database_admin_list.lng b/interface/web/sites/lib/lang/hr_database_admin_list.lng
index e0bbab5d33..4c8d4659d0 100644
--- a/interface/web/sites/lib/lang/hr_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/hr_database_admin_list.lng
@@ -8,6 +8,5 @@ $wb['database_name_txt'] = 'Naziv baze';
 $wb['add_new_record_txt'] = 'Dodaj bazu';
 $wb['sys_groupid_txt'] = 'Klijent';
 $wb['parent_domain_id_txt'] = 'Web stranica';
+$wb['type_txt'] = 'Type';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_database_list.lng b/interface/web/sites/lib/lang/hr_database_list.lng
index b98d44c28d..aee0f0f017 100644
--- a/interface/web/sites/lib/lang/hr_database_list.lng
+++ b/interface/web/sites/lib/lang/hr_database_list.lng
@@ -7,6 +7,5 @@ $wb['database_user_txt'] = 'Korisnik baze';
 $wb['database_name_txt'] = 'Naziv baze';
 $wb['add_new_record_txt'] = 'Dodaj bazu';
 $wb['parent_domain_id_txt'] = 'Web stranica';
+$wb['type_txt'] = 'Type';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_database_quota_stats_list.lng b/interface/web/sites/lib/lang/hr_database_quota_stats_list.lng
index e1de70accf..4f92576007 100644
--- a/interface/web/sites/lib/lang/hr_database_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/hr_database_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["database_txt"] = 'Database';
-$wb["server_name_txt"] = 'Server';
-$wb["client_txt"] = 'Client';
-$wb["used_txt"] = 'Used space';
-$wb["quota_txt"] = 'Quota';
-$wb["percentage_txt"] = 'Used in %';
+$wb['database_txt'] = 'Database';
+$wb['server_name_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb['used_txt'] = 'Used space';
+$wb['quota_txt'] = 'Quota';
+$wb['percentage_txt'] = 'Used in %';
 ?>
diff --git a/interface/web/sites/lib/lang/hr_database_user.lng b/interface/web/sites/lib/lang/hr_database_user.lng
index 5499c13a24..c4d033956b 100644
--- a/interface/web/sites/lib/lang/hr_database_user.lng
+++ b/interface/web/sites/lib/lang/hr_database_user.lng
@@ -21,5 +21,3 @@ $wb['globalsearch_noresults_limit_txt'] = '0 rezultata';
 $wb['globalsearch_searchfield_watermark_txt'] = 'Traži';
 $wb['globalsearch_suggestions_text_txt'] = 'Sugestija';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_database_user_admin_list.lng b/interface/web/sites/lib/lang/hr_database_user_admin_list.lng
index d9c9b72e79..0b2c66d19f 100644
--- a/interface/web/sites/lib/lang/hr_database_user_admin_list.lng
+++ b/interface/web/sites/lib/lang/hr_database_user_admin_list.lng
@@ -4,5 +4,3 @@ $wb['database_user_txt'] = 'Korisnik';
 $wb['add_new_record_txt'] = 'Dodaj';
 $wb['sys_groupid_txt'] = 'Klijent';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_database_user_list.lng b/interface/web/sites/lib/lang/hr_database_user_list.lng
index 04af3c5878..9bae17088d 100644
--- a/interface/web/sites/lib/lang/hr_database_user_list.lng
+++ b/interface/web/sites/lib/lang/hr_database_user_list.lng
@@ -3,5 +3,3 @@ $wb['list_head_txt'] = 'Korisnik baze';
 $wb['database_user_txt'] = 'Korisnik baze';
 $wb['add_new_record_txt'] = 'Dodaj novog korisnika';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_ftp_sites_stats_list.lng b/interface/web/sites/lib/lang/hr_ftp_sites_stats_list.lng
new file mode 100644
index 0000000000..e44025a715
--- /dev/null
+++ b/interface/web/sites/lib/lang/hr_ftp_sites_stats_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'FTP 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 (Download + Upload)';
+$wb['in_out_txt'] = 'DL/UL';
+?>
diff --git a/interface/web/sites/lib/lang/hr_ftp_user.lng b/interface/web/sites/lib/lang/hr_ftp_user.lng
index dcd910e37b..194e6196e7 100644
--- a/interface/web/sites/lib/lang/hr_ftp_user.lng
+++ b/interface/web/sites/lib/lang/hr_ftp_user.lng
@@ -31,8 +31,5 @@ $wb['generate_password_txt'] = 'Generiraj šifru';
 $wb['repeat_password_txt'] = 'Ponovi šifru';
 $wb['password_mismatch_txt'] = 'Šifre nisu identične.';
 $wb['password_match_txt'] = 'Šifre su identične.';
-$wb['invalid_system_user_or_group_txt'] = 'Nepostojeći sistemski korisnik ili grupa';
-$wb['directory_error_regex'] = 'Neispravan direktorij';
+$wb['expires_txt'] = 'Expire at';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_ftp_user_list.lng b/interface/web/sites/lib/lang/hr_ftp_user_list.lng
index 6cd88ad63d..9ed8e645a4 100644
--- a/interface/web/sites/lib/lang/hr_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/hr_ftp_user_list.lng
@@ -6,5 +6,3 @@ $wb['parent_domain_id_txt'] = 'Web stranica';
 $wb['username_txt'] = 'Korisničko ime';
 $wb['add_new_record_txt'] = 'Dodaj FTP račun';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_shell_user.lng b/interface/web/sites/lib/lang/hr_shell_user.lng
index e40c224c75..611c9eb318 100644
--- a/interface/web/sites/lib/lang/hr_shell_user.lng
+++ b/interface/web/sites/lib/lang/hr_shell_user.lng
@@ -34,5 +34,3 @@ $wb['shell_error_regex'] = 'Neispravan shell';
 $wb['invalid_username_txt'] = 'Neispravno korisničko ime';
 $wb['directory_error_notinweb'] = 'Direktorij treba biti unutar web početne putanje (root).';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_shell_user_list.lng b/interface/web/sites/lib/lang/hr_shell_user_list.lng
index 0116b4ee54..825a87f1b7 100644
--- a/interface/web/sites/lib/lang/hr_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/hr_shell_user_list.lng
@@ -6,5 +6,3 @@ $wb['parent_domain_id_txt'] = 'Web stranica';
 $wb['username_txt'] = 'Korisničko ime';
 $wb['add_new_record_txt'] = 'Dodaj novog Shell korisnika';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_user_quota_stats_list.lng b/interface/web/sites/lib/lang/hr_user_quota_stats_list.lng
index 2da19bbfcd..2007b63889 100644
--- a/interface/web/sites/lib/lang/hr_user_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/hr_user_quota_stats_list.lng
@@ -7,5 +7,3 @@ $wb['hard_txt'] = 'Hard limit';
 $wb['soft_txt'] = 'Soft limit';
 $wb['files_txt'] = 'Broj datoteka';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_web_aliasdomain.lng b/interface/web/sites/lib/lang/hr_web_aliasdomain.lng
new file mode 100644
index 0000000000..67eb8363f5
--- /dev/null
+++ b/interface/web/sites/lib/lang/hr_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Alias domena';
+$wb['backup_interval_txt'] = 'Interval pohrana';
+$wb['backup_copies_txt'] = 'Broj kopija pohrana';
+$wb['ssl_state_txt'] = 'Županija';
+$wb['ssl_locality_txt'] = 'Lokacija';
+$wb['ssl_organisation_txt'] = 'Organizacija';
+$wb['ssl_organisation_unit_txt'] = 'Organizacijska jedinica';
+$wb['ssl_country_txt'] = 'Država';
+$wb['ssl_key_txt'] = 'SSL ključ';
+$wb['ssl_request_txt'] = 'SSL zahtjev';
+$wb['ssl_cert_txt'] = 'SSL certifikat';
+$wb['ssl_bundle_txt'] = 'SSL paket';
+$wb['ssl_action_txt'] = 'SSL akcija';
+$wb['ssl_domain_txt'] = 'SSL domena';
+$wb['server_id_txt'] = 'Server';
+$wb['web_folder_error_regex'] = 'Neispravan direktorij. Nemojte koristiti slash.';
+$wb['type_txt'] = 'Vrsta';
+$wb['parent_domain_id_txt'] = 'Glavna web stranica';
+$wb['redirect_type_txt'] = 'Vrsta redirekcije';
+$wb['redirect_path_txt'] = 'Putanja redirekcije';
+$wb['active_txt'] = 'Aktivno';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux korisnik';
+$wb['system_group_txt'] = 'Linux grupa';
+$wb['ip_address_txt'] = 'IPv4 adresa';
+$wb['ipv6_address_txt'] = 'IPv6 adresa';
+$wb['vhost_type_txt'] = 'Vrsta VHost-a';
+$wb['hd_quota_txt'] = 'Kvota diska';
+$wb['traffic_quota_txt'] = 'Kvota prometa';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Vlastite stranice za greške';
+$wb['subdomain_txt'] = 'Automatska poddomena';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Klijent';
+$wb['limit_web_domain_txt'] = 'Iskoristili ste maksimalan broj web domena za vaš račun.';
+$wb['limit_web_aliasdomain_txt'] = 'Iskoristili ste maksimalan broj alias doena za vaš račun.';
+$wb['limit_web_subdomain_txt'] = 'Iskoristili ste maksimalan broj poddomena za vaš račun.';
+$wb['apache_directives_txt'] = 'Apache direktive';
+$wb['domain_error_empty'] = 'Domena je prazna.';
+$wb['domain_error_unique'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Naziv domene je neispravan.';
+$wb['domain_error_autosub'] = 'Već postoji poddomena sa ovim postavkama.';
+$wb['hd_quota_error_empty'] = 'Kvota diska je 0 ili prazna.';
+$wb['traffic_quota_error_empty'] = 'Kota prometa je prazna.';
+$wb['error_ssl_state_empty'] = 'SSL županija je prazna.';
+$wb['error_ssl_locality_empty'] = 'SSL lokacija je prazna.';
+$wb['error_ssl_organisation_empty'] = 'SSL organizacija je prazna.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL organizacijska jedinica je prazna.';
+$wb['error_ssl_country_empty'] = 'SSL država je prazna.';
+$wb['error_ssl_cert_empty'] = 'Polje za SSL certifikat je prazno';
+$wb['client_group_id_txt'] = 'Klijent';
+$wb['stats_password_txt'] = 'Podesi šifru za web statistiku';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Maksimalno moguća kvota diska';
+$wb['ssl_state_error_regex'] = 'Neispravno polje SSL županija. Dozvoljeni znakovi su: a-z, 0-9 i .,-_';
+$wb['ssl_locality_error_regex'] = 'Neispravno polje SSL lokacija. Dozvoljeni znakovi su: a-z, 0-9 i .,-_';
+$wb['ssl_organisation_error_regex'] = 'Neispravno polje SSL organizacija. Dozvoljeni znakovi su: a-z, 0-9 i .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Neispravno polje SSL organizacijska jedinica. Dozvoljeni znakovi su: a-z, 0-9 i .,-_';
+$wb['ssl_country_error_regex'] = 'Neispravno polje SSL država. Dozvoljeni znakovi su: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Maksimalno moguća kvota prometa';
+$wb['redirect_error_regex'] = 'Neispravna redirekcijska putanja. Primjeri dozvoljene redirekcije: /test/ ili http://www.domena.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Kvota prometa je premašena';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Korisničko ime za web statistiku';
+$wb['stats_type_txt'] = 'Program za web statistiku';
+$wb['custom_php_ini_txt'] = 'Vlastite php.ini postavke';
+$wb['none_txt'] = 'Ništa';
+$wb['disabled_txt'] = 'Onemogućeno';
+$wb['no_redirect_txt'] = 'Bez redirekcije';
+$wb['no_flag_txt'] = 'Bez flag-a';
+$wb['save_certificate_txt'] = 'Spremi certifikat';
+$wb['create_certificate_txt'] = 'Kreiraj certifikat';
+$wb['delete_certificate_txt'] = 'Obriši certifikat';
+$wb['nginx_directives_txt'] = 'nginx direktive';
+$wb['seo_redirect_txt'] = 'SEO redirekcija';
+$wb['non_www_to_www_txt'] = 'bez www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; bez www';
+$wb['php_fpm_use_socket_txt'] = 'Koristi socket za PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI za SSL nije aktiviran na ovom serveru. Možete uključiti samo jedan SSL certifikat na svakoj IP adresi.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP verzija';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generiraj šifru';
+$wb['repeat_password_txt'] = 'Ponovi šifru';
+$wb['password_mismatch_txt'] = 'Šifre nisu identične.';
+$wb['password_match_txt'] = 'Šifre su identične.';
+$wb['available_php_directive_snippets_txt'] = 'Dostupne PHP direktive:';
+$wb['available_apache_directive_snippets_txt'] = 'Dostupne Apache direktive:';
+$wb['available_nginx_directive_snippets_txt'] = 'Dostupne nginx direktive:';
+$wb['proxy_directives_txt'] = 'Proxy Directives';
+$wb['available_proxy_directive_snippets_txt'] = 'Dostupne proxy direktive:';
+$wb['Domain'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/hr_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/hr_web_aliasdomain_list.lng
new file mode 100644
index 0000000000..0b45aff791
--- /dev/null
+++ b/interface/web/sites/lib/lang/hr_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Alias domena';
+$wb['active_txt'] = 'Aktivno';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Web stranica';
+$wb['domain_txt'] = 'Alias domena';
+$wb['add_new_record_txt'] = 'Dodaj novu alias domenu';
+$wb['domain_error_empty'] = 'Domena nije upisana.';
+$wb['domain_error_unique'] = 'Domena mora biti unikatna.';
+$wb['domain_error_regex'] = 'Nazive domene nije ispravan.';
+$wb['no_redirect_txt'] = 'Bez redirekcije';
+$wb['no_flag_txt'] = 'Bez označavanja';
+$wb['none_txt'] = 'Ništa';
+?>
diff --git a/interface/web/sites/lib/lang/hr_web_backup_list.lng b/interface/web/sites/lib/lang/hr_web_backup_list.lng
index cd990f3e11..d1133334f0 100644
--- a/interface/web/sites/lib/lang/hr_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/hr_web_backup_list.lng
@@ -16,6 +16,6 @@ $wb['delete_confirm_txt'] = 'Really delete this backup?';
 $wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
 $wb['backup_type_mysql'] = 'MySQL Database';
 $wb['backup_type_web'] = 'Website files';
+$wb['filesize_txt'] = 'Filesize';
+$wb['backup_type_mongodb'] = 'MongoDB Database';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_web_childdomain.lng b/interface/web/sites/lib/lang/hr_web_childdomain.lng
index 6866b6f52b..fb95a27ca6 100644
--- a/interface/web/sites/lib/lang/hr_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/hr_web_childdomain.lng
@@ -42,7 +42,7 @@ $wb['no_flag_txt'] = 'Bez markiranja';
 $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.';
 $wb['backup_interval_txt'] = 'Backup interval';
 $wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['ssl_key_txt'] = 'SSL Key';
@@ -115,5 +115,4 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
-
 ?>
diff --git a/interface/web/sites/lib/lang/hr_web_childdomain_list.lng b/interface/web/sites/lib/lang/hr_web_childdomain_list.lng
index 44671cdbf4..4a296acc48 100644
--- a/interface/web/sites/lib/lang/hr_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/hr_web_childdomain_list.lng
@@ -4,14 +4,12 @@ $wb['active_txt'] = 'Aktivno';
 $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Web stranica';
 $wb['domain_txt'] = 'Poddomena';
-$wb['add_new_record_txt'] = 'Dodaj novu poddomenu';
 $wb['domain_error_empty'] = 'Domena nije upisana.';
 $wb['domain_error_unique'] = 'Domena mora biti unikatna.';
 $wb['domain_error_regex'] = 'Nazive domene nije ispravan.';
 $wb['no_redirect_txt'] = 'Bez redirekcije';
 $wb['no_flag_txt'] = 'Bez označavanja';
 $wb['none_txt'] = 'Ništa';
-
+$wb['add_new_subdomain_txt'] = 'Add new Subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_web_directive_snippets.lng b/interface/web/sites/lib/lang/hr_web_directive_snippets.lng
new file mode 100644
index 0000000000..d2590e53cf
--- /dev/null
+++ b/interface/web/sites/lib/lang/hr_web_directive_snippets.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['directive_snippets_id_txt'] = 'Desired configuration';
+?>
diff --git a/interface/web/sites/lib/lang/hr_web_domain.lng b/interface/web/sites/lib/lang/hr_web_domain.lng
new file mode 100644
index 0000000000..00e44269f7
--- /dev/null
+++ b/interface/web/sites/lib/lang/hr_web_domain.lng
@@ -0,0 +1,132 @@
+<?php
+$wb['backup_interval_txt'] = 'Interval backupa';
+$wb['backup_copies_txt'] = 'Broj backup kopija';
+$wb['ssl_state_txt'] = 'Županija';
+$wb['ssl_locality_txt'] = 'Grad';
+$wb['ssl_organisation_txt'] = 'Organizacija';
+$wb['ssl_organisation_unit_txt'] = 'Organizacijski sektor';
+$wb['ssl_country_txt'] = 'Država';
+$wb['ssl_request_txt'] = 'SSL zahtjev';
+$wb['ssl_cert_txt'] = 'SSL certifikat';
+$wb['ssl_bundle_txt'] = 'SSL paket';
+$wb['ssl_action_txt'] = 'SSL akcija';
+$wb['ssl_domain_txt'] = 'SSL domena';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domena';
+$wb['type_txt'] = 'Vrsta';
+$wb['parent_domain_id_txt'] = 'Glavna web stranica';
+$wb['redirect_type_txt'] = 'Vrsta redirekcije';
+$wb['redirect_path_txt'] = 'Redirect Path';
+$wb['active_txt'] = 'Aktivno';
+$wb['document_root_txt'] = 'Početni direktorij';
+$wb['system_user_txt'] = 'Linux korisnik';
+$wb['system_group_txt'] = 'Linux grupa';
+$wb['ip_address_txt'] = 'IP adresa';
+$wb['vhost_type_txt'] = 'Vrsta VHosta';
+$wb['hd_quota_txt'] = 'Limit kvote (prostor)';
+$wb['traffic_quota_txt'] = 'Limit prometa';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Vlastite error stranice';
+$wb['subdomain_txt'] = 'Automatska poddomena';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Klijent';
+$wb['limit_web_domain_txt'] = 'Iskorišten je maksimalan broj domena.';
+$wb['limit_web_aliasdomain_txt'] = 'Iskorišten je maksimalan broj alias domena.';
+$wb['limit_web_subdomain_txt'] = 'Iskorišten je maksimalan broj poddomena.';
+$wb['apache_directives_txt'] = 'Apache direktive';
+$wb['domain_error_empty'] = 'Naziv domene je prazan.';
+$wb['domain_error_unique'] = 'Već postoji web stranica ili poddomena / alias sa nazivom te domene.';
+$wb['domain_error_regex'] = 'Naziv domene nije ispravan.';
+$wb['hd_quota_error_empty'] = 'Limit kvote (prostor) je 0 ili je prazno.';
+$wb['traffic_quota_error_empty'] = 'Limit prometa je prazan.';
+$wb['error_ssl_state_empty'] = 'Niste unijeli županiju.';
+$wb['error_ssl_locality_empty'] = 'Niste unijeli grad.';
+$wb['error_ssl_organisation_empty'] = 'Niste unijeli organizaciju.';
+$wb['error_ssl_organisation_unit_empty'] = 'Niste unijeli organizacjski sektor.';
+$wb['error_ssl_country_empty'] = 'Niste unijeli državu.';
+$wb['error_ssl_cert_empty'] = 'Polje SSL certifikata je prazno';
+$wb['client_group_id_txt'] = 'Klijent';
+$wb['stats_password_txt'] = 'Šifra za statistiku';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Maksimalan limit kvote (prostor)';
+$wb['ssl_state_error_regex'] = 'Neispravan unos županije. Dozvoljeni znakovi: a-z, 0-9 i .,-_';
+$wb['ssl_locality_error_regex'] = 'Neispravan unos grada. Dozvoljeni znakovi: a-z, 0-9 i .,-_';
+$wb['ssl_organisation_error_regex'] = 'Neispravan unos organizacije. Dozvoljeni znakovi: a-z, 0-9 i .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Neispravan unos organizacijskog sektora. Dozvoljeni znakovi: a-z, 0-9 i .,-_';
+$wb['ssl_country_error_regex'] = 'Neispravan unos države. Dozvoljeni znakovi: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Maksimalan limit prometa web stranice';
+$wb['redirect_error_regex'] = 'Neispravna  putanja redirekcije. Ispravne redirekcije su npr.: /test/ ili http://www.domena.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Iskoristili ste limit prometa web stranice.';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Korisničko ime za statistiku';
+$wb['stats_type_txt'] = 'Program za statistiku';
+$wb['custom_php_ini_txt'] = 'Vlastite php.ini postavke';
+$wb['ipv6_address_txt'] = 'IPv6 adresa';
+$wb['none_txt'] = 'Ništa';
+$wb['disabled_txt'] = 'Onemogućeno';
+$wb['no_redirect_txt'] = 'Bez redirekcije';
+$wb['no_flag_txt'] = 'Bez markiranja';
+$wb['save_certificate_txt'] = 'Spremi certifikat';
+$wb['create_certificate_txt'] = 'Kreiraj certifikat';
+$wb['delete_certificate_txt'] = 'Obriši certifikat';
+$wb['nginx_directives_txt'] = 'nginx direktive';
+$wb['seo_redirect_txt'] = 'SEO redirekcija';
+$wb['non_www_to_www_txt'] = 'Non-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> non-www';
+$wb['php_fpm_use_socket_txt'] = 'Koristi socket za PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI za SSL nije aktiviran na ovom serveru. Možete omogućiti samo jedan SSL certifikat na svakoj IP adresi.';
+$wb['python_txt'] = 'Python';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Vrijednosti PHP-FPM pm postavki moraju biti slijedeće: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children mora biti pozitivan broj.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers mora biti pozitivan broj.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers mora biti pozitivan broj.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers mora biti pozitivan broj.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['perl_txt'] = 'Perl';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generiraj šifru';
+$wb['repeat_password_txt'] = 'Ponovi šifru';
+$wb['password_mismatch_txt'] = 'Šifre nisu identične.';
+$wb['password_match_txt'] = 'Šifre su identične.';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'Već postoji poddomena sa ovim postavkama.';
+$wb['available_php_directive_snippets_txt'] = 'Dostupne PHP direktive:';
+$wb['available_apache_directive_snippets_txt'] = 'Dostupne Apache direktive:';
+$wb['available_nginx_directive_snippets_txt'] = 'Dostupne nginx direktive:';
+$wb['proxy_directives_txt'] = 'Proxy direktive';
+$wb['available_proxy_directive_snippets_txt'] = 'Dostupne Proxy direktive:';
+$wb['no_server_error'] = 'Nije izabran server.';
+$wb['no_backup_txt'] = 'Bez backup-a';
+$wb['daily_backup_txt'] = 'Dnevni backup';
+$wb['weekly_backup_txt'] = 'Tjedni backup';
+$wb['monthly_backup_txt'] = 'Mjesečni backup';
+$wb['rewrite_rules_txt'] = 'Rewrite pravila';
+$wb['invalid_rewrite_rules_txt'] = 'Neispravna Rewrite pravila';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Dozvoljene direktive:';
+$wb['configuration_error_txt'] = 'KONFIGURACIJSKA GREŠKA';
+$wb['variables_txt'] = 'Varijable';
+$wb['added_by_txt'] = 'Dodao';
+$wb['added_date_txt'] = 'Dodano';
+$wb['backup_excludes_txt'] = 'Izbačeni direktoriji';
+$wb['backup_excludes_note_txt'] = '(Separate multiple directories with commas. Example: web/cache/*,web/backup)';
+$wb['backup_excludes_error_regex'] = 'Izbačeni direktorij sadrži nedozvoljene znakove.';
+$wb['invalid_custom_php_ini_settings_txt'] = 'Neispravne php.ini postavke';
+$wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
+$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
+?>
diff --git a/interface/web/sites/lib/lang/hr_web_domain_admin_list.lng b/interface/web/sites/lib/lang/hr_web_domain_admin_list.lng
new file mode 100644
index 0000000000..b5e5d2b467
--- /dev/null
+++ b/interface/web/sites/lib/lang/hr_web_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['sys_groupid_txt'] = 'Klijent';
+$wb['list_head_txt'] = 'Web stranice';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Aktivno';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domena';
+$wb['add_new_record_txt'] = 'Dodaj novu web stranicu';
+?>
diff --git a/interface/web/sites/lib/lang/hr_web_domain_list.lng b/interface/web/sites/lib/lang/hr_web_domain_list.lng
new file mode 100644
index 0000000000..2f85d7cd45
--- /dev/null
+++ b/interface/web/sites/lib/lang/hr_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Web stranice';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Aktivno';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domena';
+$wb['add_new_record_txt'] = 'Dodaj novu web stranicu';
+?>
diff --git a/interface/web/sites/lib/lang/hr_web_folder.lng b/interface/web/sites/lib/lang/hr_web_folder.lng
index e21fe053a4..5ed992e171 100644
--- a/interface/web/sites/lib/lang/hr_web_folder.lng
+++ b/interface/web/sites/lib/lang/hr_web_folder.lng
@@ -6,5 +6,3 @@ $wb['active_txt'] = 'Aktivno';
 $wb['path_error_regex'] = 'Neispravna putanja direktorija.';
 $wb['error_folder_already_protected_txt'] = 'Već postoji zapis za ovaj direktorij.';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_web_folder_list.lng b/interface/web/sites/lib/lang/hr_web_folder_list.lng
index a777e83b1d..358ffa0fdf 100644
--- a/interface/web/sites/lib/lang/hr_web_folder_list.lng
+++ b/interface/web/sites/lib/lang/hr_web_folder_list.lng
@@ -6,5 +6,3 @@ $wb['parent_domain_id_txt'] = 'Web stranica';
 $wb['path_txt'] = 'Putanja';
 $wb['add_new_record_txt'] = 'Dodaj novi direktorij';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_web_folder_user.lng b/interface/web/sites/lib/lang/hr_web_folder_user.lng
index c6787654d7..cf199655d2 100644
--- a/interface/web/sites/lib/lang/hr_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/hr_web_folder_user.lng
@@ -12,5 +12,3 @@ $wb['password_match_txt'] = 'Šifre su identične.';
 $wb['no_folder_perm'] = 'Nemate potrebne dozvole za ovaj direktorij.';
 $wb['error_user_exists_already_txt'] = 'Već postoji zapis za ovog korisnika.';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_web_folder_user_list.lng b/interface/web/sites/lib/lang/hr_web_folder_user_list.lng
index 5153b9fc4f..4a45df3738 100644
--- a/interface/web/sites/lib/lang/hr_web_folder_user_list.lng
+++ b/interface/web/sites/lib/lang/hr_web_folder_user_list.lng
@@ -5,5 +5,3 @@ $wb['web_folder_id_txt'] = 'Web direkotrij';
 $wb['username_txt'] = 'Korisničko ime';
 $wb['add_new_record_txt'] = 'Dodaj novog korisnika web direktorija';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_web_sites_stats_list.lng b/interface/web/sites/lib/lang/hr_web_sites_stats_list.lng
index 3d374a006f..a89fc20e10 100644
--- a/interface/web/sites/lib/lang/hr_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/hr_web_sites_stats_list.lng
@@ -7,5 +7,3 @@ $wb['this_year_txt'] = 'Ovu godinu';
 $wb['last_year_txt'] = 'Prošlu godinu';
 $wb['sum_txt'] = 'Ukupno';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_web_subdomain.lng b/interface/web/sites/lib/lang/hr_web_subdomain.lng
new file mode 100644
index 0000000000..3d8e014a4d
--- /dev/null
+++ b/interface/web/sites/lib/lang/hr_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['ssl_state_txt'] = 'Županija';
+$wb['ssl_locality_txt'] = 'Lokacija';
+$wb['ssl_organisation_txt'] = 'Organizacija';
+$wb['ssl_organisation_unit_txt'] = 'Organizacijski dio';
+$wb['ssl_country_txt'] = 'Država';
+$wb['ssl_request_txt'] = 'SSL zahtjev';
+$wb['ssl_cert_txt'] = 'SSL certifikat';
+$wb['ssl_bundle_txt'] = 'SSL paket';
+$wb['ssl_action_txt'] = 'SSL akcija';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domena';
+$wb['type_txt'] = 'Vrsta';
+$wb['parent_domain_id_txt'] = 'Početna web stranica';
+$wb['redirect_type_txt'] = 'Vrsta redirekcije';
+$wb['redirect_path_txt'] = 'Redirekcijska putanja';
+$wb['active_txt'] = 'Aktivno';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux korisnik';
+$wb['system_group_txt'] = 'Linux grupa';
+$wb['ip_address_txt'] = 'IP adresa';
+$wb['vhost_type_txt'] = 'Vrsta VHosta';
+$wb['hd_quota_txt'] = 'Kvota diska';
+$wb['traffic_quota_txt'] = 'Promet web stranice';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Klijent';
+$wb['limit_web_domain_txt'] = 'Iskorišten je maksimalan broj domena.';
+$wb['limit_web_aliasdomain_txt'] = 'Iskorišten je maksimalan broj alias domena.';
+$wb['limit_web_subdomain_txt'] = 'Iskorišten je maksimalan broj poddomena.';
+$wb['apache_directives_txt'] = 'Apache direktive';
+$wb['domain_error_empty'] = 'Naziv domene je prazan.';
+$wb['domain_error_unique'] = 'Već postoji web stranica ili poddomena / alias sa nazivom te domene.';
+$wb['domain_error_regex'] = 'Naziv domene je neispravan.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Neispravna  putanja redirekcije. Ispravne redirekcije su npr.: /test/ ili http://www.domena.tld/test/';
+$wb['no_redirect_txt'] = 'Bez redirekcije';
+$wb['no_flag_txt'] = 'Bez markiranja';
+$wb['domain_error_wildcard'] = 'Wildcard poddomene nisu dozvoljene.';
+$wb['proxy_directives_txt'] = 'Proxy direktive';
+$wb['available_proxy_directive_snippets_txt'] = 'Dostupne proxy direktive:';
+$wb['error_proxy_requires_url'] = 'Vrsta redirekcije \\"proxy\\" zahtjeva URL kao redirekcijsku putanju.';
+?>
diff --git a/interface/web/sites/lib/lang/hr_web_subdomain_list.lng b/interface/web/sites/lib/lang/hr_web_subdomain_list.lng
new file mode 100644
index 0000000000..942454e117
--- /dev/null
+++ b/interface/web/sites/lib/lang/hr_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Poddomene';
+$wb['active_txt'] = 'Aktivno';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Web stranica';
+$wb['domain_txt'] = 'Poddomena';
+$wb['add_new_record_txt'] = 'Dodaj novu poddomenu';
+?>
diff --git a/interface/web/sites/lib/lang/hr_web_vhost_domain.lng b/interface/web/sites/lib/lang/hr_web_vhost_domain.lng
index 85f97dbedb..91d2226b82 100644
--- a/interface/web/sites/lib/lang/hr_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/hr_web_vhost_domain.lng
@@ -18,7 +18,7 @@ $wb['parent_domain_id_txt'] = 'Glavna web stranica';
 $wb['redirect_type_txt'] = 'Vrsta redirekcije';
 $wb['redirect_path_txt'] = 'Redirect Path';
 $wb['active_txt'] = 'Aktivno';
-$wb['document_root_txt'] = 'Početni direktorij';
+$wb['document_root_txt'] = 'Document Root';
 $wb['system_user_txt'] = 'Linux korisnik';
 $wb['system_group_txt'] = 'Linux grupa';
 $wb['ip_address_txt'] = 'IP adresa';
@@ -132,9 +132,14 @@ $wb['host_txt'] = 'Hostname';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
 $wb['backup_excludes_note_txt'] = '(Separate multiple directories with commas. Example: web/cache/*,web/backup)';
 $wb['backup_excludes_error_regex'] = 'Izbačeni direktorij sadrži nedozvoljene znakove.';
-$wb['invalid_custom_php_ini_settings_txt'] = 'Neispravne php.ini postavke';
-$wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb["document_root_txt"] = "Document Root";
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['load_client_data_txt'] = 'Load client details';
+$wb['load_my_data_txt'] = 'Load my contact details';
+$wb['reset_client_data_txt'] = 'Reset data';
+$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_web_vhost_domain_admin_list.lng b/interface/web/sites/lib/lang/hr_web_vhost_domain_admin_list.lng
index 9e1880ec34..b5e5d2b467 100644
--- a/interface/web/sites/lib/lang/hr_web_vhost_domain_admin_list.lng
+++ b/interface/web/sites/lib/lang/hr_web_vhost_domain_admin_list.lng
@@ -7,5 +7,3 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domena';
 $wb['add_new_record_txt'] = 'Dodaj novu web stranicu';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/hr_web_vhost_domain_list.lng
index 55d6e4afd3..ddfd82be6e 100644
--- a/interface/web/sites/lib/lang/hr_web_vhost_domain_list.lng
+++ b/interface/web/sites/lib/lang/hr_web_vhost_domain_list.lng
@@ -6,7 +6,4 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domena';
 $wb['add_new_record_txt'] = 'Dodaj novu web stranicu';
 $wb['parent_domain_id_txt'] = 'Website';
-
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/hr_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..e7c0ed0409
--- /dev/null
+++ b/interface/web/sites/lib/lang/hr_web_vhost_subdomain.lng
@@ -0,0 +1,127 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Glavna web stranica';
+$wb['web_folder_txt'] = 'Web direktorij';
+$wb['web_folder_invalid_txt'] = 'Web direktorij je neispravan, izaberite neki drugi.';
+$wb['web_folder_unique_txt'] = 'Web direktorij se već koristi, izaberite neki drugi.';
+$wb['backup_interval_txt'] = 'Interval pohranjivanja';
+$wb['backup_copies_txt'] = 'Broj kopija za pohranu';
+$wb['ssl_state_txt'] = 'Županija';
+$wb['ssl_locality_txt'] = 'Lokacija';
+$wb['ssl_organisation_txt'] = 'Organizacija';
+$wb['ssl_organisation_unit_txt'] = 'Organizacijska jedinica';
+$wb['ssl_country_txt'] = 'Država';
+$wb['ssl_key_txt'] = 'SSL ključ';
+$wb['ssl_request_txt'] = 'SSL zahtjev';
+$wb['ssl_cert_txt'] = 'SSL certifikat';
+$wb['ssl_bundle_txt'] = 'SSL paket';
+$wb['ssl_action_txt'] = 'SSL akcija';
+$wb['ssl_domain_txt'] = 'SSL domena';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domena';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Neispravan direktorij. Nemojte koristiti slash.';
+$wb['type_txt'] = 'Vrsta';
+$wb['redirect_type_txt'] = 'Vrsta redirekcije';
+$wb['redirect_path_txt'] = 'Redirekcijska putanja';
+$wb['active_txt'] = 'Aktivno';
+$wb['document_root_txt'] = 'Početna putanja (documentroot)';
+$wb['system_user_txt'] = 'Linux korisnik';
+$wb['system_group_txt'] = 'Linux groupa';
+$wb['ip_address_txt'] = 'IPv4 adresa';
+$wb['ipv6_address_txt'] = 'IPv6 adresa';
+$wb['vhost_type_txt'] = 'Vrsta VHost-a';
+$wb['hd_quota_txt'] = 'Kvota tvrdog diska';
+$wb['traffic_quota_txt'] = 'Kvota prometa';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Vlastite stranice za greške';
+$wb['subdomain_txt'] = 'Automatska poddomena';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Klijent';
+$wb['limit_web_domain_txt'] = 'Iskorišten je maksimalan broj web domena za vaš račun.';
+$wb['limit_web_aliasdomain_txt'] = 'Iskorišten je maksimalan broj alias domena za vaš račun.';
+$wb['limit_web_subdomain_txt'] = 'Iskorišten je maksimalan broj poddomena za vaš račun.';
+$wb['apache_directives_txt'] = 'Apache direktive';
+$wb['domain_error_empty'] = 'Domena je prazna.';
+$wb['domain_error_unique'] = 'Već postoji stranica ili poddodmena tj. alias domena sa ovim nazivom.';
+$wb['domain_error_regex'] = 'Naziv domene je neispravan.';
+$wb['domain_error_wildcard'] = 'Wildcard poddomene nisu dozvoljene.';
+$wb['hd_quota_error_empty'] = 'Kvota tvrdog diska je 0 ili prazna.';
+$wb['traffic_quota_error_empty'] = 'Kvota prometa je prazna.';
+$wb['error_ssl_state_empty'] = 'SSL županija je prazna.';
+$wb['error_ssl_locality_empty'] = 'SSL lokacija je prazna.';
+$wb['error_ssl_organisation_empty'] = 'SSL organizacija je prazna.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL organizacijska jedinica je prazna.';
+$wb['error_ssl_country_empty'] = 'SSL država je prazna.';
+$wb['error_ssl_cert_empty'] = 'SSL certifikat je prazan.';
+$wb['client_group_id_txt'] = 'Klijent';
+$wb['stats_password_txt'] = 'Šifra web statistike';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Maksimalno moguća kvota diska';
+$wb['ssl_state_error_regex'] = 'Neispravno polje SSL županija. Dozvoljeni znakovi su: a-z, 0-9 i .,-_';
+$wb['ssl_locality_error_regex'] = 'Neispravno polje SSL lokacija. Dozvoljeni znakovi su: a-z, 0-9 i .,-_';
+$wb['ssl_organisation_error_regex'] = 'Neispravno polje SSL organizacija. Dozvoljeni znakovi su: a-z, 0-9 i .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Neispravno polje SSL organizacijska jedinica. Dozvoljeni znakovi su: a-z, 0-9 i .,-_';
+$wb['ssl_country_error_regex'] = 'Neispravno polje SSL država. Dozvoljeni znakovi su: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Neispravna redirekcijska putanja. Primjeri dozvoljene redirekcije: /test/ ili http://www.domena.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Kvota prometa je premašena';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Korisničko ime za web statistiku';
+$wb['stats_type_txt'] = 'Program za web statistiku';
+$wb['custom_php_ini_txt'] = 'Vlastite php.ini postavke';
+$wb['none_txt'] = 'Ništa';
+$wb['disabled_txt'] = 'Onemogućeno';
+$wb['no_redirect_txt'] = 'Bez redirekcije';
+$wb['no_flag_txt'] = 'Bez flag-a';
+$wb['save_certificate_txt'] = 'Spremi certifikat';
+$wb['create_certificate_txt'] = 'Kreiraj certifikat';
+$wb['delete_certificate_txt'] = 'Obriši certifikat';
+$wb['nginx_directives_txt'] = 'nginx direktive';
+$wb['seo_redirect_txt'] = 'SEO redirekcija';
+$wb['non_www_to_www_txt'] = 'bez www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; bez www';
+$wb['php_fpm_use_socket_txt'] = 'Koristi socket za PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI za SSL nije aktiviran na ovom serveru. Možete uključiti samo jedan SSL certifikat na svakoj IP adresi.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Vrijednosti za PHP-FPM pm postavke moraju biti slijedeće: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP verzija';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Generiraj šifru';
+$wb['repeat_password_txt'] = 'Ponovi šifru';
+$wb['password_mismatch_txt'] = 'Šifre nisu identične.';
+$wb['password_match_txt'] = 'Šifre su identične.';
+$wb['available_php_directive_snippets_txt'] = 'PHP direktive:';
+$wb['available_apache_directive_snippets_txt'] = 'Apache direktive:';
+$wb['available_nginx_directive_snippets_txt'] = 'nginx direktive:';
+$wb['proxy_directives_txt'] = 'Proxy direktive';
+$wb['available_proxy_directive_snippets_txt'] = 'Proxy direktive:';
+$wb['rewrite_rules_txt'] = 'Rewrite pravila';
+$wb['invalid_rewrite_rules_txt'] = 'Neispravna Rewrite pravila';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Dozvoljene direktive:';
+$wb['configuration_error_txt'] = 'KONFIGURACIJSKA GREŠKA';
+$wb['variables_txt'] = 'Varijable';
+$wb['backup_excludes_txt'] = 'Isključeni direktoriji';
+$wb['backup_excludes_note_txt'] = '(Odvojite više direktorija sa zarezom. Primjer: web/cache/*,web/backup)';
+$wb['backup_excludes_error_regex'] = 'Isključeni direktoriji sadrže nedozvoljene znakove.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+?>
diff --git a/interface/web/sites/lib/lang/hr_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/hr_web_vhost_subdomain_list.lng
new file mode 100644
index 0000000000..1c16bcda28
--- /dev/null
+++ b/interface/web/sites/lib/lang/hr_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
+?>
diff --git a/interface/web/sites/lib/lang/hr_webdav_user.lng b/interface/web/sites/lib/lang/hr_webdav_user.lng
index 2bf9f475d0..9fd795f266 100644
--- a/interface/web/sites/lib/lang/hr_webdav_user.lng
+++ b/interface/web/sites/lib/lang/hr_webdav_user.lng
@@ -19,5 +19,3 @@ $wb['repeat_password_txt'] = 'Ponovi šifru';
 $wb['password_mismatch_txt'] = 'Šifre nisu identične.';
 $wb['password_match_txt'] = 'Šifre su identične.';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hr_webdav_user_list.lng b/interface/web/sites/lib/lang/hr_webdav_user_list.lng
index a3d3c351d9..f19b8dafbc 100644
--- a/interface/web/sites/lib/lang/hr_webdav_user_list.lng
+++ b/interface/web/sites/lib/lang/hr_webdav_user_list.lng
@@ -6,5 +6,3 @@ $wb['parent_domain_id_txt'] = 'Web stranica';
 $wb['username_txt'] = 'Korisničko ime';
 $wb['add_new_record_txt'] = 'Dodaj Webdav korisnika';
 ?>
-
-
diff --git a/interface/web/sites/lib/lang/hu_backup_stats_list.lng b/interface/web/sites/lib/lang/hu_backup_stats_list.lng
index 0f3803f56a..65792aa591 100644
--- a/interface/web/sites/lib/lang/hu_backup_stats_list.lng
+++ b/interface/web/sites/lib/lang/hu_backup_stats_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb["database_name_txt"]   = '';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Domain';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['database_name_txt'] = '';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/sites/lib/lang/hu_cron.lng b/interface/web/sites/lib/lang/hu_cron.lng
index fdb2f23e8a..9ef984d57e 100644
--- a/interface/web/sites/lib/lang/hu_cron.lng
+++ b/interface/web/sites/lib/lang/hu_cron.lng
@@ -21,4 +21,6 @@ $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
 $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_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
+$wb['log_output_txt'] = 'Log output';
 ?>
diff --git a/interface/web/sites/lib/lang/hu_database.lng b/interface/web/sites/lib/lang/hu_database.lng
index 676fae2b2d..9cbb6398d0 100644
--- a/interface/web/sites/lib/lang/hu_database.lng
+++ b/interface/web/sites/lib/lang/hu_database.lng
@@ -43,4 +43,7 @@ $wb['select_dbuser_txt'] = 'Select database user';
 $wb['no_dbuser_txt'] = 'None';
 $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['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
 ?>
diff --git a/interface/web/sites/lib/lang/hu_database_admin_list.lng b/interface/web/sites/lib/lang/hu_database_admin_list.lng
index d844905c1a..8521deb471 100644
--- a/interface/web/sites/lib/lang/hu_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/hu_database_admin_list.lng
@@ -8,4 +8,5 @@ $wb['database_name_txt'] = 'Adatbázis';
 $wb['add_new_record_txt'] = 'Új adatbázis';
 $wb['sys_groupid_txt'] = 'Ügyfél';
 $wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/hu_database_list.lng b/interface/web/sites/lib/lang/hu_database_list.lng
index db4bd2b8aa..5d61c4d8dd 100644
--- a/interface/web/sites/lib/lang/hu_database_list.lng
+++ b/interface/web/sites/lib/lang/hu_database_list.lng
@@ -7,4 +7,5 @@ $wb['database_name_txt'] = 'Adatbázis neve';
 $wb['add_new_record_txt'] = 'Új adatbázis';
 $wb['database_user_txt'] = 'Adatbázis Felhasználó';
 $wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/hu_database_quota_stats_list.lng b/interface/web/sites/lib/lang/hu_database_quota_stats_list.lng
index e1de70accf..4f92576007 100644
--- a/interface/web/sites/lib/lang/hu_database_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/hu_database_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["database_txt"] = 'Database';
-$wb["server_name_txt"] = 'Server';
-$wb["client_txt"] = 'Client';
-$wb["used_txt"] = 'Used space';
-$wb["quota_txt"] = 'Quota';
-$wb["percentage_txt"] = 'Used in %';
+$wb['database_txt'] = 'Database';
+$wb['server_name_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb['used_txt'] = 'Used space';
+$wb['quota_txt'] = 'Quota';
+$wb['percentage_txt'] = 'Used in %';
 ?>
diff --git a/interface/web/sites/lib/lang/hu_ftp_sites_stats_list.lng b/interface/web/sites/lib/lang/hu_ftp_sites_stats_list.lng
new file mode 100644
index 0000000000..03894607db
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_ftp_sites_stats_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb["list_head_txt"] = 'FTP 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 (Download + Upload)';
+$wb["in_out_txt"] = 'DL/UL';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/hu_ftp_user.lng b/interface/web/sites/lib/lang/hu_ftp_user.lng
index bbf61d4232..5f31ff6ed1 100644
--- a/interface/web/sites/lib/lang/hu_ftp_user.lng
+++ b/interface/web/sites/lib/lang/hu_ftp_user.lng
@@ -31,6 +31,5 @@ $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['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['directory_error_regex'] = 'Invalid directory';
+$wb['expires_txt'] = 'Expire at';
 ?>
diff --git a/interface/web/sites/lib/lang/hu_web_aliasdomain.lng b/interface/web/sites/lib/lang/hu_web_aliasdomain.lng
new file mode 100644
index 0000000000..4149c71149
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['Domain'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/hu_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/hu_web_aliasdomain_list.lng
new file mode 100644
index 0000000000..955316b154
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Aliasdomain';
+$wb['active_txt'] = 'Aktív';
+$wb['server_id_txt'] = 'Szerver';
+$wb['parent_domain_id_txt'] = 'Webhely';
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['add_new_record_txt'] = 'Új Aliasdomain';
+$wb['domain_error_empty'] = 'Domain üres';
+$wb['domain_error_unique'] = 'Domain már foglalt.';
+$wb['domain_error_regex'] = 'Domain név hibás.';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/sites/lib/lang/hu_web_backup_list.lng b/interface/web/sites/lib/lang/hu_web_backup_list.lng
index fa4a59b403..d1133334f0 100644
--- a/interface/web/sites/lib/lang/hu_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/hu_web_backup_list.lng
@@ -16,4 +16,6 @@ $wb['delete_confirm_txt'] = 'Really delete this backup?';
 $wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
 $wb['backup_type_mysql'] = 'MySQL Database';
 $wb['backup_type_web'] = 'Website files';
+$wb['filesize_txt'] = 'Filesize';
+$wb['backup_type_mongodb'] = 'MongoDB Database';
 ?>
diff --git a/interface/web/sites/lib/lang/hu_web_childdomain.lng b/interface/web/sites/lib/lang/hu_web_childdomain.lng
index c156b2e52e..3714d7f974 100644
--- a/interface/web/sites/lib/lang/hu_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/hu_web_childdomain.lng
@@ -42,7 +42,7 @@ $wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for ex
 $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.';
 $wb['backup_interval_txt'] = 'Backup interval';
 $wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['ssl_key_txt'] = 'SSL Key';
@@ -115,5 +115,4 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
-
 ?>
diff --git a/interface/web/sites/lib/lang/hu_web_childdomain_list.lng b/interface/web/sites/lib/lang/hu_web_childdomain_list.lng
index e40ed1e600..5a7ac9e176 100644
--- a/interface/web/sites/lib/lang/hu_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/hu_web_childdomain_list.lng
@@ -4,12 +4,12 @@ $wb['active_txt'] = 'Aktív';
 $wb['server_id_txt'] = 'Szerver';
 $wb['parent_domain_id_txt'] = 'Weboldal';
 $wb['domain_txt'] = 'aldomain';
-$wb['add_new_record_txt'] = 'Új Aldomain';
 $wb['domain_error_empty'] = 'Domain üres';
 $wb['domain_error_unique'] = 'Domain már foglalt.';
 $wb['domain_error_regex'] = 'Domain név hibás.';
 $wb['no_redirect_txt'] = 'No redirect';
 $wb['no_flag_txt'] = 'No flag';
 $wb['none_txt'] = 'None';
-
+$wb['add_new_subdomain_txt'] = 'Add new Subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/hu_web_directive_snippets.lng b/interface/web/sites/lib/lang/hu_web_directive_snippets.lng
new file mode 100644
index 0000000000..05a004f654
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_web_directive_snippets.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['directive_snippets_id_txt'] = 'Desired configuration';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/hu_web_domain.lng b/interface/web/sites/lib/lang/hu_web_domain.lng
new file mode 100644
index 0000000000..3fc994edc4
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_web_domain.lng
@@ -0,0 +1,132 @@
+<?php
+$wb['ssl_state_txt'] = 'Megye';
+$wb['ssl_locality_txt'] = 'Város';
+$wb['ssl_organisation_txt'] = 'Cég';
+$wb['ssl_organisation_unit_txt'] = 'Osztály';
+$wb['ssl_country_txt'] = 'Ország';
+$wb['ssl_request_txt'] = 'SSL Kérés';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Csomag';
+$wb['ssl_action_txt'] = 'SSL Akció';
+$wb['server_id_txt'] = 'Szerver';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Tipus';
+$wb['parent_domain_id_txt'] = 'Szülő Weboldal';
+$wb['redirect_type_txt'] = 'Átirányítás tipusa';
+$wb['redirect_path_txt'] = 'Átirányítás útvonal';
+$wb['active_txt'] = 'Aktív';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux felhasználó';
+$wb['system_group_txt'] = 'Linux csoport';
+$wb['ip_address_txt'] = 'IP-ím';
+$wb['vhost_type_txt'] = 'VHost Típus';
+$wb['hd_quota_txt'] = 'Táhely Korlát';
+$wb['traffic_quota_txt'] = 'Forgalom Korlát';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Saját hibaoldal';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['disabled_txt'] = 'Letiltva';
+$wb['client_txt'] = 'Ügyfél';
+$wb['limit_web_domain_txt'] = 'Nincs több weboldal lehetőség.';
+$wb['limit_web_aliasdomain_txt'] = 'Nincs több aliasdomain lehetőség.';
+$wb['limit_web_subdomain_txt'] = 'Nincs több aldomain lehetőség.';
+$wb['apache_directives_txt'] = 'Apache direktivák';
+$wb['domain_error_empty'] = 'Domain üres';
+$wb['domain_error_unique'] = 'Domain már foglalt.';
+$wb['domain_error_regex'] = 'Domain név hibás.';
+$wb['hd_quota_error_empty'] = 'Tárgely korlát üres.';
+$wb['traffic_quota_error_empty'] = 'Forgalom kvóta üres.';
+$wb['subdomain_txt'] = 'Automatikus Aldomain';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['client_group_id_txt'] = 'Ügyfél';
+$wb['stats_password_txt'] = 'Statisztika jelszó';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['allow_override_txt'] = 'Allow Override';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['backup_interval_txt'] = 'Mentés időpont';
+$wb['backup_copies_txt'] = 'Mentések száma';
+$wb['ruby_txt'] = 'Ruby';
+$wb['no_redirect_txt'] = 'Nincs átirányítás';
+$wb['no_flag_txt'] = 'No flag';
+$wb['none_txt'] = 'Nincs';
+$wb['save_certificate_txt'] = 'Save Certificate';
+$wb['create_certificate_txt'] = 'Create Certificate';
+$wb['delete_certificate_txt'] = 'Delete Certificate';
+$wb['stats_user_txt'] = 'Webstatistika felhasználónév';
+$wb['stats_type_txt'] = 'Webstatistika program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['perl_txt'] = 'Perl';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['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['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_system_user_or_group_txt'] = 'Invalid system user or group';
+$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
+?>
diff --git a/interface/web/sites/lib/lang/hu_web_domain_admin_list.lng b/interface/web/sites/lib/lang/hu_web_domain_admin_list.lng
new file mode 100644
index 0000000000..11e37c8764
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_web_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['sys_groupid_txt'] = 'Ügyfél';
+$wb['list_head_txt'] = 'Webhelyek';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Aktív';
+$wb['server_id_txt'] = 'Szerver';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Új webhely';
+?>
diff --git a/interface/web/sites/lib/lang/hu_web_domain_list.lng b/interface/web/sites/lib/lang/hu_web_domain_list.lng
new file mode 100644
index 0000000000..0363b1cc2e
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Webhelyek';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Aktív';
+$wb['server_id_txt'] = 'Szerver';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Új Webhely';
+?>
diff --git a/interface/web/sites/lib/lang/hu_web_subdomain.lng b/interface/web/sites/lib/lang/hu_web_subdomain.lng
new file mode 100644
index 0000000000..b629c3fe5d
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['ssl_state_txt'] = 'Megye';
+$wb['ssl_locality_txt'] = 'Város';
+$wb['ssl_organisation_txt'] = 'Cég';
+$wb['ssl_organisation_unit_txt'] = 'Osztály';
+$wb['ssl_country_txt'] = 'Ország';
+$wb['ssl_request_txt'] = 'SSL Kérés';
+$wb['ssl_cert_txt'] = 'SSL Tanúsítvány';
+$wb['ssl_bundle_txt'] = 'SSL Csomag';
+$wb['ssl_action_txt'] = 'SSL Akció';
+$wb['server_id_txt'] = 'Szrver';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Típus';
+$wb['parent_domain_id_txt'] = 'Szülő webhely';
+$wb['redirect_type_txt'] = 'Átirányítás típusa';
+$wb['redirect_path_txt'] = 'Az Átirányitás útvonala';
+$wb['active_txt'] = 'Aktív';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux Felhasználó';
+$wb['system_group_txt'] = 'Linux Csoport';
+$wb['ip_address_txt'] = 'IP-cím';
+$wb['vhost_type_txt'] = 'VHost Típus';
+$wb['hd_quota_txt'] = 'Tárhely Kvóta';
+$wb['traffic_quota_txt'] = 'Forgalom Kvóta';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Ügyfél';
+$wb['limit_web_domain_txt'] = 'Nincs több weboldal lehetőség.';
+$wb['limit_web_aliasdomain_txt'] = 'Nincs több aliasdomain lehetőség';
+$wb['limit_web_subdomain_txt'] = 'Nincs több aldomain lehetőség.';
+$wb['apache_directives_txt'] = 'Apache direktivák';
+$wb['domain_error_empty'] = 'A Domain üres';
+$wb['domain_error_unique'] = 'A Domain már foglalt.';
+$wb['domain_error_regex'] = 'A Domain név érvénytelen';
+$wb['host_txt'] = 'Állomás';
+$wb['no_redirect_txt'] = 'Nincs átirányítás';
+$wb['no_flag_txt'] = 'No flag';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$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.';
+?>
diff --git a/interface/web/sites/lib/lang/hu_web_subdomain_list.lng b/interface/web/sites/lib/lang/hu_web_subdomain_list.lng
new file mode 100644
index 0000000000..65aade6d4b
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Aldomainek';
+$wb['active_txt'] = 'Aktív';
+$wb['server_id_txt'] = 'Szerver';
+$wb['parent_domain_id_txt'] = 'Weboldal';
+$wb['domain_txt'] = 'aldomain';
+$wb['add_new_record_txt'] = 'Új Aldomain';
+?>
diff --git a/interface/web/sites/lib/lang/hu_web_vhost_domain.lng b/interface/web/sites/lib/lang/hu_web_vhost_domain.lng
index 19c0832f1f..9d93e8f36d 100644
--- a/interface/web/sites/lib/lang/hu_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/hu_web_vhost_domain.lng
@@ -15,7 +15,7 @@ $wb['parent_domain_id_txt'] = 'Szülő Weboldal';
 $wb['redirect_type_txt'] = 'Átirányítás tipusa';
 $wb['redirect_path_txt'] = 'Átirányítás útvonal';
 $wb['active_txt'] = 'Aktív';
-$wb['document_root_txt'] = 'Documentroot';
+$wb['document_root_txt'] = 'Document Root';
 $wb['system_user_txt'] = 'Linux felhasználó';
 $wb['system_group_txt'] = 'Linux csoport';
 $wb['ip_address_txt'] = 'IP-ím';
@@ -126,15 +126,20 @@ $wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a diff
 $wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
 $wb['host_txt'] = 'Hostname';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-
 $wb['variables_txt'] = 'Variables';
 $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $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_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
-$wb["document_root_txt"] = "Document Root";
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['load_client_data_txt'] = 'Load client details';
+$wb['load_my_data_txt'] = 'Load my contact details';
+$wb['reset_client_data_txt'] = 'Reset data';
+$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
diff --git a/interface/web/sites/lib/lang/hu_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/hu_web_vhost_domain_list.lng
index 832fa634b3..4d1f787081 100644
--- a/interface/web/sites/lib/lang/hu_web_vhost_domain_list.lng
+++ b/interface/web/sites/lib/lang/hu_web_vhost_domain_list.lng
@@ -6,5 +6,4 @@ $wb['server_id_txt'] = 'Szerver';
 $wb['domain_txt'] = 'Domain';
 $wb['add_new_record_txt'] = 'Új Webhely';
 $wb['parent_domain_id_txt'] = 'Website';
-
 ?>
diff --git a/interface/web/sites/lib/lang/hu_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/hu_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..c0ca93b570
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_web_vhost_subdomain.lng
@@ -0,0 +1,127 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Variables';
+$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['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+?>
diff --git a/interface/web/sites/lib/lang/hu_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/hu_web_vhost_subdomain_list.lng
new file mode 100644
index 0000000000..1c16bcda28
--- /dev/null
+++ b/interface/web/sites/lib/lang/hu_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
+?>
diff --git a/interface/web/sites/lib/lang/id_backup_stats_list.lng b/interface/web/sites/lib/lang/id_backup_stats_list.lng
index 0f3803f56a..65792aa591 100644
--- a/interface/web/sites/lib/lang/id_backup_stats_list.lng
+++ b/interface/web/sites/lib/lang/id_backup_stats_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb["database_name_txt"]   = '';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Domain';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['database_name_txt'] = '';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/sites/lib/lang/id_cron.lng b/interface/web/sites/lib/lang/id_cron.lng
index ce2bfee0e3..c912438692 100644
--- a/interface/web/sites/lib/lang/id_cron.lng
+++ b/interface/web/sites/lib/lang/id_cron.lng
@@ -21,4 +21,6 @@ $wb['unknown_fieldtype_error'] = 'Telah digunakan tipe kolom yang tidak dikenal.
 $wb['server_id_error_empty'] = 'The server ID is empty.';
 $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_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
+$wb['log_output_txt'] = 'Log output';
 ?>
diff --git a/interface/web/sites/lib/lang/id_database.lng b/interface/web/sites/lib/lang/id_database.lng
index e05990a459..bea0128d05 100644
--- a/interface/web/sites/lib/lang/id_database.lng
+++ b/interface/web/sites/lib/lang/id_database.lng
@@ -43,4 +43,7 @@ $wb['select_dbuser_txt'] = 'Select database user';
 $wb['no_dbuser_txt'] = 'None';
 $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['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
 ?>
diff --git a/interface/web/sites/lib/lang/id_database_admin_list.lng b/interface/web/sites/lib/lang/id_database_admin_list.lng
index 6f81d66858..77bde6b833 100644
--- a/interface/web/sites/lib/lang/id_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/id_database_admin_list.lng
@@ -8,4 +8,5 @@ $wb['database_name_txt'] = 'Nama Database';
 $wb['add_new_record_txt'] = 'Tambah Database Baru';
 $wb['sys_groupid_txt'] = 'Klien';
 $wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/id_database_list.lng b/interface/web/sites/lib/lang/id_database_list.lng
index 1221632978..fb3c906f83 100644
--- a/interface/web/sites/lib/lang/id_database_list.lng
+++ b/interface/web/sites/lib/lang/id_database_list.lng
@@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Pengguna Database';
 $wb['database_name_txt'] = 'Nama Database';
 $wb['add_new_record_txt'] = 'Tambah Database Baru';
 $wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/id_database_quota_stats_list.lng b/interface/web/sites/lib/lang/id_database_quota_stats_list.lng
index e1de70accf..4f92576007 100644
--- a/interface/web/sites/lib/lang/id_database_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/id_database_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["database_txt"] = 'Database';
-$wb["server_name_txt"] = 'Server';
-$wb["client_txt"] = 'Client';
-$wb["used_txt"] = 'Used space';
-$wb["quota_txt"] = 'Quota';
-$wb["percentage_txt"] = 'Used in %';
+$wb['database_txt'] = 'Database';
+$wb['server_name_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb['used_txt'] = 'Used space';
+$wb['quota_txt'] = 'Quota';
+$wb['percentage_txt'] = 'Used in %';
 ?>
diff --git a/interface/web/sites/lib/lang/id_ftp_sites_stats_list.lng b/interface/web/sites/lib/lang/id_ftp_sites_stats_list.lng
new file mode 100644
index 0000000000..03894607db
--- /dev/null
+++ b/interface/web/sites/lib/lang/id_ftp_sites_stats_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb["list_head_txt"] = 'FTP 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 (Download + Upload)';
+$wb["in_out_txt"] = 'DL/UL';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/id_ftp_user.lng b/interface/web/sites/lib/lang/id_ftp_user.lng
index 4898de245d..d63ffc4413 100644
--- a/interface/web/sites/lib/lang/id_ftp_user.lng
+++ b/interface/web/sites/lib/lang/id_ftp_user.lng
@@ -31,6 +31,5 @@ $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['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['directory_error_regex'] = 'Invalid directory';
+$wb['expires_txt'] = 'Expire at';
 ?>
diff --git a/interface/web/sites/lib/lang/id_web_aliasdomain.lng b/interface/web/sites/lib/lang/id_web_aliasdomain.lng
new file mode 100644
index 0000000000..4149c71149
--- /dev/null
+++ b/interface/web/sites/lib/lang/id_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['Domain'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/id_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/id_web_aliasdomain_list.lng
new file mode 100644
index 0000000000..e28071cbb3
--- /dev/null
+++ b/interface/web/sites/lib/lang/id_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Alias Domain';
+$wb['active_txt'] = 'Aktif';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Situs Web';
+$wb['domain_txt'] = 'Alias Domain';
+$wb['add_new_record_txt'] = 'Tambah Alias Domain Baru';
+$wb['domain_error_empty'] = 'Domain kosong.';
+$wb['domain_error_unique'] = 'Domain harus unik.';
+$wb['domain_error_regex'] = 'Nama Domain tidak valid.';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/sites/lib/lang/id_web_backup_list.lng b/interface/web/sites/lib/lang/id_web_backup_list.lng
index fa4a59b403..d1133334f0 100644
--- a/interface/web/sites/lib/lang/id_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/id_web_backup_list.lng
@@ -16,4 +16,6 @@ $wb['delete_confirm_txt'] = 'Really delete this backup?';
 $wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
 $wb['backup_type_mysql'] = 'MySQL Database';
 $wb['backup_type_web'] = 'Website files';
+$wb['filesize_txt'] = 'Filesize';
+$wb['backup_type_mongodb'] = 'MongoDB Database';
 ?>
diff --git a/interface/web/sites/lib/lang/id_web_childdomain.lng b/interface/web/sites/lib/lang/id_web_childdomain.lng
index 91abd0a4d7..60d32c30e1 100644
--- a/interface/web/sites/lib/lang/id_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/id_web_childdomain.lng
@@ -42,7 +42,7 @@ $wb['no_flag_txt'] = 'No flag';
 $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.';
 $wb['backup_interval_txt'] = 'Backup interval';
 $wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['ssl_key_txt'] = 'SSL Key';
@@ -115,5 +115,4 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
-
 ?>
diff --git a/interface/web/sites/lib/lang/id_web_childdomain_list.lng b/interface/web/sites/lib/lang/id_web_childdomain_list.lng
index 27205198b6..28fd89cc73 100644
--- a/interface/web/sites/lib/lang/id_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/id_web_childdomain_list.lng
@@ -4,12 +4,12 @@ $wb['active_txt'] = 'Aktif';
 $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Situs Web';
 $wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Tambah Subdomain Baru';
 $wb['domain_error_empty'] = 'Domain kosong.';
 $wb['domain_error_unique'] = 'Domain harus unik.';
 $wb['domain_error_regex'] = 'Nama Domain tidak valid.';
 $wb['no_redirect_txt'] = 'No redirect';
 $wb['no_flag_txt'] = 'No flag';
 $wb['none_txt'] = 'None';
-
+$wb['add_new_subdomain_txt'] = 'Add new Subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/id_web_directive_snippets.lng b/interface/web/sites/lib/lang/id_web_directive_snippets.lng
new file mode 100644
index 0000000000..05a004f654
--- /dev/null
+++ b/interface/web/sites/lib/lang/id_web_directive_snippets.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['directive_snippets_id_txt'] = 'Desired configuration';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/id_web_domain.lng b/interface/web/sites/lib/lang/id_web_domain.lng
new file mode 100644
index 0000000000..8ed9ad9dfe
--- /dev/null
+++ b/interface/web/sites/lib/lang/id_web_domain.lng
@@ -0,0 +1,132 @@
+<?php
+$wb['ssl_state_txt'] = 'Negara Bagian';
+$wb['ssl_locality_txt'] = 'Daerah';
+$wb['ssl_organisation_txt'] = 'Organisasi';
+$wb['ssl_organisation_unit_txt'] = 'Unit Organisasi';
+$wb['ssl_country_txt'] = 'Negara';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'Sertifikat SSL';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Tipe';
+$wb['parent_domain_id_txt'] = 'Situs Web Induk';
+$wb['redirect_type_txt'] = 'Tipe Pengalihan';
+$wb['redirect_path_txt'] = 'Path Pengalihan';
+$wb['active_txt'] = 'Aktif';
+$wb['document_root_txt'] = 'Root Dokumen';
+$wb['system_user_txt'] = 'Pengguna Linux';
+$wb['system_group_txt'] = 'Grup Linux';
+$wb['ip_address_txt'] = 'Alamat IP';
+$wb['vhost_type_txt'] = 'Tipe VHost';
+$wb['hd_quota_txt'] = 'Kuota Harddisk';
+$wb['traffic_quota_txt'] = 'Kuota Trafik';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Dokumen-Kesalahan Pribadi';
+$wb['subdomain_txt'] = 'Subdomain Otomatis';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Klien';
+$wb['limit_web_domain_txt'] = 'Jumlah maks domain web untuk akun Anda telah tercapai.';
+$wb['limit_web_aliasdomain_txt'] = 'Jumlah maks alias domain untuk akun Anda telah tercapai.';
+$wb['limit_web_subdomain_txt'] = 'Jumlah maks subdomain web untuk akun Anda telah tercapai.';
+$wb['apache_directives_txt'] = 'Perintah-perintah Apache';
+$wb['domain_error_empty'] = 'Domain kosong.';
+$wb['domain_error_unique'] = 'Sudah ada situs web atau sub/alias domain dengan nama domain ini.';
+$wb['domain_error_regex'] = 'Nama domain tidak valid.';
+$wb['hd_quota_error_empty'] = 'Kuota Harddisk 0 atau kosong.';
+$wb['traffic_quota_error_empty'] = 'Kuota Trafik kosong.';
+$wb['error_ssl_state_empty'] = 'SSL Negara Bagian kosong.';
+$wb['error_ssl_locality_empty'] = 'SSL Daerah kosong.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisasi kosong.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Unit Organisasi kosong.';
+$wb['error_ssl_country_empty'] = 'SSL Negara kosong.';
+$wb['client_group_id_txt'] = 'Klien';
+$wb['stats_password_txt'] = 'Kata Sandi Statistik Web';
+$wb['allow_override_txt'] = 'Allow Override';
+$wb['limit_web_quota_free_txt'] = 'Kuota Harddisk Maks yang tersedia';
+$wb['ssl_state_error_regex'] = 'Negara Bagian SSL tidak valid. Karakter yang valid adalah: a-z, 0-9 dan .,-_';
+$wb['ssl_locality_error_regex'] = 'Daerah SSL tidak valid. Karakter yang valid adalah: a-z, 0-9 dan .,-_';
+$wb['ssl_organisation_error_regex'] = 'Organisasi SSL tidak valid. Karakter yang valid adalah: a-z, 0-9 dan .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Unit Organisasi SSL tidak valid. Karakter yang valid adalah: a-z, 0-9 dan .,-_';
+$wb['ssl_country_error_regex'] = 'Negara SSL tidak valid. Karakter yang valid adalah: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Maks Kuota Trafik yang tersedia';
+$wb['redirect_error_regex'] = 'Path pengalihan tidak valid. Pengalihat yang valid adalah sebagai contoh: /test/ atau http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Kuota Trafik terlampaui';
+$wb['backup_interval_txt'] = 'Interval Pencadangan';
+$wb['backup_copies_txt'] = 'Jumlah salinan pencadangan';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Nama Pengguna Statistik Web';
+$wb['stats_type_txt'] = 'Program Statistik Web';
+$wb['custom_php_ini_txt'] = 'Pengaturan php.ini kastem';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['perl_txt'] = 'Perl';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['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['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_system_user_or_group_txt'] = 'Invalid system user or group';
+$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
+?>
diff --git a/interface/web/sites/lib/lang/id_web_domain_admin_list.lng b/interface/web/sites/lib/lang/id_web_domain_admin_list.lng
new file mode 100644
index 0000000000..468f4357e4
--- /dev/null
+++ b/interface/web/sites/lib/lang/id_web_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['sys_groupid_txt'] = 'Klien';
+$wb['list_head_txt'] = 'Situs Web';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Aktif';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Tambah Situs Web Baru';
+?>
diff --git a/interface/web/sites/lib/lang/id_web_domain_list.lng b/interface/web/sites/lib/lang/id_web_domain_list.lng
new file mode 100644
index 0000000000..ba627a2f4a
--- /dev/null
+++ b/interface/web/sites/lib/lang/id_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Situs Web';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Aktif';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Tambah Situs Web Baru';
+?>
diff --git a/interface/web/sites/lib/lang/id_web_subdomain.lng b/interface/web/sites/lib/lang/id_web_subdomain.lng
new file mode 100644
index 0000000000..79672f6feb
--- /dev/null
+++ b/interface/web/sites/lib/lang/id_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['ssl_state_txt'] = 'Negara Bagian';
+$wb['ssl_locality_txt'] = 'Daerah';
+$wb['ssl_organisation_txt'] = 'Organisasi';
+$wb['ssl_organisation_unit_txt'] = 'Unit Organisasi';
+$wb['ssl_country_txt'] = 'Negara';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'Sertifikat SSL';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Tipe';
+$wb['parent_domain_id_txt'] = 'Situs Web Induk';
+$wb['redirect_type_txt'] = 'Tipe Pengalihan';
+$wb['redirect_path_txt'] = 'Path Pengalihan';
+$wb['active_txt'] = 'Aktif';
+$wb['document_root_txt'] = 'Root Dokumen';
+$wb['system_user_txt'] = 'Pengguna Linux';
+$wb['system_group_txt'] = 'Grup Linux';
+$wb['ip_address_txt'] = 'Alamat IP';
+$wb['vhost_type_txt'] = 'Tipe VHost';
+$wb['hd_quota_txt'] = 'Kuota Harddisk';
+$wb['traffic_quota_txt'] = 'Kuota Trafik';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Klien';
+$wb['limit_web_domain_txt'] = 'Jumlah maks domain web untuk akun Anda telah tercapai.';
+$wb['limit_web_aliasdomain_txt'] = 'Jumlah maks aliasdomain untuk akun Anda telah tercapai.';
+$wb['limit_web_subdomain_txt'] = 'Jumlah maks subdomain web untuk akun Anda telah tercapai.';
+$wb['apache_directives_txt'] = 'Perintah-perintah Apache';
+$wb['domain_error_empty'] = 'Domain kosong.';
+$wb['domain_error_unique'] = 'Sudah ada situs web atau sub / aliasdomain pada nama domain ini.';
+$wb['domain_error_regex'] = 'Nama Domain tidak valid.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Path pengalihan tidak valid. Contoh pengalihan yang valid: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$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.';
+?>
diff --git a/interface/web/sites/lib/lang/id_web_subdomain_list.lng b/interface/web/sites/lib/lang/id_web_subdomain_list.lng
new file mode 100644
index 0000000000..a231bc7560
--- /dev/null
+++ b/interface/web/sites/lib/lang/id_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomain';
+$wb['active_txt'] = 'Aktif';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Situs Web';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Tambah Subdomain Baru';
+?>
diff --git a/interface/web/sites/lib/lang/id_web_vhost_domain.lng b/interface/web/sites/lib/lang/id_web_vhost_domain.lng
index 382bfa19fb..5817756a50 100644
--- a/interface/web/sites/lib/lang/id_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/id_web_vhost_domain.lng
@@ -16,7 +16,7 @@ $wb['parent_domain_id_txt'] = 'Situs Web Induk';
 $wb['redirect_type_txt'] = 'Tipe Pengalihan';
 $wb['redirect_path_txt'] = 'Path Pengalihan';
 $wb['active_txt'] = 'Aktif';
-$wb['document_root_txt'] = 'Root Dokumen';
+$wb['document_root_txt'] = 'Document Root';
 $wb['system_user_txt'] = 'Pengguna Linux';
 $wb['system_group_txt'] = 'Grup Linux';
 $wb['ip_address_txt'] = 'Alamat IP';
@@ -126,15 +126,20 @@ $wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a diff
 $wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
 $wb['host_txt'] = 'Hostname';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-
 $wb['variables_txt'] = 'Variables';
 $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $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_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
-$wb["document_root_txt"] = "Document Root";
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['load_client_data_txt'] = 'Load client details';
+$wb['load_my_data_txt'] = 'Load my contact details';
+$wb['reset_client_data_txt'] = 'Reset data';
+$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
diff --git a/interface/web/sites/lib/lang/id_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/id_web_vhost_domain_list.lng
index 080c9d89a6..32ddc61283 100644
--- a/interface/web/sites/lib/lang/id_web_vhost_domain_list.lng
+++ b/interface/web/sites/lib/lang/id_web_vhost_domain_list.lng
@@ -6,5 +6,4 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domain';
 $wb['add_new_record_txt'] = 'Tambah Situs Web Baru';
 $wb['parent_domain_id_txt'] = 'Website';
-
 ?>
diff --git a/interface/web/sites/lib/lang/id_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/id_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..c0ca93b570
--- /dev/null
+++ b/interface/web/sites/lib/lang/id_web_vhost_subdomain.lng
@@ -0,0 +1,127 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Variables';
+$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['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+?>
diff --git a/interface/web/sites/lib/lang/id_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/id_web_vhost_subdomain_list.lng
new file mode 100644
index 0000000000..1c16bcda28
--- /dev/null
+++ b/interface/web/sites/lib/lang/id_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
+?>
diff --git a/interface/web/sites/lib/lang/it.lng b/interface/web/sites/lib/lang/it.lng
index 62f50b7328..77473bd0f8 100644
--- a/interface/web/sites/lib/lang/it.lng
+++ b/interface/web/sites/lib/lang/it.lng
@@ -7,9 +7,9 @@ $wb['Database'] = 'Databases';
 $wb['Web Access'] = 'Web Access';
 $wb['FTP-User'] = 'Utente FTP';
 $wb['Webdav-User'] = 'Utente Webdav';
-$wb['Folder'] = 'Protected Folders';
-$wb['Folder users'] = 'Protected Folder Users';
-$wb['Command Line'] = 'Command Line';
+$wb['Folder'] = 'Cartelle Protette';
+$wb['Folder users'] = 'Utenti Cartelle Protette';
+$wb['Command Line'] = 'Linea di Comando';
 $wb['Shell-User'] = 'Utente Shell';
 $wb['Cron Jobs'] = 'Cron Jobs';
 $wb['Statistics'] = 'Statistiche';
@@ -25,11 +25,11 @@ $wb['Domain'] = 'Dominio';
 $wb['Redirect'] = 'Redirect';
 $wb['SSL'] = 'SSL';
 $wb['Sites'] = 'Sito web';
-$wb['Database User'] = 'Database Users';
+$wb['Database User'] = 'Utente Database';
 $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['Available packages'] = 'Pacchetti disponibili';
+$wb['Installed packages'] = 'Pacchetti  Installati';
+$wb['Update Packagelist'] = 'Aggiorna Elenco Pacchetti';
+$wb['Subdomain (Vhost)'] = 'Sottodominio (Vhost)';
+$wb['error_proxy_requires_url'] = 'Tipo reinderizzamento \\"proxy\\" richiede una URL come percorso del reinderizzamento.';
 ?>
diff --git a/interface/web/sites/lib/lang/it_aps.lng b/interface/web/sites/lib/lang/it_aps.lng
index 29fb7b6a40..ced17becd3 100644
--- a/interface/web/sites/lib/lang/it_aps.lng
+++ b/interface/web/sites/lib/lang/it_aps.lng
@@ -1,58 +1,58 @@
 <?php
-$wb['overview_txt'] = 'Overview';
-$wb['administration_txt'] = 'Administration';
-$wb['available_packages_txt'] = 'Available packages';
-$wb['installed_packages_txt'] = 'Installed packages';
+$wb['overview_txt'] = 'Anteprima';
+$wb['administration_txt'] = 'Amministrazione';
+$wb['available_packages_txt'] = 'Pacchetti disponibili';
+$wb['installed_packages_txt'] = 'Pacchetti installati';
 $wb['yes_txt'] = 'Yes';
 $wb['no_txt'] = 'No';
-$wb['invalid_id_txt'] = 'No valid ID has been provided.';
-$wb['details_txt'] = 'Details';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
+$wb['invalid_id_txt'] = 'Nessun ID valido è stato fornito.';
+$wb['details_txt'] = 'Dettagli';
+$wb['version_txt'] = 'Versione';
+$wb['category_txt'] = 'Categoria';
 $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['supported_languages_txt'] = 'Localizzazione supportata';
+$wb['description_txt'] = 'Descrizione';
+$wb['config_script_txt'] = 'Script di Configurazione';
+$wb['installed_size_txt'] = 'Dimensione dopo l installazione';
+$wb['license_txt'] = 'Licenza';
 $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['server_requirements_txt'] = 'Requisiti server ';
+$wb['php_extensions_txt'] = 'Estensioni PHP';
+$wb['php_settings_txt'] = 'Impostazioni PHP';
+$wb['supported_php_versions_txt'] = 'Versioni PHP supportate';
 $wb['database_txt'] = 'Database';
-$wb['settings_txt'] = 'Settings';
-$wb['install_package_txt'] = 'Install this package';
-$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['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_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['packagelist_update_finished_txt'] = 'APS Packagelist update finished.';
-$wb['btn_install_txt'] = 'Install';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['limit_aps_txt'] = 'The max. number of APS instances for your account is reached.';
+$wb['settings_txt'] = 'Impostazioni';
+$wb['install_package_txt'] = 'Installa questo pacchetto';
+$wb['installation_txt'] = 'Installazione';
+$wb['install_location_txt'] = 'Posizione installazione';
+$wb['acceptance_txt'] = 'Accettazione';
+$wb['acceptance_text_txt'] = 'SI, ho letto la licenza ad accetto.';
+$wb['install_language_txt'] = 'Lingua Interfaccia';
+$wb['new_database_password_txt'] = 'Nuova password database';
+$wb['basic_settings_txt'] = 'Impostazioni di base';
+$wb['package_settings_txt'] = 'Impostazioni Pacchetto';
+$wb['error_main_domain'] = 'Il dominio del percorso di installazione è errato.';
+$wb['error_no_main_location'] = 'Hai fornito un percorso di installazione non valido.';
+$wb['error_inv_main_location'] = 'La cartella di installazione fornita non è valida.';
+$wb['error_license_agreement'] = 'Per poter proseguire è necessario che prendi visione ed accetti l accordi di licenza.';
+$wb['error_no_database_pw'] = 'La password fornita non è valida.';
+$wb['error_short_database_pw'] = 'Per favore scegli una password di database più lunga.';
+$wb['error_no_value_for'] = 'Il campo \\"%s\\" non può essere vuoto.';
+$wb['error_short_value_for'] = 'Il campo \\"%s\\" richiede un valore immesso più lungo.';
+$wb['error_long_value_for'] = 'Il campo \\"%s\\" richiede un valore immesso più corto.';
+$wb['error_inv_value_for'] = 'Hai inserito un valore non valido per il campo \\"%s\\".';
+$wb['error_inv_email_for'] = 'Hai inserito un indirizzo email non valido per il campo \\"%s\\".';
+$wb['error_inv_domain_for'] = 'Hai inserito un dominio non valido per il campo \\"%s\\".';
+$wb['error_inv_integer_for'] = 'Hai inserito un numero non valido per il campo  \\"%s\\".';
+$wb['error_inv_float_for'] = 'Hai inserito un numero di floating point non valido per il campo \\"%s\\".';
+$wb['error_used_location'] = 'L installazione della patch  contiene già un pacchetto di installazione.';
+$wb['installation_task_txt'] = 'Installazione pianificata';
+$wb['installation_error_txt'] = 'Errore di installazione';
+$wb['installation_success_txt'] = 'Installato';
+$wb['installation_remove_txt'] = 'Rimozione pianificata';
+$wb['packagelist_update_finished_txt'] = 'Elenco aggiornamenti APS terminato.';
+$wb['btn_install_txt'] = 'Installa';
+$wb['btn_cancel_txt'] = 'Annulla';
+$wb['limit_aps_txt'] = 'Nmero massimo di istanza APS raggiunto per il tuo account.';
 ?>
diff --git a/interface/web/sites/lib/lang/it_aps_instances_list.lng b/interface/web/sites/lib/lang/it_aps_instances_list.lng
index 5742b7a6e9..312b9e6baa 100644
--- a/interface/web/sites/lib/lang/it_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/it_aps_instances_list.lng
@@ -1,11 +1,11 @@
 <?php
-$wb['list_head_txt'] = 'Installed packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['customer_txt'] = 'Client';
+$wb['list_head_txt'] = 'Pacchetti Installati';
+$wb['name_txt'] = 'Nome';
+$wb['version_txt'] = 'Versione';
+$wb['customer_txt'] = 'Cliente';
 $wb['status_txt'] = 'Status';
-$wb['install_location_txt'] = 'Install location';
-$wb['pkg_delete_confirmation'] = 'Do you really want to delete this installation?';
-$wb['filter_txt'] = 'Search';
-$wb['delete_txt'] = 'Delete';
+$wb['install_location_txt'] = 'Percorso Installazione';
+$wb['pkg_delete_confirmation'] = 'Desideri davvero eliminare questa installazione?';
+$wb['filter_txt'] = 'Cerca';
+$wb['delete_txt'] = 'Elimina';
 ?>
diff --git a/interface/web/sites/lib/lang/it_aps_packages_list.lng b/interface/web/sites/lib/lang/it_aps_packages_list.lng
index 68c378085f..187818049a 100644
--- a/interface/web/sites/lib/lang/it_aps_packages_list.lng
+++ b/interface/web/sites/lib/lang/it_aps_packages_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Available packages';
-$wb['name_txt'] = 'Name';
-$wb['version_txt'] = 'Version';
-$wb['category_txt'] = 'Category';
-$wb['status_txt'] = 'Unlocked';
-$wb['filter_txt'] = 'Search';
+$wb['list_head_txt'] = 'Pacchetti disponibili';
+$wb['name_txt'] = 'Nome';
+$wb['version_txt'] = 'Versione';
+$wb['category_txt'] = 'Categoria';
+$wb['status_txt'] = 'Sbloccato';
+$wb['filter_txt'] = 'Cerca';
 ?>
diff --git a/interface/web/sites/lib/lang/it_aps_update_packagelist.lng b/interface/web/sites/lib/lang/it_aps_update_packagelist.lng
index ce9fcf68fb..aae7a4ba5c 100644
--- a/interface/web/sites/lib/lang/it_aps_update_packagelist.lng
+++ b/interface/web/sites/lib/lang/it_aps_update_packagelist.lng
@@ -1,7 +1,7 @@
 <?php
-$wb['head_txt'] = 'Update Packagelist';
+$wb['head_txt'] = 'Aggiorna Elenco Pacchetti';
 $wb['list_desc_txt'] = '';
-$wb['btn_start_txt'] = 'Update Packagelist';
-$wb['btn_cancel_txt'] = 'Cancel';
-$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.';
+$wb['btn_start_txt'] = 'Aggiorna Elenco Pacchetti';
+$wb['btn_cancel_txt'] = 'Annulla';
+$wb['legend_txt'] = 'Da qui puoi aggiornare la lista dei pacchetti disponibili. Considera che questo può richiedere anche fino a 5 minuti. Puoi abbandonare questa pagina se lo desideri; il processo continuerà in background.';
 ?>
diff --git a/interface/web/sites/lib/lang/it_backup_stats_list.lng b/interface/web/sites/lib/lang/it_backup_stats_list.lng
index 0f3803f56a..65792aa591 100644
--- a/interface/web/sites/lib/lang/it_backup_stats_list.lng
+++ b/interface/web/sites/lib/lang/it_backup_stats_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb["database_name_txt"]   = '';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Domain';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['database_name_txt'] = '';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/sites/lib/lang/it_cron.lng b/interface/web/sites/lib/lang/it_cron.lng
index 369c3b8bbd..2c01c67055 100644
--- a/interface/web/sites/lib/lang/it_cron.lng
+++ b/interface/web/sites/lib/lang/it_cron.lng
@@ -1,24 +1,26 @@
 <?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['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.';
-$wb['run_hour_error_format'] = 'Invalid format for hours.';
-$wb['run_mday_error_format'] = 'Invalid format for days of month.';
-$wb['run_month_error_format'] = 'Invalid format for months.';
-$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['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['active_txt'] = 'Attivo';
+$wb['client_txt'] = 'Cliente';
+$wb['run_min_txt'] = 'Minuti';
+$wb['run_hour_txt'] = 'Ore';
+$wb['run_mday_txt'] = 'Giorni del mese';
+$wb['run_month_txt'] = 'Mesi';
+$wb['run_wday_txt'] = 'Giorni della settimana';
+$wb['command_txt'] = 'Comando da lanciare(comandi eseguiti via sh, urls via wget)';
+$wb['limit_cron_txt'] = 'Hai raggiunto il numero massimo di cron jobs.';
+$wb['limit_cron_frequency_txt'] = 'La frequenza del cron job supera il limite consentito.';
+$wb['run_min_error_format'] = 'Formato non valido per minuti.';
+$wb['run_hour_error_format'] = 'Formato non valido per ore.';
+$wb['run_mday_error_format'] = 'Formato non valido per giorni del mese.';
+$wb['run_month_error_format'] = 'Formato non valido per  mesi.';
+$wb['run_wday_error_format'] = 'Formato non valido pergiorni della settimana.';
+$wb['command_error_format'] = 'Formato comando non valido. Nota nel caso di una url è consentito richiamare solo http/https.';
+$wb['unknown_fieldtype_error'] = 'Campo sconosciuto.';
+$wb['server_id_error_empty'] = 'Server ID  vuoto.';
+$wb['limit_cron_url_txt'] = 'Solo URL cron. Per cortesia inserire una URL che inizi con http:// come comando cron.';
+$wb['command_error_empty'] = 'Command  vuoto.';
+$wb['command_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
+$wb['log_output_txt'] = 'Log output';
 ?>
diff --git a/interface/web/sites/lib/lang/it_cron_list.lng b/interface/web/sites/lib/lang/it_cron_list.lng
index 308024dcdf..2d1799279f 100644
--- a/interface/web/sites/lib/lang/it_cron_list.lng
+++ b/interface/web/sites/lib/lang/it_cron_list.lng
@@ -1,13 +1,13 @@
 <?php
 $wb['list_head_txt'] = 'Cron Jobs';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Attivo';
 $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'] = 'Minuti';
+$wb['run_hour_txt'] = 'Ore';
+$wb['run_mday_txt'] = 'Giorno del mese';
+$wb['run_month_txt'] = 'Mese';
+$wb['run_wday_txt'] = 'Giorno Settimana';
+$wb['command_txt'] = 'Comando';
+$wb['add_new_cron_txt'] = 'Aggiungi un Cron Job';
+$wb['parent_domain_id_txt'] = 'Sito';
 ?>
diff --git a/interface/web/sites/lib/lang/it_database.lng b/interface/web/sites/lib/lang/it_database.lng
index 338ddb99ee..7ee6a1e216 100644
--- a/interface/web/sites/lib/lang/it_database.lng
+++ b/interface/web/sites/lib/lang/it_database.lng
@@ -10,37 +10,40 @@ $wb['remote_access_txt'] = 'Accesso remoto';
 $wb['client_txt'] = 'Cliente';
 $wb['active_txt'] = 'Attivo';
 $wb['database_name_error_empty'] = 'Il nome database è vuoto.';
-$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_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.';
-$wb['database_name_change_txt'] = 'The database name can not be changed';
-$wb['database_charset_change_txt'] = 'The database charset can not be changed';
-$wb['remote_ips_txt'] = 'Remote Access IPs (separate by , and leave blank for <i>any</i>)';
-$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['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_name_error_unique'] = 'Esiste già un nome di database con questo nome sul server. Per ottenere un nome unico, ad esempio. preponi il nome del tuo dominio al nome di database.';
+$wb['database_name_error_regex'] = 'Nome database non valido. Il nome database può contenere i seguenti caratteri: a-z, A-Z, 0-9 e underscore. Lungheezza: 2 - 64 caratteri.';
+$wb['database_user_error_empty'] = 'Utente Database vuoto.';
+$wb['database_user_error_unique'] = 'Esiste già un utente di database con questo nome sul server. Per ottenere un nome unico, ad esempio. preponi il nome del tuo dominio al nome utente.';
+$wb['database_user_error_regex'] = 'Nome utente database non valido. Il nome utente di database può contenere i seguenti caratteri: a-z, A-Z, 0-9 e underscore. Lunghezza: 2 - 64 caratteri.';
+$wb['limit_database_txt'] = 'Numero massimo di databases raggiunto.';
+$wb['database_name_change_txt'] = 'Il nome di database non può essere modificato';
+$wb['database_charset_change_txt'] = 'Il charset per il database non può essere modificato';
+$wb['remote_ips_txt'] = 'Accesso IP remoti(separa con , e lascia campo vuoto per <i>qualunque</i>)';
+$wb['database_remote_error_ips'] = 'Almeno uno degli indirizzi IP inseriti non è valido.';
+$wb['database_name_error_len'] = 'Nome Database - {db} - troppo lungo. La lunghezza massima compreso il prefisso è di 64 caratteri.';
+$wb['database_user_error_len'] = 'Nome utente Database - {user}- troppo lungo. La lunghezza massima compreso il prefisso è di 16 caratteri.';
+$wb['parent_domain_id_txt'] = 'Sito';
+$wb['database_site_error_empty'] = 'Seleziona a chi appartiene il database.';
+$wb['select_site_txt'] = '- Seleziona Sito -';
+$wb['btn_save_txt'] = 'Salva';
+$wb['btn_cancel_txt'] = 'Annulla';
+$wb['generate_password_txt'] = 'Genera Password';
+$wb['repeat_password_txt'] = 'Ripeti Password';
+$wb['password_mismatch_txt'] = 'Le password non coincidono.';
+$wb['password_match_txt'] = 'Le password coincidono.';
+$wb['globalsearch_resultslimit_of_txt'] = 'di';
+$wb['globalsearch_resultslimit_results_txt'] = 'risultati';
+$wb['globalsearch_noresults_text_txt'] = 'Nesuun risultato.';
+$wb['globalsearch_noresults_limit_txt'] = '0 risultati';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Cerca';
+$wb['globalsearch_suggestions_text_txt'] = 'Suggerimenti';
+$wb['database_ro_user_txt'] = 'Utente database di sola lettura';
+$wb['optional_txt'] = 'opzionale';
+$wb['select_dbuser_txt'] = 'Seleziona utente database';
+$wb['no_dbuser_txt'] = 'Nessuno';
+$wb['database_client_differs_txt'] = 'Il cliente del sito parent e il database non coincidono.';
+$wb['database_user_missing_txt'] = 'Per favore selezionare un utente per questo database.';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
 ?>
diff --git a/interface/web/sites/lib/lang/it_database_admin_list.lng b/interface/web/sites/lib/lang/it_database_admin_list.lng
index 27e62b9ac6..163440f57e 100644
--- a/interface/web/sites/lib/lang/it_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/it_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['active_txt'] = 'Attivo';
+$wb['remote_access_txt'] = 'Accesso Remoto';
 $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'] = 'Utente Database';
+$wb['database_name_txt'] = 'Nome Database';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo  Database';
+$wb['sys_groupid_txt'] = 'Cliente';
+$wb['parent_domain_id_txt'] = 'Sito Web';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/it_database_list.lng b/interface/web/sites/lib/lang/it_database_list.lng
index 7e66ceb09b..09abd791bb 100644
--- a/interface/web/sites/lib/lang/it_database_list.lng
+++ b/interface/web/sites/lib/lang/it_database_list.lng
@@ -5,6 +5,7 @@ $wb['remote_access_txt'] = 'Accesso remoto';
 $wb['server_id_txt'] = 'Server';
 $wb['database_name_txt'] = 'Nome Database';
 $wb['add_new_record_txt'] = 'Aggiungi nuovo Database';
-$wb['database_user_txt'] = 'Database user';
-$wb['parent_domain_id_txt'] = 'Website';
+$wb['database_user_txt'] = 'Utente Database';
+$wb['parent_domain_id_txt'] = 'Sito Web';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/it_database_quota_stats_list.lng b/interface/web/sites/lib/lang/it_database_quota_stats_list.lng
index e1de70accf..4f92576007 100644
--- a/interface/web/sites/lib/lang/it_database_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/it_database_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["database_txt"] = 'Database';
-$wb["server_name_txt"] = 'Server';
-$wb["client_txt"] = 'Client';
-$wb["used_txt"] = 'Used space';
-$wb["quota_txt"] = 'Quota';
-$wb["percentage_txt"] = 'Used in %';
+$wb['database_txt'] = 'Database';
+$wb['server_name_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb['used_txt'] = 'Used space';
+$wb['quota_txt'] = 'Quota';
+$wb['percentage_txt'] = 'Used in %';
 ?>
diff --git a/interface/web/sites/lib/lang/it_database_user.lng b/interface/web/sites/lib/lang/it_database_user.lng
index 66a0718349..bb4da9dc92 100644
--- a/interface/web/sites/lib/lang/it_database_user.lng
+++ b/interface/web/sites/lib/lang/it_database_user.lng
@@ -1,23 +1,23 @@
 <?php
-$wb['database_user_txt'] = 'Database user';
+$wb['database_user_txt'] = 'Utente Database';
 $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_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['password_strength_txt'] = 'Livello sicurezza Password';
+$wb['client_txt'] = 'Cliente';
+$wb['active_txt'] = 'Attivo';
+$wb['database_user_error_empty'] = 'Utente Database   vuoto.';
+$wb['database_user_error_unique'] = 'Nome utente database già presente su questo server. Per ottener un nome univoco ad esempio preponi il tuo dominio al nome utente.';
+$wb['database_user_error_regex'] = 'Nome utente database non valido.IL nome utente può contenere i seguenti caratteri: a-z, A-Z, 0-9 and the underscore. lunghezza: 2 - 64 characters.';
+$wb['database_user_error_len'] = 'Nome Utente Database - {user} - troppo lungo. Lunghezza massima per nome utente di database incluso prefissso: 16 caratteri.';
+$wb['btn_save_txt'] = 'Salva';
+$wb['btn_cancel_txt'] = 'Annulla';
+$wb['generate_password_txt'] = 'Genera Password';
+$wb['repeat_password_txt'] = 'Ripeti Password';
+$wb['password_mismatch_txt'] = 'Le password non coincidono.';
+$wb['password_match_txt'] = 'Le password coincidono.';
 $wb['globalsearch_resultslimit_of_txt'] = 'of';
 $wb['globalsearch_resultslimit_results_txt'] = 'results';
-$wb['globalsearch_noresults_text_txt'] = 'No results.';
+$wb['globalsearch_noresults_text_txt'] = 'Nessun results.';
 $wb['globalsearch_noresults_limit_txt'] = '0 results';
-$wb['globalsearch_searchfield_watermark_txt'] = 'Search';
-$wb['globalsearch_suggestions_text_txt'] = 'Suggestions';
+$wb['globalsearch_searchfield_watermark_txt'] = 'Cerca';
+$wb['globalsearch_suggestions_text_txt'] = 'Suggerimenti';
 ?>
diff --git a/interface/web/sites/lib/lang/it_database_user_admin_list.lng b/interface/web/sites/lib/lang/it_database_user_admin_list.lng
index d7f88c4c36..487abc8437 100644
--- a/interface/web/sites/lib/lang/it_database_user_admin_list.lng
+++ b/interface/web/sites/lib/lang/it_database_user_admin_list.lng
@@ -1,6 +1,6 @@
 <?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'] = 'Utente Databaser';
+$wb['database_user_txt'] = 'Utente Databaser';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo  User';
+$wb['sys_groupid_txt'] = 'Cliente';
 ?>
diff --git a/interface/web/sites/lib/lang/it_database_user_list.lng b/interface/web/sites/lib/lang/it_database_user_list.lng
index 8c226496a6..39e74b3b49 100644
--- a/interface/web/sites/lib/lang/it_database_user_list.lng
+++ b/interface/web/sites/lib/lang/it_database_user_list.lng
@@ -1,5 +1,5 @@
 <?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'] = 'Utente Database';
+$wb['database_user_txt'] = 'Utente Database';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo  utente';
 ?>
diff --git a/interface/web/sites/lib/lang/it_ftp_sites_stats_list.lng b/interface/web/sites/lib/lang/it_ftp_sites_stats_list.lng
new file mode 100644
index 0000000000..03894607db
--- /dev/null
+++ b/interface/web/sites/lib/lang/it_ftp_sites_stats_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb["list_head_txt"] = 'FTP 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 (Download + Upload)';
+$wb["in_out_txt"] = 'DL/UL';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/it_ftp_user.lng b/interface/web/sites/lib/lang/it_ftp_user.lng
index bdd7818166..36b068335b 100644
--- a/interface/web/sites/lib/lang/it_ftp_user.lng
+++ b/interface/web/sites/lib/lang/it_ftp_user.lng
@@ -9,28 +9,27 @@ $wb['ul_bandwidth_txt'] = 'Banda Upload';
 $wb['dl_bandwidth_txt'] = 'Banda Download';
 $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Sito';
-$wb['username_txt'] = 'Username';
+$wb['username_txt'] = 'Nome Utente';
 $wb['password_txt'] = 'Password';
-$wb['password_strength_txt'] = 'Password strength';
-$wb['quota_size_txt'] = 'Harddisk-Quota';
+$wb['password_strength_txt'] = 'Livello sicurezza Password';
+$wb['quota_size_txt'] = 'Quota Spazio Disco';
 $wb['active_txt'] = 'Attivo';
-$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_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['limit_ftp_user_txt'] = 'Hai raggiunto il numero masslimo consentito di utenti FTP per il tuo account.';
+$wb['username_error_empty'] = 'Nome utente  vuoto.';
+$wb['username_error_unique'] = 'Nome utente deve essere unico.';
+$wb['username_error_regex'] = 'Il nome utente contiene dei carateri che non sono ammessi.';
+$wb['quota_size_error_empty'] = 'Quota  vuoto.';
+$wb['uid_error_empty'] = 'GID vuoto.';
+$wb['directory_error_empty'] = 'Directory vuoto.';
 $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_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['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['directory_error_regex'] = 'Invalid directory';
+$wb['directory_error_notinweb'] = 'Cartella esterna all web root directory.';
+$wb['parent_domain_id_error_empty'] = 'Nessun sito web selezionato.';
+$wb['quota_size_error_regex'] = 'Quota:inserire -1 per illimitata o un numero > 0';
+$wb['dir_dot_error'] = 'No .. autorizzato nel percorso.';
+$wb['dir_slashdot_error'] = 'No ./ autorizzato nel percorso.';
+$wb['generate_password_txt'] = 'Genera Password';
+$wb['repeat_password_txt'] = 'Ripeti Password';
+$wb['password_mismatch_txt'] = 'Le password non coincidono.';
+$wb['password_match_txt'] = 'Le password coincidono.';
+$wb['expires_txt'] = 'Expire at';
 ?>
diff --git a/interface/web/sites/lib/lang/it_ftp_user_list.lng b/interface/web/sites/lib/lang/it_ftp_user_list.lng
index 9469625771..27e214b6db 100644
--- a/interface/web/sites/lib/lang/it_ftp_user_list.lng
+++ b/interface/web/sites/lib/lang/it_ftp_user_list.lng
@@ -3,6 +3,6 @@ $wb['list_head_txt'] = 'Utente FTP';
 $wb['active_txt'] = 'Attivo';
 $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Sito';
-$wb['username_txt'] = 'Username';
+$wb['username_txt'] = 'Nome Utente';
 $wb['add_new_record_txt'] = 'Aggiungi nuovo utente FTP';
 ?>
diff --git a/interface/web/sites/lib/lang/it_shell_user.lng b/interface/web/sites/lib/lang/it_shell_user.lng
index 0b274d33aa..53af373542 100644
--- a/interface/web/sites/lib/lang/it_shell_user.lng
+++ b/interface/web/sites/lib/lang/it_shell_user.lng
@@ -2,35 +2,35 @@
 $wb['shell_txt'] = 'Shell';
 $wb['dir_txt'] = 'Dir';
 $wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Site';
-$wb['username_txt'] = 'Username';
+$wb['parent_domain_id_txt'] = 'Sito';
+$wb['username_txt'] = 'Nome Utente';
 $wb['password_txt'] = 'Password';
-$wb['password_strength_txt'] = 'Password strength';
+$wb['password_strength_txt'] = 'Livello sicurezza Password';
 $wb['chroot_txt'] = 'Chroot Shell';
 $wb['quota_size_txt'] = 'Quota';
-$wb['active_txt'] = 'Active';
-$wb['username_error_empty'] = 'Username is empty.';
-$wb['username_error_unique'] = 'The username must be unique.';
-$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['limit_shell_user_txt'] = 'The max number of shell users is reached.';
-$wb['parent_domain_id_error_empty'] = 'No website selected.';
-$wb['puser_txt'] = 'Web Username';
-$wb['pgroup_txt'] = 'Web Group';
+$wb['active_txt'] = 'Attivo';
+$wb['username_error_empty'] = 'Username  vuoto.';
+$wb['username_error_unique'] = 'Il nome utente deve essere unico.';
+$wb['username_error_regex'] = 'Nome utente contiene caratteri non autorizzati.';
+$wb['quota_size_error_empty'] = 'Valore Quota  vuoto.';
+$wb['uid_error_empty'] = 'GID vuoto.';
+$wb['directory_error_empty'] = 'Valore direttrice vuoto.';
+$wb['limit_shell_user_txt'] = 'Numero massimo utenti shell raggiunto.';
+$wb['parent_domain_id_error_empty'] = 'Nessun sito selezionato.';
+$wb['puser_txt'] = 'Nome utente web';
+$wb['pgroup_txt'] = 'Gruppo web';
 $wb['ssh_rsa_txt'] = 'SSH-RSA Public Key (for key-based logins)';
-$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['username_must_not_exceed_32_chars_txt'] = 'The username must not exceed 32 characters.';
-$wb['username_not_allowed_txt'] = 'The username is not allowed.';
-$wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['directory_error_regex'] = 'Invalid directory';
-$wb['shell_error_regex'] = 'Invalid shell';
-$wb['invalid_username_txt'] = 'Invalid Username';
-$wb['directory_error_notinweb'] = 'The directory has to be inside the web root.';
+$wb['dir_dot_error'] = 'Nessun .. consentito nel percorso.';
+$wb['dir_slashdot_error'] = 'Nessun ./ consentito nel percorso.';
+$wb['generate_password_txt'] = 'Genera Password';
+$wb['repeat_password_txt'] = 'Ripeti Password';
+$wb['password_mismatch_txt'] = 'Le password non coincidono.';
+$wb['password_match_txt'] = 'Le password coincidono.';
+$wb['username_must_not_exceed_32_chars_txt'] = 'il nome utente non deve superare i 32 caratteri.';
+$wb['username_not_allowed_txt'] = 'L utente non è autorizzato.';
+$wb['invalid_system_user_or_group_txt'] = 'Utenti di sistema o gruppo non valido';
+$wb['directory_error_regex'] = 'Direttrice non valida';
+$wb['shell_error_regex'] = 'shell non valida';
+$wb['invalid_username_txt'] = 'Nome utente non valido';
+$wb['directory_error_notinweb'] = 'La direttrice deve essere all interno della direttrice del sito .';
 ?>
diff --git a/interface/web/sites/lib/lang/it_shell_user_list.lng b/interface/web/sites/lib/lang/it_shell_user_list.lng
index e6fc063c8d..a007564598 100644
--- a/interface/web/sites/lib/lang/it_shell_user_list.lng
+++ b/interface/web/sites/lib/lang/it_shell_user_list.lng
@@ -3,6 +3,6 @@ $wb['list_head_txt'] = 'Utente Shell';
 $wb['active_txt'] = 'Attivo';
 $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Sito';
-$wb['username_txt'] = 'Username';
+$wb['username_txt'] = 'Nome Utente';
 $wb['add_new_record_txt'] = 'Aggiungi nuovo Shell';
 ?>
diff --git a/interface/web/sites/lib/lang/it_user_quota_stats_list.lng b/interface/web/sites/lib/lang/it_user_quota_stats_list.lng
index ea0bed2b77..11ebce95b6 100644
--- a/interface/web/sites/lib/lang/it_user_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/it_user_quota_stats_list.lng
@@ -1,9 +1,9 @@
 <?php
-$wb['list_head_txt'] = 'Website harddisk quota';
+$wb['list_head_txt'] = 'Quota Spazio Disco Sito Web';
 $wb['domain_txt'] = 'Dominio / Sito web';
 $wb['system_user_txt'] = 'Utente linux';
 $wb['used_txt'] = 'Spazio usato';
 $wb['hard_txt'] = 'Limite rigido';
 $wb['soft_txt'] = 'Limite lasco';
-$wb['files_txt'] = 'Single files';
+$wb['files_txt'] = 'Files Singoli';
 ?>
diff --git a/interface/web/sites/lib/lang/it_web_aliasdomain.lng b/interface/web/sites/lib/lang/it_web_aliasdomain.lng
new file mode 100644
index 0000000000..4723783201
--- /dev/null
+++ b/interface/web/sites/lib/lang/it_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Domini Alias';
+$wb['backup_interval_txt'] = 'Backup intervallo';
+$wb['backup_copies_txt'] = 'Numero copie di backup';
+$wb['ssl_state_txt'] = 'Stato';
+$wb['ssl_locality_txt'] = 'Paese';
+$wb['ssl_organisation_txt'] = 'Nome Organizzazione';
+$wb['ssl_organisation_unit_txt'] = 'Nome Unità di organizzazione';
+$wb['ssl_country_txt'] = 'Città';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Richiesta';
+$wb['ssl_cert_txt'] = 'SSL Certificato';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['web_folder_error_regex'] = 'Percorso inserito non valido. Non inserire slash.';
+$wb['type_txt'] = 'Tipo';
+$wb['parent_domain_id_txt'] = 'Sito Parent';
+$wb['redirect_type_txt'] = 'Tipo di Redirect';
+$wb['redirect_path_txt'] = 'Redirect Path';
+$wb['active_txt'] = 'Attivo';
+$wb['document_root_txt'] = 'Cartella del sito';
+$wb['system_user_txt'] = 'Utente Linux';
+$wb['system_group_txt'] = 'Gruppo Linux';
+$wb['ip_address_txt'] = 'Indirizzo IPv4';
+$wb['ipv6_address_txt'] = 'Indirizzo IPv6';
+$wb['vhost_type_txt'] = 'VHost Tipo';
+$wb['hd_quota_txt'] = 'Quota Disco';
+$wb['traffic_quota_txt'] = 'Quota Traffico';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Documenti di errore personalizzati';
+$wb['subdomain_txt'] = 'Auto-Sottodominio';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Cliente';
+$wb['limit_web_domain_txt'] = 'Numero massimo domini per il tuo account raggiunti.';
+$wb['limit_web_aliasdomain_txt'] = 'Numero massimo domini alias per il tuo account è stato raggiunto.';
+$wb['limit_web_subdomain_txt'] = 'Numero massimo sottodomini per il tuo account raggiunto.';
+$wb['apache_directives_txt'] = 'Apache Direttive';
+$wb['domain_error_empty'] = 'Domain  vuoto.';
+$wb['domain_error_unique'] = 'Esiste già un sito o sottodominio / domino alias con questo nome dominio.';
+$wb['domain_error_regex'] = 'Nome dominio non valido.';
+$wb['domain_error_autosub'] = 'Impostazioni di sottodominio esistenti.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota 0 o vuoto.';
+$wb['traffic_quota_error_empty'] = 'Campo Quota Traffico  vuoto.';
+$wb['error_ssl_state_empty'] = 'SSL State  vuoto.';
+$wb['error_ssl_locality_empty'] = 'SSL Paese vuoto.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organizzazione  vuoto.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit  vuoto.';
+$wb['error_ssl_country_empty'] = 'SSL Città vuoto.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificato vuoto';
+$wb['client_group_id_txt'] = 'Cliente';
+$wb['stats_password_txt'] = 'Impostare password accesso a Statistiche Web';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Quota disco massima disponibile';
+$wb['ssl_state_error_regex'] = 'Campo Stato SSL non valido.Valori accettati: a-z, 0-9 e .,-_';
+$wb['ssl_locality_error_regex'] = 'Campo SSL Locality  non valido.. Caratteri ammessi: a-z, 0-9 e .,-_';
+$wb['ssl_organisation_error_regex'] = 'Campo  SSL Organisation  non valido.. Caratteri ammessi: a-z, 0-9 e .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Campo SSL Organisation Unit. Caratteri ammessi: a-z, 0-9 e .,-_';
+$wb['ssl_country_error_regex'] = 'Campo SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Quota Traffico massimo disponibile';
+$wb['redirect_error_regex'] = 'Percorso reinderizzamento non valido. Percorsi di redirect sono ad esempio: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Quota Traffico superato';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Nome utente statistiche Sito Web';
+$wb['custom_php_ini_txt'] = 'Impostazioni php.ini personalizzate';
+$wb['none_txt'] = 'Nessuno';
+$wb['disabled_txt'] = 'Disabilitato ';
+$wb['no_redirect_txt'] = 'Nessun redirect';
+$wb['no_flag_txt'] = 'Nessun flag';
+$wb['save_certificate_txt'] = 'Salva certificato';
+$wb['create_certificate_txt'] = 'Crea  certificato';
+$wb['delete_certificate_txt'] = 'Elimina certificato';
+$wb['nginx_directives_txt'] = 'nginx Direttive';
+$wb['seo_redirect_txt'] = 'Reinderizzamento SEO';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Utilizza Socket per PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI per SSL non attivo su questo server. Puoi abilitare unicamente un certificato per ogni indirizzo IP.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'I valori per PHP-FPM pm devono essere i seguenti: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children deve essere un valore intero postivo.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers deve essere un valore intero postivo.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers deve essere un valore intero postivo.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers deve essere un valore intero postivo.';
+$wb['hd_quota_error_regex'] = 'Quota Spazio Disco non valido.';
+$wb['traffic_quota_error_regex'] = 'Quota Traffico non valido.';
+$wb['fastcgi_php_version_txt'] = 'Versione PHP';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout deve essere un valore intero postivo.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests deve essere un valore intero postivo >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Devi avere una versione PHP >= 5.3.9 per poter utilizzare ondemand process manager. Se hai selezionato ondemand per una versione PHP precedente, PHP non si avvierà più!';
+$wb['generate_password_txt'] = 'Genera Password';
+$wb['repeat_password_txt'] = 'Ripeti Password';
+$wb['password_mismatch_txt'] = 'Le password non coincidono.';
+$wb['password_match_txt'] = 'Le password coincidono.';
+$wb['available_php_directive_snippets_txt'] = 'Sniipets Direttive PHP disponibili:';
+$wb['available_apache_directive_snippets_txt'] = 'Snippets Direttive Apache disponibili:';
+$wb['available_nginx_directive_snippets_txt'] = 'Snippets Direttive nginx Directive disponibili:';
+$wb['proxy_directives_txt'] = 'Direttive Proxy';
+$wb['available_proxy_directive_snippets_txt'] = 'Snippets Direttive Proxy disponibili:';
+$wb['Domain'] = 'Domini Alias';
+$wb['stats_type_txt'] = 'Webstatistics program';
+?>
diff --git a/interface/web/sites/lib/lang/it_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/it_web_aliasdomain_list.lng
new file mode 100644
index 0000000000..bea222d28d
--- /dev/null
+++ b/interface/web/sites/lib/lang/it_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Domini Alias';
+$wb['active_txt'] = 'Attivo';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Sito Web';
+$wb['domain_txt'] = 'Domini Alias';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo dominio alias';
+$wb['domain_error_empty'] = 'Domain  vuoto.';
+$wb['domain_error_unique'] = 'Nome DOminio deve essere unico.';
+$wb['domain_error_regex'] = 'Nome Dominio non valido.';
+$wb['no_redirect_txt'] = 'Nessun reinderizzamento';
+$wb['no_flag_txt'] = 'Nessun flag';
+$wb['none_txt'] = 'Nessuno';
+?>
diff --git a/interface/web/sites/lib/lang/it_web_backup_list.lng b/interface/web/sites/lib/lang/it_web_backup_list.lng
index fa4a59b403..9aa7b0c175 100644
--- a/interface/web/sites/lib/lang/it_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/it_web_backup_list.lng
@@ -1,19 +1,21 @@
 <?php
-$wb['list_head_txt'] = 'Existing backups';
-$wb['date_txt'] = 'Date';
-$wb['backup_type_txt'] = 'Type';
+$wb['list_head_txt'] = 'Backups esistenti';
+$wb['date_txt'] = 'Data';
+$wb['backup_type_txt'] = 'Tipo';
 $wb['filename_txt'] = 'Backup file';
-$wb['restore_backup_txt'] = 'Restore backup';
-$wb['download_backup_txt'] = 'Download 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['restore_backup_txt'] = 'Ripristino da backup';
+$wb['download_backup_txt'] = 'Scarica il backup';
+$wb['download_info_txt'] = 'Il file di backup sarà disponibile per il download nella cartella di backup del sito tra alcuni minuti.';
+$wb['restore_info_txt'] = 'Il ripristino da backup ha avuto inizio. Questa operazione dura diversi minuti.';
+$wb['restore_confirm_txt'] = 'Il ripristino sovvrascriverà tutti i files nel tuo sito. Sei sicuro di voler eseguire questo ripristino da backup?';
+$wb['download_pending_txt'] = 'Esiste già un operazione di download di backup in attesa.';
+$wb['restore_pending_txt'] = 'Esiste già un operazione di ripristino da backup in attesa.';
+$wb['backup_type_mysql'] = 'Database MySQL';
+$wb['backup_type_web'] = 'Files del Sito Web';
+$wb['filesize_txt'] = 'Filesize';
 $wb['delete_backup_txt'] = 'Delete Backup';
 $wb['delete_info_txt'] = 'Delete of the backup has been started. This action takes several minutes to be completed.';
 $wb['delete_confirm_txt'] = 'Really delete this backup?';
 $wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
-$wb['backup_type_mysql'] = 'MySQL Database';
-$wb['backup_type_web'] = 'Website files';
+$wb['backup_type_mongodb'] = 'MongoDB Database';
 ?>
diff --git a/interface/web/sites/lib/lang/it_web_childdomain.lng b/interface/web/sites/lib/lang/it_web_childdomain.lng
index 3a54ad314b..e98ba52bbe 100644
--- a/interface/web/sites/lib/lang/it_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/it_web_childdomain.lng
@@ -42,7 +42,7 @@ $wb['no_flag_txt'] = 'No flag';
 $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.';
 $wb['backup_interval_txt'] = 'Backup interval';
 $wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['ssl_key_txt'] = 'SSL Key';
@@ -115,5 +115,4 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
-
 ?>
diff --git a/interface/web/sites/lib/lang/it_web_childdomain_list.lng b/interface/web/sites/lib/lang/it_web_childdomain_list.lng
index 7d5ab04f36..e0a22db996 100644
--- a/interface/web/sites/lib/lang/it_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/it_web_childdomain_list.lng
@@ -4,12 +4,12 @@ $wb['active_txt'] = 'Attivo';
 $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Sito';
 $wb['domain_txt'] = 'Sottodominio';
-$wb['add_new_record_txt'] = 'Aggiungi nuovo sottodominio';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'Domain must be unique.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
 $wb['no_redirect_txt'] = 'No redirect';
 $wb['no_flag_txt'] = 'No flag';
 $wb['none_txt'] = 'None';
-
+$wb['add_new_subdomain_txt'] = 'Add new Subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/it_web_directive_snippets.lng b/interface/web/sites/lib/lang/it_web_directive_snippets.lng
new file mode 100644
index 0000000000..05a004f654
--- /dev/null
+++ b/interface/web/sites/lib/lang/it_web_directive_snippets.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['directive_snippets_id_txt'] = 'Desired configuration';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/it_web_domain.lng b/interface/web/sites/lib/lang/it_web_domain.lng
new file mode 100644
index 0000000000..d9399065c2
--- /dev/null
+++ b/interface/web/sites/lib/lang/it_web_domain.lng
@@ -0,0 +1,132 @@
+<?php
+$wb['ssl_state_txt'] = 'Stato';
+$wb['ssl_locality_txt'] = 'Città';
+$wb['ssl_organisation_txt'] = 'Organizzazione';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Codice Nazione';
+$wb['ssl_request_txt'] = 'Richiesta SSL';
+$wb['ssl_cert_txt'] = 'Certificato SSL';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Dominio';
+$wb['type_txt'] = 'Tipo';
+$wb['parent_domain_id_txt'] = 'Sito Web di riferimento';
+$wb['redirect_type_txt'] = 'Tipo Reinderizzamento';
+$wb['redirect_path_txt'] = 'Percorso Reinderizzamento';
+$wb['active_txt'] = 'Attivo';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Utente Linux';
+$wb['system_group_txt'] = 'Gruppo Linux';
+$wb['ip_address_txt'] = 'Indirizzo IP';
+$wb['vhost_type_txt'] = 'Tipo VHost';
+$wb['hd_quota_txt'] = 'Quota Harddisk';
+$wb['traffic_quota_txt'] = 'Quota Traffico';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Errori personalizzati';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Cliente';
+$wb['limit_web_domain_txt'] = 'Numero massimo domini siti web raggiunto per il tuo account.';
+$wb['limit_web_aliasdomain_txt'] = 'Numero massimo di domini alias raggiunto per il tuo account.';
+$wb['limit_web_subdomain_txt'] = 'Numero massimo di sottodomini  raggiunto per il tuo account.';
+$wb['apache_directives_txt'] = 'Apache Direttive ';
+$wb['domain_error_empty'] = 'Domain  vuoto.';
+$wb['domain_error_unique'] = 'Il dominio deve essere unico.';
+$wb['domain_error_regex'] = 'Nome Dominio non valido.';
+$wb['hd_quota_error_empty'] = 'Quota Spazio Disco vuoto.';
+$wb['traffic_quota_error_empty'] = 'Quota Traffico  vuoto.';
+$wb['error_ssl_state_empty'] = 'SSL Stato  vuoto.';
+$wb['error_ssl_locality_empty'] = 'SSL Città  vuoto.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organizzazione  vuoto.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Unità organizzativa  vuoto.';
+$wb['error_ssl_country_empty'] = 'SSL Codice Nazione  vuoto.';
+$wb['subdomain_txt'] = 'Auto-Sottodominio';
+$wb['client_group_id_txt'] = 'Cliente';
+$wb['stats_password_txt'] = 'Pssword Statistiche Web';
+$wb['ssl_domain_txt'] = 'SSL Domimio';
+$wb['allow_override_txt'] = 'Allow Override';
+$wb['limit_web_quota_free_txt'] = 'Valore massimo Quota Spazio Disco disponibile';
+$wb['ssl_state_error_regex'] = 'SSL Stato non valido. Caratteri ammessi: a-z, 0-9 e .,-_';
+$wb['ssl_locality_error_regex'] = 'SSL Città non valido. Caratteri ammessi: a-z, 0-9 e .,-_';
+$wb['ssl_organisation_error_regex'] = 'SSL Organizzazione non valido. Caratteri ammessi: a-z, 0-9 e .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'SSL Unità Organizzativa non valido. Caratteri ammessi: a-z, 0-9 e .,-_';
+$wb['ssl_country_error_regex'] = 'SSL Codice Nazione. Caratteri ammessi: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Quota Traffico massima disponibile';
+$wb['redirect_error_regex'] = 'Percorso di reinderizzamento non valido. Reinderizzamenti validi sono ad esempio: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Quota Traffico superata';
+$wb['backup_interval_txt'] = 'Intervallo Backup';
+$wb['backup_copies_txt'] = 'Numero copie di backup';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Nome Utente Statistiche Web';
+$wb['stats_type_txt'] = 'Applicazione per Statistiche Web';
+$wb['custom_php_ini_txt'] = 'Impostazioni personalizzate php.ini';
+$wb['error_ssl_cert_empty'] = 'Il campo Certificato SSL  è vuoto';
+$wb['ipv6_address_txt'] = 'Indirizzo IPv6';
+$wb['none_txt'] = 'Nessuno';
+$wb['disabled_txt'] = 'Disabilitato ';
+$wb['no_redirect_txt'] = 'Nessun reinderizzamentp';
+$wb['no_flag_txt'] = 'Nessun flag';
+$wb['save_certificate_txt'] = 'Salva certificato';
+$wb['create_certificate_txt'] = 'Crea  certificato';
+$wb['delete_certificate_txt'] = 'Elimina certificato';
+$wb['nginx_directives_txt'] = 'nginx Direttive';
+$wb['seo_redirect_txt'] = 'SEO Reinderizzamento';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Utilizza Socket per PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI per SSL non attivo su questo server. Puoi attivare un solo SSL certificato per ogni indirizzo IP.';
+$wb['python_txt'] = 'Python';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'I Valori per impostazioni PHP-FPM pm devono essere i seguenti: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children  deve essere un valore intero positivo.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers  deve essere un valore intero positivo.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers  deve essere un valore intero positivo.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers  deve essere un valore intero positivo.';
+$wb['hd_quota_error_regex'] = 'Quota spazio disco non valida.';
+$wb['traffic_quota_error_regex'] = 'Quota Traffico non valida.';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['perl_txt'] = 'Perl';
+$wb['fastcgi_php_version_txt'] = 'PHP Versione';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout  deve essere un valore intero positivo.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests deve essere un valore intero >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Per cortesia è necessaria una versione PHP >= 5.3.9 per poter utilizzare ondemand process manager. Se selezioni ondemand per una versione PHP minore, PHP non sarà più avviato!';
+$wb['generate_password_txt'] = 'Genera Password';
+$wb['repeat_password_txt'] = 'Ripeti Password';
+$wb['password_mismatch_txt'] = 'Le password non coincidono.';
+$wb['password_match_txt'] = 'Le password coincidono.';
+$wb['web_folder_error_regex'] = 'Cartella inserita non valida. Per favore non inserire slash.';
+$wb['domain_error_autosub'] = 'esiste già un sottodominio con queste impostazioni.';
+$wb['available_php_directive_snippets_txt'] = 'Snippets Direttive PHP disponibili:';
+$wb['available_apache_directive_snippets_txt'] = 'Snippets Direttive Apache disponibili:';
+$wb['available_nginx_directive_snippets_txt'] = 'Snippets Direttive nginx disponibili:';
+$wb['proxy_directives_txt'] = 'Direttive Proxy';
+$wb['available_proxy_directive_snippets_txt'] = 'Snippets Direttive Proxy disponibili:';
+$wb['no_server_error'] = 'Nessun server selezionato.';
+$wb['no_backup_txt'] = 'Nessun backup';
+$wb['daily_backup_txt'] = 'Quotidiano';
+$wb['weekly_backup_txt'] = 'Settimanale';
+$wb['monthly_backup_txt'] = 'Mensile';
+$wb['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Rewrite Rules non valide';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Variabili';
+$wb['added_by_txt'] = 'Inserito da';
+$wb['added_date_txt'] = 'Data inserimento';
+$wb['backup_excludes_txt'] = 'Cartelle escluse';
+$wb['backup_excludes_note_txt'] = '(Separare cartelle multiple con le virgole. Esempio: web/cache/*,web/backup)';
+$wb['backup_excludes_error_regex'] = 'Le cartelle escluse contengono caratteri non validi.';
+$wb['invalid_custom_php_ini_settings_txt'] = 'Impsotazioni  php.ini non valide';
+$wb['invalid_system_user_or_group_txt'] = 'Utente di sistema o Gruppo non valido';
+$wb['apache_directive_blocked_error'] = 'Direttive di Apache bloccate da impostazioni di sicurezza:';
+?>
diff --git a/interface/web/sites/lib/lang/it_web_domain_admin_list.lng b/interface/web/sites/lib/lang/it_web_domain_admin_list.lng
new file mode 100644
index 0000000000..087633c9a2
--- /dev/null
+++ b/interface/web/sites/lib/lang/it_web_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['sys_groupid_txt'] = 'Cliente';
+$wb['list_head_txt'] = 'Siti Web';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Attivo';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Dominio';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo sito web';
+?>
diff --git a/interface/web/sites/lib/lang/it_web_domain_list.lng b/interface/web/sites/lib/lang/it_web_domain_list.lng
new file mode 100644
index 0000000000..a7491480b7
--- /dev/null
+++ b/interface/web/sites/lib/lang/it_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Siti';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Attivo';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Dominio';
+$wb['add_new_record_txt'] = 'Aggiungi nuovo sito';
+?>
diff --git a/interface/web/sites/lib/lang/it_web_folder.lng b/interface/web/sites/lib/lang/it_web_folder.lng
index 2f06a70726..eb32a966f4 100644
--- a/interface/web/sites/lib/lang/it_web_folder.lng
+++ b/interface/web/sites/lib/lang/it_web_folder.lng
@@ -1,8 +1,8 @@
 <?php
 $wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
+$wb['parent_domain_id_txt'] = 'Sito Web';
 $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['active_txt'] = 'Attivo';
+$wb['path_error_regex'] = 'Percorso cartella non valido.';
+$wb['error_folder_already_protected_txt'] = 'esiste già un record per questa cartella.';
 ?>
diff --git a/interface/web/sites/lib/lang/it_web_folder_list.lng b/interface/web/sites/lib/lang/it_web_folder_list.lng
index 89f8b65ac3..39081ef1e0 100644
--- a/interface/web/sites/lib/lang/it_web_folder_list.lng
+++ b/interface/web/sites/lib/lang/it_web_folder_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Folder';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Cartella';
+$wb['active_txt'] = 'Attivo';
 $wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
+$wb['parent_domain_id_txt'] = 'Sito Web';
 $wb['path_txt'] = 'Path';
-$wb['add_new_record_txt'] = 'Add new Folder';
+$wb['add_new_record_txt'] = 'Aggiungi una nuova Cartella';
 ?>
diff --git a/interface/web/sites/lib/lang/it_web_folder_user.lng b/interface/web/sites/lib/lang/it_web_folder_user.lng
index 1dbc90534e..65cceffe38 100644
--- a/interface/web/sites/lib/lang/it_web_folder_user.lng
+++ b/interface/web/sites/lib/lang/it_web_folder_user.lng
@@ -1,14 +1,14 @@
 <?php
-$wb['web_folder_id_txt'] = 'Folder';
-$wb['username_txt'] = 'Username';
+$wb['web_folder_id_txt'] = 'Cartella';
+$wb['username_txt'] = 'Nome Utente';
 $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['active_txt'] = 'Attivo';
+$wb['folder_error_empty'] = 'Nessuna cartella del sito selezionata.';
+$wb['password_strength_txt'] = 'Livello sicurezza Password';
+$wb['generate_password_txt'] = 'Genera Password';
+$wb['repeat_password_txt'] = 'Ripeti Password';
+$wb['password_mismatch_txt'] = 'Le password non coincidono.';
+$wb['password_match_txt'] = 'Le password coincidono.';
+$wb['no_folder_perm'] = 'Non hai i diritti per questa cartella.';
+$wb['error_user_exists_already_txt'] = 'Esiste già un record per questo utente.';
 ?>
diff --git a/interface/web/sites/lib/lang/it_web_folder_user_list.lng b/interface/web/sites/lib/lang/it_web_folder_user_list.lng
index 67612f5111..b9f82d28f3 100644
--- a/interface/web/sites/lib/lang/it_web_folder_user_list.lng
+++ b/interface/web/sites/lib/lang/it_web_folder_user_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb['list_head_txt'] = 'Folder User';
-$wb['active_txt'] = 'Active';
-$wb['web_folder_id_txt'] = 'Folder';
-$wb['username_txt'] = 'Username';
-$wb['add_new_record_txt'] = 'Add new Folder User';
+$wb['list_head_txt'] = 'Utente Cartella';
+$wb['active_txt'] = 'Attivo';
+$wb['web_folder_id_txt'] = 'Cartella';
+$wb['username_txt'] = 'Nome Utente';
+$wb['add_new_record_txt'] = 'Aggiungi nuovo utente cartella';
 ?>
diff --git a/interface/web/sites/lib/lang/it_web_sites_stats_list.lng b/interface/web/sites/lib/lang/it_web_sites_stats_list.lng
index 28d4e1fbdb..e2eb5d0deb 100644
--- a/interface/web/sites/lib/lang/it_web_sites_stats_list.lng
+++ b/interface/web/sites/lib/lang/it_web_sites_stats_list.lng
@@ -1,9 +1,9 @@
 <?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'] = 'Traffico Web';
+$wb['domain_txt'] = 'Dominio';
+$wb['this_month_txt'] = 'Questo mese';
+$wb['last_month_txt'] = 'Mese precedente';
+$wb['this_year_txt'] = 'Anno in corso';
+$wb['last_year_txt'] = 'Anno precedente';
+$wb['sum_txt'] = 'Somma';
 ?>
diff --git a/interface/web/sites/lib/lang/it_web_subdomain.lng b/interface/web/sites/lib/lang/it_web_subdomain.lng
new file mode 100644
index 0000000000..fc989f3e3e
--- /dev/null
+++ b/interface/web/sites/lib/lang/it_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['ssl_state_txt'] = 'Stato';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organizzazione';
+$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_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Dominio';
+$wb['type_txt'] = 'Tipo';
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['redirect_type_txt'] = 'Tipo Redirect';
+$wb['redirect_path_txt'] = 'Percorso Redirect';
+$wb['active_txt'] = 'Attivo';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Utente Linux';
+$wb['system_group_txt'] = 'Gruppo Linux';
+$wb['ip_address_txt'] = 'Indirizzo IP';
+$wb['vhost_type_txt'] = 'Tipo VHost';
+$wb['hd_quota_txt'] = 'Quota Harddisk';
+$wb['traffic_quota_txt'] = 'Quota Traffico';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Cliente';
+$wb['limit_web_domain_txt'] = 'Hai raggiunto il numero massimo di siti web per il tuo account.';
+$wb['limit_web_aliasdomain_txt'] = 'Hai raggiunto il numero massimo di domini alias per il tuo account.';
+$wb['limit_web_subdomain_txt'] = 'Hai raggiunto il numero massimo di sottodomini per il tuo account.';
+$wb['apache_directives_txt'] = 'Direttive Apache';
+$wb['domain_error_empty'] = 'Dominio  vuoto.';
+$wb['domain_error_unique'] = 'Il dominio deve essere unico.';
+$wb['domain_error_regex'] = 'Nome dominio non valido.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Percorso di reinderizzamento errato. esempi di reinderizzamento validi: /test/ o http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'Nessun reinderizzamento';
+$wb['no_flag_txt'] = 'No flag';
+$wb['domain_error_wildcard'] = 'Non sono ammessi caratteri jolly per i sottodomini.';
+$wb['proxy_directives_txt'] = 'Direttive Proxy';
+$wb['available_proxy_directive_snippets_txt'] = 'Snippets Direttive Proxy disponibili:';
+$wb['error_proxy_requires_url'] = 'Tipo reinderizzamento \\"proxy\\" richiede una URL come percorso di reinderizzamento.';
+?>
diff --git a/interface/web/sites/lib/lang/it_web_subdomain_list.lng b/interface/web/sites/lib/lang/it_web_subdomain_list.lng
new file mode 100644
index 0000000000..5ba43b029d
--- /dev/null
+++ b/interface/web/sites/lib/lang/it_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Sottodomini';
+$wb['active_txt'] = 'Attivo';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Sito';
+$wb['domain_txt'] = 'Sottodominio';
+$wb['add_new_record_txt'] = 'Aggiungi nuovo sottodominio';
+?>
diff --git a/interface/web/sites/lib/lang/it_web_vhost_domain.lng b/interface/web/sites/lib/lang/it_web_vhost_domain.lng
index f74d74ffba..6037c51739 100644
--- a/interface/web/sites/lib/lang/it_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/it_web_vhost_domain.lng
@@ -15,7 +15,7 @@ $wb['parent_domain_id_txt'] = 'Parent Website';
 $wb['redirect_type_txt'] = 'Tipo Redirect';
 $wb['redirect_path_txt'] = 'Percorso Redirect';
 $wb['active_txt'] = 'Attivo';
-$wb['document_root_txt'] = 'Documentroot';
+$wb['document_root_txt'] = 'Document Root';
 $wb['system_user_txt'] = 'Utente Linux';
 $wb['system_group_txt'] = 'Gruppo Linux';
 $wb['ip_address_txt'] = 'Indirizzo IP';
@@ -126,15 +126,20 @@ $wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a diff
 $wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
 $wb['host_txt'] = 'Hostname';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-
 $wb['variables_txt'] = 'Variables';
 $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $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_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
-$wb["document_root_txt"] = "Document Root";
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['load_client_data_txt'] = 'Load client details';
+$wb['load_my_data_txt'] = 'Load my contact details';
+$wb['reset_client_data_txt'] = 'Reset data';
+$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
diff --git a/interface/web/sites/lib/lang/it_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/it_web_vhost_domain_list.lng
index 4a4ef8a3fe..4cc4c82af0 100644
--- a/interface/web/sites/lib/lang/it_web_vhost_domain_list.lng
+++ b/interface/web/sites/lib/lang/it_web_vhost_domain_list.lng
@@ -6,5 +6,4 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Dominio';
 $wb['add_new_record_txt'] = 'Aggiungi nuovo sito';
 $wb['parent_domain_id_txt'] = 'Website';
-
 ?>
diff --git a/interface/web/sites/lib/lang/it_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/it_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..3eb1015b2f
--- /dev/null
+++ b/interface/web/sites/lib/lang/it_web_vhost_subdomain.lng
@@ -0,0 +1,127 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Cartella Web';
+$wb['web_folder_invalid_txt'] = 'La cartella web  è errata, indicarne una diversa.';
+$wb['web_folder_unique_txt'] = 'La cartella web  è già utilizzata, selezionarne una diversa.';
+$wb['backup_interval_txt'] = 'Intervallo Backup';
+$wb['backup_copies_txt'] = 'Numero copie di backup';
+$wb['ssl_state_txt'] = 'Stato';
+$wb['ssl_locality_txt'] = 'Città';
+$wb['ssl_organisation_txt'] = 'Organizzazione';
+$wb['ssl_organisation_unit_txt'] = 'Unità Organizzazione';
+$wb['ssl_country_txt'] = 'Codice Nazione';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Dominio';
+$wb['host_txt'] = 'Nome Host';
+$wb['web_folder_error_regex'] = 'Cartella inserita non valida. Per favore non inserire uno slash.';
+$wb['type_txt'] = 'Tipo';
+$wb['redirect_type_txt'] = 'Tipo reinderizzamento';
+$wb['redirect_path_txt'] = 'Percorso Reinderizzamento';
+$wb['active_txt'] = 'Attivo';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux User';
+$wb['system_group_txt'] = 'Linux Group';
+$wb['ip_address_txt'] = 'Indirizzo IPv4';
+$wb['ipv6_address_txt'] = 'Indirizzo IPv6';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Quota Spazio Disco';
+$wb['traffic_quota_txt'] = 'Quota Traffico';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Documenti errore personalizzati';
+$wb['subdomain_txt'] = 'Auto-Sottodominio';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Cliente';
+$wb['limit_web_domain_txt'] = 'Hai raggiunto il numero massimo di siti web per il tuo account.';
+$wb['limit_web_aliasdomain_txt'] = 'Hai raggiunto il numero massimo di domini alias  per il tuo account.';
+$wb['limit_web_subdomain_txt'] = 'Hai raggiunto il numero massimo di sottodomini per il tuo account.';
+$wb['apache_directives_txt'] = 'Direttive Apache';
+$wb['domain_error_empty'] = 'Domain  vuoto.';
+$wb['domain_error_unique'] = 'Esiste già un sito o sottodominio / dominio alias con questo nome dominio.';
+$wb['domain_error_regex'] = 'Nome dominio non valido.';
+$wb['domain_error_wildcard'] = 'Non sono ammessi sottodomini wildcard.';
+$wb['hd_quota_error_empty'] = 'Spazio disco 0 o vuoto.';
+$wb['traffic_quota_error_empty'] = 'Quota Traffico  vuoto.';
+$wb['error_ssl_state_empty'] = 'SSL State  vuoto.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality  vuoto.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation  vuoto.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit  vuoto.';
+$wb['error_ssl_country_empty'] = 'SSL Country  vuoto.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Cliente';
+$wb['stats_password_txt'] = 'Statistiche Web password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Caratteri ammessi: a-z, 0-9 e .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Caratteri ammessi: a-z, 0-9 e .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Caratteri ammessi: a-z, 0-9 e .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Caratteri ammessi: a-z, 0-9 e .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Statistiche Web nome utente';
+$wb['stats_type_txt'] = 'Applicazione Statistiche Web';
+$wb['custom_php_ini_txt'] = 'Impostazioni php.ini personalizzate';
+$wb['none_txt'] = 'Nessuno';
+$wb['disabled_txt'] = 'Disabilitato ';
+$wb['no_redirect_txt'] = 'Nessun reinderizzamento';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Crea  certificate';
+$wb['delete_certificate_txt'] = 'Elimina certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI per SSL non attivo su questo server. Puoi abilitare un solo certificato SSL per indirizzo IP.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children  deve essere un valore intero positivo.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers  deve essere un valore intero positivo.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers  deve essere un valore intero positivo.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers  deve essere un valore intero positivo.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout  deve essere un valore intero positivo.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$wb['generate_password_txt'] = 'Genera Password';
+$wb['repeat_password_txt'] = 'Ripeti Password';
+$wb['password_mismatch_txt'] = 'Le password non coincidono.';
+$wb['password_match_txt'] = 'Le password coincidono.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Variables';
+$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['subdomain_error_empty'] = 'The subdommain field is empty or contiene caratteri non validi.';
+?>
diff --git a/interface/web/sites/lib/lang/it_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/it_web_vhost_subdomain_list.lng
new file mode 100644
index 0000000000..665fe3b1f0
--- /dev/null
+++ b/interface/web/sites/lib/lang/it_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Sotto Domini';
+$wb['active_txt'] = 'Attivo';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Sito Web';
+$wb['domain_txt'] = 'Sotto Dominio';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo sotto domino';
+?>
diff --git a/interface/web/sites/lib/lang/it_webdav_user.lng b/interface/web/sites/lib/lang/it_webdav_user.lng
index 329eb60b7e..37be4c0861 100644
--- a/interface/web/sites/lib/lang/it_webdav_user.lng
+++ b/interface/web/sites/lib/lang/it_webdav_user.lng
@@ -1,21 +1,21 @@
 <?php
-$wb['dir_txt'] = 'Directory';
+$wb['dir_txt'] = 'Direttrice';
 $wb['server_id_txt'] = 'Server';
-$wb['parent_domain_id_txt'] = 'Website';
-$wb['username_txt'] = 'Username';
+$wb['parent_domain_id_txt'] = 'Sito Web';
+$wb['username_txt'] = 'Nome Utente';
 $wb['password_txt'] = 'Password';
-$wb['password_strength_txt'] = 'Password strength';
-$wb['active_txt'] = 'Active';
-$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_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['password_strength_txt'] = 'Livello sicurezza Password';
+$wb['active_txt'] = 'Attivo';
+$wb['limit_webdav_user_txt'] = 'Numero massimo utenti webdav per il tuo account,raggiunto.';
+$wb['username_error_empty'] = 'Username  vuoto.';
+$wb['username_error_unique'] = 'Il nome utente deve essere unico.';
+$wb['username_error_regex'] = 'Il nome utente contiene caratteri che non sono consentiti.';
+$wb['directory_error_empty'] = 'Direttrice vuota.';
+$wb['parent_domain_id_error_empty'] = 'Nessun sito web selezionato.';
 $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['generate_password_txt'] = 'Genera Password';
+$wb['repeat_password_txt'] = 'Ripeti Password';
+$wb['password_mismatch_txt'] = 'Le password non coincidono.';
+$wb['password_match_txt'] = 'Le password coincidono.';
 ?>
diff --git a/interface/web/sites/lib/lang/it_webdav_user_list.lng b/interface/web/sites/lib/lang/it_webdav_user_list.lng
index bac283b0a7..41e6c9e76a 100644
--- a/interface/web/sites/lib/lang/it_webdav_user_list.lng
+++ b/interface/web/sites/lib/lang/it_webdav_user_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb['list_head_txt'] = 'Webdav-User';
-$wb['active_txt'] = 'Active';
+$wb['list_head_txt'] = 'Utente Webdav';
+$wb['active_txt'] = 'Attivo';
 $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'] = 'Sito Web';
+$wb['username_txt'] = 'Nome Utente';
+$wb['add_new_record_txt'] = 'Aggiungi un nuovo  Utente Webdav';
 ?>
diff --git a/interface/web/sites/lib/lang/ja_backup_stats_list.lng b/interface/web/sites/lib/lang/ja_backup_stats_list.lng
index 0f3803f56a..65792aa591 100644
--- a/interface/web/sites/lib/lang/ja_backup_stats_list.lng
+++ b/interface/web/sites/lib/lang/ja_backup_stats_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb["database_name_txt"]   = '';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Domain';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['database_name_txt'] = '';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/sites/lib/lang/ja_cron.lng b/interface/web/sites/lib/lang/ja_cron.lng
index 369c3b8bbd..13bd5afb07 100644
--- a/interface/web/sites/lib/lang/ja_cron.lng
+++ b/interface/web/sites/lib/lang/ja_cron.lng
@@ -21,4 +21,6 @@ $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
 $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_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
+$wb['log_output_txt'] = 'Log output';
 ?>
diff --git a/interface/web/sites/lib/lang/ja_database.lng b/interface/web/sites/lib/lang/ja_database.lng
index 7fcdf24fc4..bfd17a693c 100644
--- a/interface/web/sites/lib/lang/ja_database.lng
+++ b/interface/web/sites/lib/lang/ja_database.lng
@@ -43,4 +43,7 @@ $wb['select_dbuser_txt'] = 'Select database user';
 $wb['no_dbuser_txt'] = 'None';
 $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['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
 ?>
diff --git a/interface/web/sites/lib/lang/ja_database_admin_list.lng b/interface/web/sites/lib/lang/ja_database_admin_list.lng
index 27e62b9ac6..333a5357c6 100644
--- a/interface/web/sites/lib/lang/ja_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/ja_database_admin_list.lng
@@ -8,4 +8,5 @@ $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['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/ja_database_list.lng b/interface/web/sites/lib/lang/ja_database_list.lng
index afbda1b528..933128670c 100644
--- a/interface/web/sites/lib/lang/ja_database_list.lng
+++ b/interface/web/sites/lib/lang/ja_database_list.lng
@@ -7,4 +7,5 @@ $wb['database_name_txt'] = 'データベース名';
 $wb['add_new_record_txt'] = 'データベースを追加する';
 $wb['database_user_txt'] = 'Database user';
 $wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/ja_database_quota_stats_list.lng b/interface/web/sites/lib/lang/ja_database_quota_stats_list.lng
index e1de70accf..4f92576007 100644
--- a/interface/web/sites/lib/lang/ja_database_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/ja_database_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["database_txt"] = 'Database';
-$wb["server_name_txt"] = 'Server';
-$wb["client_txt"] = 'Client';
-$wb["used_txt"] = 'Used space';
-$wb["quota_txt"] = 'Quota';
-$wb["percentage_txt"] = 'Used in %';
+$wb['database_txt'] = 'Database';
+$wb['server_name_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb['used_txt'] = 'Used space';
+$wb['quota_txt'] = 'Quota';
+$wb['percentage_txt'] = 'Used in %';
 ?>
diff --git a/interface/web/sites/lib/lang/ja_ftp_sites_stats_list.lng b/interface/web/sites/lib/lang/ja_ftp_sites_stats_list.lng
new file mode 100644
index 0000000000..03894607db
--- /dev/null
+++ b/interface/web/sites/lib/lang/ja_ftp_sites_stats_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb["list_head_txt"] = 'FTP 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 (Download + Upload)';
+$wb["in_out_txt"] = 'DL/UL';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/ja_ftp_user.lng b/interface/web/sites/lib/lang/ja_ftp_user.lng
index 8e92b1b05f..892bcbf88b 100644
--- a/interface/web/sites/lib/lang/ja_ftp_user.lng
+++ b/interface/web/sites/lib/lang/ja_ftp_user.lng
@@ -31,6 +31,5 @@ $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['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['directory_error_regex'] = 'Invalid directory';
+$wb['expires_txt'] = 'Expire at';
 ?>
diff --git a/interface/web/sites/lib/lang/ja_web_aliasdomain.lng b/interface/web/sites/lib/lang/ja_web_aliasdomain.lng
new file mode 100644
index 0000000000..4149c71149
--- /dev/null
+++ b/interface/web/sites/lib/lang/ja_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['Domain'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/ja_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/ja_web_aliasdomain_list.lng
new file mode 100644
index 0000000000..111130259c
--- /dev/null
+++ b/interface/web/sites/lib/lang/ja_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'エイリアスドメイン';
+$wb['active_txt'] = '有効';
+$wb['server_id_txt'] = 'サーバー';
+$wb['parent_domain_id_txt'] = 'ウェブサイト';
+$wb['domain_txt'] = 'エイリアスドメイン';
+$wb['add_new_record_txt'] = 'エイリアスドメインを追加する';
+$wb['domain_error_empty'] = 'ドメインを指定してください';
+$wb['domain_error_unique'] = '既に登録済みのドメイン名です。別の名前に変更してください。';
+$wb['domain_error_regex'] = 'ドメイン名が不正です。';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/sites/lib/lang/ja_web_backup_list.lng b/interface/web/sites/lib/lang/ja_web_backup_list.lng
index fa4a59b403..d1133334f0 100644
--- a/interface/web/sites/lib/lang/ja_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/ja_web_backup_list.lng
@@ -16,4 +16,6 @@ $wb['delete_confirm_txt'] = 'Really delete this backup?';
 $wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
 $wb['backup_type_mysql'] = 'MySQL Database';
 $wb['backup_type_web'] = 'Website files';
+$wb['filesize_txt'] = 'Filesize';
+$wb['backup_type_mongodb'] = 'MongoDB Database';
 ?>
diff --git a/interface/web/sites/lib/lang/ja_web_childdomain.lng b/interface/web/sites/lib/lang/ja_web_childdomain.lng
index 6745122048..3776cf8ebe 100644
--- a/interface/web/sites/lib/lang/ja_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/ja_web_childdomain.lng
@@ -42,7 +42,7 @@ $wb['no_flag_txt'] = 'No flag';
 $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.';
 $wb['backup_interval_txt'] = 'Backup interval';
 $wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['ssl_key_txt'] = 'SSL Key';
@@ -115,5 +115,4 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
-
 ?>
diff --git a/interface/web/sites/lib/lang/ja_web_childdomain_list.lng b/interface/web/sites/lib/lang/ja_web_childdomain_list.lng
index ebc1fd6229..8e67cd9057 100644
--- a/interface/web/sites/lib/lang/ja_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/ja_web_childdomain_list.lng
@@ -4,12 +4,12 @@ $wb['active_txt'] = '有効';
 $wb['server_id_txt'] = 'サーバー';
 $wb['parent_domain_id_txt'] = 'ウェブサイト';
 $wb['domain_txt'] = 'サブドメイン';
-$wb['add_new_record_txt'] = 'サブドメインを追加する';
 $wb['domain_error_empty'] = 'ドメインを指定してください';
 $wb['domain_error_unique'] = '既に登録済みのドメイン名です。別の名前に変更してください。';
 $wb['domain_error_regex'] = 'ドメイン名が不正です。';
 $wb['no_redirect_txt'] = 'No redirect';
 $wb['no_flag_txt'] = 'No flag';
 $wb['none_txt'] = 'None';
-
+$wb['add_new_subdomain_txt'] = 'Add new Subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/ja_web_directive_snippets.lng b/interface/web/sites/lib/lang/ja_web_directive_snippets.lng
new file mode 100644
index 0000000000..05a004f654
--- /dev/null
+++ b/interface/web/sites/lib/lang/ja_web_directive_snippets.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['directive_snippets_id_txt'] = 'Desired configuration';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/ja_web_domain.lng b/interface/web/sites/lib/lang/ja_web_domain.lng
new file mode 100644
index 0000000000..41ce4717fd
--- /dev/null
+++ b/interface/web/sites/lib/lang/ja_web_domain.lng
@@ -0,0 +1,132 @@
+<?php
+$wb['ssl_state_txt'] = 'State（都道府県）';
+$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 CSR';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'Chainファイル';
+$wb['ssl_action_txt'] = 'SSL 証明書の操作';
+$wb['server_id_txt'] = 'サーバー';
+$wb['domain_txt'] = 'ドメイン';
+$wb['type_txt'] = '種別';
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['redirect_type_txt'] = 'リダイレクトの方式';
+$wb['redirect_path_txt'] = 'リダイレクト先';
+$wb['active_txt'] = '有効';
+$wb['document_root_txt'] = 'ドキュメントルート';
+$wb['system_user_txt'] = 'Linuxユーザー';
+$wb['system_group_txt'] = 'Linuxグループ';
+$wb['ip_address_txt'] = 'IPアドレス';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'ディスクの容量';
+$wb['traffic_quota_txt'] = 'トラフィックの許容量';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = '独自のエラーページを使う';
+$wb['subdomain_txt'] = '自動サブドメイン';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'クライアント';
+$wb['limit_web_domain_txt'] = 'ウェブドメインが最大数に達したため、これ以上追加できません。';
+$wb['limit_web_aliasdomain_txt'] = 'エイリアスドメインが最大数に達した為、これ以上追加できません。';
+$wb['limit_web_subdomain_txt'] = 'ウェブサブドメインが最大数に達しました。';
+$wb['apache_directives_txt'] = 'Apache ディレクティブ';
+$wb['domain_error_empty'] = 'ドメインを指定してください';
+$wb['domain_error_unique'] = '同名のサブドメインまたはエイリアスドメインが存在します。';
+$wb['domain_error_regex'] = 'ドメイン名が不正です。';
+$wb['hd_quota_error_empty'] = 'ディスクの容量を入力してください。';
+$wb['traffic_quota_error_empty'] = 'トラフィックの許容量を入力してください。';
+$wb['error_ssl_state_empty'] = 'SSL の State（都道府県）を入力してください。';
+$wb['error_ssl_locality_empty'] = 'SSL の Locality（地域）を入力してください。';
+$wb['error_ssl_organisation_empty'] = 'SSL の Organization（組織）を入力してください。';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL の Organization Unit（部署）を入力してください。';
+$wb['error_ssl_country_empty'] = 'SSL の Country（国）を入力してください。';
+$wb['client_group_id_txt'] = 'クライアント';
+$wb['stats_password_txt'] = 'アクセス統計ページのパスワード';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['allow_override_txt'] = 'Allow Override';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['perl_txt'] = 'Perl';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['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['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_system_user_or_group_txt'] = 'Invalid system user or group';
+$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
+?>
diff --git a/interface/web/sites/lib/lang/ja_web_domain_admin_list.lng b/interface/web/sites/lib/lang/ja_web_domain_admin_list.lng
new file mode 100644
index 0000000000..b460e27100
--- /dev/null
+++ b/interface/web/sites/lib/lang/ja_web_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['sys_groupid_txt'] = 'Client';
+$wb['list_head_txt'] = 'Websites';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Add new website';
+?>
diff --git a/interface/web/sites/lib/lang/ja_web_domain_list.lng b/interface/web/sites/lib/lang/ja_web_domain_list.lng
new file mode 100644
index 0000000000..e987d407d6
--- /dev/null
+++ b/interface/web/sites/lib/lang/ja_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'ウェブサイト';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = '有効';
+$wb['server_id_txt'] = 'サーバー';
+$wb['domain_txt'] = 'ドメイン';
+$wb['add_new_record_txt'] = 'ウェブサイトを追加する';
+?>
diff --git a/interface/web/sites/lib/lang/ja_web_subdomain.lng b/interface/web/sites/lib/lang/ja_web_subdomain.lng
new file mode 100644
index 0000000000..7c0d55c94d
--- /dev/null
+++ b/interface/web/sites/lib/lang/ja_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['ssl_state_txt'] = 'State（都道府県）';
+$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 CSR';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'Chainファイル';
+$wb['ssl_action_txt'] = 'SSL 証明書の操作';
+$wb['server_id_txt'] = 'サーバー';
+$wb['domain_txt'] = 'ドメイン';
+$wb['type_txt'] = '種別';
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['redirect_type_txt'] = 'リダイレクトの方式';
+$wb['redirect_path_txt'] = 'リダイレクト先';
+$wb['active_txt'] = '有効';
+$wb['document_root_txt'] = 'ドキュメントルート';
+$wb['system_user_txt'] = 'Linuxユーザー';
+$wb['system_group_txt'] = 'Linuxグループ';
+$wb['ip_address_txt'] = 'IPアドレス';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'ディスクの容量';
+$wb['traffic_quota_txt'] = 'トラフィックの許容量';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'クライアント';
+$wb['limit_web_domain_txt'] = 'ウェブドメインが最大数に達したため、これ以上追加できません。';
+$wb['limit_web_aliasdomain_txt'] = 'エイリアスドメインが最大数に達した為、これ以上追加できません。';
+$wb['limit_web_subdomain_txt'] = 'ウェブサブドメインが最大数に達しました。';
+$wb['apache_directives_txt'] = 'Apache ディレクティブ';
+$wb['domain_error_empty'] = 'ドメインを指定してください';
+$wb['domain_error_unique'] = '同名のサブドメインまたはエイリアスドメインが存在します。';
+$wb['domain_error_regex'] = 'ドメイン名が不正です。';
+$wb['host_txt'] = 'ホスト';
+$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['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.';
+?>
diff --git a/interface/web/sites/lib/lang/ja_web_subdomain_list.lng b/interface/web/sites/lib/lang/ja_web_subdomain_list.lng
new file mode 100644
index 0000000000..dc91127dc2
--- /dev/null
+++ b/interface/web/sites/lib/lang/ja_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'サブドメイン';
+$wb['active_txt'] = '有効';
+$wb['server_id_txt'] = 'サーバー';
+$wb['parent_domain_id_txt'] = 'ウェブサイト';
+$wb['domain_txt'] = 'サブドメイン';
+$wb['add_new_record_txt'] = 'サブドメインを追加する';
+?>
diff --git a/interface/web/sites/lib/lang/ja_web_vhost_domain.lng b/interface/web/sites/lib/lang/ja_web_vhost_domain.lng
index 91a0d9a0d7..b7c84de72a 100644
--- a/interface/web/sites/lib/lang/ja_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/ja_web_vhost_domain.lng
@@ -15,7 +15,7 @@ $wb['parent_domain_id_txt'] = 'Parent Website';
 $wb['redirect_type_txt'] = 'リダイレクトの方式';
 $wb['redirect_path_txt'] = 'リダイレクト先';
 $wb['active_txt'] = '有効';
-$wb['document_root_txt'] = 'ドキュメントルート';
+$wb['document_root_txt'] = 'Document Root';
 $wb['system_user_txt'] = 'Linuxユーザー';
 $wb['system_group_txt'] = 'Linuxグループ';
 $wb['ip_address_txt'] = 'IPアドレス';
@@ -126,15 +126,20 @@ $wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a diff
 $wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
 $wb['host_txt'] = 'Hostname';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-
 $wb['variables_txt'] = 'Variables';
 $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $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_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
-$wb["document_root_txt"] = "Document Root";
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['load_client_data_txt'] = 'Load client details';
+$wb['load_my_data_txt'] = 'Load my contact details';
+$wb['reset_client_data_txt'] = 'Reset data';
+$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
diff --git a/interface/web/sites/lib/lang/ja_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/ja_web_vhost_domain_list.lng
index b26a54892f..df80e5db0d 100644
--- a/interface/web/sites/lib/lang/ja_web_vhost_domain_list.lng
+++ b/interface/web/sites/lib/lang/ja_web_vhost_domain_list.lng
@@ -6,5 +6,4 @@ $wb['server_id_txt'] = 'サーバー';
 $wb['domain_txt'] = 'ドメイン';
 $wb['add_new_record_txt'] = 'ウェブサイトを追加する';
 $wb['parent_domain_id_txt'] = 'Website';
-
 ?>
diff --git a/interface/web/sites/lib/lang/ja_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/ja_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..c0ca93b570
--- /dev/null
+++ b/interface/web/sites/lib/lang/ja_web_vhost_subdomain.lng
@@ -0,0 +1,127 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Variables';
+$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['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+?>
diff --git a/interface/web/sites/lib/lang/ja_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/ja_web_vhost_subdomain_list.lng
new file mode 100644
index 0000000000..1c16bcda28
--- /dev/null
+++ b/interface/web/sites/lib/lang/ja_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
+?>
diff --git a/interface/web/sites/lib/lang/nl_backup_stats_list.lng b/interface/web/sites/lib/lang/nl_backup_stats_list.lng
index 0f3803f56a..65792aa591 100644
--- a/interface/web/sites/lib/lang/nl_backup_stats_list.lng
+++ b/interface/web/sites/lib/lang/nl_backup_stats_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb["database_name_txt"]   = '';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Domain';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['database_name_txt'] = '';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/sites/lib/lang/nl_cron.lng b/interface/web/sites/lib/lang/nl_cron.lng
index caa712dec6..76b9957dba 100644
--- a/interface/web/sites/lib/lang/nl_cron.lng
+++ b/interface/web/sites/lib/lang/nl_cron.lng
@@ -21,4 +21,6 @@ $wb['unknown_fieldtype_error'] = 'Een onbekend veld type is gebruikt.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
 $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_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
+$wb['log_output_txt'] = 'Log output';
 ?>
diff --git a/interface/web/sites/lib/lang/nl_database.lng b/interface/web/sites/lib/lang/nl_database.lng
index 2abfe8acbe..919ff25374 100644
--- a/interface/web/sites/lib/lang/nl_database.lng
+++ b/interface/web/sites/lib/lang/nl_database.lng
@@ -43,4 +43,7 @@ $wb['select_dbuser_txt'] = 'Select database user';
 $wb['no_dbuser_txt'] = 'None';
 $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['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
 ?>
diff --git a/interface/web/sites/lib/lang/nl_database_admin_list.lng b/interface/web/sites/lib/lang/nl_database_admin_list.lng
index e49d882658..d9d3a32b21 100644
--- a/interface/web/sites/lib/lang/nl_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/nl_database_admin_list.lng
@@ -8,4 +8,5 @@ $wb['database_name_txt'] = 'Database naam';
 $wb['add_new_record_txt'] = 'Toevoegen nieuwe database';
 $wb['sys_groupid_txt'] = 'Klant';
 $wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/nl_database_list.lng b/interface/web/sites/lib/lang/nl_database_list.lng
index c2af6476a1..684443a9ec 100644
--- a/interface/web/sites/lib/lang/nl_database_list.lng
+++ b/interface/web/sites/lib/lang/nl_database_list.lng
@@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Database gebruiker';
 $wb['database_name_txt'] = 'Database naam';
 $wb['add_new_record_txt'] = 'Toevoegen nieuwe database';
 $wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/nl_database_quota_stats_list.lng b/interface/web/sites/lib/lang/nl_database_quota_stats_list.lng
index e1de70accf..4f92576007 100644
--- a/interface/web/sites/lib/lang/nl_database_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/nl_database_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["database_txt"] = 'Database';
-$wb["server_name_txt"] = 'Server';
-$wb["client_txt"] = 'Client';
-$wb["used_txt"] = 'Used space';
-$wb["quota_txt"] = 'Quota';
-$wb["percentage_txt"] = 'Used in %';
+$wb['database_txt'] = 'Database';
+$wb['server_name_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb['used_txt'] = 'Used space';
+$wb['quota_txt'] = 'Quota';
+$wb['percentage_txt'] = 'Used in %';
 ?>
diff --git a/interface/web/sites/lib/lang/nl_ftp_sites_stats_list.lng b/interface/web/sites/lib/lang/nl_ftp_sites_stats_list.lng
new file mode 100644
index 0000000000..03894607db
--- /dev/null
+++ b/interface/web/sites/lib/lang/nl_ftp_sites_stats_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb["list_head_txt"] = 'FTP 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 (Download + Upload)';
+$wb["in_out_txt"] = 'DL/UL';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/nl_ftp_user.lng b/interface/web/sites/lib/lang/nl_ftp_user.lng
index 16e4ae87ce..63417c57d7 100644
--- a/interface/web/sites/lib/lang/nl_ftp_user.lng
+++ b/interface/web/sites/lib/lang/nl_ftp_user.lng
@@ -31,6 +31,5 @@ $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['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['directory_error_regex'] = 'Invalid directory';
+$wb['expires_txt'] = 'Expire at';
 ?>
diff --git a/interface/web/sites/lib/lang/nl_web_aliasdomain.lng b/interface/web/sites/lib/lang/nl_web_aliasdomain.lng
new file mode 100644
index 0000000000..4149c71149
--- /dev/null
+++ b/interface/web/sites/lib/lang/nl_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['Domain'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng
new file mode 100644
index 0000000000..4d713a4665
--- /dev/null
+++ b/interface/web/sites/lib/lang/nl_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Aliasdomein';
+$wb['active_txt'] = 'Actief';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Aliasdomein';
+$wb['add_new_record_txt'] = 'Toevoegen nieuw aliasdomein';
+$wb['domain_error_empty'] = 'Domein is niet ingvuld.';
+$wb['domain_error_unique'] = 'Domein moet uniek zijn.';
+$wb['domain_error_regex'] = 'Domeinnaam ongeldig.';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/sites/lib/lang/nl_web_backup_list.lng b/interface/web/sites/lib/lang/nl_web_backup_list.lng
index fa4a59b403..d1133334f0 100644
--- a/interface/web/sites/lib/lang/nl_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/nl_web_backup_list.lng
@@ -16,4 +16,6 @@ $wb['delete_confirm_txt'] = 'Really delete this backup?';
 $wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
 $wb['backup_type_mysql'] = 'MySQL Database';
 $wb['backup_type_web'] = 'Website files';
+$wb['filesize_txt'] = 'Filesize';
+$wb['backup_type_mongodb'] = 'MongoDB Database';
 ?>
diff --git a/interface/web/sites/lib/lang/nl_web_childdomain.lng b/interface/web/sites/lib/lang/nl_web_childdomain.lng
index cb9965dc13..5771b015b4 100644
--- a/interface/web/sites/lib/lang/nl_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/nl_web_childdomain.lng
@@ -42,7 +42,7 @@ $wb['no_flag_txt'] = 'No flag';
 $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.';
 $wb['backup_interval_txt'] = 'Backup interval';
 $wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['ssl_key_txt'] = 'SSL Key';
@@ -115,5 +115,4 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
-
 ?>
diff --git a/interface/web/sites/lib/lang/nl_web_childdomain_list.lng b/interface/web/sites/lib/lang/nl_web_childdomain_list.lng
index 1b05bfeb06..2a4a63dc91 100644
--- a/interface/web/sites/lib/lang/nl_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/nl_web_childdomain_list.lng
@@ -4,12 +4,12 @@ $wb['active_txt'] = 'Actief';
 $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Website';
 $wb['domain_txt'] = 'Subdomein';
-$wb['add_new_record_txt'] = 'Toevoegen nieuw subdomein';
 $wb['domain_error_empty'] = 'Domein is niet ingvuld.';
 $wb['domain_error_unique'] = 'Domein moet uniek zijn.';
 $wb['domain_error_regex'] = 'Domeinnaam ongeldig.';
 $wb['no_redirect_txt'] = 'No redirect';
 $wb['no_flag_txt'] = 'No flag';
 $wb['none_txt'] = 'None';
-
+$wb['add_new_subdomain_txt'] = 'Add new Subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/nl_web_directive_snippets.lng b/interface/web/sites/lib/lang/nl_web_directive_snippets.lng
new file mode 100644
index 0000000000..05a004f654
--- /dev/null
+++ b/interface/web/sites/lib/lang/nl_web_directive_snippets.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['directive_snippets_id_txt'] = 'Desired configuration';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/nl_web_domain.lng b/interface/web/sites/lib/lang/nl_web_domain.lng
new file mode 100644
index 0000000000..aa3134b92e
--- /dev/null
+++ b/interface/web/sites/lib/lang/nl_web_domain.lng
@@ -0,0 +1,132 @@
+<?php
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Aantal backup exemplaren';
+$wb['ssl_state_txt'] = 'Provincie/staat';
+$wb['ssl_locality_txt'] = 'Plaatsnaam';
+$wb['ssl_organisation_txt'] = 'Organisatie';
+$wb['ssl_organisation_unit_txt'] = 'Organisatie afdeling';
+$wb['ssl_country_txt'] = 'Land';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificaat';
+$wb['ssl_bundle_txt'] = 'SSL Bundel';
+$wb['ssl_action_txt'] = 'SSL Actie';
+$wb['ssl_domain_txt'] = 'SSL Domein';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domein';
+$wb['type_txt'] = 'Type';
+$wb['parent_domain_id_txt'] = 'Parent website';
+$wb['redirect_type_txt'] = 'Redirect type';
+$wb['redirect_path_txt'] = 'Redirect pad';
+$wb['active_txt'] = 'Actief';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux gebruiker';
+$wb['system_group_txt'] = 'Linux Groep';
+$wb['ip_address_txt'] = 'IP-Adres';
+$wb['vhost_type_txt'] = 'VHost type';
+$wb['hd_quota_txt'] = 'Harddisk quota';
+$wb['traffic_quota_txt'] = 'Traffic quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-documenten';
+$wb['subdomain_txt'] = 'Auto-subdomein';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Klant';
+$wb['limit_web_domain_txt'] = 'Het max.aantal web domeinen voor uw account is bereikt.';
+$wb['limit_web_aliasdomain_txt'] = 'Het max. aantal aliasdomeinen voor uw account is bereikt.';
+$wb['limit_web_subdomain_txt'] = 'Het max. aantal web subdomeinen voor uw account is bereikt.';
+$wb['apache_directives_txt'] = 'Apache directives';
+$wb['domain_error_empty'] = 'Domein is niet ingvuld.';
+$wb['domain_error_unique'] = 'Er is al een website of sub / aliasdomein met deze domeinnaam.';
+$wb['domain_error_regex'] = 'Domeinnaam ongeldig.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 of leeg.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is niet ingvuld.';
+$wb['error_ssl_state_empty'] = 'SSL State is niet ingvuld.';
+$wb['error_ssl_locality_empty'] = 'SSL Plaatsnaam is niet ingvuld.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisatie is niet ingvuld.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisatie afdeling is niet ingvuld.';
+$wb['error_ssl_country_empty'] = 'SSL land is niet ingvuld.';
+$wb['client_group_id_txt'] = 'Klant';
+$wb['stats_password_txt'] = 'Webstatististieken wachtwoord';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. beschikbare harddisk quota';
+$wb['ssl_state_error_regex'] = 'Ongeldige SSL Provincie/staat. Geldige karakters zijn: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Ongeldige SSL plaatsnaam. Geldige karakters zijn: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Ongeldige SSL Organisation. Geldige karakters zijn: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Ongeldige SSL Organisation Unit. Geldige karakters zijn: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Ongeldige SSL land. Geldige karakters zijn: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. beschikbare traffic quota';
+$wb['redirect_error_regex'] = 'Ongeldig redirect pad. Heldige redirects zijn bijvoorbeeld: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota overschreden';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatististieken gebruikersnaam';
+$wb['stats_type_txt'] = 'Webstatististieken programma';
+$wb['custom_php_ini_txt'] = 'Custom php.ini instellingen';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['perl_txt'] = 'Perl';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['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['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_system_user_or_group_txt'] = 'Invalid system user or group';
+$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
+?>
diff --git a/interface/web/sites/lib/lang/nl_web_domain_admin_list.lng b/interface/web/sites/lib/lang/nl_web_domain_admin_list.lng
new file mode 100644
index 0000000000..b13604142d
--- /dev/null
+++ b/interface/web/sites/lib/lang/nl_web_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['sys_groupid_txt'] = 'Klant';
+$wb['list_head_txt'] = 'Websites';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Actief';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domein';
+$wb['add_new_record_txt'] = 'Toevoegen nieuwe website';
+?>
diff --git a/interface/web/sites/lib/lang/nl_web_domain_list.lng b/interface/web/sites/lib/lang/nl_web_domain_list.lng
new file mode 100644
index 0000000000..882373d1c9
--- /dev/null
+++ b/interface/web/sites/lib/lang/nl_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Websites';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Actief';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domein';
+$wb['add_new_record_txt'] = 'Toevoegen nieuwe website';
+?>
diff --git a/interface/web/sites/lib/lang/nl_web_subdomain.lng b/interface/web/sites/lib/lang/nl_web_subdomain.lng
new file mode 100644
index 0000000000..2fea49110c
--- /dev/null
+++ b/interface/web/sites/lib/lang/nl_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['ssl_state_txt'] = 'Provincie/staat';
+$wb['ssl_locality_txt'] = 'Plaatsnaam';
+$wb['ssl_organisation_txt'] = 'Organisatie';
+$wb['ssl_organisation_unit_txt'] = 'Organisatie afdeling';
+$wb['ssl_country_txt'] = 'Land';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificaat';
+$wb['ssl_bundle_txt'] = 'SSL Bundel';
+$wb['ssl_action_txt'] = 'SSL Actie';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domein';
+$wb['type_txt'] = 'Type';
+$wb['parent_domain_id_txt'] = 'Parent website';
+$wb['redirect_type_txt'] = 'Redirect type';
+$wb['redirect_path_txt'] = 'Redirect pad';
+$wb['active_txt'] = 'Actief';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux gebruiker';
+$wb['system_group_txt'] = 'Linux groep';
+$wb['ip_address_txt'] = 'IP-adres';
+$wb['vhost_type_txt'] = 'VHost type';
+$wb['hd_quota_txt'] = 'Harddisk quota';
+$wb['traffic_quota_txt'] = 'Traffic quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Klant';
+$wb['limit_web_domain_txt'] = 'Het max. aantal web domeinen voor uw account is bereikt.';
+$wb['limit_web_aliasdomain_txt'] = 'Het max. aantal aliasdomeinen voor uw account is bereikt.';
+$wb['limit_web_subdomain_txt'] = 'Het max. aantal web subdomeinen voor uw account is bereikt.';
+$wb['apache_directives_txt'] = 'Apache directives';
+$wb['domain_error_empty'] = 'Domein is niet ingvuld.';
+$wb['domain_error_unique'] = 'Er is al eenwebsite of sub / aliasdomein met deze domeinnaam.';
+$wb['domain_error_regex'] = 'Domainnaam ongeldig.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Ongeldig redirect pad. Geldige redirects zijn bijvoorbeeld: /test/ or http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$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.';
+?>
diff --git a/interface/web/sites/lib/lang/nl_web_subdomain_list.lng b/interface/web/sites/lib/lang/nl_web_subdomain_list.lng
new file mode 100644
index 0000000000..fbba7b9ff1
--- /dev/null
+++ b/interface/web/sites/lib/lang/nl_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomeinen';
+$wb['active_txt'] = 'Actief';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomein';
+$wb['add_new_record_txt'] = 'Toevoegen nieuw subdomein';
+?>
diff --git a/interface/web/sites/lib/lang/nl_web_vhost_domain.lng b/interface/web/sites/lib/lang/nl_web_vhost_domain.lng
index af76195317..72f9dfce8e 100644
--- a/interface/web/sites/lib/lang/nl_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/nl_web_vhost_domain.lng
@@ -18,7 +18,7 @@ $wb['parent_domain_id_txt'] = 'Parent website';
 $wb['redirect_type_txt'] = 'Redirect type';
 $wb['redirect_path_txt'] = 'Redirect pad';
 $wb['active_txt'] = 'Actief';
-$wb['document_root_txt'] = 'Documentroot';
+$wb['document_root_txt'] = 'Document Root';
 $wb['system_user_txt'] = 'Linux gebruiker';
 $wb['system_group_txt'] = 'Linux Groep';
 $wb['ip_address_txt'] = 'IP-Adres';
@@ -126,15 +126,20 @@ $wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a diff
 $wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
 $wb['host_txt'] = 'Hostname';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-
 $wb['variables_txt'] = 'Variables';
 $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $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_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
-$wb["document_root_txt"] = "Document Root";
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['load_client_data_txt'] = 'Load client details';
+$wb['load_my_data_txt'] = 'Load my contact details';
+$wb['reset_client_data_txt'] = 'Reset data';
+$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
diff --git a/interface/web/sites/lib/lang/nl_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/nl_web_vhost_domain_list.lng
index f44597b2fb..469569430a 100644
--- a/interface/web/sites/lib/lang/nl_web_vhost_domain_list.lng
+++ b/interface/web/sites/lib/lang/nl_web_vhost_domain_list.lng
@@ -6,5 +6,4 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domein';
 $wb['add_new_record_txt'] = 'Toevoegen nieuwe website';
 $wb['parent_domain_id_txt'] = 'Website';
-
 ?>
diff --git a/interface/web/sites/lib/lang/nl_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/nl_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..c0ca93b570
--- /dev/null
+++ b/interface/web/sites/lib/lang/nl_web_vhost_subdomain.lng
@@ -0,0 +1,127 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Variables';
+$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['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+?>
diff --git a/interface/web/sites/lib/lang/nl_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/nl_web_vhost_subdomain_list.lng
new file mode 100644
index 0000000000..1c16bcda28
--- /dev/null
+++ b/interface/web/sites/lib/lang/nl_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
+?>
diff --git a/interface/web/sites/lib/lang/pl_backup_stats_list.lng b/interface/web/sites/lib/lang/pl_backup_stats_list.lng
index 0f3803f56a..65792aa591 100644
--- a/interface/web/sites/lib/lang/pl_backup_stats_list.lng
+++ b/interface/web/sites/lib/lang/pl_backup_stats_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb["database_name_txt"]   = '';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Domain';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['database_name_txt'] = '';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/sites/lib/lang/pl_cron.lng b/interface/web/sites/lib/lang/pl_cron.lng
index 853091cd35..e8bafacf0e 100644
--- a/interface/web/sites/lib/lang/pl_cron.lng
+++ b/interface/web/sites/lib/lang/pl_cron.lng
@@ -21,4 +21,6 @@ $wb['unknown_fieldtype_error'] = 'Został użyty niepoprawny format pola.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
 $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_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
+$wb['log_output_txt'] = 'Log output';
 ?>
diff --git a/interface/web/sites/lib/lang/pl_database.lng b/interface/web/sites/lib/lang/pl_database.lng
index 05bd91bf9d..b38029e7f9 100644
--- a/interface/web/sites/lib/lang/pl_database.lng
+++ b/interface/web/sites/lib/lang/pl_database.lng
@@ -43,4 +43,7 @@ $wb['globalsearch_noresults_text_txt'] = 'Brak wyników';
 $wb['globalsearch_noresults_limit_txt'] = '0 wyników';
 $wb['globalsearch_searchfield_watermark_txt'] = 'Szukaj';
 $wb['globalsearch_suggestions_text_txt'] = 'Sugestie';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
 ?>
diff --git a/interface/web/sites/lib/lang/pl_database_admin_list.lng b/interface/web/sites/lib/lang/pl_database_admin_list.lng
index 4795a90ecb..301e6908f8 100644
--- a/interface/web/sites/lib/lang/pl_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/pl_database_admin_list.lng
@@ -8,4 +8,5 @@ $wb['database_name_txt'] = 'Nazwa bazy danych';
 $wb['add_new_record_txt'] = 'Dodaj nową bazę danych';
 $wb['sys_groupid_txt'] = 'Klient';
 $wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/pl_database_list.lng b/interface/web/sites/lib/lang/pl_database_list.lng
index 60e1ecff23..5176bcd32b 100644
--- a/interface/web/sites/lib/lang/pl_database_list.lng
+++ b/interface/web/sites/lib/lang/pl_database_list.lng
@@ -7,4 +7,5 @@ $wb['database_name_txt'] = 'Nazwa bazy danych';
 $wb['add_new_record_txt'] = 'Dodaj nową bazę danych';
 $wb['database_user_txt'] = 'Użytkownik bazy danych';
 $wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/pl_database_quota_stats_list.lng b/interface/web/sites/lib/lang/pl_database_quota_stats_list.lng
index e1de70accf..4f92576007 100644
--- a/interface/web/sites/lib/lang/pl_database_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/pl_database_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["database_txt"] = 'Database';
-$wb["server_name_txt"] = 'Server';
-$wb["client_txt"] = 'Client';
-$wb["used_txt"] = 'Used space';
-$wb["quota_txt"] = 'Quota';
-$wb["percentage_txt"] = 'Used in %';
+$wb['database_txt'] = 'Database';
+$wb['server_name_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb['used_txt'] = 'Used space';
+$wb['quota_txt'] = 'Quota';
+$wb['percentage_txt'] = 'Used in %';
 ?>
diff --git a/interface/web/sites/lib/lang/pl_ftp_sites_stats_list.lng b/interface/web/sites/lib/lang/pl_ftp_sites_stats_list.lng
new file mode 100644
index 0000000000..03894607db
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_ftp_sites_stats_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb["list_head_txt"] = 'FTP 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 (Download + Upload)';
+$wb["in_out_txt"] = 'DL/UL';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/pl_ftp_user.lng b/interface/web/sites/lib/lang/pl_ftp_user.lng
index 37dd36b189..0d364ec2d0 100644
--- a/interface/web/sites/lib/lang/pl_ftp_user.lng
+++ b/interface/web/sites/lib/lang/pl_ftp_user.lng
@@ -31,6 +31,5 @@ $wb['generate_password_txt'] = 'Generuj hasło';
 $wb['repeat_password_txt'] = 'Powtórz hasło';
 $wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
 $wb['password_match_txt'] = 'Hasła pasują';
-$wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['directory_error_regex'] = 'Invalid directory';
+$wb['expires_txt'] = 'Expire at';
 ?>
diff --git a/interface/web/sites/lib/lang/pl_web_aliasdomain.lng b/interface/web/sites/lib/lang/pl_web_aliasdomain.lng
new file mode 100644
index 0000000000..19cd691beb
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Alias domeny';
+$wb['backup_interval_txt'] = 'Częstotliwość tworzenia kopii zapasowych';
+$wb['backup_copies_txt'] = 'Liczba kopii';
+$wb['ssl_state_txt'] = 'Województwo';
+$wb['ssl_locality_txt'] = 'Lokalizacja';
+$wb['ssl_organisation_txt'] = 'Organizacja';
+$wb['ssl_organisation_unit_txt'] = 'Jednostka organizacji';
+$wb['ssl_country_txt'] = 'Kraj';
+$wb['ssl_key_txt'] = 'Klucz SSL';
+$wb['ssl_request_txt'] = 'Żądanie SSL';
+$wb['ssl_cert_txt'] = 'Certyfikat SSL';
+$wb['ssl_bundle_txt'] = 'Paczka SSL (bundle)';
+$wb['ssl_action_txt'] = 'Akcja SSL';
+$wb['ssl_domain_txt'] = 'Domena SSL';
+$wb['server_id_txt'] = 'Serwer';
+$wb['web_folder_error_regex'] = 'Wpisano nieprawidłowy folder. Proszę nie wpisywać znaku slash: /';
+$wb['type_txt'] = 'Rodzaj';
+$wb['parent_domain_id_txt'] = 'Strona macierzysta';
+$wb['redirect_type_txt'] = 'Rodzaj przekierowania';
+$wb['redirect_path_txt'] = 'Ścieżka przekierowania';
+$wb['active_txt'] = 'Aktywny';
+$wb['document_root_txt'] = 'Document root';
+$wb['system_user_txt'] = 'Użytkownik systemowy';
+$wb['system_group_txt'] = 'Grupa systemowa';
+$wb['ip_address_txt'] = 'Adres IPv4';
+$wb['ipv6_address_txt'] = 'Adres IPv6';
+$wb['vhost_type_txt'] = 'Rodzaj VHosta';
+$wb['hd_quota_txt'] = 'Limit dysku';
+$wb['traffic_quota_txt'] = 'Limit transferu';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Własne strony błędów';
+$wb['subdomain_txt'] = 'Automatyczna subdomena';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Klient';
+$wb['limit_web_domain_txt'] = 'Maks. liczba domen web dla Twojego konta została już osiągnięta.';
+$wb['limit_web_aliasdomain_txt'] = 'Maks. liczba aliasów domen dla Twojego konta została już osiągnięta.';
+$wb['limit_web_subdomain_txt'] = 'Maks. liczba subdomen dla Twojego konta została już osiągnięta.';
+$wb['apache_directives_txt'] = 'Dyrektywy Apache';
+$wb['domain_error_empty'] = 'Pole domena jest puste';
+$wb['domain_error_unique'] = 'Istnieje już strona z tą nazwą domeny/poddomeny.';
+$wb['domain_error_regex'] = 'Nazwa domeny jest pusta';
+$wb['domain_error_autosub'] = 'Istnieje już subdomena z tymi ustawieniami.';
+$wb['hd_quota_error_empty'] = 'Limit dysku jest pusty lub wynosi 0.';
+$wb['traffic_quota_error_empty'] = 'Limit transferu jest pusty.';
+$wb['error_ssl_state_empty'] = 'Pole województwa dla SSL jest puste.';
+$wb['error_ssl_locality_empty'] = 'Pole lokalizacji dla SSL jest puste.';
+$wb['error_ssl_organisation_empty'] = 'Pole organizacji dla SSL  jest puste.';
+$wb['error_ssl_organisation_unit_empty'] = 'Pole jednostkie dla SSL jest puste.';
+$wb['error_ssl_country_empty'] = 'Pole kraju dla SSL jest puste.';
+$wb['error_ssl_cert_empty'] = 'Pole certyfikatu SSL jest puste.';
+$wb['client_group_id_txt'] = 'Klient';
+$wb['stats_password_txt'] = 'Hasło do statystyk';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Maks. dostępny limit dysku';
+$wb['ssl_state_error_regex'] = 'Nieprawidłowe województwo SSL. Dozwolone znaki to: a-z, 0-9 i .,-_';
+$wb['ssl_locality_error_regex'] = 'Nieprawidłowa lokalizacja SSL. Dozwolone znaki to: a-z, 0-9 i .,-_';
+$wb['ssl_organisation_error_regex'] = 'Nieprawidłowa organizacja SSL. Dozwolone znaki to: a-z, 0-9 i .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Nieprawidłowa jednostka SSL. Dozwolone znaki to: a-z, 0-9 i .,-_';
+$wb['ssl_country_error_regex'] = 'Nieprawidłowy kraj SSL. Dozwolone znaki to: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Maks. dostępny limit transferu';
+$wb['redirect_error_regex'] = 'Nieprawidłowa ścieżka przekierowania. Przykładowe prawidłowe przekierowania: /test/ lub http://www.domena.pl/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Limit transferu został przekroczony';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Login do statystyk';
+$wb['stats_type_txt'] = 'Rodzaj statystyk';
+$wb['custom_php_ini_txt'] = 'Własne ustawienia php.ini';
+$wb['none_txt'] = 'Brak';
+$wb['disabled_txt'] = 'Wyłączone';
+$wb['no_redirect_txt'] = 'Bez przekierowania';
+$wb['no_flag_txt'] = 'Bez flagi';
+$wb['save_certificate_txt'] = 'Zapisz certyfikat';
+$wb['create_certificate_txt'] = 'Utwórz certyfikat';
+$wb['delete_certificate_txt'] = 'Usuń certyfikat';
+$wb['nginx_directives_txt'] = 'Dyrektywy nginx';
+$wb['seo_redirect_txt'] = 'Przekierowanie SEO';
+$wb['non_www_to_www_txt'] = 'bez www -> www';
+$wb['www_to_non_www_txt'] = 'www -> bez www';
+$wb['php_fpm_use_socket_txt'] = 'Uzyj gniazda dla PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI dla SSL nie jest aktywowane dla tego serwera. Możesz włączyć tylko jeden certyfikat SSL dla jednego adresu IP.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Wartości ustawień  PHP-FPM pm muszą być następujące: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children musi być dodatnią wartością całkowitą.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers musi być dodatnią wartością całkowitą.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers musi być dodatnią wartością całkowitą.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers musi być dodatnią wartością całkowitą.';
+$wb['hd_quota_error_regex'] = 'Limit dysku jest nieprawidłowy';
+$wb['traffic_quota_error_regex'] = 'Limit transferu jest nieprawidłowy';
+$wb['fastcgi_php_version_txt'] = 'Wersja PHP';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout musi być dodatnią wartością całkowitą.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an inPHP-FPM pm.process_idle_timeout musi być dodatnią wartością całkowitą >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Wersja PHP musi być >= 5.3.9 aby użyć ondemand process manager. W przypadku użycia starszej wersji PHP może nie działać w ogóle.';
+$wb['generate_password_txt'] = 'Generuj hasło';
+$wb['repeat_password_txt'] = 'Powtórz hasło';
+$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
+$wb['password_match_txt'] = 'Hasła są jednakowe';
+$wb['available_php_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw PHP:';
+$wb['available_apache_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Apache:';
+$wb['available_nginx_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw nginx:';
+$wb['proxy_directives_txt'] = 'Dyrektywny Proxy';
+$wb['available_proxy_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Proxy:';
+$wb['Domain'] = 'Alias domeny';
+?>
diff --git a/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng
new file mode 100644
index 0000000000..5bdd8e8316
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Alias domeny';
+$wb['active_txt'] = 'Aktywny';
+$wb['server_id_txt'] = 'Serwer';
+$wb['parent_domain_id_txt'] = 'Strona www';
+$wb['domain_txt'] = 'Alias domeny';
+$wb['add_new_record_txt'] = 'Dodaj nowy alias domeny';
+$wb['domain_error_empty'] = 'Domena jest pusta.';
+$wb['domain_error_unique'] = 'Domena musi być unikatowa.';
+$wb['domain_error_regex'] = 'Nazwa domeny ma niepoprawny format.';
+$wb['no_redirect_txt'] = 'Bez przekierowania';
+$wb['no_flag_txt'] = 'Bez flagi';
+$wb['none_txt'] = 'Brak';
+?>
diff --git a/interface/web/sites/lib/lang/pl_web_backup_list.lng b/interface/web/sites/lib/lang/pl_web_backup_list.lng
index 9c01ed0435..b9fdf3d632 100644
--- a/interface/web/sites/lib/lang/pl_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_backup_list.lng
@@ -16,4 +16,6 @@ $wb['delete_confirm_txt'] = 'Really delete this backup?';
 $wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
 $wb['backup_type_mysql'] = 'Baza MySQL';
 $wb['backup_type_web'] = 'Pliki strony';
+$wb['filesize_txt'] = 'Filesize';
+$wb['backup_type_mongodb'] = 'MongoDB Database';
 ?>
diff --git a/interface/web/sites/lib/lang/pl_web_childdomain.lng b/interface/web/sites/lib/lang/pl_web_childdomain.lng
index 286a38a1a9..bd17cd1f6f 100644
--- a/interface/web/sites/lib/lang/pl_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/pl_web_childdomain.lng
@@ -115,5 +115,4 @@ $wb['available_php_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw PHP:';
 $wb['available_apache_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Apache:';
 $wb['available_nginx_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw nginx:';
 $wb['Domain'] = 'Alias domeny';
-
 ?>
diff --git a/interface/web/sites/lib/lang/pl_web_childdomain_list.lng b/interface/web/sites/lib/lang/pl_web_childdomain_list.lng
index 8c01887e0a..b7a604f08e 100644
--- a/interface/web/sites/lib/lang/pl_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_childdomain_list.lng
@@ -4,12 +4,12 @@ $wb['active_txt'] = 'Aktywny';
 $wb['server_id_txt'] = 'Serwer';
 $wb['parent_domain_id_txt'] = 'Strona www';
 $wb['domain_txt'] = 'Subdomena';
-$wb['add_new_record_txt'] = 'Dodaj nową subdomene';
 $wb['domain_error_empty'] = 'Domena jest pusta.';
 $wb['domain_error_unique'] = 'Domena musi być unikatowa.';
 $wb['domain_error_regex'] = 'Nazwa domeny ma niepoprawny format.';
 $wb['no_redirect_txt'] = 'Bez przekierowania';
 $wb['no_flag_txt'] = 'Bez flagi';
 $wb['none_txt'] = 'Brak';
-
+$wb['add_new_subdomain_txt'] = 'Add new Subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/pl_web_directive_snippets.lng b/interface/web/sites/lib/lang/pl_web_directive_snippets.lng
new file mode 100644
index 0000000000..05a004f654
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_web_directive_snippets.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['directive_snippets_id_txt'] = 'Desired configuration';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/pl_web_domain.lng b/interface/web/sites/lib/lang/pl_web_domain.lng
new file mode 100644
index 0000000000..858b35c6f4
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_web_domain.lng
@@ -0,0 +1,132 @@
+<?php
+$wb['ssl_state_txt'] = 'Województwo';
+$wb['ssl_locality_txt'] = 'Lokalizacja';
+$wb['ssl_organisation_txt'] = 'Organizacja';
+$wb['ssl_organisation_unit_txt'] = 'Jednosta organizacji';
+$wb['ssl_country_txt'] = 'Państwo';
+$wb['ssl_request_txt'] = 'Żądanie SSL';
+$wb['ssl_cert_txt'] = 'Certyfikat SSL';
+$wb['ssl_bundle_txt'] = 'Paczka SSL';
+$wb['ssl_action_txt'] = 'Akcja SSL';
+$wb['server_id_txt'] = 'Serwer';
+$wb['domain_txt'] = 'Domena';
+$wb['type_txt'] = 'Typ';
+$wb['parent_domain_id_txt'] = 'Macierzysta strona www';
+$wb['redirect_type_txt'] = 'Rodzaj przekierowania';
+$wb['redirect_path_txt'] = 'Ścieżka przekierowania';
+$wb['active_txt'] = 'Aktywny';
+$wb['document_root_txt'] = 'Katalog strony';
+$wb['system_user_txt'] = 'Użytkownik systemowy';
+$wb['system_group_txt'] = 'Grupa systemowa';
+$wb['ip_address_txt'] = 'Adres IP';
+$wb['vhost_type_txt'] = 'Rodzaj VHosta';
+$wb['hd_quota_txt'] = 'Limit dysku twardego';
+$wb['traffic_quota_txt'] = 'Limit ruchu na serwerze';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Własne strony błędów';
+$wb['subdomain_txt'] = 'Automatyczna subdomena';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Klient';
+$wb['limit_web_domain_txt'] = 'Maksymalna ilość domen dla Twojego konta została przekroczona.';
+$wb['limit_web_aliasdomain_txt'] = 'Maksymalna ilość aliasów domen dla Twojego konta została przekroczona.';
+$wb['limit_web_subdomain_txt'] = 'Maksymalna ilość subdomen dla Twojego konta została przekroczona.';
+$wb['apache_directives_txt'] = 'Dyrektywy Apache';
+$wb['domain_error_empty'] = 'Domena jest pusta.';
+$wb['domain_error_unique'] = 'Istnieje już strona www, alias lub subdomena dla tej domeny.';
+$wb['domain_error_regex'] = 'Nazwa domeny jest niepoprawna.';
+$wb['hd_quota_error_empty'] = 'Limit twardego dysku jest pusty.';
+$wb['traffic_quota_error_empty'] = 'Limit ruchu na serwerze jest pusty.';
+$wb['error_ssl_state_empty'] = 'Stan SSL jest pusty.';
+$wb['error_ssl_locality_empty'] = 'Lokalność SSL jest pusta.';
+$wb['error_ssl_organisation_empty'] = 'Organizacja SSL jest pusta.';
+$wb['error_ssl_organisation_unit_empty'] = 'Jednosta ogranizacji SSL jest pusta.';
+$wb['error_ssl_country_empty'] = 'Państwo SSL jest puste.';
+$wb['client_group_id_txt'] = 'Klient';
+$wb['stats_password_txt'] = 'Hasło statystyk strony www';
+$wb['ssl_domain_txt'] = 'Domena SSL';
+$wb['allow_override_txt'] = 'Allow Override';
+$wb['limit_web_quota_free_txt'] = 'Maksymalny dostępny limit dysku';
+$wb['ssl_state_error_regex'] = 'Nieprawidłowy stan SSL. Dozwolone znaki to: a-z, 0-9 oraz .,-_';
+$wb['ssl_locality_error_regex'] = 'Nieprawidłowa lokalizacja SSL. Dozwolone znaki to: a-z, 0-9 oraz .,-_';
+$wb['ssl_organisation_error_regex'] = 'Nieprawidłowa organizacja SSL. Dozwolone znaki to: a-z, 0-9 oraz .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Nieprawidłowa jednostka organizacji SSL. Dozwolone znaki to: a-z, 0-9 oraz .,-_';
+$wb['ssl_country_error_regex'] = 'Nieprawidłowy kraj SSL. Dozwolone znaki to: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Maksymalny dostępny limit transferu';
+$wb['redirect_error_regex'] = 'Nieprawidłowa ścieżka przekierowania. Poprawne przekierowania to np.: /test/ lub http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Limit transferu przekroczony.';
+$wb['backup_interval_txt'] = 'Odstęp między kopiami zapasowymi';
+$wb['backup_copies_txt'] = 'Liczba kopii zapasowych';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Nazwa użytkownika statystyk';
+$wb['stats_type_txt'] = 'Rodzaj statystyk';
+$wb['custom_php_ini_txt'] = 'Własne ustawienia php.ini';
+$wb['error_ssl_cert_empty'] = 'Pole certyfikatu SSL jest puste';
+$wb['none_txt'] = 'Brak';
+$wb['disabled_txt'] = 'Wyłączone';
+$wb['no_redirect_txt'] = 'Bez przekierowania';
+$wb['no_flag_txt'] = 'Bez flagi';
+$wb['save_certificate_txt'] = 'Zapisz certyfikat';
+$wb['create_certificate_txt'] = 'Utwórz certyfikat';
+$wb['delete_certificate_txt'] = 'Usuń certyfikat';
+$wb['ipv6_address_txt'] = 'Adres IPv6';
+$wb['nginx_directives_txt'] = 'Dyrektywy nginx';
+$wb['seo_redirect_txt'] = 'Przekierowanie SEO';
+$wb['non_www_to_www_txt'] = 'bez www -> www';
+$wb['www_to_non_www_txt'] = 'www -> bez www';
+$wb['php_fpm_use_socket_txt'] = 'Użyj gniazda dla PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI dla SSL nie jest aktywowane na tym serwerze. Możesz utworzyć tylko jeden certyfikat SSL dla jednego adresu IP.';
+$wb['python_txt'] = 'Python';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Wartości ustawień PHP-FPM pm muszą być następujące: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children musi być całkowitą liczną dodatnią.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers musi być całkowitą liczną dodatnią.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers musi być całkowitą liczną dodatnią.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers musi być całkowitą liczną dodatnią.';
+$wb['hd_quota_error_regex'] = 'Limit dysku jest nieprawidłowy.';
+$wb['traffic_quota_error_regex'] = 'Limit transferu jest nieprawidłowy.';
+$wb['ssl_key_txt'] = 'Klucz SSL';
+$wb['web_folder_error_regex'] = 'Wprowadzono nieprawidłowy katalog. Proszę nie wpisywać znaku slash [ / ]';
+$wb['domain_error_autosub'] = 'Istnieje już subdomena z tymi ustawieniami.';
+$wb['perl_txt'] = 'Perl';
+$wb['fastcgi_php_version_txt'] = 'Wersja PHP';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout musi być całkowitą wartością dodatnią';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests musi być całkowitą wartością >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Musisz mieć PHP w wersji >= 5.3.9 aby użyć ondemand process manager. Jeżeli wybierzesz ondemand dla starszej wersji, PHP nie zadziała w ogóle!';
+$wb['generate_password_txt'] = 'Generuj hasło';
+$wb['repeat_password_txt'] = 'Powtórz hasło';
+$wb['password_mismatch_txt'] = 'Hasła nie pasują';
+$wb['password_match_txt'] = 'Hasła pasują';
+$wb['available_php_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw PHP:';
+$wb['available_apache_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Apache:';
+$wb['available_nginx_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw nginx:';
+$wb['proxy_directives_txt'] = 'Dyrektywy Proxy';
+$wb['available_proxy_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Proxy:';
+$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['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['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_system_user_or_group_txt'] = 'Invalid system user or group';
+$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
+?>
diff --git a/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng b/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng
new file mode 100644
index 0000000000..56634eb623
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_web_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['sys_groupid_txt'] = 'Klient';
+$wb['list_head_txt'] = 'Strony www';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Aktywne';
+$wb['server_id_txt'] = 'Serwer';
+$wb['domain_txt'] = 'Domena';
+$wb['add_new_record_txt'] = 'Dodaj nową stronę';
+?>
diff --git a/interface/web/sites/lib/lang/pl_web_domain_list.lng b/interface/web/sites/lib/lang/pl_web_domain_list.lng
new file mode 100644
index 0000000000..62b7455ff3
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Strony www';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Aktywny';
+$wb['server_id_txt'] = 'Serwer';
+$wb['domain_txt'] = 'Domena';
+$wb['add_new_record_txt'] = 'Dodaj nową stronę';
+?>
diff --git a/interface/web/sites/lib/lang/pl_web_subdomain.lng b/interface/web/sites/lib/lang/pl_web_subdomain.lng
new file mode 100644
index 0000000000..def9efb723
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['ssl_state_txt'] = 'Stan';
+$wb['ssl_locality_txt'] = 'Lokalizacja';
+$wb['ssl_organisation_txt'] = 'Organizacja';
+$wb['ssl_organisation_unit_txt'] = 'Jednostka organizacji';
+$wb['ssl_country_txt'] = 'Państwo';
+$wb['ssl_request_txt'] = 'Żądanie SSL';
+$wb['ssl_cert_txt'] = 'Certyfikat SSL';
+$wb['ssl_bundle_txt'] = 'Paczka SSL';
+$wb['ssl_action_txt'] = 'Akcja SSL';
+$wb['server_id_txt'] = 'Serwer';
+$wb['domain_txt'] = 'Domena';
+$wb['type_txt'] = 'Typ';
+$wb['parent_domain_id_txt'] = 'Macierzysta strona www';
+$wb['redirect_type_txt'] = 'Typ przekierowania';
+$wb['redirect_path_txt'] = 'Ścieżka przekierowania';
+$wb['active_txt'] = 'Aktywny';
+$wb['document_root_txt'] = 'Główny katalog';
+$wb['system_user_txt'] = 'Użytkownik Linuksa';
+$wb['system_group_txt'] = 'Grupa Linux';
+$wb['ip_address_txt'] = 'Adres IP';
+$wb['vhost_type_txt'] = 'Typ wirtualnego hosta';
+$wb['hd_quota_txt'] = 'Limit twardego dysku';
+$wb['traffic_quota_txt'] = 'Limit ruchu na serwerze';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Klient';
+$wb['limit_web_domain_txt'] = 'Maksymalna ilość domen dla Twojego konta została przekroczona.';
+$wb['limit_web_aliasdomain_txt'] = 'Maksymalna ilość aliasów dla Twojego konta została przekroczona.';
+$wb['limit_web_subdomain_txt'] = 'Maksymalna ilość subdomen dla Twojego konta została przekroczona.';
+$wb['apache_directives_txt'] = 'Dyrektywy Apache';
+$wb['domain_error_empty'] = 'Domena jest pusta.';
+$wb['domain_error_unique'] = 'Istnieje już domena, alias lub subdomena o podanej nazwie.';
+$wb['domain_error_regex'] = 'Nazwa domeny jest nieprawidłowa.';
+$wb['host_txt'] = 'Serwer';
+$wb['redirect_error_regex'] = 'Nieprawidłowa ścieżka przekierowania. Poprawne przekierowanie to np.: /test/ lub http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'Bez przekierowania';
+$wb['no_flag_txt'] = 'Bez flagi';
+$wb['domain_error_wildcard'] = 'Subdomeny typu wildcard nie są dozwolone';
+$wb['proxy_directives_txt'] = 'Dyrektywy Proxy';
+$wb['available_proxy_directive_snippets_txt'] = 'Dostępne konfiguracje dodatkowe Proxy';
+$wb['error_proxy_requires_url'] = 'Rodzaj przekierowania ';
+?>
diff --git a/interface/web/sites/lib/lang/pl_web_subdomain_list.lng b/interface/web/sites/lib/lang/pl_web_subdomain_list.lng
new file mode 100644
index 0000000000..9ccb0a3c77
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomeny';
+$wb['active_txt'] = 'Aktywny';
+$wb['server_id_txt'] = 'Serwer';
+$wb['parent_domain_id_txt'] = 'Strona www';
+$wb['domain_txt'] = 'Subdomena';
+$wb['add_new_record_txt'] = 'Dodaj nową subdomene';
+?>
diff --git a/interface/web/sites/lib/lang/pl_web_vhost_domain.lng b/interface/web/sites/lib/lang/pl_web_vhost_domain.lng
index 57ec8958eb..48cb717060 100644
--- a/interface/web/sites/lib/lang/pl_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/pl_web_vhost_domain.lng
@@ -15,7 +15,7 @@ $wb['parent_domain_id_txt'] = 'Macierzysta strona www';
 $wb['redirect_type_txt'] = 'Rodzaj przekierowania';
 $wb['redirect_path_txt'] = 'Ścieżka przekierowania';
 $wb['active_txt'] = 'Aktywny';
-$wb['document_root_txt'] = 'Katalog strony';
+$wb['document_root_txt'] = 'Document Root';
 $wb['system_user_txt'] = 'Użytkownik systemowy';
 $wb['system_group_txt'] = 'Grupa systemowa';
 $wb['ip_address_txt'] = 'Adres IP';
@@ -126,15 +126,20 @@ $wb['web_folder_invalid_txt'] = 'Folder strony jest nieprawidłowy, proszę wybr
 $wb['web_folder_unique_txt'] = 'Folder strony jest już w użyciu, proszę wybrać inny.';
 $wb['host_txt'] = 'Nazwa hosta';
 $wb['domain_error_wildcard'] = 'Subdomeny typu wildcard nie są dozwolone.';
-
 $wb['variables_txt'] = 'Variables';
 $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $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_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
-$wb["document_root_txt"] = "Document Root";
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['load_client_data_txt'] = 'Load client details';
+$wb['load_my_data_txt'] = 'Load my contact details';
+$wb['reset_client_data_txt'] = 'Reset data';
+$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
diff --git a/interface/web/sites/lib/lang/pl_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/pl_web_vhost_domain_list.lng
index 6a5d709e15..845908b08a 100644
--- a/interface/web/sites/lib/lang/pl_web_vhost_domain_list.lng
+++ b/interface/web/sites/lib/lang/pl_web_vhost_domain_list.lng
@@ -6,5 +6,4 @@ $wb['server_id_txt'] = 'Serwer';
 $wb['domain_txt'] = 'Domena';
 $wb['add_new_record_txt'] = 'Dodaj nową stronę';
 $wb['parent_domain_id_txt'] = 'Website';
-
 ?>
diff --git a/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..02ad8b93ae
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_web_vhost_subdomain.lng
@@ -0,0 +1,127 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Strona macierzysta';
+$wb['web_folder_txt'] = 'Folder strony';
+$wb['web_folder_invalid_txt'] = 'Folder strony jest nieprawidłowy, proszę wybrać inny.';
+$wb['web_folder_unique_txt'] = 'Folder strony jest już w użyciu, proszę wybrać inny.';
+$wb['backup_interval_txt'] = 'Częstotliwość kopii';
+$wb['backup_copies_txt'] = 'Liczba kopii zapasowych';
+$wb['ssl_state_txt'] = 'Województwo';
+$wb['ssl_locality_txt'] = 'Lokalizacja';
+$wb['ssl_organisation_txt'] = 'Ogranizacja';
+$wb['ssl_organisation_unit_txt'] = 'Jednostka organizacji';
+$wb['ssl_country_txt'] = 'Kraj';
+$wb['ssl_key_txt'] = 'Klucz SSL';
+$wb['ssl_request_txt'] = 'Żądanie SSL';
+$wb['ssl_cert_txt'] = 'Certyfikat SSL';
+$wb['ssl_bundle_txt'] = 'Pakiet SSL (Bundle)';
+$wb['ssl_action_txt'] = 'Czynność SSL';
+$wb['ssl_domain_txt'] = 'Domena SSL';
+$wb['server_id_txt'] = 'Serwer';
+$wb['domain_txt'] = 'Domena';
+$wb['host_txt'] = 'Nazwa hosta';
+$wb['web_folder_error_regex'] = 'Wpisano nieprawidłowy folder. Proszę nie dopisywać znaku slash: / ';
+$wb['type_txt'] = 'Rodzaj';
+$wb['redirect_type_txt'] = 'Rodzaj przekierowania';
+$wb['redirect_path_txt'] = 'Ścieżka przekierowania';
+$wb['active_txt'] = 'Aktywny';
+$wb['document_root_txt'] = 'Document root';
+$wb['system_user_txt'] = 'Użytkownik systemowy';
+$wb['system_group_txt'] = 'Grupa systemowa';
+$wb['ip_address_txt'] = 'Adres IPv4';
+$wb['ipv6_address_txt'] = 'Adres IPv6';
+$wb['vhost_type_txt'] = 'Typ VHosta';
+$wb['hd_quota_txt'] = 'Limit dysku';
+$wb['traffic_quota_txt'] = 'Limit transferu';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Własne strony błędów';
+$wb['subdomain_txt'] = 'Automatyczna subdomena';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Klient';
+$wb['limit_web_domain_txt'] = 'Maks. liczba domen dla Twojego konta została osiągnięta.';
+$wb['limit_web_aliasdomain_txt'] = 'Maks. liczba aliasów domen dla Twojego konta została osiągnięta.';
+$wb['limit_web_subdomain_txt'] = 'Maks. liczba poddomen dla Twojego konta została osiągnięta.';
+$wb['apache_directives_txt'] = 'Dyrektywy Apache';
+$wb['domain_error_empty'] = 'Pole domeny jest puste';
+$wb['domain_error_unique'] = 'Istnieje już strona z taką domeną lub subdomeną.';
+$wb['domain_error_regex'] = 'Nazwa domeny jest nieprawidłowa.';
+$wb['domain_error_wildcard'] = 'Subdomeny typu wildcard nie są dozwolone.';
+$wb['hd_quota_error_empty'] = 'Pole limitu dysku jest puste lub wynosi 0.';
+$wb['traffic_quota_error_empty'] = 'Pole limitu transferu jest puste.';
+$wb['error_ssl_state_empty'] = 'Pole województwa dla SSL jest puste.';
+$wb['error_ssl_locality_empty'] = 'Pole lokalizacji dla SSL jest puste.';
+$wb['error_ssl_organisation_empty'] = 'Pole organizacji dla SSL jest puste.';
+$wb['error_ssl_organisation_unit_empty'] = 'Pole jednostki dla SSL jest puste.';
+$wb['error_ssl_country_empty'] = 'Pole kraju dla SSL jest puste.';
+$wb['error_ssl_cert_empty'] = 'Pole certyfikatu SSL jest puste.';
+$wb['client_group_id_txt'] = 'Klient';
+$wb['stats_password_txt'] = 'Hasło do statystyk';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Maks. dostępny limit dysku';
+$wb['ssl_state_error_regex'] = 'Nieprawidłowe województwo SSL. Dozwolone znaki: a-z, 0-9 i .,-_';
+$wb['ssl_locality_error_regex'] = 'Nieprawidłowa lokalizacja SSL. Dozwolone znaki: a-z, 0-9 i .,-_';
+$wb['ssl_organisation_error_regex'] = 'Nieprawidłowa organizacja SSL. Dozwolone znaki: a-z, 0-9 i .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Nieprawidłowa jednostka SSL. Dozwolone znaki: a-z, 0-9 i .,-_';
+$wb['ssl_country_error_regex'] = 'Nieprawidłowy kraj SSL. Dozwolone znaki: a-z, 0-9 i .,-_';
+$wb['limit_traffic_quota_free_txt'] = 'Maks. dostępny limit transferu';
+$wb['redirect_error_regex'] = 'Nieprawidłowa ścieżka przekierowania. Przykładowe prawidłowe przekierowania: /test/ lub http://www.domena.pl/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Limit transferu został przekroczony';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Login do statystyk';
+$wb['stats_type_txt'] = 'Rodzaj statystyk';
+$wb['custom_php_ini_txt'] = 'Własne ustawienia php.ini';
+$wb['none_txt'] = 'Brak';
+$wb['disabled_txt'] = 'Wyłączone';
+$wb['no_redirect_txt'] = 'Bez przekierowania';
+$wb['no_flag_txt'] = 'Bez flagi';
+$wb['save_certificate_txt'] = 'Zapisz certyfikat';
+$wb['create_certificate_txt'] = 'Utwórz certyfikat';
+$wb['delete_certificate_txt'] = 'Usuń certyfikat';
+$wb['nginx_directives_txt'] = 'Dyrektywy nginx';
+$wb['seo_redirect_txt'] = 'Przekierowanie SEO';
+$wb['non_www_to_www_txt'] = 'bez-www -> www';
+$wb['www_to_non_www_txt'] = 'www -> bez-www';
+$wb['php_fpm_use_socket_txt'] = 'Użyj gniazda dla PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI dla SSL nie jest aktywowane dla tego serwera. Możesz włączyć tylko jeden certyfikat SSL dla jednego adresu IP.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Wartości ustawień PHP-FPM pm muszą być następujące: pm.max_children >= pm.max_spare_servers >= pm.start_servers >= pm.min_spare_servers > 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children musi być dodatnią wartością całkowitą.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers musi być dodatnią wartością całkowitą.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers musi być dodatnią wartością całkowitą.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers musi być dodatnią wartością całkowitą.';
+$wb['hd_quota_error_regex'] = 'Limit dyski jest nieprawidłowy';
+$wb['traffic_quota_error_regex'] = 'Limit transferu jest nieprawidłowy';
+$wb['fastcgi_php_version_txt'] = 'Wersja PHP';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout musi być dodatnią wartością całkowitą.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests musi być wartością całkowitą >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Pamiętaj że musisz mieć wersję PHP >= 5.3.9 aby używać ondemand process manager. W przypadku starszej wersji PHP nie będzie działać w ogóle!';
+$wb['generate_password_txt'] = 'Generuj hasło';
+$wb['repeat_password_txt'] = 'Powtórz hasło';
+$wb['password_mismatch_txt'] = 'Hasła nie pasują do siebie';
+$wb['password_match_txt'] = 'Hasła pasują do siebie';
+$wb['available_php_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw PHP:';
+$wb['available_apache_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Apache:';
+$wb['available_nginx_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw nginx:';
+$wb['proxy_directives_txt'] = 'Dyrektywy Proxy';
+$wb['available_proxy_directive_snippets_txt'] = 'Dostępne zestawy dyrektyw Proxy:';
+$wb['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Variables';
+$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['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+?>
diff --git a/interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng
new file mode 100644
index 0000000000..1c16bcda28
--- /dev/null
+++ b/interface/web/sites/lib/lang/pl_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
+?>
diff --git a/interface/web/sites/lib/lang/pt_backup_stats_list.lng b/interface/web/sites/lib/lang/pt_backup_stats_list.lng
index 0f3803f56a..65792aa591 100644
--- a/interface/web/sites/lib/lang/pt_backup_stats_list.lng
+++ b/interface/web/sites/lib/lang/pt_backup_stats_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb["database_name_txt"]   = '';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Domain';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['database_name_txt'] = '';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/sites/lib/lang/pt_cron.lng b/interface/web/sites/lib/lang/pt_cron.lng
index a8f1abdf9b..442ef092a0 100644
--- a/interface/web/sites/lib/lang/pt_cron.lng
+++ b/interface/web/sites/lib/lang/pt_cron.lng
@@ -21,4 +21,6 @@ $wb['unknown_fieldtype_error'] = 'Um tipo desconhecido de campo foi usado.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
 $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_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
+$wb['log_output_txt'] = 'Log output';
 ?>
diff --git a/interface/web/sites/lib/lang/pt_database.lng b/interface/web/sites/lib/lang/pt_database.lng
index d99c41a8b0..e43e7f6b31 100644
--- a/interface/web/sites/lib/lang/pt_database.lng
+++ b/interface/web/sites/lib/lang/pt_database.lng
@@ -43,4 +43,7 @@ $wb['select_dbuser_txt'] = 'Select database user';
 $wb['no_dbuser_txt'] = 'None';
 $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['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
 ?>
diff --git a/interface/web/sites/lib/lang/pt_database_admin_list.lng b/interface/web/sites/lib/lang/pt_database_admin_list.lng
index 27e62b9ac6..333a5357c6 100644
--- a/interface/web/sites/lib/lang/pt_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/pt_database_admin_list.lng
@@ -8,4 +8,5 @@ $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['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/pt_database_list.lng b/interface/web/sites/lib/lang/pt_database_list.lng
index 9e886921d0..2dc2004509 100644
--- a/interface/web/sites/lib/lang/pt_database_list.lng
+++ b/interface/web/sites/lib/lang/pt_database_list.lng
@@ -7,4 +7,5 @@ $wb['database_name_txt'] = 'Nome da Base de Dados';
 $wb['add_new_record_txt'] = 'Adicionar uma nova base de dados';
 $wb['database_user_txt'] = 'Database user';
 $wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/pt_database_quota_stats_list.lng b/interface/web/sites/lib/lang/pt_database_quota_stats_list.lng
index e1de70accf..4f92576007 100644
--- a/interface/web/sites/lib/lang/pt_database_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/pt_database_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["database_txt"] = 'Database';
-$wb["server_name_txt"] = 'Server';
-$wb["client_txt"] = 'Client';
-$wb["used_txt"] = 'Used space';
-$wb["quota_txt"] = 'Quota';
-$wb["percentage_txt"] = 'Used in %';
+$wb['database_txt'] = 'Database';
+$wb['server_name_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb['used_txt'] = 'Used space';
+$wb['quota_txt'] = 'Quota';
+$wb['percentage_txt'] = 'Used in %';
 ?>
diff --git a/interface/web/sites/lib/lang/pt_ftp_sites_stats_list.lng b/interface/web/sites/lib/lang/pt_ftp_sites_stats_list.lng
new file mode 100644
index 0000000000..03894607db
--- /dev/null
+++ b/interface/web/sites/lib/lang/pt_ftp_sites_stats_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb["list_head_txt"] = 'FTP 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 (Download + Upload)';
+$wb["in_out_txt"] = 'DL/UL';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/pt_ftp_user.lng b/interface/web/sites/lib/lang/pt_ftp_user.lng
index 9f5ed046ce..68b170474b 100644
--- a/interface/web/sites/lib/lang/pt_ftp_user.lng
+++ b/interface/web/sites/lib/lang/pt_ftp_user.lng
@@ -31,6 +31,5 @@ $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['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['directory_error_regex'] = 'Invalid directory';
+$wb['expires_txt'] = 'Expire at';
 ?>
diff --git a/interface/web/sites/lib/lang/pt_web_aliasdomain.lng b/interface/web/sites/lib/lang/pt_web_aliasdomain.lng
new file mode 100644
index 0000000000..4149c71149
--- /dev/null
+++ b/interface/web/sites/lib/lang/pt_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['Domain'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/pt_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/pt_web_aliasdomain_list.lng
new file mode 100644
index 0000000000..435305ce1b
--- /dev/null
+++ b/interface/web/sites/lib/lang/pt_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Domínio Alias';
+$wb['active_txt'] = 'Activo';
+$wb['server_id_txt'] = 'Servidor';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Domínio Alias';
+$wb['add_new_record_txt'] = 'Adicionar Alias de Domínio';
+$wb['domain_error_empty'] = 'Domínio em branco.';
+$wb['domain_error_unique'] = 'O domínio deve ser único.';
+$wb['domain_error_regex'] = 'Nome de domínio inválido.';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/sites/lib/lang/pt_web_backup_list.lng b/interface/web/sites/lib/lang/pt_web_backup_list.lng
index fa4a59b403..d1133334f0 100644
--- a/interface/web/sites/lib/lang/pt_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/pt_web_backup_list.lng
@@ -16,4 +16,6 @@ $wb['delete_confirm_txt'] = 'Really delete this backup?';
 $wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
 $wb['backup_type_mysql'] = 'MySQL Database';
 $wb['backup_type_web'] = 'Website files';
+$wb['filesize_txt'] = 'Filesize';
+$wb['backup_type_mongodb'] = 'MongoDB Database';
 ?>
diff --git a/interface/web/sites/lib/lang/pt_web_childdomain.lng b/interface/web/sites/lib/lang/pt_web_childdomain.lng
index 5e436bfa56..c903b55d5d 100644
--- a/interface/web/sites/lib/lang/pt_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/pt_web_childdomain.lng
@@ -42,7 +42,7 @@ $wb['no_flag_txt'] = 'No flag';
 $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.';
 $wb['backup_interval_txt'] = 'Backup interval';
 $wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['ssl_key_txt'] = 'SSL Key';
@@ -115,5 +115,4 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
-
 ?>
diff --git a/interface/web/sites/lib/lang/pt_web_childdomain_list.lng b/interface/web/sites/lib/lang/pt_web_childdomain_list.lng
index f95938591e..08a077ae7d 100644
--- a/interface/web/sites/lib/lang/pt_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/pt_web_childdomain_list.lng
@@ -4,12 +4,12 @@ $wb['active_txt'] = 'Activo';
 $wb['server_id_txt'] = 'Servidor';
 $wb['parent_domain_id_txt'] = 'Website';
 $wb['domain_txt'] = 'Sub-domínio';
-$wb['add_new_record_txt'] = 'Adicionar um novo sub-domínio';
 $wb['domain_error_empty'] = 'Domínio em branco.';
 $wb['domain_error_unique'] = 'O domínio deve ser único.';
 $wb['domain_error_regex'] = 'Nome de domínio inválido.';
 $wb['no_redirect_txt'] = 'No redirect';
 $wb['no_flag_txt'] = 'No flag';
 $wb['none_txt'] = 'None';
-
+$wb['add_new_subdomain_txt'] = 'Add new Subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/pt_web_directive_snippets.lng b/interface/web/sites/lib/lang/pt_web_directive_snippets.lng
new file mode 100644
index 0000000000..05a004f654
--- /dev/null
+++ b/interface/web/sites/lib/lang/pt_web_directive_snippets.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['directive_snippets_id_txt'] = 'Desired configuration';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/pt_web_domain.lng b/interface/web/sites/lib/lang/pt_web_domain.lng
new file mode 100644
index 0000000000..ac0f7f724f
--- /dev/null
+++ b/interface/web/sites/lib/lang/pt_web_domain.lng
@@ -0,0 +1,132 @@
+<?php
+$wb['ssl_state_txt'] = 'Estado';
+$wb['ssl_locality_txt'] = 'Localização';
+$wb['ssl_organisation_txt'] = 'Empresa';
+$wb['ssl_organisation_unit_txt'] = 'Departamento';
+$wb['ssl_country_txt'] = 'País';
+$wb['ssl_request_txt'] = 'Requisição SSL';
+$wb['ssl_cert_txt'] = 'Certificado SSL';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['server_id_txt'] = 'Servidor';
+$wb['domain_txt'] = 'Domínio';
+$wb['type_txt'] = 'Tipo';
+$wb['parent_domain_id_txt'] = 'Site Parente';
+$wb['redirect_type_txt'] = 'Tipo Redireccionamento';
+$wb['redirect_path_txt'] = 'Pasta de redireccionamento';
+$wb['active_txt'] = 'Activo';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Utilizador Linux';
+$wb['system_group_txt'] = 'Groupo Linux';
+$wb['ip_address_txt'] = 'Endereço-IP';
+$wb['vhost_type_txt'] = 'Tipo de VHost';
+$wb['hd_quota_txt'] = 'Cota de Disco';
+$wb['traffic_quota_txt'] = 'Cota de Tráfego';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Páginas de Erro';
+$wb['subdomain_txt'] = 'Auto-Subdomínio';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Cliente';
+$wb['limit_web_domain_txt'] = 'O número máximo de domínios web para a conta foi atingido.';
+$wb['limit_web_aliasdomain_txt'] = 'O número máximo de aliases domínio para a conta foi atingido.';
+$wb['limit_web_subdomain_txt'] = 'O número máximo de sub-domínios para a conta foi atingido.';
+$wb['apache_directives_txt'] = 'Directivas do Apache';
+$wb['domain_error_empty'] = 'Domínio em branco.';
+$wb['domain_error_unique'] = 'Já existe site, alias ou sub-domínio com este nome';
+$wb['domain_error_regex'] = 'Nome de domínio inválido.';
+$wb['hd_quota_error_empty'] = 'Quota de disco está em branco.';
+$wb['traffic_quota_error_empty'] = 'Quota de tráfego está em branco.';
+$wb['error_ssl_state_empty'] = 'Estado do SSL está em branco.';
+$wb['error_ssl_locality_empty'] = 'Localização do SSL está em branco.';
+$wb['error_ssl_organisation_empty'] = 'Empresa do SSL está em branco.';
+$wb['error_ssl_organisation_unit_empty'] = 'Departamento do SSL está em branco.';
+$wb['error_ssl_country_empty'] = 'País do SSL em branco.';
+$wb['client_group_id_txt'] = 'Cliente';
+$wb['stats_password_txt'] = 'Senha da pasta de estatísticas';
+$wb['ssl_domain_txt'] = 'Domínio SSL';
+$wb['allow_override_txt'] = 'Permitir Sobrescrever';
+$wb['limit_web_quota_free_txt'] = 'Cota Max. de disco disponível';
+$wb['ssl_state_error_regex'] = 'Estado inválido para SSL. São caracteres válidos: a-z, 0-9 e .,-_';
+$wb['ssl_locality_error_regex'] = 'Localidade inválida para SSL. São caracteres válidos: a-z, 0-9 e .,-_';
+$wb['ssl_organisation_error_regex'] = 'Empresa inválida para SSL. São caracteres válidos: a-z, 0-9 e .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Departamento inválido para SSL. São caracteres válidos: a-z, 0-9 e .,-_';
+$wb['ssl_country_error_regex'] = 'País inválido para SSL. São caracteres válidos: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Cota máxima de Tráfego disponível';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['perl_txt'] = 'Perl';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['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['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_system_user_or_group_txt'] = 'Invalid system user or group';
+$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
+?>
diff --git a/interface/web/sites/lib/lang/pt_web_domain_admin_list.lng b/interface/web/sites/lib/lang/pt_web_domain_admin_list.lng
new file mode 100644
index 0000000000..b460e27100
--- /dev/null
+++ b/interface/web/sites/lib/lang/pt_web_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['sys_groupid_txt'] = 'Client';
+$wb['list_head_txt'] = 'Websites';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Add new website';
+?>
diff --git a/interface/web/sites/lib/lang/pt_web_domain_list.lng b/interface/web/sites/lib/lang/pt_web_domain_list.lng
new file mode 100644
index 0000000000..5fb91187cb
--- /dev/null
+++ b/interface/web/sites/lib/lang/pt_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Websites';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Activo';
+$wb['server_id_txt'] = 'Servidor';
+$wb['domain_txt'] = 'Domínio';
+$wb['add_new_record_txt'] = 'Adicionar um novo site';
+?>
diff --git a/interface/web/sites/lib/lang/pt_web_subdomain.lng b/interface/web/sites/lib/lang/pt_web_subdomain.lng
new file mode 100644
index 0000000000..570badca98
--- /dev/null
+++ b/interface/web/sites/lib/lang/pt_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['ssl_state_txt'] = 'Estado';
+$wb['ssl_locality_txt'] = 'Localidade';
+$wb['ssl_organisation_txt'] = 'Empresa';
+$wb['ssl_organisation_unit_txt'] = 'Departamento';
+$wb['ssl_country_txt'] = 'País';
+$wb['ssl_request_txt'] = 'Requisição SSL';
+$wb['ssl_cert_txt'] = 'Certificado SSL';
+$wb['ssl_bundle_txt'] = 'Pacote SSL';
+$wb['ssl_action_txt'] = 'Acção SSL';
+$wb['server_id_txt'] = 'Servidor';
+$wb['domain_txt'] = 'Domínio';
+$wb['type_txt'] = 'Tipo';
+$wb['parent_domain_id_txt'] = 'Site Parente';
+$wb['redirect_type_txt'] = 'Tipo do Redireccionamento';
+$wb['redirect_path_txt'] = 'Pasta do Redireccionamento';
+$wb['active_txt'] = 'Activo';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Utilizador no Linux';
+$wb['system_group_txt'] = 'Grupo no Linux';
+$wb['ip_address_txt'] = 'Endereço-IP';
+$wb['vhost_type_txt'] = 'Tipo de VHost';
+$wb['hd_quota_txt'] = 'Cota de Disco';
+$wb['traffic_quota_txt'] = 'Cota de Tráfico';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Cliente';
+$wb['limit_web_domain_txt'] = 'O número máximo de domínios web para esta conta foi atingido.';
+$wb['limit_web_aliasdomain_txt'] = 'O número máximo de aliases para esta conta foi atingido.';
+$wb['limit_web_subdomain_txt'] = 'O número máximo de sub-domínios para esta conta foi atingido.';
+$wb['apache_directives_txt'] = 'Directivas apache';
+$wb['domain_error_empty'] = 'Domínio em branco.';
+$wb['domain_error_unique'] = 'Já existe um alias ou sub-domínio com este nome.';
+$wb['domain_error_regex'] = 'Nome de domínio inválido.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Pasta de redireccionamento inválida. Exemplos de redireccionamentos válidos: /test/ or http://www.dominio.pt/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$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.';
+?>
diff --git a/interface/web/sites/lib/lang/pt_web_subdomain_list.lng b/interface/web/sites/lib/lang/pt_web_subdomain_list.lng
new file mode 100644
index 0000000000..37fa572ccf
--- /dev/null
+++ b/interface/web/sites/lib/lang/pt_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Sub-domínios';
+$wb['active_txt'] = 'Activo';
+$wb['server_id_txt'] = 'Servidor';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Sub-domínio';
+$wb['add_new_record_txt'] = 'Adicionar um novo sub-domínio';
+?>
diff --git a/interface/web/sites/lib/lang/pt_web_vhost_domain.lng b/interface/web/sites/lib/lang/pt_web_vhost_domain.lng
index 60718d0f35..4452454bb0 100644
--- a/interface/web/sites/lib/lang/pt_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/pt_web_vhost_domain.lng
@@ -15,7 +15,7 @@ $wb['parent_domain_id_txt'] = 'Site Parente';
 $wb['redirect_type_txt'] = 'Tipo Redireccionamento';
 $wb['redirect_path_txt'] = 'Pasta de redireccionamento';
 $wb['active_txt'] = 'Activo';
-$wb['document_root_txt'] = 'Documentroot';
+$wb['document_root_txt'] = 'Document Root';
 $wb['system_user_txt'] = 'Utilizador Linux';
 $wb['system_group_txt'] = 'Groupo Linux';
 $wb['ip_address_txt'] = 'Endereço-IP';
@@ -126,15 +126,20 @@ $wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a diff
 $wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
 $wb['host_txt'] = 'Hostname';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-
 $wb['variables_txt'] = 'Variables';
 $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $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_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
-$wb["document_root_txt"] = "Document Root";
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['load_client_data_txt'] = 'Load client details';
+$wb['load_my_data_txt'] = 'Load my contact details';
+$wb['reset_client_data_txt'] = 'Reset data';
+$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
diff --git a/interface/web/sites/lib/lang/pt_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/pt_web_vhost_domain_list.lng
index 9bbf3669b6..97dced180a 100644
--- a/interface/web/sites/lib/lang/pt_web_vhost_domain_list.lng
+++ b/interface/web/sites/lib/lang/pt_web_vhost_domain_list.lng
@@ -6,5 +6,4 @@ $wb['server_id_txt'] = 'Servidor';
 $wb['domain_txt'] = 'Domínio';
 $wb['add_new_record_txt'] = 'Adicionar um novo site';
 $wb['parent_domain_id_txt'] = 'Website';
-
 ?>
diff --git a/interface/web/sites/lib/lang/pt_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/pt_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..c0ca93b570
--- /dev/null
+++ b/interface/web/sites/lib/lang/pt_web_vhost_subdomain.lng
@@ -0,0 +1,127 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Variables';
+$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['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+?>
diff --git a/interface/web/sites/lib/lang/pt_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/pt_web_vhost_subdomain_list.lng
new file mode 100644
index 0000000000..1c16bcda28
--- /dev/null
+++ b/interface/web/sites/lib/lang/pt_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
+?>
diff --git a/interface/web/sites/lib/lang/ro_backup_stats_list.lng b/interface/web/sites/lib/lang/ro_backup_stats_list.lng
index 0f3803f56a..65792aa591 100644
--- a/interface/web/sites/lib/lang/ro_backup_stats_list.lng
+++ b/interface/web/sites/lib/lang/ro_backup_stats_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb["database_name_txt"]   = '';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Domain';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['database_name_txt'] = '';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/sites/lib/lang/ro_cron.lng b/interface/web/sites/lib/lang/ro_cron.lng
index 369c3b8bbd..13bd5afb07 100644
--- a/interface/web/sites/lib/lang/ro_cron.lng
+++ b/interface/web/sites/lib/lang/ro_cron.lng
@@ -21,4 +21,6 @@ $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
 $wb['server_id_error_empty'] = 'The server ID is empty.';
 $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_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
+$wb['log_output_txt'] = 'Log output';
 ?>
diff --git a/interface/web/sites/lib/lang/ro_database.lng b/interface/web/sites/lib/lang/ro_database.lng
index 9dcf25cd80..48acc975c2 100644
--- a/interface/web/sites/lib/lang/ro_database.lng
+++ b/interface/web/sites/lib/lang/ro_database.lng
@@ -43,4 +43,7 @@ $wb['select_dbuser_txt'] = 'Select database user';
 $wb['no_dbuser_txt'] = 'None';
 $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['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
 ?>
diff --git a/interface/web/sites/lib/lang/ro_database_admin_list.lng b/interface/web/sites/lib/lang/ro_database_admin_list.lng
index 27e62b9ac6..333a5357c6 100644
--- a/interface/web/sites/lib/lang/ro_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/ro_database_admin_list.lng
@@ -8,4 +8,5 @@ $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['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/ro_database_list.lng b/interface/web/sites/lib/lang/ro_database_list.lng
index 3b835ce3d5..b8ae534d7f 100644
--- a/interface/web/sites/lib/lang/ro_database_list.lng
+++ b/interface/web/sites/lib/lang/ro_database_list.lng
@@ -7,4 +7,5 @@ $wb['database_name_txt'] = 'Database name';
 $wb['add_new_record_txt'] = 'Adauga Database';
 $wb['database_user_txt'] = 'Database user';
 $wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/ro_database_quota_stats_list.lng b/interface/web/sites/lib/lang/ro_database_quota_stats_list.lng
index e1de70accf..4f92576007 100644
--- a/interface/web/sites/lib/lang/ro_database_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/ro_database_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["database_txt"] = 'Database';
-$wb["server_name_txt"] = 'Server';
-$wb["client_txt"] = 'Client';
-$wb["used_txt"] = 'Used space';
-$wb["quota_txt"] = 'Quota';
-$wb["percentage_txt"] = 'Used in %';
+$wb['database_txt'] = 'Database';
+$wb['server_name_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb['used_txt'] = 'Used space';
+$wb['quota_txt'] = 'Quota';
+$wb['percentage_txt'] = 'Used in %';
 ?>
diff --git a/interface/web/sites/lib/lang/ro_ftp_sites_stats_list.lng b/interface/web/sites/lib/lang/ro_ftp_sites_stats_list.lng
new file mode 100644
index 0000000000..e44025a715
--- /dev/null
+++ b/interface/web/sites/lib/lang/ro_ftp_sites_stats_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'FTP 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 (Download + Upload)';
+$wb['in_out_txt'] = 'DL/UL';
+?>
diff --git a/interface/web/sites/lib/lang/ro_ftp_user.lng b/interface/web/sites/lib/lang/ro_ftp_user.lng
index e28b35e6d9..1528795fe7 100644
--- a/interface/web/sites/lib/lang/ro_ftp_user.lng
+++ b/interface/web/sites/lib/lang/ro_ftp_user.lng
@@ -31,6 +31,5 @@ $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['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['directory_error_regex'] = 'Invalid directory';
+$wb['expires_txt'] = 'Expire at';
 ?>
diff --git a/interface/web/sites/lib/lang/ro_web_aliasdomain.lng b/interface/web/sites/lib/lang/ro_web_aliasdomain.lng
new file mode 100644
index 0000000000..4149c71149
--- /dev/null
+++ b/interface/web/sites/lib/lang/ro_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['Domain'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/ro_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/ro_web_aliasdomain_list.lng
new file mode 100644
index 0000000000..e83de5b94d
--- /dev/null
+++ b/interface/web/sites/lib/lang/ro_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Aliasdomain';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['add_new_record_txt'] = 'Adauga un nou  aliasdomain';
+$wb['domain_error_empty'] = 'Domain necompletat';
+$wb['domain_error_unique'] = 'Domain trebuie sa fie unic';
+$wb['domain_error_regex'] = 'Domain nume invalid.';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/sites/lib/lang/ro_web_backup_list.lng b/interface/web/sites/lib/lang/ro_web_backup_list.lng
index fa4a59b403..d1133334f0 100644
--- a/interface/web/sites/lib/lang/ro_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/ro_web_backup_list.lng
@@ -16,4 +16,6 @@ $wb['delete_confirm_txt'] = 'Really delete this backup?';
 $wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
 $wb['backup_type_mysql'] = 'MySQL Database';
 $wb['backup_type_web'] = 'Website files';
+$wb['filesize_txt'] = 'Filesize';
+$wb['backup_type_mongodb'] = 'MongoDB Database';
 ?>
diff --git a/interface/web/sites/lib/lang/ro_web_childdomain.lng b/interface/web/sites/lib/lang/ro_web_childdomain.lng
index 2f9fc74272..a3bcfdd37d 100644
--- a/interface/web/sites/lib/lang/ro_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/ro_web_childdomain.lng
@@ -42,7 +42,7 @@ $wb['no_flag_txt'] = 'No flag';
 $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.';
 $wb['backup_interval_txt'] = 'Backup interval';
 $wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['ssl_key_txt'] = 'SSL Key';
@@ -115,5 +115,4 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
-
 ?>
diff --git a/interface/web/sites/lib/lang/ro_web_childdomain_list.lng b/interface/web/sites/lib/lang/ro_web_childdomain_list.lng
index ad66cbfdb5..fd1db522c6 100644
--- a/interface/web/sites/lib/lang/ro_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/ro_web_childdomain_list.lng
@@ -4,12 +4,12 @@ $wb['active_txt'] = 'Active';
 $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Website';
 $wb['domain_txt'] = 'Subdomeniu';
-$wb['add_new_record_txt'] = 'Adauga un nou  subdomeniu';
 $wb['domain_error_empty'] = 'Domain necompletat';
 $wb['domain_error_unique'] = 'Domain trebuie sa fie unic';
 $wb['domain_error_regex'] = 'Domain nume invalid.';
 $wb['no_redirect_txt'] = 'No redirect';
 $wb['no_flag_txt'] = 'No flag';
 $wb['none_txt'] = 'None';
-
+$wb['add_new_subdomain_txt'] = 'Add new Subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/ro_web_directive_snippets.lng b/interface/web/sites/lib/lang/ro_web_directive_snippets.lng
new file mode 100644
index 0000000000..d2590e53cf
--- /dev/null
+++ b/interface/web/sites/lib/lang/ro_web_directive_snippets.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['directive_snippets_id_txt'] = 'Desired configuration';
+?>
diff --git a/interface/web/sites/lib/lang/ro_web_domain.lng b/interface/web/sites/lib/lang/ro_web_domain.lng
new file mode 100644
index 0000000000..d4667d00c4
--- /dev/null
+++ b/interface/web/sites/lib/lang/ro_web_domain.lng
@@ -0,0 +1,132 @@
+<?php
+$wb['ssl_state_txt'] = 'Judet';
+$wb['ssl_locality_txt'] = 'Localitate';
+$wb['ssl_organisation_txt'] = 'Organizatie';
+$wb['ssl_organisation_unit_txt'] = 'Unitate din Organizatie';
+$wb['ssl_country_txt'] = 'Tara';
+$wb['ssl_request_txt'] = 'SSL Cerere';
+$wb['ssl_cert_txt'] = 'SSL Certificat';
+$wb['ssl_bundle_txt'] = 'SSL Bundle (pachet)';
+$wb['ssl_action_txt'] = 'SSL Actiune';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Tip';
+$wb['parent_domain_id_txt'] = 'Parinte Website';
+$wb['redirect_type_txt'] = 'Redirect Tip';
+$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['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$wb['limit_web_domain_txt'] = 'Numarul maxim de domenii web pe contl dumneavoastra a fost atins';
+$wb['limit_web_aliasdomain_txt'] = 'Numarul maxim de aliasuri pe contul  dumneavoastra a fost atins';
+$wb['limit_web_subdomain_txt'] = 'Numarul maxim de web subdomenii pe contul dumneavoastra a fost atins';
+$wb['apache_directives_txt'] = 'Apache directive';
+$wb['domain_error_empty'] = 'Domain este necompletat';
+$wb['domain_error_unique'] = 'deja exista un domeniu /subdomeniu asemanator';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota necompletata';
+$wb['traffic_quota_error_empty'] = 'Traffic quota necompletata';
+$wb['error_ssl_state_empty'] = 'SSL Judet necompletata';
+$wb['error_ssl_locality_empty'] = 'SSL Localitate necompletata';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation necompletata';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit necompletata';
+$wb['error_ssl_country_empty'] = 'SSL Tara necompletata';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['allow_override_txt'] = 'Allow Override';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['perl_txt'] = 'Perl';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['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['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_system_user_or_group_txt'] = 'Invalid system user or group';
+$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
+?>
diff --git a/interface/web/sites/lib/lang/ro_web_domain_admin_list.lng b/interface/web/sites/lib/lang/ro_web_domain_admin_list.lng
new file mode 100644
index 0000000000..b460e27100
--- /dev/null
+++ b/interface/web/sites/lib/lang/ro_web_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['sys_groupid_txt'] = 'Client';
+$wb['list_head_txt'] = 'Websites';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Add new website';
+?>
diff --git a/interface/web/sites/lib/lang/ro_web_domain_list.lng b/interface/web/sites/lib/lang/ro_web_domain_list.lng
new file mode 100644
index 0000000000..e84427d2a0
--- /dev/null
+++ b/interface/web/sites/lib/lang/ro_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Website-uri';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Adauga un nou  website';
+?>
diff --git a/interface/web/sites/lib/lang/ro_web_subdomain.lng b/interface/web/sites/lib/lang/ro_web_subdomain.lng
new file mode 100644
index 0000000000..614f88631b
--- /dev/null
+++ b/interface/web/sites/lib/lang/ro_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['ssl_state_txt'] = 'Judet';
+$wb['ssl_locality_txt'] = 'Localitate';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Tara';
+$wb['ssl_request_txt'] = 'SSL Cerere';
+$wb['ssl_cert_txt'] = 'SSL Certificat';
+$wb['ssl_bundle_txt'] = 'SSL Bundle (pachet)';
+$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['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quaota';
+$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['limit_web_domain_txt'] = 'numarul maxim de web domnii a fost atins';
+$wb['limit_web_aliasdomain_txt'] = 'Numarul maxim de alias domain a fost atins';
+$wb['limit_web_subdomain_txt'] = 'numarul maxim de subdomenii a fost atins';
+$wb['apache_directives_txt'] = 'Apache directives';
+$wb['domain_error_empty'] = 'Domain necompletat';
+$wb['domain_error_unique'] = 'exista deja un domeniu sau subdomeniu asemanator';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$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['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.';
+?>
diff --git a/interface/web/sites/lib/lang/ro_web_subdomain_list.lng b/interface/web/sites/lib/lang/ro_web_subdomain_list.lng
new file mode 100644
index 0000000000..445ec6ca99
--- /dev/null
+++ b/interface/web/sites/lib/lang/ro_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomenii';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomeniu';
+$wb['add_new_record_txt'] = 'Adauga un nou  subdomeniu';
+?>
diff --git a/interface/web/sites/lib/lang/ro_web_vhost_domain.lng b/interface/web/sites/lib/lang/ro_web_vhost_domain.lng
index 893bf45fb4..49e61cd65f 100644
--- a/interface/web/sites/lib/lang/ro_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/ro_web_vhost_domain.lng
@@ -15,7 +15,7 @@ $wb['parent_domain_id_txt'] = 'Parinte Website';
 $wb['redirect_type_txt'] = 'Redirect Tip';
 $wb['redirect_path_txt'] = 'Redirect Path';
 $wb['active_txt'] = 'Active';
-$wb['document_root_txt'] = 'Documentroot';
+$wb['document_root_txt'] = 'Document Root';
 $wb['system_user_txt'] = 'Linux User';
 $wb['system_group_txt'] = 'Linux Group';
 $wb['ip_address_txt'] = 'IP-Address';
@@ -126,15 +126,20 @@ $wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a diff
 $wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
 $wb['host_txt'] = 'Hostname';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-
 $wb['variables_txt'] = 'Variables';
 $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $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_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
-$wb["document_root_txt"] = "Document Root";
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['load_client_data_txt'] = 'Load client details';
+$wb['load_my_data_txt'] = 'Load my contact details';
+$wb['reset_client_data_txt'] = 'Reset data';
+$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
diff --git a/interface/web/sites/lib/lang/ro_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/ro_web_vhost_domain_list.lng
index cbae0a194e..29ad32443d 100644
--- a/interface/web/sites/lib/lang/ro_web_vhost_domain_list.lng
+++ b/interface/web/sites/lib/lang/ro_web_vhost_domain_list.lng
@@ -6,5 +6,4 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domain';
 $wb['add_new_record_txt'] = 'Adauga un nou  website';
 $wb['parent_domain_id_txt'] = 'Website';
-
 ?>
diff --git a/interface/web/sites/lib/lang/ro_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/ro_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..c0ca93b570
--- /dev/null
+++ b/interface/web/sites/lib/lang/ro_web_vhost_subdomain.lng
@@ -0,0 +1,127 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Variables';
+$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['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+?>
diff --git a/interface/web/sites/lib/lang/ro_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/ro_web_vhost_subdomain_list.lng
new file mode 100644
index 0000000000..1c16bcda28
--- /dev/null
+++ b/interface/web/sites/lib/lang/ro_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
+?>
diff --git a/interface/web/sites/lib/lang/ru_backup_stats_list.lng b/interface/web/sites/lib/lang/ru_backup_stats_list.lng
index 0f3803f56a..65792aa591 100644
--- a/interface/web/sites/lib/lang/ru_backup_stats_list.lng
+++ b/interface/web/sites/lib/lang/ru_backup_stats_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb["database_name_txt"]   = '';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Domain';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['database_name_txt'] = '';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/sites/lib/lang/ru_cron.lng b/interface/web/sites/lib/lang/ru_cron.lng
index a439d366c3..b51ceff609 100644
--- a/interface/web/sites/lib/lang/ru_cron.lng
+++ b/interface/web/sites/lib/lang/ru_cron.lng
@@ -21,4 +21,6 @@ $wb['unknown_fieldtype_error'] = 'Неверный тип поля был исп
 $wb['server_id_error_empty'] = 'The server ID is empty.';
 $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_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
+$wb['log_output_txt'] = 'Log output';
 ?>
diff --git a/interface/web/sites/lib/lang/ru_database.lng b/interface/web/sites/lib/lang/ru_database.lng
index 4accbad4f4..8d34f6dfee 100644
--- a/interface/web/sites/lib/lang/ru_database.lng
+++ b/interface/web/sites/lib/lang/ru_database.lng
@@ -43,4 +43,7 @@ $wb['select_dbuser_txt'] = 'Select database user';
 $wb['no_dbuser_txt'] = 'None';
 $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['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
 ?>
diff --git a/interface/web/sites/lib/lang/ru_database_admin_list.lng b/interface/web/sites/lib/lang/ru_database_admin_list.lng
index 27e62b9ac6..333a5357c6 100644
--- a/interface/web/sites/lib/lang/ru_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/ru_database_admin_list.lng
@@ -8,4 +8,5 @@ $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['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/ru_database_list.lng b/interface/web/sites/lib/lang/ru_database_list.lng
index 4647c0c158..0b2580d9c7 100644
--- a/interface/web/sites/lib/lang/ru_database_list.lng
+++ b/interface/web/sites/lib/lang/ru_database_list.lng
@@ -7,4 +7,5 @@ $wb['database_name_txt'] = 'Имя БД';
 $wb['add_new_record_txt'] = 'Добавить новую БД';
 $wb['database_user_txt'] = 'Database user';
 $wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/ru_database_quota_stats_list.lng b/interface/web/sites/lib/lang/ru_database_quota_stats_list.lng
index e1de70accf..4f92576007 100644
--- a/interface/web/sites/lib/lang/ru_database_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/ru_database_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["database_txt"] = 'Database';
-$wb["server_name_txt"] = 'Server';
-$wb["client_txt"] = 'Client';
-$wb["used_txt"] = 'Used space';
-$wb["quota_txt"] = 'Quota';
-$wb["percentage_txt"] = 'Used in %';
+$wb['database_txt'] = 'Database';
+$wb['server_name_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb['used_txt'] = 'Used space';
+$wb['quota_txt'] = 'Quota';
+$wb['percentage_txt'] = 'Used in %';
 ?>
diff --git a/interface/web/sites/lib/lang/ru_ftp_sites_stats_list.lng b/interface/web/sites/lib/lang/ru_ftp_sites_stats_list.lng
new file mode 100644
index 0000000000..03894607db
--- /dev/null
+++ b/interface/web/sites/lib/lang/ru_ftp_sites_stats_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb["list_head_txt"] = 'FTP 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 (Download + Upload)';
+$wb["in_out_txt"] = 'DL/UL';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/ru_ftp_user.lng b/interface/web/sites/lib/lang/ru_ftp_user.lng
index f9609ce26d..35b3e724fd 100644
--- a/interface/web/sites/lib/lang/ru_ftp_user.lng
+++ b/interface/web/sites/lib/lang/ru_ftp_user.lng
@@ -31,6 +31,5 @@ $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['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['directory_error_regex'] = 'Invalid directory';
+$wb['expires_txt'] = 'Expire at';
 ?>
diff --git a/interface/web/sites/lib/lang/ru_web_aliasdomain.lng b/interface/web/sites/lib/lang/ru_web_aliasdomain.lng
new file mode 100644
index 0000000000..4149c71149
--- /dev/null
+++ b/interface/web/sites/lib/lang/ru_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['Domain'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/ru_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/ru_web_aliasdomain_list.lng
new file mode 100644
index 0000000000..70b449baa4
--- /dev/null
+++ b/interface/web/sites/lib/lang/ru_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Доменные алиасы';
+$wb['active_txt'] = 'Активен?';
+$wb['server_id_txt'] = 'Сервер';
+$wb['parent_domain_id_txt'] = 'Web-сайт';
+$wb['domain_txt'] = 'Доменный алиас';
+$wb['add_new_record_txt'] = 'Добавить новый алиас';
+$wb['domain_error_empty'] = 'Домен пустой.';
+$wb['domain_error_unique'] = 'Домен должен быть уникальным.';
+$wb['domain_error_regex'] = 'Имя домена неправильно.';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/sites/lib/lang/ru_web_backup_list.lng b/interface/web/sites/lib/lang/ru_web_backup_list.lng
index fa4a59b403..d1133334f0 100644
--- a/interface/web/sites/lib/lang/ru_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/ru_web_backup_list.lng
@@ -16,4 +16,6 @@ $wb['delete_confirm_txt'] = 'Really delete this backup?';
 $wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
 $wb['backup_type_mysql'] = 'MySQL Database';
 $wb['backup_type_web'] = 'Website files';
+$wb['filesize_txt'] = 'Filesize';
+$wb['backup_type_mongodb'] = 'MongoDB Database';
 ?>
diff --git a/interface/web/sites/lib/lang/ru_web_childdomain.lng b/interface/web/sites/lib/lang/ru_web_childdomain.lng
index 78668f2a98..340696ef19 100644
--- a/interface/web/sites/lib/lang/ru_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/ru_web_childdomain.lng
@@ -42,7 +42,7 @@ $wb['no_flag_txt'] = 'No flag';
 $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.';
 $wb['backup_interval_txt'] = 'Backup interval';
 $wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['ssl_key_txt'] = 'SSL Key';
@@ -115,5 +115,4 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
-
 ?>
diff --git a/interface/web/sites/lib/lang/ru_web_childdomain_list.lng b/interface/web/sites/lib/lang/ru_web_childdomain_list.lng
index 6ff710b7ca..bc380ac1ec 100644
--- a/interface/web/sites/lib/lang/ru_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/ru_web_childdomain_list.lng
@@ -4,12 +4,12 @@ $wb['active_txt'] = 'Активен?';
 $wb['server_id_txt'] = 'Сервер';
 $wb['parent_domain_id_txt'] = 'Web-сайт';
 $wb['domain_txt'] = 'Субдомен';
-$wb['add_new_record_txt'] = 'Добавить новый Субдомен';
 $wb['domain_error_empty'] = 'Домен пустой.';
 $wb['domain_error_unique'] = 'Домен должен быть уникальным.';
 $wb['domain_error_regex'] = 'Имя домена неправильно.';
 $wb['no_redirect_txt'] = 'No redirect';
 $wb['no_flag_txt'] = 'No flag';
 $wb['none_txt'] = 'None';
-
+$wb['add_new_subdomain_txt'] = 'Add new Subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/ru_web_directive_snippets.lng b/interface/web/sites/lib/lang/ru_web_directive_snippets.lng
new file mode 100644
index 0000000000..05a004f654
--- /dev/null
+++ b/interface/web/sites/lib/lang/ru_web_directive_snippets.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['directive_snippets_id_txt'] = 'Desired configuration';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/ru_web_domain.lng b/interface/web/sites/lib/lang/ru_web_domain.lng
new file mode 100644
index 0000000000..06d82c1a2b
--- /dev/null
+++ b/interface/web/sites/lib/lang/ru_web_domain.lng
@@ -0,0 +1,132 @@
+<?php
+$wb['ssl_state_txt'] = 'Область/край';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Компания';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Страна';
+$wb['ssl_request_txt'] = 'Запрос SSL';
+$wb['ssl_cert_txt'] = 'SSL сертификат';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['server_id_txt'] = 'Сервер';
+$wb['domain_txt'] = 'Домен';
+$wb['type_txt'] = 'Тип';
+$wb['parent_domain_id_txt'] = 'Дочерний Web-сайт';
+$wb['redirect_type_txt'] = 'Тип редиректа';
+$wb['redirect_path_txt'] = 'Путь редиректа';
+$wb['active_txt'] = 'Активен?';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Пользователь Linux';
+$wb['system_group_txt'] = 'Группа Linux';
+$wb['ip_address_txt'] = 'IP-адрес';
+$wb['vhost_type_txt'] = 'VHost Тип';
+$wb['hd_quota_txt'] = 'Квота HDD';
+$wb['traffic_quota_txt'] = 'Квота трафика';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Клиент';
+$wb['limit_web_domain_txt'] = 'Достигнуто макс. число web-сайтов для вашего аккаунта.';
+$wb['limit_web_aliasdomain_txt'] = 'Достигнуто макс. число алиасов доменовдля вашего аккаунта.';
+$wb['limit_web_subdomain_txt'] = 'Достигнуто максимальное количество субдоменов для вашего аккаунта.';
+$wb['apache_directives_txt'] = 'Директивы Apache';
+$wb['domain_error_empty'] = 'Домен пустой.';
+$wb['domain_error_unique'] = 'Домен должен быть уникальным.';
+$wb['domain_error_regex'] = 'Имя домен неправильно.';
+$wb['hd_quota_error_empty'] = 'Пустое значение квоты HDD.';
+$wb['traffic_quota_error_empty'] = 'Пустое значение квоты трафика.';
+$wb['errordocs_txt'] = 'Общие Error-Documents';
+$wb['error_ssl_state_empty'] = 'SSL область/край пуст.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL организация пуста.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL страна пуста.';
+$wb['subdomain_txt'] = 'Авто-субдомен';
+$wb['client_group_id_txt'] = 'Клиент';
+$wb['stats_password_txt'] = 'Пароль к Web-статистике';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['allow_override_txt'] = 'Allow Override';
+$wb['limit_web_quota_free_txt'] = 'Макс. доступная квота HDD';
+$wb['ssl_state_error_regex'] = 'Неверная область/край SSL. Корректные имволы: a-z, 0-9 и .,-_';
+$wb['ssl_locality_error_regex'] = 'Неверное SSL Locality. Корректные символы: a-z, 0-9 и .,-_';
+$wb['ssl_organisation_error_regex'] = 'Неверная SSL организация. кореектные символы: a-z, 0-9 и .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Неверный SSL Organisation Unit. Корректные символы: a-z, 0-9 и .,-_';
+$wb['ssl_country_error_regex'] = 'Неверная SSL Country. Разрешенные символы: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Макс.доступная квота трафика';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['perl_txt'] = 'Perl';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['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['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_system_user_or_group_txt'] = 'Invalid system user or group';
+$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
+?>
diff --git a/interface/web/sites/lib/lang/ru_web_domain_admin_list.lng b/interface/web/sites/lib/lang/ru_web_domain_admin_list.lng
new file mode 100644
index 0000000000..b460e27100
--- /dev/null
+++ b/interface/web/sites/lib/lang/ru_web_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['sys_groupid_txt'] = 'Client';
+$wb['list_head_txt'] = 'Websites';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Add new website';
+?>
diff --git a/interface/web/sites/lib/lang/ru_web_domain_list.lng b/interface/web/sites/lib/lang/ru_web_domain_list.lng
new file mode 100644
index 0000000000..018e3652e3
--- /dev/null
+++ b/interface/web/sites/lib/lang/ru_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Веб сайты';
+$wb['active_txt'] = 'Активен?';
+$wb['server_id_txt'] = 'Сервер';
+$wb['domain_txt'] = 'Домен';
+$wb['add_new_record_txt'] = 'Добавить новый вебсайт';
+$wb['domain_id_txt'] = 'ID';
+?>
diff --git a/interface/web/sites/lib/lang/ru_web_subdomain.lng b/interface/web/sites/lib/lang/ru_web_subdomain.lng
new file mode 100644
index 0000000000..8972c6e590
--- /dev/null
+++ b/interface/web/sites/lib/lang/ru_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['ssl_state_txt'] = 'Область/край';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Организация';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Страна';
+$wb['ssl_request_txt'] = 'Запрос SSL';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['server_id_txt'] = 'Сервер';
+$wb['domain_txt'] = 'Домен';
+$wb['type_txt'] = 'Тип';
+$wb['parent_domain_id_txt'] = 'Родительский Web-сайт';
+$wb['redirect_type_txt'] = 'Т';
+$wb['redirect_path_txt'] = 'Путь редиректа';
+$wb['active_txt'] = 'Активен?';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Пользователь Linux';
+$wb['system_group_txt'] = 'Группа Linux';
+$wb['ip_address_txt'] = 'IP-адрес';
+$wb['vhost_type_txt'] = 'VHost Тип';
+$wb['hd_quota_txt'] = 'Квота HDD';
+$wb['traffic_quota_txt'] = 'Квота трафика';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Клиент';
+$wb['limit_web_domain_txt'] = 'Максимальное число веб доменов достигнуто.';
+$wb['limit_web_aliasdomain_txt'] = 'Максимальное число веб алиасов достигнуто.';
+$wb['limit_web_subdomain_txt'] = 'Максимальное число веб субдоменов достигнуто.';
+$wb['apache_directives_txt'] = 'Директивы Apache';
+$wb['domain_error_empty'] = 'Домен пустой.';
+$wb['domain_error_unique'] = 'Домен должен быть уникальным.';
+$wb['domain_error_regex'] = 'Имя домена неправильно.';
+$wb['host_txt'] = 'Хост';
+$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['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.';
+?>
diff --git a/interface/web/sites/lib/lang/ru_web_subdomain_list.lng b/interface/web/sites/lib/lang/ru_web_subdomain_list.lng
new file mode 100644
index 0000000000..86b42c6ded
--- /dev/null
+++ b/interface/web/sites/lib/lang/ru_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Субдомены';
+$wb['active_txt'] = 'Активен?';
+$wb['server_id_txt'] = 'Сервер';
+$wb['parent_domain_id_txt'] = 'Web-сайт';
+$wb['domain_txt'] = 'Субдомен';
+$wb['add_new_record_txt'] = 'Добавить новый Субдомен';
+?>
diff --git a/interface/web/sites/lib/lang/ru_web_vhost_domain.lng b/interface/web/sites/lib/lang/ru_web_vhost_domain.lng
index b395dfdb34..f6538550cd 100644
--- a/interface/web/sites/lib/lang/ru_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/ru_web_vhost_domain.lng
@@ -15,7 +15,7 @@ $wb['parent_domain_id_txt'] = 'Дочерний Web-сайт';
 $wb['redirect_type_txt'] = 'Тип редиректа';
 $wb['redirect_path_txt'] = 'Путь редиректа';
 $wb['active_txt'] = 'Активен?';
-$wb['document_root_txt'] = 'Documentroot';
+$wb['document_root_txt'] = 'Document Root';
 $wb['system_user_txt'] = 'Пользователь Linux';
 $wb['system_group_txt'] = 'Группа Linux';
 $wb['ip_address_txt'] = 'IP-адрес';
@@ -126,15 +126,20 @@ $wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a diff
 $wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
 $wb['host_txt'] = 'Hostname';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-
 $wb['variables_txt'] = 'Variables';
 $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $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_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
-$wb["document_root_txt"] = "Document Root";
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['load_client_data_txt'] = 'Load client details';
+$wb['load_my_data_txt'] = 'Load my contact details';
+$wb['reset_client_data_txt'] = 'Reset data';
+$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
diff --git a/interface/web/sites/lib/lang/ru_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/ru_web_vhost_domain_list.lng
index 0d159e52ff..e80458ebc5 100644
--- a/interface/web/sites/lib/lang/ru_web_vhost_domain_list.lng
+++ b/interface/web/sites/lib/lang/ru_web_vhost_domain_list.lng
@@ -6,5 +6,4 @@ $wb['domain_txt'] = 'Домен';
 $wb['add_new_record_txt'] = 'Добавить новый вебсайт';
 $wb['domain_id_txt'] = 'ID';
 $wb['parent_domain_id_txt'] = 'Website';
-
 ?>
diff --git a/interface/web/sites/lib/lang/ru_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/ru_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..c0ca93b570
--- /dev/null
+++ b/interface/web/sites/lib/lang/ru_web_vhost_subdomain.lng
@@ -0,0 +1,127 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Variables';
+$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['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+?>
diff --git a/interface/web/sites/lib/lang/ru_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/ru_web_vhost_subdomain_list.lng
new file mode 100644
index 0000000000..1c16bcda28
--- /dev/null
+++ b/interface/web/sites/lib/lang/ru_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
+?>
diff --git a/interface/web/sites/lib/lang/se_backup_stats_list.lng b/interface/web/sites/lib/lang/se_backup_stats_list.lng
index 0f3803f56a..65792aa591 100644
--- a/interface/web/sites/lib/lang/se_backup_stats_list.lng
+++ b/interface/web/sites/lib/lang/se_backup_stats_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb["database_name_txt"]   = '';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Domain';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['database_name_txt'] = '';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/sites/lib/lang/se_cron.lng b/interface/web/sites/lib/lang/se_cron.lng
index 83b7d3b33d..24722162be 100644
--- a/interface/web/sites/lib/lang/se_cron.lng
+++ b/interface/web/sites/lib/lang/se_cron.lng
@@ -21,4 +21,6 @@ $wb['unknown_fieldtype_error'] = 'An unknown field type has been used.';
 $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'] = 'Kommandofältet är tomt.';
+$wb['command_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
+$wb['log_output_txt'] = 'Log output';
 ?>
diff --git a/interface/web/sites/lib/lang/se_database.lng b/interface/web/sites/lib/lang/se_database.lng
index c06c3f0e44..e93c07cfc7 100644
--- a/interface/web/sites/lib/lang/se_database.lng
+++ b/interface/web/sites/lib/lang/se_database.lng
@@ -43,4 +43,7 @@ $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'] = 'Vänligen välj en databasanvändare för den här databasen.';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
 ?>
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 640c07cf19..800601262d 100644
--- a/interface/web/sites/lib/lang/se_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/se_database_admin_list.lng
@@ -8,4 +8,5 @@ $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';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/se_database_list.lng b/interface/web/sites/lib/lang/se_database_list.lng
index bfcdaf39f9..d9cb09ef1a 100644
--- a/interface/web/sites/lib/lang/se_database_list.lng
+++ b/interface/web/sites/lib/lang/se_database_list.lng
@@ -7,4 +7,5 @@ $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';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/se_database_quota_stats_list.lng b/interface/web/sites/lib/lang/se_database_quota_stats_list.lng
index e1de70accf..4f92576007 100644
--- a/interface/web/sites/lib/lang/se_database_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/se_database_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["database_txt"] = 'Database';
-$wb["server_name_txt"] = 'Server';
-$wb["client_txt"] = 'Client';
-$wb["used_txt"] = 'Used space';
-$wb["quota_txt"] = 'Quota';
-$wb["percentage_txt"] = 'Used in %';
+$wb['database_txt'] = 'Database';
+$wb['server_name_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb['used_txt'] = 'Used space';
+$wb['quota_txt'] = 'Quota';
+$wb['percentage_txt'] = 'Used in %';
 ?>
diff --git a/interface/web/sites/lib/lang/se_ftp_sites_stats_list.lng b/interface/web/sites/lib/lang/se_ftp_sites_stats_list.lng
new file mode 100644
index 0000000000..03894607db
--- /dev/null
+++ b/interface/web/sites/lib/lang/se_ftp_sites_stats_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb["list_head_txt"] = 'FTP 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 (Download + Upload)';
+$wb["in_out_txt"] = 'DL/UL';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/se_ftp_user.lng b/interface/web/sites/lib/lang/se_ftp_user.lng
index 3ba08a2019..1368347baf 100644
--- a/interface/web/sites/lib/lang/se_ftp_user.lng
+++ b/interface/web/sites/lib/lang/se_ftp_user.lng
@@ -31,6 +31,5 @@ $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['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['directory_error_regex'] = 'Invalid directory';
+$wb['expires_txt'] = 'Expire at';
 ?>
diff --git a/interface/web/sites/lib/lang/se_web_aliasdomain.lng b/interface/web/sites/lib/lang/se_web_aliasdomain.lng
new file mode 100644
index 0000000000..4149c71149
--- /dev/null
+++ b/interface/web/sites/lib/lang/se_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['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
new file mode 100644
index 0000000000..8ea34c4409
--- /dev/null
+++ b/interface/web/sites/lib/lang/se_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Aliasdomain';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['add_new_record_txt'] = 'Add new aliasdomain';
+$wb['domain_error_empty'] = 'Domain is empty.';
+$wb['domain_error_unique'] = 'Domain must be unique.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['no_redirect_txt'] = 'No redirect';
+$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 19ae414f85..1f9073ab6d 100644
--- a/interface/web/sites/lib/lang/se_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/se_web_backup_list.lng
@@ -16,4 +16,6 @@ $wb['delete_confirm_txt'] = 'Really delete this backup?';
 $wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
 $wb['backup_type_mysql'] = 'MySQL-databaser';
 $wb['backup_type_web'] = 'Webbsidefiler';
+$wb['filesize_txt'] = 'Filesize';
+$wb['backup_type_mongodb'] = 'MongoDB Database';
 ?>
diff --git a/interface/web/sites/lib/lang/se_web_childdomain.lng b/interface/web/sites/lib/lang/se_web_childdomain.lng
index 1d38d2a2c7..8bcd638cd7 100644
--- a/interface/web/sites/lib/lang/se_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/se_web_childdomain.lng
@@ -42,7 +42,7 @@ $wb['no_flag_txt'] = 'No flag';
 $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.';
 $wb['backup_interval_txt'] = 'Backup interval';
 $wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['ssl_key_txt'] = 'SSL Key';
@@ -115,5 +115,4 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
-
 ?>
diff --git a/interface/web/sites/lib/lang/se_web_childdomain_list.lng b/interface/web/sites/lib/lang/se_web_childdomain_list.lng
index 95a3b5f71a..2db2e12bd6 100644
--- a/interface/web/sites/lib/lang/se_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/se_web_childdomain_list.lng
@@ -4,12 +4,12 @@ $wb['active_txt'] = 'Active';
 $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Website';
 $wb['domain_txt'] = 'Subdomain';
-$wb['add_new_record_txt'] = 'Add new subdomain';
 $wb['domain_error_empty'] = 'Domain is empty.';
 $wb['domain_error_unique'] = 'Domain must be unique.';
 $wb['domain_error_regex'] = 'Domain name invalid.';
 $wb['no_redirect_txt'] = 'No redirect';
 $wb['no_flag_txt'] = 'No flag';
 $wb['none_txt'] = 'None';
-
+$wb['add_new_subdomain_txt'] = 'Add new Subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/se_web_directive_snippets.lng b/interface/web/sites/lib/lang/se_web_directive_snippets.lng
new file mode 100644
index 0000000000..05a004f654
--- /dev/null
+++ b/interface/web/sites/lib/lang/se_web_directive_snippets.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['directive_snippets_id_txt'] = 'Desired configuration';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/se_web_domain.lng b/interface/web/sites/lib/lang/se_web_domain.lng
new file mode 100644
index 0000000000..d25c8b1528
--- /dev/null
+++ b/interface/web/sites/lib/lang/se_web_domain.lng
@@ -0,0 +1,132 @@
+<?php
+$wb['ssl_state_txt'] = 'Status';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$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'] = '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';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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['hd_quota_error_empty'] = 'Harddisk quota is empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['allow_override_txt'] = 'Allow Override';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['perl_txt'] = 'Perl';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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'] = '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'] = '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'] = 'Ogiltiga php.ini-inställningar';
+$wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
+$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
+?>
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
new file mode 100644
index 0000000000..b460e27100
--- /dev/null
+++ b/interface/web/sites/lib/lang/se_web_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['sys_groupid_txt'] = 'Client';
+$wb['list_head_txt'] = 'Websites';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$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
new file mode 100644
index 0000000000..88ec412daa
--- /dev/null
+++ b/interface/web/sites/lib/lang/se_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Websites';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Add new website';
+?>
diff --git a/interface/web/sites/lib/lang/se_web_subdomain.lng b/interface/web/sites/lib/lang/se_web_subdomain.lng
new file mode 100644
index 0000000000..b542b998d9
--- /dev/null
+++ b/interface/web/sites/lib/lang/se_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['ssl_state_txt'] = 'Status';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$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'] = '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'] = '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'] = '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'] = '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'] = '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.';
+?>
diff --git a/interface/web/sites/lib/lang/se_web_subdomain_list.lng b/interface/web/sites/lib/lang/se_web_subdomain_list.lng
new file mode 100644
index 0000000000..1c16bcda28
--- /dev/null
+++ b/interface/web/sites/lib/lang/se_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
+?>
diff --git a/interface/web/sites/lib/lang/se_web_vhost_domain.lng b/interface/web/sites/lib/lang/se_web_vhost_domain.lng
index 862635eff0..6d0f4697b5 100644
--- a/interface/web/sites/lib/lang/se_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/se_web_vhost_domain.lng
@@ -15,7 +15,7 @@ $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['document_root_txt'] = 'Document Root';
 $wb['system_user_txt'] = 'Linuxanvändare';
 $wb['system_group_txt'] = 'Linux Group';
 $wb['ip_address_txt'] = 'IP-Address';
@@ -126,15 +126,20 @@ $wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a diff
 $wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
 $wb['host_txt'] = 'Hostname';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-
 $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'] = 'Ogiltiga php.ini-inställningar';
-$wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
-$wb["document_root_txt"] = "Document Root";
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['load_client_data_txt'] = 'Load client details';
+$wb['load_my_data_txt'] = 'Load my contact details';
+$wb['reset_client_data_txt'] = 'Reset data';
+$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
diff --git a/interface/web/sites/lib/lang/se_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/se_web_vhost_domain_list.lng
index b8f85d3143..5d27a57cdc 100644
--- a/interface/web/sites/lib/lang/se_web_vhost_domain_list.lng
+++ b/interface/web/sites/lib/lang/se_web_vhost_domain_list.lng
@@ -6,5 +6,4 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Domain';
 $wb['add_new_record_txt'] = 'Add new website';
 $wb['parent_domain_id_txt'] = 'Website';
-
 ?>
diff --git a/interface/web/sites/lib/lang/se_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/se_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..c0ca93b570
--- /dev/null
+++ b/interface/web/sites/lib/lang/se_web_vhost_subdomain.lng
@@ -0,0 +1,127 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Variables';
+$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['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
new file mode 100644
index 0000000000..100b03bcca
--- /dev/null
+++ b/interface/web/sites/lib/lang/se_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Underdomäner';
+$wb['active_txt'] = 'Aktiv';
+$wb['server_id_txt'] = 'Server';
+$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/sk_backup_stats_list.lng b/interface/web/sites/lib/lang/sk_backup_stats_list.lng
index 0f3803f56a..65792aa591 100644
--- a/interface/web/sites/lib/lang/sk_backup_stats_list.lng
+++ b/interface/web/sites/lib/lang/sk_backup_stats_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb["database_name_txt"]   = '';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Domain';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['database_name_txt'] = '';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/sites/lib/lang/sk_cron.lng b/interface/web/sites/lib/lang/sk_cron.lng
index 364fe81c4d..66dcca875a 100644
--- a/interface/web/sites/lib/lang/sk_cron.lng
+++ b/interface/web/sites/lib/lang/sk_cron.lng
@@ -21,4 +21,6 @@ $wb['unknown_fieldtype_error'] = 'Nezn
 $wb['server_id_error_empty'] = 'The server ID is empty.';
 $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_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
+$wb['log_output_txt'] = 'Log output';
 ?>
diff --git a/interface/web/sites/lib/lang/sk_database.lng b/interface/web/sites/lib/lang/sk_database.lng
index bbe0b4117f..7776a5b460 100644
--- a/interface/web/sites/lib/lang/sk_database.lng
+++ b/interface/web/sites/lib/lang/sk_database.lng
@@ -43,4 +43,7 @@ $wb['select_dbuser_txt'] = 'Select database user';
 $wb['no_dbuser_txt'] = 'None';
 $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['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
 ?>
diff --git a/interface/web/sites/lib/lang/sk_database_admin_list.lng b/interface/web/sites/lib/lang/sk_database_admin_list.lng
index 27e62b9ac6..333a5357c6 100644
--- a/interface/web/sites/lib/lang/sk_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/sk_database_admin_list.lng
@@ -8,4 +8,5 @@ $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['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/sk_database_list.lng b/interface/web/sites/lib/lang/sk_database_list.lng
index 98422c41f7..badf566128 100644
--- a/interface/web/sites/lib/lang/sk_database_list.lng
+++ b/interface/web/sites/lib/lang/sk_database_list.lng
@@ -7,4 +7,5 @@ $wb['database_name_txt'] = 'Meno databáza';
 $wb['add_new_record_txt'] = 'Pridať novú databázu';
 $wb['database_user_txt'] = 'Database user';
 $wb['parent_domain_id_txt'] = 'Website';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/sk_database_quota_stats_list.lng b/interface/web/sites/lib/lang/sk_database_quota_stats_list.lng
index e1de70accf..4f92576007 100644
--- a/interface/web/sites/lib/lang/sk_database_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/sk_database_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["database_txt"] = 'Database';
-$wb["server_name_txt"] = 'Server';
-$wb["client_txt"] = 'Client';
-$wb["used_txt"] = 'Used space';
-$wb["quota_txt"] = 'Quota';
-$wb["percentage_txt"] = 'Used in %';
+$wb['database_txt'] = 'Database';
+$wb['server_name_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb['used_txt'] = 'Used space';
+$wb['quota_txt'] = 'Quota';
+$wb['percentage_txt'] = 'Used in %';
 ?>
diff --git a/interface/web/sites/lib/lang/sk_ftp_sites_stats_list.lng b/interface/web/sites/lib/lang/sk_ftp_sites_stats_list.lng
new file mode 100644
index 0000000000..03894607db
--- /dev/null
+++ b/interface/web/sites/lib/lang/sk_ftp_sites_stats_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb["list_head_txt"] = 'FTP 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 (Download + Upload)';
+$wb["in_out_txt"] = 'DL/UL';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/sk_ftp_user.lng b/interface/web/sites/lib/lang/sk_ftp_user.lng
index c57cbfdd1d..0b3207da91 100644
--- a/interface/web/sites/lib/lang/sk_ftp_user.lng
+++ b/interface/web/sites/lib/lang/sk_ftp_user.lng
@@ -31,6 +31,5 @@ $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['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['directory_error_regex'] = 'Invalid directory';
+$wb['expires_txt'] = 'Expire at';
 ?>
diff --git a/interface/web/sites/lib/lang/sk_web_aliasdomain.lng b/interface/web/sites/lib/lang/sk_web_aliasdomain.lng
new file mode 100644
index 0000000000..4149c71149
--- /dev/null
+++ b/interface/web/sites/lib/lang/sk_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['Domain'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/sk_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/sk_web_aliasdomain_list.lng
new file mode 100644
index 0000000000..635213c357
--- /dev/null
+++ b/interface/web/sites/lib/lang/sk_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Alias doména';
+$wb['active_txt'] = 'Aktívne';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Webstránky';
+$wb['domain_txt'] = 'Alias doména';
+$wb['add_new_record_txt'] = 'Pridať novú alias doménu';
+$wb['domain_error_empty'] = 'Doména je prázdna.';
+$wb['domain_error_unique'] = 'Doména musí byť unikátna.';
+$wb['domain_error_regex'] = 'Doménové meno neplatné.';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/sites/lib/lang/sk_web_backup_list.lng b/interface/web/sites/lib/lang/sk_web_backup_list.lng
index fa4a59b403..d1133334f0 100644
--- a/interface/web/sites/lib/lang/sk_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/sk_web_backup_list.lng
@@ -16,4 +16,6 @@ $wb['delete_confirm_txt'] = 'Really delete this backup?';
 $wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
 $wb['backup_type_mysql'] = 'MySQL Database';
 $wb['backup_type_web'] = 'Website files';
+$wb['filesize_txt'] = 'Filesize';
+$wb['backup_type_mongodb'] = 'MongoDB Database';
 ?>
diff --git a/interface/web/sites/lib/lang/sk_web_childdomain.lng b/interface/web/sites/lib/lang/sk_web_childdomain.lng
index d550c36176..d460d1efb0 100644
--- a/interface/web/sites/lib/lang/sk_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/sk_web_childdomain.lng
@@ -42,7 +42,7 @@ $wb['no_flag_txt'] = 'No flag';
 $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.';
 $wb['backup_interval_txt'] = 'Backup interval';
 $wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['ssl_key_txt'] = 'SSL Key';
@@ -115,5 +115,4 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
-
 ?>
diff --git a/interface/web/sites/lib/lang/sk_web_childdomain_list.lng b/interface/web/sites/lib/lang/sk_web_childdomain_list.lng
index 87db149f2c..0bf87c4d40 100644
--- a/interface/web/sites/lib/lang/sk_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/sk_web_childdomain_list.lng
@@ -4,12 +4,12 @@ $wb['active_txt'] = 'Aktívne';
 $wb['server_id_txt'] = 'Server';
 $wb['parent_domain_id_txt'] = 'Webstránka';
 $wb['domain_txt'] = 'Subdoména';
-$wb['add_new_record_txt'] = 'Pridať novú subdoménu';
 $wb['domain_error_empty'] = 'Doména je prázdna.';
 $wb['domain_error_unique'] = 'Doména musí byť unikátna.';
 $wb['domain_error_regex'] = 'Doménové meno neplatné.';
 $wb['no_redirect_txt'] = 'No redirect';
 $wb['no_flag_txt'] = 'No flag';
 $wb['none_txt'] = 'None';
-
+$wb['add_new_subdomain_txt'] = 'Add new Subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 ?>
diff --git a/interface/web/sites/lib/lang/sk_web_directive_snippets.lng b/interface/web/sites/lib/lang/sk_web_directive_snippets.lng
new file mode 100644
index 0000000000..05a004f654
--- /dev/null
+++ b/interface/web/sites/lib/lang/sk_web_directive_snippets.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['directive_snippets_id_txt'] = 'Desired configuration';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/sk_web_domain.lng b/interface/web/sites/lib/lang/sk_web_domain.lng
new file mode 100644
index 0000000000..e38610de4f
--- /dev/null
+++ b/interface/web/sites/lib/lang/sk_web_domain.lng
@@ -0,0 +1,132 @@
+<?php
+$wb['ssl_state_txt'] = 'Štát';
+$wb['ssl_locality_txt'] = 'Lokalita';
+$wb['ssl_organisation_txt'] = 'Organizácia';
+$wb['ssl_organisation_unit_txt'] = 'Organizačná zložka';
+$wb['ssl_country_txt'] = 'Krajina';
+$wb['ssl_request_txt'] = 'SSL Požiadavka';
+$wb['ssl_cert_txt'] = 'SSL Certifikát';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Akcia';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Doména';
+$wb['type_txt'] = 'Typ';
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['redirect_type_txt'] = 'Redirect Type';
+$wb['redirect_path_txt'] = 'Redirect Path';
+$wb['active_txt'] = 'Aktívne';
+$wb['document_root_txt'] = 'DocumentRoot';
+$wb['system_user_txt'] = 'Linuxový  uživateľ';
+$wb['system_group_txt'] = 'Linuxová Skupina';
+$wb['ip_address_txt'] = 'IP-Adresa';
+$wb['vhost_type_txt'] = 'VHost Typ';
+$wb['hd_quota_txt'] = 'Harddisk Kvóta';
+$wb['traffic_quota_txt'] = 'Kvóta vyťaženia';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Vlastné Error-Dokumenty';
+$wb['subdomain_txt'] = 'Auto-Subdomény';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Klient';
+$wb['limit_web_domain_txt'] = 'Max. počet internetových domén pre Váš účet je dosiahnutý.';
+$wb['limit_web_aliasdomain_txt'] = 'Max. počet alias domén pre Váš účet je dosiahnutý.';
+$wb['limit_web_subdomain_txt'] = 'Max. počet webových subdomény účtu je dosiahnutý.';
+$wb['apache_directives_txt'] = 'Apache smerníce';
+$wb['domain_error_empty'] = 'Doména je prázdna.';
+$wb['domain_error_unique'] = 'Existuje už webová stránka alebo sub / alias doména k tejto doméne.';
+$wb['domain_error_regex'] = 'Doménové meno neplatné.';
+$wb['hd_quota_error_empty'] = 'Harddisk kvóta je prázdna.';
+$wb['traffic_quota_error_empty'] = 'Kvóta vyťaženia je prázdna.';
+$wb['error_ssl_state_empty'] = 'SSL Štát je prázdny.';
+$wb['error_ssl_locality_empty'] = 'SSL Lokalita je prázdna.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organizácia je prázdna.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organizačné zložka je prázdna.';
+$wb['error_ssl_country_empty'] = 'SSL Krajina je prázdna.';
+$wb['client_group_id_txt'] = 'Klient';
+$wb['stats_password_txt'] = 'Webštatistika heslo';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['allow_override_txt'] = 'Allow Override';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['perl_txt'] = 'Perl';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['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['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_system_user_or_group_txt'] = 'Invalid system user or group';
+$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
+?>
diff --git a/interface/web/sites/lib/lang/sk_web_domain_admin_list.lng b/interface/web/sites/lib/lang/sk_web_domain_admin_list.lng
new file mode 100644
index 0000000000..b460e27100
--- /dev/null
+++ b/interface/web/sites/lib/lang/sk_web_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['sys_groupid_txt'] = 'Client';
+$wb['list_head_txt'] = 'Websites';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Add new website';
+?>
diff --git a/interface/web/sites/lib/lang/sk_web_domain_list.lng b/interface/web/sites/lib/lang/sk_web_domain_list.lng
new file mode 100644
index 0000000000..05a1d4f7b4
--- /dev/null
+++ b/interface/web/sites/lib/lang/sk_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Webstránky';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Aktívne';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Doména';
+$wb['add_new_record_txt'] = 'Pridať novú doménu';
+?>
diff --git a/interface/web/sites/lib/lang/sk_web_subdomain.lng b/interface/web/sites/lib/lang/sk_web_subdomain.lng
new file mode 100644
index 0000000000..aa0a1b60aa
--- /dev/null
+++ b/interface/web/sites/lib/lang/sk_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['ssl_state_txt'] = 'Štát';
+$wb['ssl_locality_txt'] = 'Lokalita';
+$wb['ssl_organisation_txt'] = 'Organizácia';
+$wb['ssl_organisation_unit_txt'] = 'Organizačné zložky';
+$wb['ssl_country_txt'] = 'Krajina';
+$wb['ssl_request_txt'] = 'SSL Požiadavka';
+$wb['ssl_cert_txt'] = 'SSL Certifikát';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Akcia';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Doména';
+$wb['type_txt'] = 'Typ';
+$wb['parent_domain_id_txt'] = 'Materská webová stránka';
+$wb['redirect_type_txt'] = 'Typ presmerovanie';
+$wb['redirect_path_txt'] = 'Cesta presmerovania';
+$wb['active_txt'] = 'Aktívne';
+$wb['document_root_txt'] = 'DocumentRoot';
+$wb['system_user_txt'] = 'Linuxový uživateľ';
+$wb['system_group_txt'] = 'Linuxová skupina';
+$wb['ip_address_txt'] = 'IP Adresa';
+$wb['vhost_type_txt'] = 'VHost Typ';
+$wb['hd_quota_txt'] = 'Harddisk Kvóta';
+$wb['traffic_quota_txt'] = 'Kvóta Vyťaženia';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Klient';
+$wb['limit_web_domain_txt'] = 'Max. počet internetových domén pre Váš účet je dosiahnutý.';
+$wb['limit_web_aliasdomain_txt'] = 'Max. alias domén pre  Váš účet je dosiahnutý.';
+$wb['limit_web_subdomain_txt'] = 'Max. počet webových subdomén pre Váš účet je dosiahnutý.';
+$wb['apache_directives_txt'] = 'Apache smerníce';
+$wb['domain_error_empty'] = 'Doména je prázdna.';
+$wb['domain_error_unique'] = 'Existuje už webová stránka alebo sub / alias doména k tejto doméne.';
+$wb['domain_error_regex'] = 'Doménové meno neplatné.';
+$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['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.';
+?>
diff --git a/interface/web/sites/lib/lang/sk_web_subdomain_list.lng b/interface/web/sites/lib/lang/sk_web_subdomain_list.lng
new file mode 100644
index 0000000000..5b4a3a5d2e
--- /dev/null
+++ b/interface/web/sites/lib/lang/sk_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomény';
+$wb['active_txt'] = 'Aktívne';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Webstránka';
+$wb['domain_txt'] = 'Subdoména';
+$wb['add_new_record_txt'] = 'Pridať novú subdoménu';
+?>
diff --git a/interface/web/sites/lib/lang/sk_web_vhost_domain.lng b/interface/web/sites/lib/lang/sk_web_vhost_domain.lng
index 9d1c825048..f5564d16e6 100644
--- a/interface/web/sites/lib/lang/sk_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/sk_web_vhost_domain.lng
@@ -15,7 +15,7 @@ $wb['parent_domain_id_txt'] = 'Parent Website';
 $wb['redirect_type_txt'] = 'Redirect Type';
 $wb['redirect_path_txt'] = 'Redirect Path';
 $wb['active_txt'] = 'Aktívne';
-$wb['document_root_txt'] = 'DocumentRoot';
+$wb['document_root_txt'] = 'Document Root';
 $wb['system_user_txt'] = 'Linuxový  uživateľ';
 $wb['system_group_txt'] = 'Linuxová Skupina';
 $wb['ip_address_txt'] = 'IP-Adresa';
@@ -126,15 +126,20 @@ $wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a diff
 $wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
 $wb['host_txt'] = 'Hostname';
 $wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
-
 $wb['variables_txt'] = 'Variables';
 $wb['added_by_txt'] = 'Added by';
 $wb['added_date_txt'] = 'Added date';
 $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_system_user_or_group_txt'] = 'Invalid system user or group';
-$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
-$wb["document_root_txt"] = "Document Root";
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['load_client_data_txt'] = 'Load client details';
+$wb['load_my_data_txt'] = 'Load my contact details';
+$wb['reset_client_data_txt'] = 'Reset data';
+$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
diff --git a/interface/web/sites/lib/lang/sk_web_vhost_domain_list.lng b/interface/web/sites/lib/lang/sk_web_vhost_domain_list.lng
index 8b9c86f81d..0e646c53f2 100644
--- a/interface/web/sites/lib/lang/sk_web_vhost_domain_list.lng
+++ b/interface/web/sites/lib/lang/sk_web_vhost_domain_list.lng
@@ -6,5 +6,4 @@ $wb['server_id_txt'] = 'Server';
 $wb['domain_txt'] = 'Doména';
 $wb['add_new_record_txt'] = 'Pridať novú doménu';
 $wb['parent_domain_id_txt'] = 'Website';
-
 ?>
diff --git a/interface/web/sites/lib/lang/sk_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/sk_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..c0ca93b570
--- /dev/null
+++ b/interface/web/sites/lib/lang/sk_web_vhost_subdomain.lng
@@ -0,0 +1,127 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Variables';
+$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['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+?>
diff --git a/interface/web/sites/lib/lang/sk_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/sk_web_vhost_subdomain_list.lng
new file mode 100644
index 0000000000..1c16bcda28
--- /dev/null
+++ b/interface/web/sites/lib/lang/sk_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
+?>
diff --git a/interface/web/sites/lib/lang/tr.lng b/interface/web/sites/lib/lang/tr.lng
index 23c42995ba..4f8620c34a 100644
--- a/interface/web/sites/lib/lang/tr.lng
+++ b/interface/web/sites/lib/lang/tr.lng
@@ -31,5 +31,5 @@ $wb['Available packages'] = 'Kullanılabilecek Paketler';
 $wb['Installed packages'] = 'Yüklü Paketler';
 $wb['Update Packagelist'] = 'Güncelleme Paketi Listesi';
 $wb['Subdomain (Vhost)'] = 'Alt alan adı (SSunucu)';
-$wb['error_proxy_requires_url'] = '"Vekil Sunucu" yönlendirme tipi için, yönlendirilecek yolu gösteren bir İnternet adresi gereklidir.';
+$wb['error_proxy_requires_url'] = '\"Vekil Sunucu\" yönlendirme tipi için, yönlendirilecek yolu gösteren bir İnternet adresi gereklidir.';
 ?>
diff --git a/interface/web/sites/lib/lang/tr_aps.lng b/interface/web/sites/lib/lang/tr_aps.lng
index b4865d281e..58bd945039 100644
--- a/interface/web/sites/lib/lang/tr_aps.lng
+++ b/interface/web/sites/lib/lang/tr_aps.lng
@@ -40,14 +40,14 @@ $wb['error_inv_main_location'] = 'Yazdığınız yükleme konumunu klasörü ge
 $wb['error_license_agreement'] = 'Devam etmek için lisans anlaşmasını onaylamalısınız.';
 $wb['error_no_database_pw'] = 'Yazdığınız veritabanı parolası geçersiz.';
 $wb['error_short_database_pw'] = 'Lütfen daha uzun bir veritabanı parolası yazın.';
-$wb['error_no_value_for'] = '"%s" alanı boş olamaz.';
-$wb['error_short_value_for'] = '"%s" alanına daha uzun bir değer yazılmalıdır.';
-$wb['error_long_value_for'] = '"%s" alanına daha kısa bir değer yazılmalıdır.';
-$wb['error_inv_value_for'] = '"%s" alanına yazılan değer geçersiz.';
-$wb['error_inv_email_for'] = '"%s" alanına yazılan e-posta adresi geçersiz.';
-$wb['error_inv_domain_for'] = '"%s" alanına yazılan alan adı geçersiz.';
-$wb['error_inv_integer_for'] = '"%s" alanına yazılan sayı geçersiz.';
-$wb['error_inv_float_for'] = '"%s" alanına yazılan küsuratlı sayı geçersiz.';
+$wb['error_no_value_for'] = '\"%s\" alanı boş olamaz.';
+$wb['error_short_value_for'] = '\"%s\" alanına daha uzun bir değer yazılmalıdır.';
+$wb['error_long_value_for'] = '\"%s\" alanına daha kısa bir değer yazılmalıdır.';
+$wb['error_inv_value_for'] = '\"%s\" alanına yazılan değer geçersiz.';
+$wb['error_inv_email_for'] = '\"%s\" alanına yazılan e-posta adresi geçersiz.';
+$wb['error_inv_domain_for'] = '\"%s\" alanına yazılan alan adı geçersiz.';
+$wb['error_inv_integer_for'] = '\"%s\" alanına yazılan sayı geçersiz.';
+$wb['error_inv_float_for'] = '\"%s\" alanına yazılan küsuratlı sayı geçersiz.';
 $wb['error_used_location'] = 'Yükleme yoluna daha önce yüklenmiş bir paket var.';
 $wb['installation_task_txt'] = 'Yükleme planlandı';
 $wb['installation_error_txt'] = 'Yükleme hatası';
diff --git a/interface/web/sites/lib/lang/tr_aps_instances_list.lng b/interface/web/sites/lib/lang/tr_aps_instances_list.lng
index 66bfe03b45..e8b3532ff4 100644
--- a/interface/web/sites/lib/lang/tr_aps_instances_list.lng
+++ b/interface/web/sites/lib/lang/tr_aps_instances_list.lng
@@ -6,8 +6,6 @@ $wb['customer_txt'] = 'Müşteri';
 $wb['status_txt'] = 'Durum';
 $wb['install_location_txt'] = 'Yükleme Konumu';
 $wb['pkg_delete_confirmation'] = 'Bu yüklemeyi silmek istediğinize emin misiniz?';
-$wb['pkg_reinstall_confirmation'] = 'Bu paketi aynı ayarlar ile yeniden yüklemek istediğinize emin misiniz?';
 $wb['filter_txt'] = 'Arama';
 $wb['delete_txt'] = 'Sil';
-$wb['reinstall_txt'] = 'Yeniden Yükle';
 ?>
diff --git a/interface/web/sites/lib/lang/tr_backup_stats_list.lng b/interface/web/sites/lib/lang/tr_backup_stats_list.lng
index 0f3803f56a..65792aa591 100644
--- a/interface/web/sites/lib/lang/tr_backup_stats_list.lng
+++ b/interface/web/sites/lib/lang/tr_backup_stats_list.lng
@@ -1,10 +1,10 @@
 <?php
-$wb["list_head_txt"]       = 'Backup Stats';
-$wb["database_name_txt"]   = '';
-$wb['active_txt']          = 'Active';
-$wb['domain_txt']          = 'Domain';
-$wb['backup_count_txt']    = 'Backup count';
-$wb['backup_server_txt']   = 'Server';
+$wb['list_head_txt'] = 'Backup Stats';
+$wb['database_name_txt'] = '';
+$wb['active_txt'] = 'Active';
+$wb['domain_txt'] = 'Domain';
+$wb['backup_count_txt'] = 'Backup count';
+$wb['backup_server_txt'] = 'Server';
 $wb['backup_interval_txt'] = 'Interval / cnt.';
 $wb['backup_size_txt'] = 'Backupsize';
 ?>
diff --git a/interface/web/sites/lib/lang/tr_cron.lng b/interface/web/sites/lib/lang/tr_cron.lng
index 4ed67c43fe..f645d76325 100644
--- a/interface/web/sites/lib/lang/tr_cron.lng
+++ b/interface/web/sites/lib/lang/tr_cron.lng
@@ -21,4 +21,6 @@ $wb['unknown_fieldtype_error'] = 'Bilinmeyen bir alan tipi kullanılmış.';
 $wb['server_id_error_empty'] = 'Sunucu kodu boş olamaz.';
 $wb['limit_cron_url_txt'] = 'Yalnız İnternet adresli zamanlanmış görev kullanılabilir. Lütfen zamanlanmış görev komutu olarak http:// ile başlayan bir İnternet adresi yazın.';
 $wb['command_error_empty'] = 'Komut boş olamaz.';
+$wb['command_hint_txt'] = 'e.g. /var/www/clients/clientX/webY/myscript.sh or http://www.mydomain.com/path/script.php, you can use [web_root] placeholder that is replaced by /var/www/clients/clientX/webY/web.';
+$wb['log_output_txt'] = 'Log output';
 ?>
diff --git a/interface/web/sites/lib/lang/tr_database.lng b/interface/web/sites/lib/lang/tr_database.lng
index 5ca233db60..d5d8c7d856 100644
--- a/interface/web/sites/lib/lang/tr_database.lng
+++ b/interface/web/sites/lib/lang/tr_database.lng
@@ -43,5 +43,7 @@ $wb['globalsearch_noresults_text_txt'] = 'Sonuç yok';
 $wb['globalsearch_noresults_limit_txt'] = '0 sonuç';
 $wb['globalsearch_searchfield_watermark_txt'] = 'Arama';
 $wb['globalsearch_suggestions_text_txt'] = 'Öneriler';
+$wb['limit_database_quota_txt'] = 'Database quota';
+$wb['limit_database_quota_error_notint'] = 'The database quota limit must be a number.';
+$wb['limit_database_quota_free_txt'] = 'Max. available DB quota ';
 ?>
-
diff --git a/interface/web/sites/lib/lang/tr_database_admin_list.lng b/interface/web/sites/lib/lang/tr_database_admin_list.lng
index f05c11af01..fc92e1957e 100644
--- a/interface/web/sites/lib/lang/tr_database_admin_list.lng
+++ b/interface/web/sites/lib/lang/tr_database_admin_list.lng
@@ -8,4 +8,5 @@ $wb['database_name_txt'] = 'Veritabanı adı';
 $wb['add_new_record_txt'] = 'Veritabanı ekle';
 $wb['sys_groupid_txt'] = 'Müşteri';
 $wb['parent_domain_id_txt'] = 'Web Sitesi';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/tr_database_list.lng b/interface/web/sites/lib/lang/tr_database_list.lng
index b051508686..43ea5f9b6f 100644
--- a/interface/web/sites/lib/lang/tr_database_list.lng
+++ b/interface/web/sites/lib/lang/tr_database_list.lng
@@ -7,4 +7,5 @@ $wb['database_user_txt'] = 'Veritabanı Kullanıcısı';
 $wb['database_name_txt'] = 'Veritabanı Adı';
 $wb['add_new_record_txt'] = 'Veritabanı Ekle';
 $wb['parent_domain_id_txt'] = 'Web Sitesi';
+$wb['type_txt'] = 'Type';
 ?>
diff --git a/interface/web/sites/lib/lang/tr_database_quota_stats_list.lng b/interface/web/sites/lib/lang/tr_database_quota_stats_list.lng
index e1de70accf..4f92576007 100644
--- a/interface/web/sites/lib/lang/tr_database_quota_stats_list.lng
+++ b/interface/web/sites/lib/lang/tr_database_quota_stats_list.lng
@@ -1,8 +1,8 @@
 <?php
-$wb["database_txt"] = 'Database';
-$wb["server_name_txt"] = 'Server';
-$wb["client_txt"] = 'Client';
-$wb["used_txt"] = 'Used space';
-$wb["quota_txt"] = 'Quota';
-$wb["percentage_txt"] = 'Used in %';
+$wb['database_txt'] = 'Database';
+$wb['server_name_txt'] = 'Server';
+$wb['client_txt'] = 'Client';
+$wb['used_txt'] = 'Used space';
+$wb['quota_txt'] = 'Quota';
+$wb['percentage_txt'] = 'Used in %';
 ?>
diff --git a/interface/web/sites/lib/lang/tr_database_user.lng b/interface/web/sites/lib/lang/tr_database_user.lng
index 2008eb8f22..de46731b6c 100644
--- a/interface/web/sites/lib/lang/tr_database_user.lng
+++ b/interface/web/sites/lib/lang/tr_database_user.lng
@@ -21,4 +21,3 @@ $wb['globalsearch_noresults_limit_txt'] = '0 sonuç';
 $wb['globalsearch_searchfield_watermark_txt'] = 'Arama';
 $wb['globalsearch_suggestions_text_txt'] = 'Öneriler';
 ?>
-
diff --git a/interface/web/sites/lib/lang/tr_ftp_sites_stats_list.lng b/interface/web/sites/lib/lang/tr_ftp_sites_stats_list.lng
new file mode 100644
index 0000000000..03894607db
--- /dev/null
+++ b/interface/web/sites/lib/lang/tr_ftp_sites_stats_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb["list_head_txt"] = 'FTP 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 (Download + Upload)';
+$wb["in_out_txt"] = 'DL/UL';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/tr_ftp_user.lng b/interface/web/sites/lib/lang/tr_ftp_user.lng
index 8f760b49c0..665d2ec477 100644
--- a/interface/web/sites/lib/lang/tr_ftp_user.lng
+++ b/interface/web/sites/lib/lang/tr_ftp_user.lng
@@ -21,7 +21,6 @@ $wb['username_error_unique'] = 'Bu kullanıcı adı zaten var.';
 $wb['username_error_regex'] = 'Kullanıcı adında izin verilmeyen karakterler var.';
 $wb['quota_size_error_empty'] = 'Kota boş olamaz.';
 $wb['uid_error_empty'] = 'UID boş olamaz.';
-$wb['gid_error_empty'] = 'GID boş olamaz.';
 $wb['directory_error_empty'] = 'Klasör boş olamaz.';
 $wb['directory_error_notinweb'] = 'Klasör web kök klasörünün altında bulunmalıdır.';
 $wb['parent_domain_id_error_empty'] = 'Bir web sitesi seçmelisiniz.';
@@ -32,7 +31,5 @@ $wb['generate_password_txt'] = 'Parola Oluştur';
 $wb['repeat_password_txt'] = 'Parola Onayı';
 $wb['password_mismatch_txt'] = 'Parola ile onayı aynı değil.';
 $wb['password_match_txt'] = 'Parola ile onayı aynı.';
-$wb['invalid_system_user_or_group_txt'] = 'Sistem kullanıcısı ya da grubu geçersiz';
-$wb['directory_error_regex'] = 'Klasör geçersiz';
+$wb['expires_txt'] = 'Expire at';
 ?>
-
diff --git a/interface/web/sites/lib/lang/tr_shell_user.lng b/interface/web/sites/lib/lang/tr_shell_user.lng
index 326c1b6a65..5610d59939 100644
--- a/interface/web/sites/lib/lang/tr_shell_user.lng
+++ b/interface/web/sites/lib/lang/tr_shell_user.lng
@@ -34,4 +34,3 @@ $wb['shell_error_regex'] = 'Kabuk geçersiz';
 $wb['invalid_username_txt'] = 'Kullanıcı adı geçersiz';
 $wb['directory_error_notinweb'] = 'Klasör web kök klasörünün altında bulunmalıdır.';
 ?>
-
diff --git a/interface/web/sites/lib/lang/tr_web_aliasdomain.lng b/interface/web/sites/lib/lang/tr_web_aliasdomain.lng
new file mode 100644
index 0000000000..4149c71149
--- /dev/null
+++ b/interface/web/sites/lib/lang/tr_web_aliasdomain.lng
@@ -0,0 +1,115 @@
+<?php
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Set Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['Domain'] = 'Aliasdomain';
+?>
diff --git a/interface/web/sites/lib/lang/tr_web_aliasdomain_list.lng b/interface/web/sites/lib/lang/tr_web_aliasdomain_list.lng
new file mode 100644
index 0000000000..fdb496d403
--- /dev/null
+++ b/interface/web/sites/lib/lang/tr_web_aliasdomain_list.lng
@@ -0,0 +1,14 @@
+<?php
+$wb['list_head_txt'] = 'Aliasdomain';
+$wb['active_txt'] = 'Aktif';
+$wb['server_id_txt'] = 'Sunucu';
+$wb['parent_domain_id_txt'] = 'Websitesi';
+$wb['domain_txt'] = 'Aliasdomain';
+$wb['add_new_record_txt'] = 'Yeni Aliasdomain';
+$wb['domain_error_empty'] = 'Domain boş.';
+$wb['domain_error_unique'] = 'Bu Domain zaten var.';
+$wb['domain_error_regex'] = 'Geçersiz Domain.';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['none_txt'] = 'None';
+?>
diff --git a/interface/web/sites/lib/lang/tr_web_backup_list.lng b/interface/web/sites/lib/lang/tr_web_backup_list.lng
index 4aff42952d..b4b11b8cd5 100644
--- a/interface/web/sites/lib/lang/tr_web_backup_list.lng
+++ b/interface/web/sites/lib/lang/tr_web_backup_list.lng
@@ -16,4 +16,6 @@ $wb['delete_info_txt'] = 'Delete of the backup has been started. This action tak
 $wb['delete_confirm_txt'] = 'Really delete this backup?';
 $wb['delete_pending_txt'] = 'There is already a pending backup delete job.';
 $wb['backup_type_web'] = 'Web sitesi dosyaları';
+$wb['filesize_txt'] = 'Filesize';
+$wb['backup_type_mongodb'] = 'MongoDB Database';
 ?>
diff --git a/interface/web/sites/lib/lang/tr_web_childdomain.lng b/interface/web/sites/lib/lang/tr_web_childdomain.lng
index 56a020f37f..ee35b01a99 100644
--- a/interface/web/sites/lib/lang/tr_web_childdomain.lng
+++ b/interface/web/sites/lib/lang/tr_web_childdomain.lng
@@ -42,7 +42,7 @@ $wb['no_flag_txt'] = 'No flag';
 $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.';
 $wb['backup_interval_txt'] = 'Backup interval';
 $wb['backup_copies_txt'] = 'Number of backup copies';
 $wb['ssl_key_txt'] = 'SSL Key';
@@ -115,5 +115,4 @@ $wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:
 $wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
 $wb['available_nginx_directive_snippets_txt'] = 'Available nginx Directive Snippets:';
 $wb['Domain'] = 'Aliasdomain';
-
 ?>
diff --git a/interface/web/sites/lib/lang/tr_web_childdomain_list.lng b/interface/web/sites/lib/lang/tr_web_childdomain_list.lng
index 84f7d81009..472829d095 100644
--- a/interface/web/sites/lib/lang/tr_web_childdomain_list.lng
+++ b/interface/web/sites/lib/lang/tr_web_childdomain_list.lng
@@ -4,12 +4,12 @@ $wb['active_txt'] = 'Etkin';
 $wb['server_id_txt'] = 'Sunucu';
 $wb['parent_domain_id_txt'] = 'Web Sitesi';
 $wb['domain_txt'] = 'Takma Alan Adı';
-$wb['add_new_record_txt'] = 'Takma Alan Adı Ekle';
 $wb['domain_error_empty'] = 'Alan adı boş olamaz.';
 $wb['domain_error_unique'] = 'Aynı alan adı zaten var.';
 $wb['domain_error_regex'] = 'Alan adı geçersiz.';
 $wb['no_redirect_txt'] = 'Yönlendirme yok';
 $wb['no_flag_txt'] = 'İşaret yok';
 $wb['none_txt'] = 'Yok';
+$wb['add_new_subdomain_txt'] = 'Add new Subdomain';
+$wb['add_new_aliasdomain_txt'] = 'Add new Aliasdomain';
 ?>
-
diff --git a/interface/web/sites/lib/lang/tr_web_directive_snippets.lng b/interface/web/sites/lib/lang/tr_web_directive_snippets.lng
new file mode 100644
index 0000000000..05a004f654
--- /dev/null
+++ b/interface/web/sites/lib/lang/tr_web_directive_snippets.lng
@@ -0,0 +1,3 @@
+<?php
+$wb['directive_snippets_id_txt'] = 'Desired configuration';
+?>
\ No newline at end of file
diff --git a/interface/web/sites/lib/lang/tr_web_domain.lng b/interface/web/sites/lib/lang/tr_web_domain.lng
new file mode 100644
index 0000000000..557b69b25b
--- /dev/null
+++ b/interface/web/sites/lib/lang/tr_web_domain.lng
@@ -0,0 +1,132 @@
+<?php
+$wb['ssl_state_txt'] = 'Mevki';
+$wb['ssl_locality_txt'] = 'Semt';
+$wb['ssl_organisation_txt'] = 'Kuruluş';
+$wb['ssl_organisation_unit_txt'] = 'Kuruluş Ünitesi';
+$wb['ssl_country_txt'] = 'Ülke';
+$wb['ssl_request_txt'] = 'SSL İsteği';
+$wb['ssl_cert_txt'] = 'SSL Sertifikası';
+$wb['ssl_bundle_txt'] = 'SSL Yığını';
+$wb['ssl_action_txt'] = 'SSL Eylemi';
+$wb['server_id_txt'] = 'Sunucu';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Çeşit';
+$wb['parent_domain_id_txt'] = 'Ana Website';
+$wb['redirect_type_txt'] = 'Yönlendirme Çeşidi';
+$wb['redirect_path_txt'] = 'Yönlendirme Yolu';
+$wb['active_txt'] = 'Aktif';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux Kullanıcısı';
+$wb['system_group_txt'] = 'Linux Grubu';
+$wb['ip_address_txt'] = 'IP Adresi';
+$wb['vhost_type_txt'] = 'VHost Çeşidi';
+$wb['hd_quota_txt'] = 'Harddisk Kotası';
+$wb['traffic_quota_txt'] = 'Trafik Kotası';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Özelleştirilebilir Hata Sayfaları';
+$wb['subdomain_txt'] = 'Otomatik Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Müşteri';
+$wb['limit_web_domain_txt'] = 'Hesabınızdaki max. web domaini sayısına ulaştınız.';
+$wb['limit_web_aliasdomain_txt'] = 'Hesabınızdaki max. aliasdomain sayısına ulaştınız.';
+$wb['limit_web_subdomain_txt'] = 'Hesabınızdaki max. web subdomain sayısına ulaştınız.';
+$wb['apache_directives_txt'] = 'Apache direktifleri';
+$wb['domain_error_empty'] = 'Domain boş.';
+$wb['domain_error_unique'] = 'Bu isimde websitesi veya sub / aliasdomain zaten var.';
+$wb['domain_error_regex'] = 'Domain ismi geçersiz.';
+$wb['hd_quota_error_empty'] = 'Harddisk kotası boş.';
+$wb['traffic_quota_error_empty'] = 'Trafik kotası boş.';
+$wb['error_ssl_state_empty'] = 'SSL Mevkisi boş .';
+$wb['error_ssl_locality_empty'] = 'SSL Semti boş.';
+$wb['error_ssl_organisation_empty'] = 'SSL Kuruluşu boş.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Kuruluş Ünitesi boş.';
+$wb['error_ssl_country_empty'] = 'SSL Ülkesi boş.';
+$wb['client_group_id_txt'] = 'Müşteri';
+$wb['stats_password_txt'] = 'Web istatistikleri şifresi';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['allow_override_txt'] = 'Allow Override';
+$wb['limit_web_quota_free_txt'] = 'Max. kullanılabilir Harddisk Kotası';
+$wb['ssl_state_error_regex'] = 'Geçersiz SSL Durumu. İzin verilen karakterler: a-z, 0-9 ve .,-_';
+$wb['ssl_locality_error_regex'] = 'Geçersiz SSL Yöresi. İzin verilen karakterler: a-z, 0-9 ve .,-_';
+$wb['ssl_organisation_error_regex'] = 'Geçersiz SSL Organizasyonu. İzin verilen karakterler: a-z, 0-9 ve .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Geçersiz SSL Organizasyon Unitesi. İzin verilen karakterler: a-z, 0-9 ve .,-_';
+$wb['ssl_country_error_regex'] = 'Geçersiz SSL Ülkesi. İzin verilen karakterler: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. kullanılabilir Trafik Kotası';
+$wb['redirect_error_regex'] = 'Geçersiz yönlendirme yolu. Geçerli yönlendirmeler örneğin: /test/ veya http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['perl_txt'] = 'Perl';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['domain_error_autosub'] = 'There is already a subdomain with these settings.';
+$wb['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['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['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_system_user_or_group_txt'] = 'Invalid system user or group';
+$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
+?>
diff --git a/interface/web/sites/lib/lang/tr_web_domain_admin_list.lng b/interface/web/sites/lib/lang/tr_web_domain_admin_list.lng
new file mode 100644
index 0000000000..b460e27100
--- /dev/null
+++ b/interface/web/sites/lib/lang/tr_web_domain_admin_list.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['sys_groupid_txt'] = 'Client';
+$wb['list_head_txt'] = 'Websites';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Add new website';
+?>
diff --git a/interface/web/sites/lib/lang/tr_web_domain_list.lng b/interface/web/sites/lib/lang/tr_web_domain_list.lng
new file mode 100644
index 0000000000..8dbf8fd450
--- /dev/null
+++ b/interface/web/sites/lib/lang/tr_web_domain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Web siteleri';
+$wb['domain_id_txt'] = 'ID';
+$wb['active_txt'] = 'Aktif';
+$wb['server_id_txt'] = 'Sunucu';
+$wb['domain_txt'] = 'Domain';
+$wb['add_new_record_txt'] = 'Yeni Website';
+?>
diff --git a/interface/web/sites/lib/lang/tr_web_subdomain.lng b/interface/web/sites/lib/lang/tr_web_subdomain.lng
new file mode 100644
index 0000000000..c0191cfd00
--- /dev/null
+++ b/interface/web/sites/lib/lang/tr_web_subdomain.lng
@@ -0,0 +1,46 @@
+<?php
+$wb['ssl_state_txt'] = 'Mevki';
+$wb['ssl_locality_txt'] = 'Semt';
+$wb['ssl_organisation_txt'] = 'Organizasyon';
+$wb['ssl_organisation_unit_txt'] = 'Organizasyon Unitesi';
+$wb['ssl_country_txt'] = 'Ülke';
+$wb['ssl_request_txt'] = 'SSL İsteği';
+$wb['ssl_cert_txt'] = 'SSL Sertifikası';
+$wb['ssl_bundle_txt'] = 'SSL Yığını';
+$wb['ssl_action_txt'] = 'SSL Eylemi';
+$wb['server_id_txt'] = 'Sunucu';
+$wb['domain_txt'] = 'Domain';
+$wb['type_txt'] = 'Çeşit';
+$wb['parent_domain_id_txt'] = 'Ana Website';
+$wb['redirect_type_txt'] = 'Yönlendirme Çeşidi';
+$wb['redirect_path_txt'] = 'Yönlendirme Yolu';
+$wb['active_txt'] = 'Aktif';
+$wb['document_root_txt'] = 'Documentroot';
+$wb['system_user_txt'] = 'Linux Kullanıcısı';
+$wb['system_group_txt'] = 'Linux Grubu';
+$wb['ip_address_txt'] = 'IP Adresleri';
+$wb['vhost_type_txt'] = 'VHost Çeşidi';
+$wb['hd_quota_txt'] = 'Harddisk Kotası';
+$wb['traffic_quota_txt'] = 'Trafik Kotası';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Müşteri';
+$wb['limit_web_domain_txt'] = 'Hesabınızdaki max. web domaini sayısına ulaştınız.';
+$wb['limit_web_aliasdomain_txt'] = 'Hesabınızdaki max. aliasdomain sayısına ulaştınız.';
+$wb['limit_web_subdomain_txt'] = 'Hesabınızdaki max. web subdomain sayısına ulaştınız.';
+$wb['apache_directives_txt'] = 'Apache direktifleri';
+$wb['domain_error_empty'] = 'Domain boş.';
+$wb['domain_error_unique'] = 'Bu isimde websitesi veya sub / aliasdomain zaten var.';
+$wb['domain_error_regex'] = 'Domain ismi geçersiz.';
+$wb['host_txt'] = 'Host';
+$wb['redirect_error_regex'] = 'Geçersiz yönlendirme yolu. Geçerli yönlendirmeler örneğin: /test/ veya http://www.domain.tld/test/';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$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.';
+?>
diff --git a/interface/web/sites/lib/lang/tr_web_subdomain_list.lng b/interface/web/sites/lib/lang/tr_web_subdomain_list.lng
new file mode 100644
index 0000000000..44b7bbeecb
--- /dev/null
+++ b/interface/web/sites/lib/lang/tr_web_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomainler';
+$wb['active_txt'] = 'Aktif';
+$wb['server_id_txt'] = 'Sunucu';
+$wb['parent_domain_id_txt'] = 'Websitesi';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Yeni Subdomain';
+?>
diff --git a/interface/web/sites/lib/lang/tr_web_vhost_domain.lng b/interface/web/sites/lib/lang/tr_web_vhost_domain.lng
index 1dc3b8d0bd..d86f158d1b 100644
--- a/interface/web/sites/lib/lang/tr_web_vhost_domain.lng
+++ b/interface/web/sites/lib/lang/tr_web_vhost_domain.lng
@@ -126,7 +126,20 @@ $wb['added_date_txt'] = 'Eklendiği tarih';
 $wb['backup_excludes_txt'] = 'Katılmayacak Klasörler';
 $wb['backup_excludes_note_txt'] = '(Klasörleri virgül ile ayırarak yazın. Örnek: web/cache/*,web/backup)';
 $wb['backup_excludes_error_regex'] = 'Katılmayacak klasörlerde geçersiz karakterler bulunuyor.';
-$wb['invalid_custom_php_ini_settings_txt'] = 'php.ini ayarları geçersiz';
-$wb['invalid_system_user_or_group_txt'] = 'Sistem kullanıcısı ya da grubu geçersiz';
-$wb['apache_directive_blocked_error'] = 'Apache yönergesi güvenlik ayarları tarafından engellenmiş:';
+$wb['server_chosen_not_ok'] = 'The selected server is not allowed for this account.';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['host_txt'] = 'Hostname';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+$wb['btn_save_txt'] = 'Save';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['enable_spdy_txt'] = 'Enable SPDY';
+$wb['load_client_data_txt'] = 'Load client details';
+$wb['load_my_data_txt'] = 'Load my contact details';
+$wb['reset_client_data_txt'] = 'Reset data';
+$wb['ssl_letsencrypt_txt'] = 'Let\'s Encrypt SSL';
+$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
+$wb['password_strength_txt'] = 'Password strength';
 ?>
diff --git a/interface/web/sites/lib/lang/tr_web_vhost_subdomain.lng b/interface/web/sites/lib/lang/tr_web_vhost_subdomain.lng
new file mode 100644
index 0000000000..c0ca93b570
--- /dev/null
+++ b/interface/web/sites/lib/lang/tr_web_vhost_subdomain.lng
@@ -0,0 +1,127 @@
+<?php
+$wb['parent_domain_id_txt'] = 'Parent Website';
+$wb['web_folder_txt'] = 'Web folder';
+$wb['web_folder_invalid_txt'] = 'The web folder is invalid, please choose a different one.';
+$wb['web_folder_unique_txt'] = 'The web folder is already used, please choose a different one.';
+$wb['backup_interval_txt'] = 'Backup interval';
+$wb['backup_copies_txt'] = 'Number of backup copies';
+$wb['ssl_state_txt'] = 'State';
+$wb['ssl_locality_txt'] = 'Locality';
+$wb['ssl_organisation_txt'] = 'Organisation';
+$wb['ssl_organisation_unit_txt'] = 'Organisation Unit';
+$wb['ssl_country_txt'] = 'Country';
+$wb['ssl_key_txt'] = 'SSL Key';
+$wb['ssl_request_txt'] = 'SSL Request';
+$wb['ssl_cert_txt'] = 'SSL Certificate';
+$wb['ssl_bundle_txt'] = 'SSL Bundle';
+$wb['ssl_action_txt'] = 'SSL Action';
+$wb['ssl_domain_txt'] = 'SSL Domain';
+$wb['server_id_txt'] = 'Server';
+$wb['domain_txt'] = 'Domain';
+$wb['host_txt'] = 'Hostname';
+$wb['web_folder_error_regex'] = 'Invalid folder entered. Please do not enter a slash.';
+$wb['type_txt'] = 'Type';
+$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'] = 'IPv4-Address';
+$wb['ipv6_address_txt'] = 'IPv6-Address';
+$wb['vhost_type_txt'] = 'VHost Type';
+$wb['hd_quota_txt'] = 'Harddisk Quota';
+$wb['traffic_quota_txt'] = 'Traffic Quota';
+$wb['cgi_txt'] = 'CGI';
+$wb['ssi_txt'] = 'SSI';
+$wb['errordocs_txt'] = 'Own Error-Documents';
+$wb['subdomain_txt'] = 'Auto-Subdomain';
+$wb['ssl_txt'] = 'SSL';
+$wb['suexec_txt'] = 'SuEXEC';
+$wb['php_txt'] = 'PHP';
+$wb['client_txt'] = 'Client';
+$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'] = 'There is already a website or sub / aliasdomain with this domain name.';
+$wb['domain_error_regex'] = 'Domain name invalid.';
+$wb['domain_error_wildcard'] = 'Wildcard subdomains are not allowed.';
+$wb['hd_quota_error_empty'] = 'Harddisk quota is 0 or empty.';
+$wb['traffic_quota_error_empty'] = 'Traffic quota is empty.';
+$wb['error_ssl_state_empty'] = 'SSL State is empty.';
+$wb['error_ssl_locality_empty'] = 'SSL Locality is empty.';
+$wb['error_ssl_organisation_empty'] = 'SSL Organisation is empty.';
+$wb['error_ssl_organisation_unit_empty'] = 'SSL Organisation Unit is empty.';
+$wb['error_ssl_country_empty'] = 'SSL Country is empty.';
+$wb['error_ssl_cert_empty'] = 'SSL Certificate field is empty';
+$wb['client_group_id_txt'] = 'Client';
+$wb['stats_password_txt'] = 'Webstatistics password';
+$wb['allow_override_txt'] = 'Apache AllowOverride';
+$wb['limit_web_quota_free_txt'] = 'Max. available Harddisk Quota';
+$wb['ssl_state_error_regex'] = 'Invalid SSL State. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_locality_error_regex'] = 'Invalid SSL Locality. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organisation_error_regex'] = 'Invalid SSL Organisation. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_organistaion_unit_error_regex'] = 'Invalid SSL Organisation Unit. Valid characters are: a-z, 0-9 and .,-_';
+$wb['ssl_country_error_regex'] = 'Invalid SSL Country. Valid characters are: A-Z';
+$wb['limit_traffic_quota_free_txt'] = 'Max. available Traffic Quota';
+$wb['redirect_error_regex'] = 'Invalid redirect path. Valid redirects are for example: /test/ or http://www.domain.tld/test/';
+$wb['php_open_basedir_txt'] = 'PHP open_basedir';
+$wb['traffic_quota_exceeded_txt'] = 'Traffic quota exceeded';
+$wb['ruby_txt'] = 'Ruby';
+$wb['stats_user_txt'] = 'Webstatistics username';
+$wb['stats_type_txt'] = 'Webstatistics program';
+$wb['custom_php_ini_txt'] = 'Custom php.ini settings';
+$wb['none_txt'] = 'None';
+$wb['disabled_txt'] = 'Disabled';
+$wb['no_redirect_txt'] = 'No redirect';
+$wb['no_flag_txt'] = 'No flag';
+$wb['save_certificate_txt'] = 'Save certificate';
+$wb['create_certificate_txt'] = 'Create certificate';
+$wb['delete_certificate_txt'] = 'Delete certificate';
+$wb['nginx_directives_txt'] = 'nginx Directives';
+$wb['seo_redirect_txt'] = 'SEO Redirect';
+$wb['non_www_to_www_txt'] = 'Non-www -&gt; www';
+$wb['www_to_non_www_txt'] = 'www -&gt; non-www';
+$wb['php_fpm_use_socket_txt'] = 'Use Socket For PHP-FPM';
+$wb['error_no_sni_txt'] = 'SNI for SSL is not activated on this server. You can enable only one SSL certificate on each IP address.';
+$wb['python_txt'] = 'Python';
+$wb['perl_txt'] = 'Perl';
+$wb['pm_max_children_txt'] = 'PHP-FPM pm.max_children';
+$wb['pm_start_servers_txt'] = 'PHP-FPM pm.start_servers';
+$wb['pm_min_spare_servers_txt'] = 'PHP-FPM pm.min_spare_servers';
+$wb['pm_max_spare_servers_txt'] = 'PHP-FPM pm.max_spare_servers';
+$wb['error_php_fpm_pm_settings_txt'] = 'Values of PHP-FPM pm settings must be as follows: pm.max_children &gt;= pm.max_spare_servers &gt;= pm.start_servers &gt;= pm.min_spare_servers &gt; 0';
+$wb['pm_max_children_error_regex'] = 'PHP-FPM pm.max_children must be a positive integer value.';
+$wb['pm_start_servers_error_regex'] = 'PHP-FPM pm.start_servers must be a positive integer value.';
+$wb['pm_min_spare_servers_error_regex'] = 'PHP-FPM pm.min_spare_servers must be a positive integer value.';
+$wb['pm_max_spare_servers_error_regex'] = 'PHP-FPM pm.max_spare_servers must be a positive integer value.';
+$wb['hd_quota_error_regex'] = 'Harddisk quota is invalid.';
+$wb['traffic_quota_error_regex'] = 'Traffic quota is invalid.';
+$wb['fastcgi_php_version_txt'] = 'PHP Version';
+$wb['pm_txt'] = 'PHP-FPM Process Manager';
+$wb['pm_process_idle_timeout_txt'] = 'PHP-FPM pm.process_idle_timeout';
+$wb['pm_max_requests_txt'] = 'PHP-FPM pm.max_requests';
+$wb['pm_process_idle_timeout_error_regex'] = 'PHP-FPM pm.process_idle_timeout must be a positive integer value.';
+$wb['pm_max_requests_error_regex'] = 'PHP-FPM pm.max_requests must be an integer value >= 0.';
+$wb['pm_ondemand_hint_txt'] = 'Please note that you must have PHP version >= 5.3.9 in order to use the ondemand process manager. If you select ondemand for an older PHP version, PHP will not start anymore!';
+$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['available_php_directive_snippets_txt'] = 'Available PHP Directive Snippets:';
+$wb['available_apache_directive_snippets_txt'] = 'Available Apache Directive Snippets:';
+$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['rewrite_rules_txt'] = 'Rewrite Rules';
+$wb['invalid_rewrite_rules_txt'] = 'Invalid Rewrite Rules';
+$wb['allowed_rewrite_rule_directives_txt'] = 'Allowed Directives:';
+$wb['configuration_error_txt'] = 'CONFIGURATION ERROR';
+$wb['variables_txt'] = 'Variables';
+$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['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
+?>
diff --git a/interface/web/sites/lib/lang/tr_web_vhost_subdomain_list.lng b/interface/web/sites/lib/lang/tr_web_vhost_subdomain_list.lng
new file mode 100644
index 0000000000..1c16bcda28
--- /dev/null
+++ b/interface/web/sites/lib/lang/tr_web_vhost_subdomain_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'Subdomains';
+$wb['active_txt'] = 'Active';
+$wb['server_id_txt'] = 'Server';
+$wb['parent_domain_id_txt'] = 'Website';
+$wb['domain_txt'] = 'Subdomain';
+$wb['add_new_record_txt'] = 'Add new subdomain';
+?>
diff --git a/interface/web/sites/lib/lang/tr_webdav_user.lng b/interface/web/sites/lib/lang/tr_webdav_user.lng
index 1b9fa4d925..e592f052c4 100644
--- a/interface/web/sites/lib/lang/tr_webdav_user.lng
+++ b/interface/web/sites/lib/lang/tr_webdav_user.lng
@@ -19,4 +19,3 @@ $wb['repeat_password_txt'] = 'Parola Onayı';
 $wb['password_mismatch_txt'] = 'Parola ile onayı aynı değil.';
 $wb['password_match_txt'] = 'Parola ile onayı aynı.';
 ?>
-
diff --git a/interface/web/tools/lib/lang/ar_import_vpopmail.lng b/interface/web/tools/lib/lang/ar_import_vpopmail.lng
new file mode 100644
index 0000000000..66fe56da1c
--- /dev/null
+++ b/interface/web/tools/lib/lang/ar_import_vpopmail.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['head_txt'] = 'Import email configuration from Vpopmail';
+$wb['legend_txt'] = 'Remote database server connection details';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>
diff --git a/interface/web/tools/lib/lang/ar_resync.lng b/interface/web/tools/lib/lang/ar_resync.lng
index 59767a134a..cfb7dc1a39 100644
--- a/interface/web/tools/lib/lang/ar_resync.lng
+++ b/interface/web/tools/lib/lang/ar_resync.lng
@@ -42,8 +42,8 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
 $wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
-$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
-$wb["do_mailget_txt"] = "Resynced Fetchmail";
-$wb["resync_mailget_txt"] = "Fetchmail";
+$wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
+$wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
+$wb['do_mailget_txt'] = 'Resynced Fetchmail';
+$wb['resync_mailget_txt'] = 'Fetchmail';
 ?>
diff --git a/interface/web/tools/lib/lang/bg_import_vpopmail.lng b/interface/web/tools/lib/lang/bg_import_vpopmail.lng
new file mode 100644
index 0000000000..1e4dd281f7
--- /dev/null
+++ b/interface/web/tools/lib/lang/bg_import_vpopmail.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['head_txt'] = 'Import email configuration from Vpopmail';
+$wb['legend_txt'] = 'Remote database server connection details';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+
+?>
diff --git a/interface/web/tools/lib/lang/bg_resync.lng b/interface/web/tools/lib/lang/bg_resync.lng
index 59767a134a..cfb7dc1a39 100644
--- a/interface/web/tools/lib/lang/bg_resync.lng
+++ b/interface/web/tools/lib/lang/bg_resync.lng
@@ -42,8 +42,8 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
 $wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
-$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
-$wb["do_mailget_txt"] = "Resynced Fetchmail";
-$wb["resync_mailget_txt"] = "Fetchmail";
+$wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
+$wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
+$wb['do_mailget_txt'] = 'Resynced Fetchmail';
+$wb['resync_mailget_txt'] = 'Fetchmail';
 ?>
diff --git a/interface/web/tools/lib/lang/br_import_vpopmail.lng b/interface/web/tools/lib/lang/br_import_vpopmail.lng
new file mode 100644
index 0000000000..1e4dd281f7
--- /dev/null
+++ b/interface/web/tools/lib/lang/br_import_vpopmail.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['head_txt'] = 'Import email configuration from Vpopmail';
+$wb['legend_txt'] = 'Remote database server connection details';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+
+?>
diff --git a/interface/web/tools/lib/lang/br_resync.lng b/interface/web/tools/lib/lang/br_resync.lng
index 59767a134a..cfb7dc1a39 100644
--- a/interface/web/tools/lib/lang/br_resync.lng
+++ b/interface/web/tools/lib/lang/br_resync.lng
@@ -42,8 +42,8 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
 $wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
-$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
-$wb["do_mailget_txt"] = "Resynced Fetchmail";
-$wb["resync_mailget_txt"] = "Fetchmail";
+$wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
+$wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
+$wb['do_mailget_txt'] = 'Resynced Fetchmail';
+$wb['resync_mailget_txt'] = 'Fetchmail';
 ?>
diff --git a/interface/web/tools/lib/lang/ca.lng b/interface/web/tools/lib/lang/ca.lng
new file mode 100644
index 0000000000..a5a12ccb4f
--- /dev/null
+++ b/interface/web/tools/lib/lang/ca.lng
@@ -0,0 +1,13 @@
+<?php
+$wb['User Settings'] = 'Paramètres Utilisateur';
+$wb['Settings'] = 'Paramètres';
+$wb['ISPConfig Tools'] = 'Outils ISPConfig';
+$wb['Password and Language'] = 'Mot de passe et Langue';
+$wb['ispconfig_tools_note'] = 'Ce module vous permet de changer le mot de passe utilisateur et la langue et de démarrer une resynchronisation des enregistrement DNS.';
+$wb['Resync'] = 'Resync';
+$wb['Sync Tools'] = 'Sync Tools';
+$wb['Import'] = 'Import';
+$wb['ISPConfig 3 mail'] = 'ISPConfig 3 mail';
+$wb['PDNS Tupa'] = 'PowerDNS Tupa';
+$wb['Interface'] = 'Interface';
+?>
diff --git a/interface/web/tools/lib/lang/ca_import_ispconfig.lng b/interface/web/tools/lib/lang/ca_import_ispconfig.lng
new file mode 100644
index 0000000000..548e64ec0e
--- /dev/null
+++ b/interface/web/tools/lib/lang/ca_import_ispconfig.lng
@@ -0,0 +1,23 @@
+<?php
+$wb['head_txt'] = 'Import courriel configuration from ISPConfig 3';
+$wb['legend_txt'] = 'Remote server connection details';
+$wb['legend2_txt'] = 'Import courriel 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['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'] = 'Annuler';
+$wb['client_group_id_txt'] = 'Local client';
+$wb['mail_domain_txt'] = 'Remote courriel domain';
+$wb['import_mailbox_txt'] = 'Import mailbox';
+$wb['import_aliasdomain_txt'] = 'Import alias domain';
+$wb['import_alias_txt'] = 'Import courriel alias';
+$wb['import_forward_txt'] = 'Import forward';
+$wb['import_user_filter_txt'] = 'Import user filter';
+$wb['import_spamfilter_txt'] = 'Import spamfilter';
+?>
diff --git a/interface/web/tools/lib/lang/ca_import_vpopmail.lng b/interface/web/tools/lib/lang/ca_import_vpopmail.lng
new file mode 100644
index 0000000000..66fe56da1c
--- /dev/null
+++ b/interface/web/tools/lib/lang/ca_import_vpopmail.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['head_txt'] = 'Import email configuration from Vpopmail';
+$wb['legend_txt'] = 'Remote database server connection details';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>
diff --git a/interface/web/tools/lib/lang/ca_index.lng b/interface/web/tools/lib/lang/ca_index.lng
new file mode 100644
index 0000000000..978c2f05bf
--- /dev/null
+++ b/interface/web/tools/lib/lang/ca_index.lng
@@ -0,0 +1,4 @@
+<?php
+$wb['page_head_txt'] = 'Outils ISPConfig';
+$wb['page_desc_txt'] = 'Changer les paramètres utilisateur';
+?>
diff --git a/interface/web/tools/lib/lang/ca_interface.lng b/interface/web/tools/lib/lang/ca_interface.lng
new file mode 100644
index 0000000000..b252103fd9
--- /dev/null
+++ b/interface/web/tools/lib/lang/ca_interface.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['interface_head_txt'] = 'Paramètres d\'interface';
+$wb['interface_desc_txt'] = 'Modifier votre interface';
+$wb['language_txt'] = 'Language';
+$wb['startmodule_txt'] = 'Page d\'accueil';
+$wb['app_theme_txt'] = 'Interface';
+?>
diff --git a/interface/web/tools/lib/lang/ca_resync.lng b/interface/web/tools/lib/lang/ca_resync.lng
new file mode 100644
index 0000000000..b1f9cc2a64
--- /dev/null
+++ b/interface/web/tools/lib/lang/ca_resync.lng
@@ -0,0 +1,49 @@
+<?php
+$wb['head_txt'] = 'Resync Tool';
+$wb['legend_txt'] = 'Resync';
+$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['resync_db_txt'] = 'Resync clientdb config';
+$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
+$wb['resync_dns_txt'] = 'Resync DNS records';
+$wb['btn_start_txt'] = 'Commencer';
+$wb['btn_cancel_txt'] = 'Annuler';
+$wb['resync_client_txt'] = 'Resync Client records';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
+$wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
+$wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
+$wb['do_mailget_txt'] = 'Resynced Fetchmail';
+$wb['resync_mailget_txt'] = 'Fetchmail';
+?>
diff --git a/interface/web/tools/lib/lang/ca_tpl_default.lng b/interface/web/tools/lib/lang/ca_tpl_default.lng
new file mode 100644
index 0000000000..7d2bba24fc
--- /dev/null
+++ b/interface/web/tools/lib/lang/ca_tpl_default.lng
@@ -0,0 +1,7 @@
+<?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'] = 'Sauvegarder';
+$wb['btn_cancel_txt'] = 'Retour';
+?>
diff --git a/interface/web/tools/lib/lang/ca_usersettings.lng b/interface/web/tools/lib/lang/ca_usersettings.lng
new file mode 100644
index 0000000000..85c8e75473
--- /dev/null
+++ b/interface/web/tools/lib/lang/ca_usersettings.lng
@@ -0,0 +1,12 @@
+<?php
+$wb['passwort_txt'] = 'Mot de passe';
+$wb['password_strength_txt'] = 'Force du mot de passe';
+$wb['language_txt'] = 'Langue';
+$wb['password_mismatch'] = 'Le mot de passe de confirmation ne correspond avec le premier.';
+$wb['Form to edit the user password and language.'] = 'Formulaire d\'édition du mot de passe utilisateur et de la langue.';
+$wb['Settings'] = 'Paramètres';
+$wb['generate_password_txt'] = 'Générer mot de passe';
+$wb['repeat_password_txt'] = 'Retaper le mot de passe';
+$wb['password_mismatch_txt'] = 'Les mots de passe ne correspondent pas.';
+$wb['password_match_txt'] = 'Les mots de passe correspondent.';
+?>
diff --git a/interface/web/tools/lib/lang/cz.lng b/interface/web/tools/lib/lang/cz.lng
index 480434e148..66bcaf49ae 100644
--- a/interface/web/tools/lib/lang/cz.lng
+++ b/interface/web/tools/lib/lang/cz.lng
@@ -11,5 +11,3 @@ $wb['ISPConfig 3 mail'] = 'ISPConfig 3 vzdalený e-mail server';
 $wb['PDNS Tupa'] = 'PowerDNS Tupa';
 $wb['Interface'] = 'Rozhraní';
 ?>
-
-
diff --git a/interface/web/tools/lib/lang/cz_import_ispconfig.lng b/interface/web/tools/lib/lang/cz_import_ispconfig.lng
index ba24f58f75..8ebf71795c 100644
--- a/interface/web/tools/lib/lang/cz_import_ispconfig.lng
+++ b/interface/web/tools/lib/lang/cz_import_ispconfig.lng
@@ -21,5 +21,3 @@ $wb['import_forward_txt'] = 'Import forward';
 $wb['import_user_filter_txt'] = 'Importovat uživatelský filter';
 $wb['import_spamfilter_txt'] = 'Importovat spamový filter';
 ?>
-
-
diff --git a/interface/web/tools/lib/lang/cz_import_vpopmail.lng b/interface/web/tools/lib/lang/cz_import_vpopmail.lng
new file mode 100644
index 0000000000..1e4dd281f7
--- /dev/null
+++ b/interface/web/tools/lib/lang/cz_import_vpopmail.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['head_txt'] = 'Import email configuration from Vpopmail';
+$wb['legend_txt'] = 'Remote database server connection details';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+
+?>
diff --git a/interface/web/tools/lib/lang/cz_index.lng b/interface/web/tools/lib/lang/cz_index.lng
index b1f32ec119..5ebf1ec341 100644
--- a/interface/web/tools/lib/lang/cz_index.lng
+++ b/interface/web/tools/lib/lang/cz_index.lng
@@ -2,5 +2,3 @@
 $wb['page_head_txt'] = 'ISPConfig nástroje';
 $wb['page_desc_txt'] = 'Změna uživatelského nastavení';
 ?>
-
-
diff --git a/interface/web/tools/lib/lang/cz_interface.lng b/interface/web/tools/lib/lang/cz_interface.lng
index 1125032b1f..507b7c3cbe 100644
--- a/interface/web/tools/lib/lang/cz_interface.lng
+++ b/interface/web/tools/lib/lang/cz_interface.lng
@@ -5,5 +5,3 @@ $wb['language_txt'] = 'Jazyk';
 $wb['startmodule_txt'] = 'Výchozí modul po přihlášení';
 $wb['app_theme_txt'] = 'Výchozí grafické téma';
 ?>
-
-
diff --git a/interface/web/tools/lib/lang/cz_resync.lng b/interface/web/tools/lib/lang/cz_resync.lng
index c0760d24c8..364a432c33 100644
--- a/interface/web/tools/lib/lang/cz_resync.lng
+++ b/interface/web/tools/lib/lang/cz_resync.lng
@@ -24,10 +24,10 @@ $wb['do_dns_txt'] = 'Resynced DNS zone';
 $wb['do_vserver_txt'] = 'Resynced vServer';
 $wb['do_clients_txt'] = 'Resynced clients and reseller';
 $wb['no_results_txt'] = 'Nothing found';
-$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
-$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
-$wb["do_mailget_txt"] = "Resynced Fetchmail";
-$wb["resync_mailget_txt"] = "Fetchmail";
+$wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
+$wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
+$wb['do_mailget_txt'] = 'Resynced Fetchmail';
+$wb['resync_mailget_txt'] = 'Fetchmail';
 $wb['head_txt'] = 'Resynchronizační nástroje';
 $wb['legend_txt'] = 'Resynchronizace';
 $wb['resync_sites_txt'] = 'Resynchronizovat webové stránky';
@@ -40,5 +40,10 @@ $wb['resync_dns_txt'] = 'Resynchronizovat DNS záznamy';
 $wb['btn_start_txt'] = 'Zahájit';
 $wb['btn_cancel_txt'] = 'Zrušit';
 $wb['resync_client_txt'] = 'Resync Client records';
-$wb['resync_dkim_txt'] = 'Resync DKIM-Keys';
-?>
\ No newline at end of file
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_vserver_txt'] = 'vServer';
+?>
diff --git a/interface/web/tools/lib/lang/cz_tpl_default.lng b/interface/web/tools/lib/lang/cz_tpl_default.lng
index 53e9bd8442..0f037f1590 100644
--- a/interface/web/tools/lib/lang/cz_tpl_default.lng
+++ b/interface/web/tools/lib/lang/cz_tpl_default.lng
@@ -5,5 +5,3 @@ $wb['no_settings_txt'] = 'Nejsou žádné nastavení pro výchozí motiv.';
 $wb['btn_start_txt'] = 'Uložit';
 $wb['btn_cancel_txt'] = 'Zpět';
 ?>
-
-
diff --git a/interface/web/tools/lib/lang/cz_usersettings.lng b/interface/web/tools/lib/lang/cz_usersettings.lng
index 7490e52f98..dec46b7a06 100644
--- a/interface/web/tools/lib/lang/cz_usersettings.lng
+++ b/interface/web/tools/lib/lang/cz_usersettings.lng
@@ -10,5 +10,3 @@ $wb['repeat_password_txt'] = 'Opakujte heslo';
 $wb['password_mismatch_txt'] = 'Hesla se neshodují.';
 $wb['password_match_txt'] = 'Hesla se shodují.';
 ?>
-
-
diff --git a/interface/web/tools/lib/lang/de_import_vpopmail.lng b/interface/web/tools/lib/lang/de_import_vpopmail.lng
new file mode 100644
index 0000000000..1e4dd281f7
--- /dev/null
+++ b/interface/web/tools/lib/lang/de_import_vpopmail.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['head_txt'] = 'Import email configuration from Vpopmail';
+$wb['legend_txt'] = 'Remote database server connection details';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+
+?>
diff --git a/interface/web/tools/lib/lang/de_resync.lng b/interface/web/tools/lib/lang/de_resync.lng
index 6523727a16..20f4568519 100644
--- a/interface/web/tools/lib/lang/de_resync.lng
+++ b/interface/web/tools/lib/lang/de_resync.lng
@@ -42,8 +42,8 @@ $wb['do_clients_txt'] = 'Resynced Kunden und Reseller';
 $wb['no_results_txt'] = 'Keine Daten vorhanden';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
-$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
-$wb["do_mailget_txt"] = "Resynced Fetchmail";
-$wb["resync_mailget_txt"] = "E-Mail Sammeldienst";
+$wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
+$wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
+$wb['do_mailget_txt'] = 'Resynced Fetchmail';
+$wb['resync_mailget_txt'] = 'E-Mail Sammeldienst';
 ?>
diff --git a/interface/web/tools/lib/lang/el_import_vpopmail.lng b/interface/web/tools/lib/lang/el_import_vpopmail.lng
new file mode 100644
index 0000000000..1e4dd281f7
--- /dev/null
+++ b/interface/web/tools/lib/lang/el_import_vpopmail.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['head_txt'] = 'Import email configuration from Vpopmail';
+$wb['legend_txt'] = 'Remote database server connection details';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+
+?>
diff --git a/interface/web/tools/lib/lang/el_resync.lng b/interface/web/tools/lib/lang/el_resync.lng
index 59767a134a..cfb7dc1a39 100644
--- a/interface/web/tools/lib/lang/el_resync.lng
+++ b/interface/web/tools/lib/lang/el_resync.lng
@@ -42,8 +42,8 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
 $wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
-$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
-$wb["do_mailget_txt"] = "Resynced Fetchmail";
-$wb["resync_mailget_txt"] = "Fetchmail";
+$wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
+$wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
+$wb['do_mailget_txt'] = 'Resynced Fetchmail';
+$wb['resync_mailget_txt'] = 'Fetchmail';
 ?>
diff --git a/interface/web/tools/lib/lang/es.lng b/interface/web/tools/lib/lang/es.lng
index dd5363f987..02ea8e1026 100644
--- a/interface/web/tools/lib/lang/es.lng
+++ b/interface/web/tools/lib/lang/es.lng
@@ -1,9 +1,8 @@
 <?php
-$wb['Interface'] = 'Interfaz';
+$wb['Interface'] = 'Interfase';
 $wb['User Settings'] = 'Opciones de usuario';
 $wb['Settings'] = 'Opciones';
 $wb['ISPConfig Tools'] = 'Herramientas de ISPConfig';
-$wb['Interface'] = 'Interfase';
 $wb['Password and Language'] = 'Contraseña e idioma';
 $wb['ispconfig_tools_note'] = 'Este módulo le permite cambiar la contraseña, el idioma y permite iniciar una resincronización de los registros DNS.';
 $wb['Sync Tools'] = 'Opciones de sincronización';
diff --git a/interface/web/tools/lib/lang/es_import_vpopmail.lng b/interface/web/tools/lib/lang/es_import_vpopmail.lng
new file mode 100644
index 0000000000..1e4dd281f7
--- /dev/null
+++ b/interface/web/tools/lib/lang/es_import_vpopmail.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['head_txt'] = 'Import email configuration from Vpopmail';
+$wb['legend_txt'] = 'Remote database server connection details';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+
+?>
diff --git a/interface/web/tools/lib/lang/es_resync.lng b/interface/web/tools/lib/lang/es_resync.lng
index c56021658d..3f871c20bb 100644
--- a/interface/web/tools/lib/lang/es_resync.lng
+++ b/interface/web/tools/lib/lang/es_resync.lng
@@ -1,5 +1,4 @@
 <?php
-
 $wb['head_txt'] = 'Herramienta de resincronización';
 $wb['legend_txt'] = 'Resincronización';
 $wb['resync_sites_txt'] = 'Resincronizar sitios web';
@@ -12,4 +11,39 @@ $wb['resync_dns_txt'] = 'Resincronizar registros DNS';
 $wb['btn_start_txt'] = 'Iniciar';
 $wb['btn_cancel_txt'] = 'Cancelar';
 $wb['resync_client_txt'] = 'Resincronizar registros de clientes';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
+$wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
+$wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
+$wb['do_mailget_txt'] = 'Resynced Fetchmail';
+$wb['resync_mailget_txt'] = 'Fetchmail';
 ?>
diff --git a/interface/web/tools/lib/lang/fi_import_vpopmail.lng b/interface/web/tools/lib/lang/fi_import_vpopmail.lng
new file mode 100644
index 0000000000..1e4dd281f7
--- /dev/null
+++ b/interface/web/tools/lib/lang/fi_import_vpopmail.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['head_txt'] = 'Import email configuration from Vpopmail';
+$wb['legend_txt'] = 'Remote database server connection details';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+
+?>
diff --git a/interface/web/tools/lib/lang/fi_resync.lng b/interface/web/tools/lib/lang/fi_resync.lng
index 59767a134a..cfb7dc1a39 100644
--- a/interface/web/tools/lib/lang/fi_resync.lng
+++ b/interface/web/tools/lib/lang/fi_resync.lng
@@ -42,8 +42,8 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
 $wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
-$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
-$wb["do_mailget_txt"] = "Resynced Fetchmail";
-$wb["resync_mailget_txt"] = "Fetchmail";
+$wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
+$wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
+$wb['do_mailget_txt'] = 'Resynced Fetchmail';
+$wb['resync_mailget_txt'] = 'Fetchmail';
 ?>
diff --git a/interface/web/tools/lib/lang/fr_import_ispconfig.lng b/interface/web/tools/lib/lang/fr_import_ispconfig.lng
index ce47c4da4d..babc728f70 100644
--- a/interface/web/tools/lib/lang/fr_import_ispconfig.lng
+++ b/interface/web/tools/lib/lang/fr_import_ispconfig.lng
@@ -1,7 +1,7 @@
 <?php
-$wb['head_txt'] = 'Import email configuration from ISPConfig 3';
+$wb['head_txt'] = 'Import e-mail configuration from ISPConfig 3';
 $wb['legend_txt'] = 'Remote server connection details';
-$wb['legend2_txt'] = 'Import email domain';
+$wb['legend2_txt'] = 'Import e-mail domain';
 $wb['resync_sites_txt'] = 'Resync Websites';
 $wb['resync_ftp_txt'] = 'Resync FTP users';
 $wb['resync_shell_txt'] = 'Resync shell users';
@@ -13,10 +13,10 @@ $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['mail_domain_txt'] = 'Remote e-mail domain';
 $wb['import_mailbox_txt'] = 'Import mailbox';
 $wb['import_aliasdomain_txt'] = 'Import alias domain';
-$wb['import_alias_txt'] = 'Import email alias';
+$wb['import_alias_txt'] = 'Import e-mail alias';
 $wb['import_forward_txt'] = 'Import forward';
 $wb['import_user_filter_txt'] = 'Import user filter';
 $wb['import_spamfilter_txt'] = 'Import spamfilter';
diff --git a/interface/web/tools/lib/lang/fr_import_vpopmail.lng b/interface/web/tools/lib/lang/fr_import_vpopmail.lng
new file mode 100644
index 0000000000..66fe56da1c
--- /dev/null
+++ b/interface/web/tools/lib/lang/fr_import_vpopmail.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['head_txt'] = 'Import email configuration from Vpopmail';
+$wb['legend_txt'] = 'Remote database server connection details';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>
diff --git a/interface/web/tools/lib/lang/fr_resync.lng b/interface/web/tools/lib/lang/fr_resync.lng
index 59767a134a..dad0b41c65 100644
--- a/interface/web/tools/lib/lang/fr_resync.lng
+++ b/interface/web/tools/lib/lang/fr_resync.lng
@@ -1,20 +1,22 @@
 <?php
 $wb['head_txt'] = 'Resync Tool';
 $wb['legend_txt'] = 'Resync';
+$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['resync_db_txt'] = 'Resync clientdb config';
+$wb['resync_mailbox_txt'] = 'Resync Mailboxes';
+$wb['resync_dns_txt'] = 'Resync DNS records';
+$wb['btn_start_txt'] = 'Start';
+$wb['btn_cancel_txt'] = 'Cancel';
+$wb['resync_client_txt'] = 'Resync Client records';
 $wb['resync_all_txt'] = 'All services';
-$wb['resync_sites_txt'] = 'Websites';
-$wb['resync_ftp_txt'] = 'FTP-Accounts';
 $wb['resync_webdav_txt'] = 'WebDAV-Users';
-$wb['resync_shell_txt'] = 'Shell users';
-$wb['resync_cron_txt'] = 'Cronjobs';
-$wb['resync_db_txt'] = 'Client Database config';
-$wb['resync_mailbox_txt'] = 'Mailboxes';
 $wb['resync_mail_txt'] = 'Maildomains';
 $wb['resync_mailfilter_txt'] = 'Mailfilter';
 $wb['resync_mailinglist_txt'] = 'Mailinglist';
-$wb['resync_dns_txt'] = 'DNS records';
 $wb['resync_vserver_txt'] = 'vServer';
-$wb['resync_client_txt'] = 'Client and reseller';
 $wb['all_active_txt'] = 'All active server';
 $wb['all_active_mail_txt'] = 'All active Mail-Server';
 $wb['all_active_web_txt'] = 'All active Web-Server';
@@ -40,10 +42,8 @@ $wb['do_dns_txt'] = 'Resynced DNS zone';
 $wb['do_vserver_txt'] = 'Resynced vServer';
 $wb['do_clients_txt'] = 'Resynced clients and reseller';
 $wb['no_results_txt'] = 'Nothing found';
-$wb['btn_start_txt'] = 'Start';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
-$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
-$wb["do_mailget_txt"] = "Resynced Fetchmail";
-$wb["resync_mailget_txt"] = "Fetchmail";
+$wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
+$wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
+$wb['do_mailget_txt'] = 'Resynced Fetchmail';
+$wb['resync_mailget_txt'] = 'Fetchmail';
 ?>
diff --git a/interface/web/tools/lib/lang/fr_usersettings.lng b/interface/web/tools/lib/lang/fr_usersettings.lng
index ed3ee6108d..fda69f9c76 100644
--- a/interface/web/tools/lib/lang/fr_usersettings.lng
+++ b/interface/web/tools/lib/lang/fr_usersettings.lng
@@ -3,9 +3,9 @@ $wb['passwort_txt'] = 'Mot de passe';
 $wb['password_strength_txt'] = 'Force du mot de passe';
 $wb['language_txt'] = 'Langue';
 $wb['password_mismatch'] = 'Le mot de passe de confirmation ne correspond avec le premier.';
-$wb['Form to edit the user password and language.'] = 'Formulaire d\'édition du mot de passe utilisateur et de la langue.';
+$wb['Form to edit the user password and language.'] = 'Formulaire d’édition du mot de passe utilisateur et de la langue.';
 $wb['Settings'] = 'Paramètres';
-$wb['generate_password_txt'] = 'Generate Password';
+$wb['generate_password_txt'] = 'Générer un mot de passe';
 $wb['repeat_password_txt'] = 'Repeat Password';
 $wb['password_mismatch_txt'] = 'The passwords do not match.';
 $wb['password_match_txt'] = 'The passwords do match.';
diff --git a/interface/web/tools/lib/lang/hr.lng b/interface/web/tools/lib/lang/hr.lng
index d8744ec06d..9393f7fcbe 100644
--- a/interface/web/tools/lib/lang/hr.lng
+++ b/interface/web/tools/lib/lang/hr.lng
@@ -11,5 +11,3 @@ $wb['ISPConfig 3 mail'] = 'ISPConfig 3 mail';
 $wb['PDNS Tupa'] = 'PowerDNS Tupa';
 $wb['Interface'] = 'Interface';
 ?>
-
-
diff --git a/interface/web/tools/lib/lang/hr_import_ispconfig.lng b/interface/web/tools/lib/lang/hr_import_ispconfig.lng
index afbcfd4075..0e09ffd2e7 100644
--- a/interface/web/tools/lib/lang/hr_import_ispconfig.lng
+++ b/interface/web/tools/lib/lang/hr_import_ispconfig.lng
@@ -21,5 +21,3 @@ $wb['import_forward_txt'] = 'Importiraj forward-ere';
 $wb['import_user_filter_txt'] = 'Importiraj korisničke filtere';
 $wb['import_spamfilter_txt'] = 'Importiraj spamfilter';
 ?>
-
-
diff --git a/interface/web/tools/lib/lang/hr_import_vpopmail.lng b/interface/web/tools/lib/lang/hr_import_vpopmail.lng
new file mode 100644
index 0000000000..66fe56da1c
--- /dev/null
+++ b/interface/web/tools/lib/lang/hr_import_vpopmail.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['head_txt'] = 'Import email configuration from Vpopmail';
+$wb['legend_txt'] = 'Remote database server connection details';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>
diff --git a/interface/web/tools/lib/lang/hr_index.lng b/interface/web/tools/lib/lang/hr_index.lng
index 661a152f65..a3ef38f219 100644
--- a/interface/web/tools/lib/lang/hr_index.lng
+++ b/interface/web/tools/lib/lang/hr_index.lng
@@ -2,5 +2,3 @@
 $wb['page_head_txt'] = 'ISPConfig Tools';
 $wb['page_desc_txt'] = 'Change user settings';
 ?>
-
-
diff --git a/interface/web/tools/lib/lang/hr_interface.lng b/interface/web/tools/lib/lang/hr_interface.lng
index 5ed3ccb01b..5cc9815a10 100644
--- a/interface/web/tools/lib/lang/hr_interface.lng
+++ b/interface/web/tools/lib/lang/hr_interface.lng
@@ -5,5 +5,3 @@ $wb['language_txt'] = 'Jezik';
 $wb['startmodule_txt'] = 'Početna stranica';
 $wb['app_theme_txt'] = 'Tema';
 ?>
-
-
diff --git a/interface/web/tools/lib/lang/hr_resync.lng b/interface/web/tools/lib/lang/hr_resync.lng
index 59767a134a..cfb7dc1a39 100644
--- a/interface/web/tools/lib/lang/hr_resync.lng
+++ b/interface/web/tools/lib/lang/hr_resync.lng
@@ -42,8 +42,8 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
 $wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
-$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
-$wb["do_mailget_txt"] = "Resynced Fetchmail";
-$wb["resync_mailget_txt"] = "Fetchmail";
+$wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
+$wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
+$wb['do_mailget_txt'] = 'Resynced Fetchmail';
+$wb['resync_mailget_txt'] = 'Fetchmail';
 ?>
diff --git a/interface/web/tools/lib/lang/hr_tpl_default.lng b/interface/web/tools/lib/lang/hr_tpl_default.lng
index 963ee0bfc9..5c47512825 100644
--- a/interface/web/tools/lib/lang/hr_tpl_default.lng
+++ b/interface/web/tools/lib/lang/hr_tpl_default.lng
@@ -5,5 +5,3 @@ $wb['no_settings_txt'] = 'Nema opcija za standardnu temu.';
 $wb['btn_start_txt'] = 'Spremi';
 $wb['btn_cancel_txt'] = 'Natrag';
 ?>
-
-
diff --git a/interface/web/tools/lib/lang/hr_usersettings.lng b/interface/web/tools/lib/lang/hr_usersettings.lng
index 2fcf6faba7..64b33d5923 100644
--- a/interface/web/tools/lib/lang/hr_usersettings.lng
+++ b/interface/web/tools/lib/lang/hr_usersettings.lng
@@ -10,5 +10,3 @@ $wb['repeat_password_txt'] = 'Ponovi šifru';
 $wb['password_mismatch_txt'] = 'Šifre nisu identične.';
 $wb['password_match_txt'] = 'Šifre su identične.';
 ?>
-
-
diff --git a/interface/web/tools/lib/lang/hu_import_vpopmail.lng b/interface/web/tools/lib/lang/hu_import_vpopmail.lng
new file mode 100644
index 0000000000..1e4dd281f7
--- /dev/null
+++ b/interface/web/tools/lib/lang/hu_import_vpopmail.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['head_txt'] = 'Import email configuration from Vpopmail';
+$wb['legend_txt'] = 'Remote database server connection details';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+
+?>
diff --git a/interface/web/tools/lib/lang/hu_resync.lng b/interface/web/tools/lib/lang/hu_resync.lng
index 59767a134a..cfb7dc1a39 100644
--- a/interface/web/tools/lib/lang/hu_resync.lng
+++ b/interface/web/tools/lib/lang/hu_resync.lng
@@ -42,8 +42,8 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
 $wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
-$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
-$wb["do_mailget_txt"] = "Resynced Fetchmail";
-$wb["resync_mailget_txt"] = "Fetchmail";
+$wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
+$wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
+$wb['do_mailget_txt'] = 'Resynced Fetchmail';
+$wb['resync_mailget_txt'] = 'Fetchmail';
 ?>
diff --git a/interface/web/tools/lib/lang/id_import_vpopmail.lng b/interface/web/tools/lib/lang/id_import_vpopmail.lng
new file mode 100644
index 0000000000..1e4dd281f7
--- /dev/null
+++ b/interface/web/tools/lib/lang/id_import_vpopmail.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['head_txt'] = 'Import email configuration from Vpopmail';
+$wb['legend_txt'] = 'Remote database server connection details';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+
+?>
diff --git a/interface/web/tools/lib/lang/id_resync.lng b/interface/web/tools/lib/lang/id_resync.lng
index 59767a134a..cfb7dc1a39 100644
--- a/interface/web/tools/lib/lang/id_resync.lng
+++ b/interface/web/tools/lib/lang/id_resync.lng
@@ -42,8 +42,8 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
 $wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
-$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
-$wb["do_mailget_txt"] = "Resynced Fetchmail";
-$wb["resync_mailget_txt"] = "Fetchmail";
+$wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
+$wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
+$wb['do_mailget_txt'] = 'Resynced Fetchmail';
+$wb['resync_mailget_txt'] = 'Fetchmail';
 ?>
diff --git a/interface/web/tools/lib/lang/it_import_vpopmail.lng b/interface/web/tools/lib/lang/it_import_vpopmail.lng
new file mode 100644
index 0000000000..1e4dd281f7
--- /dev/null
+++ b/interface/web/tools/lib/lang/it_import_vpopmail.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['head_txt'] = 'Import email configuration from Vpopmail';
+$wb['legend_txt'] = 'Remote database server connection details';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+
+?>
diff --git a/interface/web/tools/lib/lang/it_resync.lng b/interface/web/tools/lib/lang/it_resync.lng
index 59767a134a..cfb7dc1a39 100644
--- a/interface/web/tools/lib/lang/it_resync.lng
+++ b/interface/web/tools/lib/lang/it_resync.lng
@@ -42,8 +42,8 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
 $wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
-$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
-$wb["do_mailget_txt"] = "Resynced Fetchmail";
-$wb["resync_mailget_txt"] = "Fetchmail";
+$wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
+$wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
+$wb['do_mailget_txt'] = 'Resynced Fetchmail';
+$wb['resync_mailget_txt'] = 'Fetchmail';
 ?>
diff --git a/interface/web/tools/lib/lang/ja_import_vpopmail.lng b/interface/web/tools/lib/lang/ja_import_vpopmail.lng
new file mode 100644
index 0000000000..1e4dd281f7
--- /dev/null
+++ b/interface/web/tools/lib/lang/ja_import_vpopmail.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['head_txt'] = 'Import email configuration from Vpopmail';
+$wb['legend_txt'] = 'Remote database server connection details';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+
+?>
diff --git a/interface/web/tools/lib/lang/ja_resync.lng b/interface/web/tools/lib/lang/ja_resync.lng
index 59767a134a..cfb7dc1a39 100644
--- a/interface/web/tools/lib/lang/ja_resync.lng
+++ b/interface/web/tools/lib/lang/ja_resync.lng
@@ -42,8 +42,8 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
 $wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
-$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
-$wb["do_mailget_txt"] = "Resynced Fetchmail";
-$wb["resync_mailget_txt"] = "Fetchmail";
+$wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
+$wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
+$wb['do_mailget_txt'] = 'Resynced Fetchmail';
+$wb['resync_mailget_txt'] = 'Fetchmail';
 ?>
diff --git a/interface/web/tools/lib/lang/nl_import_vpopmail.lng b/interface/web/tools/lib/lang/nl_import_vpopmail.lng
new file mode 100644
index 0000000000..1e4dd281f7
--- /dev/null
+++ b/interface/web/tools/lib/lang/nl_import_vpopmail.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['head_txt'] = 'Import email configuration from Vpopmail';
+$wb['legend_txt'] = 'Remote database server connection details';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+
+?>
diff --git a/interface/web/tools/lib/lang/nl_resync.lng b/interface/web/tools/lib/lang/nl_resync.lng
index 59767a134a..cfb7dc1a39 100644
--- a/interface/web/tools/lib/lang/nl_resync.lng
+++ b/interface/web/tools/lib/lang/nl_resync.lng
@@ -42,8 +42,8 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
 $wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
-$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
-$wb["do_mailget_txt"] = "Resynced Fetchmail";
-$wb["resync_mailget_txt"] = "Fetchmail";
+$wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
+$wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
+$wb['do_mailget_txt'] = 'Resynced Fetchmail';
+$wb['resync_mailget_txt'] = 'Fetchmail';
 ?>
diff --git a/interface/web/tools/lib/lang/pl_import_vpopmail.lng b/interface/web/tools/lib/lang/pl_import_vpopmail.lng
new file mode 100644
index 0000000000..1e4dd281f7
--- /dev/null
+++ b/interface/web/tools/lib/lang/pl_import_vpopmail.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['head_txt'] = 'Import email configuration from Vpopmail';
+$wb['legend_txt'] = 'Remote database server connection details';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+
+?>
diff --git a/interface/web/tools/lib/lang/pl_resync.lng b/interface/web/tools/lib/lang/pl_resync.lng
index 59767a134a..cfb7dc1a39 100644
--- a/interface/web/tools/lib/lang/pl_resync.lng
+++ b/interface/web/tools/lib/lang/pl_resync.lng
@@ -42,8 +42,8 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
 $wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
-$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
-$wb["do_mailget_txt"] = "Resynced Fetchmail";
-$wb["resync_mailget_txt"] = "Fetchmail";
+$wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
+$wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
+$wb['do_mailget_txt'] = 'Resynced Fetchmail';
+$wb['resync_mailget_txt'] = 'Fetchmail';
 ?>
diff --git a/interface/web/tools/lib/lang/pt_import_vpopmail.lng b/interface/web/tools/lib/lang/pt_import_vpopmail.lng
new file mode 100644
index 0000000000..1e4dd281f7
--- /dev/null
+++ b/interface/web/tools/lib/lang/pt_import_vpopmail.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['head_txt'] = 'Import email configuration from Vpopmail';
+$wb['legend_txt'] = 'Remote database server connection details';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+
+?>
diff --git a/interface/web/tools/lib/lang/pt_resync.lng b/interface/web/tools/lib/lang/pt_resync.lng
index 59767a134a..cfb7dc1a39 100644
--- a/interface/web/tools/lib/lang/pt_resync.lng
+++ b/interface/web/tools/lib/lang/pt_resync.lng
@@ -42,8 +42,8 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
 $wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
-$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
-$wb["do_mailget_txt"] = "Resynced Fetchmail";
-$wb["resync_mailget_txt"] = "Fetchmail";
+$wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
+$wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
+$wb['do_mailget_txt'] = 'Resynced Fetchmail';
+$wb['resync_mailget_txt'] = 'Fetchmail';
 ?>
diff --git a/interface/web/tools/lib/lang/ro_import_vpopmail.lng b/interface/web/tools/lib/lang/ro_import_vpopmail.lng
new file mode 100644
index 0000000000..66fe56da1c
--- /dev/null
+++ b/interface/web/tools/lib/lang/ro_import_vpopmail.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['head_txt'] = 'Import email configuration from Vpopmail';
+$wb['legend_txt'] = 'Remote database server connection details';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+?>
diff --git a/interface/web/tools/lib/lang/ro_resync.lng b/interface/web/tools/lib/lang/ro_resync.lng
index 59767a134a..cfb7dc1a39 100644
--- a/interface/web/tools/lib/lang/ro_resync.lng
+++ b/interface/web/tools/lib/lang/ro_resync.lng
@@ -42,8 +42,8 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
 $wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
-$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
-$wb["do_mailget_txt"] = "Resynced Fetchmail";
-$wb["resync_mailget_txt"] = "Fetchmail";
+$wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
+$wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
+$wb['do_mailget_txt'] = 'Resynced Fetchmail';
+$wb['resync_mailget_txt'] = 'Fetchmail';
 ?>
diff --git a/interface/web/tools/lib/lang/ru_import_vpopmail.lng b/interface/web/tools/lib/lang/ru_import_vpopmail.lng
new file mode 100644
index 0000000000..1e4dd281f7
--- /dev/null
+++ b/interface/web/tools/lib/lang/ru_import_vpopmail.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['head_txt'] = 'Import email configuration from Vpopmail';
+$wb['legend_txt'] = 'Remote database server connection details';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+
+?>
diff --git a/interface/web/tools/lib/lang/ru_resync.lng b/interface/web/tools/lib/lang/ru_resync.lng
index 59767a134a..cfb7dc1a39 100644
--- a/interface/web/tools/lib/lang/ru_resync.lng
+++ b/interface/web/tools/lib/lang/ru_resync.lng
@@ -42,8 +42,8 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
 $wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
-$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
-$wb["do_mailget_txt"] = "Resynced Fetchmail";
-$wb["resync_mailget_txt"] = "Fetchmail";
+$wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
+$wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
+$wb['do_mailget_txt'] = 'Resynced Fetchmail';
+$wb['resync_mailget_txt'] = 'Fetchmail';
 ?>
diff --git a/interface/web/tools/lib/lang/se_import_vpopmail.lng b/interface/web/tools/lib/lang/se_import_vpopmail.lng
new file mode 100644
index 0000000000..1e4dd281f7
--- /dev/null
+++ b/interface/web/tools/lib/lang/se_import_vpopmail.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['head_txt'] = 'Import email configuration from Vpopmail';
+$wb['legend_txt'] = 'Remote database server connection details';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+
+?>
diff --git a/interface/web/tools/lib/lang/se_resync.lng b/interface/web/tools/lib/lang/se_resync.lng
index 59767a134a..cfb7dc1a39 100644
--- a/interface/web/tools/lib/lang/se_resync.lng
+++ b/interface/web/tools/lib/lang/se_resync.lng
@@ -42,8 +42,8 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
 $wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
-$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
-$wb["do_mailget_txt"] = "Resynced Fetchmail";
-$wb["resync_mailget_txt"] = "Fetchmail";
+$wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
+$wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
+$wb['do_mailget_txt'] = 'Resynced Fetchmail';
+$wb['resync_mailget_txt'] = 'Fetchmail';
 ?>
diff --git a/interface/web/tools/lib/lang/sk_import_vpopmail.lng b/interface/web/tools/lib/lang/sk_import_vpopmail.lng
new file mode 100644
index 0000000000..1e4dd281f7
--- /dev/null
+++ b/interface/web/tools/lib/lang/sk_import_vpopmail.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['head_txt'] = 'Import email configuration from Vpopmail';
+$wb['legend_txt'] = 'Remote database server connection details';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+
+?>
diff --git a/interface/web/tools/lib/lang/sk_resync.lng b/interface/web/tools/lib/lang/sk_resync.lng
index 59767a134a..cfb7dc1a39 100644
--- a/interface/web/tools/lib/lang/sk_resync.lng
+++ b/interface/web/tools/lib/lang/sk_resync.lng
@@ -42,8 +42,8 @@ $wb['do_clients_txt'] = 'Resynced clients and reseller';
 $wb['no_results_txt'] = 'Nothing found';
 $wb['btn_start_txt'] = 'Start';
 $wb['btn_cancel_txt'] = 'Cancel';
-$wb["do_mail_spamfilter_policy_txt"] = "Resynced Spamfilter Policies";
-$wb["do_mail_spamfilter_txt"] = "Resynced Spamfilter";
-$wb["do_mailget_txt"] = "Resynced Fetchmail";
-$wb["resync_mailget_txt"] = "Fetchmail";
+$wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
+$wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
+$wb['do_mailget_txt'] = 'Resynced Fetchmail';
+$wb['resync_mailget_txt'] = 'Fetchmail';
 ?>
diff --git a/interface/web/tools/lib/lang/tr_import_ispconfig.lng b/interface/web/tools/lib/lang/tr_import_ispconfig.lng
index 2be5b60a19..7aec6bd470 100644
--- a/interface/web/tools/lib/lang/tr_import_ispconfig.lng
+++ b/interface/web/tools/lib/lang/tr_import_ispconfig.lng
@@ -20,5 +20,4 @@ $wb['import_alias_txt'] = 'Takma e-postayı al';
 $wb['import_forward_txt'] = 'Yönlendirmeyi al';
 $wb['import_user_filter_txt'] = 'Kullanıcı süzgecini al';
 $wb['import_spamfilter_txt'] = 'Önemsiz posta süzgecini al';
-
 ?>
diff --git a/interface/web/tools/lib/lang/tr_import_vpopmail.lng b/interface/web/tools/lib/lang/tr_import_vpopmail.lng
new file mode 100644
index 0000000000..1e4dd281f7
--- /dev/null
+++ b/interface/web/tools/lib/lang/tr_import_vpopmail.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['head_txt'] = 'Import email configuration from Vpopmail';
+$wb['legend_txt'] = 'Remote database server connection details';
+$wb['btn_start_txt'] = 'Start Import';
+$wb['btn_connect_txt'] = 'Connect to remote server';
+$wb['btn_cancel_txt'] = 'Cancel';
+
+?>
diff --git a/interface/web/tools/lib/lang/tr_resync.lng b/interface/web/tools/lib/lang/tr_resync.lng
index 028a2fcc11..ea7b2c0f34 100644
--- a/interface/web/tools/lib/lang/tr_resync.lng
+++ b/interface/web/tools/lib/lang/tr_resync.lng
@@ -1,5 +1,4 @@
 <?php
-
 $wb['head_txt'] = 'Eşleştirme Aracı';
 $wb['legend_txt'] = 'Eşleştirme';
 $wb['resync_sites_txt'] = 'Web siteleri eşleştirilsin';
@@ -12,4 +11,39 @@ $wb['resync_dns_txt'] = 'DNS kayıtları eşleştirilsin';
 $wb['resync_client_txt'] = 'Müşteri kayıtları eşleştirilsin';
 $wb['btn_start_txt'] = 'Eşleştir';
 $wb['btn_cancel_txt'] = 'Geri';
+$wb['resync_all_txt'] = 'All services';
+$wb['resync_webdav_txt'] = 'WebDAV-Users';
+$wb['resync_mail_txt'] = 'Maildomains';
+$wb['resync_mailfilter_txt'] = 'Mailfilter';
+$wb['resync_mailinglist_txt'] = 'Mailinglist';
+$wb['resync_vserver_txt'] = 'vServer';
+$wb['all_active_txt'] = 'All active server';
+$wb['all_active_mail_txt'] = 'All active Mail-Server';
+$wb['all_active_web_txt'] = 'All active Web-Server';
+$wb['all_active_dns_txt'] = 'All active DNS-Server';
+$wb['all_active_file_txt'] = 'All active File-Server';
+$wb['all_active_db_txt'] = 'All active Database-Server';
+$wb['all_active_vserver_txt'] = 'All active vServer';
+$wb['do_sites_txt'] = 'Resynced Website';
+$wb['do_ftp_txt'] = 'Resynced FTP user';
+$wb['do_webdav_txt'] = 'Resynced WebDav user';
+$wb['do_shell_txt'] = 'Resynced Shell user';
+$wb['do_cron_txt'] = 'Resynced Cronjob';
+$wb['do_db_user_txt'] = 'Resynced Database User';
+$wb['do_db_txt'] = 'Resynced Database';
+$wb['do_mail_txt'] = 'Resynced Maildomain';
+$wb['do_mailbox_txt'] = 'Resynced Mailbox';
+$wb['do_mail_alias_txt'] = 'Resynced Alias';
+$wb['do_mail_access_txt'] = 'Resynced Mail access';
+$wb['do_mail_contentfilter_txt'] = 'Resynced Content Filter';
+$wb['do_mail_userfilter_txt'] = 'Resynced Mail User Filter';
+$wb['do_mailinglist_txt'] = 'Resynced Mailinglist';
+$wb['do_dns_txt'] = 'Resynced DNS zone';
+$wb['do_vserver_txt'] = 'Resynced vServer';
+$wb['do_clients_txt'] = 'Resynced clients and reseller';
+$wb['no_results_txt'] = 'Nothing found';
+$wb['do_mail_spamfilter_policy_txt'] = 'Resynced Spamfilter Policies';
+$wb['do_mail_spamfilter_txt'] = 'Resynced Spamfilter';
+$wb['do_mailget_txt'] = 'Resynced Fetchmail';
+$wb['resync_mailget_txt'] = 'Fetchmail';
 ?>
diff --git a/interface/web/tools/lib/lang/tr_usersettings.lng b/interface/web/tools/lib/lang/tr_usersettings.lng
index fa1c313128..ce7770c8fd 100644
--- a/interface/web/tools/lib/lang/tr_usersettings.lng
+++ b/interface/web/tools/lib/lang/tr_usersettings.lng
@@ -10,4 +10,3 @@ $wb['repeat_password_txt'] = 'Parola Onayı';
 $wb['password_mismatch_txt'] = 'Parola ile onayı aynı değil.';
 $wb['password_match_txt'] = 'Parola ile onayı aynı.';
 ?>
-
diff --git a/interface/web/vm/lib/lang/ar_openvz_template.lng b/interface/web/vm/lib/lang/ar_openvz_template.lng
index 27dfbbb7b5..4c098565a3 100644
--- a/interface/web/vm/lib/lang/ar_openvz_template.lng
+++ b/interface/web/vm/lib/lang/ar_openvz_template.lng
@@ -91,7 +91,7 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["custom_error"] = "Not allowed in Custom settings: ";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['custom_error'] = 'Not allowed in Custom settings: ';
 ?>
diff --git a/interface/web/vm/lib/lang/ar_openvz_vm.lng b/interface/web/vm/lib/lang/ar_openvz_vm.lng
index 2029d96238..3094f0aa8d 100644
--- a/interface/web/vm/lib/lang/ar_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/ar_openvz_vm.lng
@@ -38,8 +38,8 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
 $wb['Virtual server'] = 'Virtual server';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["bootorder_txt"] = "Boot order priority";
-$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['bootorder_txt'] = 'Boot order priority';
+$wb['bootorder_error_notpositive'] = 'Only positive integers are allowed for Boot order priority';
 ?>
diff --git a/interface/web/vm/lib/lang/bg_openvz_template.lng b/interface/web/vm/lib/lang/bg_openvz_template.lng
index 27dfbbb7b5..4c098565a3 100644
--- a/interface/web/vm/lib/lang/bg_openvz_template.lng
+++ b/interface/web/vm/lib/lang/bg_openvz_template.lng
@@ -91,7 +91,7 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["custom_error"] = "Not allowed in Custom settings: ";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['custom_error'] = 'Not allowed in Custom settings: ';
 ?>
diff --git a/interface/web/vm/lib/lang/bg_openvz_vm.lng b/interface/web/vm/lib/lang/bg_openvz_vm.lng
index 2029d96238..3094f0aa8d 100644
--- a/interface/web/vm/lib/lang/bg_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/bg_openvz_vm.lng
@@ -38,8 +38,8 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
 $wb['Virtual server'] = 'Virtual server';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["bootorder_txt"] = "Boot order priority";
-$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['bootorder_txt'] = 'Boot order priority';
+$wb['bootorder_error_notpositive'] = 'Only positive integers are allowed for Boot order priority';
 ?>
diff --git a/interface/web/vm/lib/lang/br_openvz_template.lng b/interface/web/vm/lib/lang/br_openvz_template.lng
index 27dfbbb7b5..4c098565a3 100644
--- a/interface/web/vm/lib/lang/br_openvz_template.lng
+++ b/interface/web/vm/lib/lang/br_openvz_template.lng
@@ -91,7 +91,7 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["custom_error"] = "Not allowed in Custom settings: ";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['custom_error'] = 'Not allowed in Custom settings: ';
 ?>
diff --git a/interface/web/vm/lib/lang/br_openvz_vm.lng b/interface/web/vm/lib/lang/br_openvz_vm.lng
index 2029d96238..3094f0aa8d 100644
--- a/interface/web/vm/lib/lang/br_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/br_openvz_vm.lng
@@ -38,8 +38,8 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
 $wb['Virtual server'] = 'Virtual server';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["bootorder_txt"] = "Boot order priority";
-$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['bootorder_txt'] = 'Boot order priority';
+$wb['bootorder_error_notpositive'] = 'Only positive integers are allowed for Boot order priority';
 ?>
diff --git a/interface/web/vm/lib/lang/ca.lng b/interface/web/vm/lib/lang/ca.lng
new file mode 100644
index 0000000000..12ed30c07e
--- /dev/null
+++ b/interface/web/vm/lib/lang/ca.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['Virtual Servers'] = 'Serveurs virtuels';
+$wb['OS Templates'] = 'Modèles de système d\'exploitation';
+$wb['VM Templates'] = 'Modèles de machine virtuelle';
+$wb['IP addresses'] = 'Adresses IP';
+$wb['OpenVZ'] = 'OpenVZ';
+?>
diff --git a/interface/web/vm/lib/lang/ca_openvz_action.lng b/interface/web/vm/lib/lang/ca_openvz_action.lng
new file mode 100644
index 0000000000..22b6b07d2f
--- /dev/null
+++ b/interface/web/vm/lib/lang/ca_openvz_action.lng
@@ -0,0 +1,16 @@
+<?php
+$wb['head_txt'] = 'Serveur virtuel actions pour la VM :';
+$wb['start_txt'] = 'Démarrer le serveur virtuel';
+$wb['stop_txt'] = 'Arrêter le serveur virtuel';
+$wb['restart_txt'] = 'Redémarrer le serveur virtuel';
+$wb['ostemplate_txt'] = 'Créer un modèle OS (OSTemplate)';
+$wb['ostemplate_desc_txt'] = '(exemple: debian-6.0-i386-custom)';
+$wb['btn_save_txt'] = 'Lancer l\'action sélectionnée';
+$wb['btn_cancel_txt'] = 'Annuler';
+$wb['start_exec_txt'] = 'La commande de démarrage a été envoyée au serveur hôte de la machine virtuelle. Cela peut prendre 1 minute avant que la VM ne démarre.';
+$wb['stop_exec_txt'] = 'La commande d\'arrêt a été envoyée au serveur hôte de la machine virtuelle. Cela peut prendre 1 minute avant que la VM ne s\'arrête.';
+$wb['restart_exec_txt'] = 'La commande de redémarrage a été envoyée au serveur hôte de la machine virtuelle. Cela peut prendre 1 minute avant que la VM ne redémarre.';
+$wb['ostemplate_name_error'] = 'Le nom de modèle OS (OSTemplate) contient des caractères interdits.';
+$wb['ostemplate_name_unique_error'] = 'Un modèle OS (OSTemplate) avec ce nom existe déjà.';
+$wb['ostemplate_exec_txt'] = 'La commande pour créer un modèle OS (OSTemplate) a été envoyée au serveur hôte. Cela peut prendre 1 minutes avant que le modèle OS (OSTemplate) ne soit créé.';
+?>
diff --git a/interface/web/vm/lib/lang/ca_openvz_ip.lng b/interface/web/vm/lib/lang/ca_openvz_ip.lng
new file mode 100644
index 0000000000..9aa6f97ea7
--- /dev/null
+++ b/interface/web/vm/lib/lang/ca_openvz_ip.lng
@@ -0,0 +1,9 @@
+<?php
+$wb['server_id_txt'] = 'Hostserver';
+$wb['ip_address_txt'] = 'Adresse IP';
+$wb['vm_id_txt'] = 'Serveur virtuel';
+$wb['reserved_txt'] = 'Reservé';
+$wb['ip_error_wrong'] = 'Renseignez une adresse IPv4 valide.';
+$wb['ip_error_unique'] = 'L\'adresse IP existe déjà.';
+$wb['IP address'] = 'Adresse IP';
+?>
diff --git a/interface/web/vm/lib/lang/ca_openvz_ip_list.lng b/interface/web/vm/lib/lang/ca_openvz_ip_list.lng
new file mode 100644
index 0000000000..4f1d3706b7
--- /dev/null
+++ b/interface/web/vm/lib/lang/ca_openvz_ip_list.lng
@@ -0,0 +1,7 @@
+<?php
+$wb['list_head_txt'] = 'Adresses IP OpenVZ';
+$wb['server_id_txt'] = 'Serveur';
+$wb['ip_address_txt'] = 'Adresse IP';
+$wb['reserved_txt'] = 'Reservé';
+$wb['vm_id_txt'] = 'VM';
+?>
diff --git a/interface/web/vm/lib/lang/ca_openvz_ostemplate.lng b/interface/web/vm/lib/lang/ca_openvz_ostemplate.lng
new file mode 100644
index 0000000000..ba9193da2f
--- /dev/null
+++ b/interface/web/vm/lib/lang/ca_openvz_ostemplate.lng
@@ -0,0 +1,11 @@
+<?php
+$wb['template_name_txt'] = 'Nom du modèle';
+$wb['template_file_txt'] = 'Nom de fichier modèle';
+$wb['server_id_txt'] = 'Serveur';
+$wb['allservers_txt'] = 'Existe sur tous les serveurs';
+$wb['active_txt'] = 'Actif';
+$wb['description_txt'] = 'Description';
+$wb['template_name_error_empty'] = 'Le modèle est vide.';
+$wb['template_file_error_empty'] = 'Le nom de fichier modèle est vide.';
+$wb['Template'] = 'Modèle';
+?>
diff --git a/interface/web/vm/lib/lang/ca_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/ca_openvz_ostemplate_list.lng
new file mode 100644
index 0000000000..377713cb9a
--- /dev/null
+++ b/interface/web/vm/lib/lang/ca_openvz_ostemplate_list.lng
@@ -0,0 +1,8 @@
+<?php
+$wb['list_head_txt'] = 'OpenVZ OSTemplate';
+$wb['active_txt'] = 'Actif';
+$wb['template_name_txt'] = 'Nom du modèle';
+$wb['server_id_txt'] = 'Serveur';
+$wb['allservers_txt'] = 'Existe sur tous les serveurs';
+$wb['ostemplate_id_txt'] = 'ID';
+?>
diff --git a/interface/web/vm/lib/lang/ca_openvz_template.lng b/interface/web/vm/lib/lang/ca_openvz_template.lng
new file mode 100644
index 0000000000..f46b001bdf
--- /dev/null
+++ b/interface/web/vm/lib/lang/ca_openvz_template.lng
@@ -0,0 +1,97 @@
+<?php
+$wb['numproc_txt'] = 'Numproc';
+$wb['numtcpsock_txt'] = 'Numtcpsock';
+$wb['numothersock_txt'] = 'Numothersock';
+$wb['vmguarpages_txt'] = 'Vmguarpages';
+$wb['kmemsize_txt'] = 'Kmemsize';
+$wb['tcpsndbuf_txt'] = 'Tcpsndbuf';
+$wb['tcprcvbuf_txt'] = 'Tcprcvbuf';
+$wb['othersockbuf_txt'] = 'Othersockbuf';
+$wb['dgramrcvbuf_txt'] = 'Dgramrcvbuf';
+$wb['oomguarpages_txt'] = 'Oomguarpages';
+$wb['privvmpages_txt'] = 'Privvmpages';
+$wb['lockedpages_txt'] = 'Lockedpages';
+$wb['shmpages_txt'] = 'Shmpages';
+$wb['physpages_txt'] = 'Physpages';
+$wb['numfile_txt'] = 'Numfile';
+$wb['avnumproc_txt'] = 'Avnumproc';
+$wb['numflock_txt'] = 'Numflock';
+$wb['numpty_txt'] = 'Numpty';
+$wb['numsiginfo_txt'] = 'Numsiginfo';
+$wb['dcachesize_txt'] = 'Dcachesize';
+$wb['numiptent_txt'] = 'Numiptent';
+$wb['swappages_txt'] = 'Swappages';
+$wb['hostname_txt'] = 'Nom de domaine';
+$wb['nameserver_txt'] = 'Nameserver(s)';
+$wb['nameserver_desc_txt'] = '(séparés par des espaces)';
+$wb['capability_txt'] = 'Capacité';
+$wb['template_name_txt'] = 'Nom du modèle';
+$wb['diskspace_txt'] = 'Espace disque';
+$wb['ram_txt'] = 'RAM (garantie)';
+$wb['ram_burst_txt'] = 'RAM (burst)';
+$wb['cpu_units_txt'] = 'Nombre de CPU';
+$wb['cpu_num_txt'] = 'Coeurs CPU';
+$wb['cpu_limit_txt'] = 'Limite CPU en %';
+$wb['io_priority_txt'] = 'I/O priorité';
+$wb['active_txt'] = 'Actif';
+$wb['description_txt'] = 'Description';
+$wb['numproc_desc_txt'] = 'Nombre de process et de threads.';
+$wb['numtcpsock_desc_txt'] = 'Nombre de sockets TCP.';
+$wb['numothersock_desc_txt'] = 'Nombre de sockets autres que TCP.';
+$wb['vmguarpages_desc_txt'] = 'Allocation de la mémoire garantie, en pages.';
+$wb['kmemsize_desc_txt'] = 'Taille de la mémoire du noyau non swappable, allouée pour les processus dans ce conteneur.';
+$wb['tcpsndbuf_desc_txt'] = 'Taille totale des tampons d\'envois TCP.';
+$wb['tcprcvbuf_desc_txt'] = 'Taille totale des tampons de réceptions TCP.';
+$wb['othersockbuf_desc_txt'] = 'Taille totale de tampons sockets UNIX-domain, UDP et autres protocoles tampons d\'envois datagram.';
+$wb['dgramrcvbuf_desc_txt'] = 'Tampons de réceptions UDP et autres protocoles datagram.';
+$wb['oomguarpages_desc_txt'] = 'La quantité de mémoire garantie dans la cas ou la mémoire est saturée (suppression de l\'excédent de mémoire garantie), en pages.';
+$wb['privvmpages_desc_txt'] = 'Allocation mémoire limite, en pages.';
+$wb['lockedpages_desc_txt'] = 'Les process de pages ne sont pas autorisés au swap (pages vérouillées par mlock(2)).';
+$wb['shmpages_desc_txt'] = 'Taille totale de la mémoire partagée (IPC, mappings anonymes partagés et objets TMPFS), en pages.';
+$wb['physpages_desc_txt'] = 'Taille totale de la RAM utilisée par les process.';
+$wb['numfile_desc_txt'] = 'Nombre de fichiers ouverts.';
+$wb['numflock_desc_txt'] = 'Nombre de fichiers vérouillés.';
+$wb['numpty_desc_txt'] = 'Nombre de pseudo-terminals.';
+$wb['numsiginfo_desc_txt'] = 'Nombre de structures siginfo.';
+$wb['dcachesize_desc_txt'] = 'Taille totale de dentry et structures inode vérouillés en mémoire.';
+$wb['numiptent_desc_txt'] = 'Nombre d\'entrées NETFILTER (IP packet filtering).';
+$wb['swappages_desc_txt'] = 'Quantité d\'espace de swap à afficher dans le conteneur.';
+$wb['create_dns_txt'] = 'Créer un DNS pour le nom de domaine.';
+$wb['template_name_error_empty'] = 'Le nom de modèle est vide.';
+$wb['diskspace_error_empty'] = 'L\'espace disque est vide.';
+$wb['ram_error_empty'] = 'RAM (garantie) est vide.';
+$wb['ram_burst_error_empty'] = 'RAM (burst) est vide.';
+$wb['cpu_units_error_empty'] = 'Le nombre de CPU est vide.';
+$wb['cpu_num_error_empty'] = 'Le nombre de coeursCPU est vide.';
+$wb['cpu_limit_error_empty'] = 'La limite de CPU en % est vide.';
+$wb['io_priority_error_empty'] = 'La priorité I/O est vide.';
+$wb['template_nameserver_error_empty'] = 'Nameserver(s) est vide.';
+$wb['numproc_error_empty'] = 'Numproc est vide.';
+$wb['numtcpsock_error_empty'] = 'Numtcpsock est vide.';
+$wb['numothersock_error_empty'] = 'Numothersock est vide.';
+$wb['vmguarpages_error_empty'] = 'Vmguarpages est vide.';
+$wb['kmemsize_error_empty'] = 'Kmemsize est vide.';
+$wb['tcpsndbuf_error_empty'] = 'Tcpsndbuf est vide.';
+$wb['tcprcvbuf_error_empty'] = 'Tcprcvbuf est vide.';
+$wb['othersockbuf_error_empty'] = 'Othersockbuf est vide.';
+$wb['dgramrcvbuf_error_empty'] = 'Dgramrcvbuf est vide.';
+$wb['oomguarpages_error_empty'] = 'Oomguarpages est vide.';
+$wb['privvmpages_error_empty'] = 'Privvmpages est vide.';
+$wb['lockedpages_error_empty'] = 'Lockedpages est vide.';
+$wb['shmpages_error_empty'] = 'Shmpages est vide.';
+$wb['physpages_error_empty'] = 'Physpages est vide.';
+$wb['numfile_error_empty'] = 'Numfile est vide.';
+$wb['avnumproc_error_empty'] = 'Avnumproc est vide.';
+$wb['numflock_error_empty'] = 'Numflock est vide.';
+$wb['numpty_error_empty'] = 'Numpty est vide.';
+$wb['numsiginfo_error_empty'] = 'Numsiginfo est vide.';
+$wb['dcachesize_error_empty'] = 'Dcachesize est vide.';
+$wb['numiptent_error_empty'] = 'Numiptent est vide.';
+$wb['swappages_error_empty'] = 'Swappages est vide.';
+$wb['Template'] = 'Modèle';
+$wb['Advanced'] = 'Avancé';
+$wb['features_txt'] = 'Features';
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['custom_error'] = 'Not allowed in Custom settings: ';
+?>
diff --git a/interface/web/vm/lib/lang/ca_openvz_template_list.lng b/interface/web/vm/lib/lang/ca_openvz_template_list.lng
new file mode 100644
index 0000000000..c4ce4edd5f
--- /dev/null
+++ b/interface/web/vm/lib/lang/ca_openvz_template_list.lng
@@ -0,0 +1,5 @@
+<?php
+$wb['list_head_txt'] = 'Modèle de machine virtuelle OpenVZ';
+$wb['active_txt'] = 'Actif';
+$wb['template_name_txt'] = 'Nom du modèle';
+?>
diff --git a/interface/web/vm/lib/lang/ca_openvz_vm.lng b/interface/web/vm/lib/lang/ca_openvz_vm.lng
new file mode 100644
index 0000000000..06710577d9
--- /dev/null
+++ b/interface/web/vm/lib/lang/ca_openvz_vm.lng
@@ -0,0 +1,45 @@
+<?php
+$wb['diskspace_txt'] = 'Espace disque';
+$wb['ram_txt'] = 'RAM (garantie)';
+$wb['ram_burst_txt'] = 'RAM (burst)';
+$wb['cpu_units_txt'] = 'Unités CPU';
+$wb['cpu_num_txt'] = 'Nombre de CPU';
+$wb['cpu_limit_txt'] = 'Limite CPU';
+$wb['io_priority_txt'] = 'Priorités I/O';
+$wb['nameserver_txt'] = 'Nameserver(s)';
+$wb['nameserver_desc_txt'] = '(séparés par un espace)';
+$wb['capability_txt'] = 'Capacité';
+$wb['server_id_txt'] = 'Hostserver';
+$wb['ostemplate_id_txt'] = 'Modèle OS (OSTemplate)';
+$wb['template_id_txt'] = 'Modèle';
+$wb['ip_address_txt'] = 'Adresse IP';
+$wb['hostname_txt'] = 'Hostname';
+$wb['vm_password_txt'] = 'Mot de passe de la VM';
+$wb['start_boot_txt'] = 'Lancer au démarrage';
+$wb['active_txt'] = 'Actif';
+$wb['description_txt'] = 'Description';
+$wb['client_group_id_txt'] = 'Client';
+$wb['veid_txt'] = 'VEID';
+$wb['create_dns_txt'] = 'Créer un DNS pour le nom de domaine';
+$wb['active_until_date_txt'] = 'Actif jusqu\'à';
+$wb['ip_address_error_empty'] = 'L\'addresse IP est vide.';
+$wb['hostname_error_empty'] = 'Hostname est vide.';
+$wb['vm_password_error_empty'] = 'Le mot de passe de la VM est vide.';
+$wb['veid_error_empty'] = 'VEID est vide.';
+$wb['veid_error_unique'] = 'VEID existe déjà.';
+$wb['diskspace_error_empty'] = 'L\'espace disque est vide.';
+$wb['ram_error_empty'] = 'RAM (garantie) est vide.';
+$wb['ram_burst_error_empty'] = 'RAM (burst) est vide.';
+$wb['cpu_units_error_empty'] = 'Unités CPU est vide.';
+$wb['cpu_num_error_empty'] = 'Le nombre de CPU est vide.';
+$wb['cpu_limit_error_empty'] = 'La limite CPU est vide.';
+$wb['io_priority_error_empty'] = 'Les priorités I/O sont vides.';
+$wb['template_nameserver_error_empty'] = 'Nameserver(s) est vide.';
+$wb['Virtual server'] = 'Serveur virtuel';
+$wb['Advanced'] = 'Avancé';
+$wb['features_txt'] = 'Features';
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['bootorder_txt'] = 'Boot order priority';
+$wb['bootorder_error_notpositive'] = 'Only positive integers are allowed for Boot order priority';
+?>
diff --git a/interface/web/vm/lib/lang/ca_openvz_vm_list.lng b/interface/web/vm/lib/lang/ca_openvz_vm_list.lng
new file mode 100644
index 0000000000..9a6f78f581
--- /dev/null
+++ b/interface/web/vm/lib/lang/ca_openvz_vm_list.lng
@@ -0,0 +1,10 @@
+<?php
+$wb['list_head_txt'] = 'Serveur virtuel';
+$wb['active_txt'] = 'Actif';
+$wb['server_id_txt'] = 'Hostserver';
+$wb['ostemplate_id_txt'] = 'Modèle OS (OSTemplate)';
+$wb['template_id_txt'] = 'Modèle';
+$wb['hostname_txt'] = 'Hostname';
+$wb['ip_address_txt'] = 'Adresse IP';
+$wb['veid_txt'] = 'VEID';
+?>
diff --git a/interface/web/vm/lib/lang/cz.lng b/interface/web/vm/lib/lang/cz.lng
index 21224389a8..4167e14a8a 100644
--- a/interface/web/vm/lib/lang/cz.lng
+++ b/interface/web/vm/lib/lang/cz.lng
@@ -5,5 +5,3 @@ $wb['VM Templates'] = 'VM Templates';
 $wb['IP addresses'] = 'IP addresses';
 $wb['OpenVZ'] = 'OpenVZ';
 ?>
-
-
diff --git a/interface/web/vm/lib/lang/cz_openvz_action.lng b/interface/web/vm/lib/lang/cz_openvz_action.lng
index 2930fff65c..3e2e3e0b84 100644
--- a/interface/web/vm/lib/lang/cz_openvz_action.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_action.lng
@@ -14,5 +14,3 @@ $wb['ostemplate_name_error'] = 'The OSTemplate name conatains unallowed characte
 $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/cz_openvz_ip.lng b/interface/web/vm/lib/lang/cz_openvz_ip.lng
index 6afda02718..6016681df8 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ip.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ip.lng
@@ -7,5 +7,3 @@ $wb['ip_error_wrong'] = 'Please fill in a valid IPv4 address.';
 $wb['ip_error_unique'] = 'This IP address does already exist.';
 $wb['IP address'] = 'IP address';
 ?>
-
-
diff --git a/interface/web/vm/lib/lang/cz_openvz_ip_list.lng b/interface/web/vm/lib/lang/cz_openvz_ip_list.lng
index e392e9c970..e6a3a68c2c 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ip_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ip_list.lng
@@ -5,5 +5,3 @@ $wb['ip_address_txt'] = 'IP address';
 $wb['reserved_txt'] = 'Reserved';
 $wb['vm_id_txt'] = 'VM';
 ?>
-
-
diff --git a/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng b/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
index 12f22178d0..72838a20de 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ostemplate.lng
@@ -9,5 +9,3 @@ $wb['template_name_error_empty'] = 'Template name is empty.';
 $wb['template_file_error_empty'] = 'Template filename is empty.';
 $wb['Template'] = 'Šablona';
 ?>
-
-
diff --git a/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
index 264d944d2c..7705a4d18f 100644
--- a/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_ostemplate_list.lng
@@ -6,5 +6,3 @@ $wb['server_id_txt'] = 'Server';
 $wb['allservers_txt'] = 'Exists on all servers';
 $wb['ostemplate_id_txt'] = 'ID';
 ?>
-
-
diff --git a/interface/web/vm/lib/lang/cz_openvz_template.lng b/interface/web/vm/lib/lang/cz_openvz_template.lng
index b5bec9d38a..9273783dcd 100644
--- a/interface/web/vm/lib/lang/cz_openvz_template.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_template.lng
@@ -91,7 +91,7 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Šablona';
 $wb['Advanced'] = 'Pokročilý';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["custom_error"] = "Not allowed in Custom settings: ";
-?>
\ No newline at end of file
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['custom_error'] = 'Not allowed in Custom settings: ';
+?>
diff --git a/interface/web/vm/lib/lang/cz_openvz_template_list.lng b/interface/web/vm/lib/lang/cz_openvz_template_list.lng
index fc3198560b..89c11ef5d1 100644
--- a/interface/web/vm/lib/lang/cz_openvz_template_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_template_list.lng
@@ -3,5 +3,3 @@ $wb['list_head_txt'] = 'OpenVZ Virtual Machine Template';
 $wb['active_txt'] = 'Aktivní';
 $wb['template_name_txt'] = 'Název šablony';
 ?>
-
-
diff --git a/interface/web/vm/lib/lang/cz_openvz_vm.lng b/interface/web/vm/lib/lang/cz_openvz_vm.lng
index 4884685a72..dd730dea83 100644
--- a/interface/web/vm/lib/lang/cz_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_vm.lng
@@ -38,10 +38,8 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
 $wb['Virtual server'] = 'Virtual server';
 $wb['Advanced'] = 'Pokročilý';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["bootorder_txt"] = "Boot order priority";
-$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['bootorder_txt'] = 'Boot order priority';
+$wb['bootorder_error_notpositive'] = 'Only positive integers are allowed for Boot order priority';
 ?>
-
-
diff --git a/interface/web/vm/lib/lang/cz_openvz_vm_list.lng b/interface/web/vm/lib/lang/cz_openvz_vm_list.lng
index 07b41b0d84..bb52bfea6a 100644
--- a/interface/web/vm/lib/lang/cz_openvz_vm_list.lng
+++ b/interface/web/vm/lib/lang/cz_openvz_vm_list.lng
@@ -8,5 +8,3 @@ $wb['hostname_txt'] = 'Název hostitele';
 $wb['ip_address_txt'] = 'IP address';
 $wb['veid_txt'] = 'VEID';
 ?>
-
-
diff --git a/interface/web/vm/lib/lang/de_openvz_template.lng b/interface/web/vm/lib/lang/de_openvz_template.lng
index 776e14a5e1..66ad4377be 100644
--- a/interface/web/vm/lib/lang/de_openvz_template.lng
+++ b/interface/web/vm/lib/lang/de_openvz_template.lng
@@ -91,7 +91,7 @@ $wb['swappages_error_empty'] = 'Swappages ist leer.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Erweitert';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["custom_error"] = "Not allowed in Custom settings: ";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['custom_error'] = 'Not allowed in Custom settings: ';
 ?>
diff --git a/interface/web/vm/lib/lang/de_openvz_vm.lng b/interface/web/vm/lib/lang/de_openvz_vm.lng
index 52daf3f55d..a5b8d54b20 100644
--- a/interface/web/vm/lib/lang/de_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/de_openvz_vm.lng
@@ -37,8 +37,9 @@ $wb['io_priority_error_empty'] = 'I/O Priorität ist leer.';
 $wb['template_nameserver_error_empty'] = 'Nameserver ist leer.';
 $wb['Virtual server'] = 'Virtueller Server';
 $wb['Advanced'] = 'Erweitert';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["bootorder_txt"] = "Boot order priority";
-$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['bootorder_txt'] = 'Boot order priority';
+$wb['bootorder_error_notpositive'] = 'Only positive integers are allowed for Boot order priority';
+$wb['features_txt'] = 'Features';
 ?>
diff --git a/interface/web/vm/lib/lang/el_openvz_template.lng b/interface/web/vm/lib/lang/el_openvz_template.lng
index 75b2d7f2f1..8e2a673de2 100644
--- a/interface/web/vm/lib/lang/el_openvz_template.lng
+++ b/interface/web/vm/lib/lang/el_openvz_template.lng
@@ -91,7 +91,7 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["custom_error"] = "Not allowed in Custom settings: ";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['custom_error'] = 'Not allowed in Custom settings: ';
 ?>
diff --git a/interface/web/vm/lib/lang/el_openvz_vm.lng b/interface/web/vm/lib/lang/el_openvz_vm.lng
index d22124530b..2a41388347 100644
--- a/interface/web/vm/lib/lang/el_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/el_openvz_vm.lng
@@ -38,8 +38,8 @@ $wb['template_nameserver_error_empty'] = 'Το Nameserver(s) είναι κενό
 $wb['Virtual server'] = 'Εικονικός server';
 $wb['Advanced'] = 'Για προχωρημένους';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["bootorder_txt"] = "Boot order priority";
-$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['bootorder_txt'] = 'Boot order priority';
+$wb['bootorder_error_notpositive'] = 'Only positive integers are allowed for Boot order priority';
 ?>
diff --git a/interface/web/vm/lib/lang/es_openvz_template.lng b/interface/web/vm/lib/lang/es_openvz_template.lng
index df715b1946..1abd562ed5 100644
--- a/interface/web/vm/lib/lang/es_openvz_template.lng
+++ b/interface/web/vm/lib/lang/es_openvz_template.lng
@@ -44,7 +44,7 @@ $wb['tcpsndbuf_desc_txt'] = 'Tamaño total de los buffers de envío TCP.';
 $wb['tcprcvbuf_desc_txt'] = 'Tamaño total de los buffers de recepción TCP.';
 $wb['othersockbuf_desc_txt'] = 'Tamaño total de buffers de socket UNIX-domain, UDP y otros protocolos de envío para buffers de datagramas.';
 $wb['dgramrcvbuf_desc_txt'] = 'Recibir buffers de UDP y otros protocolos de datagrama.';
-$wb['oomguarpages_desc_txt'] = 'La cantidad de memoria garantizada en caso de que la memoria \"over-booked\" (garantizado para out-of-memory kill), en las páginas.';
+$wb['oomguarpages_desc_txt'] = 'La cantidad de memoria garantizada en caso de que la memoria \\"over-booked\\" (garantizado para out-of-memory kill), en las páginas.';
 $wb['privvmpages_desc_txt'] = 'Límite de asignación de memoria en las páginas.';
 $wb['lockedpages_desc_txt'] = 'Páginas de procesos sin permisos para sacar del swap (páginas bloqueadas por mlock(2)).';
 $wb['shmpages_desc_txt'] = 'Tamaño total de memoria compatida (IPC, asignaciones anónimas compartidas y objetos tmpfs), en las páginas.';
@@ -91,7 +91,7 @@ $wb['swappages_error_empty'] = 'Swappages está vacío.';
 $wb['Template'] = 'Plantilla';
 $wb['Advanced'] = 'Avanzado';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["custom_error"] = "Not allowed in Custom settings: ";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['custom_error'] = 'Not allowed in Custom settings: ';
 ?>
diff --git a/interface/web/vm/lib/lang/es_openvz_vm.lng b/interface/web/vm/lib/lang/es_openvz_vm.lng
index 3dc07338e3..d197d3f572 100644
--- a/interface/web/vm/lib/lang/es_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/es_openvz_vm.lng
@@ -38,8 +38,8 @@ $wb['template_nameserver_error_empty'] = 'Nombre de servidor(es) está vacío.';
 $wb['Virtual server'] = 'Servidor virtual';
 $wb['Advanced'] = 'Avanzado';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["bootorder_txt"] = "Boot order priority";
-$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['bootorder_txt'] = 'Boot order priority';
+$wb['bootorder_error_notpositive'] = 'Only positive integers are allowed for Boot order priority';
 ?>
diff --git a/interface/web/vm/lib/lang/fi_openvz_template.lng b/interface/web/vm/lib/lang/fi_openvz_template.lng
index 27dfbbb7b5..4c098565a3 100644
--- a/interface/web/vm/lib/lang/fi_openvz_template.lng
+++ b/interface/web/vm/lib/lang/fi_openvz_template.lng
@@ -91,7 +91,7 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["custom_error"] = "Not allowed in Custom settings: ";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['custom_error'] = 'Not allowed in Custom settings: ';
 ?>
diff --git a/interface/web/vm/lib/lang/fi_openvz_vm.lng b/interface/web/vm/lib/lang/fi_openvz_vm.lng
index 2029d96238..3094f0aa8d 100644
--- a/interface/web/vm/lib/lang/fi_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/fi_openvz_vm.lng
@@ -38,8 +38,8 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
 $wb['Virtual server'] = 'Virtual server';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["bootorder_txt"] = "Boot order priority";
-$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['bootorder_txt'] = 'Boot order priority';
+$wb['bootorder_error_notpositive'] = 'Only positive integers are allowed for Boot order priority';
 ?>
diff --git a/interface/web/vm/lib/lang/fr.lng b/interface/web/vm/lib/lang/fr.lng
index 12ed30c07e..ade277c2d0 100644
--- a/interface/web/vm/lib/lang/fr.lng
+++ b/interface/web/vm/lib/lang/fr.lng
@@ -1,6 +1,6 @@
 <?php
 $wb['Virtual Servers'] = 'Serveurs virtuels';
-$wb['OS Templates'] = 'Modèles de système d\'exploitation';
+$wb['OS Templates'] = 'Modèles de système d’exploitation';
 $wb['VM Templates'] = 'Modèles de machine virtuelle';
 $wb['IP addresses'] = 'Adresses IP';
 $wb['OpenVZ'] = 'OpenVZ';
diff --git a/interface/web/vm/lib/lang/fr_openvz_action.lng b/interface/web/vm/lib/lang/fr_openvz_action.lng
index 22b6b07d2f..78958fda88 100644
--- a/interface/web/vm/lib/lang/fr_openvz_action.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_action.lng
@@ -1,14 +1,14 @@
 <?php
-$wb['head_txt'] = 'Serveur virtuel actions pour la VM :';
+$wb['head_txt'] = 'Serveur virtuel actions pour la VM :';
 $wb['start_txt'] = 'Démarrer le serveur virtuel';
 $wb['stop_txt'] = 'Arrêter le serveur virtuel';
 $wb['restart_txt'] = 'Redémarrer le serveur virtuel';
 $wb['ostemplate_txt'] = 'Créer un modèle OS (OSTemplate)';
 $wb['ostemplate_desc_txt'] = '(exemple: debian-6.0-i386-custom)';
-$wb['btn_save_txt'] = 'Lancer l\'action sélectionnée';
+$wb['btn_save_txt'] = 'Lancer l’action sélectionnée';
 $wb['btn_cancel_txt'] = 'Annuler';
 $wb['start_exec_txt'] = 'La commande de démarrage a été envoyée au serveur hôte de la machine virtuelle. Cela peut prendre 1 minute avant que la VM ne démarre.';
-$wb['stop_exec_txt'] = 'La commande d\'arrêt a été envoyée au serveur hôte de la machine virtuelle. Cela peut prendre 1 minute avant que la VM ne s\'arrête.';
+$wb['stop_exec_txt'] = 'La commande d’arrêt a été envoyée au serveur hôte de la machine virtuelle. Cela peut prendre 1 minute avant que la VM ne s’arrête.';
 $wb['restart_exec_txt'] = 'La commande de redémarrage a été envoyée au serveur hôte de la machine virtuelle. Cela peut prendre 1 minute avant que la VM ne redémarre.';
 $wb['ostemplate_name_error'] = 'Le nom de modèle OS (OSTemplate) contient des caractères interdits.';
 $wb['ostemplate_name_unique_error'] = 'Un modèle OS (OSTemplate) avec ce nom existe déjà.';
diff --git a/interface/web/vm/lib/lang/fr_openvz_ip.lng b/interface/web/vm/lib/lang/fr_openvz_ip.lng
index 9aa6f97ea7..4be05dafee 100644
--- a/interface/web/vm/lib/lang/fr_openvz_ip.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_ip.lng
@@ -4,6 +4,6 @@ $wb['ip_address_txt'] = 'Adresse IP';
 $wb['vm_id_txt'] = 'Serveur virtuel';
 $wb['reserved_txt'] = 'Reservé';
 $wb['ip_error_wrong'] = 'Renseignez une adresse IPv4 valide.';
-$wb['ip_error_unique'] = 'L\'adresse IP existe déjà.';
+$wb['ip_error_unique'] = 'L’adresse IP existe déjà.';
 $wb['IP address'] = 'Adresse IP';
 ?>
diff --git a/interface/web/vm/lib/lang/fr_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/fr_openvz_ostemplate_list.lng
index 377713cb9a..f84a0b0d3e 100644
--- a/interface/web/vm/lib/lang/fr_openvz_ostemplate_list.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_ostemplate_list.lng
@@ -4,5 +4,5 @@ $wb['active_txt'] = 'Actif';
 $wb['template_name_txt'] = 'Nom du modèle';
 $wb['server_id_txt'] = 'Serveur';
 $wb['allservers_txt'] = 'Existe sur tous les serveurs';
-$wb['ostemplate_id_txt'] = 'ID';
+$wb['ostemplate_id_txt'] = 'Id';
 ?>
diff --git a/interface/web/vm/lib/lang/fr_openvz_template.lng b/interface/web/vm/lib/lang/fr_openvz_template.lng
index c2554a0b76..e86bd1c74e 100644
--- a/interface/web/vm/lib/lang/fr_openvz_template.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_template.lng
@@ -40,11 +40,11 @@ $wb['numtcpsock_desc_txt'] = 'Nombre de sockets TCP.';
 $wb['numothersock_desc_txt'] = 'Nombre de sockets autres que TCP.';
 $wb['vmguarpages_desc_txt'] = 'Allocation de la mémoire garantie, en pages.';
 $wb['kmemsize_desc_txt'] = 'Taille de la mémoire du noyau non swappable, allouée pour les processus dans ce conteneur.';
-$wb['tcpsndbuf_desc_txt'] = 'Taille totale des tampons d\'envois TCP.';
+$wb['tcpsndbuf_desc_txt'] = 'Taille totale des tampons d’envois TCP.';
 $wb['tcprcvbuf_desc_txt'] = 'Taille totale des tampons de réceptions TCP.';
-$wb['othersockbuf_desc_txt'] = 'Taille totale de tampons sockets UNIX-domain, UDP et autres protocoles tampons d\'envois datagram.';
+$wb['othersockbuf_desc_txt'] = 'Taille totale de tampons sockets UNIX-domain, UDP et autres protocoles tampons d’envois datagram.';
 $wb['dgramrcvbuf_desc_txt'] = 'Tampons de réceptions UDP et autres protocoles datagram.';
-$wb['oomguarpages_desc_txt'] = 'La quantité de mémoire garantie dans la cas ou la mémoire est saturée (suppression de l\'excédent de mémoire garantie), en pages.';
+$wb['oomguarpages_desc_txt'] = 'La quantité de mémoire garantie dans la cas ou la mémoire est saturée (suppression de l’excédent de mémoire garantie), en pages.';
 $wb['privvmpages_desc_txt'] = 'Allocation mémoire limite, en pages.';
 $wb['lockedpages_desc_txt'] = 'Les process de pages ne sont pas autorisés au swap (pages vérouillées par mlock(2)).';
 $wb['shmpages_desc_txt'] = 'Taille totale de la mémoire partagée (IPC, mappings anonymes partagés et objets TMPFS), en pages.';
@@ -54,11 +54,11 @@ $wb['numflock_desc_txt'] = 'Nombre de fichiers vérouillés.';
 $wb['numpty_desc_txt'] = 'Nombre de pseudo-terminals.';
 $wb['numsiginfo_desc_txt'] = 'Nombre de structures siginfo.';
 $wb['dcachesize_desc_txt'] = 'Taille totale de dentry et structures inode vérouillés en mémoire.';
-$wb['numiptent_desc_txt'] = 'Nombre d\'entrées NETFILTER (IP packet filtering).';
-$wb['swappages_desc_txt'] = 'Quantité d\'espace de swap à afficher dans le conteneur.';
+$wb['numiptent_desc_txt'] = 'Nombre d’entrées NETFILTER (IP packet filtering).';
+$wb['swappages_desc_txt'] = 'Quantité d’espace de swap à afficher dans le conteneur.';
 $wb['create_dns_txt'] = 'Créer un DNS pour le nom de domaine.';
 $wb['template_name_error_empty'] = 'Le nom de modèle est vide.';
-$wb['diskspace_error_empty'] = 'L\'espace disque est vide.';
+$wb['diskspace_error_empty'] = 'L’espace disque est vide.';
 $wb['ram_error_empty'] = 'RAM (garantie) est vide.';
 $wb['ram_burst_error_empty'] = 'RAM (burst) est vide.';
 $wb['cpu_units_error_empty'] = 'Le nombre de CPU est vide.';
@@ -91,7 +91,7 @@ $wb['swappages_error_empty'] = 'Swappages est vide.';
 $wb['Template'] = 'Modèle';
 $wb['Advanced'] = 'Avancé';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["custom_error"] = "Not allowed in Custom settings: ";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['custom_error'] = 'Not allowed in Custom settings: ';
 ?>
diff --git a/interface/web/vm/lib/lang/fr_openvz_vm.lng b/interface/web/vm/lib/lang/fr_openvz_vm.lng
index cfcf2500d5..32741946cc 100644
--- a/interface/web/vm/lib/lang/fr_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_vm.lng
@@ -19,15 +19,15 @@ $wb['start_boot_txt'] = 'Lancer au démarrage';
 $wb['active_txt'] = 'Actif';
 $wb['description_txt'] = 'Description';
 $wb['client_group_id_txt'] = 'Client';
-$wb['veid_txt'] = 'VEID';
+$wb['veid_txt'] = 'VEId';
 $wb['create_dns_txt'] = 'Créer un DNS pour le nom de domaine';
-$wb['active_until_date_txt'] = 'Actif jusqu\'à';
-$wb['ip_address_error_empty'] = 'L\'addresse IP est vide.';
+$wb['active_until_date_txt'] = 'Actif jusqu’à';
+$wb['ip_address_error_empty'] = 'L’addresse IP est vide.';
 $wb['hostname_error_empty'] = 'Hostname est vide.';
 $wb['vm_password_error_empty'] = 'Le mot de passe de la VM est vide.';
 $wb['veid_error_empty'] = 'VEID est vide.';
 $wb['veid_error_unique'] = 'VEID existe déjà.';
-$wb['diskspace_error_empty'] = 'L\'espace disque est vide.';
+$wb['diskspace_error_empty'] = 'L’espace disque est vide.';
 $wb['ram_error_empty'] = 'RAM (garantie) est vide.';
 $wb['ram_burst_error_empty'] = 'RAM (burst) est vide.';
 $wb['cpu_units_error_empty'] = 'Unités CPU est vide.';
@@ -38,8 +38,8 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) est vide.';
 $wb['Virtual server'] = 'Serveur virtuel';
 $wb['Advanced'] = 'Avancé';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["bootorder_txt"] = "Boot order priority";
-$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['bootorder_txt'] = 'Boot order priority';
+$wb['bootorder_error_notpositive'] = 'Only positive integers are allowed for Boot order priority';
 ?>
diff --git a/interface/web/vm/lib/lang/fr_openvz_vm_list.lng b/interface/web/vm/lib/lang/fr_openvz_vm_list.lng
index 9a6f78f581..287069e3b7 100644
--- a/interface/web/vm/lib/lang/fr_openvz_vm_list.lng
+++ b/interface/web/vm/lib/lang/fr_openvz_vm_list.lng
@@ -6,5 +6,5 @@ $wb['ostemplate_id_txt'] = 'Modèle OS (OSTemplate)';
 $wb['template_id_txt'] = 'Modèle';
 $wb['hostname_txt'] = 'Hostname';
 $wb['ip_address_txt'] = 'Adresse IP';
-$wb['veid_txt'] = 'VEID';
+$wb['veid_txt'] = 'VEId';
 ?>
diff --git a/interface/web/vm/lib/lang/hr.lng b/interface/web/vm/lib/lang/hr.lng
index 5b9bd6acbe..4f5dbe9e60 100644
--- a/interface/web/vm/lib/lang/hr.lng
+++ b/interface/web/vm/lib/lang/hr.lng
@@ -5,5 +5,3 @@ $wb['VM Templates'] = 'VM predlošci';
 $wb['IP addresses'] = 'IP adrese';
 $wb['OpenVZ'] = 'OpenVZ';
 ?>
-
-
diff --git a/interface/web/vm/lib/lang/hr_openvz_action.lng b/interface/web/vm/lib/lang/hr_openvz_action.lng
index 4fddcff9df..d6e5fb4ed6 100644
--- a/interface/web/vm/lib/lang/hr_openvz_action.lng
+++ b/interface/web/vm/lib/lang/hr_openvz_action.lng
@@ -14,5 +14,3 @@ $wb['ostemplate_name_error'] = 'OS predložak sadrži nedozvoljene znakove.';
 $wb['ostemplate_name_unique_error'] = 'Već postoji OS predložak sa tim nazivom.';
 $wb['ostemplate_exec_txt'] = 'Komanda za kreiranje OS predloška je poslana host serveru. Treba pričekati minutu, dvije dok se OS predložak ne kreira';
 ?>
-
-
diff --git a/interface/web/vm/lib/lang/hr_openvz_ip.lng b/interface/web/vm/lib/lang/hr_openvz_ip.lng
index f51f864888..debb04b96f 100644
--- a/interface/web/vm/lib/lang/hr_openvz_ip.lng
+++ b/interface/web/vm/lib/lang/hr_openvz_ip.lng
@@ -7,5 +7,3 @@ $wb['ip_error_wrong'] = 'Unesite ispravnu IPv4 adresu.';
 $wb['ip_error_unique'] = 'Ova IP adresa već postoji.';
 $wb['IP address'] = 'IP adresa';
 ?>
-
-
diff --git a/interface/web/vm/lib/lang/hr_openvz_ip_list.lng b/interface/web/vm/lib/lang/hr_openvz_ip_list.lng
index 025a2e4488..c578fc9976 100644
--- a/interface/web/vm/lib/lang/hr_openvz_ip_list.lng
+++ b/interface/web/vm/lib/lang/hr_openvz_ip_list.lng
@@ -5,5 +5,3 @@ $wb['ip_address_txt'] = 'IP adresa';
 $wb['reserved_txt'] = 'Rezervirano';
 $wb['vm_id_txt'] = 'VM';
 ?>
-
-
diff --git a/interface/web/vm/lib/lang/hr_openvz_ostemplate.lng b/interface/web/vm/lib/lang/hr_openvz_ostemplate.lng
index 5b9162e349..df88ca9f7b 100644
--- a/interface/web/vm/lib/lang/hr_openvz_ostemplate.lng
+++ b/interface/web/vm/lib/lang/hr_openvz_ostemplate.lng
@@ -9,5 +9,3 @@ $wb['template_name_error_empty'] = 'Nije upisan naziv predloška.';
 $wb['template_file_error_empty'] = 'Nije upisan naziv datoteke predloška.';
 $wb['Template'] = 'Predložak';
 ?>
-
-
diff --git a/interface/web/vm/lib/lang/hr_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/hr_openvz_ostemplate_list.lng
index e0226937c8..430d36b929 100644
--- a/interface/web/vm/lib/lang/hr_openvz_ostemplate_list.lng
+++ b/interface/web/vm/lib/lang/hr_openvz_ostemplate_list.lng
@@ -6,5 +6,3 @@ $wb['server_id_txt'] = 'Server';
 $wb['allservers_txt'] = 'Postoji na svim serverima';
 $wb['ostemplate_id_txt'] = 'ID';
 ?>
-
-
diff --git a/interface/web/vm/lib/lang/hr_openvz_template.lng b/interface/web/vm/lib/lang/hr_openvz_template.lng
index 622274bc4d..68fd60e0bc 100644
--- a/interface/web/vm/lib/lang/hr_openvz_template.lng
+++ b/interface/web/vm/lib/lang/hr_openvz_template.lng
@@ -91,7 +91,7 @@ $wb['swappages_error_empty'] = 'Swappages polje je prazno.';
 $wb['Template'] = 'Predložak';
 $wb['Advanced'] = 'Napredno';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["custom_error"] = "Not allowed in Custom settings: ";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['custom_error'] = 'Not allowed in Custom settings: ';
 ?>
diff --git a/interface/web/vm/lib/lang/hr_openvz_template_list.lng b/interface/web/vm/lib/lang/hr_openvz_template_list.lng
index 2c5233905d..f9c8642f1d 100644
--- a/interface/web/vm/lib/lang/hr_openvz_template_list.lng
+++ b/interface/web/vm/lib/lang/hr_openvz_template_list.lng
@@ -3,5 +3,3 @@ $wb['list_head_txt'] = 'OpenVZ VM predložak';
 $wb['active_txt'] = 'Aktivan';
 $wb['template_name_txt'] = 'Ime predloška';
 ?>
-
-
diff --git a/interface/web/vm/lib/lang/hr_openvz_vm.lng b/interface/web/vm/lib/lang/hr_openvz_vm.lng
index c614b2b4b0..e5b9fe14c4 100644
--- a/interface/web/vm/lib/lang/hr_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/hr_openvz_vm.lng
@@ -38,10 +38,8 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(i) polje je prazno.';
 $wb['Virtual server'] = 'Virtualni server';
 $wb['Advanced'] = 'Napredno';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["bootorder_txt"] = "Boot order priority";
-$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['bootorder_txt'] = 'Boot order priority';
+$wb['bootorder_error_notpositive'] = 'Only positive integers are allowed for Boot order priority';
 ?>
-
-
diff --git a/interface/web/vm/lib/lang/hr_openvz_vm_list.lng b/interface/web/vm/lib/lang/hr_openvz_vm_list.lng
index 5fa97806a5..ab3ef52529 100644
--- a/interface/web/vm/lib/lang/hr_openvz_vm_list.lng
+++ b/interface/web/vm/lib/lang/hr_openvz_vm_list.lng
@@ -8,5 +8,3 @@ $wb['hostname_txt'] = 'Ime hosta';
 $wb['ip_address_txt'] = 'IP adresa';
 $wb['veid_txt'] = 'VEID';
 ?>
-
-
diff --git a/interface/web/vm/lib/lang/hu_openvz_template.lng b/interface/web/vm/lib/lang/hu_openvz_template.lng
index 27dfbbb7b5..4c098565a3 100644
--- a/interface/web/vm/lib/lang/hu_openvz_template.lng
+++ b/interface/web/vm/lib/lang/hu_openvz_template.lng
@@ -91,7 +91,7 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["custom_error"] = "Not allowed in Custom settings: ";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['custom_error'] = 'Not allowed in Custom settings: ';
 ?>
diff --git a/interface/web/vm/lib/lang/hu_openvz_vm.lng b/interface/web/vm/lib/lang/hu_openvz_vm.lng
index 2029d96238..3094f0aa8d 100644
--- a/interface/web/vm/lib/lang/hu_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/hu_openvz_vm.lng
@@ -38,8 +38,8 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
 $wb['Virtual server'] = 'Virtual server';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["bootorder_txt"] = "Boot order priority";
-$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['bootorder_txt'] = 'Boot order priority';
+$wb['bootorder_error_notpositive'] = 'Only positive integers are allowed for Boot order priority';
 ?>
diff --git a/interface/web/vm/lib/lang/id_openvz_template.lng b/interface/web/vm/lib/lang/id_openvz_template.lng
index 27dfbbb7b5..4c098565a3 100644
--- a/interface/web/vm/lib/lang/id_openvz_template.lng
+++ b/interface/web/vm/lib/lang/id_openvz_template.lng
@@ -91,7 +91,7 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["custom_error"] = "Not allowed in Custom settings: ";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['custom_error'] = 'Not allowed in Custom settings: ';
 ?>
diff --git a/interface/web/vm/lib/lang/id_openvz_vm.lng b/interface/web/vm/lib/lang/id_openvz_vm.lng
index 2029d96238..3094f0aa8d 100644
--- a/interface/web/vm/lib/lang/id_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/id_openvz_vm.lng
@@ -38,8 +38,8 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
 $wb['Virtual server'] = 'Virtual server';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["bootorder_txt"] = "Boot order priority";
-$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['bootorder_txt'] = 'Boot order priority';
+$wb['bootorder_error_notpositive'] = 'Only positive integers are allowed for Boot order priority';
 ?>
diff --git a/interface/web/vm/lib/lang/it.lng b/interface/web/vm/lib/lang/it.lng
index 4167e14a8a..c59bc303bc 100644
--- a/interface/web/vm/lib/lang/it.lng
+++ b/interface/web/vm/lib/lang/it.lng
@@ -1,7 +1,7 @@
 <?php
-$wb['Virtual Servers'] = 'Virtual Servers';
-$wb['OS Templates'] = 'OS Templates';
+$wb['OS Templates'] = 'Templates SO';
 $wb['VM Templates'] = 'VM Templates';
-$wb['IP addresses'] = 'IP addresses';
+$wb['IP addresses'] = 'Indirizzi IP';
 $wb['OpenVZ'] = 'OpenVZ';
+$wb['Virtual Servers'] = 'Virtual Servers';
 ?>
diff --git a/interface/web/vm/lib/lang/it_openvz_action.lng b/interface/web/vm/lib/lang/it_openvz_action.lng
index 52f7328582..ecbe5eec25 100644
--- a/interface/web/vm/lib/lang/it_openvz_action.lng
+++ b/interface/web/vm/lib/lang/it_openvz_action.lng
@@ -1,16 +1,16 @@
 <?php
-$wb['head_txt'] = 'Virtual server actions for VM:';
-$wb['start_txt'] = 'Start virtual server';
-$wb['stop_txt'] = 'Stop virtual server';
-$wb['restart_txt'] = 'Restart virtual server';
-$wb['ostemplate_txt'] = 'Create OSTemplate';
-$wb['ostemplate_desc_txt'] = '(example: debian-6.0-i386-custom)';
-$wb['btn_save_txt'] = 'Execute selected action';
-$wb['btn_cancel_txt'] = 'Cancel';
-$wb['start_exec_txt'] = 'Start command has been sent to the VM host server. It may take a minute until the VM is started.';
-$wb['stop_exec_txt'] = 'Stop command has been sent to the VM host server. It may take a minute until the VM is stopped.';
-$wb['restart_exec_txt'] = 'Restart command has been sent to the VM host server. It may take a minute until the VM is restarted.';
-$wb['ostemplate_name_error'] = 'The OSTemplate name conatains unallowed characters.';
-$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.';
+$wb['head_txt'] = 'Server Virtuale azioni per VM:';
+$wb['start_txt'] = 'Avvia Server virtuale';
+$wb['stop_txt'] = 'Ferma Server Virtuale';
+$wb['restart_txt'] = 'Riavvia Server Virtuale';
+$wb['ostemplate_txt'] = 'Crea  OSTemplate';
+$wb['ostemplate_desc_txt'] = '(esempio: debian-6.0-i386-custom)';
+$wb['btn_save_txt'] = 'Esegui azione selezionata';
+$wb['btn_cancel_txt'] = 'Annulla';
+$wb['start_exec_txt'] = 'Il comando di avvio è stato trasmesso al host server della VM. Ci vorrà circa un minuto prima che la VM sia avviata.';
+$wb['stop_exec_txt'] = 'Il comando di fermo è stato trasmesso al host server della VM. Ci vorrà circa un minuto prima che la VM sia fermata.';
+$wb['restart_exec_txt'] = 'Il comando di riavvio è stato trasmesso al host server della VM. Ci vorrà circa un minuto prima che la VM sia riavviata.';
+$wb['ostemplate_name_error'] = 'Il nome per OSTemplate contiene caratteri non validi.';
+$wb['ostemplate_name_unique_error'] = 'Esiste già un OSTemplate con quel nome.';
+$wb['ostemplate_exec_txt'] = 'Il comando per creare l OSTemplate è stato inviato al server host. Ci vorranno alcuni minuti prima che l OSTemplate sia creato.';
 ?>
diff --git a/interface/web/vm/lib/lang/it_openvz_ip.lng b/interface/web/vm/lib/lang/it_openvz_ip.lng
index 6016681df8..0a22248027 100644
--- a/interface/web/vm/lib/lang/it_openvz_ip.lng
+++ b/interface/web/vm/lib/lang/it_openvz_ip.lng
@@ -1,9 +1,9 @@
 <?php
-$wb['server_id_txt'] = 'Hostserver';
-$wb['ip_address_txt'] = 'IP address';
+$wb['server_id_txt'] = 'Server Host';
+$wb['ip_address_txt'] = 'Indirizzo IP';
+$wb['reserved_txt'] = 'Riservato';
+$wb['ip_error_wrong'] = 'Per favore inserisci un indirizzo IPv4 valido.';
+$wb['ip_error_unique'] = 'Questo indirizzo IP è già esistente.';
+$wb['IP address'] = 'Indirizzo IP';
 $wb['vm_id_txt'] = 'Virtual server';
-$wb['reserved_txt'] = 'Reserved';
-$wb['ip_error_wrong'] = 'Please fill in a valid IPv4 address.';
-$wb['ip_error_unique'] = 'This IP address does already exist.';
-$wb['IP address'] = 'IP address';
 ?>
diff --git a/interface/web/vm/lib/lang/it_openvz_ip_list.lng b/interface/web/vm/lib/lang/it_openvz_ip_list.lng
index e6a3a68c2c..c639477c4f 100644
--- a/interface/web/vm/lib/lang/it_openvz_ip_list.lng
+++ b/interface/web/vm/lib/lang/it_openvz_ip_list.lng
@@ -1,7 +1,7 @@
 <?php
-$wb['list_head_txt'] = 'OpenVZ IP addresses';
+$wb['list_head_txt'] = 'OpenVZ Indirizzi IP';
 $wb['server_id_txt'] = 'Server';
-$wb['ip_address_txt'] = 'IP address';
-$wb['reserved_txt'] = 'Reserved';
+$wb['ip_address_txt'] = 'Indirizzo IP';
+$wb['reserved_txt'] = 'Riservato';
 $wb['vm_id_txt'] = 'VM';
 ?>
diff --git a/interface/web/vm/lib/lang/it_openvz_ostemplate.lng b/interface/web/vm/lib/lang/it_openvz_ostemplate.lng
index 256750f19a..5b58e7ebc5 100644
--- a/interface/web/vm/lib/lang/it_openvz_ostemplate.lng
+++ b/interface/web/vm/lib/lang/it_openvz_ostemplate.lng
@@ -1,11 +1,11 @@
 <?php
-$wb['template_name_txt'] = 'Template name';
-$wb['template_file_txt'] = 'Template filename';
+$wb['template_file_txt'] = 'Nome file del Template';
 $wb['server_id_txt'] = 'Server';
-$wb['allservers_txt'] = 'Exists on all servers';
-$wb['active_txt'] = 'Active';
-$wb['description_txt'] = 'Description';
-$wb['template_name_error_empty'] = 'Template name is empty.';
-$wb['template_file_error_empty'] = 'Template filename is empty.';
+$wb['allservers_txt'] = 'Esiste su tutti i servers';
+$wb['active_txt'] = 'Attivo';
+$wb['description_txt'] = 'Descrizione';
+$wb['template_name_error_empty'] = 'Template name  vuoto.';
+$wb['template_file_error_empty'] = 'Template filename  vuoto.';
 $wb['Template'] = 'Template';
+$wb['template_name_txt'] = 'Template name';
 ?>
diff --git a/interface/web/vm/lib/lang/it_openvz_ostemplate_list.lng b/interface/web/vm/lib/lang/it_openvz_ostemplate_list.lng
index 6471ec0e27..7df4dc7fe6 100644
--- a/interface/web/vm/lib/lang/it_openvz_ostemplate_list.lng
+++ b/interface/web/vm/lib/lang/it_openvz_ostemplate_list.lng
@@ -1,8 +1,8 @@
 <?php
 $wb['list_head_txt'] = 'OpenVZ OSTemplate';
-$wb['active_txt'] = 'Active';
-$wb['template_name_txt'] = 'Template name';
+$wb['active_txt'] = 'Attivo';
 $wb['server_id_txt'] = 'Server';
-$wb['allservers_txt'] = 'Exists on all servers';
+$wb['allservers_txt'] = 'Esiste su tutti i servers';
 $wb['ostemplate_id_txt'] = 'ID';
+$wb['template_name_txt'] = 'Template name';
 ?>
diff --git a/interface/web/vm/lib/lang/it_openvz_template.lng b/interface/web/vm/lib/lang/it_openvz_template.lng
index 27dfbbb7b5..b23f862363 100644
--- a/interface/web/vm/lib/lang/it_openvz_template.lng
+++ b/interface/web/vm/lib/lang/it_openvz_template.lng
@@ -24,74 +24,74 @@ $wb['swappages_txt'] = 'Swappages';
 $wb['hostname_txt'] = 'Hostname';
 $wb['nameserver_txt'] = 'Nameserver(s)';
 $wb['nameserver_desc_txt'] = '(separated by whitespace)';
-$wb['capability_txt'] = 'Capability';
-$wb['template_name_txt'] = 'Template name';
-$wb['diskspace_txt'] = 'Diskspace';
-$wb['ram_txt'] = 'RAM (guaranteed)';
+$wb['capability_txt'] = 'Capacità';
+$wb['diskspace_txt'] = 'Spazio disco  ';
+$wb['ram_txt'] = 'RAM (garantita)';
 $wb['ram_burst_txt'] = 'RAM (burst)';
-$wb['cpu_units_txt'] = 'CPU units';
+$wb['cpu_units_txt'] = 'CPU unità';
 $wb['cpu_num_txt'] = 'CPU cores';
 $wb['cpu_limit_txt'] = 'CPU limit %';
 $wb['io_priority_txt'] = 'I/O priority';
-$wb['active_txt'] = 'Active';
-$wb['description_txt'] = 'Description';
-$wb['numproc_desc_txt'] = 'Number of processes and threads.';
-$wb['numtcpsock_desc_txt'] = 'Number of TCP sockets.';
-$wb['numothersock_desc_txt'] = 'Number of sockets other than TCP.';
-$wb['vmguarpages_desc_txt'] = 'Memory allocation guarantee, in pages.';
-$wb['kmemsize_desc_txt'] = 'Size of unswappable kernel memory, allocated for processes in this container.';
-$wb['tcpsndbuf_desc_txt'] = 'Total size of TCP send buffers.';
-$wb['tcprcvbuf_desc_txt'] = 'Total size of TCP receive buffers.';
-$wb['othersockbuf_desc_txt'] = 'Total size of UNIX-domain socket buffers, UDP and other datagram protocol send buffers.';
-$wb['dgramrcvbuf_desc_txt'] = 'Receive buffers of UDP and other datagram protocols.';
-$wb['oomguarpages_desc_txt'] = 'The guaranteed amount of memory for the case the memory is over-booked (out-of-memory kill guarantee), in pages.';
-$wb['privvmpages_desc_txt'] = 'Memory allocation limit, in pages.';
-$wb['lockedpages_desc_txt'] = 'Process pages not allowed to be swapped out (pages locked by mlock(2)).';
-$wb['shmpages_desc_txt'] = 'Total size of shared memory (IPC, shared anonymous mappings and tmpfs objects), in pages.';
-$wb['physpages_desc_txt'] = 'Total number of RAM pages used by processes.';
-$wb['numfile_desc_txt'] = 'Number of open files.';
-$wb['numflock_desc_txt'] = 'Number of file locks.';
-$wb['numpty_desc_txt'] = 'Number of pseudo-terminals.';
-$wb['numsiginfo_desc_txt'] = 'Number of siginfo structures.';
-$wb['dcachesize_desc_txt'] = 'Total size of dentry and inode structures locked in memory.';
-$wb['numiptent_desc_txt'] = 'Number of NETFILTER (IP packet filtering) entries.';
-$wb['swappages_desc_txt'] = 'Amount of swap space to show in container.';
-$wb['create_dns_txt'] = 'Create DNS for hostname';
-$wb['template_name_error_empty'] = 'Template name is empty.';
-$wb['diskspace_error_empty'] = 'Diskspace is empty.';
-$wb['ram_error_empty'] = 'RAM (guaranteed) is empty.';
-$wb['ram_burst_error_empty'] = 'RAM (burst) is empty.';
-$wb['cpu_units_error_empty'] = 'CPU units is empty.';
-$wb['cpu_num_error_empty'] = 'CPU cores is empty.';
-$wb['cpu_limit_error_empty'] = 'CPU limit % is empty.';
-$wb['io_priority_error_empty'] = 'I/O priority is empty.';
-$wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
-$wb['numproc_error_empty'] = 'Numproc is empty.';
-$wb['numtcpsock_error_empty'] = 'Numtcpsock is empty.';
-$wb['numothersock_error_empty'] = 'Numothersock is empty.';
-$wb['vmguarpages_error_empty'] = 'Vmguarpages is empty.';
-$wb['kmemsize_error_empty'] = 'Kmemsize is empty.';
-$wb['tcpsndbuf_error_empty'] = 'Tcpsndbuf is empty.';
-$wb['tcprcvbuf_error_empty'] = 'Tcprcvbuf is empty.';
-$wb['othersockbuf_error_empty'] = 'Othersockbuf is empty.';
-$wb['dgramrcvbuf_error_empty'] = 'Dgramrcvbuf is empty.';
-$wb['oomguarpages_error_empty'] = 'Oomguarpages is empty.';
-$wb['privvmpages_error_empty'] = 'Privvmpages is empty.';
-$wb['lockedpages_error_empty'] = 'Lockedpages is empty.';
-$wb['shmpages_error_empty'] = 'Shmpages is empty.';
-$wb['physpages_error_empty'] = 'Physpages is empty.';
-$wb['numfile_error_empty'] = 'Numfile is empty.';
-$wb['avnumproc_error_empty'] = 'Avnumproc is empty.';
-$wb['numflock_error_empty'] = 'Numflock is empty.';
-$wb['numpty_error_empty'] = 'Numpty is empty.';
-$wb['numsiginfo_error_empty'] = 'Numsiginfo is empty.';
-$wb['dcachesize_error_empty'] = 'Dcachesize is empty.';
-$wb['numiptent_error_empty'] = 'Numiptent is empty.';
-$wb['swappages_error_empty'] = 'Swappages is empty.';
+$wb['active_txt'] = 'Attivo';
+$wb['description_txt'] = 'Descrizione';
+$wb['numproc_desc_txt'] = 'Numero processi e threads.';
+$wb['numtcpsock_desc_txt'] = 'Numero di TCP sockets.';
+$wb['numothersock_desc_txt'] = 'Numero di sockets other than TCP.';
+$wb['vmguarpages_desc_txt'] = 'Allocazione memoria garantita, in pages.';
+$wb['kmemsize_desc_txt'] = 'Dimensione Memoria Kernel non swappable, allocata per il processo in questo contenitore.';
+$wb['tcpsndbuf_desc_txt'] = 'Dimensione totale di buffers TCP trasmessi.';
+$wb['tcprcvbuf_desc_txt'] = 'Dimensione totale di buffers TCP ricevuti.';
+$wb['othersockbuf_desc_txt'] = 'Dimensione totale di UNIX-domain socket buffers, UDP e altri  datagram protocol trasmessi.';
+$wb['dgramrcvbuf_desc_txt'] = 'Dimensione di buffers UDP e altri datagram protocols ricevuti.';
+$wb['oomguarpages_desc_txt'] = 'Memoria allocata garatita nel caso la memoria sia over-booked (garanzia out-of-memory kill), in pages.';
+$wb['privvmpages_desc_txt'] = 'Limite memoria allocata, in pages.';
+$wb['lockedpages_desc_txt'] = 'Process pages non autorizzati a eseguire swapped out (pages bloccati da mlock(2)).';
+$wb['shmpages_desc_txt'] = 'Dimensione totale di memoria condivisa (IPC, shared anonymous mappings and tmpfs objects), in pages.';
+$wb['physpages_desc_txt'] = 'Numero totale di  RAM pages usata dai processi.';
+$wb['numfile_desc_txt'] = 'Numero di files aperti.';
+$wb['numflock_desc_txt'] = 'Numero di file locks.';
+$wb['numpty_desc_txt'] = 'Numero di pseudo-terminali.';
+$wb['numsiginfo_desc_txt'] = 'Numero di siginfo structures.';
+$wb['dcachesize_desc_txt'] = 'Dimensione totale di dentry and inode structures locked nella memoria.';
+$wb['numiptent_desc_txt'] = 'Numero di inserimenti NETFILTER (IP packet filtering).';
+$wb['swappages_desc_txt'] = 'Dimensione di swap space da mostrare nel contenitore.';
+$wb['create_dns_txt'] = 'Crea  DNS per questo nome host';
+$wb['template_name_error_empty'] = 'Template name  vuoto.';
+$wb['diskspace_error_empty'] = 'Spazio disco    vuoto.';
+$wb['ram_error_empty'] = 'RAM (guaranteed)  vuoto.';
+$wb['ram_burst_error_empty'] = 'RAM (burst)  vuoto.';
+$wb['cpu_units_error_empty'] = 'CPU units  vuoto.';
+$wb['cpu_num_error_empty'] = 'CPU cores  vuoto.';
+$wb['cpu_limit_error_empty'] = 'CPU limit %  vuoto.';
+$wb['io_priority_error_empty'] = 'I/O priority  vuoto.';
+$wb['template_nameserver_error_empty'] = 'Nameserver(s)  vuoto.';
+$wb['numproc_error_empty'] = 'Numproc  vuoto.';
+$wb['numtcpsock_error_empty'] = 'Numtcpsock  vuoto.';
+$wb['numothersock_error_empty'] = 'Numothersock  vuoto.';
+$wb['vmguarpages_error_empty'] = 'Vmguarpages  vuoto.';
+$wb['kmemsize_error_empty'] = 'Kmemsize  vuoto.';
+$wb['tcpsndbuf_error_empty'] = 'Tcpsndbuf  vuoto.';
+$wb['tcprcvbuf_error_empty'] = 'Tcprcvbuf  vuoto.';
+$wb['othersockbuf_error_empty'] = 'Othersockbuf  vuoto.';
+$wb['dgramrcvbuf_error_empty'] = 'Dgramrcvbuf  vuoto.';
+$wb['oomguarpages_error_empty'] = 'Oomguarpages  vuoto.';
+$wb['privvmpages_error_empty'] = 'Privvmpages  vuoto.';
+$wb['lockedpages_error_empty'] = 'Lockedpages  vuoto.';
+$wb['shmpages_error_empty'] = 'Shmpages  vuoto.';
+$wb['physpages_error_empty'] = 'Physpages  vuoto.';
+$wb['numfile_error_empty'] = 'Numfile  vuoto.';
+$wb['avnumproc_error_empty'] = 'Avnumproc  vuoto.';
+$wb['numflock_error_empty'] = 'Numflock  vuoto.';
+$wb['numpty_error_empty'] = 'Numpty  vuoto.';
+$wb['numsiginfo_error_empty'] = 'Numsiginfo  vuoto.';
+$wb['dcachesize_error_empty'] = 'Dcachesize  vuoto.';
+$wb['numiptent_error_empty'] = 'Numiptent  vuoto.';
+$wb['swappages_error_empty'] = 'Swappages  vuoto.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
+$wb['template_name_txt'] = 'Template name';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["custom_error"] = "Not allowed in Custom settings: ";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['custom_error'] = 'Not allowed in Custom settings: ';
 ?>
diff --git a/interface/web/vm/lib/lang/it_openvz_template_list.lng b/interface/web/vm/lib/lang/it_openvz_template_list.lng
index de4045c36a..f752068085 100644
--- a/interface/web/vm/lib/lang/it_openvz_template_list.lng
+++ b/interface/web/vm/lib/lang/it_openvz_template_list.lng
@@ -1,5 +1,5 @@
 <?php
 $wb['list_head_txt'] = 'OpenVZ Virtual Machine Template';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Attivo';
 $wb['template_name_txt'] = 'Template name';
 ?>
diff --git a/interface/web/vm/lib/lang/it_openvz_vm.lng b/interface/web/vm/lib/lang/it_openvz_vm.lng
index 2029d96238..8290d94e99 100644
--- a/interface/web/vm/lib/lang/it_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/it_openvz_vm.lng
@@ -1,45 +1,45 @@
 <?php
-$wb['diskspace_txt'] = 'Diskspace';
-$wb['ram_txt'] = 'RAM (guaranteed)';
+$wb['diskspace_txt'] = 'Spazio Disco';
+$wb['ram_txt'] = 'RAM (garantita)';
 $wb['ram_burst_txt'] = 'RAM (burst)';
-$wb['cpu_units_txt'] = 'CPU units';
-$wb['cpu_num_txt'] = 'CPU number';
-$wb['cpu_limit_txt'] = 'CPU limit';
-$wb['io_priority_txt'] = 'I/O priority';
+$wb['cpu_units_txt'] = 'CPU unita';
+$wb['cpu_num_txt'] = 'CPU numero';
+$wb['cpu_limit_txt'] = 'CPU limite';
+$wb['io_priority_txt'] = 'I/O priorita';
 $wb['nameserver_txt'] = 'Nameserver(s)';
-$wb['nameserver_desc_txt'] = '(separated by whitespace)';
-$wb['capability_txt'] = 'Capability';
+$wb['nameserver_desc_txt'] = '(separati da spazi)';
+$wb['capability_txt'] = 'Capacita';
 $wb['server_id_txt'] = 'Hostserver';
 $wb['ostemplate_id_txt'] = 'OSTemplate';
 $wb['template_id_txt'] = 'Template';
-$wb['ip_address_txt'] = 'IP address';
+$wb['ip_address_txt'] = 'Indirizzo IP ';
 $wb['hostname_txt'] = 'Hostname';
 $wb['vm_password_txt'] = 'VM Password';
-$wb['start_boot_txt'] = 'Start at boot';
-$wb['active_txt'] = 'Active';
-$wb['description_txt'] = 'Description';
-$wb['client_group_id_txt'] = 'Client';
+$wb['start_boot_txt'] = 'Avvia al boot ';
+$wb['active_txt'] = 'Attivo';
+$wb['description_txt'] = 'Descrizione';
+$wb['client_group_id_txt'] = 'Cliente';
 $wb['veid_txt'] = 'VEID';
-$wb['create_dns_txt'] = 'Create DNS for hostname';
-$wb['active_until_date_txt'] = 'Active until date';
-$wb['ip_address_error_empty'] = 'IP address is empty.';
-$wb['hostname_error_empty'] = 'Hostname is empty.';
-$wb['vm_password_error_empty'] = 'VM Password is empty.';
-$wb['veid_error_empty'] = 'VEID is empty.';
-$wb['veid_error_unique'] = 'VEID does already exist.';
-$wb['diskspace_error_empty'] = 'Diskspace is empty.';
-$wb['ram_error_empty'] = 'RAM (guaranteed) is empty.';
-$wb['ram_burst_error_empty'] = 'RAM (burst) is empty.';
-$wb['cpu_units_error_empty'] = 'CPU units is empty.';
-$wb['cpu_num_error_empty'] = 'CPU number is empty.';
-$wb['cpu_limit_error_empty'] = 'CPU limit is empty.';
-$wb['io_priority_error_empty'] = 'I/O priority is empty.';
-$wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
+$wb['create_dns_txt'] = 'Crea  DNS per il nome host';
+$wb['active_until_date_txt'] = 'Attivo sino al ';
+$wb['ip_address_error_empty'] = 'Indirizzo IP vuoto.';
+$wb['hostname_error_empty'] = 'Nome Host vuoto.';
+$wb['vm_password_error_empty'] = 'VM Password vuota.';
+$wb['veid_error_empty'] = 'VEID vuoto.';
+$wb['veid_error_unique'] = 'VEID già esistente.';
+$wb['diskspace_error_empty'] = 'Spazio disco vuoto.';
+$wb['ram_error_empty'] = 'Valore VRAM (garantita) vuoto.';
+$wb['ram_burst_error_empty'] = 'Valore RAM (burst) vuoto.';
+$wb['cpu_units_error_empty'] = 'Valore CPU vuoto.';
+$wb['cpu_num_error_empty'] = 'CPU number  vuoto.';
+$wb['cpu_limit_error_empty'] = 'CPU limit  vuoto.';
+$wb['io_priority_error_empty'] = 'I/O priority  vuoto.';
+$wb['template_nameserver_error_empty'] = 'Nameserver(s)  vuoto.';
 $wb['Virtual server'] = 'Virtual server';
-$wb['Advanced'] = 'Advanced';
+$wb['Advanced'] = 'Avanzato';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["bootorder_txt"] = "Boot order priority";
-$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['bootorder_txt'] = 'Boot order priority';
+$wb['bootorder_error_notpositive'] = 'Only positive integers are allowed for Boot order priority';
 ?>
diff --git a/interface/web/vm/lib/lang/it_openvz_vm_list.lng b/interface/web/vm/lib/lang/it_openvz_vm_list.lng
index 2238e2b8f4..3ed0a012af 100644
--- a/interface/web/vm/lib/lang/it_openvz_vm_list.lng
+++ b/interface/web/vm/lib/lang/it_openvz_vm_list.lng
@@ -1,10 +1,10 @@
 <?php
 $wb['list_head_txt'] = 'Virtual server';
-$wb['active_txt'] = 'Active';
+$wb['active_txt'] = 'Attivo';
 $wb['server_id_txt'] = 'Hostserver';
 $wb['ostemplate_id_txt'] = 'OSTemplate';
 $wb['template_id_txt'] = 'Template';
-$wb['hostname_txt'] = 'Hostname';
-$wb['ip_address_txt'] = 'IP address';
+$wb['hostname_txt'] = 'Nome Host';
+$wb['ip_address_txt'] = 'Indirizzo IP';
 $wb['veid_txt'] = 'VEID';
 ?>
diff --git a/interface/web/vm/lib/lang/ja_openvz_template.lng b/interface/web/vm/lib/lang/ja_openvz_template.lng
index 27dfbbb7b5..4c098565a3 100644
--- a/interface/web/vm/lib/lang/ja_openvz_template.lng
+++ b/interface/web/vm/lib/lang/ja_openvz_template.lng
@@ -91,7 +91,7 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["custom_error"] = "Not allowed in Custom settings: ";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['custom_error'] = 'Not allowed in Custom settings: ';
 ?>
diff --git a/interface/web/vm/lib/lang/ja_openvz_vm.lng b/interface/web/vm/lib/lang/ja_openvz_vm.lng
index 2029d96238..3094f0aa8d 100644
--- a/interface/web/vm/lib/lang/ja_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/ja_openvz_vm.lng
@@ -38,8 +38,8 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
 $wb['Virtual server'] = 'Virtual server';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["bootorder_txt"] = "Boot order priority";
-$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['bootorder_txt'] = 'Boot order priority';
+$wb['bootorder_error_notpositive'] = 'Only positive integers are allowed for Boot order priority';
 ?>
diff --git a/interface/web/vm/lib/lang/nl_openvz_template.lng b/interface/web/vm/lib/lang/nl_openvz_template.lng
index 27dfbbb7b5..4c098565a3 100644
--- a/interface/web/vm/lib/lang/nl_openvz_template.lng
+++ b/interface/web/vm/lib/lang/nl_openvz_template.lng
@@ -91,7 +91,7 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["custom_error"] = "Not allowed in Custom settings: ";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['custom_error'] = 'Not allowed in Custom settings: ';
 ?>
diff --git a/interface/web/vm/lib/lang/nl_openvz_vm.lng b/interface/web/vm/lib/lang/nl_openvz_vm.lng
index 2029d96238..3094f0aa8d 100644
--- a/interface/web/vm/lib/lang/nl_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/nl_openvz_vm.lng
@@ -38,8 +38,8 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
 $wb['Virtual server'] = 'Virtual server';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["bootorder_txt"] = "Boot order priority";
-$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['bootorder_txt'] = 'Boot order priority';
+$wb['bootorder_error_notpositive'] = 'Only positive integers are allowed for Boot order priority';
 ?>
diff --git a/interface/web/vm/lib/lang/pl_openvz_template.lng b/interface/web/vm/lib/lang/pl_openvz_template.lng
index 27dfbbb7b5..4c098565a3 100644
--- a/interface/web/vm/lib/lang/pl_openvz_template.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_template.lng
@@ -91,7 +91,7 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["custom_error"] = "Not allowed in Custom settings: ";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['custom_error'] = 'Not allowed in Custom settings: ';
 ?>
diff --git a/interface/web/vm/lib/lang/pl_openvz_vm.lng b/interface/web/vm/lib/lang/pl_openvz_vm.lng
index 2029d96238..3094f0aa8d 100644
--- a/interface/web/vm/lib/lang/pl_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/pl_openvz_vm.lng
@@ -38,8 +38,8 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
 $wb['Virtual server'] = 'Virtual server';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["bootorder_txt"] = "Boot order priority";
-$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['bootorder_txt'] = 'Boot order priority';
+$wb['bootorder_error_notpositive'] = 'Only positive integers are allowed for Boot order priority';
 ?>
diff --git a/interface/web/vm/lib/lang/pt_openvz_template.lng b/interface/web/vm/lib/lang/pt_openvz_template.lng
index 27dfbbb7b5..4c098565a3 100644
--- a/interface/web/vm/lib/lang/pt_openvz_template.lng
+++ b/interface/web/vm/lib/lang/pt_openvz_template.lng
@@ -91,7 +91,7 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["custom_error"] = "Not allowed in Custom settings: ";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['custom_error'] = 'Not allowed in Custom settings: ';
 ?>
diff --git a/interface/web/vm/lib/lang/pt_openvz_vm.lng b/interface/web/vm/lib/lang/pt_openvz_vm.lng
index 2029d96238..3094f0aa8d 100644
--- a/interface/web/vm/lib/lang/pt_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/pt_openvz_vm.lng
@@ -38,8 +38,8 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
 $wb['Virtual server'] = 'Virtual server';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["bootorder_txt"] = "Boot order priority";
-$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['bootorder_txt'] = 'Boot order priority';
+$wb['bootorder_error_notpositive'] = 'Only positive integers are allowed for Boot order priority';
 ?>
diff --git a/interface/web/vm/lib/lang/ro_openvz_template.lng b/interface/web/vm/lib/lang/ro_openvz_template.lng
index 27dfbbb7b5..4c098565a3 100644
--- a/interface/web/vm/lib/lang/ro_openvz_template.lng
+++ b/interface/web/vm/lib/lang/ro_openvz_template.lng
@@ -91,7 +91,7 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["custom_error"] = "Not allowed in Custom settings: ";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['custom_error'] = 'Not allowed in Custom settings: ';
 ?>
diff --git a/interface/web/vm/lib/lang/ro_openvz_vm.lng b/interface/web/vm/lib/lang/ro_openvz_vm.lng
index 2029d96238..3094f0aa8d 100644
--- a/interface/web/vm/lib/lang/ro_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/ro_openvz_vm.lng
@@ -38,8 +38,8 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
 $wb['Virtual server'] = 'Virtual server';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["bootorder_txt"] = "Boot order priority";
-$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['bootorder_txt'] = 'Boot order priority';
+$wb['bootorder_error_notpositive'] = 'Only positive integers are allowed for Boot order priority';
 ?>
diff --git a/interface/web/vm/lib/lang/ru_openvz_template.lng b/interface/web/vm/lib/lang/ru_openvz_template.lng
index 27dfbbb7b5..4c098565a3 100644
--- a/interface/web/vm/lib/lang/ru_openvz_template.lng
+++ b/interface/web/vm/lib/lang/ru_openvz_template.lng
@@ -91,7 +91,7 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["custom_error"] = "Not allowed in Custom settings: ";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['custom_error'] = 'Not allowed in Custom settings: ';
 ?>
diff --git a/interface/web/vm/lib/lang/ru_openvz_vm.lng b/interface/web/vm/lib/lang/ru_openvz_vm.lng
index 2029d96238..3094f0aa8d 100644
--- a/interface/web/vm/lib/lang/ru_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/ru_openvz_vm.lng
@@ -38,8 +38,8 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
 $wb['Virtual server'] = 'Virtual server';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["bootorder_txt"] = "Boot order priority";
-$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['bootorder_txt'] = 'Boot order priority';
+$wb['bootorder_error_notpositive'] = 'Only positive integers are allowed for Boot order priority';
 ?>
diff --git a/interface/web/vm/lib/lang/se_openvz_template.lng b/interface/web/vm/lib/lang/se_openvz_template.lng
index 27dfbbb7b5..4c098565a3 100644
--- a/interface/web/vm/lib/lang/se_openvz_template.lng
+++ b/interface/web/vm/lib/lang/se_openvz_template.lng
@@ -91,7 +91,7 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["custom_error"] = "Not allowed in Custom settings: ";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['custom_error'] = 'Not allowed in Custom settings: ';
 ?>
diff --git a/interface/web/vm/lib/lang/se_openvz_vm.lng b/interface/web/vm/lib/lang/se_openvz_vm.lng
index 2029d96238..3094f0aa8d 100644
--- a/interface/web/vm/lib/lang/se_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/se_openvz_vm.lng
@@ -38,8 +38,8 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
 $wb['Virtual server'] = 'Virtual server';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["bootorder_txt"] = "Boot order priority";
-$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['bootorder_txt'] = 'Boot order priority';
+$wb['bootorder_error_notpositive'] = 'Only positive integers are allowed for Boot order priority';
 ?>
diff --git a/interface/web/vm/lib/lang/sk_openvz_template.lng b/interface/web/vm/lib/lang/sk_openvz_template.lng
index 27dfbbb7b5..4c098565a3 100644
--- a/interface/web/vm/lib/lang/sk_openvz_template.lng
+++ b/interface/web/vm/lib/lang/sk_openvz_template.lng
@@ -91,7 +91,7 @@ $wb['swappages_error_empty'] = 'Swappages is empty.';
 $wb['Template'] = 'Template';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["custom_error"] = "Not allowed in Custom settings: ";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['custom_error'] = 'Not allowed in Custom settings: ';
 ?>
diff --git a/interface/web/vm/lib/lang/sk_openvz_vm.lng b/interface/web/vm/lib/lang/sk_openvz_vm.lng
index 2029d96238..3094f0aa8d 100644
--- a/interface/web/vm/lib/lang/sk_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/sk_openvz_vm.lng
@@ -38,8 +38,8 @@ $wb['template_nameserver_error_empty'] = 'Nameserver(s) is empty.';
 $wb['Virtual server'] = 'Virtual server';
 $wb['Advanced'] = 'Advanced';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["bootorder_txt"] = "Boot order priority";
-$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['bootorder_txt'] = 'Boot order priority';
+$wb['bootorder_error_notpositive'] = 'Only positive integers are allowed for Boot order priority';
 ?>
diff --git a/interface/web/vm/lib/lang/tr_openvz_action.lng b/interface/web/vm/lib/lang/tr_openvz_action.lng
index 8e609bd220..29759e0266 100644
--- a/interface/web/vm/lib/lang/tr_openvz_action.lng
+++ b/interface/web/vm/lib/lang/tr_openvz_action.lng
@@ -13,6 +13,4 @@ $wb['restart_exec_txt'] = 'VM sunucusuna yeniden başlatma komutu gönderildi. V
 $wb['ostemplate_name_error'] = 'OS kalıbı adında izin verilmeyen karakterler var.';
 $wb['ostemplate_name_unique_error'] = 'Aynı adlı bir işletim sistemi kalıbı zaten var.';
 $wb['ostemplate_exec_txt'] = 'VM sunucusuna işletim sistemi kalıbı oluşturma komutu gönderildi. İşletim sistemi kalıbının oluşturulması bir kaç dakika alabilir.';
-
 ?>
-
diff --git a/interface/web/vm/lib/lang/tr_openvz_template.lng b/interface/web/vm/lib/lang/tr_openvz_template.lng
index 5470b39361..2621212862 100644
--- a/interface/web/vm/lib/lang/tr_openvz_template.lng
+++ b/interface/web/vm/lib/lang/tr_openvz_template.lng
@@ -44,7 +44,7 @@ $wb['tcpsndbuf_desc_txt'] = 'TCP gönderme arabelleğinin toplam boyutu.';
 $wb['tcprcvbuf_desc_txt'] = 'TCP alma arabelleğinin toplam boyutu.';
 $wb['othersockbuf_desc_txt'] = 'UNIX alan adı soket arabelleğinin toplam boyutu, UDP ve diğer datagram iletişim kuralları gönderme ara bellekleri.';
 $wb['dgramrcvbuf_desc_txt'] = 'UDP ve diğer datagram iletişim kuralları alma ara bellekleri.';
-$wb['oomguarpages_desc_txt'] = 'Bellek sayfası cinsinden, bellek taşması durumlarında garanti edilen bellek miktarı" (bellek bitti boşaltma garantisi).';
+$wb['oomguarpages_desc_txt'] = 'Bellek sayfası cinsinden, bellek taşması durumlarında garanti edilen bellek miktarı\" (bellek bitti boşaltma garantisi).';
 $wb['privvmpages_desc_txt'] = 'Bellek sayfası cinsinden ayrılacak bellek sınırı.';
 $wb['lockedpages_desc_txt'] = 'İşlem sayfaları takasına izin verilmez (mlock(2) ile kilitlenmiş sayfalar).';
 $wb['shmpages_desc_txt'] = 'Bellek sayfası cinsinden, paylaşılan belleğin toplam boyutu (IPC, paylaşılan anonim haritalama ve tmpfs nesneleri).';
@@ -90,4 +90,8 @@ $wb['numiptent_error_empty'] = 'Numiptent boş olamaz.';
 $wb['swappages_error_empty'] = 'Swappages boş olamaz.';
 $wb['Template'] = 'Kalıp';
 $wb['Advanced'] = 'Gelişmiş';
+$wb['features_txt'] = 'Features';
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['custom_error'] = 'Not allowed in Custom settings: ';
 ?>
diff --git a/interface/web/vm/lib/lang/tr_openvz_vm.lng b/interface/web/vm/lib/lang/tr_openvz_vm.lng
index 25ad9388aa..8840183a50 100644
--- a/interface/web/vm/lib/lang/tr_openvz_vm.lng
+++ b/interface/web/vm/lib/lang/tr_openvz_vm.lng
@@ -21,10 +21,10 @@ $wb['description_txt'] = 'Açıklama';
 $wb['client_group_id_txt'] = 'Müşteri';
 $wb['veid_txt'] = 'VEID';
 $wb['features_txt'] = 'Features';
-$wb["iptables_txt"] = "IP Tables";
-$wb["custom_txt"] = "Custom settings";
-$wb["bootorder_txt"] = "Boot order priority";
-$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
+$wb['iptables_txt'] = 'IP Tables';
+$wb['custom_txt'] = 'Custom settings';
+$wb['bootorder_txt'] = 'Boot order priority';
+$wb['bootorder_error_notpositive'] = 'Only positive integers are allowed for Boot order priority';
 $wb['create_dns_txt'] = 'Sunucu için DNS oluştur';
 $wb['active_until_date_txt'] = 'Şu tarihe kadar etkin';
 $wb['ip_address_error_empty'] = 'IP adresi boş olamaz.';
-- 
GitLab


From 99768b5efd67a53bf9b84d98244bcb45d21d4141 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Sun, 31 Jan 2016 20:46:41 +0100
Subject: [PATCH 6/6] Fixed issue in updater for git-stable mode.

---
 server/scripts/update_from_dev_stable.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/scripts/update_from_dev_stable.sh b/server/scripts/update_from_dev_stable.sh
index 1988189eb7..de2e6a47b5 100644
--- a/server/scripts/update_from_dev_stable.sh
+++ b/server/scripts/update_from_dev_stable.sh
@@ -14,8 +14,8 @@ wget -O ispconfig3-dev.tar.gz "http://git.ispconfig.org/ispconfig/ispconfig3/rep
 tar xzf ispconfig3-dev.tar.gz
 
 echo -n "Latest git version:  "
-ls -1d ispconfig3-master*
-cd ispconfig3-master*/install
+ls -1d ispconfig3-stable*
+cd ispconfig3-stable*/install
 
 php -q \
     -d disable_classes= \
-- 
GitLab