diff --git a/config/samba/default.pdc b/config/samba/default.pdc
index 887e387ea..1d1e89371 100644
--- a/config/samba/default.pdc
+++ b/config/samba/default.pdc
@@ -17,3 +17,4 @@ browseable = no
 writeable = yes
 comment = Benutzerprofile
 valid users = %S
+
diff --git a/config/samba/default.settings b/config/samba/default.settings
index 99f817eda..e69de29bb 100644
--- a/config/samba/default.settings
+++ b/config/samba/default.settings
@@ -1,16 +0,0 @@
-NETBIOSNAME=ipfire
-BINDINTERFACESONLY=True
-WINSSUPPORT=on
-WINSSRV=
-GUESTACCOUNT=samba
-BLUE=off
-SECURITY=share
-OTHERINTERFACES=
-WORKGRP=homeip.net
-GREEN=on
-OSLEVEL=33
-MAPTOGUEST='Bad User'
-SRVSTRING='Samba'
-INTERFACES=' eth0'
-VPN=off
-ORANGE=off
diff --git a/config/samba/default.shares b/config/samba/default.shares
index f7226df7c..3c93e895f 100644
--- a/config/samba/default.shares
+++ b/config/samba/default.shares
@@ -1,12 +1,11 @@
 [Temp]
-path = /var/samba/tmp
+path = /tmp
 comment = Temp
 browseable = yes
 writeable = yes
 create mask = 0777
 directory mask = 0777
 guest ok = yes
-public = yes
 force user = samba
 
 [P2P]
@@ -17,5 +16,4 @@ writeable = yes
 create mask = 0777
 directory mask = 0777
 guest ok = yes
-public = yes
 force user = samba
diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index e45ca26fd..d3e5b605d 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -23,7 +23,7 @@ my %ovpnsettings = ();
 my $message = "";
 my $errormessage = "";
 my @Logs = qx(ls /var/log/samba/);
-my $Log ='kein Log ausgewählt';
+my $Log =$Lang::tr{'no log selected'};
 my $defaultoption= "[Share]\npath = /var/samba/share1\ncomment = Share - Public Access\nbrowseable = yes\nwriteable = yes\ncreate mask = 0777\ndirectory mask = 0777\nguest ok = yes\npublic = yes\nforce user = samba";
 my $userentry = "";
 my @user = ();
@@ -81,13 +81,13 @@ $sambasettings{'WINSSRV'} = '';
 $sambasettings{'WINSSUPPORT'} = 'on';
 $sambasettings{'REMOTEANNOUNCE'} = '';
 $sambasettings{'PASSWORDSYNC'} = 'off';
-$sambasettings{'OTHERINTERFACES'} = '';
+$sambasettings{'OTHERINTERFACES'} = '127.0.0.1';
 $sambasettings{'GUESTACCOUNT'} = 'samba';
 $sambasettings{'MAPTOGUEST'} = 'Never';
-$sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:10 winbind:2';
+$sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2';
 ### Values that have to be initialized
 $sambasettings{'ACTION'} = '';
-$sambasettings{'LOGLINES'} = '15';
+my $LOGLINES = '50';
 
 ################################################## Samba PDC Variablen #####################################################
 
@@ -116,7 +116,7 @@ if ($sambasettings{'ACTION'} eq 'smbchangepw'){system("/usr/local/bin/sambactrl
 if ($sambasettings{'ACTION'} eq 'smbrestart'){system("/usr/local/bin/sambactrl smbrestart");}
 if ($sambasettings{'ACTION'} eq 'smbstart'){system("/usr/local/bin/sambactrl smbstart");}
 if ($sambasettings{'ACTION'} eq 'smbstop'){system("/usr/local/bin/sambactrl smbstop");}
-if ($sambasettings{'ACTION'} eq 'smbstop'){system("/usr/local/bin/sambactrl smbstop");}
+if ($sambasettings{'ACTION'} eq 'smbreload'){system("/usr/local/bin/sambactrl smbreload");}
 if ($sambasettings{'ACTION'} eq 'globalresetyes')
 	{
 	system("/usr/local/bin/sambactrl smbglobalreset");
@@ -134,10 +134,10 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes')
 	$sambasettings{'WINSSUPPORT'} = 'on';
 	$sambasettings{'REMOTEANNOUNCE'} = '';
 	$sambasettings{'PASSWORDSYNC'} = 'off';
-	$sambasettings{'OTHERINTERFACES'} = '';
+	$sambasettings{'OTHERINTERFACES'} = '127.0.0.1';
 	$sambasettings{'GUESTACCOUNT'} = 'samba';
 	$sambasettings{'MAPTOGUEST'} = 'Never';
-	$sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:10 winbind:2';
+	$sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2';
 ### Values that have to be initialized
 	$sambasettings{'ACTION'} = '';
 	$sambasettings{'LOCALMASTER'} = 'off';
@@ -501,7 +501,7 @@ $selected{'SECURITY'}{$sambasettings{'SECURITY'}} = "selected='selected'";
 ############################################################################################################################
 ################################### Aufbau der HTML Seite fr globale Sambaeinstellungen ###################################
 
-&Header::openbox('100%', 'center', 'Samba');
+&Header::openbox('100%', 'center', $Lang::tr{'samba'});
 print <<END
         <hr />
         <table width='95%' cellspacing='0'>
@@ -509,12 +509,12 @@ END
 ;
 if ( $message ne "" )
 	{
-	print "<tr><td colspan='2' align='left'><font color='red'>$message</font>";
+	print "<tr><td colspan='3' align='left'><font color='red'>$message</font>";
 	}
 
 print <<END
-<tr><td colspan='2'><br /></td></tr>
-<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>Alle Dienste</b></td></tr>
+<tr><td colspan='3'><br /></td></tr>
+<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'all services'}</b></td></tr>
 </table><table width='95%' cellspacing='0'>
 END
 ;
@@ -522,25 +522,18 @@ END
 my $key = '';
 foreach $key (sort keys %servicenames)
 	{
-	print "<tr><td align='left' width='40%'>$key";
+	print "<tr><td align='left' width='40%'>$key</td>";
 	my $shortname = $servicenames{$key};
 	my $status = &isrunning($shortname);
-	print "$status";
-	print <<END
-	<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-				<input type='hidden' name='ACTION' value='restart $shortname' />
-				<input type='image' src='/images/reload.gif' />
-	</form></td>
-END
-;
+	print "$status</tr>";
 	}
 
 print <<END
 <tr><td colspan='3'><br /></td></tr>
-<tr><td colspan='3' align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-																		<input type='submit' name='ACTION' value='Start' />
-																		<input type='submit' name='ACTION' value='Stop' />
-																		<input type='submit' name='ACTION' value='$Lang::tr{'restart'}' />
+<tr><td></td><td colspan='2' align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+																		<input type='submit' name='ACTION' value='smbstart' />
+																		<input type='submit' name='ACTION' value='smbstop' />
+																		<input type='submit' name='ACTION' value='smbrestart' />
 </form></td></tr>
 </table>
 
@@ -548,12 +541,12 @@ print <<END
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
 <table width='95%' cellspacing='0'>
 <tr><td colspan='2'><br /></td></tr>
-<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>Basisoptionen</b></td></tr>
-<tr><td align='left' width='40%'>Workgroup:</td><td align='left'><input type='text' name='WORKGRP' value='$sambasettings{'WORKGRP'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>NetBIOS-Name:</td><td align='left'><input type='text' name='NETBIOSNAME' value='$sambasettings{'NETBIOSNAME'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>Server-String:</td><td align='left'><input type='text' name='SRVSTRING' value='$sambasettings{'SRVSTRING'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>Log Level:</td><td align='left'><input type='text' name='LOGLEVEL' value='$sambasettings{'LOGLEVEL'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>Interfaces:</td><td align='left'>on <input type='radio' name='VPN' value='on' $checked{'VPN'}{'on'} />/
+<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'basic options'}</b></td></tr>
+<tr><td align='left' width='40%'>$Lang::tr{'workgroup'}</td><td align='left'><input type='text' name='WORKGRP' value='$sambasettings{'WORKGRP'}' size="30" /></td></tr>
+<tr><td align='left' width='40%'>$Lang::tr{'netbios name'}</td><td align='left'><input type='text' name='NETBIOSNAME' value='$sambasettings{'NETBIOSNAME'}' size="30" /></td></tr>
+<tr><td align='left' width='40%'>$Lang::tr{'server string'}</td><td align='left'><input type='text' name='SRVSTRING' value='$sambasettings{'SRVSTRING'}' size="30" /></td></tr>
+<tr><td align='left' width='40%'>$Lang::tr{'log level'}</td><td align='left'><input type='text' name='LOGLEVEL' value='$sambasettings{'LOGLEVEL'}' size="30" /></td></tr>
+<tr><td align='left' width='40%'>$Lang::tr{'interfaces'}</td><td align='left'>on <input type='radio' name='VPN' value='on' $checked{'VPN'}{'on'} />/
 																						<input type='radio' name='VPN' value='off' $checked{'VPN'}{'off'} /> off |
 																						<font size='2' color='$Header::colourovpn'><b>   OpenVpn  -  $ovpnsettings{'DDEVICE'}</b></font></td></tr>
 <tr><td align='left' width='40%'></td><td align='left'>on <input type='radio' name='GREEN' value='on' $checked{'GREEN'}{'on'} />/
@@ -583,32 +576,32 @@ END
 	}
 
 print <<END
-<tr><td align='center' width='40%'>weitere</td><td align='left'><input type='text' name='OTHERINTERFACES' value='$sambasettings{'OTHERINTERFACES'}' size="30" /></td></tr>
+<tr><td align='center' width='40%'>$Lang::tr{'more'}</td><td align='left'><input type='text' name='OTHERINTERFACES' value='$sambasettings{'OTHERINTERFACES'}' size="30" /></td></tr>
 <tr><td align='left'><br /></td><td></td></tr>
-<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>Sicherheitsoptionen</b></td></tr>
-<tr><td align='left' width='40%'>Security:</td><td align='left'><select name='SECURITY' style="width: 165px">
+<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'security options'}</b></td></tr>
+<tr><td align='left' width='40%'>$Lang::tr{'security'}</td><td align='left'><select name='SECURITY' style="width: 165px">
 																				<option value='share' $selected{'SECURITY'}{'share'}>Share</option>
 																				<option value='user' $selected{'SECURITY'}{'user'}>User</option>
 																				<option value='domain' $selected{'SECURITY'}{'domain'}>Domain</option>
 																				<option value='ADS' $selected{'SECURITY'}{'ADS'}>ADS</option>
 																				<option value='server' $selected{'SECURITY'}{'server'}>Server</option>
 																				</select></td></tr>
-<tr><td align='left' width='40%'>Map to guest:</td><td align='left'><select name='MAPTOGUEST' style="width: 165px">
+<tr><td align='left' width='40%'>$Lang::tr{'map to guest'}</td><td align='left'><select name='MAPTOGUEST' style="width: 165px">
 																						<option value='Never' $selected{'MAPTOGUEST'}{'Never'}>Never</option>
 																						<option value='Bad User' $selected{'MAPTOGUEST'}{'Bad User'}>Bad User</option>
 																						<option value='Bad Password' $selected{'MAPTOGUEST'}{'Bad Password'}>Bad Password</option>
 																						</select></td></tr>
-<tr><td align='left' width='40%'>Unix Passwort Sync:</td><td align='left'>on <input type='radio' name='PASSWORDSYNC' value='on' $checked{'PASSWORDSYNC'}{'on'} />/
+<tr><td align='left' width='40%'>$Lang::tr{'unix password sync'}</td><td align='left'>on <input type='radio' name='PASSWORDSYNC' value='on' $checked{'PASSWORDSYNC'}{'on'} />/
 																										<input type='radio' name='PASSWORDSYNC' value='off' $checked{'PASSWORDSYNC'}{'off'} /> off</td></tr>
 <tr><td align='left'><br /></td><td /></tr>
-<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>Netzwerkoptionen</b></td></tr>
-<tr><td align='left' width='40%'>OS Level:</td><td align='left'><input type='text' name='OSLEVEL' value='$sambasettings{'OSLEVEL'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>Remote Announce:</td><td align='left'><input type='text' name='REMOTEANNOUNCE' value='$sambasettings{'REMOTEANNOUNCE'}' size="30" /></td></tr>
+<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'network options'}</b></td></tr>
+<tr><td align='left' width='40%'>$Lang::tr{'os level'}</td><td align='left'><input type='text' name='OSLEVEL' value='$sambasettings{'OSLEVEL'}' size="30" /></td></tr>
+<tr><td align='left' width='40%'>$Lang::tr{'remote announce'}</td><td align='left'><input type='text' name='REMOTEANNOUNCE' value='$sambasettings{'REMOTEANNOUNCE'}' size="30" /></td></tr>
 END
 ;
