From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 90a90bc1db9ecf57a0f1eec7cb5e171e166cc873
Date: Sat, 19 Sep 2020 19:25:36 +0000 [thread overview]
Message-ID: <4Bv0zP20nZz2xcF@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 46685 bytes --]
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 90a90bc1db9ecf57a0f1eec7cb5e171e166cc873 (commit)
via 2bba65094799e87b2e04c543edd1b0dbd16d8578 (commit)
via 03dd66d6160d48165f43c654099afc4ced1e4eeb (commit)
via 73bb48cbd17a4ddf758bd64204e8947bdc8b425e (commit)
via cc573a98d102e53b11bc69cfd7ba439d29e351a6 (commit)
via b1b1a258356d7bf40ab4dba3716c2a8639ac7cd2 (commit)
via b79d74fe9e9a68ed88d9ed09f87a3ff89c8182fb (commit)
via 8ffdc78c49e128755e0024dbb55a3f3d3796f7cd (commit)
via a232fe32bcc7f04951e37279d81b1e9ef01016c2 (commit)
via fa088214bc9eea0a3c1a906780bd6074af070646 (commit)
via 2c35344dda6b0b0d6b754c1e0ea6bed83cda8341 (commit)
via 3c48052ed1d8a26aa6e749f04a27977654e1388b (commit)
via 6fc3625512aa4f06c15322cccbf1d763716e2ea1 (commit)
via 85de90ef9d2d241c802951ba81163c04ac0b63e0 (commit)
via 947bd622a1449ed259551cb15948b5ccc21a025c (commit)
via 74847444dfe5c3ad07cf5db778022b8a283b37a7 (commit)
from 383eefc0aeada63c453eae1c59ad6daf06bf172e (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 90a90bc1db9ecf57a0f1eec7cb5e171e166cc873
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Sep 19 19:24:51 2020 +0000
core150: fix typo at graphs.pl
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 2bba65094799e87b2e04c543edd1b0dbd16d8578
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Aug 23 00:01:17 2020 +0200
graphs.pl: Standardize localization strings for entropy graphs
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 03dd66d6160d48165f43c654099afc4ced1e4eeb
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Aug 22 23:55:36 2020 +0200
graphs.pl: Standardize localization strings for disk access graphs
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 73bb48cbd17a4ddf758bd64204e8947bdc8b425e
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Sep 19 19:17:54 2020 +0000
core150: add conntrack graph changes.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit cc573a98d102e53b11bc69cfd7ba439d29e351a6
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Sep 5 17:41:13 2020 +0200
graphs.pl: Standardize temperature displays
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit b1b1a258356d7bf40ab4dba3716c2a8639ac7cd2
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Sep 5 17:41:12 2020 +0200
netother.cgi: Added missing double quotes
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit b79d74fe9e9a68ed88d9ed09f87a3ff89c8182fb
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Sep 5 17:41:11 2020 +0200
Changed/fixed translation 'Connection tracking'
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 8ffdc78c49e128755e0024dbb55a3f3d3796f7cd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Aug 21 17:33:56 2020 +0100
web UI: Add graph for connection tracking
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a232fe32bcc7f04951e37279d81b1e9ef01016c2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Aug 21 17:33:55 2020 +0100
collectd: Enable conntrack plugin
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit fa088214bc9eea0a3c1a906780bd6074af070646
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Sep 5 17:41:10 2020 +0200
graphs.pl: Added translation for 'ACPI Thermal Zone'
This patchset is based on https://git.ipfire.org/?p=people/ms/ipfire-2.x.git;a=commitdiff;h=4bf0d000ffe961cdc5d9dbd27b3a11f900b3daed
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 2c35344dda6b0b0d6b754c1e0ea6bed83cda8341
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Tue Sep 15 19:36:15 2020 +0200
Language files: Clarify menu entries and page titles for VPN connections.
These pages for RW and N2N statistics only show handle for OpenVPN connections.
Fixes #12476.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 3c48052ed1d8a26aa6e749f04a27977654e1388b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Sep 19 19:06:55 2020 +0000
core150: add graphs.pl
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 6fc3625512aa4f06c15322cccbf1d763716e2ea1
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Sep 18 07:44:37 2020 +0000
graphs: Fix rendering CPU graphs after number of cores decreased
Fixes: #12193 - cpu graphs cannot created if smt is disabled
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 85de90ef9d2d241c802951ba81163c04ac0b63e0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sat Sep 19 19:05:06 2020 +0000
core150: add index.cgi
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 947bd622a1449ed259551cb15948b5ccc21a025c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Sep 19 16:13:51 2020 +0000
index.cgi: Fix CPU architecture check
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 74847444dfe5c3ad07cf5db778022b8a283b37a7
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Sep 19 20:46:17 2020 +0200
htop: Update to 3.0.2
For details see:
https://github.com/htop-dev/htop/blob/master/ChangeLog
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/cfgroot/graphs.pl | 61 +++++++++++++++++++++++--------
config/collectd/collectd.conf | 1 +
config/rootfiles/core/150/filelists/files | 4 ++
config/rootfiles/core/150/update.sh | 2 +
doc/language_issues.de | 1 +
doc/language_issues.en | 4 +-
doc/language_issues.es | 2 +
doc/language_issues.fr | 2 +
doc/language_issues.it | 2 +
doc/language_issues.nl | 2 +
doc/language_issues.pl | 2 +
doc/language_issues.ru | 2 +
doc/language_issues.tr | 2 +
doc/language_missings | 15 ++++++++
html/cgi-bin/index.cgi | 2 +-
html/cgi-bin/netother.cgi | 10 ++++-
langs/de/cgi-bin/de.pl | 12 +++---
langs/en/cgi-bin/en.pl | 10 +++--
langs/es/cgi-bin/es.pl | 4 +-
langs/fr/cgi-bin/fr.pl | 4 +-
langs/it/cgi-bin/it.pl | 4 +-
langs/nl/cgi-bin/nl.pl | 4 +-
langs/pl/cgi-bin/pl.pl | 4 +-
langs/ru/cgi-bin/ru.pl | 2 +-
langs/tr/cgi-bin/tr.pl | 10 ++---
lfs/htop | 8 ++--
26 files changed, 128 insertions(+), 48 deletions(-)
Difference in files:
diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index a7b82fed3..04f038be1 100644
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -172,7 +172,7 @@ sub updatecpugraph {
}
for(my $i = 2; $i < $cpucount; $i++) {
- $addstring .= "+,";
+ $addstring .= "ADDNAN,";
}
if ( $cpucount > 1){
@@ -190,7 +190,7 @@ sub updatecpugraph {
push(@command,$nice,$interrupt,$steal,$user,$system,$idle,$iowait,$irq);
}
- push(@command,"CDEF:total=user,system,idle,iowait,irq,nice,interrupt,steal,+,+,+,+,+,+,+"
+ push(@command,"CDEF:total=user,system,idle,iowait,irq,nice,interrupt,steal,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN"
,"CDEF:userpct=100,user,total,/,*"
,"CDEF:nicepct=100,nice,total,/,*"
,"CDEF:interruptpct=100,interrupt,total,/,*"
@@ -486,7 +486,7 @@ sub updatediskgraph {
"--start",
"-1".$period,
"-r",
- "-t ".$disk." ".$Lang::tr{'disk access per'}." ".$Lang::tr{$period."-graph"},
+ "-t ".$disk." ".$Lang::tr{'disk access'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
"-v ".$Lang::tr{'bytes per second'},
"--color=SHADEA".$color{"color19"},
"--color=SHADEB".$color{"color19"},
@@ -810,15 +810,15 @@ sub updatehddgraph {
"DEF:standby=".$mainsettings{'RRDLOG'}."/hddshutdown-$disk.rrd:standby:AVERAGE",
"CDEF:st=standby,INF,*",
"AREA:st".$color{"color20"}."A0:standby",
- "LINE3:temperature".$color{"color11"}."A0:$Lang::tr{'hdd temperature in'} C\\j",
+ "LINE3:temperature".$color{"color11"}."A0:$Lang::tr{'hdd temperature in'} °C\\j",
"COMMENT:$Lang::tr{'maximal'}",
"COMMENT:$Lang::tr{'average'}",
"COMMENT:$Lang::tr{'minimal'}",
"COMMENT:$Lang::tr{'current'}\\j",
- "GPRINT:temperature:MAX:%3.0lf Grad C",
- "GPRINT:temperature:AVERAGE:%3.0lf Grad C",
- "GPRINT:temperature:MIN:%3.0lf Grad C",
- "GPRINT:temperature:LAST:%3.0lf Grad C\\j",
+ "GPRINT:temperature:MAX:%3.0lf °C",
+ "GPRINT:temperature:AVERAGE:%3.0lf °C",
+ "GPRINT:temperature:MIN:%3.0lf °C",
+ "GPRINT:temperature:LAST:%3.0lf °C\\j",
);
$ERROR = RRDs::error;
print "Error in RRD::graph for hdd-".$disk.": ".$ERROR."\n" if $ERROR;
@@ -836,6 +836,7 @@ sub updatehwtempgraph {
"-1".$period,
"-r",
"-t ".$Lang::tr{'mbmon temp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
+ "-v Celsius",
"--color=SHADEA".$color{"color19"},
"--color=SHADEB".$color{"color19"},
"--color=BACK".$color{"color21"},
@@ -862,7 +863,7 @@ sub updatehwtempgraph {
$_ =~ /\/(.*)sensors-(.*)\/(.*)\.rrd/;
my $label = $2.$3;$label=~ s/-//g;
if ( $sensorsettings{'LINE-'.$label} eq "off" ){next;}
- push(@command,"LINE3:".$sensorsettings{'LABEL-'.$label}.random_hex_color(6)."A0:".sprintf("%-25s",$sensorsettings{'LABEL-'.$label}),"GPRINT:".$sensorsettings{'LABEL-'.$label}.":MAX:%3.2lf C","GPRINT:".$sensorsettings{'LABEL-'.$label}.":AVERAGE:%3.2lf C","GPRINT:".$sensorsettings{'LABEL-'.$label}.":MIN:%3.2lf C","GPRINT:".$sensorsettings{'LABEL-'.$label}.":LAST:%3.2lf C\\j",);
+ push(@command,"LINE3:".$sensorsettings{'LABEL-'.$label}.random_hex_color(6)."A0:".sprintf("%-25s",$sensorsettings{'LABEL-'.$label}),"GPRINT:".$sensorsettings{'LABEL-'.$label}.":MAX:%3.2lf °C","GPRINT:".$sensorsettings{'LABEL-'.$label}.":AVERAGE:%3.2lf °C","GPRINT:".$sensorsettings{'LABEL-'.$label}.":MIN:%3.2lf °C","GPRINT:".$sensorsettings{'LABEL-'.$label}.":LAST:%3.2lf °C\\j",);
}
}
@@ -1088,8 +1089,8 @@ sub updatethermaltempgraph {
"--start",
"-1".$period,
"-r",
- "-t "."ACPI Thermal-Zone Temperature"." - ".$Lang::tr{$period."-graph"},
- "-v Grad Celsius",
+ "-t ".$Lang::tr{'acpitemp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
+ "-v Celsius",
"--color=SHADEA".$color{"color19"},
"--color=SHADEB".$color{"color19"},
"--color=BACK".$color{"color21"},
@@ -1105,10 +1106,10 @@ sub updatethermaltempgraph {
push(@command,"DEF:temp".$i."_=".$mainsettings{'RRDLOG'}."/collectd/localhost/thermal-thermal_zone".$i."/temperature-temperature.rrd:value:AVERAGE"
,"CDEF:temp".$i."=temp".$i."_,1,/"
,"LINE3:temp".$i.$color{"color1$j"}."A0:Temp ".$i." "
- ,"GPRINT:temp".$i.":MAX:%3.0lf Grad C"
- ,"GPRINT:temp".$i.":AVERAGE:%3.0lf Grad C"
- ,"GPRINT:temp".$i.":MIN:%3.0lf Grad C"
- ,"GPRINT:temp".$i.":LAST:%3.0lf Grad C\\j");
+ ,"GPRINT:temp".$i.":MAX:%3.0lf °C"
+ ,"GPRINT:temp".$i.":AVERAGE:%3.0lf °C"
+ ,"GPRINT:temp".$i.":MIN:%3.0lf °C"
+ ,"GPRINT:temp".$i.":LAST:%3.0lf °C\\j");
}
RRDs::graph (@command);
@@ -1142,7 +1143,7 @@ sub updateentropygraph {
"-1".$period,
"-r",
"--lower-limit","0",
- "-t $Lang::tr{'entropy'}",
+ "-t ".$Lang::tr{'entropy'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
"-v $Lang::tr{'bit'}",
"DEF:entropy=$mainsettings{'RRDLOG'}/collectd/localhost/entropy/entropy.rrd:entropy:AVERAGE",
"LINE3:entropy#ff0000:" . sprintf("%-15s", $Lang::tr{'entropy'}),
@@ -1160,3 +1161,31 @@ sub updateentropygraph {
print "Error in RRD::graph for entropy: ".$ERROR."\n" if $ERROR;
}
+
+sub updateconntrackgraph {
+ my $period = $_[0];
+ my @command = (
+ @GRAPH_ARGS,
+ "-",
+ "--start",
+ "-1" . $period,
+ "-r",
+ "--lower-limit","0",
+ "-t $Lang::tr{'connection tracking'}",
+ "-v $Lang::tr{'open connections'}",
+ "DEF:conntrack=$mainsettings{'RRDLOG'}/collectd/localhost/conntrack/conntrack.rrd:entropy:AVERAGE",
+ "LINE3:conntrack#ff0000:" . sprintf("%-15s", $Lang::tr{'open connections'}),
+ "VDEF:ctmin=conntrack,MINIMUM",
+ "VDEF:ctmax=conntrack,MAXIMUM",
+ "VDEF:ctavg=conntrack,AVERAGE",
+ "GPRINT:ctmax:" . sprintf("%15s\\: %%5.0lf", $Lang::tr{'maximum'}),
+ "GPRINT:ctmin:" . sprintf("%15s\\: %%5.0lf", $Lang::tr{'minimum'}),
+ "GPRINT:ctavg:" . sprintf("%15s\\: %%5.0lf", $Lang::tr{'average'}) . "\\n",
+ "--color=BACK" . $color{"color21"},
+ );
+
+ RRDs::graph(@command);
+ $ERROR = RRDs::error;
+
+ print STDERR "Error in RRD::Graph for conntrack: " . $ERROR . "\n" if $ERROR;
+}
diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index e336a9d3f..c2316e415 100644
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -12,6 +12,7 @@ TypesDB "/usr/share/collectd/types.db"
Interval 30
ReadThreads 1
+LoadPlugin conntrack
LoadPlugin cpu
#LoadPlugin cpufreq
LoadPlugin disk
diff --git a/config/rootfiles/core/150/filelists/files b/config/rootfiles/core/150/filelists/files
index ce4e51768..c9f8f2775 100644
--- a/config/rootfiles/core/150/filelists/files
+++ b/config/rootfiles/core/150/filelists/files
@@ -2,3 +2,7 @@ etc/system-release
etc/issue
srv/web/ipfire/cgi-bin/credits.cgi
var/ipfire/langs
+etc/collectd.conf
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/netother.cgi
+var/ipfire/graphs.pl
diff --git a/config/rootfiles/core/150/update.sh b/config/rootfiles/core/150/update.sh
index a5468a65d..c125c058c 100644
--- a/config/rootfiles/core/150/update.sh
+++ b/config/rootfiles/core/150/update.sh
@@ -89,6 +89,7 @@ rm -rf /lib/modules
# Remove files
# Stop services
+/etc/init.d/collectd stop
# Extract files
extract_files
@@ -103,6 +104,7 @@ ldconfig
/usr/local/bin/filesystem-cleanup
# Start services
+/etc/init.d/collectd start
# remove lm_sensor config after collectd was started
# to reserch sensors at next boot with updated kernel
diff --git a/doc/language_issues.de b/doc/language_issues.de
index f2a7ba8ae..667b98b27 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -767,6 +767,7 @@ WARNING: translation string unused: zoneconf val ppp assignment error
WARNING: translation string unused: zoneconf val vlan amount assignment error
WARNING: translation string unused: zoneconf val vlan tag assignment error
WARNING: translation string unused: zoneconf val zoneslave amount error
+WARNING: untranslated string: connnection tracking = Connection Tracking
WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date!
WARNING: untranslated string: fwhost cust locationgrp = unknown string
WARNING: untranslated string: fwhost err hostip = unknown string
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 40cba2292..10b56af03 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -492,6 +492,7 @@ WARNING: untranslated string: connection type = Connection Type
WARNING: untranslated string: connection type is invalid = Connection type is invalid.
WARNING: untranslated string: connections = Connections
WARNING: untranslated string: connections are associated with this ca. deleting the ca will delete these connections as well. = connections are associated with this CA. Deleting the CA will delete these connections as well.
+WARNING: untranslated string: connnection tracking = Connection Tracking
WARNING: untranslated string: connscheduler = Connection Scheduler
WARNING: untranslated string: could not be opened = could not be opened.
WARNING: untranslated string: could not download latest updates = Could not download latest updates.
@@ -1113,7 +1114,7 @@ WARNING: untranslated string: invalid input for keepalive 1 = Invalid input for
WARNING: untranslated string: invalid input for keepalive 1:2 = Invalid input for Keepalive use at least a ratio of 1:2
WARNING: untranslated string: invalid input for keepalive 2 = Invalid input for Keepalive ping-restart
WARNING: untranslated string: invalid input for local ip address = Invalid input for local IP address
-WARNING: untranslated string: invalid input for max clients = Invalid input for Max Clients
+WARNING: untranslated string: invalid input for max clients = Invalid input for Max Clients. The maximum of 1024 clients has been exceeded
WARNING: untranslated string: invalid input for mode = Invalid input for mode
WARNING: untranslated string: invalid input for name = Invalid input for user's full name or system hostname
WARNING: untranslated string: invalid input for oink code = Invalid input for Oink code
@@ -1378,6 +1379,7 @@ WARNING: untranslated string: one year = One Year
WARNING: untranslated string: only digits allowed in holdoff field = Only digits allowed in holdoff field
WARNING: untranslated string: only digits allowed in max retries field = Only digits allowed in max retries field.
WARNING: untranslated string: only digits allowed in the idle timeout = Only digits allowed in the idle timeout.
+WARNING: untranslated string: open connections = Open Connections
WARNING: untranslated string: openssl produced an error = OpenSSL produced an error
WARNING: untranslated string: openvpn client = OpenVPN client
WARNING: untranslated string: openvpn default = Default
diff --git a/doc/language_issues.es b/doc/language_issues.es
index f7431f692..043df5c0f 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -793,6 +793,7 @@ WARNING: untranslated string: ccd routes = Routing:
WARNING: untranslated string: ccd subnet = Subnet
WARNING: untranslated string: ccd used = Used addresses
WARNING: untranslated string: check all = Check all
+WARNING: untranslated string: connnection tracking = Connection Tracking
WARNING: untranslated string: count = Count
WARNING: untranslated string: countries = Countries
WARNING: untranslated string: country codes and flags = Country Codes and Flags:
@@ -1199,6 +1200,7 @@ WARNING: untranslated string: one hour = One Hour
WARNING: untranslated string: one month = One Month
WARNING: untranslated string: one week = One Week
WARNING: untranslated string: one year = One Year
+WARNING: untranslated string: open connections = Open Connections
WARNING: untranslated string: openvpn default = Default
WARNING: untranslated string: openvpn destination port used = The destination port is already used by another OpenVPN server.
WARNING: untranslated string: openvpn fragment allowed with udp = Using fragment is only allowed when using the UDP protocol.
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 597883693..1ebed2140 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -807,6 +807,7 @@ WARNING: translation string unused: zoneconf val ppp assignment error
WARNING: translation string unused: zoneconf val vlan amount assignment error
WARNING: translation string unused: zoneconf val vlan tag assignment error
WARNING: translation string unused: zoneconf val zoneslave amount error
+WARNING: untranslated string: connnection tracking = Connection Tracking
WARNING: untranslated string: fwhost cust locationgrp = unknown string
WARNING: untranslated string: fwhost err hostip = unknown string
WARNING: untranslated string: guardian block a host = unknown string
@@ -839,6 +840,7 @@ 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: legacy architecture warning = You are running IPFire on a legacy architecture and it is recommended to upgrade
+WARNING: untranslated string: open connections = Open Connections
WARNING: untranslated string: pakfire ago = ago.
WARNING: untranslated string: route config changed = unknown string
WARNING: untranslated string: routing config added = unknown string
diff --git a/doc/language_issues.it b/doc/language_issues.it
index c943da739..f0790ed23 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -832,6 +832,7 @@ WARNING: untranslated string: block = Block
WARNING: untranslated string: broken = Broken
WARNING: untranslated string: bytes = unknown string
WARNING: untranslated string: check all = Check all
+WARNING: untranslated string: connnection tracking = Connection Tracking
WARNING: untranslated string: cpu frequency = CPU frequency
WARNING: untranslated string: crypto error = Cryptographic error
WARNING: untranslated string: crypto warning = Cryptographic warning
@@ -1012,6 +1013,7 @@ WARNING: untranslated string: one hour = One Hour
WARNING: untranslated string: one month = One Month
WARNING: untranslated string: one week = One Week
WARNING: untranslated string: one year = One Year
+WARNING: untranslated string: open connections = Open Connections
WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression
WARNING: untranslated string: outgoing overhead in bytes per second = Outgoing Overhead
WARNING: untranslated string: ovpn add conf = Additional configuration
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 7496d647c..2dfde5c5b 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -826,6 +826,7 @@ WARNING: untranslated string: broken = Broken
WARNING: untranslated string: bytes = unknown string
WARNING: untranslated string: capabilities = Capabilities
WARNING: untranslated string: check all = Check all
+WARNING: untranslated string: connnection tracking = Connection Tracking
WARNING: untranslated string: cpu frequency = CPU frequency
WARNING: untranslated string: crypto error = Cryptographic error
WARNING: untranslated string: crypto warning = Cryptographic warning
@@ -1037,6 +1038,7 @@ WARNING: untranslated string: one hour = One Hour
WARNING: untranslated string: one month = One Month
WARNING: untranslated string: one week = One Week
WARNING: untranslated string: one year = One Year
+WARNING: untranslated string: open connections = Open Connections
WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression
WARNING: untranslated string: outgoing overhead in bytes per second = Outgoing Overhead
WARNING: untranslated string: ovpn add conf = Additional configuration
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index f7431f692..043df5c0f 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -793,6 +793,7 @@ WARNING: untranslated string: ccd routes = Routing:
WARNING: untranslated string: ccd subnet = Subnet
WARNING: untranslated string: ccd used = Used addresses
WARNING: untranslated string: check all = Check all
+WARNING: untranslated string: connnection tracking = Connection Tracking
WARNING: untranslated string: count = Count
WARNING: untranslated string: countries = Countries
WARNING: untranslated string: country codes and flags = Country Codes and Flags:
@@ -1199,6 +1200,7 @@ WARNING: untranslated string: one hour = One Hour
WARNING: untranslated string: one month = One Month
WARNING: untranslated string: one week = One Week
WARNING: untranslated string: one year = One Year
+WARNING: untranslated string: open connections = Open Connections
WARNING: untranslated string: openvpn default = Default
WARNING: untranslated string: openvpn destination port used = The destination port is already used by another OpenVPN server.
WARNING: untranslated string: openvpn fragment allowed with udp = Using fragment is only allowed when using the UDP protocol.
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index a3eb33669..52de2e382 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -796,6 +796,7 @@ WARNING: untranslated string: ccd subnet = Subnet
WARNING: untranslated string: ccd used = Used addresses
WARNING: untranslated string: check all = Check all
WARNING: untranslated string: community rules = Snort/VRT GPLv2 Community Rules
+WARNING: untranslated string: connnection tracking = Connection Tracking
WARNING: untranslated string: count = Count
WARNING: untranslated string: countries = Countries
WARNING: untranslated string: country codes and flags = Country Codes and Flags:
@@ -1201,6 +1202,7 @@ WARNING: untranslated string: one hour = One Hour
WARNING: untranslated string: one month = One Month
WARNING: untranslated string: one week = One Week
WARNING: untranslated string: one year = One Year
+WARNING: untranslated string: open connections = Open Connections
WARNING: untranslated string: openvpn default = Default
WARNING: untranslated string: openvpn destination port used = The destination port is already used by another OpenVPN server.
WARNING: untranslated string: openvpn fragment allowed with udp = Using fragment is only allowed when using the UDP protocol.
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 60a646e5f..e5792e08e 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -815,6 +815,7 @@ WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Pro
WARNING: untranslated string: advproxy wpad view pac = Open PAC File
WARNING: untranslated string: broken = Broken
WARNING: untranslated string: bytes = unknown string
+WARNING: untranslated string: connnection tracking = Connection Tracking
WARNING: untranslated string: cpu frequency = CPU frequency
WARNING: untranslated string: crypto error = Cryptographic error
WARNING: untranslated string: crypto warning = Cryptographic warning
@@ -925,6 +926,7 @@ WARNING: untranslated string: no data = unknown string
WARNING: untranslated string: no entries = No entries at the moment.
WARNING: untranslated string: not affected = Not Affected
WARNING: untranslated string: not validating = Not validating
+WARNING: untranslated string: open connections = Open Connections
WARNING: untranslated string: ovpn connection name = Connection Name
WARNING: untranslated string: ovpn error dh = The Diffie-Hellman parameter needs to be in minimum 2048 bit! <br>Please generate or upload a new Diffie-Hellman parameter, this can be made below in the section "Diffie-Hellman parameters options".</br>
WARNING: untranslated string: ovpn error md5 = You host certificate uses MD5 for the signature which is not accepted anymore. <br>Please update to the latest IPFire version and generate a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>
diff --git a/doc/language_missings b/doc/language_missings
index 3fbaad77b..c9c42d15a 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -25,6 +25,7 @@
< Captive invalid coupon
< Captive please enter a coupon code
< choose media
+< connnection tracking
< could not connect to www ipfire org
< cryptographic settings
< dhcp server disabled on blue interface
@@ -183,6 +184,7 @@
< ccd subnet
< ccd used
< check all
+< connnection tracking
< ConnSched dial
< ConnSched hangup
< ConnSched reboot
@@ -626,6 +628,7 @@
< one month
< one week
< one year
+< open connections
< openvpn default
< openvpn destination port used
< openvpn disabled
@@ -920,9 +923,11 @@
< ansi t1.483
< bewan adsl pci st
< bewan adsl usb
+< connnection tracking
< g.dtm
< g.lite
< legacy architecture warning
+< open connections
< upload fcdsl.o
############################################################################
# Checking cgi-bin translations for language: it #
@@ -1001,6 +1006,7 @@
< Captive WiFi coupon
< Captive wrong ext
< check all
+< connnection tracking
< cpu frequency
< crypto error
< cryptographic settings
@@ -1163,6 +1169,7 @@
< one month
< one week
< one year
+< open connections
< outgoing compression in bytes per second
< outgoing overhead in bytes per second
< ovpn add conf
@@ -1357,6 +1364,7 @@
< Captive WiFi coupon
< Captive wrong ext
< check all
+< connnection tracking
< cpu frequency
< crypto error
< cryptographic settings
@@ -1555,6 +1563,7 @@
< one month
< one week
< one year
+< open connections
< outgoing compression in bytes per second
< outgoing overhead in bytes per second
< ovpn add conf
@@ -1820,6 +1829,7 @@
< ccd used
< check all
< community rules
+< connnection tracking
< ConnSched dial
< ConnSched hangup
< ConnSched reboot
@@ -2265,6 +2275,7 @@
< one month
< one week
< one year
+< open connections
< openvpn default
< openvpn destination port used
< openvpn disabled
@@ -2671,6 +2682,7 @@
< ccd used
< check all
< community rules
+< connnection tracking
< ConnSched dial
< ConnSched hangup
< ConnSched reboot
@@ -3123,6 +3135,7 @@
< one month
< one week
< one year
+< open connections
< openvpn default
< openvpn destination port used
< openvpn disabled
@@ -3407,6 +3420,7 @@
< advproxy wpad view pac
< broken
< Captive delete logo
+< connnection tracking
< cpu frequency
< crypto error
< cryptographic settings
@@ -3489,6 +3503,7 @@
< not affected
< not validating
< okay
+< open connections
< ovpn connection name
< ovpn error dh
< ovpn error md5
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 8e7207d0c..5aec4c594 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -547,7 +547,7 @@ if ( ! -e "/var/ipfire/main/send_profile") {
# Legacy architecture
my ($sysname, $nodename, $release, $version, $machine) = &POSIX::uname();
-if ($machine =~ m/^i?86$/) {
+if ($machine =~ m/^i.86$/) {
$warnmessage .= "<li>$Lang::tr{'legacy architecture warning'}</li>";
}
diff --git a/html/cgi-bin/netother.cgi b/html/cgi-bin/netother.cgi
index 4f03c82e8..459979684 100755
--- a/html/cgi-bin/netother.cgi
+++ b/html/cgi-bin/netother.cgi
@@ -41,7 +41,11 @@ my @querry = split(/\?/,$ENV{'QUERY_STRING'});
$querry[0] = '' unless defined $querry[0];
$querry[1] = 'hour' unless defined $querry[1];
-if ( $querry[0] =~ "fwhits"){
+if ( $querry[0] eq "conntrack") {
+ print "Content-Type: image/png\n\n";
+ binmode(STDOUT);
+ &Graphs::updateconntrackgraph($querry[1]);
+} elsif ( $querry[0] =~ "fwhits"){
print "Content-type: image/png\n\n";
binmode(STDOUT);
&Graphs::updatefwhitsgraph($querry[1]);
@@ -67,6 +71,10 @@ if ( $querry[0] =~ "fwhits"){
&Header::closebox();
}
+ &Header::openbox('100%', 'center', "$Lang::tr{'connnection tracking'}");
+ &Graphs::makegraphbox("netother.cgi", "conntrack", "day");
+ &Header::closebox();
+
&Header::openbox('100%', 'center', "$Lang::tr{'firewallhits'} $Lang::tr{'graph'}");
&Graphs::makegraphbox("netother.cgi","fwhits","day");
&Header::closebox();
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index ef4e4e6c8..b7c5f4ec9 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -135,6 +135,7 @@
'accounting' => 'Benutzerverwaltung',
'accounting user nonpdc' => 'Benutzerverwaltung - kein PDC Modus',
'accounting user pdc' => 'Benutzerverwaltung - PDC Modus',
+'acpitemp' => 'ACPI - Temperaturen',
'action' => 'Aktion',
'activate' => 'aktivieren',
'activate user' => 'Benutzer aktivieren',
@@ -637,7 +638,7 @@
'connection closed' => 'Nicht Verbunden...',
'connection debugging' => 'Debugmeldungen dieser Verbindung protokollieren',
'connection status and controlc' => 'Verbindungsstatus und -kontrolle',
-'connection tracking' => 'iptables-Verbindungsverfolgung',
+'connection tracking' => 'Verbindungsverfolgung',
'connection type' => 'Verbindungstyp',
'connection type is invalid' => 'Verbindungstyp ist ungültig',
'connections' => 'Verbindungen',
@@ -803,7 +804,7 @@
'disconnect' => 'OpenVPN Stop / Trennen',
'disconnected' => 'Getrennt',
'disconnects' => 'Abbrüche',
-'disk access per' => 'Festplattenzugriff je',
+'disk access' => 'Festplattenzugriff',
'disk usage' => 'Festplattenbelegung',
'display' => 'Anzeige',
'display charset' => 'Display Charset',
@@ -1832,6 +1833,7 @@
'only digits allowed in max retries field' => 'Im Feld "Maximale Wiederholversuche" sind nur Ziffern erlaubt.',
'only digits allowed in the idle timeout' => 'Im Feld "Leerlauf-Wartezeit" sind nur Ziffern erlaubt.',
'only red' => 'Nur ROT',
+'open connections' => 'Offene Verbindungen',
'open to all' => 'Überschreibe externen Zugang zu ALL',
'openssl produced an error' => 'OpenSSL hat einen Fehler verursacht',
'openvpn client' => 'OpenVPN-Client',
@@ -2836,9 +2838,9 @@
'vpn start action add' => 'Auf Verbindungseingang warten',
'vpn start action route' => 'Bei Bedarf',
'vpn start action start' => 'Immer An',
-'vpn statistic n2n' => 'VPN: Netz-zu-Netz-Statistik',
-'vpn statistic rw' => 'VPN: Roadwarrior-Statistik',
-'vpn statistics n2n' => 'VPN: Netz-zu-Netz-Statistiken',
+'vpn statistic n2n' => 'OpenVPN: Netz-zu-Netz-Statistik',
+'vpn statistic rw' => 'OpenVPN: Roadwarrior-Statistik',
+'vpn statistics n2n' => 'OpenVPN: Netz-zu-Netz-Statistiken',
'vpn subjectaltname' => 'SubjectAlternativeName',
'vpn subjectaltname missing' => 'SubjectAlternativeName darf nicht leer bleiben.',
'vpn wait' => 'WARTE',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 0b1b304a9..90d9247e6 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -133,6 +133,7 @@
'accounting' => 'Accounting',
'accounting user nonpdc' => 'Accounting - none PDC Mode',
'accounting user pdc' => 'Accounting - PDC Mode',
+'acpitemp' => 'ACPI - Temperatures',
'action' => 'Action',
'activate' => 'Activate',
'activate user' => 'Activate user',
@@ -652,7 +653,7 @@
'connection closed' => 'Not connected...',
'connection debugging' => 'Connection debugging',
'connection status and controlc' => 'Connection Status and -Control',
-'connection tracking' => 'iptables Connection Tracking',
+'connection tracking' => 'Connection Tracking',
'connection type' => 'Connection Type',
'connection type is invalid' => 'Connection type is invalid.',
'connections' => 'Connections',
@@ -823,7 +824,7 @@
'disconnect' => 'OVPN Stop / Disconnect',
'disconnected' => 'Disconnected',
'disconnects' => 'Disconnects',
-'disk access per' => 'Disk Access per',
+'disk access' => 'Disk Access',
'disk usage' => 'Disk usage',
'display' => 'Display',
'display charset' => 'Display Charset',
@@ -1858,6 +1859,7 @@
'only digits allowed in max retries field' => 'Only digits allowed in max retries field.',
'only digits allowed in the idle timeout' => 'Only digits allowed in the idle timeout.',
'only red' => 'Only RED',
+'open connections' => 'Open Connections',
'open to all' => 'Override external access to ALL',
'openssl produced an error' => 'OpenSSL produced an error',
'openvpn client' => 'OpenVPN client',
@@ -2870,8 +2872,8 @@
'vpn start action add' => 'Wait for connection initiation',
'vpn start action route' => 'On Demand',
'vpn start action start' => 'Always On',
-'vpn statistic n2n' => 'VPN: Net-to-Net Statistics',
-'vpn statistic rw' => 'VPN: Roadwarrior Statistics',
+'vpn statistic n2n' => 'OpenVPN: Net-to-Net Statistics',
+'vpn statistic rw' => 'OpenVPN: Roadwarrior Statistics',
'vpn subjectaltname' => 'SubjectAlternativeName',
'vpn subjectaltname missing' => 'SubjectAlternativeName cannot be emtpy.',
'vpn wait' => 'WAITING',
diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index 8a611e181..2e7f014cb 100644
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -511,7 +511,7 @@
'connection closed' => 'No conectado…',
'connection debugging' => 'Depurado de conexión',
'connection status and controlc' => 'Control y Status de conexión:',
-'connection tracking' => 'Rastreo de conexión iptables',
+'connection tracking' => 'Seguimiento de conexión',
'connection type' => 'Tipo de conexión',
'connection type is invalid' => 'Tipo de conexión no es válido',
'connections' => 'Conexiones',
@@ -655,7 +655,7 @@
'disabled' => 'desactivado',
'disconnect' => 'Parar / Desconectar OVPN',
'disconnects' => 'Desconecta',
-'disk access per' => 'Acceso a disco por',
+'disk access' => 'Acceso a disco',
'disk usage' => 'Uso de disco',
'display' => 'Mostrar',
'display charset' => 'Juego de caracteres a mostrar',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index fc19257bf..6b99189d2 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -658,7 +658,7 @@
'connection closed' => 'Non connecté...',
'connection debugging' => 'Déboggage de la connexion ',
'connection status and controlc' => 'Etat et contrôle de connexion :',
-'connection tracking' => 'Surveillance des connexions tables IP',
+'connection tracking' => 'Suivi de connexion',
'connection type' => 'Type de connexion',
'connection type is invalid' => 'Le type de connexion est non valide.',
'connections' => 'Connexions',
@@ -829,7 +829,7 @@
'disconnect' => 'OVPN stoppé / déconnecté',
'disconnected' => 'Déconnecté',
'disconnects' => 'Déconnexion',
-'disk access per' => 'Accès disque par',
+'disk access' => 'Accès disque',
'disk usage' => 'Utilisation disque',
'display' => 'Réglages',
'display charset' => 'Afficher jeu de car.',
diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl
index fa4591b67..577ead7dd 100644
--- a/langs/it/cgi-bin/it.pl
+++ b/langs/it/cgi-bin/it.pl
@@ -574,7 +574,7 @@
'connection closed' => 'Non connesso...',
'connection debugging' => 'Connection debugging',
'connection status and controlc' => 'Stato della connessione e controllo',
-'connection tracking' => 'Monitoraggio connessioni iptables',
+'connection tracking' => 'Monitoraggio della connessione',
'connection type' => 'Connection Type',
'connection type is invalid' => 'Connection type is invalid.',
'connections' => 'Connessioni',
@@ -733,7 +733,7 @@
'disabled' => 'disabled',
'disconnect' => 'OVPN Stop / Disconnect',
'disconnects' => 'Disconnects',
-'disk access per' => 'Accessi al disco per',
+'disk access' => 'Accessi al disco',
'disk usage' => 'utilizzo del disco',
'display' => 'Display',
'display charset' => 'Display Charset',
diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
index 4be11d5c1..2509efbcb 100644
--- a/langs/nl/cgi-bin/nl.pl
+++ b/langs/nl/cgi-bin/nl.pl
@@ -571,7 +571,7 @@
'connection closed' => 'Niet verbonden...',
'connection debugging' => 'Connectie debugging',
'connection status and controlc' => 'Verbindingsstatus en controle:',
-'connection tracking' => 'iptables verbindingen volgen',
+'connection tracking' => 'Verbinding volgen',
'connection type' => 'Verbindingstype',
'connection type is invalid' => 'Verbindingstype is ongeldig.',
'connections' => 'Verbindingen',
@@ -723,7 +723,7 @@
'disabled' => 'uitgeschakeld',
'disconnect' => 'OVPN Stop / Verbreek',
'disconnects' => 'Verbreekt',
-'disk access per' => 'Schijftoegang per',
+'disk access' => 'Schijftoegang',
'disk usage' => 'Schijfgebruik',
'display' => 'Scherm',
'display charset' => 'Scherm tekenset',
diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl
index e77120273..4950518fc 100644
--- a/langs/pl/cgi-bin/pl.pl
+++ b/langs/pl/cgi-bin/pl.pl
@@ -512,7 +512,7 @@
'connection closed' => 'Brak połączenia...',
'connection debugging' => 'Debugowanie połączenia',
'connection status and controlc' => 'Stan i kontrola połączenia:',
-'connection tracking' => 'Śledzenie połączeń iptables',
+'connection tracking' => 'Śledzenie połączeń',
'connection type' => 'Rodzaj połączenia',
'connection type is invalid' => 'Nieprawidłowy rodzaj połączenia.',
'connections' => 'Połączenia',
@@ -656,7 +656,7 @@
'disabled' => 'wyłączony',
'disconnect' => 'OVPN Zatrz./Rozłączenie',
'disconnects' => 'Rozłączeń',
-'disk access per' => 'Dostepow do dysku na',
+'disk access' => 'Dostepow do dysku',
'disk usage' => 'Wykorzystanie dysku',
'display' => 'Wyświetl',
'display charset' => 'Display Charset',
diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl
index 29e6b5f93..32b89bbb8 100644
--- a/langs/ru/cgi-bin/ru.pl
+++ b/langs/ru/cgi-bin/ru.pl
@@ -510,7 +510,7 @@
'connection closed' => 'Не подключён...',
'connection debugging' => 'Connection debugging',
'connection status and controlc' => 'Статус и управление подключениями:',
-'connection tracking' => 'Просмотр соединений через iptables',
+'connection tracking' => 'Отслеживание подключений',
'connection type' => 'Connection Type',
'connection type is invalid' => 'Connection type is invalid.',
'connections' => 'Соединения',
diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl
index ea2047609..ea0736cff 100644
--- a/langs/tr/cgi-bin/tr.pl
+++ b/langs/tr/cgi-bin/tr.pl
@@ -640,7 +640,7 @@
'connection closed' => 'Bağlı değil...',
'connection debugging' => 'Hata ayıklama bağlantısı',
'connection status and controlc' => 'Bağlantı durumu ve kontrol:',
-'connection tracking' => 'IPTablo bağlantı takibi',
+'connection tracking' => 'Bağlantı izleme',
'connection type' => 'Bağlantı türü',
'connection type is invalid' => 'Geçersiz bağlantı türü.',
'connections' => 'Bağlantılar',
@@ -804,7 +804,7 @@
'disabled' => 'devre dışı',
'disconnect' => 'OVPN Durdur / Bağlantıyı kes',
'disconnects' => 'Bağlantıyı kes',
-'disk access per' => 'erişim başına disk',
+'disk access' => 'Disk erişim',
'disk usage' => 'Disk kullanımı',
'display' => 'Görünüm',
'display charset' => 'Karakterleri göster',
@@ -1295,7 +1295,7 @@
'gpl please read carefully the general public license and accept it below' => 'Dikkatlice Genel Kamu Lisansını okuyup kabul edin',
'gpl unofficial translation of the general public license v3' => 'Resmi olmayan sürüm-3 Genel Kamu Lisansı çevirisi',
'graph' => 'grafiği',
-'graph per' => '-',
+'graph per' => 'uzmanı',
'green' => 'YEŞİL',
'green interface' => 'Yeşil Arabirim',
'grouptype' => 'Grup türü:',
@@ -2750,8 +2750,8 @@
'vpn start action' => 'Hareketi Başlat',
'vpn start action route' => 'İstek Üzerine',
'vpn start action start' => 'Her Zaman',
-'vpn statistic n2n' => 'Ağdan Ağa VPN İstatistiği',
-'vpn statistic rw' => 'Roadwarrior VPN İstatistiği',
+'vpn statistic n2n' => 'Ağdan Ağa OpenVPN İstatistiği',
+'vpn statistic rw' => 'Roadwarrior OpenVPN İstatistiği',
'vpn subjectaltname' => 'Alternatif konu adı',
'vpn watch' => 'Karşı eş IP değiştirdiğinde (dyndns) ağdan-ağa VPN bağlantısını yeniden başlat. Bu DPD ye yardımcı olur.',
'vpn weak' => 'Hafta',
diff --git a/lfs/htop b/lfs/htop
index 272c8feb9..8bf588be9 100644
--- a/lfs/htop
+++ b/lfs/htop
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2020 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 2.2.0
+VER = 3.0.2
THISAPP = htop-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = htop
-PAK_VER = 12
+PAK_VER = 13
DEPS =
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0d816b6beed31edc75babcfbf863ffa8
+$(DL_FILE)_MD5 = fb848a1c91871d134c785bccb560ca8d
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2020-09-19 19:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4Bv0zP20nZz2xcF@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox