Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x

diff --git a/config/rootfiles/core/30/filelists/files b/config/rootfiles/core/30/filelists/files
index 096af5e46c5be420bc8a14c51b42264277f68134..a36eb4a957476db09d454454663226f239da24ec 100644 (file)
--- a/config/rootfiles/core/30/filelists/files
+++ b/config/rootfiles/core/30/filelists/files
@@ -7,3 +7,4 @@ var/ipfire/langs/en.pl
 srv/web/ipfire/cgi-bin/qos.cgi
 srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/gui.cgi
+srv/web/ipfire/cgi-bin/pakfire.cgi

diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
old mode 100644 (file)
new mode 100755 (executable)
index 69bd11d..2d6f1c8
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -286,16 +286,16 @@ print <<END;
        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                <table width='95%'>
                        <tr><td colspan='2' bgcolor='$color{'color20'}'><b>$Lang::tr{'basic options'}</b></td></tr>
-                       <tr><td align='left' width='40%'>$Lang::tr{'pakfire update daily'}</td><td align="left">
-          on <input type='radio' name='AUTOUPDATE' value='on' $checked{'AUTOUPDATE'}{'on'} />/
+                       <tr><td align='left' width='45%'>$Lang::tr{'pakfire update daily'}</td><td width="55%" align="left">
+          on <input type='radio' name='AUTOUPDATE' value='on' $checked{'AUTOUPDATE'}{'on'} /> |
           <input type='radio' name='AUTOUPDATE' value='off' $checked{'AUTOUPDATE'}{'off'} /> off </td></tr>
-                       <tr><td align='left' width='40%'>$Lang::tr{'pakfire core update auto'}</td><td align="left">
-          on <input type='radio' name='AUTOUPGRADE' value='on' $checked{'AUTOUPGRADE'}{'on'} />/
+                       <tr><td align='left' width='45%'>$Lang::tr{'pakfire core update auto'}</td><td align="left">
+          on <input type='radio' name='AUTOUPGRADE' value='on' $checked{'AUTOUPGRADE'}{'on'} /> |
           <input type='radio' name='AUTOUPGRADE' value='off' $checked{'AUTOUPGRADE'}{'off'} /> off </td></tr>
-                       <tr><td align='left' width='40%'>$Lang::tr{'pakfire register'}</td><td align="left">
-          on <input type='radio' name='UUID' value='on' $checked{'UUID'}{'on'} />/
+                       <tr><td align='left' width='45%'>$Lang::tr{'pakfire register'}</td><td align="left">
+          on <input type='radio' name='UUID' value='on' $checked{'UUID'}{'on'} /> |
           <input type='radio' name='UUID' value='off' $checked{'UUID'}{'off'} /> off </td></tr>
-                       <tr><td width='100%' colspan="2" align="center"><input type="submit" name="ACTION" value="$Lang::tr{'save'}" /></td></tr>
+                       <tr><td colspan="2" align="center"><input type="submit" name="ACTION" value="$Lang::tr{'save'}" /></td></tr>
                </table>
        </form>
 END

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 6ffd0d4c9704b3ed211a8ba525d984d76b65de39..3aa10368f7f95c57af0122f4f97b2bb1abe39090 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1285,7 +1285,7 @@
 'pakfire accept all' => 'Möchten Sie der Installation aller Pakete zustimmen?',
 'pakfire available addons' => 'Verfügbare Addons:',
 'pakfire configuration' => 'Pakfire Konfiguration',
-'pakfire core update auto' => 'Core Updates automatisch installieren?',
+'pakfire core update auto' => 'Core und Addon Updates automatisch installieren:',
 'pakfire core update level' => 'Core-Update-Level',
 'pakfire install description' => 'Wählen Sie ein oder mehrere Pakete zur Installation aus und drücken Sie auf das plus Symbol.',
 'pakfire install package' => 'Sie möchten folgende Pakete installieren: ',
@@ -1295,11 +1295,11 @@
 'pakfire last serverlist update' => 'Letztes Serverlisten Update vor',
 'pakfire last update' => 'Letzes Update vor',
 'pakfire possible dependency' => ' Möglicherweise haben diese Pakete Abhängigkeiten, d.h. andere Pakete müssen zusätzlich installiert werden. Dazu sehen sie unten eine Liste.',
-'pakfire register' => 'Registrierung am Master-Server:',
+'pakfire register' => 'Registrierung am Pakfire-Server:',
 'pakfire system state' => 'System Status',
 'pakfire uninstall description' => 'Wählen Sie ein oder mehrere Pakete zur Deinstallation aus und drücken Sie auf das minus Symbol.',
 'pakfire uninstall package' => 'Sie möchten folgende Pakete deinstallieren: ',
-'pakfire update daily' => 'Automatische Updates täglich ausführen:',
+'pakfire update daily' => 'Täglich nach Updates suchen:',
 'pakfire updates' => 'Zur Verfügung stehende Updates:',
 'pakfire working' => 'Pakfire führt gerade eine Aufgabe aus... Bitte warten sie, bis diese erfolgreich beendet wurde.',
 'pap or chap' => 'PAP oder CHAP',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index a2839388bb9efac77a23a009818521cee63a85d3..bef35206453d81a9ab9fbf0416c4e23313bc36a5 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1313,7 +1313,7 @@
 'pakfire accept all' => 'Do you want to install all packages?',
 'pakfire available addons' => 'Available Addons:',
 'pakfire configuration' => 'Pakfire Configuration',
-'pakfire core update auto' => 'Install Core Update automaticly?',
+'pakfire core update auto' => 'Install core and addon updates automatically:',
 'pakfire core update level' => 'Core-Update-Level',
 'pakfire install description' => 'Please choose one or more items from the list below and click the plus to install.',
 'pakfire install package' => 'You want to install the following packages: ',
@@ -1323,11 +1323,11 @@
 'pakfire last serverlist update' => 'Last server list update made',
 'pakfire last update' => 'Last Update made',
 'pakfire possible dependency' => ' There may be depending packages, here is a list of packages that need to be installed.',
-'pakfire register' => 'Register at master server:',
+'pakfire register' => 'Register at pakfire-server:',
 'pakfire system state' => 'System Status',
 'pakfire uninstall description' => 'Please choose one or more items from the list below and click the minus to uninstall.',
 'pakfire uninstall package' => 'You want to uninstall the following packages: ',
-'pakfire update daily' => 'Run automatic Update daily:',
+'pakfire update daily' => 'Search for updates daily:',
 'pakfire updates' => 'Available Update:',
 'pakfire working' => 'Pakfire ist working ... Please wait until everything is done successfull.',
 'pap or chap' => 'PAP or CHAP',