-if ($sambasettings{'WINSSUPPORT'} eq 'off') {print"<tr><td align='left' width='40%'>WINS-Server:</td><td align='left'><input type='text' name='WINSSRV' value='$sambasettings{'WINSSRV'}' size='30' /></td></tr>";}
+if ($sambasettings{'WINSSUPPORT'} eq 'off') {print"<tr><td align='left' width='40%'>$Lang::tr{'wins server'}</td><td align='left'><input type='text' name='WINSSRV' value='$sambasettings{'WINSSRV'}' size='30' /></td></tr>";}
 	print <<END
-<tr><td align='left' width='40%'>WINS-Support:</td><td align='left'>on <input type='radio' name='WINSSUPPORT' value='on' $checked{'WINSSUPPORT'}{'on'} />/
+<tr><td align='left' width='40%'>$Lang::tr{'wins support'}</td><td align='left'>on <input type='radio' name='WINSSUPPORT' value='on' $checked{'WINSSUPPORT'}{'on'} />/
 																								<input type='radio' name='WINSSUPPORT' value='off' $checked{'WINSSUPPORT'}{'off'} /> off</td></tr>
 END
 ;
@@ -616,11 +609,11 @@ END
 if ($sambasettings{'SECURITY'} eq 'user')
 	{
 	print <<END
-<tr><td align='left' width='40%'>Local Master:</td><td align='left'>on <input type='radio' name='LOCALMASTER' value='on' $checked{'LOCALMASTER'}{'on'} />/
+<tr><td align='left' width='40%'>$Lang::tr{'local master'}</td><td align='left'>on <input type='radio' name='LOCALMASTER' value='on' $checked{'LOCALMASTER'}{'on'} />/
 																							<input type='radio' name='LOCALMASTER' value='off' $checked{'LOCALMASTER'}{'off'} /> off</td></tr>
-<tr><td align='left' width='40%'>Domain Master:</td><td align='left'>on <input type='radio' name='DOMAINMASTER' value='on' $checked{'DOMAINMASTER'}{'on'} />/
+<tr><td align='left' width='40%'>$Lang::tr{'domain master'}</td><td align='left'>on <input type='radio' name='DOMAINMASTER' value='on' $checked{'DOMAINMASTER'}{'on'} />/
 																								<input type='radio' name='DOMAINMASTER' value='off' $checked{'DOMAINMASTER'}{'off'} /> off</td></tr>
-<tr><td align='left' width='40%'>Preferred Master:</td><td align='left'>on <input type='radio' name='PREFERREDMASTER' value='on' $checked{'PREFERREDMASTER'}{'on'} />/
+<tr><td align='left' width='40%'>$Lang::tr{'prefered master'}</td><td align='left'>on <input type='radio' name='PREFERREDMASTER' value='on' $checked{'PREFERREDMASTER'}{'on'} />/
 																									<input type='radio' name='PREFERREDMASTER' value='off' $checked{'PREFERREDMASTER'}{'off'} /> off</td></tr>
 END
 ;
@@ -630,7 +623,7 @@ if ($sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'o
 	{
 	print <<END
 	<tr><td align='left'><br /></td><td></td></tr>
-	<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>PDC Optionen</b></td></tr>
+	<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'pdc options'}</b></td></tr>
 	<tr><td align='left'><br /></td><td></td></tr>
 	<tr><td colspan='2' align='center'><textarea name="PDCOPTIONS" cols="50" rows="15" Wrap="off">$PDCOPTIONS</textarea></td></tr>
 END
@@ -643,13 +636,13 @@ print <<END
 <tr><td colspan='3'><br /></td></tr>
 <tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 												<input type='hidden' name='ACTION' value=$Lang::tr{'save'} />
-												<input type='image' alt=$Lang::tr{'save'} src='/images/floppy.gif' /></form></td>
+												<input type='image' alt='$Lang::tr{'save'}' src='/images/floppy.gif' /></form></td>
 <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 										<input type='hidden' name='ACTION' value='globalreset' />
-										<input type='image' alt='Reset' src='/images/reload.gif' /></form></td>
+										<input type='image' alt='$Lang::tr{'reset'}' src='/images/reload.gif' /></form></td>
 <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 										<input type='hidden' name='ACTION' value='globalcaption' />
-										<input type='image' alt='Legende' src='/images/info.gif' /></form></td></tr>
+										<input type='image' alt='$Lang::tr{'caption'}' src='/images/info.gif' /></form></td></tr>
 </table>
 END
 ;
@@ -659,9 +652,9 @@ if ($sambasettings{'ACTION'} eq 'globalcaption')
 	print <<END
 	<table width='95%' cellspacing='0'>
 	<tr><td colspan='2'><br /></td></tr>
-	<tr><td align='center' colspan='2'><b>Legende:</b></td></tr>
-	<tr><td align='right' width='33%'><img src='/images/floppy.gif' /></td><td align='left'>Einstellungen speichern</td></tr>
-	<tr><td align='right' width='33%'><img src='/images/reload.gif' /></td><td align='left'>Auf default zurueck setzen</td></tr>
+	<tr><td align='center' colspan='2'><b>$Lang::tr{'caption'}</b></td></tr>
+	<tr><td align='right' width='33%'><img src='/images/floppy.gif' /></td><td align='left'>$Lang::tr{'save settings'}</td></tr>
+	<tr><td align='right' width='33%'><img src='/images/reload.gif' /></td><td align='left'>$Lang::tr{'restore settings'}</td></tr>
 	</table>
 END
 ;
@@ -676,19 +669,19 @@ if ($sambasettings{'SECURITY'} eq 'user')
 	{
 	if ($sambasettings{'DOMAINMASTER'} eq 'off')
 		{
-		&Header::openbox('100%', 'center', 'accounting - user Security none PDC mode');
+		&Header::openbox('100%', 'center', $Lang::tr{'accounting user nonpdc'});
 		}
 	else
 		{
-		&Header::openbox('100%', 'center', 'accounting - user Security PDC mode');
+		&Header::openbox('100%', 'center', $Lang::tr{'accounting user pdc'});
 		}
 	print <<END
 	<hr />
 	<table width='95%' cellspacing='0'>
 	<tr><td colspan='6'><br /></td></tr>
 	<tr><td colspan='6' align='left'></td></tr>
-	<tr><td bgcolor='${Header::table1colour}' colspan='7' align='left'><b>Benutzerverwaltung</b></td></tr>
-	<tr><td align='left'><u>Name</u></td><td align='left'><u>Passwort</u></td>
+	<tr><td bgcolor='${Header::table1colour}' colspan='7' align='left'><b>$Lang::tr{'accounting'}</b></td></tr>
+	<tr><td align='left'><u>$Lang::tr{'username'}</u></td><td align='left'><u>$Lang::tr{'password'}</u></td>
 END
 ;
 
@@ -701,7 +694,7 @@ END
 		print "<td align='left'><u>Typ</u></td>";
 		}
 
-	print "<td align='left'><u>Status</u></td><td colspan='3' width='5%' align='center'><u>Optionen</u></td></tr>";
+	print "<td align='left'><u>$Lang::tr{'interfaces'}</u></td><td colspan='3' width='5%' align='center'><u>$Lang::tr{'options'}</u></td></tr>";
 	system('/usr/local/bin/sambactrl readsmbpasswd');
 	open(FILE, "</var/ipfire/samba/private/smbpasswd") or die "Can't read user file: $!";
 	@user = <FILE>;
@@ -713,11 +706,11 @@ END
 		print "<tr><td align='left'>$userline[0]</td><td align='left'>";
 		if ($userline[4] =~ /N/)
 			{
-			print "nicht gesetzt</td><td align='left'>";
+			print "$Lang::tr{'not set'}</td><td align='left'>";
 			}
 		else
 			{
-			print "gesetzt</td><td align='left'>";
+			print "$Lang::tr{'set'}</td><td align='left'>";
 			}
 
 		if ($sambasettings{'DOMAINMASTER'} eq 'off')
@@ -728,11 +721,11 @@ END
 			{
 			if ($userline[0] =~ /\$/)
 				{
-				print "PC</td><td align='left'>";
+				print "$Lang::tr{'interfaces'}</td><td align='left'>";
 				}
 			else
 				{
-				print "User</td><td align='left'>";
+				print "$Lang::tr{'user'}</td><td align='left'>";
 				}
 			}
 
@@ -743,7 +736,7 @@ END
 			<td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 					<input type='hidden' name='NAME' value='$userline[0]' />
 					<input type='hidden' name='ACTION' value='smbuserenable' />
-					<input type='image' alt='Aktivieren' src='/images/on.gif' />
+					<input type='image' alt='$Lang::tr{'activate'}' src='/images/on.gif' />
 			</form></td>
 END
 ;
@@ -755,7 +748,7 @@ END
 			<td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 					<input type='hidden' name='NAME' value='$userline[0]' />
 					<input type='hidden' name='ACTION' value='smbuserdisable' />
-					<input type='image' alt='Deaktivieren' src='/images/off.gif' />
+					<input type='image' alt='$Lang::tr{'deactivate'}' src='/images/off.gif' />
 			</form></td>
 END
 ;
@@ -771,7 +764,7 @@ END
 			<td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 					<input type='hidden' name='NAME' value='$userline[0]' />
 					<input type='hidden' name='ACTION' value='userchangepw' />
-					<input type='image' alt='Bearbeiten' src='/images/edit.gif' />
+					<input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' />
 			</form></td>
 END
 ;
@@ -783,7 +776,7 @@ END
 				<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 						<input type='hidden' name='NAME' value='$userline[0]' />
 						<input type='hidden' name='ACTION' value='userdelete' />
-						<input type='image' alt='Loeschen' src='/images/network-error.png' />
+						<input type='image' alt='$Lang::tr{'delete'}' src='/images/network-error.png' />
 						</form></td></tr>
 END
 ;
@@ -794,7 +787,7 @@ END
 				<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 						<input type='hidden' name='NAME' value='$userline[0]' />
 						<input type='hidden' name='ACTION' value='userdelete' />
-						<input type='image' alt='Loeschen' src='/images/user-option-remove.png' />
+						<input type='image' alt='$Lang::tr{'delete'}' src='/images/user-option-remove.png' />
 				</form></td></tr>
 END
 ;
@@ -806,7 +799,7 @@ END
 	<tr><td colspan='3'><br /></td></tr>
 	<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 													<input type='hidden' name='ACTION' value='useradd' />
-													<input type='image' alt='Benutzer anlegen' src='/images/user-option-add.png' /></form></td>
+													<input type='image' alt='$Lang::tr{'add user'}' src='/images/user-option-add.png' /></form></td>
 END
 ;
 
@@ -815,14 +808,14 @@ END
 		print <<END
 		<td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 												<input type='hidden' name='ACTION' value='pcadd' />
-												<input type='image' alt='PC anlegen' src='/images/network.png' /></form>
+												<input type='image' alt='$Lang::tr{'add pc'}' src='/images/network.png' /></form>
 END
 ;
 		}
 	print <<END
 	<td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 											<input type='hidden' name='ACTION' value='usercaption' />
-											<input type='image' alt='Legende' src='/images/info.gif' /></form>
+											<input type='image' alt='$Lang::tr{'caption'}' src='/images/info.gif' /></form>
 	</td></tr>
 	</table>
 END
@@ -833,15 +826,15 @@ END
 		print <<END
 		<table width='95%' cellspacing='0'>
 		<tr><td align='center' colspan='2'><br /></td></tr>
-		<tr><td align='center' colspan='2'><b>Legende:</b></td></tr>
-		<tr><td align='right' width='33%'><img src='/images/user-option-add.png' /></td><td align='left'>Benutzer neu anlegen</td></tr>
-		<tr><td align='right' width='33%'><img src='/images/network.png' /></td><td align='left'>Client Account neu anlegen</td></tr>
-		<tr><td align='right' width='33%'><img src='/images/user-option-remove.png' /></td><td align='left'>Benutzer loeschen</td></tr>
-		<tr><td align='right' width='33%'><img src='/images/network-error.png' /></td><td align='left'>Client Account loeschen</td></tr>
-		<tr><td align='right' width='33%'><img src='/images/on.gif' /></td><td align='left'>Benutzer aktivieren</td></tr>
-		<tr><td align='right' width='33%'><img src='/images/off.gif' /></td><td align='left'>Benutzer deaktivieren</td></tr>
-		<tr><td align='right' width='33%'><img src='/images/edit.gif' /></td><td align='left'>Passwort wechseln</td></tr>
-		<tr><td align='right' width='33%'><img src='/images/floppy.gif' /></td><td align='left'>Einstellungen speichern</td></tr>
+		<tr><td align='center' colspan='2'><b>$Lang::tr{'caption'}</b></td></tr>
+		<tr><td align='right' width='33%'><img src='/images/user-option-add.png' /></td><td align='left'>$Lang::tr{'add user'}</td></tr>
+		<tr><td align='right' width='33%'><img src='/images/network.png' /></td><td align='left'>$Lang::tr{'add pc'}</td></tr>
+		<tr><td align='right' width='33%'><img src='/images/user-option-remove.png' /></td><td align='left'>$Lang::tr{'delete user'}</td></tr>
+		<tr><td align='right' width='33%'><img src='/images/network-error.png' /></td><td align='left'>$Lang::tr{'delete pc'}</td></tr>
+		<tr><td align='right' width='33%'><img src='/images/on.gif' /></td><td align='left'>$Lang::tr{'activate user'}</td></tr>
+		<tr><td align='right' width='33%'><img src='/images/off.gif' /></td><td align='left'>$Lang::tr{'deactivate user'}</td></tr>
+		<tr><td align='right' width='33%'><img src='/images/edit.gif' /></td><td align='left'>$Lang::tr{'change passwords'}</td></tr>
+		<tr><td align='right' width='33%'><img src='/images/floppy.gif' /></td><td align='left'>$Lang::tr{'save config'}</td></tr>
 		</table>
 END
 ;
@@ -856,9 +849,9 @@ END
 		<form method='post' action='$ENV{'SCRIPT_NAME'}'>
 		<table width='95%' cellspacing='0'>
 		<tr><td colspan='2'><br /></td></tr>
-		<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>Passwort wechseln</b></td></tr>
-		<tr><td align='left'>Benutzername</td><td><input type='text' name='USERNAME' value='$username' size='30' /></td></tr>
-		<tr><td align='left'>Passwort</td><td><input type='password' name='PASSWORD' value='$password' size='30' /></td></tr>
+		<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'change passwords'}</b></td></tr>
+		<tr><td align='left'>$Lang::tr{'username'}</td><td><input type='text' name='USERNAME' value='$username' size='30' /></td></tr>
+		<tr><td align='left'>$Lang::tr{'password'}</td><td><input type='password' name='PASSWORD' value='$password' size='30' /></td></tr>
 		<tr><td colspan='2' align='center'><input type='hidden' name='ACTION' value='smbchangepw' />
 																				<input type='image' alt=$Lang::tr{'save'} src='/images/floppy.gif' /></td></tr>
 		</table>
