Merge commit '04a01ed3a074b66'

Conflicts:
	CMakeLists.txt
	include/info.h
	po/bg.po
	po/ca.po
	po/cs.po
	po/de.po
	po/el.po
	po/es.po
	po/fr.po
	po/hu.po
	po/id.po
	po/it.po
	po/ja.po
	po/lv.po
	po/nl.po
	po/pl.po
	po/pt.po
	po/ro.po
	po/ru.po
	po/sk.po
	po/sr.po
	po/tr.po
	po/uk.po
	po/zh_CN.po
	topuser.c

diff --cc html.c
Simple merge

diff --cc po/bg.po
index 90e269e52b3f73c91b75f9f4b123ead8ffe464ef,7d57aa15296576b0feb4f3ee5877d57c69312412..b1c275668f24baab29519a3348afd49adad969ac
--- 1/po/bg.po
--- 2/po/bg.po
+++ b/po/bg.po
@@@ -40,9 -40,9 +40,9 @@@ msgid "sort command return status %d\n
  msgstr ""
  
  #: authfail.c:78 authfail.c:83 dansguardian_log.c:140 email.c:119 html.c:384
- #: lastlog.c:83 log.c:1656 realtime.c:83 siteuser.c:67 siteuser.c:73
+ #: lastlog.c:83 log.c:1657 realtime.c:83 siteuser.c:67 siteuser.c:73
  #: smartfilter.c:73 smartfilter.c:78 sort.c:100 sort.c:160
 -#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:176
 +#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:171
  #: topsites.c:181 topuser.c:155 useragent.c:140 useragent.c:145
  #: useragent.c:217 useragent.c:222 useragent.c:277 useragent.c:282
  #, c-format

diff --cc po/ca.po
index d0cf6572910e40a7162f3cecc0dab25e0a303002,aa1fcd6d07fb7eb75b397ce38cb8223e95f0f290..aa7a0951f9d0315ed3c7f68e191723dbd4c5a91a
--- 1/po/ca.po
--- 2/po/ca.po
+++ b/po/ca.po
@@@ -40,9 -40,9 +40,9 @@@ msgid "sort command return status %d\n
  msgstr ""
  
  #: authfail.c:78 authfail.c:83 dansguardian_log.c:140 email.c:119 html.c:384
- #: lastlog.c:83 log.c:1656 realtime.c:83 siteuser.c:67 siteuser.c:73
+ #: lastlog.c:83 log.c:1657 realtime.c:83 siteuser.c:67 siteuser.c:73
  #: smartfilter.c:73 smartfilter.c:78 sort.c:100 sort.c:160
 -#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:176
 +#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:171
  #: topsites.c:181 topuser.c:155 useragent.c:140 useragent.c:145
  #: useragent.c:217 useragent.c:222 useragent.c:277 useragent.c:282
  #, c-format

diff --cc po/cs.po
index 2077882b10826a2386e66b498bf60b44391bb69b,a2f8ea199348a37abed542db4f0cf944a3e4a53b..86103a55507b9ce9ced5f6b819a0dc2ddbcdb0cb
--- 1/po/cs.po
--- 2/po/cs.po
+++ b/po/cs.po
@@@ -40,9 -40,9 +40,9 @@@ msgid "sort command return status %d\n
  msgstr ""
  
  #: authfail.c:78 authfail.c:83 dansguardian_log.c:140 email.c:119 html.c:384
- #: lastlog.c:83 log.c:1656 realtime.c:83 siteuser.c:67 siteuser.c:73
+ #: lastlog.c:83 log.c:1657 realtime.c:83 siteuser.c:67 siteuser.c:73
  #: smartfilter.c:73 smartfilter.c:78 sort.c:100 sort.c:160
 -#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:176
 +#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:171
  #: topsites.c:181 topuser.c:155 useragent.c:140 useragent.c:145
  #: useragent.c:217 useragent.c:222 useragent.c:277 useragent.c:282
  #, c-format

diff --cc po/de.po
index 4c79fe7c04c5d608dfe47f159ec38a9a95afcaea,3afd0a11a5104d7825a0978006ded56dc1d24cf5..0ea197c5d4ccb0ae6df2b5868e33c73f1226ae1e
--- 1/po/de.po
--- 2/po/de.po
+++ b/po/de.po
@@@ -40,9 -40,9 +40,9 @@@ msgid "sort command return status %d\n
  msgstr ""
  
  #: authfail.c:78 authfail.c:83 dansguardian_log.c:140 email.c:119 html.c:384
