[packages/webalizer] - up to 2.23.08 + current debian patches
arekm
arekm at pld-linux.org
Wed Oct 9 12:25:40 CEST 2019
commit 0f90fe80bf1f9081540e06ec425fda750177eb70
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Oct 9 12:25:19 2019 +0200
- up to 2.23.08 + current debian patches
02_fix_a_spelling_error.diff | 8 +-
03_fix_etc_path_in_man.diff | 35 +
04_Fix_cast_warnings_in_output.c.diff | 67 +
05_apache_logio.diff | 216 ++--
08_use_memmove_for_overlapping_blocks.diff | 47 +
14_add_search_engines.diff | 60 +
17_fix_typo_supress_suppress_in_sample.conf.diff | 21 +
18_ttf_support_throught_libgd.diff | 4 +-
22_php_as_htm_in_sample.conf.diff | 18 +
23_gettext_first_part.diff | 60 +-
24_gettext_generated.diff | 44 +-
25_add_convertlang2po.diff | 101 ++
...ttext_po_files.diff => 26_gettext_po_files.diff | 1289 ++++++++++----------
webalizer-conf.patch | 47 +-
webalizer.spec | 36 +-
15 files changed, 1204 insertions(+), 849 deletions(-)
---
diff --git a/webalizer.spec b/webalizer.spec
index 6d3fba1..26f8f7b 100644
--- a/webalizer.spec
+++ b/webalizer.spec
@@ -8,7 +8,7 @@
%bcond_with db3 # build with db3 instead of db 4.x
#
%define ver 2.23
-%define patchlvl 05
+%define patchlvl 08
Summary: The Webalizer - A web server log file analysis thingie
Summary(es.UTF-8): Software para análisis de archivos de log de servidores WWW
Summary(pl.UTF-8): Webalizer - analizator logów serwera WWW
@@ -17,11 +17,11 @@ Summary(ru.UTF-8): Программа анализа log-файла web/ftp/prox
Summary(uk.UTF-8): Програма аналізу log-файлу web/ftp/proxy-сервера
Name: webalizer
Version: %{ver}_%{patchlvl}
-Release: 4
+Release: 1
License: GPL v2
Group: Networking/Utilities
Source0: ftp://ftp.mrunix.net/pub/webalizer/%{name}-%{ver}-%{patchlvl}-src.tar.bz2
-# Source0-md5: 18cb592434dae81e9bdd8f55f5e28b96
+# Source0-md5: d25a9715dcbfe67ddf86816c27fbda2b
Source2: %{name}.sysconfig
Source3: %{name}.cron
@@ -29,14 +29,21 @@ Source4: %{name}.crontab
#
Patch100: 01_symlink_vulnerability.diff
Patch101: 02_fix_a_spelling_error.diff
-Patch102: 05_apache_logio.diff
-Patch103: 06_apache_logio_optional.diff
-Patch104: 07_apache_logio_color_config.diff
-Patch105: 15_ignore_localhost.diff
-Patch106: 18_ttf_support_throught_libgd.diff
-Patch107: 23_gettext_first_part.diff
-Patch108: 24_gettext_generated.diff
-Patch109: 25_gettext_po_files.diff
+Patch102: 03_fix_etc_path_in_man.diff
+Patch103: 04_Fix_cast_warnings_in_output.c.diff
+Patch104: 05_apache_logio.diff
+Patch105: 06_apache_logio_optional.diff
+Patch106: 07_apache_logio_color_config.diff
+Patch107: 08_use_memmove_for_overlapping_blocks.diff
+Patch108: 14_add_search_engines.diff
+Patch109: 15_ignore_localhost.diff
+Patch110: 17_fix_typo_supress_suppress_in_sample.conf.diff
+Patch111: 18_ttf_support_throught_libgd.diff
+Patch112: 22_php_as_htm_in_sample.conf.diff
+Patch113: 23_gettext_first_part.diff
+Patch114: 24_gettext_generated.diff
+Patch115: 25_add_convertlang2po.diff
+Patch116: 26_gettext_po_files.diff
#
Patch0: %{name}-nolibnsl.patch
Patch1: %{name}-conf.patch
@@ -125,6 +132,13 @@ Webalizer i dokumentacja do niego.
%patch107 -p1
%patch108 -p1
%patch109 -p1
+%patch110 -p1
+%patch111 -p1
+%patch112 -p1
+%patch113 -p1
+%patch114 -p1
+%patch115 -p1
+%patch116 -p1
%patch0 -p1
%patch1 -p1
diff --git a/02_fix_a_spelling_error.diff b/02_fix_a_spelling_error.diff
index 01b02b4..5346799 100644
--- a/02_fix_a_spelling_error.diff
+++ b/02_fix_a_spelling_error.diff
@@ -6,9 +6,9 @@ Thank you lintian ;)
Index: webalizer/wcmgr.c
===================================================================
---- webalizer.orig/wcmgr.c 2010-11-24 00:17:21.000000000 +0100
-+++ webalizer/wcmgr.c 2010-11-24 00:20:19.000000000 +0100
-@@ -683,7 +683,7 @@
+--- webalizer.orig/wcmgr.c 2013-10-06 14:34:50.000000000 +0200
++++ webalizer/wcmgr.c 2013-10-06 14:45:59.000000000 +0200
+@@ -692,7 +692,7 @@
}
dns_db->close(dns_db, 0);
if (verbose)
@@ -17,7 +17,7 @@ Index: webalizer/wcmgr.c
}
/*********************************************/
-@@ -761,7 +761,7 @@
+@@ -770,7 +770,7 @@
if (db_put(addr, name, (strcmp(name,addr))?0:1, runtime)==0)
dns_db->close(dns_db,0);
if (verbose)
diff --git a/03_fix_etc_path_in_man.diff b/03_fix_etc_path_in_man.diff
new file mode 100644
index 0000000..ab93180
--- /dev/null
+++ b/03_fix_etc_path_in_man.diff
@@ -0,0 +1,35 @@
+From: Julien Viard de Galbert <julien at vdg.blogsite.org>
+Date: Wed, 12 Jul 2017 22:14:37 +0200
+Subject: fix etc path in manpage
+
+Forwarded: not-needed
+
+ The package is configured to use /etc/webalizer/ as config dir, not /etc/.
+---
+ webalizer.1 | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/webalizer.1 b/webalizer.1
+index bd94cb4..7727ca0 100644
+--- a/webalizer.1
++++ b/webalizer.1
+@@ -45,8 +45,8 @@ as a \fBcrond(8)\fP job. Once executed, the general flow of the program is:
+ .B o
+ A default configuration file is scanned for. A file named
+ \fIwebalizer.conf\fP is searched for in the current directory, and if
+-found, it's configuration data is parsed. If the file is not
+-present in the current directory, the file \fI/etc/webalizer.conf\fP
++found, its configuration data is parsed. If the file is not
++present in the current directory, the file \fI/etc/webalizer/webalizer.conf\fP
+ is searched for and, if found, is used instead.
+ .TP 8
+ .B o
+@@ -879,7 +879,7 @@ had search string information present.
+ .TP 20
+ .I webalizer.conf
+ Default configuration file. Is searched for in the current directory
+-and if not found, in the \fI/etc/\fP directory.
++and if not found, in the \fI/etc/webalizer/\fP directory.
+ .TP 20
+ .I webalizer.hist
+ Monthly history file for previous months. (can be changed)
diff --git a/04_Fix_cast_warnings_in_output.c.diff b/04_Fix_cast_warnings_in_output.c.diff
new file mode 100644
index 0000000..f7d7277
--- /dev/null
+++ b/04_Fix_cast_warnings_in_output.c.diff
@@ -0,0 +1,67 @@
+From: Julien Viard de Galbert <julien at vdg.blogsite.org>
+Date: Tue, 7 Oct 2014 23:45:04 +0200
+Subject: Fix cast warnings when building output.c
+
+Casts were used to cast to the same type, so discarded them.
+---
+ output.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/output.c b/output.c
+index 838d383..81e869c 100644
+--- a/output.c
++++ b/output.c
+@@ -949,7 +949,7 @@ void top_sites_table(int flag)
+ while(cnt--)
+ {
+ /* calculate totals */
+- switch ( (int)((HNODEPTR)(*pointer)->flag) )
++ switch ( (*pointer)->flag )
+ {
+ case OBJ_REG: h_reg++; break;
+ case OBJ_GRP: h_grp++; break;
+@@ -1182,7 +1182,7 @@ void top_urls_table(int flag)
+ while (cnt--)
+ {
+ /* calculate totals */
+- switch ( (int)((UNODEPTR)(*pointer)->flag) )
++ switch ( (*pointer)->flag )
+ {
+ case OBJ_REG: u_reg++; break;
+ case OBJ_GRP: u_grp++; break;
+@@ -1436,7 +1436,7 @@ void top_entry_table(int flag)
+ cnt=a_ctr; pointer=u_array;
+ while (cnt--)
+ {
+- if ( (int)((UNODEPTR)(*pointer)->flag) == OBJ_REG )
++ if ( (*pointer)->flag == OBJ_REG )
+ {
+ if ( (u_int64_t)(((UNODEPTR)(*pointer))->entry) )
+ { u_entry++; t_entry+=(u_int64_t)(((UNODEPTR)(*pointer))->entry); }
+@@ -1540,7 +1540,7 @@ void top_refs_table()
+ while(cnt--)
+ {
+ /* calculate totals */
+- switch ( (int)((RNODEPTR)(*pointer)->flag) )
++ switch ( (*pointer)->flag )
+ {
+ case OBJ_REG: r_reg++; break;
+ case OBJ_HIDE: r_hid++; break;
+@@ -1705,7 +1705,7 @@ void top_agents_table()
+ while(cnt--)
+ {
+ /* calculate totals */
+- switch ( (int)((ANODEPTR)(*pointer)->flag) )
++ switch ( (*pointer)->flag )
+ {
+ case OBJ_REG: a_reg++; break;
+ case OBJ_GRP: a_grp++; break;
+@@ -1972,7 +1972,7 @@ void top_users_table()
+ while(cnt--)
+ {
+ /* calculate totals */
+- switch ( (int)((INODEPTR)(*pointer)->flag) )
++ switch ( (*pointer)->flag )
+ {
+ case OBJ_REG: i_reg++; break;
+ case OBJ_GRP: i_grp++; break;
diff --git a/05_apache_logio.diff b/05_apache_logio.diff
index d442aa5..dcecc21 100644
--- a/05_apache_logio.diff
+++ b/05_apache_logio.diff
@@ -17,8 +17,8 @@ from Pim van den Berg <pim at nethuis.nl>, Thanks !
Index: webalizer/README.FIRST
===================================================================
---- webalizer.orig/README.FIRST 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/README.FIRST 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/README.FIRST 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/README.FIRST 2013-10-06 14:49:14.000000000 +0200
@@ -19,3 +19,12 @@
in the subject. Please do not send HTML formatted e-mails or e-mail
containing HTML tags as my mail server will reject them. Thanks!
@@ -34,8 +34,8 @@ Index: webalizer/README.FIRST
+
Index: webalizer/graphs.c
===================================================================
---- webalizer.orig/graphs.c 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/graphs.c 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/graphs.c 2013-10-06 14:34:50.000000000 +0200
++++ webalizer/graphs.c 2013-10-06 14:49:23.000000000 +0200
@@ -51,6 +51,8 @@
#define FILECOLOR file_or_blue /* files */
#define SITECOLOR site_or_orange /* sites */
@@ -302,8 +302,8 @@ Index: webalizer/graphs.c
{
Index: webalizer/graphs.h
===================================================================
---- webalizer.orig/graphs.h 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/graphs.h 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/graphs.h 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/graphs.h 2013-10-06 14:45:59.000000000 +0200
@@ -2,7 +2,8 @@
#define _GRAPHS_H
@@ -316,9 +316,9 @@ Index: webalizer/graphs.h
extern int pie_chart(char *, char *, u_int64_t, u_int64_t *, char **);
Index: webalizer/hashtab.c
===================================================================
---- webalizer.orig/hashtab.c 2011-04-18 23:54:39.000000000 +0200
-+++ webalizer/hashtab.c 2011-04-18 23:56:44.000000000 +0200
-@@ -155,6 +155,8 @@
+--- webalizer.orig/hashtab.c 2013-10-06 14:34:50.000000000 +0200
++++ webalizer/hashtab.c 2013-10-06 14:49:08.000000000 +0200
+@@ -150,6 +150,8 @@
u_int64_t count, /* hit count */
u_int64_t file, /* File flag */
double xfer, /* xfer size */
@@ -327,7 +327,7 @@ Index: webalizer/hashtab.c
u_int64_t *ctr, /* counter */
u_int64_t visit, /* visits */
u_int64_t tstamp,/* timestamp */
-@@ -177,6 +179,8 @@
+@@ -170,6 +172,8 @@
nptr->count = count;
nptr->files = file;
nptr->xfer = xfer;
@@ -336,7 +336,7 @@ Index: webalizer/hashtab.c
nptr->next = NULL;
htab[hval] = nptr;
if (type!=OBJ_GRP) (*ctr)++;
-@@ -219,9 +223,11 @@
+@@ -202,9 +206,11 @@
if ((type==cptr->flag)||((type!=OBJ_GRP)&&(cptr->flag!=OBJ_GRP)))
{
/* found... bump counter */
@@ -351,7 +351,7 @@ Index: webalizer/hashtab.c
if (ispage(log_rec.url))
{
-@@ -253,6 +259,8 @@
+@@ -232,6 +238,8 @@
nptr->count = count;
nptr->files = file;
nptr->xfer = xfer;
@@ -360,7 +360,7 @@ Index: webalizer/hashtab.c
nptr->next = htab[hval];
htab[hval]=nptr;
if (type!=OBJ_GRP) (*ctr)++;
-@@ -361,6 +369,7 @@
+@@ -336,6 +344,7 @@
/*********************************************/
int put_unode(char *str, int type, u_int64_t count, double xfer,
@@ -368,7 +368,7 @@ Index: webalizer/hashtab.c
u_int64_t *ctr, u_int64_t entry, u_int64_t exit, UNODEPTR *htab)
{
UNODEPTR cptr,nptr;
-@@ -378,6 +387,8 @@
+@@ -353,6 +362,8 @@
nptr->flag = type;
nptr->count= count;
nptr->xfer = xfer;
@@ -377,7 +377,7 @@ Index: webalizer/hashtab.c
nptr->next = NULL;
nptr->entry= entry;
nptr->exit = exit;
-@@ -395,8 +406,10 @@
+@@ -370,8 +381,10 @@
if ((type==cptr->flag)||((type!=OBJ_GRP)&&(cptr->flag!=OBJ_GRP)))
{
/* found... bump counter */
@@ -390,7 +390,7 @@ Index: webalizer/hashtab.c
return 0;
}
}
-@@ -408,6 +421,8 @@
+@@ -383,6 +396,8 @@
nptr->flag = type;
nptr->count= count;
nptr->xfer = xfer;
@@ -399,7 +399,7 @@ Index: webalizer/hashtab.c
nptr->next = htab[hval];
nptr->entry= entry;
nptr->exit = exit;
-@@ -846,6 +861,8 @@
+@@ -816,6 +831,8 @@
u_int64_t count, /* hit count */
u_int64_t file, /* File flag */
double xfer, /* xfer size */
@@ -408,7 +408,7 @@ Index: webalizer/hashtab.c
u_int64_t *ctr, /* counter */
u_int64_t visit, /* visits */
u_int64_t tstamp,/* timestamp */
-@@ -867,6 +884,8 @@
+@@ -837,6 +854,8 @@
nptr->count = count;
nptr->files = file;
nptr->xfer = xfer;
@@ -417,7 +417,7 @@ Index: webalizer/hashtab.c
nptr->next = NULL;
htab[hval] = nptr;
if (type!=OBJ_GRP) (*ctr)++;
-@@ -893,9 +912,11 @@
+@@ -863,9 +882,11 @@
if ((type==cptr->flag)||((type!=OBJ_GRP)&&(cptr->flag!=OBJ_GRP)))
{
/* found... bump counter */
@@ -432,7 +432,7 @@ Index: webalizer/hashtab.c
if (ispage(log_rec.url))
{
-@@ -915,6 +936,8 @@
+@@ -885,6 +906,8 @@
nptr->count = count;
nptr->files = file;
nptr->xfer = xfer;
@@ -443,8 +443,8 @@ Index: webalizer/hashtab.c
if (type!=OBJ_GRP) (*ctr)++;
Index: webalizer/hashtab.h
===================================================================
---- webalizer.orig/hashtab.h 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/hashtab.h 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/hashtab.h 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/hashtab.h 2013-10-06 14:45:59.000000000 +0200
@@ -32,6 +32,8 @@
u_int64_t tstamp;
char *lasturl;
@@ -489,8 +489,8 @@ Index: webalizer/hashtab.h
extern int put_anode(char *, int, u_int64_t, u_int64_t *, ANODEPTR *);
Index: webalizer/lang.h
===================================================================
---- webalizer.orig/lang.h 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang.h 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang.h 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang.h 2013-10-06 14:49:10.000000000 +0200
@@ -108,6 +108,8 @@
extern char *msg_h_files ;
extern char *msg_h_sites ;
@@ -520,8 +520,8 @@ Index: webalizer/lang.h
extern char *msg_dtot_ds ;
Index: webalizer/lang/webalizer_lang.catalan
===================================================================
---- webalizer.orig/lang/webalizer_lang.catalan 2011-04-18 23:54:39.000000000 +0200
-+++ webalizer/lang/webalizer_lang.catalan 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.catalan 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.catalan 2013-10-06 14:45:59.000000000 +0200
@@ -224,7 +224,9 @@
char *msg_h_visits= "Visites";
char *msg_h_files = "Fitxers";
@@ -553,8 +553,8 @@ Index: webalizer/lang/webalizer_lang.catalan
/* daily total table */
Index: webalizer/lang/webalizer_lang.chinese
===================================================================
---- webalizer.orig/lang/webalizer_lang.chinese 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.chinese 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.chinese 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.chinese 2013-10-06 14:45:59.000000000 +0200
@@ -218,7 +218,9 @@
char *msg_h_visits= "Visits";
char *msg_h_files = "�ɮ�";
@@ -588,8 +588,8 @@ Index: webalizer/lang/webalizer_lang.chinese
/* daily total table */
Index: webalizer/lang/webalizer_lang.croatian
===================================================================
---- webalizer.orig/lang/webalizer_lang.croatian 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.croatian 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.croatian 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.croatian 2013-10-06 14:45:59.000000000 +0200
@@ -215,7 +215,9 @@
char *msg_h_visits= "Posjeta";
char *msg_h_files = "Datoteka";
@@ -625,8 +625,8 @@ Index: webalizer/lang/webalizer_lang.croatian
/* daily total table */
Index: webalizer/lang/webalizer_lang.czech
===================================================================
---- webalizer.orig/lang/webalizer_lang.czech 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.czech 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.czech 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.czech 2013-10-06 14:45:59.000000000 +0200
@@ -226,7 +226,9 @@
char *msg_h_visits= "N�v�t�v";
char *msg_h_files = "Soubor�";
@@ -660,8 +660,8 @@ Index: webalizer/lang/webalizer_lang.czech
/* daily total table */
Index: webalizer/lang/webalizer_lang.danish
===================================================================
---- webalizer.orig/lang/webalizer_lang.danish 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.danish 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.danish 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.danish 2013-10-06 14:45:59.000000000 +0200
@@ -218,7 +218,9 @@
char *msg_h_visits= "Bes�g";
char *msg_h_files = "Filer";
@@ -697,8 +697,8 @@ Index: webalizer/lang/webalizer_lang.danish
/* daily total table */
Index: webalizer/lang/webalizer_lang.dutch
===================================================================
---- webalizer.orig/lang/webalizer_lang.dutch 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.dutch 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.dutch 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.dutch 2013-10-06 14:45:59.000000000 +0200
@@ -234,7 +234,9 @@
char *msg_h_visits= "Bezoeken";
char *msg_h_files = "Bestanden";
@@ -734,8 +734,8 @@ Index: webalizer/lang/webalizer_lang.dutch
/* daily total table */
Index: webalizer/lang/webalizer_lang.english
===================================================================
---- webalizer.orig/lang/webalizer_lang.english 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.english 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.english 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.english 2013-10-06 14:45:59.000000000 +0200
@@ -219,7 +219,9 @@
char *msg_h_visits= "Visits";
char *msg_h_files = "Files";
@@ -771,8 +771,8 @@ Index: webalizer/lang/webalizer_lang.english
/* daily total table */
Index: webalizer/lang/webalizer_lang.estonian
===================================================================
---- webalizer.orig/lang/webalizer_lang.estonian 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.estonian 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.estonian 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.estonian 2013-10-06 14:45:59.000000000 +0200
@@ -218,7 +218,9 @@
char *msg_h_visits= "K�lastusi";
char *msg_h_files = "Faile";
@@ -808,8 +808,8 @@ Index: webalizer/lang/webalizer_lang.estonian
/* daily total table */
Index: webalizer/lang/webalizer_lang.finnish
===================================================================
---- webalizer.orig/lang/webalizer_lang.finnish 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.finnish 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.finnish 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.finnish 2013-10-06 14:45:59.000000000 +0200
@@ -226,7 +226,9 @@
char *msg_h_visits= "vierailuja";
char *msg_h_files = "tiedostoja";
@@ -845,8 +845,8 @@ Index: webalizer/lang/webalizer_lang.finnish
/* daily total table */
Index: webalizer/lang/webalizer_lang.french
===================================================================
---- webalizer.orig/lang/webalizer_lang.french 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.french 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.french 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.french 2013-10-06 14:45:59.000000000 +0200
@@ -253,7 +253,9 @@
char *msg_h_visits= "Visites";
char *msg_h_files = "Fichiers";
@@ -882,8 +882,8 @@ Index: webalizer/lang/webalizer_lang.french
/* daily total table */
Index: webalizer/lang/webalizer_lang.galician
===================================================================
---- webalizer.orig/lang/webalizer_lang.galician 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.galician 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.galician 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.galician 2013-10-06 14:45:59.000000000 +0200
@@ -223,7 +223,9 @@
char *msg_h_visits= "Visitas";
char *msg_h_files = "Arquivos";
@@ -919,8 +919,8 @@ Index: webalizer/lang/webalizer_lang.galician
/* daily total table */
Index: webalizer/lang/webalizer_lang.german
===================================================================
---- webalizer.orig/lang/webalizer_lang.german 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.german 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.german 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.german 2013-10-06 14:45:59.000000000 +0200
@@ -243,7 +243,9 @@
char *msg_h_visits= "Besuche";
char *msg_h_files = "Dateien";
@@ -956,8 +956,8 @@ Index: webalizer/lang/webalizer_lang.german
/* daily total table */
Index: webalizer/lang/webalizer_lang.greek
===================================================================
---- webalizer.orig/lang/webalizer_lang.greek 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.greek 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.greek 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.greek 2013-10-06 14:45:59.000000000 +0200
@@ -217,7 +217,9 @@
char *msg_h_visits= "����������";
char *msg_h_files = "������";
@@ -993,8 +993,8 @@ Index: webalizer/lang/webalizer_lang.greek
/* daily total table */
Index: webalizer/lang/webalizer_lang.hungarian
===================================================================
---- webalizer.orig/lang/webalizer_lang.hungarian 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.hungarian 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.hungarian 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.hungarian 2013-10-06 14:45:59.000000000 +0200
@@ -224,7 +224,9 @@
char *msg_h_visits= "L�togat�k";
char *msg_h_files = "File-ok";
@@ -1030,8 +1030,8 @@ Index: webalizer/lang/webalizer_lang.hungarian
/* daily total table */
Index: webalizer/lang/webalizer_lang.icelandic
===================================================================
---- webalizer.orig/lang/webalizer_lang.icelandic 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.icelandic 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.icelandic 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.icelandic 2013-10-06 14:45:59.000000000 +0200
@@ -226,7 +226,9 @@
char *msg_h_visits= "Heims�knir";
char *msg_h_files = "Skr�r";
@@ -1067,8 +1067,8 @@ Index: webalizer/lang/webalizer_lang.icelandic
/* daily total table */
Index: webalizer/lang/webalizer_lang.indonesian
===================================================================
---- webalizer.orig/lang/webalizer_lang.indonesian 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.indonesian 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.indonesian 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.indonesian 2013-10-06 14:45:59.000000000 +0200
@@ -222,7 +222,9 @@
char *msg_h_visits= "Kunjungan";
char *msg_h_files = "File";
@@ -1104,8 +1104,8 @@ Index: webalizer/lang/webalizer_lang.indonesian
/* daily total table */
Index: webalizer/lang/webalizer_lang.italian
===================================================================
---- webalizer.orig/lang/webalizer_lang.italian 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.italian 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.italian 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.italian 2013-10-06 14:45:59.000000000 +0200
@@ -221,7 +221,9 @@
char *msg_h_visits= "Visite";
char *msg_h_files = "File";
@@ -1141,8 +1141,8 @@ Index: webalizer/lang/webalizer_lang.italian
/* daily total table */
Index: webalizer/lang/webalizer_lang.japanese
===================================================================
---- webalizer.orig/lang/webalizer_lang.japanese 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.japanese 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.japanese 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.japanese 2013-10-06 14:45:59.000000000 +0200
@@ -215,7 +215,9 @@
char *msg_h_visits= "Visits";
char *msg_h_files = "Files";
@@ -1174,8 +1174,8 @@ Index: webalizer/lang/webalizer_lang.japanese
/* daily total table */
Index: webalizer/lang/webalizer_lang.korean
===================================================================
---- webalizer.orig/lang/webalizer_lang.korean 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.korean 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.korean 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.korean 2013-10-06 14:45:59.000000000 +0200
@@ -219,7 +219,9 @@
char *msg_h_visits= "Visits";
char *msg_h_files = "Files";
@@ -1211,8 +1211,8 @@ Index: webalizer/lang/webalizer_lang.korean
/* daily total table */
Index: webalizer/lang/webalizer_lang.latvian
===================================================================
---- webalizer.orig/lang/webalizer_lang.latvian 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.latvian 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.latvian 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.latvian 2013-10-06 14:45:59.000000000 +0200
@@ -220,7 +220,9 @@
char *msg_h_visits= "Apmekl�jumi";
char *msg_h_files = "Faili";
@@ -1248,8 +1248,8 @@ Index: webalizer/lang/webalizer_lang.latvian
/* daily total table */
Index: webalizer/lang/webalizer_lang.malay
===================================================================
---- webalizer.orig/lang/webalizer_lang.malay 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.malay 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.malay 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.malay 2013-10-06 14:45:59.000000000 +0200
@@ -220,7 +220,9 @@
char *msg_h_visits= "Lawatan";
char *msg_h_files = "Fail";
@@ -1285,8 +1285,8 @@ Index: webalizer/lang/webalizer_lang.malay
/* daily total table */
Index: webalizer/lang/webalizer_lang.norwegian
===================================================================
---- webalizer.orig/lang/webalizer_lang.norwegian 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.norwegian 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.norwegian 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.norwegian 2013-10-06 14:45:59.000000000 +0200
@@ -231,7 +231,9 @@
char *msg_h_visits= "Bes�k";
char *msg_h_files = "Filer";
@@ -1322,8 +1322,8 @@ Index: webalizer/lang/webalizer_lang.norwegian
/* daily total table */
Index: webalizer/lang/webalizer_lang.polish
===================================================================
---- webalizer.orig/lang/webalizer_lang.polish 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.polish 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.polish 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.polish 2013-10-06 14:45:59.000000000 +0200
@@ -226,7 +226,9 @@
char *msg_h_visits= "Wizyty";
char *msg_h_files = "Pliki";
@@ -1359,8 +1359,8 @@ Index: webalizer/lang/webalizer_lang.polish
/* daily total table */
Index: webalizer/lang/webalizer_lang.portuguese
===================================================================
---- webalizer.orig/lang/webalizer_lang.portuguese 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.portuguese 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.portuguese 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.portuguese 2013-10-06 14:45:59.000000000 +0200
@@ -225,7 +225,9 @@
char *msg_h_visits= "Visitas";
char *msg_h_files = "Ficheiros";
@@ -1396,8 +1396,8 @@ Index: webalizer/lang/webalizer_lang.portuguese
/* daily total table */
Index: webalizer/lang/webalizer_lang.portuguese_brazil
===================================================================
---- webalizer.orig/lang/webalizer_lang.portuguese_brazil 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.portuguese_brazil 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.portuguese_brazil 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.portuguese_brazil 2013-10-06 14:45:59.000000000 +0200
@@ -226,7 +226,9 @@
char *msg_h_visits= "Visitas";
char *msg_h_files = "Arquivos";
@@ -1433,8 +1433,8 @@ Index: webalizer/lang/webalizer_lang.portuguese_brazil
/* daily total table */
Index: webalizer/lang/webalizer_lang.romanian
===================================================================
---- webalizer.orig/lang/webalizer_lang.romanian 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.romanian 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.romanian 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.romanian 2013-10-06 14:45:59.000000000 +0200
@@ -219,7 +219,9 @@
char *msg_h_visits= "Vizite";
char *msg_h_files = "Fisiere";
@@ -1470,8 +1470,8 @@ Index: webalizer/lang/webalizer_lang.romanian
/* daily total table */
Index: webalizer/lang/webalizer_lang.romanian-iso-8859-2
===================================================================
---- webalizer.orig/lang/webalizer_lang.romanian-iso-8859-2 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.romanian-iso-8859-2 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.romanian-iso-8859-2 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.romanian-iso-8859-2 2013-10-06 14:45:59.000000000 +0200
@@ -220,7 +220,9 @@
char *msg_h_visits= "Vizite";
char *msg_h_files = "Fi�iere";
@@ -1507,8 +1507,8 @@ Index: webalizer/lang/webalizer_lang.romanian-iso-8859-2
/* daily total table */
Index: webalizer/lang/webalizer_lang.russian
===================================================================
---- webalizer.orig/lang/webalizer_lang.russian 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.russian 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.russian 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.russian 2013-10-06 14:45:59.000000000 +0200
@@ -232,7 +232,9 @@
char *msg_h_visits= "���������";
char *msg_h_files = "������";
@@ -1542,8 +1542,8 @@ Index: webalizer/lang/webalizer_lang.russian
/* daily total table */
Index: webalizer/lang/webalizer_lang.serbian
===================================================================
---- webalizer.orig/lang/webalizer_lang.serbian 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.serbian 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.serbian 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.serbian 2013-10-06 14:45:59.000000000 +0200
@@ -215,7 +215,9 @@
char *msg_h_visits= "Poseta";
char *msg_h_files = "Fajlova";
@@ -1579,8 +1579,8 @@ Index: webalizer/lang/webalizer_lang.serbian
/* daily total table */
Index: webalizer/lang/webalizer_lang.simplified_chinese
===================================================================
---- webalizer.orig/lang/webalizer_lang.simplified_chinese 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.simplified_chinese 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.simplified_chinese 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.simplified_chinese 2013-10-06 14:45:59.000000000 +0200
@@ -214,7 +214,9 @@
char *msg_h_visits= "����";
char *msg_h_files = "�ļ�";
@@ -1612,8 +1612,8 @@ Index: webalizer/lang/webalizer_lang.simplified_chinese
/* daily total table */
Index: webalizer/lang/webalizer_lang.slovak
===================================================================
---- webalizer.orig/lang/webalizer_lang.slovak 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.slovak 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.slovak 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.slovak 2013-10-06 14:45:59.000000000 +0200
@@ -224,7 +224,9 @@
char *msg_h_visits= "n�v�tev";
char *msg_h_files = "s�borov";
@@ -1649,8 +1649,8 @@ Index: webalizer/lang/webalizer_lang.slovak
/* daily total table */
Index: webalizer/lang/webalizer_lang.slovene
===================================================================
---- webalizer.orig/lang/webalizer_lang.slovene 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.slovene 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.slovene 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.slovene 2013-10-06 14:45:59.000000000 +0200
@@ -215,7 +215,9 @@
char *msg_h_visits= "Obiskov";
char *msg_h_files = "Datotek";
@@ -1686,8 +1686,8 @@ Index: webalizer/lang/webalizer_lang.slovene
/* daily Skupaj table */
Index: webalizer/lang/webalizer_lang.spanish
===================================================================
---- webalizer.orig/lang/webalizer_lang.spanish 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.spanish 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.spanish 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.spanish 2013-10-06 14:45:59.000000000 +0200
@@ -232,7 +232,9 @@
char *msg_h_visits= "Visitas";
char *msg_h_files = "Archivos";
@@ -1723,8 +1723,8 @@ Index: webalizer/lang/webalizer_lang.spanish
/* daily total table */
Index: webalizer/lang/webalizer_lang.swedish
===================================================================
---- webalizer.orig/lang/webalizer_lang.swedish 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.swedish 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.swedish 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.swedish 2013-10-06 14:45:59.000000000 +0200
@@ -243,7 +243,9 @@
char *msg_h_visits= "Bes�k."; // GD
char *msg_h_files = "Filer";
@@ -1760,8 +1760,8 @@ Index: webalizer/lang/webalizer_lang.swedish
/* daily total table */
Index: webalizer/lang/webalizer_lang.turkish
===================================================================
---- webalizer.orig/lang/webalizer_lang.turkish 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/lang/webalizer_lang.turkish 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.turkish 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.turkish 2013-10-06 14:45:59.000000000 +0200
@@ -220,7 +220,9 @@
char *msg_h_visits= "Ziyaret";
char *msg_h_files = "Dosya";
@@ -1797,8 +1797,8 @@ Index: webalizer/lang/webalizer_lang.turkish
/* daily total table */
Index: webalizer/lang/webalizer_lang.ukrainian
===================================================================
---- webalizer.orig/lang/webalizer_lang.ukrainian 2011-04-18 23:54:39.000000000 +0200
-+++ webalizer/lang/webalizer_lang.ukrainian 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/lang/webalizer_lang.ukrainian 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/lang/webalizer_lang.ukrainian 2013-10-06 14:45:59.000000000 +0200
@@ -224,7 +224,9 @@
char *msg_h_visits= "צ�צ�.";
char *msg_h_files = "���̦�";
@@ -1832,8 +1832,8 @@ Index: webalizer/lang/webalizer_lang.ukrainian
/* daily total table */
Index: webalizer/output.c
===================================================================
---- webalizer.orig/output.c 2011-04-18 23:56:42.000000000 +0200
-+++ webalizer/output.c 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/output.c 2013-10-06 14:45:59.000000000 +0200
++++ webalizer/output.c 2013-10-06 14:49:23.000000000 +0200
@@ -308,8 +308,10 @@
tm_file, /* data 2 (files) */
tm_site, /* data 3 (sites) */
@@ -2591,8 +2591,8 @@ Index: webalizer/output.c
"<FONT SIZE=\"-1\">%.0f</FONT></TH>\n",GREY,gt_pages);
Index: webalizer/parser.c
===================================================================
---- webalizer.orig/parser.c 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/parser.c 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/parser.c 2013-10-06 14:34:50.000000000 +0200
++++ webalizer/parser.c 2013-10-06 14:49:08.000000000 +0200
@@ -199,6 +199,9 @@
/* return appropriate response code */
log_rec.resp_code=(*(eob-2)=='i')?206:200;
@@ -2634,8 +2634,8 @@ Index: webalizer/parser.c
}
Index: webalizer/preserve.c
===================================================================
---- webalizer.orig/preserve.c 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/preserve.c 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/preserve.c 2013-10-06 14:34:50.000000000 +0200
++++ webalizer/preserve.c 2013-10-06 14:49:08.000000000 +0200
@@ -121,7 +121,8 @@
if (i>=0)
{
@@ -2893,8 +2893,8 @@ Index: webalizer/preserve.c
if (verbose)
Index: webalizer/preserve.h
===================================================================
---- webalizer.orig/preserve.h 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/preserve.h 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/preserve.h 2012-05-08 23:10:52.000000000 +0200
++++ webalizer/preserve.h 2013-10-06 14:45:59.000000000 +0200
@@ -21,6 +21,8 @@
u_int64_t page; /* pages for month */
u_int64_t visit; /* visits for month */
@@ -2906,8 +2906,8 @@ Index: webalizer/preserve.h
extern struct hist_rec hist[HISTSIZE]; /* declare our hist array */
Index: webalizer/webalizer.c
===================================================================
---- webalizer.orig/webalizer.c 2011-04-18 23:54:39.000000000 +0200
-+++ webalizer/webalizer.c 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/webalizer.c 2013-10-06 14:34:50.000000000 +0200
++++ webalizer/webalizer.c 2013-10-06 14:49:23.000000000 +0200
@@ -216,11 +216,15 @@
int gz_log=COMP_NONE; /* gziped log? (0=no) */
@@ -3060,8 +3060,8 @@ Index: webalizer/webalizer.c
}
Index: webalizer/webalizer.h
===================================================================
---- webalizer.orig/webalizer.h 2011-04-18 23:54:32.000000000 +0200
-+++ webalizer/webalizer.h 2011-04-18 23:56:44.000000000 +0200
+--- webalizer.orig/webalizer.h 2013-10-06 14:34:50.000000000 +0200
++++ webalizer/webalizer.h 2013-10-06 14:49:23.000000000 +0200
@@ -144,7 +144,9 @@
char *desc; /* TLD description */
u_int64_t count; /* hit counter */
diff --git a/08_use_memmove_for_overlapping_blocks.diff b/08_use_memmove_for_overlapping_blocks.diff
new file mode 100644
index 0000000..aa54f32
--- /dev/null
+++ b/08_use_memmove_for_overlapping_blocks.diff
@@ -0,0 +1,47 @@
+From: Kees Monshouwer <mind04 at launchpad??>
+Date: Tue, 05 Apr 2016 00:00:00 +0200
+Subject: Use memmove for overlapping blocks
+
+Origin: https://bugs.launchpad.net/ubuntu/+source/webalizer/+bug/1399615
+
+Webalizer is using memcpy for overlapping blocks. This is causing undefined behaviour.
+---
+ dns_resolv.c | 2 +-
+ preserve.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/dns_resolv.c b/dns_resolv.c
+index 7462f46..a1ea0cf 100644
+--- a/dns_resolv.c
++++ b/dns_resolv.c
+@@ -886,7 +886,7 @@ char *geodb_get_cc(DB *db, char *ip, char *buf)
+ /* kludge for IPv6 6to4 (RFC3056) */
+ if (addr[0]==0x20 && addr[1]==0x02)
+ {
+- memcpy(&addr[12],&addr[2],4);
++ memmove(&addr[12],&addr[2],4);
+ memset(&addr,0,12);
+ }
+
+diff --git a/preserve.c b/preserve.c
+index fdbedd0..6abad68 100644
+--- a/preserve.c
++++ b/preserve.c
+@@ -109,7 +109,7 @@ void get_history()
+ yr = hist[i].year;
+ mth= hist[i].month+1;
+ if (mth>12) { mth=1; yr++; }
+- memcpy(&hist[0], &hist[1], sizeof(hist[0])*i);
++ memmove(&hist[0], &hist[1], sizeof(hist[0])*i);
+ memset(&hist[i], 0, sizeof(struct hist_rec));
+ hist[i].year=yr; hist[i].month=mth; n--;
+ }
+@@ -282,7 +282,7 @@ void update_history()
+ yr = hist[i].year;
+ mth= hist[i].month+1;
+ if (mth>12) { mth=1; yr++; }
+- memcpy(&hist[0],&hist[1],sizeof(hist[0])*i);
++ memmove(&hist[0],&hist[1],sizeof(hist[0])*i);
+ memset(&hist[i], 0, sizeof(struct hist_rec));
+ hist[i].year=yr; hist[i].month=mth; n--;
+ }
diff --git a/14_add_search_engines.diff b/14_add_search_engines.diff
new file mode 100644
index 0000000..06535a4
--- /dev/null
+++ b/14_add_search_engines.diff
@@ -0,0 +1,60 @@
+From: Julien Viard de Galbert <julien at vdg.blogsite.org>
+Subject: enable and add more SearchEngines in .conf file
+
+Based on patch
+14_add_search_engines.dpatch by Jose Carlos Medeiros <debian at psabs.com.br>
+Also uncomment all SearchEngines directives.
+
+#################################
+# SearchEngine field for the sensis.com.au search engine
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=327496
+# From: Gavin Rogers <grogers at vk6hgr.echidna.id.au>
+
+################################
+# Support for French versions of Google keywords
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=253830
+# From: Cyril Bouthors <cyb at debian.org>
+No longer needed, the sample configuration matches the ".google." string.
+
+Index: webalizer/sample.conf
+===================================================================
+--- webalizer.orig/sample.conf 2013-10-06 14:58:08.000000000 +0200
++++ webalizer/sample.conf 2013-10-06 14:58:08.000000000 +0200
+@@ -710,21 +710,22 @@
+ # engine, and the second is the URL variable used by that search engine
+ # to define its search terms.
+
+-#SearchEngine .google. q=
+-#SearchEngine yahoo.com p=
+-#SearchEngine altavista.com q=
+-#SearchEngine aolsearch. query=
+-#SearchEngine ask.co q=
+-#SearchEngine eureka.com q=
+-#SearchEngine lycos.com query=
+-#SearchEngine hotbot.com MT=
+-#SearchEngine msn.com q=
+-#SearchEngine infoseek.com qt=
+-#SearchEngine excite search=
+-#SearchEngine netscape.com query=
+-#SearchEngine mamma.com query=
+-#SearchEngine alltheweb.com q=
+-#SearchEngine northernlight.com qr=
++SearchEngine .google. q=
++SearchEngine yahoo.com p=
++SearchEngine altavista.com q=
++SearchEngine aolsearch. query=
++SearchEngine ask.co q=
++SearchEngine eureka.com q=
++SearchEngine lycos.com query=
++SearchEngine hotbot.com MT=
++SearchEngine msn.com q=
++SearchEngine infoseek.com qt=
++SearchEngine excite search=
++SearchEngine netscape.com query=
++SearchEngine mamma.com query=
++SearchEngine alltheweb.com q=
++SearchEngine northernlight.com qr=
++SearchEngine sensis.com.au find=
+
+ # Normally, search strings are converted to lower case in order to
+ # increase accuracy. The SearchCaseI option allows them to maintain
diff --git a/17_fix_typo_supress_suppress_in_sample.conf.diff b/17_fix_typo_supress_suppress_in_sample.conf.diff
new file mode 100644
index 0000000..d7f2764
--- /dev/null
+++ b/17_fix_typo_supress_suppress_in_sample.conf.diff
@@ -0,0 +1,21 @@
+From: Julien Viard de Galbert <julien at vdg.blogsite.org>
+Date: Wed, 12 Jul 2017 23:59:31 +0200
+Subject: Fix typo supress -> suppress in sample.conf
+
+---
+ sample.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sample.conf b/sample.conf
+index 925f509..fc91d0c 100644
+--- a/sample.conf
++++ b/sample.conf
+@@ -289,7 +289,7 @@ PageType cgi
+
+ #Quiet no
+
+-# ReallyQuiet will supress all messages including errors and
++# ReallyQuiet will suppress all messages including errors and
+ # warnings. Values can be 'yes' or 'no' with 'no' being the
+ # default. If 'yes' is used here, it cannot be overriden from
+ # the command line, so use with caution. A value of 'no' has
diff --git a/18_ttf_support_throught_libgd.diff b/18_ttf_support_throught_libgd.diff
index b5a51c3..1d2c0d8 100644
--- a/18_ttf_support_throught_libgd.diff
+++ b/18_ttf_support_throught_libgd.diff
@@ -1,5 +1,5 @@
From: Tatsuki Sugiura <sugi at nemui.org>
-Subject: make possible to use TrueTypeFont throught libgd
+Subject: make possible to use TrueTypeFont through libgd
Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=201723
@@ -11,7 +11,7 @@ Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=201723
# GD's built-in font has no Japanese Kanji and any other multi-byte
# characters. Graph labels can't be displayed correctly under some
# locales which has these characters.
-# This patch make possible to use TrueTypeFont throught libgd
+# This patch make possible to use TrueTypeFont through libgd
# function.
Index: webalizer/README.FIRST
diff --git a/22_php_as_htm_in_sample.conf.diff b/22_php_as_htm_in_sample.conf.diff
new file mode 100644
index 0000000..e5a30df
--- /dev/null
+++ b/22_php_as_htm_in_sample.conf.diff
@@ -0,0 +1,18 @@
+From: Jose Carlos Medeiros <debian at psabs.com.br>
+Subject: enable php as htm pages
+
+Index: webalizer/sample.conf
+===================================================================
+--- webalizer.orig/sample.conf 2010-11-24 00:04:10.000000000 +0100
++++ webalizer/sample.conf 2010-11-24 00:04:12.000000000 +0100
+@@ -108,8 +108,9 @@
+ PageType htm*
+ PageType cgi
+ #PageType phtml
+-#PageType php3
++PageType php3
+ #PageType pl
++PageType php
+
+ # PagePrefix allows all requests with a specified prefix to be
+ # considered as 'pages'. If you want everything under /documents
diff --git a/23_gettext_first_part.diff b/23_gettext_first_part.diff
index 350482b..bd93086 100644
--- a/23_gettext_first_part.diff
+++ b/23_gettext_first_part.diff
@@ -19,11 +19,11 @@ He described his patch as follows:
# - case 't': msg_title=optarg; break; /* Report title */
# + case 't': _("Usage Statistics for")=optarg; break; /* Report title */
# To do it, just look at .diff files and after remove these one.
-# 5. Looked for strings that arent msg_*, like new string put with fprintf, ex.
+# 5. Looked for strings that aren't msg_*, like new string put with fprintf, ex.
# fprintf(stderr,"%s %s!\n","Error: File is a symlink",log_fname);
# in webalizer.c file
# grep \" *.c |grep -v "_(\"" |less
-# 6. Found and change string that arent msg_* . Patch of Geolizer is an example.
+# 6. Found and change string that aren't msg_* . Patch of Geolizer is an example.
# It put messages like "Error, something..." and we need to change to _("Error, som...")
# 7. Created webalizer.pot file with the follow command:
# xgettext --default-domain=webalizer --directory=. -o po/webalizer.pot \
@@ -98,11 +98,11 @@ It handles the following bugs as well:
Index: webalizer/Makefile.in
===================================================================
---- webalizer.orig/Makefile.in 2011-01-07 19:11:55.000000000 +0100
-+++ webalizer/Makefile.in 2011-01-07 19:13:13.000000000 +0100
+--- webalizer.orig/Makefile.in 2013-10-06 14:48:22.000000000 +0200
++++ webalizer/Makefile.in 2013-10-06 14:48:22.000000000 +0200
@@ -23,10 +23,11 @@
BINDIR = @bindir@
- MANDIR = ${datadir}/man/man1
+ MANDIR = @mandir@/man1
ETCDIR = @sysconfdir@
+LOCALEDIR = @localedir@
GEODB = @GEODB_LOC@
@@ -140,7 +140,7 @@ Index: webalizer/Makefile.in
parser.o: parser.c parser.h webalizer.h lang.h
@@ -81,14 +85,16 @@
- wcmgr.o: wcmgr.c
+ wcmgr.o: wcmgr.c webalizer.h
$(CC) ${CFLAGS} ${DEFS} -c wcmgr.c
+$(LANGS:%=po/%.mo): %.mo: %.po
@@ -175,8 +175,8 @@ Index: webalizer/Makefile.in
+ for a in $(LANGS); do rm -f $(LOCALEDIR)/$$a/LC_MESSAGES/webalizer.mo; done
Index: webalizer/configure.in
===================================================================
---- webalizer.orig/configure.in 2011-01-07 19:12:51.000000000 +0100
-+++ webalizer/configure.in 2011-01-07 19:13:13.000000000 +0100
+--- webalizer.orig/configure.in 2013-10-06 14:48:22.000000000 +0200
++++ webalizer/configure.in 2013-10-06 14:48:22.000000000 +0200
@@ -281,43 +281,16 @@
if test "$OLDHASH" = "yes"; then OPTS="-DUSE_OLDHASH"; fi
@@ -229,8 +229,8 @@ Index: webalizer/configure.in
dnl done.. write out our Makefile
Index: webalizer/dns_resolv.c
===================================================================
---- webalizer.orig/dns_resolv.c 2011-01-07 19:11:55.000000000 +0100
-+++ webalizer/dns_resolv.c 2011-01-07 19:13:13.000000000 +0100
+--- webalizer.orig/dns_resolv.c 2013-10-06 14:48:22.000000000 +0200
++++ webalizer/dns_resolv.c 2013-10-06 14:49:08.000000000 +0200
@@ -120,7 +120,7 @@
query.data = log_rec->hostname;
query.size = strlen(log_rec->hostname);
@@ -425,8 +425,8 @@ Index: webalizer/dns_resolv.c
}
Index: webalizer/graphs.c
===================================================================
---- webalizer.orig/graphs.c 2011-01-07 19:12:51.000000000 +0100
-+++ webalizer/graphs.c 2011-01-07 19:13:13.000000000 +0100
+--- webalizer.orig/graphs.c 2013-10-06 14:48:22.000000000 +0200
++++ webalizer/graphs.c 2013-10-06 14:49:08.000000000 +0200
@@ -217,12 +217,12 @@
if (graph_mths<16)
{
@@ -444,8 +444,8 @@ Index: webalizer/graphs.c
else
Index: webalizer/lang.h
===================================================================
---- webalizer.orig/lang.h 2011-01-07 19:12:27.000000000 +0100
-+++ webalizer/lang.h 2011-01-07 19:13:13.000000000 +0100
+--- webalizer.orig/lang.h 2013-10-06 14:48:22.000000000 +0200
++++ webalizer/lang.h 2013-10-06 14:48:22.000000000 +0200
@@ -1,187 +1,20 @@
#ifndef _LANG_H
#define _LANG_H
@@ -644,7 +644,7 @@ Index: webalizer/lang.h
Index: webalizer/lang2.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/lang2.h 2011-01-07 19:13:13.000000000 +0100
++++ webalizer/lang2.h 2013-10-06 14:48:22.000000000 +0200
@@ -0,0 +1,435 @@
+/*
+ webalizer_lang.english
@@ -694,14 +694,14 @@ Index: webalizer/lang2.h
+ gettext_noop("-i = ignore history file") ,
+ gettext_noop("-p = preserve state (incremental)") ,
+ gettext_noop("-b = ignore state (incremental)") ,
-+ gettext_noop("-q = supress informational messages") ,
-+ gettext_noop("-Q = supress _ALL_ messages") ,
-+ gettext_noop("-Y = supress country graph") ,
-+ gettext_noop("-G = supress hourly graph") ,
-+ gettext_noop("-H = supress hourly stats") ,
-+ gettext_noop("-L = supress color coded graph legends") ,
++ gettext_noop("-q = suppress informational messages") ,
++ gettext_noop("-Q = suppress _ALL_ messages") ,
++ gettext_noop("-Y = suppress country graph") ,
++ gettext_noop("-G = suppress hourly graph") ,
++ gettext_noop("-H = suppress hourly stats") ,
++ gettext_noop("-L = suppress color coded graph legends") ,
+ gettext_noop("-l num = use num background lines on graph") ,
-+ gettext_noop("-m num = Visit timout value (seconds)") ,
++ gettext_noop("-m num = Visit timeout value (seconds)") ,
+ gettext_noop("-T = print timing information") ,
+ gettext_noop("-c file = use configuration file 'file'") ,
+ gettext_noop("-n name = hostname to use") ,
@@ -1084,7 +1084,7 @@ Index: webalizer/lang2.h
Index: webalizer/lang_po.sh
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/lang_po.sh 2011-01-07 19:13:13.000000000 +0100
++++ webalizer/lang_po.sh 2013-10-06 14:48:22.000000000 +0200
@@ -0,0 +1,24 @@
+#!/bin/bash
+# create lang.txt file with vars and strings from webalizer_lang.english file
@@ -1112,8 +1112,8 @@ Index: webalizer/lang_po.sh
+rm -f lang_po_exec.sh lang.txt;
Index: webalizer/output.c
===================================================================
---- webalizer.orig/output.c 2011-01-07 19:12:31.000000000 +0100
-+++ webalizer/output.c 2011-01-07 19:13:13.000000000 +0100
+--- webalizer.orig/output.c 2013-10-06 14:48:22.000000000 +0200
++++ webalizer/output.c 2013-10-06 14:49:08.000000000 +0200
@@ -191,7 +191,7 @@
fprintf(out_fp,"<HTML lang=\"%s\">\n<HEAD>\n",langcode);
@@ -1305,7 +1305,7 @@ Index: webalizer/output.c
Index: webalizer/update_po.sh
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/update_po.sh 2011-01-07 19:13:13.000000000 +0100
++++ webalizer/update_po.sh 2013-10-06 14:48:22.000000000 +0200
@@ -0,0 +1,9 @@
+# 7. Created webalizer.pot file with the follow command:
+ xgettext --default-domain=webalizer --directory=. -o po/webalizer.pot \
@@ -1318,8 +1318,8 @@ Index: webalizer/update_po.sh
+
Index: webalizer/webalizer.c
===================================================================
---- webalizer.orig/webalizer.c 2011-01-07 19:12:51.000000000 +0100
-+++ webalizer/webalizer.c 2011-01-07 19:13:13.000000000 +0100
+--- webalizer.orig/webalizer.c 2013-10-06 14:48:22.000000000 +0200
++++ webalizer/webalizer.c 2013-10-06 14:49:08.000000000 +0200
@@ -86,7 +86,7 @@
#include "preserve.h"
#include "hashtab.h"
@@ -1483,8 +1483,8 @@ Index: webalizer/webalizer.c
+
Index: webalizer/webalizer.h
===================================================================
---- webalizer.orig/webalizer.h 2011-01-07 19:12:31.000000000 +0100
-+++ webalizer/webalizer.h 2011-01-07 19:13:13.000000000 +0100
+--- webalizer.orig/webalizer.h 2013-10-06 14:48:22.000000000 +0200
++++ webalizer/webalizer.h 2013-10-06 14:48:22.000000000 +0200
@@ -301,7 +301,7 @@
extern char pie_color3[]; /* pie additionnal color 3 */
extern char pie_color4[]; /* pie additionnal color 4 */
diff --git a/24_gettext_generated.diff b/24_gettext_generated.diff
index d33d44b..01cedf2 100644
--- a/24_gettext_generated.diff
+++ b/24_gettext_generated.diff
@@ -6,8 +6,8 @@ the script 'lang_po.sh'.
Index: webalizer/dns_resolv.c
===================================================================
---- webalizer.orig/dns_resolv.c 2011-01-08 20:59:53.000000000 +0100
-+++ webalizer/dns_resolv.c 2011-01-08 20:59:58.000000000 +0100
+--- webalizer.orig/dns_resolv.c 2013-10-06 14:48:22.000000000 +0200
++++ webalizer/dns_resolv.c 2013-10-06 14:48:22.000000000 +0200
@@ -199,7 +199,7 @@
DB_CREATE, 0644) != 0) )
{
@@ -70,8 +70,8 @@ Index: webalizer/dns_resolv.c
}
Index: webalizer/graphs.c
===================================================================
---- webalizer.orig/graphs.c 2011-01-08 20:59:53.000000000 +0100
-+++ webalizer/graphs.c 2011-01-08 20:59:58.000000000 +0100
+--- webalizer.orig/graphs.c 2013-10-06 14:48:22.000000000 +0200
++++ webalizer/graphs.c 2013-10-06 14:48:22.000000000 +0200
@@ -141,68 +141,68 @@
if (graph_legend)
{
@@ -331,8 +331,8 @@ Index: webalizer/graphs.c
}
Index: webalizer/hashtab.c
===================================================================
---- webalizer.orig/hashtab.c 2011-01-08 20:59:30.000000000 +0100
-+++ webalizer/hashtab.c 2011-01-08 20:59:58.000000000 +0100
+--- webalizer.orig/hashtab.c 2013-10-06 14:48:22.000000000 +0200
++++ webalizer/hashtab.c 2013-10-06 14:48:22.000000000 +0200
@@ -119,7 +119,7 @@
{
if (verbose)
@@ -342,7 +342,7 @@ Index: webalizer/hashtab.c
if (debug_mode)
fprintf(stderr,":\n--> %s",str);
fprintf(stderr,"\n");
-@@ -338,7 +338,7 @@
+@@ -318,7 +318,7 @@
{
if (verbose)
{
@@ -351,7 +351,7 @@ Index: webalizer/hashtab.c
if (debug_mode)
fprintf(stderr,":\n--> %s",str);
fprintf(stderr,"\n");
-@@ -474,7 +474,7 @@
+@@ -454,7 +454,7 @@
{
if (verbose)
{
@@ -360,7 +360,7 @@ Index: webalizer/hashtab.c
if (debug_mode)
fprintf(stderr,":\n--> %s",str);
fprintf(stderr,"\n");
-@@ -600,7 +600,7 @@
+@@ -575,7 +575,7 @@
{
if (verbose)
{
@@ -369,7 +369,7 @@ Index: webalizer/hashtab.c
if (debug_mode)
fprintf(stderr,":\n--> %s",str);
fprintf(stderr,"\n");
-@@ -719,7 +719,7 @@
+@@ -694,7 +694,7 @@
{
if (verbose)
{
@@ -378,7 +378,7 @@ Index: webalizer/hashtab.c
if (debug_mode)
fprintf(stderr,":\n--> %s",str);
fprintf(stderr,"\n");
-@@ -826,7 +826,7 @@
+@@ -801,7 +801,7 @@
{
if (verbose)
{
@@ -387,7 +387,7 @@ Index: webalizer/hashtab.c
if (debug_mode)
fprintf(stderr,":\n--> %s",str);
fprintf(stderr,"\n");
-@@ -1006,7 +1006,7 @@
+@@ -981,7 +981,7 @@
{
if (verbose)
{
@@ -398,8 +398,8 @@ Index: webalizer/hashtab.c
fprintf(stderr,"\n");
Index: webalizer/linklist.c
===================================================================
---- webalizer.orig/linklist.c 2011-01-08 20:36:44.000000000 +0100
-+++ webalizer/linklist.c 2011-01-08 20:59:58.000000000 +0100
+--- webalizer.orig/linklist.c 2013-10-06 14:48:22.000000000 +0200
++++ webalizer/linklist.c 2013-10-06 14:48:22.000000000 +0200
@@ -106,7 +106,7 @@
if (sizeof(newptr->string) < strlen(str))
{
@@ -420,8 +420,8 @@ Index: webalizer/linklist.c
{
Index: webalizer/output.c
===================================================================
---- webalizer.orig/output.c 2011-01-08 20:59:53.000000000 +0100
-+++ webalizer/output.c 2011-01-08 20:59:58.000000000 +0100
+--- webalizer.orig/output.c 2013-10-06 14:48:22.000000000 +0200
++++ webalizer/output.c 2013-10-06 14:48:22.000000000 +0200
@@ -189,9 +189,9 @@
fprintf(out_fp,"<!-- -->\n");
fprintf(out_fp,"<!-- *** Generated: %s *** -->\n\n",cur_time());
@@ -1460,8 +1460,8 @@ Index: webalizer/output.c
return out_fp;
Index: webalizer/parser.c
===================================================================
---- webalizer.orig/parser.c 2011-01-08 20:59:30.000000000 +0100
-+++ webalizer/parser.c 2011-01-08 20:59:58.000000000 +0100
+--- webalizer.orig/parser.c 2013-10-06 14:48:22.000000000 +0200
++++ webalizer/parser.c 2013-10-06 14:48:22.000000000 +0200
@@ -229,7 +229,7 @@
{
if (verbose)
@@ -1536,8 +1536,8 @@ Index: webalizer/parser.c
}
Index: webalizer/preserve.c
===================================================================
---- webalizer.orig/preserve.c 2011-01-08 20:59:30.000000000 +0100
-+++ webalizer/preserve.c 2011-01-08 20:59:58.000000000 +0100
+--- webalizer.orig/preserve.c 2013-10-06 14:48:22.000000000 +0200
++++ webalizer/preserve.c 2013-10-06 14:48:22.000000000 +0200
@@ -75,7 +75,7 @@
if (hist_fp)
@@ -1690,8 +1690,8 @@ Index: webalizer/preserve.c
Index: webalizer/webalizer.c
===================================================================
---- webalizer.orig/webalizer.c 2011-01-08 20:59:53.000000000 +0100
-+++ webalizer/webalizer.c 2011-01-08 20:59:58.000000000 +0100
+--- webalizer.orig/webalizer.c 2013-10-06 14:48:22.000000000 +0200
++++ webalizer/webalizer.c 2013-10-06 14:48:22.000000000 +0200
@@ -326,7 +326,7 @@
setlocale(LC_CTYPE,"");
diff --git a/25_add_convertlang2po.diff b/25_add_convertlang2po.diff
new file mode 100644
index 0000000..09d4b57
--- /dev/null
+++ b/25_add_convertlang2po.diff
@@ -0,0 +1,101 @@
+From: Julien Viard de Galbert <julien at vdg.blogsite.org>
+Date: Fri, 10 Oct 2014 21:54:14 +0200
+Subject: Add python script to convert lang file to po file
+
+The generated po files needs updating at least to add original authors
+and comments.
+---
+ convertlang2po.py | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 84 insertions(+)
+ create mode 100755 convertlang2po.py
+
+diff --git a/convertlang2po.py b/convertlang2po.py
+new file mode 100755
+index 0000000..fff48e5
+--- /dev/null
++++ b/convertlang2po.py
+@@ -0,0 +1,84 @@
++#!/usr/bin/env python3
++
++# note: apt-get install python3-pycparser python3-polib
++
++from pycparser import parse_file, c_ast
++import polib
++import sys
++
++if(len(sys.argv)!=2):
++ print("convertlang2po.py <lang/file>")
++ sys.exit(1)
++
++filename_pot='po/webalizer.pot'
++filename_english='lang/webalizer_lang.english'
++filename_lang=sys.argv[1]
++
++ast_english = parse_file(filename_english, use_cpp=True)
++ast_lang = parse_file(filename_lang, use_cpp=True)
++
++#ast_english.show()
++
++
++def tags_value(ast):
++ t2v={}
++ for decl in ast.ext:
++ # strings are pointer on char, just check pointer for now :)
++ # also values are always strings... So don't check.
++ if(isinstance(decl.type, c_ast.PtrDecl)):
++ #print(decl.name, "=", decl.init.value)
++ t2v[decl.name]=decl.init.value.strip('"')
++ # arrays
++ elif(isinstance(decl.type, c_ast.ArrayDecl)):
++ # of pointers ... assume chars
++ if(isinstance(decl.type.type, c_ast.PtrDecl)):
++ for idx, val in enumerate(decl.init.exprs):
++ if(isinstance(val, c_ast.Constant)):
++ key="{0}[{1}]".format(decl.name,idx)
++ #print(key,"=",val.value)
++ v=val.value.strip('"')
++ if(v == 'May'):
++ if(decl.name == 's_month'): v = 'short|May'
++ if(decl.name == 'l_month'): v = 'long|May'
++ t2v[key]=v
++ # response case
++ elif(decl.name=='response'):
++ for idx, val in enumerate(decl.init.exprs):
++ key="{0}[{1}]".format(decl.name,idx)
++ #print(key,"=",val.exprs[0].value)
++ t2v[key]=val.exprs[0].value.strip('"')
++ # ctry case
++ elif(decl.name=='ctry'):
++ for idx, val in enumerate(decl.init.exprs):
++ if(isinstance(val.exprs[1], c_ast.Constant)):
++ if(isinstance(val.exprs[0], c_ast.Constant)):
++ cc=val.exprs[0].value
++ else:
++ cc=''.join([c.value.strip("'") for c in val.exprs[0].args.exprs])
++ key="{0}[{1}]".format(decl.name,cc)
++ #print(key,"=",val.exprs[1].value)
++ t2v[key]=val.exprs[1].value.strip('"')
++ else:
++ print("missed:", decl.name)
++ else:
++ print("missed:", decl.name)
++ return t2v
++
++tag2english = tags_value(ast_english);
++tag2lang = tags_value(ast_lang);
++
++po = polib.pofile(filename_pot)
++
++#for entry in po:
++# print (entry.msgid, entry.msgstr)
++for k in tag2english.keys():
++ #print(k, tag2english[k], tag2lang[k])
++ entry = po.find(tag2english[k])
++ if entry:
++ entry.msgstr = tag2lang[k]
++ if 'fuzzy' in entry.flags:
++ entry.flags.remove('fuzzy')
++
++po.metadata['Language'] = tag2lang['langcode']
++po.save('po/'+tag2lang['langcode']+'.po')
++
diff --git a/25_gettext_po_files.diff b/26_gettext_po_files.diff
similarity index 98%
rename from 25_gettext_po_files.diff
rename to 26_gettext_po_files.diff
index 2c2b2a4..3b69e5f 100644
--- a/25_gettext_po_files.diff
+++ b/26_gettext_po_files.diff
@@ -1,4 +1,5 @@
From: Julien Viard de Galbert <julien at vdg.blogsite.org>
+Date: Wed, 8 Oct 2014 01:23:00 +0200
Subject: gettext po files
This patch is generated by importing the previous po directory form the previous
@@ -9,10 +10,79 @@ each new contribution to this patch.
Also fixed some encodings: cs.po (#409454) and ko.po (#461176)
-Index: webalizer/po/ca.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/ca.po 2010-11-24 16:39:12.000000000 +0100
+Converted french translation using convertlang2po.py and updated it
+---
+ po/ca.po | 2455 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/cs.po | 2452 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/da.po | 2451 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/de.po | 2451 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/el.po | 2451 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/es.po | 2454 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/et.po | 2451 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/fi.po | 2451 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/fr.po | 2379 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/gl.po | 2453 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/hr.po | 2451 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/hu.po | 2452 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/id.po | 2465 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/is.po | 2451 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/it.po | 2471 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/ja.po | 2451 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/ko.po | 2451 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/lv.po | 2451 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/ml.po | 2453 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/nl.po | 2452 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/no.po | 2451 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/pl.po | 2453 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/pt.po | 2450 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/ro.po | 2452 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/ru.po | 2457 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/sl.po | 2451 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/sr.po | 2451 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/sv.po | 2451 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/tr.po | 2451 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/uk.po | 2451 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/webalizer.pot | 2361 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ po/zh.po | 2451 +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 32 files changed, 78326 insertions(+)
+ create mode 100644 po/ca.po
+ create mode 100644 po/cs.po
+ create mode 100644 po/da.po
+ create mode 100644 po/de.po
+ create mode 100644 po/el.po
+ create mode 100644 po/es.po
+ create mode 100644 po/et.po
+ create mode 100644 po/fi.po
+ create mode 100644 po/fr.po
+ create mode 100644 po/gl.po
+ create mode 100644 po/hr.po
+ create mode 100644 po/hu.po
+ create mode 100644 po/id.po
+ create mode 100644 po/is.po
+ create mode 100644 po/it.po
+ create mode 100644 po/ja.po
+ create mode 100644 po/ko.po
+ create mode 100644 po/lv.po
+ create mode 100644 po/ml.po
+ create mode 100644 po/nl.po
+ create mode 100644 po/no.po
+ create mode 100644 po/pl.po
+ create mode 100644 po/pt.po
+ create mode 100644 po/ro.po
+ create mode 100644 po/ru.po
+ create mode 100644 po/sl.po
+ create mode 100644 po/sr.po
+ create mode 100644 po/sv.po
+ create mode 100644 po/tr.po
+ create mode 100644 po/uk.po
+ create mode 100644 po/webalizer.pot
+ create mode 100644 po/zh.po
+
+diff --git a/po/ca.po b/po/ca.po
+new file mode 100644
+index 0000000..3db95d6
+--- /dev/null
++++ b/po/ca.po
@@ -0,0 +1,2455 @@
+msgid ""
+msgstr ""
@@ -274,27 +344,27 @@ Index: webalizer/po/ca.po
+msgstr "-p = conservem dades actuals (incremental)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
++msgid "-q = suppress informational messages"
+msgstr "-q = suprimir els missatges d'informaci�"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
+msgstr "-Q = suprimir TOTS es missatges"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
++msgid "-Y = suppress country graph"
+msgstr "-Y = suprimir la gr�fica de pa�s"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
+msgstr "-G = suprimir gr�fica per hores"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
+msgstr "-H = suprimir estad�stiques per hores"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
+msgstr "-L num = suprimir les llegendes de color dels gr�fics"
+
+#: lang2.h:55
@@ -302,7 +372,7 @@ Index: webalizer/po/ca.po
+msgstr "-l num = valor de temps de visita (seconds)"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
+msgstr "-T = ensenyar temps cronometratge"
+
+#: lang2.h:57
@@ -2469,10 +2539,11 @@ Index: webalizer/po/ca.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "Av�s: He trobat dades que potser s�n duplicades"
-Index: webalizer/po/cs.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/cs.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/cs.po b/po/cs.po
+new file mode 100644
+index 0000000..99235a1
+--- /dev/null
++++ b/po/cs.po
@@ -0,0 +1,2452 @@
+msgid ""
+msgstr ""
@@ -2734,27 +2805,27 @@ Index: webalizer/po/cs.po
+msgstr "-p = zapamatuj stav (inkrementalne)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
++msgid "-q = suppress informational messages"
+msgstr "-q = potlac informativni zpravy"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
+msgstr "-Q = potlac VSECHNY zpravy"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
++msgid "-Y = suppress country graph"
+msgstr "-Y = potlac graf statu"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
+msgstr "-G = potlac hodinovy graf"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
+msgstr "-H = potlac hodinove statistiky"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
+msgstr "-L = potlac barevne kody v legendach grafu"
+
+#: lang2.h:55
@@ -2762,7 +2833,7 @@ Index: webalizer/po/cs.po
+msgstr "-l poc = pouzij 'num' radek v podkladu grafu"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
+msgstr "-m poc = cas pro navstevu (seconds)"
+
+#: lang2.h:57
@@ -4926,10 +4997,11 @@ Index: webalizer/po/cs.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "Pozor: Nalezeny pravdepodobne duplicitni udaje"
-Index: webalizer/po/da.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/da.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/da.po b/po/da.po
+new file mode 100644
+index 0000000..a8ab21d
+--- /dev/null
++++ b/po/da.po
@@ -0,0 +1,2451 @@
+msgid ""
+msgstr ""
@@ -5191,27 +5263,27 @@ Index: webalizer/po/da.po
+msgstr "-p = bevar tilstand (inkremental)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
++msgid "-q = suppress informational messages"
+msgstr "-q = undertryk informationsrelaterede beskeder"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
+msgstr "-Q = undertryk _ALLE_ beskeder"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
++msgid "-Y = suppress country graph"
+msgstr "-Y = undertryk landegrafer"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
+msgstr "-G = undertryk timegrafer"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
+msgstr "-H = undertryk timestatistikker"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
+msgstr "-L = undertryk farvekodede grafertekst"
+
+#: lang2.h:55
@@ -5219,7 +5291,7 @@ Index: webalizer/po/da.po
+msgstr "-l num = brug numeriske baggrundslinier p� graf"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
+msgstr "-m num = Unders�g timeout-v�rdi (seconds)"
+
+#: lang2.h:57
@@ -7382,10 +7454,11 @@ Index: webalizer/po/da.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "Advarsel: Mulige dobbelte data fundet"
-Index: webalizer/po/de.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/de.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/de.po b/po/de.po
+new file mode 100644
+index 0000000..39ede24
+--- /dev/null
++++ b/po/de.po
@@ -0,0 +1,2451 @@
+msgid ""
+msgstr ""
@@ -7647,27 +7720,27 @@ Index: webalizer/po/de.po
+msgstr "-p = sichere Programmzustand (inkrementell)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
++msgid "-q = suppress informational messages"
+msgstr "-q = Statusmeldungen unterdr�cken"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
+msgstr "-Q = alle Meldungen unterdr�cken"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
++msgid "-Y = suppress country graph"
+msgstr "-Y = L�ndergrafik unterdr�cken"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
+msgstr "-G = Stundengrafik unterdr�cken"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
+msgstr "-H = Stundenstatistik unterdr�cken"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
+msgstr "-L = Farbige L�nderlegende unterdr�cken"
+
+#: lang2.h:55
@@ -7675,7 +7748,7 @@ Index: webalizer/po/de.po
+msgstr "-l anz = 'Anz' Hintergrundlinien in Grafik verwenden"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
+msgstr "-m num = Timeout f�r Besuch (seconds)"
+
+#: lang2.h:57
@@ -9838,10 +9911,11 @@ Index: webalizer/po/de.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "Warnung: M�glicherweise doppelte Daten gelesen."
-Index: webalizer/po/el.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/el.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/el.po b/po/el.po
+new file mode 100644
+index 0000000..8561a9d
+--- /dev/null
++++ b/po/el.po
@@ -0,0 +1,2451 @@
+msgid ""
+msgstr ""
@@ -10103,36 +10177,36 @@ Index: webalizer/po/el.po
+msgstr "-p = preserve state (incremental)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
-+msgstr "-q = supress informational messages"
++msgid "-q = suppress informational messages"
++msgstr "-q = suppress informational messages"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
-+msgstr "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
++msgstr "-Q = suppress _ALL_ messages"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
-+msgstr "-Y = supress country graph"
++msgid "-Y = suppress country graph"
++msgstr "-Y = suppress country graph"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
-+msgstr "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
++msgstr "-G = suppress hourly graph"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
-+msgstr "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
++msgstr "-H = suppress hourly stats"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
-+msgstr "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
++msgstr "-L = suppress color coded graph legends"
+
+#: lang2.h:55
+msgid "-l num = use num background lines on graph"
+msgstr "-l num = use num background lines on graph"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
-+msgstr "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
++msgstr "-m num = Visit timeout value (seconds)"
+
+#: lang2.h:57
+msgid "-T = print timing information"
@@ -12294,10 +12368,11 @@ Index: webalizer/po/el.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "Warning: Possible duplicate data found"
-Index: webalizer/po/es.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/es.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/es.po b/po/es.po
+new file mode 100644
+index 0000000..c6bd92a
+--- /dev/null
++++ b/po/es.po
@@ -0,0 +1,2454 @@
+msgid ""
+msgstr ""
@@ -12559,27 +12634,27 @@ Index: webalizer/po/es.po
+msgstr "-p = recordar estado (incremental)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
++msgid "-q = suppress informational messages"
+msgstr "-q = suprimir mensajes de informaci�n"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
+msgstr "-Q = suprimir TODOS los mensajes"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
++msgid "-Y = suppress country graph"
+msgstr "-Y = suprimir gr�fico de pa�ses"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
+msgstr "-G = suprimir gr�fico por horas"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
+msgstr "-H = suprimir estad�sticas por horas"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
+msgstr "-L = suprimir leyendas coloreadas de los gr�ficos"
+
+#: lang2.h:55
@@ -12587,7 +12662,7 @@ Index: webalizer/po/es.po
+msgstr "-l N = usar N l�neas de fondo en los gr�ficos"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
+msgstr "-m N = especificar temporizador de visitas (N segundos)"
+
+#: lang2.h:57
@@ -14753,10 +14828,11 @@ Index: webalizer/po/es.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "Aviso: Posibles datos duplicados encontrados"
-Index: webalizer/po/et.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/et.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/et.po b/po/et.po
+new file mode 100644
+index 0000000..8fb412f
+--- /dev/null
++++ b/po/et.po
@@ -0,0 +1,2451 @@
+msgid ""
+msgstr ""
@@ -15018,27 +15094,27 @@ Index: webalizer/po/et.po
+msgstr "-p = s�ilita olek (inkrementaalne rezhiim)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
++msgid "-q = suppress informational messages"
+msgstr "-q = keela informatiivsed teated"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
+msgstr "-Q = keela K�IK teated"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
++msgid "-Y = suppress country graph"
+msgstr "-Y = keela maade graafik"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
+msgstr "-G = keela tunnigraafik"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
+msgstr "-H = keela tunnistatistika"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
+msgstr "-L = keela v�rvilegendide kuva"
+
+#: lang2.h:55
@@ -15046,7 +15122,7 @@ Index: webalizer/po/et.po
+msgstr "-l num = kasuta graafikutel {num} horisontaaljoont"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
+msgstr "-m num = viisidi timeout v��rtus (seconds)"
+
+#: lang2.h:57
@@ -17209,10 +17285,11 @@ Index: webalizer/po/et.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "Hoiatus: T�en�oliselt leitud topeltkirjed"
-Index: webalizer/po/fi.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/fi.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/fi.po b/po/fi.po
+new file mode 100644
+index 0000000..8838e45
+--- /dev/null
++++ b/po/fi.po
@@ -0,0 +1,2451 @@
+msgid ""
+msgstr ""
@@ -17474,36 +17551,36 @@ Index: webalizer/po/fi.po
+msgstr "-p = preserve state (incremental)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
-+msgstr "-q = supress informational messages"
++msgid "-q = suppress informational messages"
++msgstr "-q = suppress informational messages"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
-+msgstr "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
++msgstr "-Q = suppress _ALL_ messages"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
-+msgstr "-Y = supress country graph"
++msgid "-Y = suppress country graph"
++msgstr "-Y = suppress country graph"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
-+msgstr "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
++msgstr "-G = suppress hourly graph"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
-+msgstr "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
++msgstr "-H = suppress hourly stats"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
-+msgstr "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
++msgstr "-L = suppress color coded graph legends"
+
+#: lang2.h:55
+msgid "-l num = use num background lines on graph"
+msgstr "-l num = use num background lines on graph"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
-+msgstr "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
++msgstr "-m num = Visit timeout value (seconds)"
+
+#: lang2.h:57
+msgid "-T = print timing information"
@@ -19665,23 +19742,48 @@ Index: webalizer/po/fi.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "Warning: Possible duplicate data found"
-Index: webalizer/po/fr.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/fr.po 2010-11-24 16:39:12.000000000 +0100
-@@ -0,0 +1,2451 @@
+diff --git a/po/fr.po b/po/fr.po
+new file mode 100644
+index 0000000..b04da00
+--- /dev/null
++++ b/po/fr.po
+@@ -0,0 +1,2379 @@
++# webalizer gettext french translation
++# Copyright (C) 1998-2014
++# This file is distributed under the same license as the webalizer package.
++# This file was converted from webalizer_lang.french
++# 04-Jun-1998 Translation by Sylvain Avril (savril at oceanet.fr)
++# 04-Jun-1998 Modified for level 1.1 support (brad at mrunix.net)
++# 23-Jul-1998 Modified for level 1.2 support (brad at mrunix.net)
++# 20-Feb-1999 Added non-extended char l_month array (brad at mrunix.net)
++# 08-Mar-1999 Updated HTTP 1.1 response codes by Yves Lafon (ylafon at w3.org)
++# 28-Jun-1999 Modified for level 1.3 support (brad at mrunix.net)
++# 27-Jan-2000 Translation complements by Christophe Aubert (ca at tgi.fr)
++# 11-Fev-2000 Minor complements by Laurent Monin(lmonin at metaconcept.com)
++# 22-Feb-2000 Modified for level 2.0 support (brad at mrunix.net)
++# 17-Mar-2000 French support for level 2.0 (lmonin at metaconcept.com)
++# 26-Mar-2008 Updated to current IANA TLDs (brad at mrunix.net)
++# 26-May-2008 Modified for level 2.2 support (brad at mrunix.net)
++# 10-Oct-2014 Converted to gextext (julien at vdg.blogsite.org)
++# Mergetd with previos gettext translation from
++# 2003-05-25 23:29+0200 Johan Poirier <johan.poirier at insa-lyon.fr>
++# Updated TLD description according to
++# http://fr.wikipedia.org/wiki/Liste_des_domaines_Internet_de_premier_niveau
++# Updated some country name translation.
++#
++#
+msgid ""
+msgstr ""
-+"Project-Id-Version: 1.0\n"
++"Project-Id-Version: 2.23-08\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-24 15:03+0100\n"
-+"PO-Revision-Date: 2003-05-25 23:29+0200\n"
-+"Last-Translator: Johan Poirier <johan.poirier at insa-lyon.fr>\n"
-+"Language-Team: French <tech at jexiste.org>\n"
-+"Language: fr\n"
++"PO-Revision-Date: 2014-10-10 23:17+0200\n"
++"Last-Translator: Julien Viard de Galbert <julien at vdg.blogsite.org>\n"
++"Language-Team: French <LL at li.org>\n"
+"MIME-Version: 1.0\n"
-+"Content-Type: text/plain; charset=ISO-8859-1\n"
++"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
++"Language: fr\n"
+
+#: dns_resolv.c:123
+#, c-format
@@ -19824,21 +19926,21 @@ Index: webalizer/po/fr.po
+#: output.c:1998 output.c:2225 output.c:2301 output.c:2345 output.c:2466
+#: output.c:2623
+msgid "kB F"
-+msgstr ""
++msgstr "ko F"
+
+#: graphs.c:144 graphs.c:153 graphs.c:155 graphs.c:474 graphs.c:482
+#: graphs.c:484 output.c:716 output.c:807 output.c:939 output.c:1039
+#: output.c:1146 output.c:1268 output.c:1903 output.c:1998 output.c:2227
+#: output.c:2301 output.c:2345 output.c:2466 output.c:2625
+msgid "kB In"
-+msgstr ""
++msgstr "ko E"
+
+#: graphs.c:145 graphs.c:159 graphs.c:161 graphs.c:488 graphs.c:490
+#: output.c:717 output.c:808 output.c:941 output.c:1039 output.c:1149
+#: output.c:1268 output.c:1905 output.c:1998 output.c:2229 output.c:2301
+#: output.c:2346 output.c:2466 output.c:2627
+msgid "kB Out"
-+msgstr ""
++msgstr "ko S"
+
+#: graphs.c:164 graphs.c:167 graphs.c:169 graphs.c:501 graphs.c:503
+#: output.c:547 output.c:713 output.c:943 output.c:1040 output.c:1374
@@ -19894,23 +19996,20 @@ Index: webalizer/po/fr.po
+msgstr "-h = print this help message"
+
+#: lang2.h:41
-+#, fuzzy
+msgid "-V = print version information"
-+msgstr "-v -V = print version information"
++msgstr "-V = print version information"
+
+#: lang2.h:42
-+#, fuzzy
+msgid "-v = be verbose"
-+msgstr "-f = fold sequence errors"
++msgstr "-v = be verbose"
+
+#: lang2.h:43
+msgid "-d = print additional debug info"
+msgstr "-d = print additional debug info"
+
+#: lang2.h:44
-+#, fuzzy
+msgid "-F type = Log type. type= (clf | ftp | squid | w3c)"
-+msgstr "-F type = Log type. type= (clf | ftp | squid)"
++msgstr "-F type = Log type. type= (clf | ftp | squid | w3c)"
+
+#: lang2.h:45
+msgid "-f = Fold sequence errors"
@@ -19925,40 +20024,39 @@ Index: webalizer/po/fr.po
+msgstr "-p = preserve state (incremental)"
+
+#: lang2.h:48
-+#, fuzzy
+msgid "-b = ignore state (incremental)"
-+msgstr "-p = preserve state (incremental)"
++msgstr "-b = ignore state (incremental)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
-+msgstr "-q = supress informational messages"
++msgid "-q = suppress informational messages"
++msgstr "-q = suppress informational messages"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
-+msgstr "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
++msgstr "-Q = suppress _ALL_ messages"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
-+msgstr "-Y = supress country graph"
++msgid "-Y = suppress country graph"
++msgstr "-Y = suppress country graph"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
-+msgstr "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
++msgstr "-G = suppress hourly graph"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
-+msgstr "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
++msgstr "-H = suppress hourly stats"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
-+msgstr "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
++msgstr "-L = suppress color coded graph legends"
+
+#: lang2.h:55
+msgid "-l num = use num background lines on graph"
+msgstr "-l num = use num background lines on graph"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
+msgstr "-m num = Visit timeout value (seconds)"
+
+#: lang2.h:57
@@ -20002,9 +20100,8 @@ Index: webalizer/po/fr.po
+msgstr "-x name = use filename extension 'name'"
+
+#: lang2.h:67
-+#, fuzzy
+msgid "-O name = Omit page 'name'"
-+msgstr "-s name = hide site 'name'"
++msgstr "-O name = Omit page 'name'"
+
+#: lang2.h:68
+msgid "-P name = Page type extension 'name'"
@@ -20016,12 +20113,11 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:70
+msgid "-K num = num months in summary table"
-+msgstr ""
++msgstr "-K num = num months in summary table"
+
+#: lang2.h:71
-+#, fuzzy
+msgid "-k num = num months in summary graph"
-+msgstr "-l num = use num background lines on graph"
++msgstr "-k num = num months in summary graph"
+
+#: lang2.h:72
+msgid "-A num = Display num top agents"
@@ -20061,33 +20157,31 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:81
+msgid "-z dir = Use country flags in 'dir'"
-+msgstr ""
++msgstr "-z dir = Use country flags in 'dir'"
+
+#: lang2.h:83
+msgid "-D name = Use DNS Cache file 'name'"
-+msgstr "-D name = Use DNS Cache file 'name'"
++msgstr ""
+
+#: lang2.h:84
+msgid "-N num = Number of DNS processes (0=disable)"
-+msgstr "-N num = Number of DNS processes (0=disable)"
++msgstr ""
+
+#: lang2.h:85
+msgid "-j = Enable native GeoDB lookups"
+msgstr ""
+
+#: lang2.h:86
-+#, fuzzy
+msgid "-J name = Use GeoDB database 'name'"
-+msgstr "-D name = Use DNS Cache file 'name'"
++msgstr ""
+
+#: lang2.h:89
+msgid "-w = Enable GeoIP lookups"
+msgstr ""
+
+#: lang2.h:90
-+#, fuzzy
+msgid "-W name = Use GeoIP database 'name'"
-+msgstr "-I name = Index alias 'name'"
++msgstr ""
+
+#: lang2.h:95
+msgid "Feb"
@@ -20111,7 +20205,7 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:96
+msgid "short|May"
-+msgstr ""
++msgstr "Mai"
+
+#: lang2.h:97
+msgid "Aug"
@@ -20158,9 +20252,8 @@ Index: webalizer/po/fr.po
+msgstr "Juin"
+
+#: lang2.h:102
-+#, fuzzy
+msgid "long|May"
-+msgstr "Tonga"
++msgstr "Mai"
+
+#: lang2.h:103
+msgid "August"
@@ -20355,17 +20448,14 @@ Index: webalizer/po/fr.po
+msgstr "Non-resolu/Inconnu"
+
+#: lang2.h:156
-+#, fuzzy
+msgid "Commercial (com)"
-+msgstr "US Commercial (.com)"
++msgstr "Commercial (.com)"
+
+#: lang2.h:157
-+#, fuzzy
+msgid "Educational (edu)"
-+msgstr "US Enseignement (.edu)"
++msgstr "Enseignement (.edu)"
+
+#: lang2.h:158
-+#, fuzzy
+msgid "US Government (gov)"
+msgstr "US Gouvernement (.gov)"
+
@@ -20374,67 +20464,64 @@ Index: webalizer/po/fr.po
+msgstr "International (int)"
+
+#: lang2.h:160
-+#, fuzzy
+msgid "US Military (mil)"
+msgstr "US Militaire (.mil)"
+
+#: lang2.h:161
-+#, fuzzy
+msgid "Network (net)"
+msgstr "Network (.net)"
+
+#: lang2.h:162
-+#, fuzzy
+msgid "Non-Profit (org)"
-+msgstr "Organisations Non-commerciales (.org)"
++msgstr "Non-commerciales (.org)"
+
+#: lang2.h:163
+msgid "Generic Business (biz)"
-+msgstr ""
++msgstr "Affaires (biz)"
+
+#: lang2.h:164
+msgid "Catalan Community (cat)"
-+msgstr ""
++msgstr "Langue et culture catalane (cat)"
+
+#: lang2.h:165
+msgid "Professional (pro)"
-+msgstr ""
++msgstr "Professionels (pro)"
+
+#: lang2.h:166
+msgid "Ind. Contact Data (tel)"
-+msgstr ""
++msgstr "Services de communications (tel)"
+
+#: lang2.h:167
+msgid "Air Transport Industry (aero)"
-+msgstr ""
++msgstr "Industrie du transport aérien (aero)"
+
+#: lang2.h:168
+msgid "Asia Pacific Community (asia)"
-+msgstr ""
++msgstr "Région Asie-Pacifique (asia)"
+
+#: lang2.h:169
+msgid "Cooperative Association (coop)"
-+msgstr ""
++msgstr "Coopératives (coop)"
+
+#: lang2.h:170
+msgid "Generic TLD (info)"
-+msgstr ""
++msgstr "Information (info)"
+
+#: lang2.h:171
+msgid "Human Resources (jobs)"
-+msgstr ""
++msgstr "Embauche (jobs)"
+
+#: lang2.h:172
+msgid "Generic Mobile TLD (mobi)"
-+msgstr ""
++msgstr "Appareils mobiles (mobi)"
+
+#: lang2.h:173
+msgid "Individual (name)"
-+msgstr ""
++msgstr "Individu (name)"
+
+#: lang2.h:174
+msgid "Address Routing (arpa)"
-+msgstr ""
++msgstr "Anciennement Arpanet (arpa)"
+
+#: lang2.h:175
+msgid "Nato field (nato)"
@@ -20442,15 +20529,15 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:176
+msgid "Museums (museum)"
-+msgstr ""
++msgstr "Musées (museum)"
+
+#: lang2.h:177
+msgid "Travel Ind. (travel)"
-+msgstr ""
++msgstr "Voyage et tourisme (travel)"
+
+#: lang2.h:178
+msgid "Ascension Island"
-+msgstr ""
++msgstr "Ile Ascension"
+
+#: lang2.h:179
+msgid "Andorra"
@@ -20513,9 +20600,8 @@ Index: webalizer/po/fr.po
+msgstr "Aruba"
+
+#: lang2.h:194
-+#, fuzzy
+msgid "Aland Islands"
-+msgstr "Iles Caimans"
++msgstr "Åland"
+
+#: lang2.h:195
+msgid "Azerbaijan"
@@ -20559,7 +20645,7 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:205
+msgid "Saint Barthelemy"
-+msgstr ""
++msgstr "Saint-Barthélemy"
+
+#: lang2.h:206
+msgid "Bermuda"
@@ -20610,9 +20696,8 @@ Index: webalizer/po/fr.po
+msgstr "Iles Cocos (Keeling)"
+
+#: lang2.h:218
-+#, fuzzy
+msgid "Congo, Democratic Republic"
-+msgstr "Republique Centrafricaine"
++msgstr "Rep. Democr. Congo (Kinshasa)"
+
+#: lang2.h:219
+msgid "Central African Republic"
@@ -20728,7 +20813,7 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:247
+msgid "European Union"
-+msgstr ""
++msgstr "Union européenne"
+
+#: lang2.h:248
+msgid "Finland"
@@ -20748,7 +20833,7 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:252
+msgid "Faroe Islands"
-+msgstr "Iles Feroes"
++msgstr "Îles Féroé"
+
+#: lang2.h:253
+msgid "France"
@@ -20776,7 +20861,7 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:259
+msgid "Guernsey"
-+msgstr ""
++msgstr "Guernsey"
+
+#: lang2.h:260
+msgid "Ghana"
@@ -20824,7 +20909,7 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:271
+msgid "Guinea-Bissau"
-+msgstr "Guinee-Bissau"
++msgstr "Guinée-Bissau"
+
+#: lang2.h:272
+msgid "Guyana"
@@ -20844,11 +20929,11 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:276
+msgid "Croatia"
-+msgstr ""
++msgstr "Croatie"
+
+#: lang2.h:277
+msgid "Haiti"
-+msgstr "Haiti"
++msgstr "Haïti"
+
+#: lang2.h:278
+msgid "Hungary"
@@ -20856,7 +20941,7 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:279
+msgid "Indonesia"
-+msgstr "Indonesie"
++msgstr "Indonésie"
+
+#: lang2.h:280
+msgid "Ireland"
@@ -20868,7 +20953,7 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:282
+msgid "Isle of Man"
-+msgstr ""
++msgstr "Ile de Man"
+
+#: lang2.h:283
+msgid "India"
@@ -20896,7 +20981,7 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:289
+msgid "Jersey"
-+msgstr ""
++msgstr "Jersey"
+
+#: lang2.h:290
+msgid "Jamaica"
@@ -20936,12 +21021,11 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:299
+msgid "Korea, Democratic Republic of"
-+msgstr ""
++msgstr "Corée (Nord)"
+
+#: lang2.h:300
-+#, fuzzy
+msgid "Korea, Republic of"
-+msgstr "Slovaquie"
++msgstr "Corée (Sud)"
+
+#: lang2.h:301
+msgid "Kuwait"
@@ -21012,13 +21096,12 @@ Index: webalizer/po/fr.po
+msgstr "Moldavie"
+
+#: lang2.h:318
-+#, fuzzy
+msgid "Montenegro"
-+msgstr "Montserrat"
++msgstr "Monténégro"
+
+#: lang2.h:319
+msgid "Saint Martin (French part)"
-+msgstr ""
++msgstr "Saint-Martin (Antilles françaises)"
+
+#: lang2.h:320
+msgid "Madagascar"
@@ -21030,7 +21113,7 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:322
+msgid "Macedonia"
-+msgstr "Macedoine"
++msgstr "Macédoine"
+
+#: lang2.h:323
+msgid "Mali"
@@ -21098,7 +21181,7 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:339
+msgid "New Caledonia"
-+msgstr "Nouvelle Caledonie"
++msgstr "Nouvelle Calédonie"
+
+#: lang2.h:340
+msgid "Niger"
@@ -21122,11 +21205,11 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:345
+msgid "Norway"
-+msgstr "Norvege"
++msgstr "Norvège"
+
+#: lang2.h:346
+msgid "Nepal"
-+msgstr "Nepal"
++msgstr "Népal"
+
+#: lang2.h:347
+msgid "Nauru"
@@ -21137,9 +21220,8 @@ Index: webalizer/po/fr.po
+msgstr "Nioue"
+
+#: lang2.h:349
-+#, fuzzy
+msgid "New Zealand"
-+msgstr "Nouvelle Zelande (Aotearoa)"
++msgstr "Nouvelle Zélande"
+
+#: lang2.h:350
+msgid "Oman"
@@ -21151,15 +21233,15 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:352
+msgid "Peru"
-+msgstr "Perou"
++msgstr "Pérou"
+
+#: lang2.h:353
+msgid "French Polynesia"
-+msgstr "Polynesie Francaise"
++msgstr "Polynésie Française"
+
+#: lang2.h:354
+msgid "Papua New Guinea"
-+msgstr "Papouasie Nouvelle Guinee"
++msgstr "Papouasie Nouvelle Guinée"
+
+#: lang2.h:355
+msgid "Philippines"
@@ -21187,7 +21269,7 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:361
+msgid "Palestinian Territory, Occupied"
-+msgstr ""
++msgstr "Territoires palestiniens occupés"
+
+#: lang2.h:362
+msgid "Portugal"
@@ -21207,7 +21289,7 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:366
+msgid "Reunion"
-+msgstr "Reunion"
++msgstr "Réunion"
+
+#: lang2.h:367
+msgid "Romania"
@@ -21215,7 +21297,7 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:368
+msgid "Serbia"
-+msgstr ""
++msgstr "Serbie"
+
+#: lang2.h:369
+msgid "Russian Federation"
@@ -21243,7 +21325,7 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:375
+msgid "Sweden"
-+msgstr "Suede"
++msgstr "Suède"
+
+#: lang2.h:376
+msgid "Singapore"
@@ -21251,20 +21333,19 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:377
+msgid "St. Helena"
-+msgstr "Sainte Helene"
++msgstr "Sainte Hélène"
+
+#: lang2.h:378
+msgid "Slovenia"
-+msgstr "Slovenie"
++msgstr "Slovénie"
+
+#: lang2.h:379
+msgid "Svalbard and Jan Mayen Islands"
+msgstr "Iles Svalbard et Jan Mayen"
+
+#: lang2.h:380
-+#, fuzzy
+msgid "Slovakia"
-+msgstr "Slovenie"
++msgstr "Slovaquie"
+
+#: lang2.h:381
+msgid "Sierra Leone"
@@ -21276,7 +21357,7 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:383
+msgid "Senegal"
-+msgstr "Senegal"
++msgstr "Sénégal"
+
+#: lang2.h:384
+msgid "Somalia"
@@ -21292,16 +21373,15 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:387
+msgid "Soviet Union"
-+msgstr ""
++msgstr "URSS (ancien)"
+
+#: lang2.h:388
+msgid "El Salvador"
+msgstr "Salvador"
+
+#: lang2.h:389
-+#, fuzzy
+msgid "Syrian Arab Republic"
-+msgstr "Republique Centrafricaine"
++msgstr "Syrie"
+
+#: lang2.h:390
+msgid "Swaziland"
@@ -21337,7 +21417,7 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:398
+msgid "Timor-Leste"
-+msgstr ""
++msgstr "Timor-Leste"
+
+#: lang2.h:399
+msgid "Turkmenistan"
@@ -21353,7 +21433,7 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:402
+msgid "Portuguese Timor"
-+msgstr ""
++msgstr "Timor Oriental"
+
+#: lang2.h:403
+msgid "Turkey"
@@ -21361,7 +21441,7 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:404
+msgid "Trinidad and Tobago"
-+msgstr "Trinite et Tobago"
++msgstr "Trinité et Tobago"
+
+#: lang2.h:405
+msgid "Tuvalu"
@@ -21389,11 +21469,11 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:411
+msgid "US Minor Outlying Islands"
-+msgstr "US Minor Outlying Islands"
++msgstr "Îles mineures éloignées des États-Unis"
+
+#: lang2.h:412
+msgid "United States"
-+msgstr "Etats Unis"
++msgstr "États-Unis"
+
+#: lang2.h:413
+msgid "Uruguay"
@@ -21405,7 +21485,7 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:415
+msgid "Vatican City State (Holy See)"
-+msgstr "Cite du Vatican"
++msgstr "Cité du Vatican"
+
+#: lang2.h:416
+msgid "Saint Vincent and the Grenadines"
@@ -21424,7 +21504,6 @@ Index: webalizer/po/fr.po
+msgstr "Iles Vierges Americaines"
+
+#: lang2.h:420
-+#, fuzzy
+msgid "Vietnam"
+msgstr "Vietnam"
+
@@ -21466,23 +21545,23 @@ Index: webalizer/po/fr.po
+
+#: lang2.h:430
+msgid "Anonymous Proxy"
-+msgstr ""
++msgstr "Anonymous Proxy"
+
+#: lang2.h:431
+msgid "Satellite Provider"
-+msgstr ""
++msgstr "Satellite Provider"
+
+#: lang2.h:433
+msgid "Asia/Pacific Region"
-+msgstr ""
++msgstr "Asia/Pacific Region"
+
+#: lang2.h:434
+msgid "Local Network (lan)"
-+msgstr ""
++msgstr "Réseau local (lan)"
+
+#: output.c:190
+msgid "en"
-+msgstr ""
++msgstr "fr"
+
+#: output.c:192 output.c:218 output.c:2604
+msgid "Summary by Month"
@@ -21590,19 +21669,16 @@ Index: webalizer/po/fr.po
+msgstr "Total"
+
+#: output.c:551
-+#, fuzzy
+msgid "Total kB Files"
-+msgstr "Total des Fichiers"
++msgstr "Total des ko Fichiers"
+
+#: output.c:554
-+#, fuzzy
+msgid "Total kB In"
-+msgstr "Total"
++msgstr "Total des ko Entrée"
+
+#: output.c:557
-+#, fuzzy
+msgid "Total kB Out"
-+msgstr "Total des Ko"
++msgstr "Total des ko Sorti"
+
+#: output.c:564
+msgid "Total Unique Sites"
@@ -21650,28 +21726,24 @@ Index: webalizer/po/fr.po
+msgstr "Pages par Jour"
+
+#: output.c:628
-+#, fuzzy
+msgid "Sites per Day"
-+msgstr "Hits par Jour"
++msgstr "Sites par Jour"
+
+#: output.c:634
+msgid "Visits per Day"
+msgstr "Visites par Jour"
+
+#: output.c:640
-+#, fuzzy
+msgid "kB Files per Day"
-+msgstr "Fichiers par Jour"
++msgstr "ko Fichiers par Jour"
+
+#: output.c:646
-+#, fuzzy
+msgid "kB In per Day"
-+msgstr "KOctets par Jour"
++msgstr "ko Entrée par Jour"
+
+#: output.c:652
-+#, fuzzy
+msgid "kB Out per Day"
-+msgstr "KOctets par Jour"
++msgstr "ko Sorti par Jour"
+
+#: output.c:658
+msgid "Hits by Response Code"
@@ -21798,14 +21870,12 @@ Index: webalizer/po/fr.po
+msgstr ""
+
+#: output.c:2199
-+#, fuzzy
+msgid "Usage by Country for"
+msgstr "Acces par pays pour"
+
+#: output.c:2216
-+#, fuzzy
+msgid "Total Countries"
-+msgstr "Pays"
++msgstr "pays"
+
+#: output.c:2231
+msgid "Country"
@@ -21820,9 +21890,9 @@ Index: webalizer/po/fr.po
+msgstr "Resume des acces pour"
+
+#: output.c:2584
-+#, fuzzy, c-format
++#, c-format
+msgid "Error: Failed to create .htaccess file: %s\n"
-+msgstr "Error: Unable to write history file"
++msgstr ""
+
+#: output.c:2607
+msgid "Month"
@@ -21889,7 +21959,6 @@ Index: webalizer/po/fr.po
+msgstr "Previous run data not found..."
+
+#: preserve.c:572
-+#, fuzzy
+msgid "Reading previous run data.."
+msgstr "Reading previous run data..."
+
@@ -21931,7 +22000,7 @@ Index: webalizer/po/fr.po
+
+#: webalizer.c:497
+msgid "DNS support not present, aborting..."
-+msgstr ""
++msgstr "DNS support not present, aborting..."
+
+#: webalizer.c:514 webalizer.c:531 webalizer.c:542
+msgid "Error: Can't open log file"
@@ -21958,21 +22027,20 @@ Index: webalizer/po/fr.po
+msgstr "Using DNS cache file"
+
+#: webalizer.c:621
-+#, fuzzy
+msgid "Error opening file"
-+msgstr "Error: Can't open log file"
++msgstr "Error opening file"
+
+#: webalizer.c:622 webalizer.c:652
+msgid "default"
-+msgstr ""
++msgstr "default"
+
+#: webalizer.c:623 webalizer.c:647
+msgid "lookups disabled"
-+msgstr ""
++msgstr "lookups disabled"
+
+#: webalizer.c:627 webalizer.c:650
+msgid "Using"
-+msgstr ""
++msgstr "Using"
+
+#: webalizer.c:658
+msgid "Creating output in"
@@ -21999,7 +22067,6 @@ Index: webalizer/po/fr.po
+msgstr "Can't allocate enough memory, Top Countries disabled!"
+
+#: webalizer.c:706
-+#, fuzzy
+msgid "Error: Skipping oversized log record"
+msgstr "Error: Skipping oversized log record"
+
@@ -22060,71 +22127,11 @@ Index: webalizer/po/fr.po
+#, c-format
+msgid "Default config dir: %s\n"
+msgstr ""
-+
-+#~ msgid "Old style Arpanet (arpa)"
-+#~ msgstr "Ancien style Arpanet (arpa)"
-+
-+#~ msgid "Czechoslovakia (former)"
-+#~ msgstr "Tchecoslovaquie (ancien)"
-+
-+#, fuzzy
-+#~ msgid "France, Metropolitan"
-+#~ msgstr "France Metropolitaine"
-+
-+#~ msgid "Croatia (Hrvatska)"
-+#~ msgstr "Croatie (Hrvatska)"
-+
-+#~ msgid "Korea (North)"
-+#~ msgstr "Coree (Nord)"
-+
-+#~ msgid "Korea (South)"
-+#~ msgstr "Coree (Sud)"
-+
-+#~ msgid "Neutral Zone"
-+#~ msgstr "Zone Neutre"
-+
-+#~ msgid "USSR (former)"
-+#~ msgstr "URSS (ancien)"
-+
-+#~ msgid "Syria"
-+#~ msgstr "Syrie"
-+
-+#~ msgid "East Timor"
-+#~ msgstr "Timor Oriental"
-+
-+#~ msgid "Zaire"
-+#~ msgstr "Zaire"
-+
-+#, fuzzy
-+#~ msgid "Locations"
-+#~ msgstr "Laos"
-+
-+#, fuzzy
-+#~ msgid "Total Locations"
-+#~ msgstr "pays"
-+
-+#~ msgid "Last 12 Months"
-+#~ msgstr "12 derniers mois"
-+
-+#, fuzzy
-+#~ msgid "Can't allocate enough memory, Top Locations disabled!"
-+#~ msgstr "Can't allocate enough memory, Top URLs disabled!"
-+
-+#~ msgid "English"
-+#~ msgstr "French"
-+
-+#~ msgid "KBytes"
-+#~ msgstr "Ko"
-+
-+#~ msgid "May"
-+#~ msgstr "Mai"
-+
-+#~ msgid "Warning: Possible duplicate data found"
-+#~ msgstr "Warning: Possible duplicate data found"
-Index: webalizer/po/gl.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/gl.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/gl.po b/po/gl.po
+new file mode 100644
+index 0000000..5bd490d
+--- /dev/null
++++ b/po/gl.po
@@ -0,0 +1,2453 @@
+msgid ""
+msgstr ""
@@ -22386,27 +22393,27 @@ Index: webalizer/po/gl.po
+msgstr "-p = lembrar estado (incremental)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
++msgid "-q = suppress informational messages"
+msgstr "-q = suprimir mensaxes de informacion"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
+msgstr "-Q = suprimir T�DALAS mensaxes"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
++msgid "-Y = suppress country graph"
+msgstr "-Y = suprimir grafico de pa�ses"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
+msgstr "-G = suprimir gr�fico horario"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
+msgstr "-H = suprimir estat�sticas horarias"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
+msgstr "-L = suprimir lendas coloreadas dos gr�ficos"
+
+#: lang2.h:55
@@ -22414,7 +22421,7 @@ Index: webalizer/po/gl.po
+msgstr "-l num = usar num l��as de fondo nos gr�ficos"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
+msgstr "-m num = especificar temporizador de visitas (seconds)"
+
+#: lang2.h:57
@@ -24579,10 +24586,11 @@ Index: webalizer/po/gl.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "Aviso: Posibles datos duplicados atopados"
-Index: webalizer/po/hr.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/hr.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/hr.po b/po/hr.po
+new file mode 100644
+index 0000000..0ca4355
+--- /dev/null
++++ b/po/hr.po
@@ -0,0 +1,2451 @@
+msgid ""
+msgstr ""
@@ -24844,36 +24852,36 @@ Index: webalizer/po/hr.po
+msgstr "-p = preserve state (incremental)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
-+msgstr "-q = supress informational messages"
++msgid "-q = suppress informational messages"
++msgstr "-q = suppress informational messages"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
-+msgstr "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
++msgstr "-Q = suppress _ALL_ messages"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
-+msgstr "-Y = supress country graph"
++msgid "-Y = suppress country graph"
++msgstr "-Y = suppress country graph"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
-+msgstr "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
++msgstr "-G = suppress hourly graph"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
-+msgstr "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
++msgstr "-H = suppress hourly stats"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
-+msgstr "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
++msgstr "-L = suppress color coded graph legends"
+
+#: lang2.h:55
+msgid "-l num = use num background lines on graph"
+msgstr "-l num = use num background lines on graph"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
-+msgstr "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
++msgstr "-m num = Visit timeout value (seconds)"
+
+#: lang2.h:57
+msgid "-T = print timing information"
@@ -27035,10 +27043,11 @@ Index: webalizer/po/hr.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "Warning: Possible duplicate data found"
-Index: webalizer/po/hu.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/hu.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/hu.po b/po/hu.po
+new file mode 100644
+index 0000000..c84bcfe
+--- /dev/null
++++ b/po/hu.po
@@ -0,0 +1,2452 @@
+msgid ""
+msgstr ""
@@ -27300,36 +27309,36 @@ Index: webalizer/po/hu.po
+msgstr "-p = Meg�rzi az �llapotott (incremental)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
-+msgstr "-q = supress informational messages"
++msgid "-q = suppress informational messages"
++msgstr "-q = suppress informational messages"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
-+msgstr "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
++msgstr "-Q = suppress _ALL_ messages"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
-+msgstr "-Y = supress country graph"
++msgid "-Y = suppress country graph"
++msgstr "-Y = suppress country graph"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
-+msgstr "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
++msgstr "-G = suppress hourly graph"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
-+msgstr "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
++msgstr "-H = suppress hourly stats"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
-+msgstr "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
++msgstr "-L = suppress color coded graph legends"
+
+#: lang2.h:55
+msgid "-l num = use num background lines on graph"
+msgstr "-l num = use num background lines on graph"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
-+msgstr "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
++msgstr "-m num = Visit timeout value (seconds)"
+
+#: lang2.h:57
+msgid "-T = print timing information"
@@ -29492,10 +29501,11 @@ Index: webalizer/po/hu.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "Figyelmeztet�s: Lehets�ges ism�telt adatot tal�ltam"
-Index: webalizer/po/id.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/id.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/id.po b/po/id.po
+new file mode 100644
+index 0000000..f8378b7
+--- /dev/null
++++ b/po/id.po
@@ -0,0 +1,2465 @@
+msgid ""
+msgstr ""
@@ -29757,27 +29767,27 @@ Index: webalizer/po/id.po
+msgstr "-p = menjaga pernyataan (penambahan)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
++msgid "-q = suppress informational messages"
+msgstr "-q = mengeluarkan pesan informasional"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
+msgstr "-Q = mengeluarkan _SEMUA_ pesan"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
++msgid "-Y = suppress country graph"
+msgstr "-Y = mengeluarkan grafik negara"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
+msgstr "-G = mengeluarkan grafik per jam"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
+msgstr "-H = mengeluarkan statistik per jam"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
+msgstr "-L = mengeluarkan legenda grafik terkode yang berwarna"
+
+#: lang2.h:55
@@ -29785,7 +29795,7 @@ Index: webalizer/po/id.po
+msgstr "-l num = memakai num garis background di atas grafik"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
+msgstr "-m num = Harga timeout kunjungan (seconds)"
+
+#: lang2.h:57
@@ -31962,10 +31972,11 @@ Index: webalizer/po/id.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "Peringatan: Kemungkinan ditemukan data yang terduplikasi"
-Index: webalizer/po/is.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/is.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/is.po b/po/is.po
+new file mode 100644
+index 0000000..bb7df2f
+--- /dev/null
++++ b/po/is.po
@@ -0,0 +1,2451 @@
+msgid ""
+msgstr ""
@@ -32227,36 +32238,36 @@ Index: webalizer/po/is.po
+msgstr "-p = preserve state (incremental)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
-+msgstr "-q = supress informational messages"
++msgid "-q = suppress informational messages"
++msgstr "-q = suppress informational messages"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
-+msgstr "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
++msgstr "-Q = suppress _ALL_ messages"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
-+msgstr "-Y = supress country graph"
++msgid "-Y = suppress country graph"
++msgstr "-Y = suppress country graph"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
-+msgstr "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
++msgstr "-G = suppress hourly graph"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
-+msgstr "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
++msgstr "-H = suppress hourly stats"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
-+msgstr "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
++msgstr "-L = suppress color coded graph legends"
+
+#: lang2.h:55
+msgid "-l num = use num background lines on graph"
+msgstr "-l num = use num background lines on graph"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
-+msgstr "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
++msgstr "-m num = Visit timeout value (seconds)"
+
+#: lang2.h:57
+msgid "-T = print timing information"
@@ -34418,10 +34429,11 @@ Index: webalizer/po/is.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "A�v�run: M�guleiki � tv�skr��um g�gnum"
-Index: webalizer/po/it.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/it.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/it.po b/po/it.po
+new file mode 100644
+index 0000000..5454900
+--- /dev/null
++++ b/po/it.po
@@ -0,0 +1,2471 @@
+msgid ""
+msgstr ""
@@ -34684,27 +34696,27 @@ Index: webalizer/po/it.po
+msgstr "-p = conserva le statistiche (modalita' incrementale)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
++msgid "-q = suppress informational messages"
+msgstr "-q = non visualizza i messaggi informativi"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
+msgstr "-Q = non visualizza alcun messaggio"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
++msgid "-Y = suppress country graph"
+msgstr "-Y = non visualizza il grafico relativo ai paesi"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
+msgstr "-G = non visualizza il grafico orario"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
+msgstr "-H = non visualizza le statistiche orarie"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
+msgstr "-L = non visualizza le legende policromatiche nei grafici"
+
+#: lang2.h:55
@@ -34712,7 +34724,7 @@ Index: webalizer/po/it.po
+msgstr "-l num = utilizza num linee nello sfondo dei grafici"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
+msgstr "-m num = valore di timeout per gli accessi (seconds)"
+
+#: lang2.h:57
@@ -36894,10 +36906,11 @@ Index: webalizer/po/it.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "Attenzione: Possibile individuazione di dati duplicati"
-Index: webalizer/po/ja.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/ja.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/ja.po b/po/ja.po
+new file mode 100644
+index 0000000..e8aafc4
+--- /dev/null
++++ b/po/ja.po
@@ -0,0 +1,2451 @@
+msgid ""
+msgstr ""
@@ -37159,27 +37172,27 @@ Index: webalizer/po/ja.po
+msgstr "-p = ���֤���¸���� (�ɲå⡼��)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
++msgid "-q = suppress informational messages"
+msgstr "-q = �в��å�������ɽ�����ʤ�"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
+msgstr "-Q = *���Ƥ�* ��å�������ɽ�����ʤ�"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
++msgid "-Y = suppress country graph"
+msgstr "-Y = ���̥���դ�ɽ�����ʤ�"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
+msgstr "-G = �����̥���դ�ɽ�����ʤ�"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
+msgstr "-H = ���������פ�ɽ�����ʤ�"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
+msgstr "-L = ���Ĥ��Υ���ե�٥��Ȥ�ʤ�"
+
+#: lang2.h:55
@@ -37187,7 +37200,7 @@ Index: webalizer/po/ja.po
+msgstr "-l num = ����դη����� num �ܤˤ���"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
+msgstr "-m num = ˬ�䥿���ॢ������ (��)"
+
+#: lang2.h:57
@@ -39350,10 +39363,11 @@ Index: webalizer/po/ja.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "�ٹ�: ��ʣ����ǡ��������Ĥ���ޤ���"
-Index: webalizer/po/ko.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/ko.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/ko.po b/po/ko.po
+new file mode 100644
+index 0000000..13a7ef9
+--- /dev/null
++++ b/po/ko.po
@@ -0,0 +1,2451 @@
+msgid ""
+msgstr ""
@@ -39615,35 +39629,35 @@ Index: webalizer/po/ko.po
+msgstr "-p = ��� ���� ���� (incremental)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
++msgid "-q = suppress informational messages"
+msgstr "-q = �Ϲ� ���� ��� ����"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
+msgstr "-Q = ��� ���� ��� ����"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
-+msgstr "-Y = supress country graph"
++msgid "-Y = suppress country graph"
++msgstr "-Y = suppress country graph"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
+msgstr "-G = �Ϻ� ���� ����"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
+msgstr "-H = �� ��� ����"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
-+msgstr "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
++msgstr "-L = suppress color coded graph legends"
+
+#: lang2.h:55
+msgid "-l num = use num background lines on graph"
+msgstr "-l num = use num background lines on graph"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
+msgstr "-m num = Visit timeout value (seconds)"
+
+#: lang2.h:57
@@ -41806,10 +41820,11 @@ Index: webalizer/po/ko.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "����: �ߺ��� ������ ����"
-Index: webalizer/po/lv.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/lv.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/lv.po b/po/lv.po
+new file mode 100644
+index 0000000..b0fbc94
+--- /dev/null
++++ b/po/lv.po
@@ -0,0 +1,2451 @@
+msgid ""
+msgstr ""
@@ -42071,36 +42086,36 @@ Index: webalizer/po/lv.po
+msgstr "-p = preserve state (incremental)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
-+msgstr "-q = supress informational messages"
++msgid "-q = suppress informational messages"
++msgstr "-q = suppress informational messages"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
-+msgstr "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
++msgstr "-Q = suppress _ALL_ messages"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
-+msgstr "-Y = supress country graph"
++msgid "-Y = suppress country graph"
++msgstr "-Y = suppress country graph"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
-+msgstr "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
++msgstr "-G = suppress hourly graph"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
-+msgstr "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
++msgstr "-H = suppress hourly stats"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
-+msgstr "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
++msgstr "-L = suppress color coded graph legends"
+
+#: lang2.h:55
+msgid "-l num = use num background lines on graph"
+msgstr "-l num = use num background lines on graph"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
-+msgstr "-m num = Visit timout value (HHMMSS format)"
++msgid "-m num = Visit timeout value (seconds)"
++msgstr "-m num = Visit timeout value (HHMMSS format)"
+
+#: lang2.h:57
+msgid "-T = print timing information"
@@ -44262,10 +44277,11 @@ Index: webalizer/po/lv.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "Warning: Iesp�jams, ka dati atk�rtojas"
-Index: webalizer/po/ml.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/ml.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/ml.po b/po/ml.po
+new file mode 100644
+index 0000000..a46c070
+--- /dev/null
++++ b/po/ml.po
@@ -0,0 +1,2453 @@
+msgid ""
+msgstr ""
@@ -44527,27 +44543,27 @@ Index: webalizer/po/ml.po
+msgstr "-p = kekalkan keadaan (secara menaik)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
++msgid "-q = suppress informational messages"
+msgstr "-q = abaikan maklumat mesej"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
+msgstr "-Q = abaikan _SEMUA_ mesej"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
++msgid "-Y = suppress country graph"
+msgstr "-Y = abaikan graf negara"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
+msgstr "-G = abaikan graf ikut jam"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
+msgstr "-H = abaikan statistik ikut jam"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
+msgstr "-L = abaikan graf yang berdasarkan petunjuk warna"
+
+#: lang2.h:55
@@ -44555,7 +44571,7 @@ Index: webalizer/po/ml.po
+msgstr "-l num = gunakan sejumlah garisan latarbelakang pada graf"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
+msgstr "-m num = Nilai masa tamat untuk Lawatan (dalam saat)"
+
+#: lang2.h:57
@@ -46720,10 +46736,11 @@ Index: webalizer/po/ml.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "Amaran: Kemungkinan data yang sama dijumpai"
-Index: webalizer/po/nl.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/nl.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/nl.po b/po/nl.po
+new file mode 100644
+index 0000000..127e282
+--- /dev/null
++++ b/po/nl.po
@@ -0,0 +1,2452 @@
+msgid ""
+msgstr ""
@@ -46985,27 +47002,27 @@ Index: webalizer/po/nl.po
+msgstr "-p = Bewaar status (incremental)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
++msgid "-q = suppress informational messages"
+msgstr "-q = Geen informatieve info, wel foutmeldingen"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
+msgstr "-Q = Geen enkele info, ook geen foutmeldingen"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
++msgid "-Y = suppress country graph"
+msgstr "-Y = Geen land-grafieken"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
+msgstr "-G = Geen uur-grafieken"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
+msgstr "-H = Geen uur-statistieken"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
+msgstr "-L = Geen legenda"
+
+#: lang2.h:55
@@ -47013,7 +47030,7 @@ Index: webalizer/po/nl.po
+msgstr "-l num = Gebruik [num] achtergrondregels in grafiek"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
+msgstr "-m num = Bezoeker-onderbreking waarde (seconds)"
+
+#: lang2.h:57
@@ -49177,10 +49194,11 @@ Index: webalizer/po/nl.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "Waarschuwing: mogelijk dubbele gegevens gevonden"
-Index: webalizer/po/no.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/no.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/no.po b/po/no.po
+new file mode 100644
+index 0000000..d8904ea
+--- /dev/null
++++ b/po/no.po
@@ -0,0 +1,2451 @@
+msgid ""
+msgstr ""
@@ -49442,27 +49460,27 @@ Index: webalizer/po/no.po
+msgstr "-p = bevar tillstand (inkrementell)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
++msgid "-q = suppress informational messages"
+msgstr "-q = vis ikke informasjonsbeskjeder"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
+msgstr "-Q = vis ikke noe informasjon"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
++msgid "-Y = suppress country graph"
+msgstr "-Y = ikke opprettgraf for land"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
+msgstr "-G = ikke opprett graf for timmar"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
+msgstr "-H = ikke opprett statistikk for timmar"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
+msgstr "-L = ikke opprett fargekodet grafer"
+
+#: lang2.h:55
@@ -49470,7 +49488,7 @@ Index: webalizer/po/no.po
+msgstr "-l num = opprett 'num' referenslinjer for grafer"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
+msgstr "-m num = Verdi for timeout for bes�k (sekunder)"
+
+#: lang2.h:57
@@ -51633,10 +51651,11 @@ Index: webalizer/po/no.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "Advarsel: Mulige dobble oppf�ringer funnet"
-Index: webalizer/po/pl.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/pl.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/pl.po b/po/pl.po
+new file mode 100644
+index 0000000..cba6f72
+--- /dev/null
++++ b/po/pl.po
@@ -0,0 +1,2453 @@
+msgid ""
+msgstr ""
@@ -51898,27 +51917,27 @@ Index: webalizer/po/pl.po
+msgstr "-p = zachowuje stan (przyrostowy)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
++msgid "-q = suppress informational messages"
+msgstr "-q = wy��cza komunikaty informacyjne"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
+msgstr "-Q = wy��cza wszystkie komunikaty"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
++msgid "-Y = suppress country graph"
+msgstr "-Y = wy��cza wykres kraj�w"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
+msgstr "-G = wy��cza wykres godzinny"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
+msgstr "-H = wy��cza statystyk� godzinn�"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
+msgstr "-L = wy��cza kolorowe s�upki ledendy"
+
+#: lang2.h:55
@@ -51926,7 +51945,7 @@ Index: webalizer/po/pl.po
+msgstr "-l num = w��cza num linii w tle wykres�w"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
+msgstr "-m num = czas pojedynczej wizyty (seconds)"
+
+#: lang2.h:57
@@ -54091,10 +54110,11 @@ Index: webalizer/po/pl.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "Ostrze�enie: Prawdopodobnie znalaz�em zdublowane dane"
-Index: webalizer/po/pt.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/pt.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/pt.po b/po/pt.po
+new file mode 100644
+index 0000000..bdbf542
+--- /dev/null
++++ b/po/pt.po
@@ -0,0 +1,2450 @@
+msgid ""
+msgstr ""
@@ -54356,35 +54376,35 @@ Index: webalizer/po/pt.po
+msgstr "-p = preservar estado (incremental)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
++msgid "-q = suppress informational messages"
+msgstr "-q = suprimir mensagens de informacao"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
+msgstr "-Q = suprimir _TODAS_ as mensagens"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
-+msgstr "-Y = supress country graph"
++msgid "-Y = suppress country graph"
++msgstr "-Y = suppress country graph"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
+msgstr "-G = suprimir grafico por horas"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
+msgstr "-H = suprimir estatisticas por horas"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
-+msgstr "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
++msgstr "-L = suppress color coded graph legends"
+
+#: lang2.h:55
+msgid "-l num = use num background lines on graph"
+msgstr "-l num = use num background lines on graph"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
+msgstr "-m num = Visit timeout value (seconds)"
+
+#: lang2.h:57
@@ -56546,10 +56566,11 @@ Index: webalizer/po/pt.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "Aviso: Encontrados dados possivelmente duplicados"
-Index: webalizer/po/ro.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/ro.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/ro.po b/po/ro.po
+new file mode 100644
+index 0000000..005210d
+--- /dev/null
++++ b/po/ro.po
@@ -0,0 +1,2452 @@
+msgid ""
+msgstr ""
@@ -56811,27 +56832,27 @@ Index: webalizer/po/ro.po
+msgstr "-p = pastreaza starea (incremental)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
++msgid "-q = suppress informational messages"
+msgstr "-q = elimina mesajele de informare"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
+msgstr "-Q = elimina _TOATE_ mesajele"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
++msgid "-Y = suppress country graph"
+msgstr "-Y = elimina graficul tarilor"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
+msgstr "-G = elimina graficul orelor"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
+msgstr "-H = elimina starea pe ore"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
+msgstr "-L = elimina legenda graficelor color"
+
+#: lang2.h:55
@@ -56839,7 +56860,7 @@ Index: webalizer/po/ro.po
+msgstr "-l num = foloseste linii numerotate pe fundalul graficelor"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
+msgstr "-m num = valoarea timeout-ului pentru vizite (secunde)"
+
+#: lang2.h:57
@@ -59003,10 +59024,11 @@ Index: webalizer/po/ro.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "Avertisment: S-ar putea sa fi gasit date duplicate"
-Index: webalizer/po/ru.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/ru.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/ru.po b/po/ru.po
+new file mode 100644
+index 0000000..a4095d8
+--- /dev/null
++++ b/po/ru.po
@@ -0,0 +1,2457 @@
+msgid ""
+msgstr ""
@@ -59268,27 +59290,27 @@ Index: webalizer/po/ru.po
+msgstr "-p = ��������� ���������� � ��������� (���������������)"
+
+#: lang2.h:49
-+msgid "-q = supress informational messages"
++msgid "-q = suppress informational messages"
+msgstr "-q = �� �������� �������������� ���������"
+
+#: lang2.h:50
-+msgid "-Q = supress _ALL_ messages"
++msgid "-Q = suppress _ALL_ messages"
+msgstr "-Q = �� �������� _�������_ ���������"
+
+#: lang2.h:51
-+msgid "-Y = supress country graph"
++msgid "-Y = suppress country graph"
+msgstr "-Y = �� �������� ������ �� �������"
+
+#: lang2.h:52
-+msgid "-G = supress hourly graph"
++msgid "-G = suppress hourly graph"
+msgstr "-G = �� �������� ��������� ������"
+
+#: lang2.h:53
-+msgid "-H = supress hourly stats"
++msgid "-H = suppress hourly stats"
+msgstr "-H = �� �������� ��������� ����������"
+
+#: lang2.h:54
-+msgid "-L = supress color coded graph legends"
++msgid "-L = suppress color coded graph legends"
+msgstr "-L = �� �������� �������� ������ � ��������"
+
+#: lang2.h:55
@@ -59296,7 +59318,7 @@ Index: webalizer/po/ru.po
+msgstr "-l ����� = ������ ���� � '�����' �����"
+
+#: lang2.h:56
-+msgid "-m num = Visit timout value (seconds)"
++msgid "-m num = Visit timeout value (seconds)"
+msgstr "-m ����� = �������� ��� ����������� '���������' (seconds)"
+
+#: lang2.h:57
@@ -61465,10 +61487,11 @@ Index: webalizer/po/ru.po
+
+#~ msgid "Warning: Possible duplicate data found"
+#~ msgstr "��������������: ���������� ��������� ������������ ������"
-Index: webalizer/po/sl.po
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ webalizer/po/sl.po 2010-11-24 16:39:12.000000000 +0100
+diff --git a/po/sl.po b/po/sl.po
+new file mode 100644
+index 0000000..c63d75c
+--- /dev/null
++++ b/po/sl.po
<Skipped 498 lines>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/webalizer.git/commitdiff/0f90fe80bf1f9081540e06ec425fda750177eb70
More information about the pld-cvs-commit
mailing list