Fix merge conflicts

diff --cc wwwroot/cgi-bin/awstats.pl
index d8fe8beee8319369306581c5a3adda40042c0250,7bb34cb82e68057e3bc87264eeee49878c2b6a29..d3c9a0375aa7f82960bda4adc2a7ccb14fa81ebb
--- 1/wwwroot/cgi-bin/awstats.pl
--- 2/wwwroot/cgi-bin/awstats.pl
+++ b/wwwroot/cgi-bin/awstats.pl
@@@ -749,13 -739,8 +749,14 @@@ use vars qw/ @Message /
        'Konqueror versions',
        ',',
        'Downloads',
-         'Export CSV',
+       'Export CSV',
 -    'TB'
++        'TB',
 +        'Frequency[/s]',
 +        'Number of requests',
 +        'Period',
 +        's',
 +        'Request average frequency [/s]',
 +        'Request time'
  );
  
  #------------------------------------------------------------------------------
@@@ -10418,12 -10312,6 +10429,12 @@@ sub HTMLMenu
  "<a href=\"$linkanchor#sessions\"$targetpage>$Message[117]</a>";
                                print( $frame? "</td></tr>\n" : " &nbsp; " );
                        }
- "<a href=\"$linkanchor#requesttimes\"$targetpage>$Message[185]</a>";
 +                        if ($ShowRequestTimesStats) {
 +                                print( $frame? "<tr><td class=\"awsm\">" : "" );
 +                                print
++"<a href=\"$linkanchor#requesttimes\"$targetpage>$Message[186]</a>";
 +                                print ($frame? "</td></tr>\n" : " &nbsp; " );
 +                        }
                        if ($ShowFileTypesStats && $LevelForFileTypesDetection > 0) {
                                print( $frame? "<tr><td class=\"awsm\">" : "" );
                                print
@@@ -10895,85 -10783,6 +10906,85 @@@ sub HTMLMainFileType
        &tab_end();
  }
  
