X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=src%2Fscripts%2Fmakegraphs;h=a5497fd59c6e3e37ad84ccd388ba2ef27bc9cd79;hp=67bacd4881890a5c556a0bf58d025ffd5a7a7659;hb=c7acba4a59b42c6448a30dc23126fbf8fd761cbd;hpb=a68fedca8fde0f46f6cdab6dc6bdedd6c4b80eaa

diff --git a/src/scripts/makegraphs b/src/scripts/makegraphs
index 67bacd4881..a5497fd59c 100644
--- a/src/scripts/makegraphs
+++ b/src/scripts/makegraphs
@@ -503,14 +503,14 @@ sub updatefwhitsgraph {
 		"-t firewall hits over the last $interval",
 		"DEF:amount=$rrdlog/firewallhits.rrd:amount:AVERAGE",
 		"AREA:amount#6464FF:firewallhits",
-		"GPRINT:amount:MAX:   Max\\: %2.2lf %S",
-		"GPRINT:amount:AVERAGE: Avg\\: %2.2lf %S",
-		"GPRINT:amount:LAST: Current\\: %2.2lf %Shits/5 min\\n",
+		"GPRINT:amount:MAX:   $tr{'maximal'}\\: %2.2lf %S",
+		"GPRINT:amount:AVERAGE: $tr{'average'}\\: %2.2lf %S",
+		"GPRINT:amount:LAST: $tr{'current'}\\: %2.2lf %Shits/5 min\\n",
 		"DEF:portamount=$rrdlog/firewallhits.rrd:portamount:AVERAGE",
 		"AREA:portamount#FF6464:portscans",
-		"GPRINT:portamount:MAX:      Max\\: %2.2lf %S",
-		"GPRINT:portamount:AVERAGE: Avg\\: %2.2lf %S",
-		"GPRINT:portamount:LAST: Current\\: %2.2lf %Shits/5 min");
+		"GPRINT:portamount:MAX:      $tr{'maximal'}\\: %2.2lf %S",
+		"GPRINT:portamount:AVERAGE: $tr{'average'}\\: %2.2lf %S",
+		"GPRINT:portamount:LAST: $tr{'current'}\\: %2.2lf %Shits/5 min");
 	$ERROR = RRDs::error;
 	print "Error in RRD::graph for Firewallhits: $ERROR\n" if $ERROR;
 
@@ -523,14 +523,14 @@ sub updatefwhitsgraph {
 		"-t firewall hits over the last $interval",
 		"DEF:amount=$rrdlog/firewallhits.rrd:amount:AVERAGE",
 		"LINE2:amount#6464FF:firewallhits",
-		"GPRINT:amount:MAX:   Max\\: %2.2lf %S",
-		"GPRINT:amount:AVERAGE: Avg\\: %2.2lf %S",
+		"GPRINT:amount:MAX:   $tr{'maximal'}\\: %2.2lf %S",
+		"GPRINT:amount:AVERAGE: $tr{'average'}\\: %2.2lf %S",
 		"GPRINT:amount:LAST: Current\\: %2.2lf %Shits/5 min\\n",
 		"DEF:portamount=$rrdlog/firewallhits.rrd:portamount:AVERAGE",
 		"LINE2:portamount#FF6464:portscans",
-		"GPRINT:portamount:MAX:      Max\\: %2.2lf %S",
-		"GPRINT:portamount:AVERAGE: Avg\\: %2.2lf %S",
-		"GPRINT:portamount:LAST: Current\\: %2.2lf %Shits/5 min");
+		"GPRINT:portamount:MAX:      $tr{'maximal'}\\: %2.2lf %S",
+		"GPRINT:portamount:AVERAGE: $tr{'average'}\\: %2.2lf %S",
+		"GPRINT:portamount:LAST: $tr{'current'}\\: %2.2lf %Shits/5 min");
 	$ERROR = RRDs::error;
 	print "Error in RRD::graph for Firewallhits: $ERROR\n" if $ERROR;
 }
@@ -663,9 +663,9 @@ sub updatelqgraph {
 		"AREA:r0#80FF80:<30 ms",
 		"AREA:loss10#800000:Packet loss (x10)",
 		"LINE1:roundtrip#707070:",
-		"GPRINT:roundtrip:MAX:$tr{'maximal'} $tr{'linkq'}\\:%3.2lf ms",
-		"GPRINT:roundtrip:AVERAGE:$tr{'average'} $tr{'linkq'}\\:%3.2lf ms",
-		"GPRINT:roundtrip:LAST:$tr{'current'} $tr{'linkq'}\\:%3.2lf ms\\j",
+		"GPRINT:roundtrip:MAX:$tr{'maximal'}\\:%3.2lf ms",
+		"GPRINT:roundtrip:AVERAGE:$tr{'average'}\\:%3.2lf ms",
+		"GPRINT:roundtrip:LAST:$tr{'current'}\\:%3.2lf ms\\j",
 		"GPRINT:loss:MAX:$tr{'maximal'} Loss\\:%3.2lf%%",
 		"GPRINT:loss:AVERAGE:$tr{'average'} Loss\\:%3.2lf%%",
 		"GPRINT:loss:LAST:$tr{'current'} Loss\\:%3.2lf%%\\j"