diff --git a/data/y-web/Y_Blocks.txt b/data/y-web/Y_Blocks.txt
index ecf2b20bc..8341dae6a 100644
--- a/data/y-web/Y_Blocks.txt
+++ b/data/y-web/Y_Blocks.txt
@@ -499,7 +499,7 @@ start-block~netfs_table_row
 				{=var-get:local_dir_{=var-get:nr=}=}
 			</td>
 			<td>
-				<a href="/Y_Tools_NetFS_edit.yhtm?nr={=var-get:nr=}&mount_type={=mount_type=}&mount_type_s={=mount_type_s=}" title="{=L:ni.edit=}">
+				<a href="/Y_Tools_NetFS_edit.yhtm?nr={=var-get:nr=}&mount_type={=mount_type=}&mount_type_s={=mount_type_s=}" title="{=L:edit=}">
 					<img src="/images/modify.png">
 				</a>
 				{=if-equal:{=mount_type=}~0~
diff --git a/data/y-web/Y_Boxcontrol_PZapit.yhtm b/data/y-web/Y_Boxcontrol_PZapit.yhtm
index 4f769cd2f..9d6701f63 100644
--- a/data/y-web/Y_Boxcontrol_PZapit.yhtm
+++ b/data/y-web/Y_Boxcontrol_PZapit.yhtm
@@ -30,10 +30,10 @@
 				<td class="y_form_header" width="48%">{=L:bc.pzapit.tuner=}</td>
 			</tr>
 				<td>
-					<input type="button" value="{=L:ni.reload=}" title="{=L:ni.dblclick=}" ondblclick='$("out").update(""); goUrl("/control/exec?Y_NI_Tools&amp;reload_channellists");' />
+					<input type="button" value="{=L:reload=}" title="{=L:dblclick=}" ondblclick='$("out").update(""); goUrl("/control/exec?Y_NI_Tools&amp;reload_channellists");' />
 				</td>
 				<td>
-					<input type="button" value="{=L:ni.reset=}"  title="{=L:ni.dblclick=}" ondblclick='$("out").update(""); goUrl("/control/exec?Y_NI_Tools&amp;reset_tuner");' />
+					<input type="button" value="{=L:reset=}"  title="{=L:dblclick=}" ondblclick='$("out").update(""); goUrl("/control/exec?Y_NI_Tools&amp;reset_tuner");' />
 				</td>
 		</table>
 	</form>
diff --git a/data/y-web/Y_Menue.yhtm b/data/y-web/Y_Menue.yhtm
index 6927125da..2639b6a43 100644
--- a/data/y-web/Y_Menue.yhtm
+++ b/data/y-web/Y_Menue.yhtm
@@ -107,7 +107,7 @@ function vlc() {
 			<td>
 				<span class="control_icon">
 					<a target="base" href="Y_Tools_Screenshot.yhtm?osd=1" title="{=L:main.remote_full_desc=}"><img src="/images/fb.png"></a>
-					<a target="blank" href="info/yinfo.yhtm" title="{=L:ni.infopage=}"><img src="/images/info.png"></a>
+					<a target="blank" href="info/yinfo.yhtm" title="{=L:infopage=}"><img src="/images/info.png"></a>
 					<a href="javascript:vlc()" title="{=L:main.stream_to_vlc_client_desc=}"><img src="/images/vlc.png"></a>
 				</span>
 			</td>
diff --git a/data/y-web/Y_Settings_Camds.yhtm b/data/y-web/Y_Settings_Camds.yhtm
index dc01f25fa..e3f59566d 100644
--- a/data/y-web/Y_Settings_Camds.yhtm
+++ b/data/y-web/Y_Settings_Camds.yhtm
@@ -42,7 +42,7 @@ input[type="button"], .tools select {
 				<td class="y_form_header">&nbsp;</td>
 				<td class="y_form_header">&nbsp;</td>
 				<td class="y_form_header">
-					<input type="button" value="{=L:ni.reset=}" title="{=L:ni.reset=}" onclick='Y_NI_Tools("softcamreset", 10000);' />
+					<input type="button" value="{=L:reset=}" title="{=L:reset=}" onclick='Y_NI_Tools("softcamreset", 10000);' />
 				</td>
 				<td class="y_form_header">&nbsp;</td>
 			</tr>
@@ -58,14 +58,14 @@ input[type="button"], .tools select {
 			{=if-equal:{=var-get:x_{=var-get:camd=}=}~true~
 				{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
 				<td>
-					<input type="button" value="{=L:ni.stop=}"  title="{=L:ni.stop=} {=var-get:camd=}"  onclick='Y_NI_Tools("{=var-get:camd=}stop", 10000);' />
+					<input type="button" value="{=L:stop=}"  title="{=L:stop=} {=var-get:camd=}"  onclick='Y_NI_Tools("{=var-get:camd=}stop", 10000);' />
 				</td>
 				<td>	
-					<input type="button" value="{=L:ni.reset=}" title="{=L:ni.reset=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}reset", 10000);' />
+					<input type="button" value="{=L:reset=}" title="{=L:reset=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}reset", 10000);' />
 				</td>
 				~
 				<td>
-					<input type="button" value="{=L:ni.start=}" title="{=L:ni.start=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}start", 10000);' />
+					<input type="button" value="{=L:start=}" title="{=L:start=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}start", 10000);' />
 				</td>
 				<td>
 				</td>
@@ -82,40 +82,40 @@ input[type="button"], .tools select {
 						<option onclick='return false;' selected>{=L:set.camd-tools=} {=var-get:camd=}</option>
 						<option onclick='return false;'> {=L:set.camd-tools.line=} </option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/keys/gbox_cfg","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: gbox_cfg
+							{=L:edit=}: gbox_cfg
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/keys/conax","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: conax
+							{=L:edit=}: conax
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/keys/constcw","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: constcw
+							{=L:edit=}: constcw
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/keys/crypto","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: crypto
+							{=L:edit=}: crypto
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/keys/cwshare.cfg","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: cwshare.cfg
+							{=L:edit=}: cwshare.cfg
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/keys/ignore.list","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: ignore.list
+							{=L:edit=}: ignore.list
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/keys/irdeto","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: irdeto
+							{=L:edit=}: irdeto
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/keys/nagra","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: nagra
+							{=L:edit=}: nagra
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/keys/nds","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: nds
+							{=L:edit=}: nds
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/keys/seca","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: seca
+							{=L:edit=}: seca
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/keys/softcam.cfg","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: softcam.cfg
+							{=L:edit=}: softcam.cfg
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/keys/via","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: via
+							{=L:edit=}: via
 						</option>
 						{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
 						<option> {=L:set.camd-tools.line=} </option>
@@ -162,14 +162,14 @@ input[type="button"], .tools select {
 			{=if-equal:{=var-get:x_{=var-get:camd=}=}~true~
 				{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
 				<td>
-					<input type="button" value="{=L:ni.stop=}"  title="{=L:ni.stop=} {=var-get:camd=}"  onclick='Y_NI_Tools("{=var-get:camd=}stop", 10000);' />
+					<input type="button" value="{=L:stop=}"  title="{=L:stop=} {=var-get:camd=}"  onclick='Y_NI_Tools("{=var-get:camd=}stop", 10000);' />
 				</td>
 				<td>	
-					<input type="button" value="{=L:ni.reset=}" title="{=L:ni.reset=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}reset", 10000);' />
+					<input type="button" value="{=L:reset=}" title="{=L:reset=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}reset", 10000);' />
 				</td>
 				~
 				<td>
-					<input type="button" value="{=L:ni.start=}" title="{=L:ni.start=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}start", 10000);' />
+					<input type="button" value="{=L:start=}" title="{=L:start=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}start", 10000);' />
 				</td>
 				<td>
 				</td>
@@ -186,22 +186,22 @@ input[type="button"], .tools select {
 						<option onclick='return false;' selected>{=L:set.camd-tools=} {=var-get:camd=}</option>
 						<option onclick='return false;'> {=L:set.camd-tools.line=} </option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/oscam.conf","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: oscam.conf
+							{=L:edit=}: oscam.conf
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/oscam.dvbapi","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: oscam.dvbapi
+							{=L:edit=}: oscam.dvbapi
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/oscam.server","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: oscam.server
+							{=L:edit=}: oscam.server
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/oscam.services","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: oscam.services
+							{=L:edit=}: oscam.services
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/oscam.srvid","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: oscam.srvid
+							{=L:edit=}: oscam.srvid
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/oscam.user","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: oscam.user
+							{=L:edit=}: oscam.user
 						</option>
 						{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
 						<option> {=L:set.camd-tools.line=} </option>
@@ -233,14 +233,14 @@ input[type="button"], .tools select {
 			{=if-equal:{=var-get:x_{=var-get:camd=}=}~true~
 				{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
 				<td>
-					<input type="button" value="{=L:ni.stop=}"  title="{=L:ni.stop=} {=var-get:camd=}"  onclick='Y_NI_Tools("{=var-get:camd=}stop", 10000);' />
+					<input type="button" value="{=L:stop=}"  title="{=L:stop=} {=var-get:camd=}"  onclick='Y_NI_Tools("{=var-get:camd=}stop", 10000);' />
 				</td>
 				<td>
-					<input type="button" value="{=L:ni.reset=}" title="{=L:ni.reset=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}reset", 10000);' />
+					<input type="button" value="{=L:reset=}" title="{=L:reset=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}reset", 10000);' />
 				</td>
 				~
 				<td>
-					<input type="button" value="{=L:ni.start=}" title="{=L:ni.start=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}start", 10000);' />
+					<input type="button" value="{=L:start=}" title="{=L:start=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}start", 10000);' />
 				</td>
 				<td>
 				</td>
@@ -257,22 +257,22 @@ input[type="button"], .tools select {
 						<option onclick='return false;' selected>{=L:set.camd-tools=} {=var-get:camd=}</option>
 						<option onclick='return false;'> {=L:set.camd-tools.line=} </option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/oscam.conf","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: oscam.conf
+							{=L:edit=}: oscam.conf
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/oscam.dvbapi","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: oscam.dvbapi
+							{=L:edit=}: oscam.dvbapi
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/oscam.server","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: oscam.server
+							{=L:edit=}: oscam.server
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/oscam.services","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: oscam.services
+							{=L:edit=}: oscam.services
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/oscam.srvid","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: oscam.srvid
+							{=L:edit=}: oscam.srvid
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/oscam.user","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: oscam.user
+							{=L:edit=}: oscam.user
 						</option>
 						{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
 						<option> {=L:set.camd-tools.line=} </option>
@@ -304,14 +304,14 @@ input[type="button"], .tools select {
 			{=if-equal:{=var-get:x_{=var-get:camd=}=}~true~
 				{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
 				<td>
-					<input type="button" value="{=L:ni.stop=}"  title="{=L:ni.stop=} {=var-get:camd=}"  onclick='Y_NI_Tools("{=var-get:camd=}stop", 10000);' />
+					<input type="button" value="{=L:stop=}"  title="{=L:stop=} {=var-get:camd=}"  onclick='Y_NI_Tools("{=var-get:camd=}stop", 10000);' />
 				</td>
 				<td>
-					<input type="button" value="{=L:ni.reset=}" title="{=L:ni.reset=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}reset", 10000);' />
+					<input type="button" value="{=L:reset=}" title="{=L:reset=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}reset", 10000);' />
 				</td>
 				~
 				<td>
-					<input type="button" value="{=L:ni.start=}" title="{=L:ni.start=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}start", 10000);' />
+					<input type="button" value="{=L:start=}" title="{=L:start=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}start", 10000);' />
 				</td>
 				<td>
 				</td>
@@ -328,22 +328,22 @@ input[type="button"], .tools select {
 						<option onclick='return false;' selected>{=L:set.camd-tools=} {=var-get:camd=}</option>
 						<option onclick='return false;'> {=L:set.camd-tools.line=} </option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/ncam.conf","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: ncam.conf
+							{=L:edit=}: ncam.conf
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/ncam.dvbapi","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: ncam.dvbapi
+							{=L:edit=}: ncam.dvbapi
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/ncam.server","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: ncam.server
+							{=L:edit=}: ncam.server
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/ncam.services","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: ncam.services
+							{=L:edit=}: ncam.services
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/ncam.srvid","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: ncam.srvid
+							{=L:edit=}: ncam.srvid
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/ncam.user","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: ncam.user
+							{=L:edit=}: ncam.user
 						</option>
 						{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
 						<option> {=L:set.camd-tools.line=} </option>
@@ -375,14 +375,14 @@ input[type="button"], .tools select {
 			{=if-equal:{=var-get:x_{=var-get:camd=}=}~true~
 				{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
 				<td>
-					<input type="button" value="{=L:ni.stop=}"  title="{=L:ni.stop=} {=var-get:camd=}"  onclick='Y_NI_Tools("{=var-get:camd=}stop", 10000);' />
+					<input type="button" value="{=L:stop=}"  title="{=L:stop=} {=var-get:camd=}"  onclick='Y_NI_Tools("{=var-get:camd=}stop", 10000);' />
 				</td>
 				<td>
-					<input type="button" value="{=L:ni.reset=}" title="{=L:ni.reset=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}reset", 10000);' />
+					<input type="button" value="{=L:reset=}" title="{=L:reset=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}reset", 10000);' />
 				</td>
 				~
 				<td>
-					<input type="button" value="{=L:ni.start=}" title="{=L:ni.start=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}start", 10000);' />
+					<input type="button" value="{=L:start=}" title="{=L:start=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}start", 10000);' />
 				</td>
 				<td>
 				</td>
@@ -399,16 +399,16 @@ input[type="button"], .tools select {
 						<option onclick='return false;' selected>{=L:set.camd-tools=} {=var-get:camd=}</option>
 						<option onclick='return false;'> {=L:set.camd-tools.line=} </option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/etc/CCcam.cfg","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: CCcam.cfg
+							{=L:edit=}: CCcam.cfg
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/etc/CCcam.channelinfo","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: CCcam.channelinfo
+							{=L:edit=}: CCcam.channelinfo
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/etc/CCcam.prio","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: CCcam.prio
+							{=L:edit=}: CCcam.prio
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/etc/CCcam.providers","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: CCcam.providers
+							{=L:edit=}: CCcam.providers
 						</option>
 						{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
 						<option> {=L:set.camd-tools.line=} </option>
@@ -440,14 +440,14 @@ input[type="button"], .tools select {
 			{=if-equal:{=var-get:x_{=var-get:camd=}=}~true~
 				{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
 				<td>
-					<input type="button" value="{=L:ni.stop=}"  title="{=L:ni.stop=} {=var-get:camd=}"  onclick='Y_NI_Tools("{=var-get:camd=}stop", 10000);' />
+					<input type="button" value="{=L:stop=}"  title="{=L:stop=} {=var-get:camd=}"  onclick='Y_NI_Tools("{=var-get:camd=}stop", 10000);' />
 				</td>
 				<td>
-					<input type="button" value="{=L:ni.reset=}" title="{=L:ni.reset=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}reset", 10000);' />
+					<input type="button" value="{=L:reset=}" title="{=L:reset=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}reset", 10000);' />
 				</td>
 				~
 				<td>
-					<input type="button" value="{=L:ni.start=}" title="{=L:ni.start=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}start", 10000);' />
+					<input type="button" value="{=L:start=}" title="{=L:start=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}start", 10000);' />
 				</td>
 				<td>
 				</td>
@@ -464,31 +464,31 @@ input[type="button"], .tools select {
 						<option onclick='return false;' selected>{=L:set.camd-tools=} {=var-get:camd=}</option>
 						<option onclick='return false;'> {=L:set.camd-tools.line=} </option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/doscam.cfg","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: doscam.cfg
+							{=L:edit=}: doscam.cfg
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/doscam.ac","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: doscam.ac
+							{=L:edit=}: doscam.ac
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/doscam.dvbapi","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: doscam.dvbapi
+							{=L:edit=}: doscam.dvbapi
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/doscam.guess","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: doscam.guess
+							{=L:edit=}: doscam.guess
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/doscam.provid","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: doscam.provid
+							{=L:edit=}: doscam.provid
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/doscam.services","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: doscam.services
+							{=L:edit=}: doscam.services
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/doscam.srvid","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: doscam.srvid
+							{=L:edit=}: doscam.srvid
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/doscam.tiers","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: doscam.tiers
+							{=L:edit=}: doscam.tiers
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/doscam.whitelist","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: doscam.whitelist
+							{=L:edit=}: doscam.whitelist
 						</option>
 						{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
 						<option> {=L:set.camd-tools.line=} </option>
@@ -516,14 +516,14 @@ input[type="button"], .tools select {
 			{=if-equal:{=var-get:x_{=var-get:camd=}=}~true~
 				{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
 				<td>
-					<input type="button" value="{=L:ni.stop=}"  title="{=L:ni.stop=} {=var-get:camd=}"  onclick='Y_NI_Tools("{=var-get:camd=}stop", 10000);' /> 
+					<input type="button" value="{=L:stop=}"  title="{=L:stop=} {=var-get:camd=}"  onclick='Y_NI_Tools("{=var-get:camd=}stop", 10000);' /> 
 				</td>                                                                                                                                               
 				<td>	                                                                                                                                            
-					<input type="button" value="{=L:ni.reset=}" title="{=L:ni.reset=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}reset", 10000);' />
+					<input type="button" value="{=L:reset=}" title="{=L:reset=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}reset", 10000);' />
 				</td>                                                                                                                                               
 				~                                                                                                                                                   
 				<td>                                                                                                                                                
-					<input type="button" value="{=L:ni.start=}" title="{=L:ni.start=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}start", 10000);' />
+					<input type="button" value="{=L:start=}" title="{=L:start=} {=var-get:camd=}" onclick='Y_NI_Tools("{=var-get:camd=}start", 10000);' />
 				</td>
 				<td>
 				</td>
@@ -540,31 +540,31 @@ input[type="button"], .tools select {
 						<option onclick='return false;' selected>{=L:set.camd-tools=} {=var-get:camd=}</option>
 						<option onclick='return false;'> {=L:set.camd-tools.line=} </option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/keys/mg_cfg","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: mg_cfg
+							{=L:edit=}: mg_cfg
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/keys/AutoRoll.Key","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: AutoRoll.Key
+							{=L:edit=}: AutoRoll.Key
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/keys/cccamd.list","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: cccamd.list
+							{=L:edit=}: cccamd.list
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/keys/ignore.list","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: ignore.list
+							{=L:edit=}: ignore.list
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/keys/newcamd.list","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: newcamd.list
+							{=L:edit=}: newcamd.list
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/keys/peer.cfg","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: peer.cfg
+							{=L:edit=}: peer.cfg
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/keys/priority.list","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: priority.list
+							{=L:edit=}: priority.list
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/keys/replace.list","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: replace.list
+							{=L:edit=}: replace.list
 						</option>
 						<option class="e" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/keys/SoftCam.Key","edit", "width=800,height=600,resizable=yes");'>
-							{=L:ni.edit=}: SoftCam.Key
+							{=L:edit=}: SoftCam.Key
 						</option>
 						{=if-equal:{=var-get:r_{=var-get:camd=}=}~true~
 						<option> {=L:set.camd-tools.line=} </option>
diff --git a/data/y-web/Y_Settings_Infoicons.yhtm b/data/y-web/Y_Settings_Infoicons.yhtm
index 330090417..05b971b2b 100644
--- a/data/y-web/Y_Settings_Infoicons.yhtm
+++ b/data/y-web/Y_Settings_Infoicons.yhtm
@@ -59,8 +59,8 @@ function do_submit()
 					{=L:set.infoicons.flagfiles=}
 				</td>
 				<td class="y_form_header">
-					<input type="button" value="{=L:ni.remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag0=} {=var-get:icons_flag1=} {=var-get:icons_flag2=} {=var-get:icons_flag3=} {=var-get:icons_flag4=} {=var-get:icons_flag5=} {=var-get:icons_flag6=} {=var-get:icons_flag7=}", 1500);' />
-					<input type="button" value="{=L:ni.create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag0=} {=var-get:icons_flag1=} {=var-get:icons_flag2=} {=var-get:icons_flag3=} {=var-get:icons_flag4=} {=var-get:icons_flag5=} {=var-get:icons_flag6=} {=var-get:icons_flag7=}", 1500);' />
+					<input type="button" value="{=L:remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag0=} {=var-get:icons_flag1=} {=var-get:icons_flag2=} {=var-get:icons_flag3=} {=var-get:icons_flag4=} {=var-get:icons_flag5=} {=var-get:icons_flag6=} {=var-get:icons_flag7=}", 1500);' />
+					<input type="button" value="{=L:create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag0=} {=var-get:icons_flag1=} {=var-get:icons_flag2=} {=var-get:icons_flag3=} {=var-get:icons_flag4=} {=var-get:icons_flag5=} {=var-get:icons_flag6=} {=var-get:icons_flag7=}", 1500);' />
 				</td>
 			</tr>
 			{=var-set:nr=0=}
@@ -82,8 +82,8 @@ function do_submit()
 					<input type="text" name="mode_icons_flag{=var-get:nr=}" size="30" value="{=var-get:icons_flag{=var-get:nr=}=}" title=""/>
 				</td>
 				<td>
-					<input type="button" value="{=L:ni.remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
-					<input type="button" value="{=L:ni.create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
 				</td>
 			</tr>
 			{=var-set:nr=1=}
@@ -105,8 +105,8 @@ function do_submit()
 					<input type="text" name="mode_icons_flag{=var-get:nr=}" size="30" value="{=var-get:icons_flag{=var-get:nr=}=}" title=""/>
 				</td>
 				<td>
-					<input type="button" value="{=L:ni.remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
-					<input type="button" value="{=L:ni.create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
 				</td>
 			</tr>
 			{=var-set:nr=2=}
@@ -128,8 +128,8 @@ function do_submit()
 					<input type="text" name="mode_icons_flag{=var-get:nr=}" size="30" value="{=var-get:icons_flag{=var-get:nr=}=}" title=""/>
 				</td>
 				<td>
-					<input type="button" value="{=L:ni.remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
-					<input type="button" value="{=L:ni.create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
 				</td>
 			</tr>
 			{=var-set:nr=3=}
@@ -151,8 +151,8 @@ function do_submit()
 					<input type="text" name="mode_icons_flag{=var-get:nr=}" size="30" value="{=var-get:icons_flag{=var-get:nr=}=}" title=""/>
 				</td>
 				<td>
-					<input type="button" value="{=L:ni.remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
-					<input type="button" value="{=L:ni.create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
 				</td>
 			</tr>
 			{=var-set:nr=4=}
@@ -174,8 +174,8 @@ function do_submit()
 					<input type="text" name="mode_icons_flag{=var-get:nr=}" size="30" value="{=var-get:icons_flag{=var-get:nr=}=}" title=""/>
 				</td>
 				<td>
-					<input type="button" value="{=L:ni.remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
-					<input type="button" value="{=L:ni.create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
 				</td>
 			</tr>
 			{=var-set:nr=5=}
@@ -197,8 +197,8 @@ function do_submit()
 					<input type="text" name="mode_icons_flag{=var-get:nr=}" size="30" value="{=var-get:icons_flag{=var-get:nr=}=}" title=""/>
 				</td>
 				<td>
-					<input type="button" value="{=L:ni.remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
-					<input type="button" value="{=L:ni.create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
 				</td>
 			</tr>
 			{=var-set:nr=6=}
@@ -220,8 +220,8 @@ function do_submit()
 					<input type="text" name="mode_icons_flag{=var-get:nr=}" size="30" value="{=var-get:icons_flag{=var-get:nr=}=}" title=""/>
 				</td>
 				<td>
-					<input type="button" value="{=L:ni.remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
-					<input type="button" value="{=L:ni.create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
 				</td>
 			</tr>
 			{=var-set:nr=7=}
@@ -243,16 +243,16 @@ function do_submit()
 					<input type="text" name="mode_icons_flag{=var-get:nr=}" size="30" value="{=var-get:icons_flag{=var-get:nr=}=}" title=""/>
 				</td>
 				<td>
-					<input type="button" value="{=L:ni.remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
-					<input type="button" value="{=L:ni.create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:remove=}" onclick='Y_NI_Tools("rm_icons_flag    {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
+					<input type="button" value="{=L:create=}" onclick='Y_NI_Tools("touch_icons_flag {=var-get:icons_flag{=var-get:nr=}=}", 500);' />
 				</td>
 			</tr>
 		</table>
 		<br/>
 		<input type="hidden" name="tmpl" value="Y_Settings_Infoicons.yhtm"/>
 		<input type="hidden" name="execute" value="func:infoicons_set_values"/>
-		<button type="button" ytype="save" title="{=L:save_values_desc=}" onClick="do_submit()">{=L:ni.save=}</button>
-		<button type="button" ytype="cancel" title="{=L:cancel=}" name="abort" onClick='window.document.location.href="/Y_Settings_Infoicons.yhtm"'>{=L:ni.cancel=}</button>
+		<button type="button" ytype="save" title="{=L:save_values_desc=}" onClick="do_submit()">{=L:save=}</button>
+		<button type="button" ytype="cancel" title="{=L:cancel=}" name="abort" onClick='window.document.location.href="/Y_Settings_Infoicons.yhtm"'>{=L:cancel=}</button>
 	</form>
 	</div>
 </div>
diff --git a/data/y-web/Y_Settings_Plugins.yhtm b/data/y-web/Y_Settings_Plugins.yhtm
index 61cb9e966..f4ae862ec 100644
--- a/data/y-web/Y_Settings_Plugins.yhtm
+++ b/data/y-web/Y_Settings_Plugins.yhtm
@@ -29,13 +29,13 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.fritzcallmonitor~
-					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_fcm_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_fcm_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_fcm_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_fcm_start", 5000);'/>
 					=}
 				</td>
 				<td>
-					<input type="button" value="{=L:ni.configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/FritzCallMonitor.cfg","edit", "width=800,height=600,resizable=yes");' />
+					<input type="button" value="{=L:configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/FritzCallMonitor.cfg","edit", "width=800,height=600,resizable=yes");' />
 				</td>
 				<td>
 					<input type="button" value="{=L:set.plugin-tools.fcm-addr=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/FritzCallMonitor.addr","edit", "width=800,height=600,resizable=yes");' />
@@ -49,13 +49,13 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.nfsd~
-					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_nfs_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_nfs_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_nfs_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_nfs_start", 5000);'/>
 					=}
 				</td>
 				<td>
-					<input type="button" value="{=L:ni.configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/etc/exports","edit", "width=800,height=600,resizable=yes");' />
+					<input type="button" value="{=L:configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/etc/exports","edit", "width=800,height=600,resizable=yes");' />
 				</td>
 				<td>
 				</td>