- #: lastlog.c:83 log.c:1656 realtime.c:83 siteuser.c:67 siteuser.c:73
+ #: lastlog.c:83 log.c:1657 realtime.c:83 siteuser.c:67 siteuser.c:73
  #: smartfilter.c:73 smartfilter.c:78 sort.c:100 sort.c:160
 -#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:176
 +#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:171
  #: topsites.c:181 topuser.c:155 useragent.c:140 useragent.c:145
  #: useragent.c:217 useragent.c:222 useragent.c:277 useragent.c:282
  #, c-format

diff --cc po/el.po
index 5b3dc275262ca8476b6809427195583771afbd47,df32255a9717e515ab45e293800a091005d2ca45..5541be6af6fe7076e74460c7359e1a3ae57d0ddb
--- 1/po/el.po
--- 2/po/el.po
+++ b/po/el.po
@@@ -40,9 -40,9 +40,9 @@@ msgid "sort command return status %d\n
  msgstr ""
  
  #: authfail.c:78 authfail.c:83 dansguardian_log.c:140 email.c:119 html.c:384
- #: lastlog.c:83 log.c:1656 realtime.c:83 siteuser.c:67 siteuser.c:73
+ #: lastlog.c:83 log.c:1657 realtime.c:83 siteuser.c:67 siteuser.c:73
  #: smartfilter.c:73 smartfilter.c:78 sort.c:100 sort.c:160
 -#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:176
 +#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:171
  #: topsites.c:181 topuser.c:155 useragent.c:140 useragent.c:145
  #: useragent.c:217 useragent.c:222 useragent.c:277 useragent.c:282
  #, c-format

diff --cc po/es.po
index 4d18981064d9fcacdaf2a793d6c1dd4bcaddb239,50ccc1df48202e7622536a969493a0351d4fb0f6..91273730f140c170ab5d30802a5692efc322b56e
--- 1/po/es.po
--- 2/po/es.po
+++ b/po/es.po
@@@ -41,9 -41,9 +41,9 @@@ msgid "sort command return status %d\n
  msgstr ""
  
  #: authfail.c:78 authfail.c:83 dansguardian_log.c:140 email.c:119 html.c:384
- #: lastlog.c:83 log.c:1656 realtime.c:83 siteuser.c:67 siteuser.c:73
+ #: lastlog.c:83 log.c:1657 realtime.c:83 siteuser.c:67 siteuser.c:73
  #: smartfilter.c:73 smartfilter.c:78 sort.c:100 sort.c:160
 -#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:176
 +#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:171
  #: topsites.c:181 topuser.c:155 useragent.c:140 useragent.c:145
  #: useragent.c:217 useragent.c:222 useragent.c:277 useragent.c:282
  #, c-format

diff --cc po/fr.po
index f2a3e7b7ef5152d3839691dd071ddbc48ce83627,b3a54b36583bfb81d65146b810e62f6d2727e034..b8f1eaf2d0b7dfab5d26768d0473a263e6916d5b
--- 1/po/fr.po
--- 2/po/fr.po
+++ b/po/fr.po
@@@ -8,8 -8,8 +8,8 @@@ msgid "
  msgstr ""
  "Project-Id-Version: sarg 2.3\n"
  "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n"
- "POT-Creation-Date: 2010-07-14 21:07+0200\n"
+ "POT-Creation-Date: 2010-07-19 08:59+0200\n"
 -"PO-Revision-Date: 2010-07-07 20:12+0200\n"
 +"PO-Revision-Date: 2010-09-18 14:29+0200\n"
  "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
  "Language-Team: French <traduc@traduc.org>\n"
  "MIME-Version: 1.0\n"
@@@ -42,9 -42,9 +42,9 @@@ msgid "sort command return status %d\n
  msgstr "La commande «sort» retourne le statut %d\n"
  
  #: authfail.c:78 authfail.c:83 dansguardian_log.c:140 email.c:119 html.c:384
- #: lastlog.c:83 log.c:1656 realtime.c:83 siteuser.c:67 siteuser.c:73
+ #: lastlog.c:83 log.c:1657 realtime.c:83 siteuser.c:67 siteuser.c:73
  #: smartfilter.c:73 smartfilter.c:78 sort.c:100 sort.c:160
 -#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:176
 +#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:171
  #: topsites.c:181 topuser.c:155 useragent.c:140 useragent.c:145
  #: useragent.c:217 useragent.c:222 useragent.c:277 useragent.c:282
  #, c-format

diff --cc po/hu.po
index 480d107f3d44b153abb5457a133e058e06ad69aa,226505054230dc8df35f91d0b62c7ebe2ce09cfd..1d253554bed0b15b547549687df711364e664d0e
--- 1/po/hu.po
--- 2/po/hu.po
+++ b/po/hu.po
@@@ -40,9 -40,9 +40,9 @@@ msgid "sort command return status %d\n
  msgstr ""
  
  #: authfail.c:78 authfail.c:83 dansguardian_log.c:140 email.c:119 html.c:384
