Corrected and translated outgoing fw

Added recent changes to core6
Further integrated collectd
Started  building core 7 for collected


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

langs/de/cgi-bin/de.pl

@@ -389,6 +389,7 @@
 'cache size' => 'Cache-Größe (MB):',
 'cached' => 'zwischengespeichert',
 'cached memory' => 'Cache Speicher    ',
+'cached swap' => 'Gecachter Swap',
 'calamaris available reports' => 'Verfügbare Berichte',
 'calamaris byte unit' => 'Byte Einheit',
 'calamaris create report' => 'Bericht erstellen',
@@ -495,8 +496,15 @@
 'could not open update information file' => 'Datei mit den Update-Information konnte nicht geöffnet werden. Die Update-Datei ist beschädigt.',
 'could not retrieve common name from certificate' => 'Der Gemeinsame Name (CN) konnte nicht aus dem Zertifikat gelesen werden.',
 'country' => 'Land',
-'cpu irq usage' => 'IRQ CPU Nutzung     ',
+'cpu idle usage' => 'Leerlauf CPU Nutzung',
+'cpu interrupt usage' => 'Interrupt CPU Nutzung',
+'cpu iowait usage' => 'CPU wartet auf IO',
+'cpu irq usage' => 'IRQ CPU Nutzung',
+'cpu nice usage' => 'Nice CPU Nutzung',
+'cpu steal usage' => 'Steal CPU Nutzung',
+'cpu system usage' => 'System CPU Nutzung',
 'cpu usage per' => 'CPU-Nutzung pro',
+'cpu user usage' => 'Benutzer CPU Nutzung',
 'create' => 'Erzeuge',
 'create mask' => 'UNIX Rechte für neue Dateien',
 'create new backup' => 'Einen neuen Sicherungssatz anlegen',
@@ -824,8 +832,6 @@
 'icmp type' => 'ICMP-Typ',
 'id' => 'ID',
 'idle' => 'Leerlauf',
-'idle cpu' => 'CPU Leerlauf',
-'idle cpu usage' => 'Leerlauf CPU Nutzung',
 'idle timeout' => 'Leerlauf-Wartezeit in min (0 zum Deaktivieren):',
 'idle timeout not set' => 'Leerlauf-Wartezeit nicht angegeben.',
 'ids log viewer' => 'Ansicht IDS-Log',
@@ -927,7 +933,6 @@
 'invalid vpi vpci' => 'Ungültige VPI/VPCI-Einstellungen',
 'invalid wins address' => 'Ungültige WINS Server Addresse.',
 'invert' => 'Invertieren',
-'iowait' => 'CPU wartet auf IO   ',
 'ip address' => 'IP-Adresse',
 'ip address in use' => 'IP-Adresse bereits vergeben',
 'ip address outside subnets' => 'IP-Adresse ausserhalb der(s) lokalen Subnetze(s)',
@@ -945,7 +950,6 @@
 'iptmangles' => 'IPTable Mangles',
 'iptnats' => 'IPTable Network Address Translation',
 'ipts' => 'IPTables',
-'irq cpu usage' => 'IRQ Cpu Nutzung     ',
 'isdn' => 'ISDN',
 'isdn settings' => 'Zusätzliche ISDN-Einstellungen:',
 'isdn1' => 'Einfaches ISDN',
@@ -1114,8 +1118,9 @@
 'network' => 'Netzwerk',
 'network added' => 'Benutzerdefiniertes Netzwerk hinzugefügt',
 'network configuration' => 'Netzwerk Konfiguration',
+'network internal' => 'Netzwerk (intern)',
 'network options' => 'Netzwerk Optionen',
-'network other' => 'Netzwerk (intern)',
+'network other' => 'Netzwerk (sonstige)',
 'network red' => 'Netzwerk (extern)',
 'network removed' => 'Benutzerdefiniertes Netzwerk entfernt',
 'network status information' => 'Netzwerk-Statusinformationen',
@@ -1124,6 +1129,7 @@
 'network traffic graphs' => 'Diagramme zur Netzwerkauslastung',
 'network traffic graphs external' => 'Net-Traffic-Diagramme (extern)',
 'network traffic graphs internal' => 'Net-Traffic-Diagramme (intern)',