@@ -68,13 +68,13 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.samba~
-					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_samba_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_samba_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_samba_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_samba_start", 5000);'/>
 					=}
 				</td>
 				<td>
-					<input type="button" value="{=L:ni.configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file={=if-file-exists:/etc/samba/smb.conf~/etc/samba/smb.conf~/etc/smb.conf=}","edit", "width=800,height=600,resizable=yes");' />
+					<input type="button" value="{=L:configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file={=if-file-exists:/etc/samba/smb.conf~/etc/samba/smb.conf~/etc/smb.conf=}","edit", "width=800,height=600,resizable=yes");' />
 				</td>
 				<td>
 				</td>
@@ -87,13 +87,13 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.tuxcald~
-					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_tuxcald_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_tuxcald_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_tuxcald_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_tuxcald_start", 5000);'/>
 					=}
 				</td>
 				<td>
-					<input type="button" value="{=L:ni.configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/tuxcal/tuxcal.conf","edit", "width=800,height=600,resizable=yes");' />
+					<input type="button" value="{=L:configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/tuxcal/tuxcal.conf","edit", "width=800,height=600,resizable=yes");' />
 				</td>
 				<td>
 				</td>
@@ -106,13 +106,13 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.tuxmaild~
-					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_tuxmaild_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_tuxmaild_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_tuxmaild_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_tuxmaild_start", 5000);'/>
 					=}
 				</td>
 				<td>
