Corrected 2 cgis not fully translated

diff --git a/config/rootfiles/core/15/files b/config/rootfiles/core/15/files
index ba8bce191f710302ee3b1df174f12ca57db2fa5e..c35d91a8a7e8caf5e78494606f767ed7f77eed21 100644 (file)
--- a/config/rootfiles/core/15/files
+++ b/config/rootfiles/core/15/files
@@ -2,3 +2,6 @@ etc/init.d/mISDN
 etc/modprobe.d/blacklist
 usr/bin/bc
 usr/bin/dc
+srv/web/ipfire/cgi-bin/pakfire.cgi
+srv/web/ipfire/cgi-bin/qos.cgi
+var/ipfire/langs

diff --git a/config/rootfiles/core/15/update.sh b/config/rootfiles/core/15/update.sh
index 600ffd9514d210aa4b40a1259d4c28eecd535c29..3cb2d28a728bc7013eaca262a8d0b9ff2da68991 100644 (file)
--- a/config/rootfiles/core/15/update.sh
+++ b/config/rootfiles/core/15/update.sh
@@ -2,4 +2,5 @@
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 extract_files
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
 /etc/init.d/mISDN config

diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index 79bb3fb887e7315eae6d91ac6c75b74f13e0ee22..69bd11d3e23c20fc7ed3b4162bee2f7a035930d4 100644 (file)
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -231,7 +231,7 @@ print <<END;
                                        $Lang::tr{'pakfire last package update'} $packages_update_age ago
                                        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                <input type='hidden' name='ACTION' value='update' />
-                                               <input type='submit' value='Liste aktualisieren' /><br />
+                                               <input type='submit' value='$Lang::tr{'calamaris refresh list'}' /><br />
                                        </form>
                                <td align="center">
                                 <form method='post' action='$ENV{'SCRIPT_NAME'}'>

diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 70ec4286c5686cb753286e3e8e71132d184575c7..d5da1fd9122c7bf3504d3d5f99e64b1f7b8bc944 100644 (file)
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -578,7 +578,7 @@ END
        &General::writehash("${General::swroot}/qos/settings", \%qossettings);
 
 }
-elsif ($qossettings{'ACTION'} eq 'Statusinformationen')
+elsif ($qossettings{'ACTION'} eq "$Lang::tr{'status'}" )
 {
        &Header::openbox('100%', 'left', 'QoS Status');
        if ($qossettings{'ENABLED'} eq 'on'){
@@ -592,7 +592,7 @@ elsif ($qossettings{'ACTION'} eq 'Statusinformationen')
        &Header::closepage();
        exit
 }
-elsif ($qossettings{'ACTION'} eq 'Parentklasse hinzufuegen')
+elsif ($qossettings{'ACTION'} eq "$Lang::tr{'parentclass add'}" )
 {
        &parentclass();
        &Header::closebigbox();
@@ -645,21 +645,21 @@ END
        &Header::closepage();
        exit
 }
-elsif ($qossettings{'ACTION'} eq 'Erweiterte Einstellungen')
+elsif ($qossettings{'ACTION'} eq "$Lang::tr{'urlfilter advanced settings'}" )
 {
        &expert();
        &Header::closebigbox();
        &Header::closepage();
        exit
 }
-if ($qossettings{'ACTIONBW'} eq 'Andern')
+if ($qossettings{'ACTIONBW'} eq "$Lang::tr{'modify'}" )
 {
        &changebandwidth();
        &Header::closebigbox();
        &Header::closepage();
        exit
 }
-if ($qossettings{'ACTIONDEF'} eq 'Andern')
+if ($qossettings{'ACTIONDEF'} eq "$Lang::tr{'modify'}" )
 {
        &changedefclasses();
        &Header::closebigbox();
@@ -715,7 +715,7 @@ END
          <table width='66%'>
                <tr><td colspan='3'>&nbsp;
                <tr><td width='50%' align='right'>$Lang::tr{'downlink speed'}:  <td width='30%' align='left'>$qossettings{'INC_SPD'}
-                   <td width='20%' rowspan='2' align='center' valign='middle'><input type='submit' name='ACTIONBW' value='Andern' />
+                   <td width='20%' rowspan='2' align='center' valign='middle'><input type='submit' name='ACTIONBW' value='$Lang::tr{'modify'}' />
                <tr><td width='50%' align='right'>$Lang::tr{'uplink speed'}:    <td width='30%' align='left'>$qossettings{'OUT_SPD'}
                </table></form>
 END
@@ -727,7 +727,7 @@ END
                <table width='66%'>
                <tr><td colspan='3'><hr />
                <tr><td width='50%' align='right'>$Lang::tr{'downlink std class'}:      <td width='30%' align='left'>$qossettings{'DEFCLASS_INC'}
-                   <td width='20%' rowspan='3' align='center' valign='middle'><input type='submit' name='ACTIONDEF' value='Andern' />
+                   <td width='20%' rowspan='3' align='center' valign='middle'><input type='submit' name='ACTIONDEF' value='$Lang::tr{'modify'}' />
                <tr><td width='50%' align='right'>$Lang::tr{'uplink std class'}:        <td width='30%' align='left'>$qossettings{'DEFCLASS_OUT'}
                <tr><td width='50%' align='right'>ACKs:                         <td width='30%' align='left'>$qossettings{'ACK'}
                <tr><td colspan='3' width='100%'><hr />
@@ -736,9 +736,9 @@ END
                </form>
                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                <table border='0' cellpadding='0' cellspacing='0'>
-                       <tr><td><input type='submit' name='ACTION' value='Parentklasse hinzufuegen' />
-                           <td><input type='submit' name='ACTION' value='Erweiterte Einstellungen' />
-                           <td><input type='submit' name='ACTION' value='Statusinformationen' />
+                       <tr><td><input type='submit' name='ACTION' value='$Lang::tr{'parentclass add'}' />
+                           <td><input type='submit' name='ACTION' value='$Lang::tr{'urlfilter advanced settings'}' />
+                           <td><input type='submit' name='ACTION' value='$Lang::tr{'status'}' />
                        </tr></table>
        </form>
 END

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index b7cdc80c0082bbf9d63e3503a14c4c0c92da0cc1..557242df630bfb409d498ab043c7f178c50d5571 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -31,6 +31,8 @@
 'Level7 Rule' => 'Level7-Regel',
 'Local VPN IP' => 'Internes Netzwerk (GREEN)',
 'MTU' => 'MTU Size',
+'modify' => 'Ändern',
+'parentclass add' => 'Parentklasse hinzufügen',
 'Number of IPs for the pie chart' => 'Anzahl der angezeigten IPs im Diagramm',
 'Number of Ports for the pie chart' => 'Anzahl der angezeigten Ports im Diagramm',
 'OVPN' => 'OpenVPN',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index b5708d8e82dc725d7b1f9def7c5f1e726e31a6f2..0118b64b3bc00c2e393af27a44bcb2affb2ae29b 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -19,6 +19,8 @@
 'ConnSched scheduled actions' => 'Scheduled actions',
 'ConnSched scheduler' => 'Scheduler',
 'ConnSched select profile' => 'Select profile',
+'modify' => 'Modify',
+'parentclass add' => 'Add parentclass',
 'ConnSched time' => 'Time:',
 'ConnSched up' => 'Up',
 'ConnSched weekdays' => 'Days of the week:',