Merge remote-tracking branch 'alfh/feature_langfixes' into next

diff --combined html/cgi-bin/logs.cgi/firewalllog.dat
index 75340881ddf61ae1c03820565cc359db1f6530fc,9b332f7196dc9d88b2fbed1c4938727034399709..8bb4900638b7b1ce431c99c18d568c65f159aa84
--- 1/html/cgi-bin/logs.cgi/firewalllog.dat
--- 2/html/cgi-bin/logs.cgi/firewalllog.dat
+++ b/html/cgi-bin/logs.cgi/firewalllog.dat
@@@ -285,8 -285,7 +285,8 @@@ EN
  &Header::openbox('100%', 'left', $Lang::tr{'log'});
  print "<p><b>$Lang::tr{'firewall hits'} $date: $lines</b></p>";
  
 -$start = $lines - ${Header::viewsize} if ($start >= $lines - ${Header::viewsize});
 +my $lastPageIndex = $lines - ${Header::viewsize};
 +$start = $lastPageIndex if ($start >= $lastPageIndex);
  $start = 0 if ($start < 0);
  
  my $prev;
@@@ -298,7 -297,7 +298,7 @@@
      }
                                      
  my $next;
 -    if ($start == $lines - ${Header::viewsize}) {
 +    if ($start == $lastPageIndex) {
          $next = -1;
      } else {
          $next = $start + ${Header::viewsize};
@@@ -317,7 -316,7 +317,7 @@@ print <<EN
          <th align='center' class='boldbase'><b>$Lang::tr{'proto'}</b></th>
          <th align='center' class='boldbase'><b>$Lang::tr{'source'}<br/>$Lang::tr{'destination'}</b></th>
          <th align='center' class='boldbase'><b>$Lang::tr{'src port'}<br />$Lang::tr{'dst port'}</b></th>
-         <th align='center' class='boldbase'><b>Flag</b></th>
+         <th align='center' class='boldbase'><b>$Lang::tr{'country'}</b></th>
          <th align='center' class='boldbase'><b>$Lang::tr{'mac address'}</b></th>
  </tr>
  END
@@@ -403,18 -402,16 +403,18 @@@ EN
  
  print "<td align='center' width='50%'>";
  if ($prev != -1) {
 +        print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?0,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'first'}</a> "; 
          print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$prev,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'older'}</a>"; }
  else {
 -        print "$Lang::tr{'older'}"; }
 +        print "$Lang::tr{'first'} $Lang::tr{'older'}"; }
  print "</td>\n";
  
  print "<td align='center' width='50%'>";
  if ($next >= 0) {
 -        print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$next,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'newer'}</a>"; }
 +        print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$next,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'newer'}</a> ";
 +        print "<a href='/cgi-bin/logs.cgi/firewalllog.dat?$lastPageIndex,$cgiparams{'MONTH'},$cgiparams{'DAY'}'>$Lang::tr{'last'}</a>"; }      
  else {
 -        print "$Lang::tr{'newer'}"; }
 +        print "$Lang::tr{'newer'} $Lang::tr{'last'} "; }
  print "</td>\n";
  
  print <<END