-					<input type="button" value="{=L:ni.configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/tuxmail/tuxmail.conf","edit", "width=800,height=600,resizable=yes");' />
+					<input type="button" value="{=L:configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/tuxmail/tuxmail.conf","edit", "width=800,height=600,resizable=yes");' />
 				</td>
 				<td>
 				</td>
@@ -125,13 +125,13 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.inadyn~
-					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_inadyn_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_inadyn_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_inadyn_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_inadyn_start", 5000);'/>
 					=}
 				</td>
 				<td>
-					<input type="button" value="{=L:ni.configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/etc/inadyn.conf","edit", "width=800,height=600,resizable=yes");' />
+					<input type="button" value="{=L:configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/etc/inadyn.conf","edit", "width=800,height=600,resizable=yes");' />
 				</td>
 				<td>
 				</td>
@@ -144,9 +144,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.dropbear~
-					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_dropbear_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_dropbear_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_dropbear_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_dropbear_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -163,13 +163,13 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.ushare~
-					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_ushare_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_ushare_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_ushare_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_ushare_start", 5000);'/>
 					=}
 				</td>
 				<td>
-					<input type="button" value="{=L:ni.configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/etc/ushare.conf","edit", "width=800,height=600,resizable=yes");' />
+					<input type="button" value="{=L:configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/etc/ushare.conf","edit", "width=800,height=600,resizable=yes");' />
 				</td>
 				<td>
 				</td>