@@ -880,11 +873,11 @@ END
 		<form method='post' action='$ENV{'SCRIPT_NAME'}'>
 		<table width='95%' cellspacing='0'>
 		<tr><td colspan='2'><br /></td></tr>
-		<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>Benutzer neu anlegen</b></td></tr>
-		<tr><td align='left'>Benutzername</td><td><input type='text' name='USERNAME' value='$username' size='30' /></td></tr>
-		<tr><td align='left'>Passwort</td><td><input type='password' name='PASSWORD' value='$password' size='30' /></td></tr>
-		<tr><td align='left'>Unix Gruppe</td><td><input type='text' name='GROUP' value='sambauser' size='30' /></td></tr>
-		<tr><td align='left'>Unix Shell</td><td><input type='text' name='SHELL' value='/bin/false' size='30' /></td></tr>
+		<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'add user'}</b></td></tr>
+		<tr><td align='left'>$Lang::tr{'username'}</td><td><input type='text' name='USERNAME' value='$username' size='30' /></td></tr>
+		<tr><td align='left'>$Lang::tr{'password'}</td><td><input type='password' name='PASSWORD' value='$password' size='30' /></td></tr>
+		<tr><td align='left'>$Lang::tr{'unix group'}</td><td><input type='text' name='GROUP' value='sambauser' size='30' /></td></tr>
+		<tr><td align='left'>$Lang::tr{'unix shell'}</td><td><input type='text' name='SHELL' value='/bin/false' size='30' /></td></tr>
 		<tr><td colspan='2' align='center'><input type='hidden' name='ACTION' value='smbuseradd' />
 																				<input type='image' alt=$Lang::tr{'save'} src='/images/floppy.gif' /></td></tr>
 		</table>
@@ -903,10 +896,10 @@ END
 		<form method='post' action='$ENV{'SCRIPT_NAME'}'>
 		<table width='95%' cellspacing='0'>
 		<tr><td colspan='2'><br /></td></tr>
-		<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>Client Account neu anlegen</b></td></tr>
-		<tr><td align='left'>Clientname</td><td><input type='text' name='PCNAME' value='$pcname' size='30' /></td></tr>
-		<tr><td align='left'>Unix Gruppe</td><td><input type='text' name='GROUP' value='sambawks' size='30' /></td></tr>
-		<tr><td align='left'>Unix Shell</td><td><input type='text' name='SHELL' value='/bin/false' size='30' /></td></tr>
+		<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'pc add'}</b></td></tr>
+		<tr><td align='left'>$Lang::tr{'client'}</td><td><input type='text' name='PCNAME' value='$pcname' size='30' /></td></tr>
+		<tr><td align='left'>$Lang::tr{'unix group'}</td><td><input type='text' name='GROUP' value='sambawks' size='30' /></td></tr>
+		<tr><td align='left'>$Lang::tr{'unix shell'}</td><td><input type='text' name='SHELL' value='/bin/false' size='30' /></td></tr>
 		<tr><td colspan='2' align='center'><input type='hidden' name='ACTION' value='smbpcadd' />
 																				<input type='image' alt=$Lang::tr{'save'} src='/images/floppy.gif' /></td></tr>
 		</table>
@@ -921,14 +914,14 @@ END
 ############################################################################################################################
 ############################################### Verwalten von Freigaben ####################################################
 
-&Header::openbox('100%', 'center', 'Shares');
+&Header::openbox('100%', 'center', $Lang::tr{'shares'});
 
 print <<END
 <hr />
 <table width='95%' cellspacing='0'>
 <tr><td colspan='3'><br /></td></tr>
-<tr><td bgcolor='${Header::table1colour}' colspan='3' align='left'><b>Shareverwaltung</b>
-<tr><td align='left'><u>Names des Shares</u></td><td colspan='2' width="5%" align='center'><u>Optionen</u></td></tr>
+<tr><td bgcolor='${Header::table1colour}' colspan='3' align='left'><b>$Lang::tr{'manage shares'}</b>
+<tr><td align='left'><u>$Lang::tr{'sharename'}</u></td><td colspan='2' width="5%" align='center'><u>$Lang::tr{'options'}</u></td></tr>
 END
 ;
 
@@ -939,12 +932,12 @@ foreach $shareentry (sort @Shares)
 	<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 			<input type='hidden' name='NAME' value='$shareentry' />
 			<input type='hidden' name='ACTION' value='sharechange' />
-			<input type='image' alt='Bearbeiten' src='/images/edit.gif' />
+			<input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' />
 	</form></td>
 	<td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 			<input type='hidden' name='NAME' value='$shareentry' />
 			<input type='hidden' name='ACTION' value='smbsharedel' />
-			<input type='image' alt='Loeschen' src='/images/delete.gif' />
+			<input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' />
 	</form></td></tr>
 END
 ;
@@ -956,15 +949,15 @@ print <<END
 <tr><td colspan='3'><br /></td></tr>
 <tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 												<input type='hidden' name='ACTION' value='shareadd' />
-												<input type='image' alt='neuen Share anlegen' src='/images/add.gif' />
+												<input type='image' alt='$Lang::tr{'add share'}' src='/images/add.gif' />
 												</form></td>
 		<td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 												<input type='hidden' name='ACTION' value='sharesreset' />
-												<input type='image' alt='Reset' src='/images/reload.gif' />
+												<input type='image' alt='$Lang::tr{'reset'}' src='/images/reload.gif' />
 												</form></td>
 		<td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
 												<input type='hidden' name='ACTION' value='sharecaption' />
-												<input type='image' alt='Legende' src='/images/info.gif' />
+												<input type='image' alt='$Lang::tr{'caption'}' src='/images/info.gif' />
 												</form></td></tr>
 </table>
 END
@@ -976,11 +969,11 @@ if ($sambasettings{'ACTION'} eq 'sharecaption')
 	<table width='95%' cellspacing='0'>
 	<tr><td align='center' colspan='2'><br /></td></tr>
 	<tr><td align='center' colspan='2'><b>Legende:</b></td></tr>
-	<tr><td align='right' width='33%'><img src='/images/add.gif' /></td><td align='left'>Share neu anlegen</td></tr>
-	<tr><td align='right' width='33%'><img src='/images/edit.gif' /></td><td align='left'>Share bearbeiten</td></tr>
-	<tr><td align='right' width='33%'><img src='/images/floppy.gif' /></td><td align='left'>Einstellungen speichern</td></tr>
-	<tr><td align='right' width='33%'><img src='/images/reload.gif' /></td><td align='left'>Shares zurueck setzen</td></tr>
-	<tr><td align='right' width='33%'><img src='/images/delete.gif' /></td><td align='left'>Share loeschen</td></tr>
+	<tr><td align='right' width='33%'><img src='/images/add.gif' /></td><td align='left'>$Lang::tr{'add share'}</td></tr>
+	<tr><td align='right' width='33%'><img src='/images/edit.gif' /></td><td align='left'>$Lang::tr{'edit share'}</td></tr>
+	<tr><td align='right' width='33%'><img src='/images/floppy.gif' /></td><td align='left'>$Lang::tr{'save config'}</td></tr>
+	<tr><td align='right' width='33%'><img src='/images/reload.gif' /></td><td align='left'>$Lang::tr{'reset shares'}</td></tr>
+	<tr><td align='right' width='33%'><img src='/images/delete.gif' /></td><td align='left'>$Lang::tr{'delete share'}</td></tr>
 	</table>
 END
 ;
@@ -992,18 +985,18 @@ if ($sambasettings{'ACTION'} eq 'shareadd' || $sambasettings{'ACTION'} eq 'optio
 	<hr />
 	<table width='95%' cellspacing='0'>
 	<tr><td colspan='2'><br /></td></tr>
-	<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>neuen Share anlegen</b></td></tr>
+	<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'add share'}</b></td></tr>
 	<tr><td colspan='2' align='center'></td></tr>
-	<tr><td colspan='2' align='center'>Anzeige der Optionen fuer Shares<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+	<tr><td colspan='2' align='center'>$Lang::tr{'show share options'}<form method='post' action='$ENV{'SCRIPT_NAME'}'>
 																																			<input type='hidden' name='ACTION' value='optioncaption' />
-																																			<input type='image' alt='Legende' src='/images/info.gif' />
+																																			<input type='image' alt='$Lang::tr{'caption'}' src='/images/info.gif' />
 																																			</form></td></tr>
 	<form method='post' action='$ENV{'SCRIPT_NAME'}'><tr><td colspan='2' align='center'><textarea name="SHAREOPTION" cols="50" rows="15" Wrap="off">$defaultoption</textarea></td></tr>
 	</table>
 	<table width='10%' cellspacing='0'>
 	<tr><td><br /></td></tr>
 	<tr><td align='center'><input type='hidden' name='ACTION' value='smbshareadd' />
-													<input type='image' alt='Share hinzufuegen' src='/images/floppy.gif' /></td></tr></form>
+													<input type='image' alt='$Lang::tr{'add share'}' src='/images/floppy.gif' /></td></tr></form>
 	</table>
 END
 ;