+'network traffic graphs others' => 'Netzwerk (sonstige)',
 'network updated' => 'Benutzerdefiniertes Netzwerk aktualisiert',
 'networks settings' => 'Firewall - Netzwerkeinstellungen',
 'new optionsfw later' => 'Ihre Modifikation(en) wird (werden) beim nächsten Neustart aktiv werden',
@@ -1195,6 +1201,11 @@
 'outgoing' => 'ausgehend',
 'outgoing firewall' => 'Ausgehende Firewall',
 'outgoing traffic in bytes per second' => 'Abgehender Verkehr in Bytes pro Sekunde',
+'outgoingfw mode0' => 'In diesem Modus ist es allen Rechnern im Netzwerk uneingeschraenkt moeglich Verbindungen ins Internet aufzubauen.',
+'outgoingfw mode1' => 'In diesem Modus werden nur Verbindungen nach den oben definierten Regeln zugelassen.',
+'outgoingfw mode2' => 'In diesem Modus werden saemtliche Verbindungen erlaubt, bis auf die oben definierten Block-Regeln.',
+'outgoingfw p2p description' => 'Klicken Sie auf die Symbole um das entsprechende iptables P2P-Blockmodul zu (de-)aktivieren.',
+'outgoingfw reset' => 'Alle Regeln loeschen',
 'override mtu' => 'Überschreibe Standard MTU',
 'ovpn' => 'OpenVPN',
 'ovpn con stat' => 'OpenVPN Verbindungs-Statistik',
@@ -1269,6 +1280,7 @@
 'pkcs12 file password' => 'PKCS12 Datei-Passwort',
 'play' => 'Play',
 'polfile' => 'Polfile',
+'policy' => 'Richtlinie',
 'port' => 'Port',
 'port forwarding configuration' => 'Konfiguration der Port-Weiterleitung',
 'ports' => 'Ports',
@@ -1314,8 +1326,8 @@
 'qos graphs' => 'Qos Diagramme',
 'quick playlist' => 'Quick Playlist',
 'ram' => 'RAM-Speicher',
+'read bytes' => 'Gelesene Bytes',
 'read list' => 'Liste der Leseberechtigten',
-'read sectors' => 'Sektoren lesen',
 'real address' => 'Reale Addresse',
 'reboot' => 'Neustart',
 'reboot schedule' => 'Zeitsteuerung für IPFire Neustarts',
@@ -1387,8 +1399,6 @@
 'secondary wins server address' => 'Sekundäre WINS-Server Adresse',
 'seconds' => 'sek.',
 'section' => 'Abschnitt',
-'sectors read from disk per second' => 'Von Platte gelesene Sektoren pro Sekunde',
-'sectors written to disk per second' => 'Auf Platte geschriebene Sektoren pro Sekunde',
 'secure shell server' => 'Secure Shell Server',
 'security' => 'Sicherheit',
 'security options' => 'Sicherheitsoptionen',
@@ -1418,7 +1428,6 @@
 'settings' => 'Konfiguration',
 'shaping list options' => 'Datenflußkontrolldienste',
 'shared' => 'shared',
-'shared memory' => 'Gemeins. Speicher ',
 'sharename' => 'Freigabename',
 'shares' => 'Freigaben',
 'show ajax speedmeter in footer' => 'Ajax Speed Anzeige',
@@ -1519,8 +1528,6 @@
 'swap' => 'Swap',
 'swap usage per' => 'Nutzung von Auslagerungsspeicher (Swap) pro',
 'system' => 'System',
-'system cpu' => 'System CPU',
-'system cpu usage' => 'System CPU Nutzung  ',
 'system graphs' => 'System-Diagramme',
 'system log viewer' => 'Betrachter der System-Logdateien',
 'system logs' => 'System-Logdateien',
@@ -1886,7 +1893,6 @@
 'used memory' => 'Genutzter Speicher',
 'used swap' => 'Genutzter Swap',
 'user' => 'Benutzer',
-'user cpu usage' => 'Benutzer CPU Nutzung',
 'user log' => 'Benutzer Log',
 'user proxy logs' => 'Benutzer Proxy Log',
 'username' => 'Benutzername:',
