From: eldy <> Date: Thu, 29 Aug 2002 13:48:37 +0000 (+0000) Subject: Correct bandwith to bandwidth X-Git-Tag: AWSTATS_5_0_BETA~111 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=642046dc3170859eef9974f571a552f515370698;p=thirdparty%2FAWStats.git Correct bandwith to bandwidth --- diff --git a/wwwroot/cgi-bin/awstats.pl b/wwwroot/cgi-bin/awstats.pl index 75fa5f55..a015e5a2 100644 --- a/wwwroot/cgi-bin/awstats.pl +++ b/wwwroot/cgi-bin/awstats.pl @@ -150,10 +150,10 @@ $DirLock $DirCgi $DirData $DirIcons $DirLang $AWScript $ArchiveFileName $HTMLHeadSection $HTMLEndSection $LinksToWhoIs $LogFile $LogFormat $LogSeparator $Logo $LogoLink $StyleSheet $WrapperScript $SiteDomain /; -($DirCgi, $DirData, $DirIcons, $DirLang, $AWScript, $ArchiveFileName, +($DirLock, $DirCgi, $DirData, $DirIcons, $DirLang, $AWScript, $ArchiveFileName, $HTMLHeadSection, $HTMLEndSection, $LinksToWhoIs, $LogFile, $LogFormat, $LogSeparator, $Logo, $LogoLink, $StyleSheet, $WrapperScript, $SiteDomain)= -("","","","","","","","","","","","","","","","","","",""); +("","","","","","","","","","","","","","","","","",""); use vars qw/ $color_Background $color_TableBG $color_TableBGRowTitle $color_TableBGTitle $color_TableBorder $color_TableRowTitle $color_TableTitle @@ -556,6 +556,10 @@ sub error { if ($HTMLOutput) { print "
\n"; } print "See AWStats documentation in 'docs' directory for informations on how to setup $PROG.\n"; } + # Remove lock if set + if ($DirLock && $message !~ /lock file/) { + &Lock_Update(0); + } if ($HTMLOutput) { print "\n\n"; } exit 1; } @@ -1285,7 +1289,7 @@ sub Check_Config { if (! $Message[72]) { $Message[72]="Navigation"; } if (! $Message[73]) { $Message[73]="Files type"; } if (! $Message[74]) { $Message[74]="Update now"; } - if (! $Message[75]) { $Message[75]="Bandwith"; } + if (! $Message[75]) { $Message[75]="Bandwidth"; } if (! $Message[76]) { $Message[76]="Back to main page"; } if (! $Message[77]) { $Message[77]="Top"; } if (! $Message[78]) { $Message[78]="dd mmm yyyy - HH:MM"; } @@ -1309,7 +1313,7 @@ sub Check_Config { if (! $Message[96]) { $Message[96]="Average"; } if (! $Message[97]) { $Message[97]="Max"; } if (! $Message[98]) { $Message[98]="Web compression"; } - if (! $Message[99]) { $Message[99]="Bandwith saved"; } + if (! $Message[99]) { $Message[99]="Bandwidth saved"; } if (! $Message[100]) { $Message[100]="Compression on"; } if (! $Message[101]) { $Message[101]="Compression result"; } if (! $Message[102]) { $Message[102]="Total"; } @@ -2478,7 +2482,7 @@ sub Save_History { # When if ($sectiontosave eq "day") { print HISTORYTMP "\n"; - print HISTORYTMP "# Date - Pages - Hits - Bandwith - Visits\n"; + print HISTORYTMP "# Date - Pages - Hits - Bandwidth - Visits\n"; print HISTORYTMP "BEGIN_DAY ".(scalar keys %DayHits)."\n"; foreach my $key (sort keys %DayHits) { if ($key =~ /^$year$month/i) { # Found a day entry of the good month @@ -2493,7 +2497,7 @@ sub Save_History { } if ($sectiontosave eq "time") { print HISTORYTMP "\n"; - print HISTORYTMP "# Hour - Pages - Hits - Bandwith\n"; + print HISTORYTMP "# Hour - Pages - Hits - Bandwidth\n"; print HISTORYTMP "BEGIN_TIME 24\n"; for (my $ix=0; $ix<=23; $ix++) { print HISTORYTMP "$ix ".int($_time_p[$ix])." ".int($_time_h[$ix])." ".int($_time_k[$ix])."\n"; } print HISTORYTMP "END_TIME\n"; @@ -2502,7 +2506,7 @@ sub Save_History { # Who if ($sectiontosave eq "domain") { print HISTORYTMP "\n"; - print HISTORYTMP "# Domain - Pages - Hits - Bandwith\n"; + print HISTORYTMP "# Domain - Pages - Hits - Bandwidth\n"; print HISTORYTMP "BEGIN_DOMAIN ".(scalar keys %_domener_h)."\n"; foreach my $key (keys %_domener_h) { my $page=$_domener_p{$key}||0; @@ -2513,7 +2517,7 @@ sub Save_History { } if ($sectiontosave eq "visitor") { print HISTORYTMP "\n"; - print HISTORYTMP "# Host - Pages - Hits - Bandwith - Last visit date - [Start of last visit date] - [Last page of last visit]\n"; + print HISTORYTMP "# Host - Pages - Hits - Bandwidth - Last visit date - [Start of last visit date] - [Last page of last visit]\n"; print HISTORYTMP "# [Start of last visit date] and [Last page of last visit] are saved only if session is not finished\n"; print HISTORYTMP "# The $MaxNbOfHostsShown first Hits must be first (order not required for others)\n"; print HISTORYTMP "BEGIN_VISITOR ".(scalar keys %_host_h)."\n"; @@ -2582,7 +2586,7 @@ sub Save_History { } if ($sectiontosave eq "login") { print HISTORYTMP "\n"; - print HISTORYTMP "# Login - Pages - Hits - Bandwith\n"; + print HISTORYTMP "# Login - Pages - Hits - Bandwidth\n"; print HISTORYTMP "BEGIN_LOGIN ".(scalar keys %_login_h)."\n"; foreach my $key (keys %_login_h) { print HISTORYTMP "$key ".int($_login_p{$key})." ".int($_login_h{$key})." ".int($_login_k{$key})." $_login_l{$key}\n"; } print HISTORYTMP "END_LOGIN\n"; @@ -2600,7 +2604,7 @@ sub Save_History { # This section must be saved after VISITOR section if ($sectiontosave eq "sider") { print HISTORYTMP "\n"; - print HISTORYTMP "# URL - Pages - Bandwith - Entry - Exit\n"; + print HISTORYTMP "# URL - Pages - Bandwidth - Entry - Exit\n"; print HISTORYTMP "# The $MaxNbOfPageShown first Pages must be first (order not required for others)\n"; print HISTORYTMP "BEGIN_SIDER ".(scalar keys %_url_p)."\n"; &BuildKeyList($MaxNbOfPageShown,$MinHitFile,\%_url_p,\%_url_p); @@ -2621,7 +2625,7 @@ sub Save_History { } if ($sectiontosave eq "filetypes") { print HISTORYTMP "\n"; - print HISTORYTMP "# Files type - Hits - Bandwith - Bandwith without compression - Bandwith after compression\n"; + print HISTORYTMP "# Files type - Hits - Bandwidth - Bandwidth without compression - Bandwidth after compression\n"; print HISTORYTMP "BEGIN_FILETYPES ".(scalar keys %_filetypes_h)."\n"; foreach my $key (keys %_filetypes_h) { my $hits=$_filetypes_h{$key}||0; diff --git a/wwwroot/cgi-bin/lang/awstats-ba.txt b/wwwroot/cgi-bin/lang/awstats-ba.txt index be73530a..638fb266 100644 --- a/wwwroot/cgi-bin/lang/awstats-ba.txt +++ b/wwwroot/cgi-bin/lang/awstats-ba.txt @@ -1,4 +1,5 @@ # Bosnian message file (vljubovic@smartnet.ba) +# $Revision$ - $Date$ PageCode=iso-8859-2 message0=Nepoznat message1=nepoznatih (IP adresa nije razrije¹ena) @@ -99,7 +100,7 @@ message95=Min message96=Average message97=Max message98=Web compression -message99=Bandwith saved +message99=bandwidth saved message100=Before compression message101=After compression message102=Total diff --git a/wwwroot/cgi-bin/lang/awstats-cn.txt b/wwwroot/cgi-bin/lang/awstats-cn.txt index ea938631..91e12905 100644 --- a/wwwroot/cgi-bin/lang/awstats-cn.txt +++ b/wwwroot/cgi-bin/lang/awstats-cn.txt @@ -1,4 +1,5 @@ # Chinese message file +# $Revision$ - $Date$ PageCode=big5 message0=µLªk±oª¾ message1=µLªk±oª¾(¤£¯à¤Ï¸Ñºô°ì¦WºÙ) @@ -99,7 +100,7 @@ message95=Min message96=Average message97=Max message98=Web compression -message99=Bandwith saved +message99=bandwidth saved message100=Before compression message101=After compression message102=Total diff --git a/wwwroot/cgi-bin/lang/awstats-cz.txt b/wwwroot/cgi-bin/lang/awstats-cz.txt index d0a3757d..2548104d 100644 --- a/wwwroot/cgi-bin/lang/awstats-cz.txt +++ b/wwwroot/cgi-bin/lang/awstats-cz.txt @@ -1,4 +1,5 @@ # Czech message file (js@fsid.cvut.cz) +# $Revision$ - $Date$ PageCode=iso-8859-2 message0=Neznámý message1=Neznámý (nepøelo¾ená IP) @@ -99,7 +100,7 @@ message95=Min message96=Average message97=Max message98=Web compression -message99=Bandwith saved +message99=bandwidth saved message100=Before compression message101=After compression message102=Total diff --git a/wwwroot/cgi-bin/lang/awstats-en.txt b/wwwroot/cgi-bin/lang/awstats-en.txt index 04e31d42..cca0cfce 100644 --- a/wwwroot/cgi-bin/lang/awstats-en.txt +++ b/wwwroot/cgi-bin/lang/awstats-en.txt @@ -75,7 +75,7 @@ message71=Dec message72=Navigation message73=Files type message74=Update now -message75=Bandwith +message75=bandwidth message76=Back to main page message77=Top message78=dd mmm yyyy - HH:MM @@ -99,7 +99,7 @@ message95=Min message96=Average message97=Max message98=Web compression -message99=Bandwith saved +message99=bandwidth saved message100=Compression on message101=Compression result message102=Total diff --git a/wwwroot/cgi-bin/lang/awstats-gr.txt b/wwwroot/cgi-bin/lang/awstats-gr.txt index 03809d64..3a89ca1b 100644 --- a/wwwroot/cgi-bin/lang/awstats-gr.txt +++ b/wwwroot/cgi-bin/lang/awstats-gr.txt @@ -1,4 +1,5 @@ # Greek message file (simos@hellug.gr) +# $Revision$ - $Date$ PageCode=iso-8859-7 message0=¶ãíùóôï message1=¶ãíùóôï (ìç áíáãíùñéóìÝíç ip) @@ -99,7 +100,7 @@ message95=Min message96=Average message97=Max message98=Web compression -message99=Bandwith saved +message99=bandwidth saved message100=Before compression message101=After compression message102=Total diff --git a/wwwroot/cgi-bin/lang/awstats-id.txt b/wwwroot/cgi-bin/lang/awstats-id.txt index 3da6d3af..9c54600c 100644 --- a/wwwroot/cgi-bin/lang/awstats-id.txt +++ b/wwwroot/cgi-bin/lang/awstats-id.txt @@ -1,4 +1,5 @@ # Indonesian message file +# $Revision$ - $Date$ message0=Tidak Diketahui message1=Ip Tidak Diketahui message2=Yang Lainnya @@ -98,7 +99,7 @@ message95=Min message96=Average message97=Max message98=Web compression -message99=Bandwith saved +message99=bandwidth saved message100=Before compression message101=After compression message102=Total diff --git a/wwwroot/cgi-bin/lang/awstats-kr.txt b/wwwroot/cgi-bin/lang/awstats-kr.txt index ae944af3..87bdc0be 100644 --- a/wwwroot/cgi-bin/lang/awstats-kr.txt +++ b/wwwroot/cgi-bin/lang/awstats-kr.txt @@ -1,4 +1,5 @@ # Korean message file +# $Revision$ - $Date$ PageCode=euc-kr message0=¾Ë¼ö¾øÀ½ message1=¾Ë¼ö¾øÀ½(¾Ë¼ö¾ø´Â ip) @@ -99,7 +100,7 @@ message95=Min message96=Average message97=Max message98=Web compression -message99=Bandwith saved +message99=bandwidth saved message100=Before compression message101=After compression message102=Total diff --git a/wwwroot/cgi-bin/lang/awstats-lv.txt b/wwwroot/cgi-bin/lang/awstats-lv.txt index 6e27200e..98e08899 100644 --- a/wwwroot/cgi-bin/lang/awstats-lv.txt +++ b/wwwroot/cgi-bin/lang/awstats-lv.txt @@ -100,7 +100,7 @@ message95=Min message96=Vid message97=Maks message98=Web salîdzinâjums -message99=Bandwith saved +message99=bandwidth saved message100=Pirms salîdzinâðanas message101=Pçc salîdzinâðanas message102=Kopâ diff --git a/wwwroot/cgi-bin/lang/awstats-pl.txt b/wwwroot/cgi-bin/lang/awstats-pl.txt index 041c08cd..96aae1fa 100644 --- a/wwwroot/cgi-bin/lang/awstats-pl.txt +++ b/wwwroot/cgi-bin/lang/awstats-pl.txt @@ -100,7 +100,7 @@ message95=Min message96=Srednio message97=Max message98=Web compression -message99=Bandwith saved +message99=bandwidth saved message100=Before compression message101=After compression message102=Razem diff --git a/wwwroot/cgi-bin/lang/awstats-sk.txt b/wwwroot/cgi-bin/lang/awstats-sk.txt index d08594f4..3b4608a1 100644 --- a/wwwroot/cgi-bin/lang/awstats-sk.txt +++ b/wwwroot/cgi-bin/lang/awstats-sk.txt @@ -100,7 +100,7 @@ message95=Min message96=Priemer message97=Max message98=Web kompresia -message99=Bandwith saved +message99=bandwidth saved message100=Pred kompresiou message101=Po kompresii message102=Celkom diff --git a/wwwroot/cgi-bin/lang/awstats-tr.txt b/wwwroot/cgi-bin/lang/awstats-tr.txt index e0d1d9df..1818c6ea 100644 --- a/wwwroot/cgi-bin/lang/awstats-tr.txt +++ b/wwwroot/cgi-bin/lang/awstats-tr.txt @@ -1,4 +1,5 @@ # Turkish message file by giray@pultar.org +# $Revision$ - $Date$ message0=Bilinmeyen message1=Bilinmeyen (çözülemeyen ip) message2=Diðerleri @@ -98,7 +99,7 @@ message95=Min message96=Average message97=Max message98=Web compression -message99=Bandwith saved +message99=bandwidth saved message100=Before compression message101=After compression message102=Total diff --git a/wwwroot/cgi-bin/lang/awstats-tw.txt b/wwwroot/cgi-bin/lang/awstats-tw.txt index 144ad382..005a40e1 100644 --- a/wwwroot/cgi-bin/lang/awstats-tw.txt +++ b/wwwroot/cgi-bin/lang/awstats-tw.txt @@ -1,4 +1,5 @@ # Chinese message file +# $Revision$ - $Date$ PageCode=big5 message0=µLªk±oª¾ message1=µLªk±oª¾(¤£¯à¤Ï¸Ñºô°ì¦WºÙ) @@ -99,7 +100,7 @@ message95=Min message96=Average message97=Max message98=Web compression -message99=Bandwith saved +message99=bandwidth saved message100=Before compression message101=After compression message102=Total