diff --git a/lang/dynamic/helpers/acl.php b/lang/dynamic/helpers/acl.php
index ea0fb2686..a3cb69c69 100644
--- a/lang/dynamic/helpers/acl.php
+++ b/lang/dynamic/helpers/acl.php
@@ -33,7 +33,6 @@
  *
  */
 echo gettext('Allow access to the \'Status: Captive portal: Voucher Rolls\' page.');
-echo gettext('Allow access to the \'Services: Captive portal\' page.');
 echo gettext('Allow access to the \'Status: IPsec: SAD\' page.');
 echo gettext('Allow access to the \'VPN: PPTP: Users\' page.');
 echo gettext('Allow access to the \'VPN: IPsec: Pre-Shared Keys List\' page.');
@@ -85,7 +84,7 @@ echo gettext('Allow access to the \'Services: DHCP Server : Edit static mapping\
 echo gettext('Allow access to the \'Services: DHCPv6 server\' page.');
 echo gettext('Allow access to the \'Status: Captive portal: Test Vouchers\' page.');
 echo gettext('Allow access to the \'Status: System logs: Load Balancer\' page.');
-echo gettext('Allow access to the \'Firewall: Traffic Shaper: Wizard\' page.');
+echo gettext('Allow access to the \'Services: Captive portal\' page.');
 echo gettext('Allow access to the \'Lobby: Login / Logout/ Dashboard\' page.');
 echo gettext('Allow access to the \'Services: DNS Resolver: Edit host\' page.');
 echo gettext('Allow access to the \'Services: SNMP\' page.');
@@ -148,7 +147,6 @@ echo gettext('Allow access to the \'AJAX: Service Providers\' page.');
 echo gettext('Allow access to the \'Diagnostics: Backup/restore\' page.');
 echo gettext('Allow access to the \'Diagnostics: Halt system\' page.');
 echo gettext('Allow access to the \'Services: DHCP server\' page.');
-echo gettext('Indicates whether the user is able to login for tunneling via SSH when they have no shell access. Note: User - System - Copy files conflicts with this privilege.');
 echo gettext('Allow access to the \'Services: Igmpproxy: Edit\' page.');
 echo gettext('Allow access to the \'System: User Manager: Settings: Test LDAP\' page.');
 echo gettext('Allow access to the \'VPN: L2TP\' page.');
@@ -177,7 +175,6 @@ echo gettext('Allows access to the \'Diagnostics: Limiter Info\' page');
 echo gettext('Allow access to the \'Services: DHCPv6 Relay\' page.');
 echo gettext('Allow access to the \'Diagnostics: Logs: System: Resolver\' page.');
 echo gettext('Allow access to the \'Status: Wireless\' page.');
-echo gettext('Allow access to the \'Firewall: Traffic Shaper: Queues\' page.');
 echo gettext('Allow access to the \'Hidden: No longer included\' page.');
 echo gettext('Allow access to the \'Status: NTP PPS\' page.');
 echo gettext('Allow access to the \'Status: System logs: IPsec VPN\' page.');
@@ -208,7 +205,6 @@ echo gettext('Allow access to the \'System: Gateways: Edit Gateway\' page.');
 echo gettext('Allow access to the \'Services: Captive portal: Edit Zones\' page.');
 echo gettext('Allow access to the \'Diagnostics: Logs: Firewall\' page.');
 echo gettext('Allow direct access to all Dashboard widget pages, required for some widgets using AJAX.');
-echo gettext('Allow access to the \'Status: Traffic shaper: Queues\' page.');
 echo gettext('Allow access to the \'Status: Load Balancer: Virtual Server\' page.');
 echo gettext('Allow access to the \'Diagnostics: Configuration History\' page.');
 echo gettext('Allow access to the \'Interfaces: GRE: Edit\' page.');