@@ -1033,17 +1026,17 @@ if ($sambasettings{'ACTION'} eq 'sharechange' || $sambasettings{'ACTION'} eq 'op
 	<hr />
 	<table width='95%' cellspacing='0'>
 	<tr><td colspan='2'><br /></td></tr>
-	<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>Share bearbeiten</b></td></tr>
+	<tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>$Lang::tr{'edit share'}</b></td></tr>
 	<tr><td colspan='2' align='center'></td></tr>
-	<tr><td colspan='2' align='center'>Anzeige der Optionen fuer Shares<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+	<tr><td colspan='2' align='center'>$Lang::tr{'show share options'}<form method='post' action='$ENV{'SCRIPT_NAME'}'>
 																																			<input type='hidden' name='ACTION' value='optioncaption2' />
-																																			<input type='image' alt='Legende' src='/images/info.gif' /></form></td></tr>
+																																			<input type='image' alt='$Lang::tr{'caption'}' src='/images/info.gif' /></form></td></tr>
 	<tr><td colspan='2' align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'><textarea name="SHAREOPTION" cols="50" rows="15" Wrap="off">$shareoption</textarea></td></tr>
 	</table>
 	<table width='10%' cellspacing='0'>
 	<tr><td><br /></td></tr>
 	<tr><td align='center'><input type='hidden' name='NAME' value='$sambasettings{'NAME'}' />
-													<input type='image' alt='Share ändern' src='/images/floppy.gif' />
+													<input type='image' alt='$Lang::tr{'change share'}' src='/images/floppy.gif' />
 													<input type='hidden' name='ACTION' value='smbsharechange' /></form></td></tr>
 	</table>
 END
@@ -1055,15 +1048,15 @@ if ($sambasettings{'ACTION'} eq 'optioncaption' || $sambasettings{'ACTION'} eq '
 	print <<END
 	<table width='95%' cellspacing='0'>
 	<tr><td><br /></td></tr>
-	<tr><td><b>Legende:</b></td></tr>
-	<tr><td><u>Option</u></td><td><u>Bedeutung</u> / <u>Beispiel</u></td></tr>
-	<tr><td>comment</td><td>Kommentar</td></tr>
-	<tr><td></td><td>comment = Mein neues Share</td></tr>
+	<tr><td><b>$Lang::tr{'caption'}</b></td></tr>
+	<tr><td><u>$Lang::tr{'options'}</u></td><td><u>$Lang::tr{'meaning'}</u> / <u>$Lang::tr{'exampel'}</u></td></tr>
+	<tr><td>comment</td><td>$Lang::tr{'comment'}</td></tr>
+	<tr><td></td><td>comment = $Lang::tr{'my new share'}</td></tr>
 	<tr><td><br /></td><td></td></tr>
-	<tr><td>path</td><td>Pfad zum Verzeichnis</td></tr>
-	<tr><td></td><td>path = /share/neu</td></tr>
+	<tr><td>path</td><td>$Lang::tr{'path to directory'}</td></tr>
+	<tr><td></td><td>path = /tmp</td></tr>
 	<tr><td><br /></td><td></td></tr>
-	<tr><td>writeable</td><td>Verzeichnis schreibbar</td></tr>
+	<tr><td>writeable</td><td>$Lang::tr{'directory writeable'}</td></tr>
 	<tr><td></td><td>writeable = yes</td></tr>
 	<tr><td><br /></td><td></td></tr>
 	<tr><td>browseable</td><td>sichtbar in Verzeichnisliste</td></tr>
@@ -1075,34 +1068,34 @@ if ($sambasettings{'ACTION'} eq 'optioncaption' || $sambasettings{'ACTION'} eq '
 	<tr><td>valid users</td><td>Liste der Zugriffsberechtigten</td></tr>
 	<tr><td></td><td>valid users = samba, user1</td></tr>
 	<tr><td><br /></td><td></td></tr>
-	<tr><td>write list</td><td>Liste der Schreibberechtigten</td></tr>
+	<tr><td>write list</td><td>$Lang::tr{'visible in browselist'}</td></tr>
 	<tr><td></td><td>write list = samba</td></tr>
 	<tr><td><br /></td><td></td></tr>
-	<tr><td>hosts allow</td><td>nur die angegebenen Hosts drfen das Share benutzen</td></tr>
+	<tr><td>hosts allow</td><td>$Lang::tr{'host allow'}</td></tr>
 	<tr><td></td><td>hosts allow = localhost 192.168.1.1 192.168.2.0/24</td></tr>
 	<tr><td><br /></td><td></td></tr>
-	<tr><td>hosts deny</td><td>jede Maschine ausser diesen darf das Share benutzen</td></tr>
+	<tr><td>hosts deny</td><td>$Lang::tr{'host deny'}</td></tr>
 	<tr><td></td><td>hosts deny = 192.168.1.2 192.168.3.0/24</td></tr>
 	<tr><td><br /></td><td></td></tr>
-	<tr><td>read list</td><td>Liste der nur Leseberechtigten</td></tr>
+	<tr><td>read list</td><td>$Lang::tr{'read list'}</td></tr>
 	<tr><td></td><td>read list = user1</td></tr>
 	<tr><td><br /></td><td></td></tr>
-	<tr><td>admin users</td><td>Liste der Benutzer mit SuperUser Rechten</td></tr>
+	<tr><td>admin users</td><td>$Lang::tr{'admin users'}</td></tr>
 	<tr><td></td><td>admin users = user1</td></tr>
 	<tr><td><br /></td><td></td></tr>
-	<tr><td>invalid users</td><td>Liste der Benutzer denen der Zugriff verweigert wird</td></tr>
+	<tr><td>invalid users</td><td>$Lang::tr{'invalid users'}</td></tr>
 	<tr><td></td><td>invalid users = user2</td></tr>
 	<tr><td><br /></td><td></td></tr>
-	<tr><td>force user</td><td>Standartbenutzer fuer alle Dateien</td></tr>
+	<tr><td>force user</td><td>$Lang::tr{'force user'}</td></tr>
 	<tr><td></td><td>force user = samba</td></tr>
 	<tr><td><br /></td><td></td></tr>
-	<tr><td>directory mask</td><td>UNIX Verzeichnisberchtigung beim Erzeugen</td></tr>
+	<tr><td>directory mask</td><td>$Lang::tr{'directory mask'}</td></tr>
 	<tr><td></td><td>directory mask = 0777</td></tr>
 	<tr><td><br /></td><td></td></tr>
-	<tr><td>create mask</td><td>UNIX Dateiberchtigung beim Erzeugen</td></tr>
+	<tr><td>create mask</td><td>U$Lang::tr{'create mask'}</td></tr>
 	<tr><td></td><td>create mask = 0777</td></tr>
 	<tr><td><br /></td><td></td></tr>
-	<tr><td>guest ok</td><td>Annonymer Zugriff</td></tr>
+	<tr><td>guest ok</td><td>$Lang::tr{'guest ok'}</td></tr>
 	<tr><td></td><td>guest ok = yes</td></tr>
 	</table>
 END
@@ -1120,7 +1113,7 @@ print <<END
 <hr />
 <table width='95%' cellspacing='0'>
 <tr><td colspan='4'  align='left'><br /></td></tr>
-<tr><td bgcolor='${Header::table1colour}' colspan='3' align='left'><b>Samba Status</b></td></tr>
+<tr><td bgcolor='${Header::table1colour}' colspan='3' align='left'><b>$Lang::tr{'samba status'}</b></td></tr>
 <tr><td  align='left'>$Status</td></tr>
 </table>
 END
@@ -1133,18 +1126,18 @@ END
 
 if ($sambasettings{'ACTION'} eq 'showlog')
 {
-$Log = qx(tail -n $sambasettings{'LOGLINES'} /var/log/samba/$sambasettings{'LOG'});
+$Log = qx(tail -n $LOGLINES /var/log/samba/$sambasettings{'LOG'});
 $Log=~s/\n/<br \/>/g;
 }
 
-&Header::openbox('100%', 'center', 'Logs');
+&Header::openbox('100%', 'center', $Lang::tr{'log'});
 
 print <<END
 <hr />
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
 <table width='95%' cellspacing='0'>
 <tr><td colspan='3'  align='left'><br /></td></tr>
-<tr><td bgcolor='${Header::table1colour}' colspan='3' align='left'><b>Loganzeige</b></td></tr>
+<tr><td bgcolor='${Header::table1colour}' colspan='3' align='left'><b>$Lang::tr{'log view'}</b></td></tr>
 <tr><td colspan='3'  align='left'><br /></td></tr>
 <tr><td  align='left'><select name='LOG' style="width: 200px">
 END
@@ -1152,8 +1145,8 @@ END
 foreach my $log (@Logs) {chomp $log;print"<option value='$log'>$log</option>";}
 print <<END
 
-</select></td><td  align='left'>anzeige der letzen x Zeilen <input type='text' name='LOGLINES' value='$sambasettings{'LOGLINES'}' size="3" /></td>
-			<td  align='left'><input type='submit' name='ACTION' value='showlog' /></td></tr>
+</select></td><td  align='left'>$Lang::tr{'show last x lines'}<input type='text' name='LOGLINES' value='$LOGLINES' size="3" /></td>
+			<td  align='left'><input type='hidden' name='ACTION' value='showlog' /><input type='image' alt='view Log' src='/images/document-open.png' /></td></tr>
 <tr><td colspan='3'  align='left'><br /></td></tr>
 <tr><td colspan='3'  align='left'><font size=2>$Log</font></td></tr>
 <tr><td colspan='3'  align='left'><br /></td></tr>
diff --git a/html/html/images/Makefile.am b/html/html/images/Makefile.am
new file mode 100755
index 000000000..4fb6083ff
--- /dev/null
+++ b/html/html/images/Makefile.am
@@ -0,0 +1,82 @@
+
+size = 16x16
+context = actions
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA =				\
+	address-book-new.png		\
+	appointment-new.png		\
+	bookmark-new.png		\
+	contact-new.png			\
+	document-new.png		\
+	document-open.png		\
+	document-print.png		\
+	document-print-preview.png	\
+	document-properties.png		\
+	document-save.png		\
+	document-save-as.png		\
+	edit-clear.png			\
+	edit-copy.png			\
+	edit-cut.png			\
+	edit-delete.png	\
+	edit-find.png			\
+	edit-find-replace.png			\
+	edit-paste.png			\
+	edit-redo.png			\
+	edit-select-all.png	\
+	edit-undo.png			\
+	folder-new.png			\
+	format-indent-less.png		\
+	format-indent-more.png		\
+	format-justify-center.png	\
+	format-justify-fill.png		\
+	format-justify-left.png		\
+	format-justify-right.png	\
+	format-text-bold.png		\
+	format-text-italic.png		\
+	format-text-strikethrough.png	\
+	format-text-underline.png	\
+	go-bottom.png			\
+	go-down.png			\
+	go-first.png			\
+	go-home.png			\
+	go-jump.png			\
+	go-last.png			\
+	go-next.png			\
+	go-previous.png			\
+	go-top.png			\
+	go-up.png			\
+	list-add.png	\
+	list-remove.png	\
+	mail-forward.png	\
+	mail-message-new.png		\
+	mail-mark-junk.png	\
+	mail-mark-not-junk.png	\
+	mail-reply-all.png	\
+	mail-reply-sender.png	\
+	mail-send-receive.png	\
+	media-eject.png	\
+	media-playback-pause.png	\
+	media-playback-start.png	\
+	media-playback-stop.png		\
+	media-record.png		\
+	media-seek-backward.png		\
+	media-seek-forward.png		\
+	media-skip-backward.png		\
+	media-skip-forward.png		\
+	process-stop.png		\
+	system-lock-screen.png		\
+	system-log-out.png		\
+	system-search.png		\
+	system-shutdown.png		\
+	tab-new.png			\
+	view-fullscreen.png		\
+	view-refresh.png 		\
+	window-new.png	
+
+EXTRA_DIST =				\
+	$(icons_DATA)
+
+install-data-local: install-iconsDATA
+	(cd $(DESTDIR)$(themedir)/$(size) && $(ICONMAP) -c $(context))
diff --git a/html/html/images/accessories-calculator.png b/html/html/images/accessories-calculator.png
new file mode 100755
index 000000000..9248971a9
Binary files /dev/null and b/html/html/images/accessories-calculator.png differ
diff --git a/html/html/images/accessories-character-map.png b/html/html/images/accessories-character-map.png
new file mode 100755
index 000000000..5dd11246f
Binary files /dev/null and b/html/html/images/accessories-character-map.png differ
diff --git a/html/html/images/accessories-text-editor.png b/html/html/images/accessories-text-editor.png
new file mode 100755
index 000000000..188e1c12b
Binary files /dev/null and b/html/html/images/accessories-text-editor.png differ
diff --git a/html/html/images/address-book-new.png b/html/html/images/address-book-new.png
new file mode 100755
index 000000000..2098cfdf3
Binary files /dev/null and b/html/html/images/address-book-new.png differ
diff --git a/html/html/images/application-certificate.png b/html/html/images/application-certificate.png
new file mode 100755
index 000000000..486913d9f
Binary files /dev/null and b/html/html/images/application-certificate.png differ
diff --git a/html/html/images/application-x-executable.png b/html/html/images/application-x-executable.png
new file mode 100755
index 000000000..003ded243
Binary files /dev/null and b/html/html/images/application-x-executable.png differ
diff --git a/html/html/images/applications-accessories.png b/html/html/images/applications-accessories.png
new file mode 100755
index 000000000..c8d899cff
Binary files /dev/null and b/html/html/images/applications-accessories.png differ
diff --git a/html/html/images/applications-development.png b/html/html/images/applications-development.png
new file mode 100755
index 000000000..437522777
Binary files /dev/null and b/html/html/images/applications-development.png differ
diff --git a/html/html/images/applications-games.png b/html/html/images/applications-games.png
new file mode 100755
index 000000000..4ba874bcb
Binary files /dev/null and b/html/html/images/applications-games.png differ
diff --git a/html/html/images/applications-graphics.png b/html/html/images/applications-graphics.png
new file mode 100755
index 000000000..4bb955f0e
Binary files /dev/null and b/html/html/images/applications-graphics.png differ
diff --git a/html/html/images/applications-internet.png b/html/html/images/applications-internet.png
new file mode 100755
index 000000000..a5889683a
Binary files /dev/null and b/html/html/images/applications-internet.png differ
diff --git a/html/html/images/applications-multimedia.png b/html/html/images/applications-multimedia.png
new file mode 100755
index 000000000..3e4ced5b6
Binary files /dev/null and b/html/html/images/applications-multimedia.png differ
diff --git a/html/html/images/applications-office.png b/html/html/images/applications-office.png
new file mode 100755
index 000000000..f9b3bb9fb
Binary files /dev/null and b/html/html/images/applications-office.png differ
diff --git a/html/html/images/applications-other.png b/html/html/images/applications-other.png
new file mode 100755
index 000000000..0d49f9dfd
Binary files /dev/null and b/html/html/images/applications-other.png differ
diff --git a/html/html/images/applications-system.png b/html/html/images/applications-system.png
new file mode 100755
index 000000000..d90ab661c
Binary files /dev/null and b/html/html/images/applications-system.png differ
diff --git a/html/html/images/appointment-new.png b/html/html/images/appointment-new.png
new file mode 100755
index 000000000..18b7c6781
Binary files /dev/null and b/html/html/images/appointment-new.png differ
diff --git a/html/html/images/audio-card.png b/html/html/images/audio-card.png
new file mode 100755
index 000000000..aaa790700
Binary files /dev/null and b/html/html/images/audio-card.png differ
diff --git a/html/html/images/audio-input-microphone.png b/html/html/images/audio-input-microphone.png
new file mode 100755
index 000000000..53a039317
Binary files /dev/null and b/html/html/images/audio-input-microphone.png differ
diff --git a/html/html/images/audio-volume-high.png b/html/html/images/audio-volume-high.png
new file mode 100755
index 000000000..ec8f00b4a
Binary files /dev/null and b/html/html/images/audio-volume-high.png differ
diff --git a/html/html/images/audio-volume-low.png b/html/html/images/audio-volume-low.png
new file mode 100755
index 000000000..4d7239ff6
Binary files /dev/null and b/html/html/images/audio-volume-low.png differ
diff --git a/html/html/images/audio-volume-medium.png b/html/html/images/audio-volume-medium.png
new file mode 100755
index 000000000..36ca7b080
Binary files /dev/null and b/html/html/images/audio-volume-medium.png differ
diff --git a/html/html/images/audio-volume-muted.png b/html/html/images/audio-volume-muted.png
new file mode 100755
index 000000000..af5a97b5a
Binary files /dev/null and b/html/html/images/audio-volume-muted.png differ
diff --git a/html/html/images/audio-x-generic.png b/html/html/images/audio-x-generic.png
new file mode 100755
index 000000000..fd877cb8d
Binary files /dev/null and b/html/html/images/audio-x-generic.png differ
diff --git a/html/html/images/battery-caution.png b/html/html/images/battery-caution.png
new file mode 100755
index 000000000..53a27d165
Binary files /dev/null and b/html/html/images/battery-caution.png differ
diff --git a/html/html/images/battery.png b/html/html/images/battery.png
new file mode 100755
index 000000000..8684e2a1b
Binary files /dev/null and b/html/html/images/battery.png differ
diff --git a/html/html/images/bookmark-new.png b/html/html/images/bookmark-new.png
new file mode 100755
index 000000000..6cf6443a2
Binary files /dev/null and b/html/html/images/bookmark-new.png differ
diff --git a/html/html/images/camera-photo.png b/html/html/images/camera-photo.png
new file mode 100755
index 000000000..1e8e88636
Binary files /dev/null and b/html/html/images/camera-photo.png differ
diff --git a/html/html/images/camera-video.png b/html/html/images/camera-video.png
new file mode 100755
index 000000000..98fc21148
Binary files /dev/null and b/html/html/images/camera-video.png differ
diff --git a/html/html/images/computer.png b/html/html/images/computer.png
new file mode 100755
index 000000000..c9cc93eff
Binary files /dev/null and b/html/html/images/computer.png differ
diff --git a/html/html/images/contact-new.png b/html/html/images/contact-new.png
new file mode 100755
index 000000000..46573fff6
Binary files /dev/null and b/html/html/images/contact-new.png differ
diff --git a/html/html/images/dialog-information.png b/html/html/images/dialog-information.png
new file mode 100755
index 000000000..8851b99ba
Binary files /dev/null and b/html/html/images/dialog-information.png differ
diff --git a/html/html/images/dialog-warning.png b/html/html/images/dialog-warning.png
new file mode 100755
index 000000000..a9e4ff399
Binary files /dev/null and b/html/html/images/dialog-warning.png differ
diff --git a/html/html/images/document-new.png b/html/html/images/document-new.png
new file mode 100755
index 000000000..4c3efdd6f
Binary files /dev/null and b/html/html/images/document-new.png differ
diff --git a/html/html/images/document-open.png b/html/html/images/document-open.png
new file mode 100755
index 000000000..69dd8d483
Binary files /dev/null and b/html/html/images/document-open.png differ
diff --git a/html/html/images/document-print-preview.png b/html/html/images/document-print-preview.png
new file mode 100755
index 000000000..ab92a309c
Binary files /dev/null and b/html/html/images/document-print-preview.png differ
diff --git a/html/html/images/document-print.png b/html/html/images/document-print.png
new file mode 100755
index 000000000..35c37bd73
Binary files /dev/null and b/html/html/images/document-print.png differ
diff --git a/html/html/images/document-properties.png b/html/html/images/document-properties.png
new file mode 100755
index 000000000..ab0e8ea37
Binary files /dev/null and b/html/html/images/document-properties.png differ
diff --git a/html/html/images/document-save-as.png b/html/html/images/document-save-as.png
new file mode 100755
index 000000000..9bed1436e
Binary files /dev/null and b/html/html/images/document-save-as.png differ
diff --git a/html/html/images/document-save.png b/html/html/images/document-save.png
new file mode 100755
index 000000000..22ff49571
Binary files /dev/null and b/html/html/images/document-save.png differ
diff --git a/html/html/images/drive-harddisk.png b/html/html/images/drive-harddisk.png
new file mode 100755
index 000000000..5c3b8587f
Binary files /dev/null and b/html/html/images/drive-harddisk.png differ
diff --git a/html/html/images/drive-optical.png b/html/html/images/drive-optical.png
new file mode 100755
index 000000000..4ced6fe4f
Binary files /dev/null and b/html/html/images/drive-optical.png differ
diff --git a/html/html/images/drive-removable-media.png b/html/html/images/drive-removable-media.png
new file mode 100755
index 000000000..915389828
Binary files /dev/null and b/html/html/images/drive-removable-media.png differ
diff --git a/html/html/images/edit-clear.png b/html/html/images/edit-clear.png
new file mode 100755
index 000000000..e6c8e8b9f
Binary files /dev/null and b/html/html/images/edit-clear.png differ
diff --git a/html/html/images/edit-copy.png b/html/html/images/edit-copy.png
new file mode 100755
index 000000000..8dd48c494
Binary files /dev/null and b/html/html/images/edit-copy.png differ
diff --git a/html/html/images/edit-cut.png b/html/html/images/edit-cut.png
new file mode 100755
index 000000000..dc9eb9a7a
Binary files /dev/null and b/html/html/images/edit-cut.png differ
diff --git a/html/html/images/edit-delete.png b/html/html/images/edit-delete.png
new file mode 100755
index 000000000..ea03150a1
Binary files /dev/null and b/html/html/images/edit-delete.png differ
diff --git a/html/html/images/edit-find-replace.png b/html/html/images/edit-find-replace.png
new file mode 100755
index 000000000..6edbef614
Binary files /dev/null and b/html/html/images/edit-find-replace.png differ
diff --git a/html/html/images/edit-find.png b/html/html/images/edit-find.png
new file mode 100755
index 000000000..d072d3cbe
Binary files /dev/null and b/html/html/images/edit-find.png differ
diff --git a/html/html/images/edit-paste.png b/html/html/images/edit-paste.png
new file mode 100755
index 000000000..24588a3a4
Binary files /dev/null and b/html/html/images/edit-paste.png differ
diff --git a/html/html/images/edit-select-all.png b/html/html/images/edit-select-all.png
new file mode 100755
index 000000000..f4b0b19e0
Binary files /dev/null and b/html/html/images/edit-select-all.png differ
diff --git a/html/html/images/edit-undo.png b/html/html/images/edit-undo.png
new file mode 100755
index 000000000..8b0fef9a8
Binary files /dev/null and b/html/html/images/edit-undo.png differ
diff --git a/html/html/images/emblem-favorite.png b/html/html/images/emblem-favorite.png
new file mode 100755
index 000000000..55642d55a
Binary files /dev/null and b/html/html/images/emblem-favorite.png differ
diff --git a/html/html/images/emblem-important.png b/html/html/images/emblem-important.png
new file mode 100755
index 000000000..81e9ed29a
Binary files /dev/null and b/html/html/images/emblem-important.png differ
diff --git a/html/html/images/emblem-photos.png b/html/html/images/emblem-photos.png
new file mode 100755
index 000000000..ab4046363
Binary files /dev/null and b/html/html/images/emblem-photos.png differ
diff --git a/html/html/images/emblem-readonly.png b/html/html/images/emblem-readonly.png
new file mode 100755
index 000000000..04666196e
Binary files /dev/null and b/html/html/images/emblem-readonly.png differ
diff --git a/html/html/images/emblem-symbolic-link.png b/html/html/images/emblem-symbolic-link.png
new file mode 100755
index 000000000..800b9e848
Binary files /dev/null and b/html/html/images/emblem-symbolic-link.png differ
diff --git a/html/html/images/emblem-system.png b/html/html/images/emblem-system.png
new file mode 100755
index 000000000..259ed26dd
Binary files /dev/null and b/html/html/images/emblem-system.png differ
diff --git a/html/html/images/emblem-unreadable.png b/html/html/images/emblem-unreadable.png
new file mode 100755
index 000000000..93edaf03f
Binary files /dev/null and b/html/html/images/emblem-unreadable.png differ
diff --git a/html/html/images/face-angel.png b/html/html/images/face-angel.png
new file mode 100755
index 000000000..d2c5e940d
Binary files /dev/null and b/html/html/images/face-angel.png differ
diff --git a/html/html/images/face-crying.png b/html/html/images/face-crying.png
new file mode 100755
index 000000000..a7e3f49fb
Binary files /dev/null and b/html/html/images/face-crying.png differ
diff --git a/html/html/images/face-devil-grin.png b/html/html/images/face-devil-grin.png
new file mode 100755
index 000000000..8e2cd4584
Binary files /dev/null and b/html/html/images/face-devil-grin.png differ
diff --git a/html/html/images/face-glasses.png b/html/html/images/face-glasses.png
new file mode 100755
index 000000000..d13f2c8c7
Binary files /dev/null and b/html/html/images/face-glasses.png differ
diff --git a/html/html/images/face-grin.png b/html/html/images/face-grin.png
new file mode 100755
index 000000000..d15cf2d45
Binary files /dev/null and b/html/html/images/face-grin.png differ
diff --git a/html/html/images/face-kiss.png b/html/html/images/face-kiss.png
new file mode 100755
index 000000000..809c1cf77
Binary files /dev/null and b/html/html/images/face-kiss.png differ
diff --git a/html/html/images/face-monkey.png b/html/html/images/face-monkey.png
new file mode 100755
index 000000000..69db8fa5b
Binary files /dev/null and b/html/html/images/face-monkey.png differ
diff --git a/html/html/images/face-plain.png b/html/html/images/face-plain.png
new file mode 100755
index 000000000..a6761bd10
Binary files /dev/null and b/html/html/images/face-plain.png differ
diff --git a/html/html/images/face-sad.png b/html/html/images/face-sad.png
new file mode 100755
index 000000000..fa258956a
Binary files /dev/null and b/html/html/images/face-sad.png differ
diff --git a/html/html/images/face-smile-big.png b/html/html/images/face-smile-big.png
new file mode 100755
index 000000000..4cebcff64
Binary files /dev/null and b/html/html/images/face-smile-big.png differ
diff --git a/html/html/images/face-smile.png b/html/html/images/face-smile.png
new file mode 100755
index 000000000..01e01170d
Binary files /dev/null and b/html/html/images/face-smile.png differ
diff --git a/html/html/images/face-surprise.png b/html/html/images/face-surprise.png
new file mode 100755
index 000000000..863f30484
Binary files /dev/null and b/html/html/images/face-surprise.png differ
diff --git a/html/html/images/face-wink.png b/html/html/images/face-wink.png
new file mode 100755
index 000000000..46be68557
Binary files /dev/null and b/html/html/images/face-wink.png differ
diff --git a/html/html/images/folder-drag-accept.png b/html/html/images/folder-drag-accept.png
new file mode 100755
index 000000000..4a6c897b6
Binary files /dev/null and b/html/html/images/folder-drag-accept.png differ
diff --git a/html/html/images/folder-new.png b/html/html/images/folder-new.png
new file mode 100755
index 000000000..628f4d50f
Binary files /dev/null and b/html/html/images/folder-new.png differ
diff --git a/html/html/images/folder-open.png b/html/html/images/folder-open.png
new file mode 100755
index 000000000..1e074cd02
Binary files /dev/null and b/html/html/images/folder-open.png differ
diff --git a/html/html/images/folder-remote.png b/html/html/images/folder-remote.png
new file mode 100755
index 000000000..8f1f0a90c
Binary files /dev/null and b/html/html/images/folder-remote.png differ
diff --git a/html/html/images/folder-saved-search.png b/html/html/images/folder-saved-search.png
new file mode 100755
index 000000000..a55601d3f
Binary files /dev/null and b/html/html/images/folder-saved-search.png differ
diff --git a/html/html/images/folder-visiting.png b/html/html/images/folder-visiting.png
new file mode 100755
index 000000000..d8d1be63e
Binary files /dev/null and b/html/html/images/folder-visiting.png differ
diff --git a/html/html/images/folder.png b/html/html/images/folder.png
new file mode 100755
index 000000000..901edc962
Binary files /dev/null and b/html/html/images/folder.png differ
diff --git a/html/html/images/font-x-generic.png b/html/html/images/font-x-generic.png
new file mode 100755
index 000000000..bdbc1a80a
Binary files /dev/null and b/html/html/images/font-x-generic.png differ
diff --git a/html/html/images/format-indent-less.png b/html/html/images/format-indent-less.png
new file mode 100755
index 000000000..1787a7ff4
Binary files /dev/null and b/html/html/images/format-indent-less.png differ
diff --git a/html/html/images/format-indent-more.png b/html/html/images/format-indent-more.png
new file mode 100755
index 000000000..6bad6bbac
Binary files /dev/null and b/html/html/images/format-indent-more.png differ
diff --git a/html/html/images/format-justify-center.png b/html/html/images/format-justify-center.png
new file mode 100755
index 000000000..207dc4cd8
Binary files /dev/null and b/html/html/images/format-justify-center.png differ
diff --git a/html/html/images/format-justify-fill.png b/html/html/images/format-justify-fill.png
new file mode 100755
index 000000000..663cbaddd
Binary files /dev/null and b/html/html/images/format-justify-fill.png differ
diff --git a/html/html/images/format-justify-left.png b/html/html/images/format-justify-left.png
new file mode 100755
index 000000000..d9b40a76f
Binary files /dev/null and b/html/html/images/format-justify-left.png differ
diff --git a/html/html/images/format-justify-right.png b/html/html/images/format-justify-right.png
new file mode 100755
index 000000000..c3013073c
Binary files /dev/null and b/html/html/images/format-justify-right.png differ
diff --git a/html/html/images/format-text-bold.png b/html/html/images/format-text-bold.png
new file mode 100755
index 000000000..c9cb63034
Binary files /dev/null and b/html/html/images/format-text-bold.png differ
diff --git a/html/html/images/format-text-italic.png b/html/html/images/format-text-italic.png
new file mode 100755
index 000000000..977ea8217
Binary files /dev/null and b/html/html/images/format-text-italic.png differ
diff --git a/html/html/images/format-text-strikethrough.png b/html/html/images/format-text-strikethrough.png
new file mode 100755
index 000000000..ccee76e29
Binary files /dev/null and b/html/html/images/format-text-strikethrough.png differ
diff --git a/html/html/images/format-text-underline.png b/html/html/images/format-text-underline.png
new file mode 100755
index 000000000..0c4872100
Binary files /dev/null and b/html/html/images/format-text-underline.png differ
diff --git a/html/html/images/go-bottom.png b/html/html/images/go-bottom.png
new file mode 100755
index 000000000..2c5a80385
Binary files /dev/null and b/html/html/images/go-bottom.png differ
diff --git a/html/html/images/go-down.png b/html/html/images/go-down.png
new file mode 100755
index 000000000..3dd7fccdf
Binary files /dev/null and b/html/html/images/go-down.png differ
diff --git a/html/html/images/go-first.png b/html/html/images/go-first.png
new file mode 100755
index 000000000..9c15c09e9
Binary files /dev/null and b/html/html/images/go-first.png differ
diff --git a/html/html/images/go-home.png b/html/html/images/go-home.png
new file mode 100755
index 000000000..a46fb2220
Binary files /dev/null and b/html/html/images/go-home.png differ
diff --git a/html/html/images/go-jump.png b/html/html/images/go-jump.png
new file mode 100755
index 000000000..1d218c388
Binary files /dev/null and b/html/html/images/go-jump.png differ
diff --git a/html/html/images/go-last.png b/html/html/images/go-last.png
new file mode 100755
index 000000000..6e904efd0
Binary files /dev/null and b/html/html/images/go-last.png differ
diff --git a/html/html/images/go-next.png b/html/html/images/go-next.png
new file mode 100755
index 000000000..6ef8de76e
Binary files /dev/null and b/html/html/images/go-next.png differ
diff --git a/html/html/images/go-previous.png b/html/html/images/go-previous.png
new file mode 100755
index 000000000..659cd90d7
Binary files /dev/null and b/html/html/images/go-previous.png differ
diff --git a/html/html/images/go-top.png b/html/html/images/go-top.png
new file mode 100755
index 000000000..70f2c996c
Binary files /dev/null and b/html/html/images/go-top.png differ
diff --git a/html/html/images/go-up.png b/html/html/images/go-up.png
new file mode 100755
index 000000000..fa9a7d71b
Binary files /dev/null and b/html/html/images/go-up.png differ
diff --git a/html/html/images/help-browser.png b/html/html/images/help-browser.png
new file mode 100755
index 000000000..f25fc3fbf
Binary files /dev/null and b/html/html/images/help-browser.png differ
diff --git a/html/html/images/image-loading.png b/html/html/images/image-loading.png
new file mode 100755
index 000000000..174994ecf
Binary files /dev/null and b/html/html/images/image-loading.png differ
diff --git a/html/html/images/image-missing.png b/html/html/images/image-missing.png
new file mode 100755
index 000000000..a644f242d
Binary files /dev/null and b/html/html/images/image-missing.png differ
diff --git a/html/html/images/image-x-generic.png b/html/html/images/image-x-generic.png
new file mode 100755
index 000000000..68da5027c
Binary files /dev/null and b/html/html/images/image-x-generic.png differ
diff --git a/html/html/images/input-gaming.png b/html/html/images/input-gaming.png
new file mode 100755
index 000000000..9d040ee84
Binary files /dev/null and b/html/html/images/input-gaming.png differ
diff --git a/html/html/images/input-keyboard.png b/html/html/images/input-keyboard.png
new file mode 100755
index 000000000..29cd63944
Binary files /dev/null and b/html/html/images/input-keyboard.png differ
diff --git a/html/html/images/input-mouse.png b/html/html/images/input-mouse.png
new file mode 100755
index 000000000..eeda4db86
Binary files /dev/null and b/html/html/images/input-mouse.png differ
diff --git a/html/html/images/internet-group-chat.png b/html/html/images/internet-group-chat.png
new file mode 100755
index 000000000..f6e83254b
Binary files /dev/null and b/html/html/images/internet-group-chat.png differ
diff --git a/html/html/images/internet-mail.png b/html/html/images/internet-mail.png
new file mode 100755
index 000000000..859251fe0
Binary files /dev/null and b/html/html/images/internet-mail.png differ
diff --git a/html/html/images/internet-news-reader.png b/html/html/images/internet-news-reader.png
new file mode 100755
index 000000000..a9850ee2c
Binary files /dev/null and b/html/html/images/internet-news-reader.png differ
diff --git a/html/html/images/internet-web-browser.png b/html/html/images/internet-web-browser.png
new file mode 100755
index 000000000..ac5957ad6
Binary files /dev/null and b/html/html/images/internet-web-browser.png differ
diff --git a/html/html/images/list-add.png b/html/html/images/list-add.png
new file mode 100755
index 000000000..1aa7f095c
Binary files /dev/null and b/html/html/images/list-add.png differ
diff --git a/html/html/images/list-remove.png b/html/html/images/list-remove.png
new file mode 100755
index 000000000..00b654e8c
Binary files /dev/null and b/html/html/images/list-remove.png differ
diff --git a/html/html/images/mail-attachment.png b/html/html/images/mail-attachment.png
new file mode 100755
index 000000000..529bb7f55
Binary files /dev/null and b/html/html/images/mail-attachment.png differ
diff --git a/html/html/images/mail-forward.png b/html/html/images/mail-forward.png
new file mode 100755
index 000000000..de0199b46
Binary files /dev/null and b/html/html/images/mail-forward.png differ
diff --git a/html/html/images/mail-mark-junk.png b/html/html/images/mail-mark-junk.png
new file mode 100755
index 000000000..f12d45253
Binary files /dev/null and b/html/html/images/mail-mark-junk.png differ
diff --git a/html/html/images/mail-mark-not-junk.png b/html/html/images/mail-mark-not-junk.png
new file mode 100755
index 000000000..87c425f92
Binary files /dev/null and b/html/html/images/mail-mark-not-junk.png differ
diff --git a/html/html/images/mail-message-new.png b/html/html/images/mail-message-new.png
new file mode 100755
index 000000000..7c68cb8d3
Binary files /dev/null and b/html/html/images/mail-message-new.png differ
diff --git a/html/html/images/mail-reply-all.png b/html/html/images/mail-reply-all.png
new file mode 100755
index 000000000..2017b0af0
Binary files /dev/null and b/html/html/images/mail-reply-all.png differ
diff --git a/html/html/images/mail-reply-sender.png b/html/html/images/mail-reply-sender.png
new file mode 100755
index 000000000..a61974159
Binary files /dev/null and b/html/html/images/mail-reply-sender.png differ
diff --git a/html/html/images/mail-send-receive.png b/html/html/images/mail-send-receive.png
new file mode 100755
index 000000000..3eb6a9ce3
Binary files /dev/null and b/html/html/images/mail-send-receive.png differ
diff --git a/html/html/images/media-eject.png b/html/html/images/media-eject.png
new file mode 100755
index 000000000..2084067e9
Binary files /dev/null and b/html/html/images/media-eject.png differ
diff --git a/html/html/images/media-flash.png b/html/html/images/media-flash.png
new file mode 100755
index 000000000..62b1ede98
Binary files /dev/null and b/html/html/images/media-flash.png differ
diff --git a/html/html/images/media-floppy.png b/html/html/images/media-floppy.png
new file mode 100755
index 000000000..f1d7a1985
Binary files /dev/null and b/html/html/images/media-floppy.png differ
diff --git a/html/html/images/media-optical.png b/html/html/images/media-optical.png
new file mode 100755
index 000000000..760de9386
Binary files /dev/null and b/html/html/images/media-optical.png differ
diff --git a/html/html/images/media-playback-pause.png b/html/html/images/media-playback-pause.png
new file mode 100755
index 000000000..c8b4fe225
Binary files /dev/null and b/html/html/images/media-playback-pause.png differ
diff --git a/html/html/images/media-playback-start.png b/html/html/images/media-playback-start.png
new file mode 100755
index 000000000..a7de0feb0
Binary files /dev/null and b/html/html/images/media-playback-start.png differ
diff --git a/html/html/images/media-playback-stop.png b/html/html/images/media-playback-stop.png
new file mode 100755
index 000000000..ede2815e5
Binary files /dev/null and b/html/html/images/media-playback-stop.png differ
diff --git a/html/html/images/media-record.png b/html/html/images/media-record.png
new file mode 100755
index 000000000..2f66cdebb
Binary files /dev/null and b/html/html/images/media-record.png differ
diff --git a/html/html/images/media-seek-backward.png b/html/html/images/media-seek-backward.png
new file mode 100755
index 000000000..ffcac3113
Binary files /dev/null and b/html/html/images/media-seek-backward.png differ
diff --git a/html/html/images/media-seek-forward.png b/html/html/images/media-seek-forward.png
new file mode 100755
index 000000000..4d7e2cd40
Binary files /dev/null and b/html/html/images/media-seek-forward.png differ
diff --git a/html/html/images/media-skip-backward.png b/html/html/images/media-skip-backward.png
new file mode 100755
index 000000000..94381f54f
Binary files /dev/null and b/html/html/images/media-skip-backward.png differ
diff --git a/html/html/images/media-skip-forward.png b/html/html/images/media-skip-forward.png
new file mode 100755
index 000000000..758ec6f1b
Binary files /dev/null and b/html/html/images/media-skip-forward.png differ
diff --git a/html/html/images/multimedia-player.png b/html/html/images/multimedia-player.png
new file mode 100755
index 000000000..461e9de01
Binary files /dev/null and b/html/html/images/multimedia-player.png differ
diff --git a/html/html/images/network-idle.png b/html/html/images/network-idle.png
new file mode 100755
index 000000000..0efee57e5
Binary files /dev/null and b/html/html/images/network-idle.png differ
diff --git a/html/html/images/network-offline.png b/html/html/images/network-offline.png
new file mode 100755
index 000000000..1f210fc3e
Binary files /dev/null and b/html/html/images/network-offline.png differ
diff --git a/html/html/images/network-receive.png b/html/html/images/network-receive.png
new file mode 100755
index 000000000..b57c65c86
Binary files /dev/null and b/html/html/images/network-receive.png differ
diff --git a/html/html/images/network-server.png b/html/html/images/network-server.png
new file mode 100755
index 000000000..068ffebee
Binary files /dev/null and b/html/html/images/network-server.png differ
diff --git a/html/html/images/network-transmit-receive.png b/html/html/images/network-transmit-receive.png
new file mode 100755
index 000000000..271d37d0f
Binary files /dev/null and b/html/html/images/network-transmit-receive.png differ
diff --git a/html/html/images/network-transmit.png b/html/html/images/network-transmit.png
new file mode 100755
index 000000000..08aa28b09
Binary files /dev/null and b/html/html/images/network-transmit.png differ
diff --git a/html/html/images/network-wired.png b/html/html/images/network-wired.png
new file mode 100755
index 000000000..3ac6b35cb
Binary files /dev/null and b/html/html/images/network-wired.png differ
diff --git a/html/html/images/network-wireless-encrypted.png b/html/html/images/network-wireless-encrypted.png
new file mode 100755
index 000000000..12b572a5a
Binary files /dev/null and b/html/html/images/network-wireless-encrypted.png differ
diff --git a/html/html/images/network-wireless.png b/html/html/images/network-wireless.png
new file mode 100755
index 000000000..2dc625071
Binary files /dev/null and b/html/html/images/network-wireless.png differ
diff --git a/html/html/images/network-workgroup.png b/html/html/images/network-workgroup.png
new file mode 100755
index 000000000..5c140d838
Binary files /dev/null and b/html/html/images/network-workgroup.png differ
diff --git a/html/html/images/network.png b/html/html/images/network.png
new file mode 100755
index 000000000..271d37d0f
Binary files /dev/null and b/html/html/images/network.png differ
diff --git a/html/html/images/office-calendar.png b/html/html/images/office-calendar.png
new file mode 100755
index 000000000..106a592e6
Binary files /dev/null and b/html/html/images/office-calendar.png differ
diff --git a/html/html/images/package-x-generic.png b/html/html/images/package-x-generic.png
new file mode 100755
index 000000000..901542615
Binary files /dev/null and b/html/html/images/package-x-generic.png differ
diff --git a/html/html/images/preferences-desktop-accessibility.png b/html/html/images/preferences-desktop-accessibility.png
new file mode 100755
index 000000000..b365c274d
Binary files /dev/null and b/html/html/images/preferences-desktop-accessibility.png differ
diff --git a/html/html/images/preferences-desktop-assistive-technology.png b/html/html/images/preferences-desktop-assistive-technology.png
new file mode 100755
index 000000000..513d817dd
Binary files /dev/null and b/html/html/images/preferences-desktop-assistive-technology.png differ
diff --git a/html/html/images/preferences-desktop-font.png b/html/html/images/preferences-desktop-font.png
new file mode 100755
index 000000000..18a014944
Binary files /dev/null and b/html/html/images/preferences-desktop-font.png differ
diff --git a/html/html/images/preferences-desktop-keyboard-shortcuts.png b/html/html/images/preferences-desktop-keyboard-shortcuts.png
new file mode 100755
index 000000000..291dc1ac1
Binary files /dev/null and b/html/html/images/preferences-desktop-keyboard-shortcuts.png differ
diff --git a/html/html/images/preferences-desktop-locale.png b/html/html/images/preferences-desktop-locale.png
new file mode 100755
index 000000000..5ef73a60b
Binary files /dev/null and b/html/html/images/preferences-desktop-locale.png differ
diff --git a/html/html/images/preferences-desktop-peripherals.png b/html/html/images/preferences-desktop-peripherals.png
new file mode 100755
index 000000000..2a63ceead
Binary files /dev/null and b/html/html/images/preferences-desktop-peripherals.png differ
diff --git a/html/html/images/preferences-desktop-remote-desktop.png b/html/html/images/preferences-desktop-remote-desktop.png
new file mode 100755
index 000000000..b790f6342
Binary files /dev/null and b/html/html/images/preferences-desktop-remote-desktop.png differ
diff --git a/html/html/images/preferences-desktop-screensaver.png b/html/html/images/preferences-desktop-screensaver.png
new file mode 100755
index 000000000..dc297db17
Binary files /dev/null and b/html/html/images/preferences-desktop-screensaver.png differ
diff --git a/html/html/images/preferences-desktop-sound.png b/html/html/images/preferences-desktop-sound.png
new file mode 100755
index 000000000..2e5ba43c9
Binary files /dev/null and b/html/html/images/preferences-desktop-sound.png differ
diff --git a/html/html/images/preferences-desktop-theme.png b/html/html/images/preferences-desktop-theme.png
new file mode 100755
index 000000000..fbea772ca
Binary files /dev/null and b/html/html/images/preferences-desktop-theme.png differ
diff --git a/html/html/images/preferences-desktop-wallpaper.png b/html/html/images/preferences-desktop-wallpaper.png
new file mode 100755
index 000000000..e7cc834c5
Binary files /dev/null and b/html/html/images/preferences-desktop-wallpaper.png differ
diff --git a/html/html/images/preferences-desktop.png b/html/html/images/preferences-desktop.png
new file mode 100755
index 000000000..68f916c9d
Binary files /dev/null and b/html/html/images/preferences-desktop.png differ
diff --git a/html/html/images/preferences-system-network-proxy.png b/html/html/images/preferences-system-network-proxy.png
new file mode 100755
index 000000000..bdeb79d86
Binary files /dev/null and b/html/html/images/preferences-system-network-proxy.png differ
diff --git a/html/html/images/preferences-system-session.png b/html/html/images/preferences-system-session.png
new file mode 100755
index 000000000..35f8b5711
Binary files /dev/null and b/html/html/images/preferences-system-session.png differ
diff --git a/html/html/images/preferences-system-windows.png b/html/html/images/preferences-system-windows.png
new file mode 100755
index 000000000..596caf948
Binary files /dev/null and b/html/html/images/preferences-system-windows.png differ
diff --git a/html/html/images/preferences-system.png b/html/html/images/preferences-system.png
new file mode 100755
index 000000000..9460dfc74
Binary files /dev/null and b/html/html/images/preferences-system.png differ
diff --git a/html/html/images/printer-error.png b/html/html/images/printer-error.png
new file mode 100755
index 000000000..21d4dedff
Binary files /dev/null and b/html/html/images/printer-error.png differ
diff --git a/html/html/images/printer.png b/html/html/images/printer.png
new file mode 100755
index 000000000..12a4e39dd
Binary files /dev/null and b/html/html/images/printer.png differ
diff --git a/html/html/images/process-stop.png b/html/html/images/process-stop.png
new file mode 100755
index 000000000..ab6808fba
Binary files /dev/null and b/html/html/images/process-stop.png differ
diff --git a/html/html/images/process-working.png b/html/html/images/process-working.png
new file mode 100755
index 000000000..984bde41d
Binary files /dev/null and b/html/html/images/process-working.png differ
diff --git a/html/html/images/start-here.png b/html/html/images/start-here.png
new file mode 100755
index 000000000..bd516a54c
Binary files /dev/null and b/html/html/images/start-here.png differ
diff --git a/html/html/images/system-file-manager.png b/html/html/images/system-file-manager.png
new file mode 100755
index 000000000..60cade46c
Binary files /dev/null and b/html/html/images/system-file-manager.png differ
diff --git a/html/html/images/system-installer.png b/html/html/images/system-installer.png
new file mode 100755
index 000000000..d16abcbde
Binary files /dev/null and b/html/html/images/system-installer.png differ
diff --git a/html/html/images/system-lock-screen.png b/html/html/images/system-lock-screen.png
new file mode 100755
index 000000000..f7ea0cd22
Binary files /dev/null and b/html/html/images/system-lock-screen.png differ
diff --git a/html/html/images/system-log-out.png b/html/html/images/system-log-out.png
new file mode 100755
index 000000000..0010931e2
Binary files /dev/null and b/html/html/images/system-log-out.png differ
diff --git a/html/html/images/system-search.png b/html/html/images/system-search.png
new file mode 100755
index 000000000..fd7f0b07a
Binary files /dev/null and b/html/html/images/system-search.png differ
diff --git a/html/html/images/system-shutdown.png b/html/html/images/system-shutdown.png
new file mode 100755
index 000000000..afe62deec
Binary files /dev/null and b/html/html/images/system-shutdown.png differ
diff --git a/html/html/images/system-software-update.png b/html/html/images/system-software-update.png
new file mode 100755
index 000000000..58f19c68b
Binary files /dev/null and b/html/html/images/system-software-update.png differ
diff --git a/html/html/images/system-users.png b/html/html/images/system-users.png
new file mode 100755
index 000000000..9d2d50081
Binary files /dev/null and b/html/html/images/system-users.png differ
diff --git a/html/html/images/tab-new.png b/html/html/images/tab-new.png
new file mode 100755
index 000000000..3e590f6fe
Binary files /dev/null and b/html/html/images/tab-new.png differ
diff --git a/html/html/images/text-html.png b/html/html/images/text-html.png
new file mode 100755
index 000000000..53014ab15
Binary files /dev/null and b/html/html/images/text-html.png differ
diff --git a/html/html/images/text-x-generic-template.png b/html/html/images/text-x-generic-template.png
new file mode 100755
index 000000000..a0cc462f4
Binary files /dev/null and b/html/html/images/text-x-generic-template.png differ
diff --git a/html/html/images/text-x-generic.png b/html/html/images/text-x-generic.png
new file mode 100755
index 000000000..2d7f2d601
Binary files /dev/null and b/html/html/images/text-x-generic.png differ
diff --git a/html/html/images/text-x-script.png b/html/html/images/text-x-script.png
new file mode 100755
index 000000000..c923098ea
Binary files /dev/null and b/html/html/images/text-x-script.png differ
diff --git a/html/html/images/user-desktop.png b/html/html/images/user-desktop.png
new file mode 100755
index 000000000..4c9787cc4
Binary files /dev/null and b/html/html/images/user-desktop.png differ
diff --git a/html/html/images/user-home.png b/html/html/images/user-home.png
new file mode 100755
index 000000000..13d2c00d0
Binary files /dev/null and b/html/html/images/user-home.png differ
diff --git a/html/html/images/user-trash-full.png b/html/html/images/user-trash-full.png
new file mode 100755
index 000000000..695d215a7
Binary files /dev/null and b/html/html/images/user-trash-full.png differ
diff --git a/html/html/images/user-trash.png b/html/html/images/user-trash.png
new file mode 100755
index 000000000..0e0953c73
Binary files /dev/null and b/html/html/images/user-trash.png differ
diff --git a/html/html/images/utilities-system-monitor.png b/html/html/images/utilities-system-monitor.png
new file mode 100755
index 000000000..8734e777a
Binary files /dev/null and b/html/html/images/utilities-system-monitor.png differ
diff --git a/html/html/images/utilities-terminal.png b/html/html/images/utilities-terminal.png
new file mode 100755
index 000000000..c5b797a7d
Binary files /dev/null and b/html/html/images/utilities-terminal.png differ
diff --git a/html/html/images/video-display.png b/html/html/images/video-display.png
new file mode 100755
index 000000000..a73a169ac
Binary files /dev/null and b/html/html/images/video-display.png differ
diff --git a/html/html/images/video-x-generic.png b/html/html/images/video-x-generic.png
new file mode 100755
index 000000000..64e7a3075
Binary files /dev/null and b/html/html/images/video-x-generic.png differ
diff --git a/html/html/images/view-fullscreen.png b/html/html/images/view-fullscreen.png
new file mode 100755
index 000000000..ffdabd4e9
Binary files /dev/null and b/html/html/images/view-fullscreen.png differ
diff --git a/html/html/images/view-refresh.png b/html/html/images/view-refresh.png
new file mode 100755
index 000000000..3fd71d6e5
Binary files /dev/null and b/html/html/images/view-refresh.png differ
diff --git a/html/html/images/weather-clear-night.png b/html/html/images/weather-clear-night.png
new file mode 100755
index 000000000..434575269
Binary files /dev/null and b/html/html/images/weather-clear-night.png differ
diff --git a/html/html/images/weather-clear.png b/html/html/images/weather-clear.png
new file mode 100755
index 000000000..7dc15ea96
Binary files /dev/null and b/html/html/images/weather-clear.png differ
diff --git a/html/html/images/weather-few-clouds-night.png b/html/html/images/weather-few-clouds-night.png
new file mode 100755
index 000000000..d69efec98
Binary files /dev/null and b/html/html/images/weather-few-clouds-night.png differ
diff --git a/html/html/images/weather-few-clouds.png b/html/html/images/weather-few-clouds.png
new file mode 100755
index 000000000..0e633a38f
Binary files /dev/null and b/html/html/images/weather-few-clouds.png differ
diff --git a/html/html/images/weather-overcast.png b/html/html/images/weather-overcast.png
new file mode 100755
index 000000000..0045129b8
Binary files /dev/null and b/html/html/images/weather-overcast.png differ
diff --git a/html/html/images/weather-severe-alert.png b/html/html/images/weather-severe-alert.png
new file mode 100755
index 000000000..98e9f6c1d
Binary files /dev/null and b/html/html/images/weather-severe-alert.png differ
diff --git a/html/html/images/weather-showers-scattered.png b/html/html/images/weather-showers-scattered.png
new file mode 100755
index 000000000..8d10d844c
Binary files /dev/null and b/html/html/images/weather-showers-scattered.png differ
diff --git a/html/html/images/weather-showers.png b/html/html/images/weather-showers.png
new file mode 100755
index 000000000..d9685d242
Binary files /dev/null and b/html/html/images/weather-showers.png differ
diff --git a/html/html/images/weather-snow.png b/html/html/images/weather-snow.png
new file mode 100755
index 000000000..a83d85598
Binary files /dev/null and b/html/html/images/weather-snow.png differ
diff --git a/html/html/images/weather-storm.png b/html/html/images/weather-storm.png
new file mode 100755
index 000000000..feebe1d4e
Binary files /dev/null and b/html/html/images/weather-storm.png differ
diff --git a/html/html/images/window-new.png b/html/html/images/window-new.png
new file mode 100755
index 000000000..0e12ef954
Binary files /dev/null and b/html/html/images/window-new.png differ
diff --git a/html/html/images/x-office-address-book.png b/html/html/images/x-office-address-book.png
new file mode 100755
index 000000000..f3b5d9d98
Binary files /dev/null and b/html/html/images/x-office-address-book.png differ
diff --git a/html/html/images/x-office-calendar.png b/html/html/images/x-office-calendar.png
new file mode 100755
index 000000000..f6978d7d3
Binary files /dev/null and b/html/html/images/x-office-calendar.png differ
diff --git a/html/html/images/x-office-document-template.png b/html/html/images/x-office-document-template.png
new file mode 100755
index 000000000..d1d9e7c12
Binary files /dev/null and b/html/html/images/x-office-document-template.png differ
diff --git a/html/html/images/x-office-document.png b/html/html/images/x-office-document.png
new file mode 100755
index 000000000..d18082e39
Binary files /dev/null and b/html/html/images/x-office-document.png differ
diff --git a/html/html/images/x-office-drawing-template.png b/html/html/images/x-office-drawing-template.png
new file mode 100755
index 000000000..dc384dba1
Binary files /dev/null and b/html/html/images/x-office-drawing-template.png differ
diff --git a/html/html/images/x-office-drawing.png b/html/html/images/x-office-drawing.png
new file mode 100755
index 000000000..ffbb9e407
Binary files /dev/null and b/html/html/images/x-office-drawing.png differ
diff --git a/html/html/images/x-office-presentation-template.png b/html/html/images/x-office-presentation-template.png
new file mode 100755
index 000000000..d90d034a5
Binary files /dev/null and b/html/html/images/x-office-presentation-template.png differ
diff --git a/html/html/images/x-office-presentation.png b/html/html/images/x-office-presentation.png
new file mode 100755
index 000000000..f7ea30245
Binary files /dev/null and b/html/html/images/x-office-presentation.png differ
diff --git a/html/html/images/x-office-spreadsheet-template.png b/html/html/images/x-office-spreadsheet-template.png
new file mode 100755
index 000000000..e8bf570cc
Binary files /dev/null and b/html/html/images/x-office-spreadsheet-template.png differ
diff --git a/html/html/images/x-office-spreadsheet.png b/html/html/images/x-office-spreadsheet.png
new file mode 100755
index 000000000..a6b1268d3
Binary files /dev/null and b/html/html/images/x-office-spreadsheet.png differ
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 1e00b6159..9ff82e080 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1570,6 +1570,81 @@
 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'Sie können nur eine Roadwarrior Verbindung definieren, wenn die Pre-shared Schlüsselauthentifizierung verwendet wird.<br/>Entweder haben Sie bereits eine Roadwarrior Verbindung mit Pre-shared Schlüsselauthentifizierung, oder Sie versuchen gerade eine hinzuzufügen.',
 'your department' => 'Ihre Abteilung',
 'your e-mail' => 'Ihre E-mail Adresse',
+'samba' => 'Samba',
+'all services' => 'Alle Dienste',
+'basic options' => 'Basisoptionen',
+'workgroup' => 'Arbeitsgruppe',
+'netbios name' => 'Netbios Name',
+'server string' => 'Server String',
+'log level' => 'Log Level',
+'interfaces' => 'Interfaces',
+'more' => 'weitere',
+'security options' => 'Sicherheitsoptionen',
+'security' => 'Sicherheit',
+'map to guest' => 'Map to Guest',
+'unix password sync' => 'Unix Password Sync',
+'network options' => 'Netzwerk Optionen',
+'os level' => 'OS Level',
+'remote announce' => 'Remote Announce',
+'wins server' => 'Wins Server',
+'wins support' => 'Wins Support',
+'local master' => 'Local Master',
+'domain master' => 'Domain Master',
+'prefered master' => 'Prefered Master',
+'pdc options' => 'PDC Optionen',
+'save' => 'Speichern',
+'reset' => 'Zurück setzen',
+'caption' => 'Legende',
+'save settings' => 'Einstellungen speichern',
+'restore settings' => 'Einstellungen wiederherstellen',
+'accounting user pdc' => 'Benutzerverwaltung - PDC Modus',
+'accounting user nonpdc' => 'Benutzerverwaltung - kein PDC Modus',
+'accounting' => 'Benutzerverwaltung',
+'set' => 'gesetzt',
+'not set' => 'nicht gesetzt',
+'user' => 'Benutzer',
+'pc' => 'PC',
+'activate' => 'aktivieren',
+'deactivate' => 'deaktivieren',
+'add user' => 'Benutzer anlegen',
+'add pc' => 'PC anlegen',
+'delete user' => 'Benutzer löschen',
+'delete pc' => 'PC löschen',
+'activate user' => 'Benutzer aktivieren',
+'deactivate user' => 'Benutzer deaktivieren',
+'save config' => 'Einstellungen speichern',
+'unix group' => ' UNIX Benutzergruppe',
+'unix shell' => 'UNIX Shell',
+'client' => 'PC Name',
+'shares' => 'Freigaben',
+'sharename' => 'Freigabename',
+'manage shares' => 'Freigaben verwalten',
+'add share' => 'Freigabe anlegen',
+'edit share' => 'Freigabe bearbeiten',
+'reset shares' => 'Freigaben zurücksetzen',
+'delete share' => 'Freigabe löschen',
+'show share options' => 'Anzeige der Freigabeeinstellungen',
+'change share' => 'Freigabeeinstellungen ändern',
+'meaning' => 'Bedeutung',
+'exampel' => 'Beispiel',
+'my new share' => 'Meine neue Freigabe',
+'path to directory' => 'Pfad zur Freigabe',
+'directory writeable' => 'Verzeichnis schreibbar',
+'visible in browselist' => 'Sichtbar in der Verzeichnisliste',
+'host allow' => 'Liste der Zugriffsberechtigten',
+'host deny' => 'Liste der nicht Zugriffsberechtigten',
+'read list' => 'Liste der Leseberechtigten',
+'admin users' => 'Liste der Benutzer mit Super User Rechten',
+'invalid users' => 'Liste mit Benutzern denen der Zugriff untersagt ist',
+'force user' => 'Standartbenutzer für das UNIX Dateisystem',
+'directory mask' => 'UNIX Verzeichnis Rechte',
+'create mask' => 'UNIX Rechte für neue Dateien',
+'guest ok' => 'Gastzugang gewähren',
+'samba status' => 'Samba Status',
+'log view' => 'Log Anzeige',
+'show last x lines' => 'die letzten x Zeilen anzeigen',
+'view log' => 'Log anzeigen',
+'no log selected' => 'kein Log ausgewählt',
 );
 
 #EOF
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index fe1cfd5c0..21cdfde3e 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1579,6 +1579,81 @@
 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'You can only define one Roadwarrior connection when using pre-shared key authentication.<br />Either you already have a Roadwarrior connection with pre-shared key authentication, or you\'re trying to add one now.',
 'your department' => 'Your Department',
 'your e-mail' => 'Your E-mail Address',
+'samba' => 'Samba',
+'all services' => 'All Services',
+'basic options' => 'Basic Options',
+'workgroup' => 'Workgroup',
+'netbios name' => 'Netbios Name',
+'server string' => 'Server String',
+'log level' => 'Log Level',
+'interfaces' => 'Interfaces',
+'more' => 'more',
+'security options' => 'Security Options',
+'security' => 'Security',
+'map to guest' => 'Map to Guest',
+'unix password sync' => 'Unix Password Sync',
+'network options' => 'Network Options',
+'os level' => 'OS Level',
+'remote announce' => 'Remote Announce',
+'wins server' => 'Wins Server',
+'wins support' => 'Wins Support',
+'local master' => 'Local Master',
+'domain master' => 'Domain Master',
+'prefered master' => 'Prefered Master',
+'pdc options' => 'PDC Options',
+'save' => 'Save',
+'reset' => 'Reset',
+'caption' => 'Caption',
+'save settings' => 'Save Settings',
+'restore settings' => 'Reset Settings',
+'accounting user pdc' => 'Accounting - PDC Mode',
+'accounting user nonpdc' => 'Accounting - none PDC Mode',
+'accounting' => 'Accounting',
+'set' => 'set',
+'not set' => 'not set',
+'user' => 'User',
+'pc' => 'Workstatipon',
+'activate' => 'activate',
+'deactivate' => 'deactivate',
+'add user' => 'add User',
+'add pc' => 'add workstation',
+'delete user' => 'delete User',
+'delete pc' => 'delete workstation',
+'activate user' => 'activate user',
+'deactivate user' => 'deactivate user',
+'save config' => 'save settings',
+'unix group' => ' UNIX usergroup',
+'unix shell' => 'UNIX Shell',
+'client' => 'Workstation Name',
+'shares' => 'Shares',
+'sharename' => 'Sharename',
+'manage shares' => 'manage shares',
+'add share' => 'add share',
+'edit share' => 'edit share',
+'reset shares' => 'reset share',
+'delete share' => 'delete share',
+'show share options' => 'show shares options',
+'change share' => 'edit share options',
+'meaning' => 'meaning',
+'exampel' => 'exampel',
+'my new share' => 'My new share',
+'path to directory' => 'path to share',
+'directory writeable' => 'directory writeable',
+'visible in browselist' => 'visible in browselist',
+'host allow' => 'list with allowed hosts',
+'host deny' => 'list with denied hosts',
+'read list' => 'list with readonly hosts',
+'admin users' => 'user with superuser rights',
+'invalid users' => 'list with users denied to access',
+'force user' => 'force all new file to user',
+'directory mask' => 'UNIX directory rights',
+'create mask' => 'UNIX rights for new created files',
+'guest ok' => 'allow guests to access',
+'samba status' => 'Samba Status',
+'log view' => 'log view',
+'show last x lines' => 'show last x lines',
+'view log' => 'view log',
+'no log selected' => 'no log selected',
 );
 
 #EOF
diff --git a/src/misc-progs/sambactrl.c b/src/misc-progs/sambactrl.c
index d6964b58f..c598cb0e3 100644
--- a/src/misc-progs/sambactrl.c
+++ b/src/misc-progs/sambactrl.c
@@ -74,20 +74,31 @@ int main(int argc, char *argv[])
             return 0;
         }
 
-        if (strcmp(argv[1], "smbrestart")==0)
-        {
-            return 0;
-        }
-
         if (strcmp(argv[1], "smbstop")==0)
         {
+            safe_system("/etc/rc.d/init.d/samba stop");
+            printf(command);
             return 0;
         }
 
         if (strcmp(argv[1], "smbstart")==0)
         {
-            snprintf(command, BUFFER_SIZE-1, "smbd -D && nmbd -D && winbindd -D",);
-            safe_system(command);
+            safe_system("/etc/rc.d/init.d/samba start");
+            printf(command);
+            return 0;
+        }
+
+        if (strcmp(argv[1], "smbrestart")==0)
+        {
+            safe_system("/etc/rc.d/init.d/samba restart");
+            printf(command);
+            return 0;
+        }
+
+        if (strcmp(argv[1], "smbreload")==0)
+        {
+            safe_system("/etc/rc.d/init.d/samba reload");
+            printf(command);
             return 0;
         }