@@ -1950,7 +1956,7 @@
 'wireless configuration' => 'Wireless-Konfiguration',
 'wol wakeup' => 'WakeUp',
 'workgroup' => 'Arbeitsgruppe',
-'written sectors' => 'Sektoren schr.',
+'written bytes' => 'Geschriebene Bytes',
 'xtaccess all error' => 'Sie können einen externen Zugang nicht auf \'ALL\' setzen - dies erfolgt in den Port-Weiterleitungsregeln.',
 'xtaccess bad transfert' => 'Wenn Sie einen Port Zielbereich angeben, muss der Quellbereich identisch sein!',
 'year' => 'Jahr',

langs/en/cgi-bin/en.pl

@@ -408,6 +408,7 @@
 'cache size' => 'Cache size (MB):',
 'cached' => 'cached',
 'cached memory' => 'Cached Memory  ',
+'cached swap' => 'Cached Swap',
 'calamaris available reports' => 'Available reports',
 'calamaris byte unit' => 'Byte unit',
 'calamaris create report' => 'Create report',
@@ -516,8 +517,15 @@
 'could not open update information file' => 'Could not open update information file.  The update file is corrupt.',
 'could not retrieve common name from certificate' => 'Could not retrieve common name from certificate.',
 'country' => 'Country',
-'cpu irq usage' => 'IRQ CPU Usage     ',
+'cpu idle usage' => 'Idle CPU Usage',
+'cpu interrupt usage' => 'Interrupt CPU Usage',
+'cpu iowait usage' => 'CPU waiting for IO',
+'cpu irq usage' => 'IRQ CPU Usage',
+'cpu nice usage' => 'Nice CPU Usage',
+'cpu steal usage' => 'Steal CPU Usage',
+'cpu system usage' => 'System CPU Usage',
 'cpu usage per' => 'CPU Usage per',
+'cpu user usage' => 'User CPU Usage',
 'create' => 'Create',
 'create mask' => 'UNIX rights for new created files',
 'create new backup' => 'Create a new backup set',
@@ -850,8 +858,6 @@
 'icmp type' => 'ICMP Type',
 'id' => 'ID',
 'idle' => 'Idle',
-'idle cpu' => 'Idle CPU',
-'idle cpu usage' => 'Idle CPU Usage    ',
 'idle timeout' => 'Idle timeout (mins; 0 to disable):',
 'idle timeout not set' => 'Idle timeout not set.',
 'ids log viewer' => 'IDS log viewer',
@@ -873,7 +879,7 @@
 'inactive' => 'inactive',
 'include logfiles' => 'include logfiles',
 'incoming' => 'incoming',
-'incoming traffic in bytes per second' => 'Incoming Traffic in Bytes per Second',
+'incoming traffic in bytes per second' => 'Incoming Traffic',
 'incorrect password' => 'Incorrect password',
 'info' => 'Info',
 'init string' => 'Init:',
@@ -954,7 +960,6 @@
 'invalid vpi vpci' => 'Invalid VPI/VPCI settings',
 'invalid wins address' => 'Invalid WINS Server address.',
 'invert' => 'Invert',
-'iowait' => 'CPU waiting for IO',
 'ip address' => 'IP Address',
 'ip address in use' => 'IP address already in use',
 'ip address outside subnets' => 'IP Address outside subnets',
@@ -972,7 +977,6 @@
 'iptmangles' => 'IPTable Mangles',
 'iptnats' => 'IPTable Network Address Translation',
 'ipts' => 'IPTables',
-'irq cpu usage' => 'IRQ Cpu Usage       ',
 'isdn' => 'ISDN',
 'isdn settings' => 'Additional ISDN settings:',
 'isdn1' => 'Single ISDN',
@@ -1141,8 +1145,9 @@
 'network' => 'Network',
 'network added' => 'Custom Network added',
 'network configuration' => 'Network Configuration',
+'network internal' => 'Network (internal)',
 'network options' => 'Network Options',
-'network other' => 'network (internal)',
+'network other' => 'network (other)',
 'network red' => 'network (external)',
 'network removed' => 'Custom Network removed',
 'network status information' => 'Network Status Information',