diff --git a/lang/dynamic/helpers/controllers.php b/lang/dynamic/helpers/controllers.php
index 58f06a7cb..641b95f14 100644
--- a/lang/dynamic/helpers/controllers.php
+++ b/lang/dynamic/helpers/controllers.php
@@ -124,6 +124,7 @@ echo gettext('The prompt will be displayed in the autherntication request window
 echo gettext('This specifies for how long (in hours) the proxy server assumes an externally validated username and password combination is valid (Time To Live).<br/>
             When the TTL expires, the user will be prompted for credentials again.');
 echo gettext('The total number of authenticator processes to spawn.');
+echo gettext('enable this pipe and it\'s related queues and rules');
 echo gettext('Total bandwidth for this pipe');
 echo gettext('number of dynamic queues, leave empty for default');
 echo gettext('Dynamic queue creation by source or destination address.
@@ -131,16 +132,20 @@ echo gettext('Dynamic queue creation by source or destination address.
         <li> choose source to provide all connected clients up to a maximum of this pipe configured bandwidth  </li>
         ');
 echo gettext('Description to identify this pipe.');
+echo gettext('enable this queue and it\'s related rules');
 echo gettext('connected pipe for this queue');
-echo gettext('Weight of this queue (1..100)');
+echo gettext('Weight of this queue (1..100), used to prioritize within a pipe. (1 is low, 100 is high)');
 echo gettext('Dynamic queue creation by source or destination address.
         <li> choose destination here to share the total bandwidth of this pipe among all connected clients. </li>
         <li> choose source to provide all connected clients up to a maximum of this pipe configured bandwidth  </li>
         ');
 echo gettext('Description to identify this pipe.');
 echo gettext('order in which the rule will be evaluated (lowest first)');
+echo gettext('secondary interface, matches packets going traveling from interface (1) to interface (2).
+        ');
 echo gettext('source ip or network, examples 10.0.0.0/24, 10.0.0.1');
 echo gettext('source port number or well known name (imap,imaps, http,https,...)');
 echo gettext('destination ip or network, examples 10.0.0.0/24, 10.0.0.1');
 echo gettext('destination port number or well known name (imap,imaps, http,https,...)');
+echo gettext('matches incomming or outgoing packets or both (default)');
 echo gettext('target pipe or queue');
diff --git a/lang/dynamic/helpers/models.php b/lang/dynamic/helpers/models.php
index 6e290695f..a4dd6b093 100644
--- a/lang/dynamic/helpers/models.php
+++ b/lang/dynamic/helpers/models.php
@@ -82,9 +82,7 @@ echo gettext('Floating');
 echo gettext('Interface');
 echo gettext('Rules');
 echo gettext('Schedules');
-echo gettext('By Queue');
-echo gettext('Wizards');
-echo gettext('Queues');
+echo gettext('Traffic Shaper');
 echo gettext('Virtual IPs');
 echo gettext('Firewall');
 echo gettext('IP');
@@ -147,7 +145,6 @@ echo gettext('VirtualServers');
 echo gettext('Load Balancer');
 echo gettext('NTP');
 echo gettext('OpenVPN');
-echo gettext('Queues');
 echo gettext('Settings');
 echo gettext('RRD Graphs');
 echo gettext('Services');
@@ -206,8 +203,6 @@ echo gettext('Paid Support');
 echo gettext('UserForum');
 echo gettext('Help');
 echo gettext('menu');
-echo gettext('test');
-echo gettext('you should input a valid email address');
 echo gettext('ICP port needs to be an integer value between 1 and 65535');
 echo gettext('Specify a positive cache size. (number of MB\'s)');
 echo gettext('Specify a positive number of first-level subdirectories.');
@@ -220,6 +215,8 @@ echo gettext('Proxy port needs to be an integer value between 1 and 65535');
 echo gettext('FTP Proxy port needs to be an integer value between 1 and 65535');
 echo gettext('Credentials TTL needs to be an integer value above 0');
 echo gettext('Number of children needs to be an integer value above 0');
+echo gettext('test');
+echo gettext('you should input a valid email address');
 echo gettext('Pipe number must be between 1...65535');
 echo gettext('Bandwidth out of range');
 echo gettext('Bandwidth metric should be one of bit,Kbit,Mbit');
@@ -234,3 +231,4 @@ echo gettext('origin should be regular text of max 30 characters');
 echo gettext('provide a valid sequence for sorting');
 echo gettext('Related pipe or queue not found');
 echo gettext('origin should be regular text of max 30 characters');
+echo gettext('sid should be a number');