- #: lastlog.c:83 log.c:1656 realtime.c:83 siteuser.c:67 siteuser.c:73
+ #: lastlog.c:83 log.c:1657 realtime.c:83 siteuser.c:67 siteuser.c:73
  #: smartfilter.c:73 smartfilter.c:78 sort.c:100 sort.c:160
 -#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:176
 +#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:171
  #: topsites.c:181 topuser.c:155 useragent.c:140 useragent.c:145
  #: useragent.c:217 useragent.c:222 useragent.c:277 useragent.c:282
  #, c-format

diff --cc po/id.po
index 8db43e056da816d0e03f7cbb760dc43bc2eafc36,ea5f7ad1bbd2ffaa7ba56fbc755ad3e74a1ce6c8..22e4531764547d6547e41daca7df4114b243b4bf
--- 1/po/id.po
--- 2/po/id.po
+++ b/po/id.po
@@@ -40,9 -40,9 +40,9 @@@ msgid "sort command return status %d\n
  msgstr ""
  
  #: authfail.c:78 authfail.c:83 dansguardian_log.c:140 email.c:119 html.c:384
- #: lastlog.c:83 log.c:1656 realtime.c:83 siteuser.c:67 siteuser.c:73
+ #: lastlog.c:83 log.c:1657 realtime.c:83 siteuser.c:67 siteuser.c:73
  #: smartfilter.c:73 smartfilter.c:78 sort.c:100 sort.c:160
 -#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:176
 +#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:171
  #: topsites.c:181 topuser.c:155 useragent.c:140 useragent.c:145
  #: useragent.c:217 useragent.c:222 useragent.c:277 useragent.c:282
  #, c-format

diff --cc po/it.po
index a947be5dfa24b7751321da973d729382fa80677a,b75ad0f96851efb1c99ad10d979c00ddf20ff8ae..3ab2ed5ff995badae2c5bb235ff0a8b6cb6c99b9
--- 1/po/it.po
--- 2/po/it.po
+++ b/po/it.po
@@@ -40,9 -40,9 +40,9 @@@ msgid "sort command return status %d\n
  msgstr ""
  
  #: authfail.c:78 authfail.c:83 dansguardian_log.c:140 email.c:119 html.c:384
- #: lastlog.c:83 log.c:1656 realtime.c:83 siteuser.c:67 siteuser.c:73
+ #: lastlog.c:83 log.c:1657 realtime.c:83 siteuser.c:67 siteuser.c:73
  #: smartfilter.c:73 smartfilter.c:78 sort.c:100 sort.c:160
 -#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:176
 +#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:171
  #: topsites.c:181 topuser.c:155 useragent.c:140 useragent.c:145
  #: useragent.c:217 useragent.c:222 useragent.c:277 useragent.c:282
  #, c-format

diff --cc po/ja.po
index e3e3cbb0dbc5bab53d2828028f2c76541f5cfcd6,995edd2a2341542726660a080e2a1fe571267fd5..e45afa0ca63b564785402e0d0ea2db010e898a87
--- 1/po/ja.po
--- 2/po/ja.po
+++ b/po/ja.po
@@@ -40,9 -40,9 +40,9 @@@ msgid "sort command return status %d\n
  msgstr ""
  
  #: authfail.c:78 authfail.c:83 dansguardian_log.c:140 email.c:119 html.c:384
- #: lastlog.c:83 log.c:1656 realtime.c:83 siteuser.c:67 siteuser.c:73
+ #: lastlog.c:83 log.c:1657 realtime.c:83 siteuser.c:67 siteuser.c:73
  #: smartfilter.c:73 smartfilter.c:78 sort.c:100 sort.c:160
 -#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:176
 +#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:171
  #: topsites.c:181 topuser.c:155 useragent.c:140 useragent.c:145
  #: useragent.c:217 useragent.c:222 useragent.c:277 useragent.c:282
  #, c-format

diff --cc po/lv.po
index f045b29d9998df447972859c3f828a439155505a,b417f6698beab5a8b822ecae3c3d3d34dba126b8..12698867e1dcbc9677fb35469d992b83741aafa9
--- 1/po/lv.po
--- 2/po/lv.po
+++ b/po/lv.po
@@@ -41,9 -41,9 +41,9 @@@ msgid "sort command return status %d\n
  msgstr ""
  
  #: authfail.c:78 authfail.c:83 dansguardian_log.c:140 email.c:119 html.c:384