@@ -1151,6 +1156,7 @@
 'network traffic graphs' => 'Network traffic graphs',
 'network traffic graphs external' => 'Net-Traffic graphs (external)',
 'network traffic graphs internal' => 'Net-Traffic graphs (internal)',
+'network traffic graphs others' => 'Network (others)',
 'network updated' => 'Custom Network updated',
 'networks settings' => 'Firewall - Network settings',
 'new optionsfw later' => 'Your modification(s) will be active on next restart',
@@ -1222,7 +1228,12 @@
 'out' => 'Out',
 'outgoing' => 'outgoing',
 'outgoing firewall' => 'Outgoing Firewall',
-'outgoing traffic in bytes per second' => 'Outgoing Traffic in Bytes per Second',
+'outgoing traffic in bytes per second' => 'Outgoing Traffic',
+'outgoingfw mode0' => 'Using this mode, all clients are able to access the internet without any restrictions.',
+'outgoingfw mode1' => 'Using this mode, only connections based on the defined rules are allowed.',
+'outgoingfw mode2' => 'Using this mode, all connections are allowed despited off the defined ones.',
+'outgoingfw p2p description' => 'Press the corresponding button to enable/disable the iptables p2p block modul.',
+'outgoingfw reset' => 'Reset all',
 'override mtu' => 'Override default MTU',
 'ovpn' => 'OpenVPN',
 'ovpn con stat' => 'OpenVPN Connection Statistics',
@@ -1297,6 +1308,7 @@
 'pkcs12 file password' => 'PKCS12 File Password',
 'play' => 'play',
 'polfile' => 'Polfile',
+'policy' => 'Policy',
 'port' => 'Port',
 'port forwarding configuration' => 'Port forwarding configuration',
 'ports' => 'Ports',
@@ -1343,8 +1355,8 @@
 'quick control' => 'Quick Control',
 'quick playlist' => 'Quick Playlist',
 'ram' => 'RAM',
+'read bytes' => 'Read Bytes',
 'read list' => 'list with readonly hosts',
-'read sectors' => 'Read Sectors',
 'real address' => 'Real Address',
 'reboot' => 'Reboot',
 'reboot schedule' => 'Schedule IPFire reboots',
@@ -1416,8 +1428,6 @@
 'secondary wins server address' => 'Secondary WINS Server address',
 'seconds' => 'Secs',
 'section' => 'Section',
-'sectors read from disk per second' => 'Sectors read from disk per second',
-'sectors written to disk per second' => 'Sectors written to disk per second',
 'secure shell server' => 'Secure shell server',
 'security' => 'Security',
 'security options' => 'Security Options',
@@ -1448,7 +1458,6 @@
 'shaping add options' => 'Add service',
 'shaping list options' => 'Traffic shaping services',
 'shared' => 'shared',
-'shared memory' => 'Shared Memory  ',
 'sharename' => 'Sharename',
 'shares' => 'Shares',
 'show ajax speedmeter in footer' => 'Show Ajax Speedmeter',
@@ -1551,8 +1560,6 @@
 'swap' => 'Swap',
 'swap usage per' => 'Swap Usage per',
 'system' => 'System',
-'system cpu' => 'System CPU',
-'system cpu usage' => 'System CPU Usage  ',
 'system graphs' => 'System Graphs',
 'system log viewer' => 'System Log Viewer',
 'system logs' => 'System Logs',
@@ -1919,8 +1926,6 @@
 'used memory' => 'Used Memory    ',
 'used swap' => 'Used Swap',
 'user' => 'User',
-'user cpu' => 'User CPU',
-'user cpu usage' => 'User CPU Usage    ',
 'user log' => 'user log',
 'user proxy logs' => 'user proxy log',
 'username' => 'User Name:',
@@ -1984,7 +1989,7 @@
 'wireless configuration' => 'Wireless Configuration',
 'wol wakeup' => 'WakeUp',
 'workgroup' => 'Workgroup',
-'written sectors' => 'Written Sectors',
+'written bytes' => 'Writen Bytes',
 'xtaccess all error' => 'You cannot set an external access to ALL, that is done in the port forwarding record.',
 'xtaccess bad transfert' => 'If you specify a port destination range, the source range must be identical !',
 'year' => 'Year',