From: Frédéric Marchal Date: Fri, 1 Jun 2012 18:42:46 +0000 (+0200) Subject: Merge commit '04a01ed3a074b66' X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce36c3c71f89165b28f7961477c44efb2f8d0d81;p=thirdparty%2Fsarg.git 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 --- ce36c3c71f89165b28f7961477c44efb2f8d0d81 diff --cc po/bg.po index 90e269e,7d57aa1..b1c2756 --- a/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 d0cf657,aa1fcd6..aa7a095 --- a/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 2077882,a2f8ea1..86103a5 --- a/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 4c79fe7,3afd0a1..0ea197c --- a/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 5b3dc27,df32255..5541be6 --- a/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 4d18981,50ccc1d..9127373 --- a/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 f2a3e7b,b3a54b3..b8f1eaf --- a/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 \n" "Language-Team: French \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 480d107,2265050..1d25355 --- a/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 8db43e0,ea5f7ad..22e4531 --- a/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 a947be5,b75ad0f..3ab2ed5 --- a/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 e3e3cbb,995edd2..e45afa0 --- a/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 f045b29,b417f66..1269886 --- a/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 5551e83,9eb1a2b..15cf99f --- a/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 88fcf80,470746a..5f521bb --- a/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 8378819,7f8f608..71bf6dd --- a/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 66a68a4,213c8cd..4b88d3f --- a/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 4ae89e7,bf7706e..f9caf8d --- a/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 790eb2c,cbc5d0f..0a2944f --- a/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 059fdfb,11af6e2..57cfe90 --- a/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 0caa4f5,90e0706..3c34c60 --- a/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 3d1d7be,bc49105..846ac0b --- a/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 f3500c0,db9d438..317e942 --- a/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