- #: lastlog.c:83 log.c:1656 realtime.c:83 siteuser.c:67 siteuser.c:73
+ #: lastlog.c:83 log.c:1657 realtime.c:83 siteuser.c:67 siteuser.c:73
  #: smartfilter.c:73 smartfilter.c:78 sort.c:100 sort.c:160
 -#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:176
 +#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:171
  #: topsites.c:181 topuser.c:155 useragent.c:140 useragent.c:145
  #: useragent.c:217 useragent.c:222 useragent.c:277 useragent.c:282
  #, c-format

diff --cc po/nl.po
index 5551e83de2e2fe15983ea5bab42d8fdbdd91d4bd,9eb1a2b0e348d77707896957a053fb8047731797..15cf99f650b2a157e257d28523a8e010c341e502
--- 1/po/nl.po
--- 2/po/nl.po
+++ b/po/nl.po
@@@ -42,9 -42,9 +42,9 @@@ msgid "sort command return status %d\n
  msgstr ""
  
  #: authfail.c:78 authfail.c:83 dansguardian_log.c:140 email.c:119 html.c:384
- #: lastlog.c:83 log.c:1656 realtime.c:83 siteuser.c:67 siteuser.c:73
+ #: lastlog.c:83 log.c:1657 realtime.c:83 siteuser.c:67 siteuser.c:73
  #: smartfilter.c:73 smartfilter.c:78 sort.c:100 sort.c:160
 -#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:176
 +#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:171
  #: topsites.c:181 topuser.c:155 useragent.c:140 useragent.c:145
  #: useragent.c:217 useragent.c:222 useragent.c:277 useragent.c:282
  #, c-format

diff --cc po/pl.po
index 88fcf80aabc7355c1391124381c4b537f683194b,470746a5e3d5778748b5dcc58b82ad095d079f0b..5f521bb4be9d34824379945cdcecaa529d650d45
--- 1/po/pl.po
--- 2/po/pl.po
+++ b/po/pl.po
@@@ -40,9 -40,9 +40,9 @@@ msgid "sort command return status %d\n
  msgstr ""
  
  #: authfail.c:78 authfail.c:83 dansguardian_log.c:140 email.c:119 html.c:384
- #: lastlog.c:83 log.c:1656 realtime.c:83 siteuser.c:67 siteuser.c:73
+ #: lastlog.c:83 log.c:1657 realtime.c:83 siteuser.c:67 siteuser.c:73
  #: smartfilter.c:73 smartfilter.c:78 sort.c:100 sort.c:160
 -#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:176
 +#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:171
  #: topsites.c:181 topuser.c:155 useragent.c:140 useragent.c:145
  #: useragent.c:217 useragent.c:222 useragent.c:277 useragent.c:282
  #, c-format

diff --cc po/pt.po
index 83788196f2f77aeeab83109d8df38ea9289479bd,7f8f6089fed0229778465581b2f45cc0fef0168b..71bf6dd3aad92e10127639bd7272d4d9e53b7017
--- 1/po/pt.po
--- 2/po/pt.po
+++ b/po/pt.po
@@@ -40,9 -40,9 +40,9 @@@ msgid "sort command return status %d\n
  msgstr ""
  
  #: authfail.c:78 authfail.c:83 dansguardian_log.c:140 email.c:119 html.c:384
- #: lastlog.c:83 log.c:1656 realtime.c:83 siteuser.c:67 siteuser.c:73
+ #: lastlog.c:83 log.c:1657 realtime.c:83 siteuser.c:67 siteuser.c:73
  #: smartfilter.c:73 smartfilter.c:78 sort.c:100 sort.c:160
 -#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:176
 +#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:171
  #: topsites.c:181 topuser.c:155 useragent.c:140 useragent.c:145
  #: useragent.c:217 useragent.c:222 useragent.c:277 useragent.c:282
  #, c-format

diff --cc po/ro.po
index 66a68a4d4a67c113b0b6bdac673de194f2108cd9,213c8cd5b82db194987dcf6cc515fd56f206e0e8..4b88d3f916b55d73257e4876c822a17f395feb22
--- 1/po/ro.po
--- 2/po/ro.po
+++ b/po/ro.po
@@@ -40,9 -40,9 +40,9 @@@ msgid "sort command return status %d\n
  msgstr ""
  
  #: authfail.c:78 authfail.c:83 dansguardian_log.c:140 email.c:119 html.c:384