-         my $title = "$Message[185]";
 +#------------------------------------------------------------------------------
 +# Function:     Prints Request Time table
 +# Parameters:   _
 +# Input:        _
 +# Output:       HTML
 +# Return:       -
 +#------------------------------------------------------------------------------
 +sub HTMLMainRequestTime{
 +        if ($Debug) { debug("ShowRequestTimesStats", 2); }
 +        my $FirstTime = 0;
 +        my $LastTime  = 0;
 +        foreach my $key ( keys %FirstTime ) {
 +                my $keyqualified = 0;
 +                if ( $MonthRequired eq 'all' ) { $keyqualified = 1; }
 +                if ( $key =~ /^$YearRequired$MonthRequired/ ) { $keyqualified = 1; }
 +                if ($keyqualified) {
 +                        if ( $FirstTime{$key}
 +                                && ( $FirstTime == 0 || $FirstTime > $FirstTime{$key} ) )
 +                        {
 +                                $FirstTime = $FirstTime{$key};
 +                        }
 +                        if ( $LastTime < ( $LastTime{$key} || 0 ) ) {
 +                                $LastTime = $LastTime{$key};
 +                        }
 +                }
 +        }
 +
 +        my $inicio = 0;
 +        my $fim = 0;
 +        if ($FirstTime =~ /$regdate/o) { $inicio = Time::Local::timelocal($6,$5,$4,$3,$2-1,$1); }
 +        if ($LastTime =~ /$regdate/o) { $fim = Time::Local::timelocal($6,$5,$4,$3,$2-1,$1); }
 +        my $periodo = $fim - $inicio;
 +        my $number_of_requests = 0;
 +        my $request_frequency_average = 0;
 +        foreach my $key (@TimeRange) {
 +                $number_of_requests += $_requesttime{$key};
 +        }
 +        if ($periodo) { $request_frequency_average = $number_of_requests / $periodo;}
 +        else { $request_frequency_average = 0};
 +        print "$Center<a name=\"requesttimes\">&nbsp;</a><br />\n";
-         print "<tr bgcolor=\"#$color_TableBGRowTitle\"".Tooltip(1)."><th>$Message[181]: $number_of_requests - $Message[182]: $periodo $Message[183] - $Message[184]: ".sprintf ("%.6f",$request_frequency_average)."</th><th bgcolor=\"#$color_s\" width=\"80\">$Message[180]</th><th bgcolor=\"#$color_s\" width=\"80\">$Message[57]</th><th bgcolor=\"#$color_s\" width=\"80\">$Message[15]</th></tr>\n";
++        my $title = "$Message[186]";
 +        &tab_head($title, 19, 0, 'requesttimes');
 +        my $Totals = 0;
 +        my $average_s = 0;
 +        foreach (@TimeRange) {
 +                $average_s += ($_requesttime{$_} || 0) * $TimeAverage{$_};
 +                $Totals += $_requesttime{$_} || 0;
 +        }
 +        if ($Totals) { $average_s = int($average_s / $Totals); }
 +        else { $average_s = '?'; }
++        print "<tr bgcolor=\"#$color_TableBGRowTitle\"".Tooltip(1)."><th>$Message[182]: $number_of_requests - $Message[183]: $periodo $Message[184] - $Message[185]: ".sprintf ("%.6f",$request_frequency_average)."</th><th bgcolor=\"#$color_s\" width=\"80\">$Message[181]</th><th bgcolor=\"#$color_s\" width=\"80\">$Message[57]</th><th bgcolor=\"#$color_s\" width=\"80\">$Message[15]</th></tr>\n";
 +        my $total_s = 0;
 +        my $count = 0;
 +        foreach my $key (@TimeRange) {
 +                my $p = 0;
 +                my $f = 0;
 +                if ($Totals) { $p = int($_requesttime{$key} / $Totals * 1000) / 10; }
 +                if ($periodo) { $f = $_requesttime{$key} / $periodo; }
 +                $total_s += $_requesttime{$key} || 0;
 +                print "<tr><td class=\"aws\">$key</td>";
 +                print "<td>".($_requesttime{$key} ? sprintf("%.5f",$f) : "&nbsp;")."</td>";
 +                print "<td>".($_requesttime{$key} ? $_requesttime{$key} : "&nbsp;")."</td>";
 +                print "<td>".($_requesttime{$key} ? "$p %" : "&nbsp;")."</td>";
 +                print "</tr>\n";
 +                $count++;
 +        }
 +        my $rest_s = $TotalVisits - $total_s;
 +        if ($rest_s > 0) {
 +                my $p = 0;
 +                if ($TotalVisits) { $p = int($rest_s / $TotalVisits * 1000) / 10; }
 +                print "<tr".Tooltip(20)."><td class=\"aws\"><span style=\"color: #$color_other\">$Message[0]</span></td>";
 +                print "<td>$rest_s</td>";
 +                print "<td>".($rest_s?"$p %":"&nbsp;")."</td>";
 +                print "</tr>\n";
 +        }
 +
 +        &tab_end();
 +}
 +
  #------------------------------------------------------------------------------
  # Function:     Prints the Browser Detail frame or static page
  # Parameters:   _

diff --cc wwwroot/cgi-bin/lang/awstats-en.txt
index 27abc620e8885d168166d37dce06f481fc22c450,2f5802e8ba728d632aeebdac80ab857dafdbdb15..e985ed5375eae7da344212aff3ed4939b764138c
--- 1/wwwroot/cgi-bin/lang/awstats-en.txt
--- 2/wwwroot/cgi-bin/lang/awstats-en.txt
+++ b/wwwroot/cgi-bin/lang/awstats-en.txt
@@@ -180,10 -180,5 +180,11 @@@ message175=Chrome version
  message176=Konqueror versions
  message177=,
  message178=Downloads
- message179=TB
- message180=Frequency[/s]
- message181=Number of requests
- message182=Period
- message183=s
- message184=Request average frequency [/s]
- message185=Request time
+ message179=Export CSV
+ message180=TB
++message181=Frequency[/s]
++message182=Number of requests
++message183=Period
++message184=s
++message185=Request average frequency [/s]
++message186=Request time