[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6d653734fb8b044db24f2650c740820a6e0132a0
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 6d653734fb8b044db24f2650c740820a6e0132a0 (commit) via 61498b76b6f2b85b2a6674687c0edd19ed105be6 (commit) via 144ff7605d5340bad77bd032274d1423bb7084d7 (commit) from 2f34103d47a490cc9d1b7ef4f067f261fc52250a (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 6d653734fb8b044db24f2650c740820a6e0132a0 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed May 22 11:23:07 2019 +0100
Update German translations
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 61498b76b6f2b85b2a6674687c0edd19ed105be6 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed May 22 11:08:43 2019 +0100
vulnerabilities.cgi: Regard mitigations that only mitigate something still as vulnerable
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 144ff7605d5340bad77bd032274d1423bb7084d7 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed May 22 11:05:20 2019 +0100
vulnerabilities.cgi: Simplify regexes
We can do the split in one.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: doc/language_issues.de | 21 --------------------- doc/language_issues.en | 6 +++--- doc/language_issues.es | 6 +++--- doc/language_issues.fr | 6 +++--- doc/language_issues.it | 6 +++--- doc/language_issues.nl | 6 +++--- doc/language_issues.pl | 6 +++--- doc/language_issues.ru | 6 +++--- doc/language_issues.tr | 6 +++--- doc/language_missings | 36 +++++++++++++++++++++--------------- html/cgi-bin/vulnerabilities.cgi | 15 +++------------ langs/de/cgi-bin/de.pl | 21 +++++++++++++++++++++ langs/en/cgi-bin/en.pl | 6 +++--- 13 files changed, 72 insertions(+), 75 deletions(-)
Difference in files: diff --git a/doc/language_issues.de b/doc/language_issues.de index e72ad7e2b..412efdc47 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -793,30 +793,9 @@ WARNING: untranslated string: guardian logtarget_file = unknown string WARNING: untranslated string: guardian logtarget_syslog = unknown string WARNING: untranslated string: guardian no entries = unknown string WARNING: untranslated string: guardian service = unknown string -WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities -WARNING: untranslated string: ids hide = Hide -WARNING: untranslated string: ids rules update = Ruleset -WARNING: untranslated string: ids show = Show -WARNING: untranslated string: ike lifetime should be between 1 and 8 hours = unknown string -WARNING: untranslated string: info messages = unknown string -WARNING: untranslated string: interface mode = Interface -WARNING: untranslated string: meltdown = Meltdown -WARNING: untranslated string: mitigated = Mitigated -WARNING: untranslated string: no data = unknown string -WARNING: untranslated string: not affected = Not Affected -WARNING: untranslated string: please reboot to apply your changes = Please reboot to apply your changes -WARNING: untranslated string: processor vulnerability mitigations = Processor Vulnerability Mitigations WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string WARNING: untranslated string: routing table = unknown string WARNING: untranslated string: show tls-auth key = Show tls-auth key -WARNING: untranslated string: smt disabled = unknown string -WARNING: untranslated string: smt enabled = unknown string -WARNING: untranslated string: smt not supported = unknown string -WARNING: untranslated string: spectre variant 1 = Spectre Variant 1 -WARNING: untranslated string: spectre variant 2 = Spectre Variant 2 -WARNING: untranslated string: spectre variant 4 = Spectre Variant 4 WARNING: untranslated string: vpn statistics n2n = unknown string -WARNING: untranslated string: vulnerability = Vulnerability -WARNING: untranslated string: vulnerable = Vulnerable diff --git a/doc/language_issues.en b/doc/language_issues.en index 126803997..9ca53b50a 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -1631,9 +1631,9 @@ WARNING: untranslated string: smartwarn2 = reports S.M.A.R.T. error WARNING: untranslated string: smbrestart = Restart samba WARNING: untranslated string: smbstart = Start samba WARNING: untranslated string: smbstop = Stop samba -WARNING: untranslated string: smt disabled = unknown string -WARNING: untranslated string: smt enabled = unknown string -WARNING: untranslated string: smt not supported = unknown string +WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled +WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled +WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported WARNING: untranslated string: snat new source ip address = New source IP address WARNING: untranslated string: socket options = Socket options WARNING: untranslated string: software version = Software Version diff --git a/doc/language_issues.es b/doc/language_issues.es index f015ac7df..2af165d6b 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -1224,9 +1224,9 @@ WARNING: untranslated string: search = Search WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running. WARNING: untranslated string: show dh = Show Diffie-Hellman parameters WARNING: untranslated string: show tls-auth key = Show tls-auth key -WARNING: untranslated string: smt disabled = unknown string -WARNING: untranslated string: smt enabled = unknown string -WARNING: untranslated string: smt not supported = unknown string +WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled +WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled +WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported WARNING: untranslated string: snat new source ip address = New source IP address WARNING: untranslated string: software version = Software Version WARNING: untranslated string: source ip country = Source IP Country diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 0503c8241..545136dc9 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -866,9 +866,9 @@ WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string WARNING: untranslated string: routing table = unknown string -WARNING: untranslated string: smt disabled = unknown string -WARNING: untranslated string: smt enabled = unknown string -WARNING: untranslated string: smt not supported = unknown string +WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled +WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled +WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported WARNING: untranslated string: spectre variant 1 = Spectre Variant 1 WARNING: untranslated string: spectre variant 2 = Spectre Variant 2 WARNING: untranslated string: spectre variant 4 = Spectre Variant 4 diff --git a/doc/language_issues.it b/doc/language_issues.it index ac213f0b1..59c649954 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -989,9 +989,9 @@ WARNING: untranslated string: routing table = unknown string WARNING: untranslated string: samba join a domain = Join a domain WARNING: untranslated string: samba join domain = Join domain WARNING: untranslated string: search = Search -WARNING: untranslated string: smt disabled = unknown string -WARNING: untranslated string: smt enabled = unknown string -WARNING: untranslated string: smt not supported = unknown string +WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled +WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled +WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported WARNING: untranslated string: spectre variant 1 = Spectre Variant 1 WARNING: untranslated string: spectre variant 2 = Spectre Variant 2 WARNING: untranslated string: spectre variant 4 = Spectre Variant 4 diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 741c1c39f..836745e5a 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -1028,9 +1028,9 @@ WARNING: untranslated string: samba join domain = Join domain WARNING: untranslated string: search = Search WARNING: untranslated string: show dh = Show Diffie-Hellman parameters WARNING: untranslated string: show tls-auth key = Show tls-auth key -WARNING: untranslated string: smt disabled = unknown string -WARNING: untranslated string: smt enabled = unknown string -WARNING: untranslated string: smt not supported = unknown string +WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled +WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled +WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported WARNING: untranslated string: software version = Software Version WARNING: untranslated string: source ip country = Source IP Country WARNING: untranslated string: spectre variant 1 = Spectre Variant 1 diff --git a/doc/language_issues.pl b/doc/language_issues.pl index f015ac7df..2af165d6b 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -1224,9 +1224,9 @@ WARNING: untranslated string: search = Search WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running. WARNING: untranslated string: show dh = Show Diffie-Hellman parameters WARNING: untranslated string: show tls-auth key = Show tls-auth key -WARNING: untranslated string: smt disabled = unknown string -WARNING: untranslated string: smt enabled = unknown string -WARNING: untranslated string: smt not supported = unknown string +WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled +WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled +WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported WARNING: untranslated string: snat new source ip address = New source IP address WARNING: untranslated string: software version = Software Version WARNING: untranslated string: source ip country = Source IP Country diff --git a/doc/language_issues.ru b/doc/language_issues.ru index f8f4e1051..b904157b1 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -1220,9 +1220,9 @@ WARNING: untranslated string: search = Search WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running. WARNING: untranslated string: show dh = Show Diffie-Hellman parameters WARNING: untranslated string: show tls-auth key = Show tls-auth key -WARNING: untranslated string: smt disabled = unknown string -WARNING: untranslated string: smt enabled = unknown string -WARNING: untranslated string: smt not supported = unknown string +WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled +WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled +WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported WARNING: untranslated string: snat new source ip address = New source IP address WARNING: untranslated string: software version = Software Version WARNING: untranslated string: source ip country = Source IP Country diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 2f1699d59..cf773d8cb 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -891,9 +891,9 @@ WARNING: untranslated string: route config changed = unknown string WARNING: untranslated string: routing config added = unknown string WARNING: untranslated string: routing config changed = unknown string WARNING: untranslated string: routing table = unknown string -WARNING: untranslated string: smt disabled = unknown string -WARNING: untranslated string: smt enabled = unknown string -WARNING: untranslated string: smt not supported = unknown string +WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled +WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled +WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (SMT) is not supported WARNING: untranslated string: spectre variant 1 = Spectre Variant 1 WARNING: untranslated string: spectre variant 2 = Spectre Variant 2 WARNING: untranslated string: spectre variant 4 = Spectre Variant 4 diff --git a/doc/language_missings b/doc/language_missings index 3f4d41394..453557189 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -45,34 +45,19 @@ < g.dtm < g.lite < guardian -< hardware vulnerabilities -< ids hide -< ids rules update -< ids show < insert removable device -< interface mode -< meltdown -< mitigated -< not affected < notes -< please reboot to apply your changes -< processor vulnerability mitigations < quick control < shaping add options < show areas < show lines < show tls-auth key -< spectre variant 1 -< spectre variant 2 -< spectre variant 4 < teovpn_fragment < tor bridge enabled < tor errmsg invalid node id < updxlrtr used by < upload fcdsl.o < vpn configuration main -< vulnerability -< vulnerable ############################################################################ # Checking cgi-bin translations for language: es # ############################################################################ @@ -707,6 +692,9 @@ < Set time on boot < show dh < show tls-auth key +< smt disabled +< smt enabled +< smt not supported < snat new source ip address < software version < source ip country @@ -943,6 +931,9 @@ < processor vulnerability mitigations < ptr < runmode +< smt disabled +< smt enabled +< smt not supported < spectre variant 1 < spectre variant 2 < spectre variant 4 @@ -1203,6 +1194,9 @@ < samba join a domain < samba join domain < search +< smt disabled +< smt enabled +< smt not supported < spectre variant 1 < spectre variant 2 < spectre variant 4 @@ -1563,6 +1557,9 @@ < search < show dh < show tls-auth key +< smt disabled +< smt enabled +< smt not supported < software version < source ip country < spectre variant 1 @@ -2267,6 +2264,9 @@ < server restart < show dh < show tls-auth key +< smt disabled +< smt enabled +< smt not supported < snat new source ip address < software version < source ip country @@ -3078,6 +3078,9 @@ < server restart < show dh < show tls-auth key +< smt disabled +< smt enabled +< smt not supported < snat new source ip address < software version < source ip country @@ -3342,6 +3345,9 @@ < processor vulnerability mitigations < ptr < runmode +< smt disabled +< smt enabled +< smt not supported < spectre variant 1 < spectre variant 2 < spectre variant 4 diff --git a/html/cgi-bin/vulnerabilities.cgi b/html/cgi-bin/vulnerabilities.cgi index 76eb79f82..74d222017 100644 --- a/html/cgi-bin/vulnerabilities.cgi +++ b/html/cgi-bin/vulnerabilities.cgi @@ -125,12 +125,6 @@ for my $vuln (sort keys %VULNERABILITIES) { $colour = "white"; $bgcolour = ${Header::colourred};
- # Mitigated but smt is enabled - } elsif ($status eq "Mitigation-SMT") { - $status_message = $Lang::tr{'mitigated'}; - $colour = "white"; - $bgcolour = ${Header::colourred}; - # Mitigated } elsif ($status eq "Mitigation") { $status_message = $Lang::tr{'mitigated'}; @@ -233,15 +227,12 @@ sub check_status($) { my $status = <FILE>; close(FILE);
- if ($status =~ /^(Vulnerable): (.*)$/) { - return ($1, $2); - } - + # Fix status when something has been mitigated, but not fully, yet if ($status =~ /^(Mitigation): (.*vulnerable.*)$/) { - return ("Mitigation-SMT", $2); + return ("Vulnerable", $2); }
- if ($status =~ /^(Mitigation): (.*)$/) { + if ($status =~ /^(Vulnerable|Mitigation): (.*)$/) { return ($1, $2); }
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index bb97e4511..2e67e495f 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1310,6 +1310,7 @@ 'harddisk temperature graphs' => 'Festplatten-Diagramme', 'hardware graphs' => 'Hardware-Diagramme', 'hardware support' => 'Hardware-Unterstützung', +'hardware vulnerabilities' => 'Hardwareverwundbarkeiten', 'hdd temperature in' => 'Festplattentemperatur in', 'help' => 'Hilfe', 'high' => 'Hoch', @@ -1345,6 +1346,7 @@ 'ids automatic rules update' => 'Automatische Regelaktualisierung', 'ids download new ruleset' => 'Das neue Regelsatz wird heruntergeladen und entpackt. Bitte warten Sie, bis dieser Vorgang erfolgreich beendet wurde...', 'ids enable' => 'Intrusion-Prevention-System aktivieren', +'ids hide' => 'Verstecken', 'ids ignored hosts' => 'Ausnahmeliste', 'ids log hits' => 'Gesamtanzahl der aktivierten Regeln für', 'ids log viewer' => 'Ansicht IPS-Protokoll', @@ -1354,8 +1356,10 @@ 'ids no network zone' => 'Bitte wählen Sie mindestens eine Netzwerkzone aus, die überwacht werden soll', 'ids no ruleset available' => 'Es ist kein Regelsatz verfügbar. Bitte laden Sie einen Regelsatz herunter.', 'ids oinkcode required' => 'Für den ausgewählten Regelsatz wird ein Abonnement oder ein Oinkcode benötigt', +'ids rules update' => 'Regelsatz', 'ids ruleset autoupdate in progress' => 'Der Regelsatz wird gerade aktualisiert. Bitte warten Sie, bis dieser Vorgang erfolgreich beendet wurde...', 'ids ruleset settings' => 'Regelsatzeinstellungen', +'ids show' => 'Anzeigen', 'ids working' => 'Änderungen werden übernommen. Bitte warten Sie, bis dieser Vorgang erfolgreich beendet wurde.', 'iface' => 'Iface', 'ignore filter' => '"Ignorieren"-Filter', @@ -1364,6 +1368,7 @@ 'ike integrity' => 'IKE Integrität:', 'ike lifetime' => 'IKE Lebensdauer:', 'ike lifetime should be between 1 and 24 hours' => 'IKE Lebensdauer sollte zwischen 1 und 24 Stunden betragen.', +'ike lifetime should be between 1 and 8 hours' => 'Die IKE-Laufzeit sollte zwischen einer und acht Stunden betragen', 'imei' => 'IMEI', 'import' => 'Import', 'importkey' => 'PSK importieren', @@ -1378,6 +1383,7 @@ 'incoming traffic in bytes per second' => 'Eingehender Verkehr', 'incorrect password' => 'Fehlerhaftes Passwort', 'info' => 'Info', +'info messages' => 'Info', 'init string' => 'Initialisierung:', 'insert floppy' => 'Legen Sie eine formatierte Diskette in das Floppy-Laufwerk in IPFire und klicken auf <i>Datensicherung auf Diskette</i>, um die Systemeinstellungen zu sichern. Überprüfen Sie das Ergebnis sorgfältig, um sicher zu sein, dass die Datensicherung vollständig und erfolgreich abgeschlossen wurde.', 'install' => 'Installieren', @@ -1387,6 +1393,7 @@ 'instant update' => 'Sofortiges Update', 'integrity' => 'Integrität:', 'interface' => 'Schnittstelle', +'interface mode' => 'Schnittstelle', 'interfaces' => 'Interfaces', 'internet' => 'INTERNET', 'intrusion detection' => 'Intrusion-Prevention', @@ -1630,6 +1637,7 @@ 'media' => 'Laufwerke', 'media information' => 'Laufwerksinformationen', 'medium' => 'Mittel', +'meltdown' => 'Meltdown', 'memory' => 'Speicher', 'memory information' => 'Speicherinformationen', 'memory usage per' => 'Speichernutzung pro', @@ -1646,6 +1654,7 @@ 'misc-options' => 'Sonstige Optionen', 'missing dat' => 'Verschlüsseltes Archiv wurde nicht gefunden', 'missing gz' => 'Nichtverschlüsseltes Archiv wurde nicht gefunden', +'mitigated' => 'Entschärft', 'mode' => 'Modus', 'model' => 'Modell', 'modem' => 'Modem', @@ -1738,6 +1747,7 @@ 'no' => 'Nein', 'no alcatelusb firmware' => 'Keine Alcatel USB ADSL-Firmware vorhanden. Bitte hochladen.', 'no cfg upload' => 'Keine Daten wurden hochgeladen', +'no data' => 'Keine Daten', 'no dhcp lease' => 'Eine DHCP-Zuordnung konnte nicht empfangen werden', 'no eciadsl synch.bin file' => 'Keine ECI ADSL Datei synch.bin vorhanden. Bitte hochladen.', 'no filter pass' => 'Legen Sie hier die Standardklassen fest durch die nicht-gefilterte Pakete gehen.', @@ -1754,6 +1764,7 @@ 'noservicename' => 'Kein Dienstname wurde eingegeben', 'not a valid ca certificate' => 'Kein gültiges CA Zertifikat.', 'not a valid dh key' => 'Kein gültiger Diffie-Hellman-Parameter. Es sind nur Parameter mit einer Länge von 2048, 3072 oder 4096 Bit im PKCS#3-Format erlaubt.', +'not affected' => 'Nicht betroffen', 'not enough disk space' => 'Nicht genügend Plattenplatz vorhanden', 'not present' => '<B>Nicht</B> vorhanden', 'not running' => 'nicht gestartet', @@ -1953,6 +1964,7 @@ 'ping disabled' => 'Ping Antwort deaktivieren', 'pkcs12 file password' => 'PKCS12 Datei-Passwort', 'play' => 'Play', +'please reboot to apply your changes' => 'Bitte starten Sie das System neu', 'polfile' => 'Polfile', 'policy' => 'Richtlinie', 'port' => 'Port', @@ -1981,6 +1993,7 @@ 'printing options' => 'Druckeroptionen', 'priority' => 'Priorität', 'processes' => 'Prozesse', +'processor vulnerability mitigations' => 'Prozessorverwundbarkeitsentschärfungen', 'profile' => 'Profil', 'profile deleted' => 'Profil gelöscht: ', 'profile has errors' => 'Profil fehlerhaft', @@ -2165,6 +2178,9 @@ 'smbrestart' => 'Samba neustarten', 'smbstart' => 'Samba Dienste starten', 'smbstop' => 'Samba Dienste beenden', +'smt disabled' => 'Simultanes Multi-Threading ausgeschaltet', +'smt enabled' => 'Simultanes Multi-Threading eingeschaltet', +'smt not supported' => 'Simultanes Multi-Threading nicht unterstützt', 'smtphost' => 'Smtp Host', 'smtpport' => 'Smtp Port', 'snat new source ip address' => 'Neue Quell-IP-Adresse', @@ -2188,6 +2204,9 @@ 'source port overlaps' => 'Quell-Port-Bereich überlappt mit einem bereits definierten Port-Bereich.', 'speaker off' => 'Lautsprecher aus:', 'speaker on' => 'Lautsprecher ein:', +'spectre variant 1' => 'Spectre-Variante 1', +'spectre variant 2' => 'Spectre-Variante 2', +'spectre variant 4' => 'Spectre-Variante 4', 'squid extension methods' => 'Ihre <tt>extension_methods</tt> Liste', 'squid extension methods invalid' => 'Ihre 'extension_methods' Liste darf nur Worte aus Großbuchstaben und Ziffer enthalten, die mittels eines Leerzeichens getrennt werden.', 'squid fix cache' => 'Cache reparieren', @@ -2772,6 +2791,8 @@ 'vpn wait' => 'WARTE', 'vpn watch' => 'Netz-zu-Netz VPN neu starten, wenn sich Remote-IP ändert (DynDNS).', 'vpn weak' => 'schwach', +'vulnerability' => 'Verwundbarkeit', +'vulnerable' => 'Verwundbar', 'waiting to synchronize clock' => 'Bitte warten, die Uhr wird synchronisiert', 'warn when traffic reaches' => 'Warnen wenn Traffic x % erreicht', 'warning messages' => 'Warnhinweise', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 5f32a7ab1..8b7e63cb8 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -17,9 +17,6 @@ 'Captive activate' => 'Activate', 'Captive activated' => 'Activated', 'Captive active on' => 'Activated on', -'smt enabled' => 'Simultaneous Multi-Threading (SMT) is enabled', -'smt disabled' => 'Simultaneous Multi-Threading (SMT) is disabled', -'smt not supported' => 'Simultaneous Multi-Threading (SMT) is not supported', 'Captive agree tac' => 'I agree with the terms & conditions below.', 'Captive auth_lic' => 'License', 'Captive auth_vou' => 'Voucher', @@ -2221,6 +2218,9 @@ 'smbrestart' => 'Restart samba', 'smbstart' => 'Start samba', 'smbstop' => 'Stop samba', +'smt disabled' => 'Simultaneous Multi-Threading (SMT) is disabled', +'smt enabled' => 'Simultaneous Multi-Threading (SMT) is enabled', +'smt not supported' => 'Simultaneous Multi-Threading (SMT) is not supported', 'smtphost' => 'SMTP host', 'smtpport' => 'SMTP port', 'snat new source ip address' => 'New source IP address',
hooks/post-receive -- IPFire 2.x development tree
-
Michael Tremer