- #: lastlog.c:83 log.c:1656 realtime.c:83 siteuser.c:67 siteuser.c:73
+ #: lastlog.c:83 log.c:1657 realtime.c:83 siteuser.c:67 siteuser.c:73
  #: smartfilter.c:73 smartfilter.c:78 sort.c:100 sort.c:160
 -#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:176
 +#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:171
  #: topsites.c:181 topuser.c:155 useragent.c:140 useragent.c:145
  #: useragent.c:217 useragent.c:222 useragent.c:277 useragent.c:282
  #, c-format

diff --cc po/ru.po
index 4ae89e72e66e24bd39adb4ccb07035e8a8a89f07,bf7706eab19167486738d7f056f80dc7da272499..f9caf8da1ff7d786713c86872d606ce7b05e97d2
--- 1/po/ru.po
--- 2/po/ru.po
+++ b/po/ru.po
@@@ -39,9 -39,9 +39,9 @@@ msgid "sort command return status %d\n
  msgstr "команда сортировки вернула результата %d\n"
  
  #: authfail.c:78 authfail.c:83 dansguardian_log.c:140 email.c:119 html.c:384
- #: lastlog.c:83 log.c:1656 realtime.c:83 siteuser.c:67 siteuser.c:73
+ #: lastlog.c:83 log.c:1657 realtime.c:83 siteuser.c:67 siteuser.c:73
  #: smartfilter.c:73 smartfilter.c:78 sort.c:100 sort.c:160
 -#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:176
 +#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:171
  #: topsites.c:181 topuser.c:155 useragent.c:140 useragent.c:145
  #: useragent.c:217 useragent.c:222 useragent.c:277 useragent.c:282
  #, c-format

diff --cc po/sk.po
index 790eb2c2b3a41d9f51c21a3110c45f914040ec1e,cbc5d0f7dd3b3ebe995a959be15da17bc9935ce0..0a2944f781994845c798401e4dccc7ee0932d52e
--- 1/po/sk.po
--- 2/po/sk.po
+++ b/po/sk.po
@@@ -40,9 -40,9 +40,9 @@@ msgid "sort command return status %d\n
  msgstr ""
  
  #: authfail.c:78 authfail.c:83 dansguardian_log.c:140 email.c:119 html.c:384
- #: lastlog.c:83 log.c:1656 realtime.c:83 siteuser.c:67 siteuser.c:73
+ #: lastlog.c:83 log.c:1657 realtime.c:83 siteuser.c:67 siteuser.c:73
  #: smartfilter.c:73 smartfilter.c:78 sort.c:100 sort.c:160
 -#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:176
 +#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:171
  #: topsites.c:181 topuser.c:155 useragent.c:140 useragent.c:145
  #: useragent.c:217 useragent.c:222 useragent.c:277 useragent.c:282
  #, c-format

diff --cc po/sr.po
index 059fdfb3f4ac80e9bad65bfa0e70a1da43ccc7bd,11af6e22747666b88413b1f3725172552346bf42..57cfe90c194d287a506e0d703609fe0363625826
--- 1/po/sr.po
--- 2/po/sr.po
+++ b/po/sr.po
@@@ -40,9 -40,9 +40,9 @@@ msgid "sort command return status %d\n
  msgstr ""
  
  #: authfail.c:78 authfail.c:83 dansguardian_log.c:140 email.c:119 html.c:384
- #: lastlog.c:83 log.c:1656 realtime.c:83 siteuser.c:67 siteuser.c:73
+ #: lastlog.c:83 log.c:1657 realtime.c:83 siteuser.c:67 siteuser.c:73
  #: smartfilter.c:73 smartfilter.c:78 sort.c:100 sort.c:160
 -#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:176
 +#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:171
  #: topsites.c:181 topuser.c:155 useragent.c:140 useragent.c:145
  #: useragent.c:217 useragent.c:222 useragent.c:277 useragent.c:282
  #, c-format

diff --cc po/tr.po
index 0caa4f524dfe4a377a8a0b86c70b96c2543f83d4,90e0706d63a0ea13117f2e2d03068914ffed21d0..3c34c6073253702166e5e42c7904f90072378ebc
--- 1/po/tr.po
--- 2/po/tr.po
+++ b/po/tr.po
@@@ -40,9 -40,9 +40,9 @@@ msgid "sort command return status %d\n
  msgstr ""
  
  #: authfail.c:78 authfail.c:83 dansguardian_log.c:140 email.c:119 html.c:384
- #: lastlog.c:83 log.c:1656 realtime.c:83 siteuser.c:67 siteuser.c:73
+ #: lastlog.c:83 log.c:1657 realtime.c:83 siteuser.c:67 siteuser.c:73
  #: smartfilter.c:73 smartfilter.c:78 sort.c:100 sort.c:160
 -#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:176
 +#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:171
  #: topsites.c:181 topuser.c:155 useragent.c:140 useragent.c:145
  #: useragent.c:217 useragent.c:222 useragent.c:277 useragent.c:282
  #, c-format

