fixes in Samba und Korrekturen der langs

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@527 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/samba/default.shares b/config/samba/default.shares
index 015870a82eede9d0b792d485c47381bfb7111e46..aa21965f955ff8eed3fb265044f251728ce808a1 100644 (file)
--- a/config/samba/default.shares
+++ b/config/samba/default.shares
@@ -1,18 +1,18 @@
-[Temp]\r
-path = /tmp\r
-comment = Temp\r
-browseable = yes\r
-writeable = yes\r
-create mask = 0777\r
-directory mask = 0777\r
-guest ok = yes\r
-force user = samba\r
-[P2P]\r
-path = /var/ipfire/samba/p2p\r
-comment = P2P\r
-browseable = yes\r
-writeable = yes\r
-create mask = 0777\r
-directory mask = 0777\r
-guest ok = yes\r
-force user = samba\r
+[Temp]
+path = /tmp
+comment = Temp
+browseable = yes
+writeable = yes
+create mask = 0777
+directory mask = 0777
+guest ok = yes
+force user = samba
+[P2P]
+path = /var/ipfire/samba/p2p
+comment = P2P
+browseable = yes
+writeable = yes
+create mask = 0777
+directory mask = 0777
+guest ok = yes
+force user = samba

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 478b1ed675e760800ab06f28f38c3bc736800881..5a631a03c88368af7f81f104c1c39b3ae6f30f24 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -281,7 +281,6 @@ WARNING: translation string unused: too long 80 char max
 WARNING: translation string unused: traffic on
 WARNING: translation string unused: transfer limits
 WARNING: translation string unused: transparent on
-WARNING: translation string unused: tripwire cronjob
 WARNING: translation string unused: umount
 WARNING: translation string unused: umount removable media before to unplug
 WARNING: translation string unused: unencrypted
@@ -313,6 +312,7 @@ WARNING: translation string unused: written sectors
 WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year
 WARNING: untranslated string: IPFires hostname
+WARNING: untranslated string: add pc
 WARNING: untranslated string: allmsg
 WARNING: untranslated string: alt proxy
 WARNING: untranslated string: bleeding rules
@@ -328,13 +328,11 @@ WARNING: untranslated string: openvpn log
 WARNING: untranslated string: otherip
 WARNING: untranslated string: otherport
 WARNING: untranslated string: pakfire configuration
-WARNING: untranslated string: pc add
 WARNING: untranslated string: red
 WARNING: untranslated string: selecttraffic
 WARNING: untranslated string: settingsc
 WARNING: untranslated string: show areas
 WARNING: untranslated string: show lines
-WARNING: untranslated string: smbrestart
 WARNING: untranslated string: sstraffic
 WARNING: untranslated string: trafficblue
 WARNING: untranslated string: trafficdate

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 34c1846936d1b45a2b9e6e7a2d87a6e1ff55fbfb..cb6c09fb05d99d2a37f6dff08002ed2de88ca1a3 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -287,7 +287,6 @@ WARNING: translation string unused: to install an update
 WARNING: translation string unused: traffic on
 WARNING: translation string unused: transfer limits
 WARNING: translation string unused: transparent on
-WARNING: translation string unused: tripwire cronjob
 WARNING: translation string unused: unencrypted
 WARNING: translation string unused: update transcript
 WARNING: translation string unused: updates
@@ -317,6 +316,7 @@ WARNING: translation string unused: written sectors
 WARNING: translation string unused: year
 WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: IPFires hostname
+WARNING: untranslated string: add pc
 WARNING: untranslated string: alt proxy
 WARNING: untranslated string: bleeding rules
 WARNING: untranslated string: community rules
@@ -330,11 +330,9 @@ WARNING: untranslated string: openvpn log
 WARNING: untranslated string: otherip
 WARNING: untranslated string: otherport
 WARNING: untranslated string: pakfire configuration
-WARNING: untranslated string: pc add
 WARNING: untranslated string: red
 WARNING: untranslated string: remove x509
 WARNING: untranslated string: settingsc
