Renamed "Reconnection" button to "Reconnect"

Removed double phrases at language files
Fix permissions of dns and mac.cgi (-x)

diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi
old mode 100755 (executable)
new mode 100644 (file)
index 08baf1e..12c90c4
--- a/html/cgi-bin/dns.cgi
+++ b/html/cgi-bin/dns.cgi
@@ -63,7 +63,7 @@ if ($dnssettings{'ACTION'} eq $Lang::tr{'save'}) {
        }
 }
 
-if ($dnssettings{'RECONNECT'} eq $Lang::tr{'dns reconnection'}) {
+if ($dnssettings{'RECONNECT'} eq $Lang::tr{'reconnect'}) {
        system("/usr/local/bin/redctrl restart >/dev/null 2>&1 &");
        &Header::openbox('100%', 'left', $Lang::tr{'dns address recon'} );
        print "<font class='base'>$Lang::tr{'dns address done'}</font>\n";
@@ -104,7 +104,7 @@ print <<END
     <td colspan="2"><div align="center">
         <input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
         &nbsp;&nbsp;&nbsp;&nbsp;
-        <input type='submit' name='RECONNECT' value='$Lang::tr{'dns reconnection'}' />
+        <input type='submit' name='RECONNECT' value='$Lang::tr{'reconnect'}' />
         </div>
       </td>
   </tr>

diff --git a/html/cgi-bin/mac.cgi b/html/cgi-bin/mac.cgi
old mode 100755 (executable)
new mode 100644 (file)
index 5a6d65b..6261c59
--- a/html/cgi-bin/mac.cgi
+++ b/html/cgi-bin/mac.cgi
@@ -67,7 +67,7 @@ if ($macsettings{'ACTION'} eq $Lang::tr{'save'}) {
                $errormessage = $Lang::tr{'mac address error not valid'};
        }
 }
-if ($macsettings{'RECONNECT'} eq $Lang::tr{'mac reconnection'}) {
+if ($macsettings{'RECONNECT'} eq $Lang::tr{'reconnect'}) {
        system("/usr/local/bin/redctrl restart >/dev/null 2>&1 &");
        &Header::openbox('100%', 'left', $Lang::tr{'mac address recon'} );
        print "<font class='base'>$Lang::tr{'mac address done'}</font>\n";
@@ -104,7 +104,7 @@ print <<END
     <td><div align="center">
       <input type='submit' name='ACTION' value='$Lang::tr{'save'}' />
       &nbsp;&nbsp;&nbsp;&nbsp;
-      <input type='submit' name='RECONNECT' value='$Lang::tr{'mac reconnection'}' />
+      <input type='submit' name='RECONNECT' value='$Lang::tr{'reconnect'}' />
     </div></td>
   </tr>
 </table>

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index d560800ddff3a72d46a31c5075aa1064f7d7efa9..a73a19994d94307fa07d1381a10763a452997f0a 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -649,7 +649,6 @@
 'dns new 0' => 'Neue <strong>primäre</strong> DNS Server IP:',
 'dns new 1' => 'Neue <strong>sekundäre</strong> DNS Server IP:',
 'dns address recon' => 'Es wird neu Verbunden!',
-'dns reconnection' => 'Wiederverbinden',
 'dns address done' => 'Die DNS-Server Adressen werden übernommen.',
 'do not log this port list' => 'Verwerfe diese Port-Liste kurz bevor sie protokolliert werden (reduziert Protokollgröße)',
 'dod' => 'Dial-on-Demand-Modus',
@@ -1058,7 +1057,6 @@
 'mac address done' => 'Die MAC-Adresse wird übernommen',
 'mac desc' => 'Sie können an dieser Stelle die MAC-Adresse von red0 ändern. Die Adresse muss in hexadezimal (0-9,a-f) eingegeben werden, eine gültige Eingaben ist z.B. 00-01-02-0e-b8-d6 oder 00:01:02:0e:b8:d6.',
 'mac new' => 'Neue MAC-Adresse:',
-'mac reconnection' => 'Wiederverbinden',
 'magic packet send to:' => 'Sende WOL-Paket an',
 'mailmethod' => 'Mail Methode',
 'mailprogramm' => 'Mail Programm',
@@ -1379,6 +1377,7 @@
 'reboot schedule' => 'Zeitsteuerung für IPFire Neustarts',
 'rebooting' => 'Starte neu ...',
 'rebooting ipfire' => 'Starte IPFire neu',
+'reconnect' => 'Neu Verbinden',
 'reconnection' => 'Wiederverbindung',
 'red' => 'Internet',
 'references' => 'Referenzen',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 9e97dcd6ae2e3d60ef1135a4695ce1caf17d3535..a1c8d6b34576bd797afd1936a7492e3f878a6440 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -675,7 +675,6 @@
 'dns new 0' => 'New <strong>primary</strong> DNS server IP:',
 'dns new 1' => 'New <strong>secondary</strong> DNS server IP:',
 'dns address recon' => 'Trying to reconnect!',
-'dns reconnection' => 'Reconnection',
 'dns address done' => 'The DNS-Server addresses are going to be saved.',
 'do not log this port list' => 'Drop this port list just before they are logged (reduces log size)',
 'dod' => 'Dial on Demand',
@@ -1088,7 +1087,6 @@
 'mac address done' => 'The MAC address will be saved.',
 'mac desc' => 'Here you are able to change the MAC address on red0. The address must be entered in hexadecimal (0-9,a-f), a valid entry is <br />e.g. 00-01-02-0e-b8-d6 or 00:01:02:0e:b8:d6.',
 'mac new' => 'new MAC addresse:',
-'mac reconnection' => 'Reconnection',
 'magic packet send to:' => 'Magic packet send to:',
 'mailmethod' => 'Mailmethod',
 'mailprogramm' => 'Mailprogramm',
@@ -1408,6 +1406,7 @@
 'reboot schedule' => 'Schedule IPFire reboots',
 'rebooting' => 'Rebooting',
 'rebooting ipfire' => 'Rebooting IPFire',
+'reconnect' => 'Reconnect',
 'reconnection' => 'Reconnection',
 'red' => 'Internet',
 'references' => 'References',