diff --cc po/uk.po
index 3d1d7bef96f46b77f87abf81bc25842acc90e555,bc491052f1d9e1ce6b11c77a1de69895fc84eef4..846ac0b1c9d91adbd01e0744bcda040aacbe0f09
--- 1/po/uk.po
--- 2/po/uk.po
+++ b/po/uk.po
@@@ -40,9 -40,9 +40,9 @@@ msgid "sort command return status %d\n
  msgstr ""
  
  #: authfail.c:78 authfail.c:83 dansguardian_log.c:140 email.c:119 html.c:384
- #: lastlog.c:83 log.c:1656 realtime.c:83 siteuser.c:67 siteuser.c:73
+ #: lastlog.c:83 log.c:1657 realtime.c:83 siteuser.c:67 siteuser.c:73
  #: smartfilter.c:73 smartfilter.c:78 sort.c:100 sort.c:160
 -#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:176
 +#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:171
  #: topsites.c:181 topuser.c:155 useragent.c:140 useragent.c:145
  #: useragent.c:217 useragent.c:222 useragent.c:277 useragent.c:282
  #, c-format

diff --cc po/zh_CN.po
index f3500c0105e1a1204602eacba9dea45b0337a1c8,db9d438ccf48197f799cf3ccdcb3246c14920667..317e94257cd659c1dafcb9f02fd47feb2f500c74
--- 1/po/zh_CN.po
--- 2/po/zh_CN.po
+++ b/po/zh_CN.po
@@@ -29,20 -29,20 +29,20 @@@ msgstr "(auth) ���ܴ����Ä
  #: auth.c:51
  #, c-format
  msgid "(auth) Cannot open template file: %s - %s\n"
 -msgstr "(auth) ²»ÄÜ´ò¿ªÁÙʱÎļþ: %s - %s\n"
 +msgstr "(auth) ���ܴ�����ʱ�ļ�: %s - %s\n"
  
  #: authfail.c:77 dansguardian_log.c:139 email.c:118 html.c:383 lastlog.c:82
- #: log.c:1655 realtime.c:82 siteuser.c:66 smartfilter.c:72 sort.c:99
+ #: log.c:1656 realtime.c:82 siteuser.c:66 smartfilter.c:72 sort.c:99
  #: sort.c:159 squidguard_log.c:380 topsites.c:77 topsites.c:175 topuser.c:154
  #: useragent.c:139 useragent.c:216 useragent.c:276
  #, c-format
  msgid "sort command return status %d\n"
 -msgstr "ÅÅÐòÃüÁî·µ»Ø״̬ %d\n"
 +msgstr "���������״̬ %d\n"
  
  #: authfail.c:78 authfail.c:83 dansguardian_log.c:140 email.c:119 html.c:384
- #: lastlog.c:83 log.c:1656 realtime.c:83 siteuser.c:67 siteuser.c:73
+ #: lastlog.c:83 log.c:1657 realtime.c:83 siteuser.c:67 siteuser.c:73
  #: smartfilter.c:73 smartfilter.c:78 sort.c:100 sort.c:160
 -#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:176
 +#: squidguard_log.c:381 topsites.c:78 topsites.c:84 topsites.c:171
  #: topsites.c:181 topuser.c:155 useragent.c:140 useragent.c:145
  #: useragent.c:217 useragent.c:222 useragent.c:277 useragent.c:282
  #, c-format
@@@ -112,21 -112,21 +112,21 @@@ msgstr "�в��������û
  #: authfail.c:123
  #, c-format
  msgid "There is a broken IP address in file %s\n"
 -msgstr "Óв»ÍêÕûµÄIPµØÖ·ÔÚÎļþÖÐ %s\n"
 +msgstr "�в�������IP��ַ���ļ��� %s\n"
  
- #: authfail.c:127 denied.c:107 download.c:102 html.c:197 html.c:277
+ #: authfail.c:127 denied.c:107 download.c:102 html.c:193 html.c:271
  #, c-format
  msgid "There is a broken url in file %s\n"
 -msgstr "Óв»ÍêÕûµÄÁ¬½ÓÔÚÎļþÖÐ %s\n"
 +msgstr "�в�������������ļ��� %s\n"
  
  #: authfail.c:136 denied.c:116 download.c:111 siteuser.c:115 smartfilter.c:119
 -#: squidguard_report.c:122 topuser.c:268
 +#: squidguard_report.c:122 topuser.c:278
  #, c-format
  msgid "Unknown user ID %s in file %s\n"
 -msgstr "δ֪µÄÓû§ID %s ÔÚÎļþ %s\n"
 +msgstr "δ֪���û�ID %s ���ļ� %s\n"
  
  #: authfail.c:190 dansguardian_report.c:157 denied.c:175 download.c:166
 -#: grepday.c:758 html.c:555 repday.c:227 siteuser.c:201
 +#: grepday.c:758 html.c:594 repday.c:227 siteuser.c:201
  #: squidguard_report.c:176 topsites.c:256 useragent.c:312
  #, c-format
  msgid "Write error in file %s\n"