@@ -182,9 +182,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.minidlnad~
-					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_minidlna_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_minidlna_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_minidlna_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_minidlna_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -205,9 +205,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.djmount~
-					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_djmount_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_djmount_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_djmount_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_djmount_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -224,9 +224,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.xupnpd~
-					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_xupnpd_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_xupnpd_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_xupnpd_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_xupnpd_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -247,9 +247,9 @@
 				</td>
 				<td>
 					{=if-file-exists:/var/etc/.crond~
-					<input type="button" value="{=L:ni.stop=}" onclick='Y_NI_Tools("p_crond_stop", 5000);'/>
+					<input type="button" value="{=L:stop=}" onclick='Y_NI_Tools("p_crond_stop", 5000);'/>
 					~
-					<input type="button" value="{=L:ni.start=}" onclick='Y_NI_Tools("p_crond_start", 5000);'/>
+					<input type="button" value="{=L:start=}" onclick='Y_NI_Tools("p_crond_start", 5000);'/>
 					=}
 				</td>
 				<td>
@@ -274,7 +274,7 @@
 					&nbsp;
 				</td>
 				<td>
-					<input type="button" value="{=L:ni.configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/EPGscan.conf","edit", "width=800,height=600,resizable=yes");' />
+					<input type="button" value="{=L:configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/EPGscan.conf","edit", "width=800,height=600,resizable=yes");' />
 				</td>
 				<td>
 					<input type="button" value="{=L:set.plugin-tools.epgscan-dat=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/EPGscan.dat","edit", "width=800,height=600,resizable=yes");' />