-WARNING: untranslated string: smbrestart
 WARNING: untranslated string: tripwire cronjobs
 WARNING: untranslated string: up
 WARNING: untranslated string: urlfilter background image

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index c4b32261f7161a27359d477dbea2d1a046fd93aa..6d191ea09f1d7e99f4135fdee4e9a88f178707eb 100644 (file)
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -719,7 +719,7 @@ END
                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                <table width='95%' cellspacing='0'>
                <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{'username'}</td><td><input type='text' name='USERNAME' value='$username' size='30' readonly /></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/media-floppy.png' /></td></tr>
@@ -1138,7 +1138,7 @@ foreach my $allarrayentry (@allarray)
                        $options=qx(tail -$linestart $file | head -$lineend);
                        }
                $hash{$namearray[$i]} = "$options";
-#              print"<pre>$namearray[$i]\n$options\n</pre>"; # enable only for debuging
+               #print"<pre>$namearray[$i]\n$options\n</pre>"; # enable only for debuging
                }
 return(%hash);
 }

diff --git a/html/cgi-bin/tripwire.cgi b/html/cgi-bin/tripwire.cgi
index a622741cde713cf9cd24e8b0bbec88c6a6fe086e..d33fa33add996267a1d3c023890c2a8152277e49 100755 (executable)
--- a/html/cgi-bin/tripwire.cgi
+++ b/html/cgi-bin/tripwire.cgi
@@ -484,7 +484,7 @@ END
 ############################################################################################################################
 ####################################################### Tripwire Cronjob ##################################################
 
-&Header::openbox('100%', 'center', $Lang::tr{'tripwire cronjobs'});
+&Header::openbox('100%', 'center', $Lang::tr{'tripwire cronjob'});
 print <<END
 <hr />
 <br />

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 51c101d13a15f1e1e43a0a7cef6210ccc6528343..4c22d79cf7b68f3789b6376526f08fd5f2a8a4f2 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -50,7 +50,6 @@
 'add new alias' => 'Neue Alias-Adresse hinzufügen:',
 'add new lease' => 'Neue Zuordnung definieren',
 'add new ovpn' => 'OpenVPN Einstellungen',
-'add pc' => 'PC anlegen',
 'add printer' => 'Drucker hinzufügen',
 'add service' => 'Dienst hinzufügen',
 'add share' => 'Freigabe anlegen',
@@ -1109,6 +1108,7 @@
 'passwords must be at least 6 characters in length' => 'Passwörter müssen mind. 6 Zeichen lang sein',
 'path to directory' => 'Pfad zur Freigabe',
 'pc' => 'PC',
+'pc add' => 'PC hinzufügen',
 'pdc options' => 'PDC Optionen',
 'percentage' => 'Prozent',
 'persistent' => 'Dauerhaft',
@@ -1278,6 +1278,7 @@
 'size' => 'Größe',
 'smart information' => 'SMART-Informationen',
 'smbreload' => 'Samba Dienste durchstarten',
+'smbrestart' => 'Samba neustarten',
 'smbstart' => 'Samba Dienste starten',
 'smbstop' => 'Samba Dienste beenden',
 'smtphost' => 'Smtp Host',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index b5ed74674baf7f0c4c03fc6ee4ccbdc6a07e7052..f36f43367bfdf2a139f926951284a90dfec93559 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -50,7 +50,6 @@
 'add new alias' => 'Add a new alias:',
 'add new lease' => 'Add a new fixed lease',
 'add new ovpn' => 'OpenVPN Settings:',
-'add pc' => 'add workstation',
 'add printer' => 'add printer',
 'add service' => 'Add service',
 'add share' => 'add share',
@@ -1124,6 +1123,7 @@
 'passwords must be at least 6 characters in length' => 'Passwords must be at least 6 characters in length',
 'path to directory' => 'path to share',
 'pc' => 'Workstatipon',
+'pc add' => 'add workstation',
 'pdc options' => 'PDC Options',
 'percentage' => 'Percentage',
 'persistent' => 'Persistent',
@@ -1291,6 +1291,7 @@
 'size' => 'Size',
 'smart information' => 'SMART information',
 'smbreload' => 'Samba Dienste durchstarten',
+'smbrestart' => 'restart Samba',
 'smbstart' => 'Samba Dienste starten',
 'smbstop' => 'Samba Dienste beenden',
 'smtphost' => 'Smtp Host',