@@@ -236,9 -236,9 +236,9 @@@ msgstr "(datafile) ���ܴ���
  #: datafile.c:118
  #, c-format
  msgid "Not enough memory to read the downloaded files.\n"
 -msgstr "ûÓÐ×ã¹»µÄÄÚ´æÈ¥¶ÁÈ¡ÒÑÏÂÔØÎļþ. \n"
 +msgstr "û���㹻���ڴ�ȥ��ȡ�������ļ�. \n"
  
- #: datafile.c:130 denied.c:95 download.c:98 report.c:169 smartfilter.c:113
+ #: datafile.c:130 denied.c:103 download.c:98 report.c:169 smartfilter.c:113
  #: totday.c:79
  #, c-format
  msgid "There is a broken record or garbage in file %s\n"
@@@ -403,17 -403,17 +403,17 @@@ msgstr "ƽ��ֵ
  
  #: email.c:253 html.c:234
  msgid "Report"
 -msgstr "±¨¸æ"
 +msgstr "����"
  
- #: email.c:256 index.c:544 log.c:1641
+ #: email.c:256 index.c:544 log.c:1642
  #, c-format
  msgid "command return status %d\n"
 -msgstr "ÃüÁî·µ»Ø״̬ %d\n"
 +msgstr "�����״̬ %d\n"
  
- #: email.c:257 index.c:545 log.c:1642
+ #: email.c:257 index.c:545 log.c:1643
  #, c-format
  msgid "command: %s\n"
 -msgstr "ÃüÁî: %s\n"
 +msgstr "����: %s\n"
  
  #: exclude.c:65
  #, c-format
@@@ -453,12 -453,12 +453,12 @@@ msgstr "�����ų��ļ��
  #: exclude.c:329
  #, c-format
  msgid "Failed to move till the end of the excluded users file %s: %s\n"
 -msgstr "ÔÚÅųýÓû§Îļþ֮ǰ²»ÄÜÒƶ¯¸ÃÎļþ %s: %s\n"
 +msgstr "���ų��û��ļ�֮ǰ�����ƶ����ļ� %s: %s\n"
  
- #: exclude.c:334 log.c:1711 util.c:1384
+ #: exclude.c:334 log.c:1712 util.c:1384
  #, c-format
  msgid "Cannot get the size of file %s\n"
 -msgstr "²»Äܵõ½ÎļþµÄ´óС %s\n"
 +msgstr "���ܵõ��ļ��Ĵ�С %s\n"
  
  #: exclude.c:339
  #, c-format
@@@ -1470,102 -1454,102 +1470,102 @@@ msgstr "��־�ļ��е��ûï¿
  #: log.c:1542
  #, c-format
  msgid "SARG: Records in file: %lu, reading: %3.2f%%\n"
 -msgstr "SARG: ¼Í¼ÔÚÎļþ: %lu, reading: %3.2f%%\n"
 +msgstr "SARG: ��¼���ļ�: %lu, reading: %3.2f%%\n"
  
- #: log.c:1547
+ #: log.c:1548
  #, c-format
  msgid "   Records read: %ld, written: %ld, excluded: %ld\n"
 -msgstr "¼Í¼ ¶ÁÈ¡: %ld, ÒÑдÈë: %ld, Åųý: %ld\n"
 +msgstr "��¼ ��ȡ: %ld, ��д��: %ld, �ų�: %ld\n"
  
- #: log.c:1569
+ #: log.c:1570
  #, c-format
  msgid "Log with mixed records format (squid and common log)\n"
 -msgstr "ÈÕÖ¾Óë¼Í¼»ìºÏ¸ñʽ(squid and common log)\n"
 +msgstr "��־����¼���ϸ�ʽ(squid and common log)\n"
  
- #: log.c:1572
+ #: log.c:1573
  #, c-format
  msgid "Common log format\n"
 -msgstr "ÆÕͨÈÕÖ¾¸ñʽ\n"
 +msgstr "��ͨ��־��ʽ\n"
  