@@ -290,7 +290,7 @@
 					&nbsp;
 				</td>
 				<td>
-					<input type="button" value="{=L:ni.configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/pr-auto-timer.conf","edit", "width=800,height=600,resizable=yes");' />
+					<input type="button" value="{=L:configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/pr-auto-timer.conf","edit", "width=800,height=600,resizable=yes");' />
 				</td>
 				<td>
 					<input type="button" value="{=L:set.plugin-tools.pat-rules=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/pr-auto-timer.rules","edit", "width=800,height=600,resizable=yes");' />
diff --git a/data/y-web/Y_Tools_NetFS.yhtm b/data/y-web/Y_Tools_NetFS.yhtm
index 4a039bf7c..e1f332989 100644
--- a/data/y-web/Y_Tools_NetFS.yhtm
+++ b/data/y-web/Y_Tools_NetFS.yhtm
@@ -68,7 +68,7 @@ function do_submit()
 				{=L:tools.netfs.entrys=} {=L:tools.netfs.{=mount_type=}=}
 			</td>
 			<td class="y_form_header">
-				<a href="javascript:edit_popup();" title="{=L:ni.edit=}: {=L:tools.netfs.{=mount_type=}=}">
+				<a href="javascript:edit_popup();" title="{=L:edit=}: {=L:tools.netfs.{=mount_type=}=}">
 					<img src="/images/modify.png">
 				</a>
 				{=if-equal:{=mount_type=}~0~
@@ -98,9 +98,9 @@ function do_submit()
 		{=var-set:nr=7=} {=include-block:Y_Blocks.txt;netfs_table_row=}
 	</table>
 	<br />
-	<button type="button" ytype="save" title="{=L:ni.save=}: {=L:tools.netfs.{=mount_type=}=}" onclick="$('out').update(''); goUrl('/y/cgi?execute=func:netfs_write_config {=mount_type=}')">{=L:ni.save=}</button>
+	<button type="button" ytype="save" title="{=L:save=}: {=L:tools.netfs.{=mount_type=}=}" onclick="$('out').update(''); goUrl('/y/cgi?execute=func:netfs_write_config {=mount_type=}')">{=L:save=}</button>
 	{=if-equal:{=mount_type=}~1~
-	<button type="button" ytype="refresh" title="{=L:tools.netfs.autofs_restart=}" onclick="Y_NI_Tools('do_autofs restart', 5000)">{=L:ni.reload=}</button>
+	<button type="button" ytype="refresh" title="{=L:tools.netfs.autofs_restart=}" onclick="Y_NI_Tools('do_autofs restart', 5000)">{=L:reload=}</button>
 	~
 	=}
 	</div>
diff --git a/data/y-web/Y_Tools_NetFS_edit.yhtm b/data/y-web/Y_Tools_NetFS_edit.yhtm
index f5a3ec885..8d8a5cf2c 100644
--- a/data/y-web/Y_Tools_NetFS_edit.yhtm
+++ b/data/y-web/Y_Tools_NetFS_edit.yhtm
@@ -25,7 +25,7 @@ function do_submit()
 {=var-set:wait_text={=L:tools.netfs.title=}<br/>=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:menu={=L:tools.netfs.title=} ({=L:ni.edit=}: {=L:tools.netfs.{=mount_type=}=} - {=nr=})=}{=include-block:Y_Blocks.txt;work_menu=}
+	{=var-set:menu={=L:tools.netfs.title=} ({=L:edit=}: {=L:tools.netfs.{=mount_type=}=} - {=nr=})=}{=include-block:Y_Blocks.txt;work_menu=}
 	</div></div>
 	<div class="work_box_body">
 	<form name="f" action="/y/cgi">
@@ -88,7 +88,7 @@ function do_submit()
 		<input type="hidden" name="tmpl" value="Y_Tools_NetFS.yhtm"/>
 		<input type="hidden" name="execute" value="func:netfs_set_values"/>
 		<button type="button" ytype="accept_" title="ok" onClick="do_submit()">OK</button>
-		<button type="button" ytype="cancel_" title="{=L:cancel=}" name="abort" onClick='window.document.location.href="/Y_Tools_NetFS.yhtm?mount_type={=mount_type=}&mount_type_s={=mount_type_s=}"'>{=L:ni.cancel=}</button>
+		<button type="button" ytype="cancel_" title="{=L:cancel=}" name="abort" onClick='window.document.location.href="/Y_Tools_NetFS.yhtm?mount_type={=mount_type=}&mount_type_s={=mount_type_s=}"'>{=L:cancel=}</button>
 	</form>
 	</div>
 </div>
diff --git a/data/y-web/languages/Deutsch b/data/y-web/languages/Deutsch
index db6fd18f8..201d2767e 100644
--- a/data/y-web/languages/Deutsch
+++ b/data/y-web/languages/Deutsch
@@ -51,6 +51,16 @@ automatic=automatisch
 unknown=unbekannt
 show=zeigen
 hide=verstecken
+edit=Bearbeiten
+remove=L&ouml;schen
+create=Anlegen
+start=Start
+stop=Stopp
+reset=Reset
+reload=Neu laden
+configure=Konfigurieren
+dblclick=Doppelklick erforderlich
+infopage=Infoseite
 
 # ===== Dates
 date.su=So
@@ -562,17 +572,3 @@ rc.key_picsize=Pic Size
 rc.key_picmode=Pic Mode
 rc.key_pos=Pos
 rc.key_recall=Recall
-
-# ===== NI
-ni.save=Speichern
-ni.cancel=Abbrechen
-ni.edit=Bearbeiten
-ni.remove=L&ouml;schen
-ni.create=Anlegen
-ni.start=Start
-ni.stop=Stopp
-ni.reset=Reset
-ni.reload=Neu laden
-ni.configure=Konfigurieren
-ni.dblclick=Doppelklick erforderlich
-ni.infopage=NI Infoseite
diff --git a/data/y-web/languages/English b/data/y-web/languages/English
index 944674874..c82a8213f 100644
--- a/data/y-web/languages/English
+++ b/data/y-web/languages/English
@@ -51,6 +51,16 @@ automatic=automatically
 unknown=unknown
 show=show
 hide=hide
+edit=Edit
+remove=Remove
+create=Create
+start=Start
+stop=Stop
+reset=Reset
+reload=Reload
+configure=Configure
+dblclick=Doubleclick required
+infopage=Infopage
 
 # ===== Dates
 date.su=Su
@@ -562,17 +572,3 @@ rc.key_picsize=Pic Size
 rc.key_picmode=Pic Mode
 rc.key_pos=Pos
 rc.key_recall=Recall
-
-# ===== NI
-ni.save=Save
-ni.cancel=Cancel
-ni.edit=Edit
-ni.remove=Remove
-ni.create=Create
-ni.start=Start
-ni.stop=Stop
-ni.reset=Reset
-ni.reload=Reload
-ni.configure=Configure
-ni.dblclick=Doubleclick required
-ni.infopage=NI Infopage