- #: log.c:1575
+ #: log.c:1576
  #, c-format
  msgid "Squid log format\n"
 -msgstr "SquidÈÕÖ¾¸ñʽ\n"
 +msgstr "Squid��־��ʽ\n"
  
- #: log.c:1578
+ #: log.c:1579
  #, c-format
  msgid "Sarg log format\n"
 -msgstr "SargÈÕÖ¾¸ñʽ\n"
 +msgstr "Sarg��־��ʽ\n"
  
- #: log.c:1581
+ #: log.c:1582
  #, c-format
  msgid "Log with invalid format\n"
 -msgstr "²»´æÔÚµÄÈÕÖ¾¸ñʽ\n"
 +msgstr "�����ڵ���־��ʽ\n"
  
- #: log.c:1585
+ #: log.c:1586
  #, c-format
  msgid "No records found\n"
 -msgstr "ûÓÐÕÒµ½¼Í¼\n"
 +msgstr "û���ҵ���¼\n"
  
- #: log.c:1586 log.c:1682
+ #: log.c:1587 log.c:1683
  #, c-format
  msgid "End\n"
 -msgstr "½áÊø\n"
 +msgstr "����\n"
  
- #: log.c:1600
+ #: log.c:1601
  #, c-format
  msgid "Period covered by log files: %s-%s\n"
 -msgstr "Æڼ䱻ÈÕÖ¾Îļþ¸²¸Ç: %s - %s\n"
 +msgstr "�ڼ䱻��־�ļ�����: %s - %s\n"
  
- #: log.c:1604
+ #: log.c:1605
  #, c-format
  msgid "Failed to build the string representation of the date range\n"
 -msgstr "½¨Á¢ÒÔ×Ö·û´®±íʾÈÕÆڵķ¶Î§Ê±Ê§°Ü\n"
 +msgstr "������ַ�����ʾ���ڵķ�Χʱʧ��\n"
  
- #: log.c:1614
+ #: log.c:1615
  #, c-format
  msgid "Period: %s\n"
 -msgstr "ÆÚ¼ä: %s\n"
 +msgstr "�ڼ�: %s\n"
  
- #: log.c:1629
+ #: log.c:1630
  #, c-format
  msgid "failed to rename %s to %s - %s\n"
 -msgstr "ÖØÃüÃûʧ°Ü %s ÖÁ %s - %s\n"
 +msgstr "������ʧ�� %s �� %s - %s\n"
  
- #: log.c:1648
+ #: log.c:1649
  #, c-format
  msgid "Sarg parsed log saved as %s\n"
 -msgstr "Sarg½âÎöÈÕÖ¾Áí´æΪ %s\n"
 +msgstr "Sarg������־����Ϊ %s\n"
  
- #: log.c:1698
+ #: log.c:1699
  #, c-format
  msgid "Loading password file from %s\n"
 -msgstr "¼ÓÔØÃÜÂë´ÓÎļþ %s\n"
 +msgstr "�����������ļ� %s\n"
  
- #: log.c:1701
+ #: log.c:1702
  #, c-format
  msgid "(getusers) Cannot open file %s - %s\n"
 -msgstr "(getusers) ²»ÄÜ´ò¿ªÎļþ %s - %s\n"
 +msgstr "(getusers) ���ܴ����ļ� %s - %s\n"
  
- #: log.c:1706
+ #: log.c:1707
  #, c-format
  msgid "Failed to move till the end of the users file %s: %s\n"
 -msgstr "Òƶ¯Óû§ÎļþÖÁĩβʱʧ°Ü%s: %s\n"
 +msgstr "�ƶ��û��ļ���ĩβʱʧ��%s: %s\n"
  
- #: log.c:1716
+ #: log.c:1717
  #, c-format
  msgid "Failed to rewind the users file %s: %s\n"
 -msgstr "ת´æÓû§Îļþʱʧ°Ü %s: %s\n"
 +msgstr "ת���û��ļ�ʱʧ�� %s: %s\n"
  
- #: log.c:1721 util.c:1394
+ #: log.c:1722 util.c:1394
  #, c-format
  msgid "malloc error (%ld)\n"
 -msgstr "ÄÚ´æ·ÖÒ³´íÎó (%ld)\n"
 +msgstr "�ڴ���ҳ���� (%ld)\n"
  
- #: log.c:1731
+ #: log.c:1732
  #, c-format
  msgid "You have an invalid user in your %s file\n"
 -msgstr "ÓÐÒ»¸ö²»´æÔÚµÄÓû§ÔÚÄãµÄ %s Îļþ\n"
 +msgstr "��һ����ڵ��û������� %s �ļ�\n"
  
  #: longline.c:113 longline.c:126
  #, c-format

diff --cc topuser.c
Simple merge