Revert to an old version of the Chinese translation

Several merge conflict tags has gone unnoticed. Since the po file hasn't
been modified for a long time, it is safe to revert to the old version.

Some characters had been damaged too. This version looks good from the
po point of view.

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4295e6e3b22f91eca7d87422299402b53e362218..73ec4965d9f5b92aa4abb14fc602149272d23cb2 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,11 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sarg 2.3-pre3\n"
 "Report-Msgid-Bugs-To: fmarchal@users.sourceforge.net\n"
-"POT-Creation-Date: 2012-07-19 09:13+0200\n"
+"POT-Creation-Date: 2010-09-18 07:02+0200\n"
 "PO-Revision-Date: 2010-06-18 02:09+0800\n"
 "Last-Translator: zhixiang.ren <kurt998@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
-"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=GB18030\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,345 +19,266 @@ msgstr ""
 #: auth.c:42
 #, c-format
 msgid "File name too long: %s/%s/.htaccess\n"
-msgstr "�ļ�������: %s/%s/.htaccess\n"
+msgstr "ÎļþÃû¹ý³¤: %s/%s/.htaccess\n"
 
 #: auth.c:46
 #, c-format
 msgid "(auth) Cannot open file: %s - %s\n"
-msgstr "(auth) ���ܴ����ļ�: %s - %s\n"
+msgstr "(auth) ²»ÄÜ´ò¿ªÎļþ: %s - %s\n"
 
 #: 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:34
-#, c-format
-msgid "%d more authentication failure not shown here&hellip;"
-msgid_plural "%d more authentication failures not shown here&hellip;"
-msgstr[0] ""
-
-#: authfail.c:75 authfail.c:97 authfail.c:210 dansguardian_log.c:158
-#: dansguardian_report.c:64 dansguardian_report.c:174 denied.c:68 denied.c:181
-#: download.c:79 download.c:234 email.c:146 email.c:257 grepday.c:687
-#: grepday.c:729 html.c:329 html.c:404 html.c:459 html.c:490 html.c:495
-#: index.c:47 indexonly.c:50 lastlog.c:87 lastlog.c:95 lastlog.c:131
-#: log.c:1685 log.c:1697 realtime.c:108 realtime.c:292 redirector.c:402
-#: redirector.c:448 redirector.c:580 report.c:335 siteuser.c:185
-#: smartfilter.c:89 smartfilter.c:211 sort.c:89 sort.c:139 topsites.c:185
-#: topsites.c:223 topuser.c:205 topuser.c:359 topuser.c:415 useragent.c:152
-#: useragent.c:235 useragent.c:283 useragent.c:304 useragent.c:337 util.c:1832
-#: util.c:1845 util.c:1965
-#, fuzzy, c-format
-msgid "Cannot delete \"%s\": %s\n"
-msgstr " ����ɾ�� %s - %s\n"
-
-#: authfail.c:77
-msgid "Authentication failures report not produced because it is empty\n"
-msgstr ""
-
-#: authfail.c:87 dansguardian_log.c:153 download.c:70 email.c:140 html.c:393
-#: lastlog.c:81 log.c:1680 realtime.c:103 redirector.c:396 siteuser.c:68
-#: smartfilter.c:79 sort.c:84 sort.c:130 topsites.c:89 topsites.c:212
-#: topuser.c:194 useragent.c:141 useragent.c:224 useragent.c:293
+#: authfail.c:77 dansguardian_log.c:139 email.c:125 html.c:414 lastlog.c:82
+#: log.c:1657 realtime.c:87 siteuser.c:66 smartfilter.c:72 sort.c:99
+#: sort.c:159 squidguard_log.c:380 topsites.c:77 topsites.c:170 topuser.c:162
+#: 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:88 authfail.c:93 dansguardian_log.c:154 download.c:71
-#: email.c:141 html.c:394 lastlog.c:82 log.c:1681 realtime.c:104
-#: redirector.c:397 siteuser.c:69 siteuser.c:75 smartfilter.c:80
-#: smartfilter.c:85 sort.c:85 sort.c:131 topsites.c:90 topsites.c:96
-#: topsites.c:213 topsites.c:218 topuser.c:195 useragent.c:142 useragent.c:147
-#: useragent.c:225 useragent.c:230 useragent.c:294 useragent.c:299
+#: authfail.c:78 authfail.c:83 dansguardian_log.c:140 email.c:126 html.c:415
+#: lastlog.c:83 log.c:1658 realtime.c:88 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:171
+#: topsites.c:176 topuser.c:163 useragent.c:140 useragent.c:145
+#: useragent.c:217 useragent.c:222 useragent.c:277 useragent.c:282
 #, c-format
 msgid "sort command: %s\n"
-msgstr "��������: %s\n"
+msgstr "ÅÅÐòÃüÁî: %s\n"
 
-#: authfail.c:92 authfail.c:102
+#: authfail.c:82 authfail.c:89
 #, c-format
 msgid "(authfail) Cannot open file %s\n"
-msgstr "(authfail) ���ܴ����ļ� %s\n"
-
-<<<<<<< HEAD
-#: authfail.c:95 authfail.c:208 dansguardian_log.c:158
-#: dansguardian_report.c:173 download.c:79 download.c:234 email.c:146
-#: email.c:257 grepday.c:728 html.c:455 html.c:459 html.c:490 html.c:495
-#: index.c:47 lastlog.c:87 lastlog.c:95 log.c:1694 realtime.c:108
-#: realtime.c:292 redirector.c:402 redirector.c:579 report.c:335
-#: siteuser.c:184 smartfilter.c:89 sort.c:89 sort.c:139 topsites.c:178
-#: topsites.c:214 topuser.c:205 topuser.c:359 topuser.c:415 useragent.c:152
-#: useragent.c:235 useragent.c:283 useragent.c:304 useragent.c:337
-#, fuzzy, c-format
-msgid "Cannot delete %s - %s\n"
-msgstr " ����ɾ�� %s - %s\n"
+msgstr "(authfail) ²»ÄÜ´ò¿ªÎļþ %s\n"
 
-#: authfail.c:104 authfail.c:108 topuser.c:241
-=======
-#: authfail.c:106 authfail.c:110 topuser.c:241
->>>>>>> origin/v2.3
+#: authfail.c:93 authfail.c:97 topuser.c:199
 msgid "Authentication Failures"
-msgstr "��֤ʧ��"
+msgstr "ÈÏ֤ʧ°Ü"
 
-#: authfail.c:108 dansguardian_report.c:83 denied.c:87 download.c:144
-#: grepday.c:559 redirector.c:472 siteuser.c:86 smartfilter.c:107
-#: smartfilter.c:175 topsites.c:234 topuser.c:218
+#: authfail.c:95 dansguardian_report.c:74 denied.c:86 download.c:81
+#: grepday.c:559 siteuser.c:84 smartfilter.c:97 smartfilter.c:165
+#: squidguard_report.c:85 topsites.c:190 topuser.c:183
 #, c-format
 msgid "Period: %s"
-msgstr "����: %s"
+msgstr "Çø¼ä: %s"
 
-#: authfail.c:114 dansguardian_report.c:89 denied.c:93 download.c:150
-#: email.c:175 realtime.c:314 redirector.c:478 smartfilter.c:116
-#: smartfilter.c:183 topuser.c:269 useragent.c:175
+#: authfail.c:101 dansguardian_report.c:80 denied.c:92 download.c:87
+#: email.c:168 realtime.c:294 smartfilter.c:106 smartfilter.c:173
+#: squidguard_report.c:91 topuser.c:218 useragent.c:170
 msgid "USERID"
-msgstr "�û�ID"
+msgstr "Óû§ID"
 
-#: authfail.c:114 dansguardian_report.c:89 denied.c:93 download.c:150
-#: realtime.c:314 redirector.c:478 smartfilter.c:116 smartfilter.c:183
+#: authfail.c:101 dansguardian_report.c:80 denied.c:92 download.c:87
+#: realtime.c:294 smartfilter.c:106 smartfilter.c:173 squidguard_report.c:91
 msgid "IP/NAME"
-msgstr "IP/����"
+msgstr "IP/ÐÕÃû"
 
-#: authfail.c:114 dansguardian_report.c:89 denied.c:93 download.c:150
-#: realtime.c:314 redirector.c:478 smartfilter.c:116 smartfilter.c:183
+#: authfail.c:101 dansguardian_report.c:80 denied.c:92 download.c:87
+#: realtime.c:294 report.c:291 report.c:293 smartfilter.c:106
+#: smartfilter.c:173 squidguard_report.c:91
 msgid "DATE/TIME"
-msgstr "����/ʱ��"
+msgstr "ÈÕÆÚ/ʱ¼ä"
 
-#. TRANSLATORS: This is a column header showing the URL of the visited sites.
-#: authfail.c:114 dansguardian_report.c:89 denied.c:93 download.c:150
-#: html.c:202 realtime.c:314 redirector.c:478 report.c:267 siteuser.c:95
-#: smartfilter.c:116 smartfilter.c:183 topsites.c:250
+#: authfail.c:101 dansguardian_report.c:80 denied.c:92 download.c:87
+#: html.c:243 realtime.c:294 report.c:293 siteuser.c:91 siteuser.c:93
+#: smartfilter.c:106 smartfilter.c:173 squidguard_report.c:91 topsites.c:198
 msgid "ACCESSED SITE"
-msgstr "����վ��"
+msgstr "·ÃÎÊÕ¾µã"
 
-#: authfail.c:117 email.c:81 html.c:128 html.c:350 html.c:411 siteuser.c:110
-#: topsites.c:106 topsites.c:264
+#: authfail.c:104 email.c:75 html.c:81 html.c:175 html.c:374 html.c:427
+#: siteuser.c:106 topsites.c:94 topsites.c:204
 #, c-format
 msgid "Not enough memory to read file %s\n"
-msgstr "û���㹻���ڴ����ȡ�ļ� %s\n"
+msgstr "ûÓÐ×ã¹»µÄÄÚ´æÀ´¶ÁÈ¡Îļþ %s\n"
 
-#: authfail.c:124
+#: authfail.c:111
 #, c-format
 msgid "There is a broken date in file %s\n"
-msgstr "�в��������������ļ� %s\n"
+msgstr "Óв»ÍêÕûµÄÈÕÆÚÔÚÎļþ %s\n"
 
-#: authfail.c:128
+#: authfail.c:115
 #, c-format
 msgid "There is a broken time in file %s\n"
-msgstr "�в�������ʱ�����ļ��� %s\n"
+msgstr "Óв»ÍêÕûµÄʱ¼äÔÚÎļþÖÐ %s\n"
 
-#: authfail.c:132
+#: authfail.c:119
 #, c-format
 msgid "There is a broken user ID in file %s\n"
-msgstr "�в��������û�ID���ļ��� %s\n"
+msgstr "Óв»ÍêÕûµÄÓû§IDÔÚÎļþÖÐ %s\n"
 
-#: authfail.c:136
+#: 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:140 denied.c:108 download.c:165 html.c:150 html.c:238
+#: authfail.c:127 denied.c:107 download.c:102 html.c:197 html.c:277
 #, c-format
 msgid "There is a broken url in file %s\n"
-msgstr "�в�������������ļ��� %s\n"
+msgstr "Óв»ÍêÕûµÄÁ¬½ÓÔÚÎļþÖÐ %s\n"
 
-#: authfail.c:149 denied.c:117 download.c:174 email.c:212 redirector.c:509
-#: siteuser.c:119 smartfilter.c:129 topuser.c:332
+#: authfail.c:136 denied.c:116 download.c:111 siteuser.c:115 smartfilter.c:119
+#: 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:205 dansguardian_report.c:169 denied.c:176 download.c:229
-#: grepday.c:773 html.c:586 redirector.c:575 repday.c:245 siteuser.c:191
-#: topsites.c:319 useragent.c:332
+#: authfail.c:190 dansguardian_report.c:157 denied.c:175 download.c:166
+#: grepday.c:758 html.c:594 repday.c:227 siteuser.c:201
+#: squidguard_report.c:176 topsites.c:251 useragent.c:312
 #, c-format
 msgid "Write error in file %s\n"
-msgstr "���ļ�����д������ %s\n"
+msgstr "ÔÚÎļþÖÐÓÐдÈë´íÎó %s\n"
 
-#: authfail.c:207 convlog.c:80 dansguardian_report.c:171 denied.c:178
-#: download.c:231 grepday.c:775 html.c:588 redirector.c:577 repday.c:247
-#: siteuser.c:193 splitlog.c:112 splitlog.c:143 splitlog.c:147 topsites.c:321
-#: topuser.c:50 totday.c:181 useragent.c:127 useragent.c:278 useragent.c:334
+#: authfail.c:192 convlog.c:80 dansguardian_report.c:159 denied.c:177
+#: download.c:168 grepday.c:760 html.c:596 repday.c:229 report.c:525
+#: report.c:567 siteuser.c:203 splitlog.c:84 squidguard_report.c:178
+#: topsites.c:253 topuser.c:413 totday.c:134 totger.c:79 useragent.c:128
+#: useragent.c:267 useragent.c:314
 #, c-format
 msgid "Failed to close file %s - %s\n"
-msgstr "�ر��ļ�ʱʧ�� %s - %s\n"
+msgstr "¹Ø±ÕÎļþʱʧ°Ü %s - %s\n"
 
 #: convlog.c:46
 #, fuzzy, c-format
 msgid "(convlog) Cannot open log file %s - %s\n"
-msgstr "(log) ���ܴ�����־�ļ�: %s - %s\n"
+msgstr "(log) ²»ÄÜ´ò¿ªÈÕÖ¾Îļþ: %s - %s\n"
 
-#: convlog.c:51 splitlog.c:87
+#: convlog.c:51 splitlog.c:51
 #, fuzzy, c-format
 msgid "Not enough memory to read the log file %s\n"
-msgstr "û���㹻���ڴ����ȡ��־�ļ�\n"
+msgstr "ûÓÐ×ã¹»µÄÄÚ´æÀ´¶ÁÈ¡ÈÕÖ¾Îļþ\n"
 
 #: convlog.c:58
 #, c-format
 msgid "Maybe you have a broken record or garbage in file %s\n"
-msgstr "�����в������ļ�¼������������ļ� %s\n"
+msgstr "¿ÉÄÜÓв»ÍêÕûµÄ¼Í¼»òÕßÀ¬»ø´æÔÚÎļþ %s\n"
 
-#: dansguardian_log.c:56
+#: dansguardian_log.c:57
 #, c-format
 msgid "Cannot open DansGuardian config file: %s\n"
-msgstr "���ܴ��� DansGuardian �����ļ�: %s\n"
+msgstr "²»ÄÜ´ò¿ª DansGuardian ÅäÖÃÎļþ: %s\n"
 
-#: dansguardian_log.c:61 dansguardian_log.c:66 dansguardian_log.c:90
+#: dansguardian_log.c:62 dansguardian_log.c:67 dansguardian_log.c:89
 #, c-format
 msgid "(dansguardian) Cannot open log file: %s\n"
-msgstr "(dansguardian) ���ܴ�����־�ļ�: %s\n"
+msgstr "(dansguardian) ²»ÄÜ´ò¿ªÈÕÖ¾Îļþ: %s\n"
 
-#: dansguardian_log.c:77 dansguardian_log.c:116 dansguardian_log.c:125
-#: dansguardian_report.c:95 lastlog.c:114 log.c:943 log.c:948 log.c:954
-#: log.c:962 log.c:966 log.c:970 log.c:975 log.c:980 log.c:1081 log.c:1085
-#: log.c:1089 log.c:1093 log.c:1097 log.c:1101 log.c:1105 log.c:1109
-#: log.c:1113 log.c:1146 log.c:1153 log.c:1177 topsites.c:271 topsites.c:276
-#: useragent.c:83 useragent.c:106
+#: dansguardian_log.c:78 dansguardian_log.c:101 dansguardian_log.c:110
+#: dansguardian_report.c:86 lastlog.c:108 log.c:919 log.c:924 log.c:930
+#: log.c:938 log.c:942 log.c:946 log.c:951 log.c:956 log.c:1052 log.c:1056
+#: log.c:1060 log.c:1064 log.c:1068 log.c:1072 log.c:1076 log.c:1080
+#: log.c:1084 log.c:1112 log.c:1119 log.c:1143 realtime.c:217 realtime.c:221
+#: realtime.c:225 realtime.c:229 realtime.c:238 squidguard_log.c:122
+#: squidguard_log.c:127 topsites.c:211 topsites.c:216 useragent.c:84
+#: useragent.c:107
 #, c-format
 msgid "Maybe you have a broken record or garbage in your %s file\n"
-msgstr "�����в������ļ�¼������������� %s �ļ��� \n"
+msgstr "¿ÉÄÜÓв»ÍêÕûµÄ¼Í¼»òÕßÀ¬»øÔÚÄãµÄ %s ÎļþÖÐ \n"
 
-#: dansguardian_log.c:80
-#, fuzzy, c-format
-msgid ""
-"Using the dansguardian log file \"%s\" found in your configuration file \"%s"
-"\"\n"
-msgstr "�������ļ��д��ڹ�������־�ļ�\n"
-
-#: dansguardian_log.c:87
+#: dansguardian_log.c:86
 #, c-format
 msgid "Reading DansGuardian log file: %s\n"
-msgstr "��ȡ DansGuardian ��־�ļ�: %s\n"
-
-#: dansguardian_log.c:100
-#, fuzzy, c-format
-msgid "Invalid date found in your dansguardian log file %s\n"
-msgstr "���ļ��д�����Ч������ %s\n"
-
-#: dansguardian_log.c:104
-#, fuzzy, c-format
-msgid "Invalid time found in your dansguardian log file %s\n"
-msgstr "��Ч��ʱ�����ļ��� %s\n"
+msgstr "¶ÁÈ¡ DansGuardian ÈÕÖ¾Îļþ: %s\n"
 
-#: dansguardian_log.c:108
-#, fuzzy, c-format
-msgid "Invalid user found in your dansguardian log file %s\n"
-msgstr "���ļ��д�����Ч������ %s\n"
-
-#: dansguardian_log.c:112
-#, fuzzy, c-format
-msgid "Invalid IP address found in your dansguardian log file %s\n"
-msgstr "���ļ��д�����Ч������ %s\n"
-
-#: dansguardian_log.c:120 dansguardian_report.c:99 html.c:360 log.c:958
-#: log.c:1056
+#: dansguardian_log.c:105 dansguardian_report.c:90 html.c:384 log.c:934
+#: log.c:1027 realtime.c:234
 #, c-format
 msgid "Maybe you have a broken url in your %s file\n"
-msgstr "�������в���������������� %s �ļ���\n"
+msgstr "¿ÉÄÜÄãÓв»ÍêÕûµÄÁ¬½ÓÔÚÄãµÄ %s ÎļþÖÐ\n"
 
-#: dansguardian_log.c:148 redirector.c:387 sort.c:75 useragent.c:132
+#: dansguardian_log.c:134 sort.c:92 squidguard_log.c:374 useragent.c:133
 #, c-format
 msgid "Sorting file: %s\n"
-msgstr "���������ļ�: %s\n"
-
-#: dansguardian_report.c:34
-#, c-format
-msgid "%d more dansguardian entry not shown here&hellip;"
-msgid_plural "%d more dansguardian entries not shown here&hellip;"
-msgstr[0] ""
-
-#: dansguardian_report.c:65
-#, fuzzy
-msgid "Dansguardian report not generated because it is empty\n"
-msgstr "£¨dansguardian_report£©ÎÞ·¨´ò¿ªÎļþ%s\n"
+msgstr "ÕýÔÚÅÅÐòÎļþ: %s\n"
 
-#: dansguardian_report.c:72 dansguardian_report.c:77
+#: dansguardian_report.c:63 dansguardian_report.c:68
 #, c-format
 msgid "(dansguardian_report) Cannot open log file %s\n"
-msgstr "(dansguardian_report) ���ܴ�����־�ļ� %s\n"
+msgstr "(dansguardian_report) ²»ÄÜ´ò¿ªÈÕÖ¾Îļþ %s\n"
 
-#: dansguardian_report.c:81 dansguardian_report.c:85 topuser.c:237
+#: dansguardian_report.c:72 dansguardian_report.c:76 topuser.c:195
 msgid "DansGuardian"
 msgstr "DansGuardian"
 
-#: dansguardian_report.c:89
+#: dansguardian_report.c:80
 msgid "CAUSE"
-msgstr "ԭ��"
+msgstr "ԭÒò"
 
-#: dansguardian_report.c:103
+#: dansguardian_report.c:94
 #, c-format
 msgid "Maybe you have a broken rule in your %s file\n"
-msgstr "�������в������Ĺ��������� %s �ļ���\n"
+msgstr "¿ÉÄÜÄãÓв»ÍêÕûµÄ¹æÔòÔÚÄãµÄ %s ÎļþÖÐ\n"
 
-#: datafile.c:72 html.c:82 report.c:114
-#, fuzzy, c-format
-msgid "Cannot enumerate the user list\n"
-msgstr "û���㹻���ڴ���洢�û� %s\n"
+#: datafile.c:77 html.c:116 index.c:53 index.c:107 index.c:156 index.c:217
+#: index.c:319 indexonly.c:38 lastlog.c:57 report.c:109 sort.c:68 sort.c:128
+#, c-format
+msgid "Failed to open directory %s - %s\n"
+msgstr "´ò¿ªÎļþ¼Ðʱʧ°Ü %s - %s\n"
 
-#: datafile.c:83
-#, fuzzy, c-format
-msgid "Reading user file: %s/%s\n"
-msgstr "�����ļ�: %s/%s\n"
+#: datafile.c:96 report.c:139
+#, c-format
+msgid "Ignoring unknown user file %s\n"
+msgstr "Ìø¹ýδ֪µÄÓû§Îļþ %s\n"
 
-#: datafile.c:87
-#, fuzzy, c-format
-<<<<<<< HEAD
-msgid "(datafile) directory path too long: %s/%s.log\n"
-msgstr "(datafile) �ļ���·��̫��: %s/%s\n"
-=======
-msgid "(datafile) directory path too long: %s/%s.user_log\n"
-msgstr "(datafile) �ļ���·��̫��: %s/%s\n"
->>>>>>> origin/v2.3
+#: datafile.c:108
+#, c-format
+msgid "(datafile) directory path too long: %s/%s\n"
+msgstr "(datafile) Îļþ¼Ð·¾¶Ì«³¤: %s/%s\n"
 
-#: datafile.c:92 datafile.c:148
+#: datafile.c:113 datafile.c:169
 #, c-format
 msgid "(datafile) Cannot open file %s\n"
-msgstr "(datafile) ���ܴ�����־�ļ� %s\n"
+msgstr "(datafile) ²»ÄÜ´ò¿ªÈÕÖ¾Îļþ %s\n"
 
-#: datafile.c:97
+#: datafile.c:118
 #, c-format
 msgid "Not enough memory to read the downloaded files.\n"
-msgstr "û���㹻���ڴ�ȥ��ȡ�������ļ�. \n"
+msgstr "ûÓÐ×ã¹»µÄÄÚ´æÈ¥¶ÁÈ¡ÒÑÏÂÔØÎļþ. \n"
 
-#: datafile.c:109 denied.c:104 download.c:161 report.c:166 smartfilter.c:123
+#: datafile.c:130 denied.c:103 download.c:98 report.c:172 smartfilter.c:113
+#: totday.c:79
 #, c-format
 msgid "There is a broken record or garbage in file %s\n"
-msgstr "�в������ļ�¼��������ļ� %s\n"
+msgstr "Óв»ÍêÕûµÄ¼Í¼»òÀ¬»øÔÚÎļþ %s\n"
 
-#: datafile.c:113
+#: datafile.c:134
 #, c-format
 msgid "There is an invalid smart info in file %s\n"
-msgstr "����Ч��������Ϣ���ļ� %s\n"
+msgstr "ÓÐÎÞЧµÄÖÇÄÜÐÅÏ¢ÔÚÎļþ %s\n"
 
-#: datafile.c:132 datafile.c:177 realtime.c:280 report.c:203 report.c:279
-#: report.c:304 siteuser.c:139 topsites.c:120 topsites.c:139
+#: datafile.c:153 datafile.c:198 realtime.c:262 report.c:210 report.c:305
+#: report.c:335 siteuser.c:126 siteuser.c:177 topsites.c:108 topsites.c:127
 #, c-format
 msgid "Not enough memory to store the url\n"
-msgstr "û���㹻���ڴ�ȥ�洢���\n"
+msgstr "ûÓÐ×ã¹»µÄÄÚ´æÈ¥´æ´¢Á¬½Ó\n"
 
-#: datafile.c:198
+#: datafile.c:219
 #, c-format
 msgid "Datafile %s written successfully\n"
-msgstr "�����ļ� %s д���ɹ�\n"
+msgstr "Êý¾ÝÎļþ %s дÈë³É¹¦\n"
 
 #: decomp.c:36
 #, c-format
 msgid "File not found: %s\n"
-msgstr "δ�ҵ��ļ�: %s\n"
+msgstr "δÕÒµ½Îļþ: %s\n"
 
 #: decomp.c:42 decomp.c:62
 #, c-format
 msgid "Decompressing log file \"%s\" with zcat\n"
-msgstr "��ѹ����־�ļ� \"%s\" ʹ��zcat\n"
+msgstr "½âѹËõÈÕÖ¾Îļþ \"%s\" ʹÓÃzcat\n"
 
 #: decomp.c:44 decomp.c:54 decomp.c:64
 #, c-format
 msgid "decompression command too long for log file %s\n"
-msgstr "��ѹ��־�ļ��������� %s\n"
+msgstr "½âѹÈÕÖ¾ÎļþÃüÁî¹ý³¤ %s\n"
 
 #: decomp.c:52
 #, c-format
 msgid "Decompressing log file \"%s\" with bzcat\n"
-msgstr "��ѹ���ļ� \"%s\" ʹ��bzcat\n"
+msgstr "½âѹËõÎļþ \"%s\" ʹÓÃbzcat\n"
 
 #: denied.c:34
 #, c-format
@@ -366,443 +286,382 @@ msgid "%d more denied access not shown here&hellip;"
 msgid_plural "%d more denied accesses not shown here&hellip;"
 msgstr[0] ""
 
-#: denied.c:69
-msgid "Denied report not produced because it is empty\n"
-msgstr ""
-
-#: denied.c:76 denied.c:81
+#: denied.c:75 denied.c:80
 #, c-format
 msgid "(denied) Cannot open log file %s\n"
-msgstr "(denied)���ܴ�����־�ļ� %s\n"
+msgstr "(denied)²»ÄÜ´ò¿ªÈÕÖ¾Îļþ %s\n"
 
-#: denied.c:85 denied.c:89
+#: denied.c:84 denied.c:88
 msgid "Denied"
-msgstr "����"
+msgstr "ÉùÃ÷"
 
-#: denied.c:96
+#: denied.c:95
 #, c-format
 msgid "Not enough memory to read the denied accesses\n"
-msgstr "û���㹻���ڴ����ȡ��ֹ����\n"
+msgstr "ûÓÐ×ã¹»µÄÄÚ´æÀ´¶ÁÈ¡×èÖ¹·ÃÎÊ\n"
 
-<<<<<<< HEAD
 #: denied.c:180
 #, fuzzy, c-format
 msgid "Failed to delete the file \"%s\" after processing it - %s\n"
-msgstr "ɾ���ļ�ʧ�� %s\n"
-
-=======
->>>>>>> origin/v2.3
-#: dichotomic.c:161 dichotomic.c:176
-#, fuzzy, c-format
-msgid "Not enough memory to store the key/value pair %s/%s\n"
-msgstr "û���㹻���ڴ���洢�û� %s\n"
-
-#: download.c:65
-#, c-format
-msgid "Path too long to sort the file: %s/download.int_unsort\n"
-msgstr ""
-
-#: download.c:75
-#, fuzzy, c-format
-msgid "Path too long for %s/download.int_unsort\n"
-msgstr "�û������� %s/%s.unsort\n"
-
-#: download.c:114
-#, fuzzy
-msgid "No downloaded files to report\n"
-msgstr "���غ�׺�б�����\n"
-
-#: download.c:125
-msgid "Sorted file doesn't exist (to produce the download report)\n"
-msgstr ""
+msgstr "ɾ³ýÎļþʧ°Ü %s\n"
 
-#: download.c:133 download.c:138
+#: download.c:70 download.c:75
 #, c-format
 msgid "(download) Cannot open log file %s\n"
-msgstr "(download) ���ܴ�����־�ļ� %s\n"
+msgstr "(download) ²»ÄÜ´ò¿ªÈÕÖ¾Îļþ %s\n"
 
-#: download.c:142 download.c:146 topuser.c:239
+#: download.c:79 download.c:83 topuser.c:197
 msgid "Downloads"
-msgstr "����"
+msgstr "ÏÂÔØ"
 
-#: download.c:153 report.c:156 topuser.c:293
+#: download.c:90 report.c:162 topuser.c:239
 #, c-format
 msgid "Not enough memory to read the downloaded files\n"
-msgstr "û���㹻���ڴ����ȡ�����ļ�\n"
+msgstr "ûÓÐ×ã¹»µÄÄÚ´æÀ´¶ÁÈ¡ÏÂÔØÎļþ\n"
 
-#: download.c:275
+#: download.c:198
 #, c-format
 msgid "Download suffix list too long\n"
-msgstr "���غ�׺�б�����\n"
+msgstr "ÏÂÔغó׺Áбí¹ý³¤\n"
 
-#: download.c:283
+#: download.c:206
 #, c-format
 msgid "Too many download suffixes\n"
-msgstr "���������غ�׺\n"
+msgstr "¹ý¶àµÄÏÂÔغó׺\n"
 
-#: email.c:61 email.c:67 email.c:73 email.c:151 email.c:157 email.c:269
+#: email.c:55 email.c:61 email.c:67 email.c:133 email.c:144 email.c:150
+#: email.c:254
 #, c-format
 msgid "(email) Cannot open file %s\n"
-msgstr "(email)���ܴ����ļ� %s\n"
-
-#: email.c:129
-#, c-format
-msgid "Total statistics mismatch when reading %s to produce the email report\n"
-msgstr ""
+msgstr "(email)²»ÄÜ´ò¿ªÎļþ %s\n"
 
-#: email.c:135 html.c:388 log.c:1675 realtime.c:98 redirector.c:391
-#: siteuser.c:63 sort.c:79 topsites.c:84 topsites.c:207 topuser.c:189
-#: useragent.c:136 useragent.c:219 useragent.c:288
-#, fuzzy, c-format
-msgid "Sort command too long when sorting file \"%s\" to \"%s\"\n"
-msgstr "ѹËõÃüÁî¶ÔÓÚÈÕÖ¾Îļþ¹ý³¤ %s\n"
-
-#: email.c:161 log.c:364
+#: email.c:154 log.c:359
 msgid "Squid User Access Report"
-msgstr "Squid�û����ʱ���"
+msgstr "SquidÓû§·ÃÎʱ¨¸æ"
 
-#: email.c:165
+#: email.c:158
 msgid "Decreasing Access (bytes)"
-msgstr "���ͷ���(bytes)"
+msgstr "½µµÍ·ÃÎÊ(bytes)"
 
-#: email.c:169 html.c:182 repday.c:127 report.c:258 useragent.c:167
+#: email.c:162 html.c:229 repday.c:128 report.c:282 useragent.c:162
 msgid "Period"
-msgstr "�ڼ�"
+msgstr "ÆÚ¼ä"
 
-#. TRANSLATORS: This is a column header showing the position of the entry in the sorted list.
-#: email.c:173 siteuser.c:93 topsites.c:246 topuser.c:260
+#: email.c:166 siteuser.c:91 siteuser.c:93 topsites.c:198 topuser.c:214
 msgid "NUM"
-msgstr "����"
+msgstr "Êý×Ö"
 
-#. TRANSLATORS: This is a column header showing the number of connections to a visited site.
-#: email.c:177 html.c:205 topsites.c:252 topuser.c:272
+#: email.c:170 html.c:246 topsites.c:198 topuser.c:220
 msgid "CONNECT"
-msgstr "���"
+msgstr "Á¬½Ó"
 
-#. TRANSLATORS: This is a column header showing the number of transfered bytes.
-#: email.c:179 grepday.c:752 html.c:207 html.c:209 index.c:432 repday.c:140
-#: siteuser.c:97 topsites.c:254 topuser.c:274 topuser.c:276
+#: email.c:172 grepday.c:737 html.c:248 html.c:250 index.c:416 repday.c:141
+#: siteuser.c:91 topsites.c:198 topuser.c:222 topuser.c:224
 msgid "BYTES"
-msgstr "�ֽ�"
+msgstr "×Ö½Ú"
 
-#: email.c:181 grepday.c:765 html.c:213 topuser.c:280
+#: email.c:174 grepday.c:750 html.c:254 topuser.c:228
 msgid "ELAPSED TIME"
-msgstr "��ʹ��ʱ��"
+msgstr "ÒÑʹÓÃʱ¼ä"
 
-#: email.c:183 html.c:215 topuser.c:282
+#: email.c:176 html.c:256 topuser.c:230
 msgid "MILLISEC"
-msgstr "����"
+msgstr "ºÁÃë"
 
-#. TRANSLATORS: This is a column header showing the time spent by the proxy processing the requests.
-#: email.c:185 html.c:217 report.c:267 topsites.c:256 topuser.c:284
+#: email.c:178 html.c:258 topsites.c:198 topuser.c:232
 msgid "TIME"
-msgstr "ʱ��"
+msgstr "ʱ¼ä"
 
-#: email.c:194 useragent.c:197
+#: email.c:188 useragent.c:192
 #, c-format
 msgid "There is an invalid user ID in file %s\n"
-msgstr "��һ����ڵ��û�ID���ļ� %s\n"
+msgstr "ÓÐÒ»¸ö²»´æÔÚµÄÓû§IDÔÚÎļþ %s\n"
 
-#: email.c:198
+#: email.c:192
 #, c-format
 msgid "There is an invalid number of bytes in file %s\n"
-msgstr "�в����ڵ��ֽ������ļ� %s\n"
+msgstr "Óв»´æÔÚµÄ×Ö½ÚÊýÔÚÎļþ %s\n"
 
-#: email.c:202
+#: email.c:196
 #, c-format
 msgid "There is an invalid number of access in file %s\n"
-msgstr "��һ����ڵķ��������ļ� %s\n"
+msgstr "ÓÐÒ»¸ö²»´æÔڵķÃÎÊÊýÔÚÎļþ %s\n"
 
-#: email.c:206
+#: email.c:200
 #, c-format
 msgid "There is an invalid elapsed time in file %s\n"
-msgstr "��һ����Ч��ʱ��ֵ %s\n"
+msgstr "ÓÐÒ»¸öÎÞЧµÄʱ¼äֵ %s\n"
 
-#: email.c:231 email.c:233 html.c:503 repday.c:148 repday.c:172 repday.c:200
-#: repday.c:224 topuser.c:426 useragent.c:311
+#: email.c:212 email.c:214 html.c:509 repday.c:146 repday.c:170 repday.c:189
+#: repday.c:213 topuser.c:348 useragent.c:291
 msgid "TOTAL"
-msgstr "��ֵ"
+msgstr "×Üֵ"
 
-#: email.c:247 html.c:564 index.c:432 topuser.c:460
+#: email.c:235 html.c:575 index.c:416 topuser.c:381
 msgid "AVERAGE"
-msgstr "ƽ��ֵ"
-
-#. TRANSLATORS: The string is formatted using strftime. You can use
-#. any string formatting marker allowed by strftime.
-#: email.c:278
-#, fuzzy, c-format
-msgid "SARG report, %c"
-msgstr "SARG ���� %s"
+msgstr "ƽ¾ùÖµ"
 
-#: email.c:281
-#, fuzzy, c-format
-msgid "Sending mail with command: %s\n"
-msgstr "����: %s\n"
+#: email.c:261 html.c:240
+msgid "Report"
+msgstr "±¨¸æ"
 
-#: email.c:284 index.c:582 log.c:1663
+#: email.c:264 index.c:544 log.c:1643
 #, c-format
 msgid "command return status %d\n"
-msgstr "�����״̬ %d\n"
+msgstr "ÃüÁî·µ»Ø״̬ %d\n"
 
-#: email.c:285 index.c:583 log.c:1664
+#: email.c:265 index.c:545 log.c:1644
 #, c-format
 msgid "command: %s\n"
-msgstr "����: %s\n"
+msgstr "ÃüÁî: %s\n"
 
-#: exclude.c:82 exclude.c:110
+#: exclude.c:65
 #, c-format
 msgid "Not enough memory to store the exlcluded IP addresses\n"
-msgstr "û���㹻���ڴ���洢���ų���IP��ַ\n"
+msgstr "ûÓÐ×ã¹»µÄÄÚ´æÀ´´æ´¢±»ÅųýµÄIPµØַ\n"
 
-#: exclude.c:161 exclude.c:171
+#: exclude.c:110 exclude.c:120
 #, c-format
 msgid "Not enough memory to store the excluded URLs\n"
-msgstr "û���㹻���ڴ���洢���ų������\n"
+msgstr "ûÓÐ×ã¹»µÄÄÚ´æÀ´´æ´¢±»ÅųýµÄÁ¬½Ó\n"
 
-#: exclude.c:196
+#: exclude.c:141
 #, c-format
 msgid "Cannot open exclude_hosts file: %s - %s\n"
-msgstr "���ܴ���exclude_hosts�ļ�: %s-%s\n"
+msgstr "²»ÄÜ´ò¿ªexclude_hostsÎļþ: %s-%s\n"
 
-#: exclude.c:200
+#: exclude.c:145
 #, c-format
 msgid "Loading exclude host file from: %s\n"
-msgstr "�����ܾ������ļ���: %s\n"
+msgstr "ÔØÈë¾Ü¾øÖ÷»úÎļþ´Ó: %s\n"
 
-#: exclude.c:203 exclude.c:317
+#: exclude.c:148 exclude.c:324
 #, c-format
 msgid "(gethexclude) Cannot open file %s - %s\n"
-msgstr "(gethexclude)���ܴ����ļ� %s - %s\n"
+msgstr "(gethexclude)²»ÄÜ´ò¿ªÎļþ %s - %s\n"
 
-#: exclude.c:214 url.c:596
+#: exclude.c:210
 #, c-format
-msgid "While reading \"%s\"\n"
-msgstr ""
+msgid "IPv6 addresses are not supported (found in %s)\n"
+msgstr "IPv6²»±»Ö§³Ö(found in %s)\n"
 
-#: exclude.c:314
+#: exclude.c:321
 #, c-format
 msgid "Loading exclude file from: %s\n"
-msgstr "�����ų��ļ���: %s\n"
+msgstr "ÔØÈëÅųýÎļþ´Ó: %s\n"
 
-#: exclude.c:322
+#: 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:327 log.c:1739 usertab.c:73 util.c:1414
+#: exclude.c:334 log.c:1713 util.c:1387
 #, c-format
 msgid "Cannot get the size of file %s\n"
-msgstr "���ܵõ��ļ��Ĵ�С %s\n"
+msgstr "²»Äܵõ½ÎļþµÄ´óС %s\n"
 
-#: exclude.c:332
+#: exclude.c:339
 #, c-format
 msgid "Failed to rewind the excluded users file %s: %s\n"
-msgstr "ת���ų��û��ļ�ʱʧ�� %s: %s\n"
+msgstr "תÏòÅųýÓû§Îļþʱʧ°Ü %s: %s\n"
 
-#: exclude.c:337
+#: exclude.c:344
 #, c-format
 msgid "malloc error (%ld bytes required)\n"
-msgstr "�ڴ�Ҳ���� (%ld bytes required)\n"
+msgstr "ÄÚ´æÒ²´íÎó (%ld bytes required)\n"
 
-#: getconf.c:210
+#: getconf.c:203
 #, c-format
 msgid "The string value of parameter \"%s\" is too long\n"
-msgstr "�������ַ���ֵ\"%s\" ̫��\n"
+msgstr "²ÎÊýµÄ×Ö·û´®Öµ\"%s\" Ì«³¤\n"
 
-#: getconf.c:230
+#: getconf.c:223
 #, c-format
 msgid "Missing double quote after parameter \"%s\"\n"
-msgstr "�ڲ���֮��ȱ��˫����\"%s\"\n"
+msgstr "ÔÚ²ÎÊýÖ®ºóȱÉÙË«ÒýºÅ\"%s\"\n"
 
-#: getconf.c:242
+#: getconf.c:235
 #, c-format
 msgid ""
 "Missing double quote after parameter \"%s\" or value is more than %d bytes "
 "long\n"
-msgstr "�ڲ���֮��ȱ��˫���� \"%s\" ������ֵ���� %d �ֽڳ�\n"
+msgstr "ÔÚ²ÎÊýÖ®ºóȱÉÙË«ÒýºÅ \"%s\" »òÕßÊýÖµ´óÓÚ %d ×Ö½Ú³¤\n"
 
-#: getconf.c:263
+#: getconf.c:256
 #, c-format
 msgid "The first word of parameter \"%s\" is more than %d bytes long\n"
-msgstr "�����ĵ�һ���� \"%s\" ���� %d �ֽڳ�\n"
+msgstr "²ÎÊýµÄµÚÒ»¸ö´Ê \"%s\" ´óÓÚ %d ×Ö½Ú³¤\n"
 
-#: getconf.c:267
+#: getconf.c:260
 #, c-format
 msgid "Missing second word for parameter \"%s\"\n"
-msgstr "����ȱ�ٵڶ����� \"%s\"\n"
+msgstr "²ÎÊýȱÉÙµÚ¶þ¸ö´Ê \"%s\"\n"
 
-#: getconf.c:277
+#: getconf.c:270
 #, c-format
 msgid "The second word of parameter \"%s\" is more than %d bytes long\n"
-msgstr "�ڶ������� \"%s\" ���� %d �ֽڳ�\n"
+msgstr "µÚ¶þ¸ö²ÎÊý \"%s\" ´óÓÚ %d ×Ö½Ú³¤\n"
 
-#: getconf.c:300
+#: getconf.c:293
 #, c-format
 msgid "The integer value of parameter \"%s\" is invalid\n"
-msgstr "������ֵ���� \"%s\" ������\n"
+msgstr "ÕûÊýÊýÖµ²ÎÊý \"%s\" ²»´æÔÚ\n"
 
-#: getconf.c:352
+#: getconf.c:345
 #, c-format
 msgid "Unknown value \"%s\" for parameter \"%s\"\n"
-msgstr "�����ڵ���ֵ \"%s\" ���� \"%s\"\n"
+msgstr "²»´æÔÚµÄÊýÖµ \"%s\" ²ÎÊý \"%s\"\n"
 
-#: getconf.c:356
+#: getconf.c:349
 #, c-format
 msgid ""
 "Value \"%s\" conflicts with other selected values for parameter \"%s\"\n"
-msgstr "��ֵ \"%s\" ��ͻ��������ѡ���IJ�����ֵ \"%s\"\n"
+msgstr "ÊýÖµ \"%s\" ³åÍ»ÓëÆäËü±»Ñ¡¶¨µÄ²ÎÊýÊýֵ \"%s\"\n"
 
-#: getconf.c:387
+#: getconf.c:380
 #, fuzzy, c-format
 msgid "Unknown sort criterion \"%s\" for parameter \"%s\"\n"
-msgstr "�����ڵ���ֵ \"%s\" ���� \"%s\"\n"
+msgstr "²»´æÔÚµÄÊýÖµ \"%s\" ²ÎÊý \"%s\"\n"
 
-#: getconf.c:402
+#: getconf.c:395
 #, fuzzy, c-format
 msgid "Unknown sort order \"%s\" for parameter \"%s\"\n"
-msgstr "�����ڵ���ֵ \"%s\" ���� \"%s\"\n"
+msgstr "²»´æÔÚµÄÊýÖµ \"%s\" ²ÎÊý \"%s\"\n"
 
-#: getconf.c:422
+#: getconf.c:415
 #, c-format
 msgid "SARG: TAG: %s\n"
 msgstr "SARG: TAG: %s\n"
 
-#: getconf.c:471
+#: getconf.c:462
 #, c-format
 msgid ""
 "Maybe you have a broken record or garbage in \"date_format\" parameter\n"
-msgstr "�������в������ļ�¼������� \"date_format\" ������\n"
+msgstr "¿ÉÄÜÄãÓв»ÍêÕûµÄ¼Í¼»òÀ¬»øÔÚ \"date_format\" ²ÎÊýÖÐ\n"
 
-#: getconf.c:481
+#: getconf.c:472
 #, c-format
 msgid "Error: Invalid syntax in hours tag!\n"
-msgstr "����: �����ڵľ䷨��Сʱ��ǩ��!\n"
+msgstr "´íÎó: ²»´æÔڵľ䷨ÔÚСʱ±êÇ©ÖÐ!\n"
 
-#: getconf.c:489
+#: getconf.c:480
 #, c-format
 msgid "Error: Invalid syntax in weekdays tag!\n"
-msgstr "����: �����ڵľ䷨����ʱ����ǩ��!\n"
+msgstr "´íÎó: ²»´æÔڵľ䷨ÔÚÔÚʱ¼ä±êÇ©ÖÐ!\n"
 
-#: getconf.c:502
+#: getconf.c:493
 #, c-format
 msgid "Too many log files in configuration file\n"
-msgstr "�������ļ��д��ڹ�������־�ļ�\n"
+msgstr "ÔÚÅäÖÃÎļþÖдæÔÚ¹ý¶àµÄÈÕÖ¾Îļþ\n"
 
-#: getconf.c:514
+#: getconf.c:505
 #, c-format
 msgid "Too many redirector log files in configuration file\n"
-msgstr "�������ļ����ж������ض�����־�ļ�\n"
+msgstr "ÔÚÅäÖÃÎļþÖÐÓжàÓàµÄÖض¨ÏòÈÕÖ¾Îļþ\n"
 
-#: getconf.c:658 getconf.c:665
+#: getconf.c:645 getconf.c:652
 #, c-format
 msgid "Template file name is too long in parameter \"AuthUserTemplateFile\"\n"
-msgstr "�ڲ�������ʱ�ļ�������\"AuthUserTemplateFile\"\n"
-
-#: getconf.c:683
-#, c-format
-msgid ""
-"No graphs available as sarg was not compiled with libgd. Set \"graphs\" to "
-"\"no\" in %s to disable this warning\n"
-msgstr ""
+msgstr "ÔÚ²ÎÊýÖÐÁÙʱÎļþÃû¹ý³¤\"AuthUserTemplateFile\"\n"
 
-#: getconf.c:693
+#: getconf.c:673
 #, c-format
 msgid ""
 "squidguard_log_format is deprecated and has been replaced by "
 "redirector_log_format. Please update your configuration file.\n"
 msgstr ""
-"squidguard_log_format��ʧЧ�������Ѿ��� redirector_log_format ��������������"
-"���������ļ���\n"
+"squidguard_log_formatÒÑʧЧ£¬²¢ÇÒÒѾ­±» redirector_log_format ËùÌæ´ú£¬Çë¸üÐÂ"
+"ÄúµÄÅäÖÃÎļþ¡£\n"
 
-#: getconf.c:702
+#: getconf.c:682
 #, fuzzy, c-format
 msgid ""
 "redirector_ignore_date is deprecated and has been replaced by "
 "redirector_filter_out_date that does the action implied by its name as "
 "opposed to redirector_ignore_date. Please update your configuration file.\n"
 msgstr ""
-"squidguard_ignore_date ��ʧЧ�������Ѿ���redirector_ignore_date��������������"
-"���������ļ���\n"
+"squidguard_ignore_date ÒÑʧЧ£¬²¢ÇÒÒѾ­±»redirector_ignore_dateËùÌæ´ú¡£Çë¸üÐÂ"
+"ÄúµÄÅäÖÃÎļþ¡£\n"
 
-#: getconf.c:707
+#: getconf.c:687
 #, fuzzy, c-format
 msgid ""
 "squidguard_ignore_date is deprecated and has been replaced by "
 "redirector_filter_out_date that does the action implied by its name as "
 "opposed to squidguard_ignore_date. Please update your configuration file.\n"
 msgstr ""
-"squidguard_ignore_date ��ʧЧ�������Ѿ���redirector_ignore_date��������������"
-"���������ļ���\n"
+"squidguard_ignore_date ÒÑʧЧ£¬²¢ÇÒÒѾ­±»redirector_ignore_dateËùÌæ´ú¡£Çë¸üÐÂ"
+"ÄúµÄÅäÖÃÎļþ¡£\n"
 
-#: getconf.c:714
+#: getconf.c:694
 #, fuzzy, c-format
 msgid ""
 "dansguardian_ignore_date is deprecated and has been replaced by "
 "dansguardian_filter_out_date that does the action implied by its name as "
 "opposed to dansguardian_ignore_date. Please update your configuration file.\n"
 msgstr ""
-"squidguard_ignore_date ��ʧЧ�������Ѿ���redirector_ignore_date��������������"
-"���������ļ���\n"
+"squidguard_ignore_date ÒÑʧЧ£¬²¢ÇÒÒѾ­±»redirector_ignore_dateËùÌæ´ú¡£Çë¸üÐÂ"
+"ÄúµÄÅäÖÃÎļþ¡£\n"
 
-#: getconf.c:763 getconf.c:768
+#: getconf.c:737 getconf.c:742
 #, c-format
 msgid "The \"byte_cost\" parameter of the configuration file is invalid\n"
-msgstr "\"byte_cost\" �����ļ��IJ���������\n"
+msgstr "\"byte_cost\" ÅäÖÃÎļþµÄ²ÎÊý²»´æÔÚ\n"
 
-#: getconf.c:775
+#: getconf.c:749
 #, c-format
 msgid "SARG: Unknown option %s\n"
-msgstr "SARG: δ֪��ѡ�� %s\n"
+msgstr "SARG: δ֪µÄÑ¡Ïî %s\n"
 
-#: getconf.c:784
+#: getconf.c:759
 #, c-format
 msgid "Loading configuration from %s\n"
-msgstr "�������ô� %s\n"
+msgstr "ÔØÈëÅäÖÃ´Ó %s\n"
 
-#: getconf.c:787
+#: getconf.c:762
 #, c-format
 msgid "(getconf) Cannot open file %s\n"
-msgstr "(getconf) ���ܴ����ļ� %s\n"
+msgstr "(getconf) ²»ÄÜ´ò¿ªÎļþ %s\n"
 
 #: grepday.c:144
 #, fuzzy, c-format
 msgid "realloc error (%<PRIu64> bytes required)\n"
-msgstr "���·������� (%zu bytes required)\n"
+msgstr "ÖØзÖÅä´íÎó (%zu bytes required)\n"
 
 #: grepday.c:157
 #, c-format
 msgid "(grepday) iconv failed to convert string \"%s\" from %s to UTF-8 - %s\n"
-msgstr "(grepday) iconvת���ַ���ʧ�� \"%s\" �� %s �� UTF-8 - %s \n"
+msgstr "(grepday) iconvת»»×Ö·û´®Ê§°Ü \"%s\" ´Ó %s µ½ UTF-8 - %s \n"
 
 #: grepday.c:170
 #, c-format
 msgid "libgd failed to calculate the bounding box of the text \"%s\": %s\n"
-msgstr "libgd �����ı��еı߽�ʧ�� \"%s\":%s\n"
+msgstr "libgd ¼ÆËãÎı¾Öеı߽çʧ°Ü \"%s\":%s\n"
 
 #: grepday.c:237
 #, c-format
 msgid "libgd failed to render the text \"%s\": %s\n"
-msgstr "libgb �ύ�ı�ʱʧ�� \"%s\": %s\n"
+msgstr "libgb Ìá½»Îı¾Ê±Ê§°Ü \"%s\": %s\n"
 
 #: grepday.c:296
 #, fuzzy, c-format
 msgid "Minimum for Y scale of the graph is out of range: %<PRId64>\n"
-msgstr "��ͼ��Y����������С��Χ: %lld\n"
+msgstr "ÊÓͼµÄY±ÈÀý³¬³ö×îС·¶Χ: %lld\n"
 
 #: grepday.c:300
 #, fuzzy, c-format
 msgid "Maximum for Y scale of the graph is out of range: %<PRId64>\n"
-msgstr "��ͼ��Y��������������Χ: %lld\n"
+msgstr "ÊÓͼµÄY±ÈÀý³¬³ö×î´ó·¶Χ: %lld\n"
 
 #: grepday.c:328
 #, c-format
 msgid "Unknown type %d for Y axis scale\n"
-msgstr "δ֪���� %d ����Y������\n"
+msgstr "δ֪ÀàÐÍ %d ¶ÔÓÚYÖá±ÈÀý\n"
 
 #: grepday.c:489
 #, c-format
 msgid "Unknown color \"%s\" requested for the graph. Using orange instead\n"
-msgstr "δ֪����ɫ \"%s\" ���ڸ�ͼ��, ��ʹ�ó�ɫ����\n"
+msgstr "δ֪µÄÑÕÉ« \"%s\" ¶ÔÓÚ¸ÃͼÐÎ, ÇëʹÓóÈÉ«Ìæ´ú\n"
 
 #: grepday.c:557
 msgid "SARG, "
@@ -811,2970 +670,2049 @@ msgstr "SARG,"
 #: grepday.c:561
 #, c-format
 msgid "User: %s"
-msgstr "�û�: %s"
+msgstr "Óû§: %s"
 
-#: grepday.c:617 grepday.c:734
+#: grepday.c:617 grepday.c:719
 #, fuzzy, c-format
 msgid "user name too long for %s/%s/%s\n"
-msgstr "�û������� %s/%s.day\n"
+msgstr "Óû§Ãû¹ý³¤ %s/%s.day\n"
 
-#: grepday.c:621 grepday.c:692
+#: grepday.c:621 grepday.c:680
 #, c-format
 msgid "(grepday) Cannot open log file %s\n"
-msgstr "(grepday) ���ܴ�����־�ļ� %s\n"
-
-#: grepday.c:638
-#, c-format
-msgid "Graphs disabled as requested in %s\n"
-msgstr ""
-
-#: grepday.c:643
-#, c-format
-msgid "Graphs disabled as no font names were provided in %s\n"
-msgstr ""
+msgstr "(grepday) ²»ÄÜ´ò¿ªÈÕÖ¾Îļþ %s\n"
 
-#: grepday.c:648
+#: grepday.c:637
 #, c-format
 msgid "(grepday) Fontname %s not found\n"
-msgstr "(grepday) �������� %s �Ҳ���\n"
+msgstr "(grepday) ×ÖÌåÃû³Æ %s ÕÒ²»µ½\n"
 
-#: grepday.c:655
+#: grepday.c:644
 #, c-format
 msgid "(grepday) iconv cannot convert from %s to UTF-8 - %s\n"
-msgstr "(grepday) iconv ����ת���� %s �� UTF-8 - %s\n"
+msgstr "(grepday) iconv ²»ÄÜת»»´Ó %s µ½ UTF-8 - %s\n"
 
-#: grepday.c:679
+#: grepday.c:668
 #, c-format
 msgid "user name too long for %s/%s.day\n"
-msgstr "�û������� %s/%s.day\n"
+msgstr "Óû§Ãû¹ý³¤ %s/%s.day\n"
 
-#: grepday.c:702 redirector.c:487 repday.c:81
+#: grepday.c:690 repday.c:82 squidguard_report.c:100
 #, c-format
 msgid "Invalid date in file %s\n"
-msgstr "���ļ��д�����Ч������ %s\n"
+msgstr "ÔÚÎļþÖдæÔÚÎÞЧµÄÈÕÆÚ %s\n"
 
-#: grepday.c:708
+#: grepday.c:696
 #, c-format
 msgid "Invalid entry in file %s\n"
-msgstr "���ļ��д�����Ч���� %s\n"
+msgstr "ÔÚÎļþÖдæÔÚÎÞЧÊäÈë %s\n"
 
-#: grepday.c:714 repday.c:106
+#: grepday.c:702 repday.c:107 totday.c:98
 #, c-format
 msgid "Invalid number of bytes in file %s\n"
-msgstr "���ļ��д�����Ч�������ֽ� %s\n"
+msgstr "ÔÚÎļþÖдæÔÚÎÞЧµÄÊý×Ö×Ö½Ú %s\n"
 
-#: grepday.c:721 repday.c:113
+#: grepday.c:709 repday.c:114 totday.c:105
 #, c-format
 msgid "Invalid elapsed time in file %s\n"
-msgstr "���ļ��д�����Ч��ʱ���� %s\n"
+msgstr "ÔÚÎļþÖдæÔÚÎÞЧµÄʱ¼ä¶Î %s\n"
 
-#: grepday.c:738
+#: grepday.c:723
 #, fuzzy, c-format
 msgid "(grepday) Cannot open output file %s\n"
-msgstr "(grepday) ���ܴ�����־�ļ� %s\n"
+msgstr "(grepday) ²»ÄÜ´ò¿ªÈÕÖ¾Îļþ %s\n"
 
-#: grepday.c:741
+#: grepday.c:726
 #, fuzzy
 msgid "Graph report"
-msgstr "�ձ�"
+msgstr "ÈÕ±¨"
 
-#: grepday.c:748 grepday.c:761 index.c:263
+#: grepday.c:733 grepday.c:746 index.c:252
 msgid "DAYS"
-msgstr "��"
+msgstr "ÈÕ"
 
-#: html.c:64
-#, fuzzy, c-format
-msgid "File name too long: %s/sargtmp.int_unsort\n"
-msgstr "�ļ�������: %s/%s%s\n"
+#: html.c:77
+#, c-format
+msgid "(html2) Cannot open file %s\n"
+msgstr "(html2) ²»ÄÜ´ò¿ªÈÕÖ¾Îļþ %s\n"
 
-#: html.c:69
-#, fuzzy, c-format
-msgid "File name too long: %s/sargtmp.int_log\n"
-msgstr "�ļ�������: %s/%s.ip\n"
+#: html.c:100
+#, c-format
+msgid "(html11) Cannot open file %s\n"
+msgstr "(html11) ²»ÄÜ´ò¿ªÎļþ %s\n"
 
-#: html.c:87
+#: html.c:104
 #, c-format
-msgid "Destination directory too long: %s/%s\n"
-msgstr "Ŀ��Ŀ¼����: %s/%s\n"
+msgid "(html11) read error in %s\n"
+msgstr "(html11) ¶ÁÈ¡´íÎóÔÚ %s\n"
 
-#: html.c:98 index.c:543 index.c:551 util.c:331 util.c:342 util.c:931
-#, fuzzy, c-format
-msgid "Cannot create directory %s - %s\n"
-msgstr "�����ļ���ʱʧ�� %s - %s\n"
+#: html.c:136
+#, c-format
+msgid "Unknown user ID %s in directory %s\n"
+msgstr "δ֪µÄÓû§ID %s ÔÚĿ¼ %s\n"
 
-#: html.c:105
-#, fuzzy, c-format
-msgid "Input file name too long: %s/htmlrel.txt\n"
-msgstr "���������ƹ���: %s/%s\n"
+#: html.c:146
+#, c-format
+msgid "Destination directory too long: %s/%s\n"
+msgstr "Ä¿±êĿ¼¹ý³¤: %s/%s\n"
 
-#: html.c:110
+#: html.c:155
 #, c-format
-msgid "(html3) Cannot open file %s\n"
-msgstr "(html3) ���ܴ����ļ� %s\n"
+msgid "Input file name too long: %s/%s\n"
+msgstr "ÊäÈëµÄÃû³Æ¹ý³¤: %s/%s\n"
 
-#: html.c:115
+#: html.c:159
 #, c-format
 msgid "Output file name too long: %s/%s/%s.html\n"
-msgstr "�����ļ�������: %s/%s/%s.html\n"
+msgstr "Êä³öÎļþÃû¹ý³¤: %s/%s/%s.html\n"
 
-#: html.c:119
-<<<<<<< HEAD
+#: html.c:163
 #, c-format
 msgid "File name too long: %s/%s/denied_%s.html\n"
-msgstr "�ļ�������: %s/%s/denied_%s.html\n"
-=======
-#, fuzzy, c-format
-msgid "File name too long: %s/denied_%s.html\n"
-msgstr "�ļ�������: %s/%s/denied_%s.html\n"
->>>>>>> origin/v2.3
+msgstr "ÎļþÃû¹ý³¤: %s/%s/denied_%s.html\n"
+
+#: html.c:170
+#, c-format
+msgid "(html3) Cannot open file %s\n"
+msgstr "(html3) ²»ÄÜ´ò¿ªÎļþ %s\n"
 
-#: html.c:140 html.c:230 topuser.c:308
+#: html.c:187 html.c:269 topuser.c:254
 #, c-format
 msgid "There is a broken number of access in file %s\n"
-msgstr "�в������ķ����������ļ� %s\n"
+msgstr "Óв»ÍêÕûµÄ·ÃÎÊÊý×ÖÔÚÎļþ %s\n"
 
-#: html.c:145
+#: html.c:192
 #, c-format
 msgid "There is a broken downloaded size in file %s\n"
-msgstr "�в����������ش�С���ļ� %s\n"
+msgstr "Óв»ÍêÕûµÄÏÂÔØ´óСÔÚÎļþ %s\n"
 
-#: html.c:154 html.c:242
+#: html.c:201 html.c:281
 #, c-format
 msgid "There is a broken access code in file %s\n"
-msgstr "�в������ķ��ʴ������ļ� %s\n"
+msgstr "Óв»ÍêÕûµÄ·ÃÎÊ´úÂëÔÚÎļþ %s\n"
 
-#: html.c:158 html.c:246 report.c:171
+#: html.c:205 html.c:285 report.c:177
 #, c-format
 msgid "There is a broken elapsed time in file %s\n"
-msgstr "�в�������ʱ�����ļ� %s\n"
+msgstr "Óв»ÍêÕûµÄʱ¼äÔÚÎļþ %s\n"
 
-#: html.c:163
+#: html.c:210
 #, c-format
 msgid "There is a broken in-cache volume in file %s\n"
-msgstr "�в�������in-cache�����ļ� %s\n"
+msgstr "Óв»ÍêÕûµÄin-cache¾íÔÚÎļþ %s\n"
 
-#: html.c:168
+#: html.c:215
 #, c-format
 msgid "There is a broken out-cache volume in file %s\n"
-msgstr "�в�������out-cache�����ļ� %s\n"
+msgstr "Óв»ÍêÕûµÄout-cache¾íÔÚÎļþ %s\n"
 
-#: html.c:177
+#: html.c:224
 #, c-format
 msgid "(html5) Cannot open file %s\n"
-msgstr "(html5) ���ܴ����ļ� %s\n"
+msgstr "(html5) ²»ÄÜ´ò¿ªÎļþ %s\n"
 
-#: html.c:181 html.c:187
+#: html.c:228 html.c:234
 msgid "User report"
-msgstr "�û�����"
+msgstr "Óû§±¨¸æ"
 
-#: html.c:183 repday.c:128 report.c:259 report.c:263 smartfilter.c:177
+#: html.c:230 repday.c:129 report.c:283 report.c:287 smartfilter.c:167
 msgid "User"
-msgstr "�û�"
+msgstr "Óû§"
 
-#: html.c:185 report.c:261
+#: html.c:232 report.c:285
 #, c-format
 msgid "Sort:&nbsp;%s, %s"
 msgstr ""
 
-<<<<<<< HEAD
-#: html.c:198 smartfilter.c:109 topuser.c:242
+#: html.c:240 smartfilter.c:58 smartfilter.c:99 topuser.c:200
 msgid "SmartFilter"
-msgstr "���ܹ���"
-
-#: html.c:198
-msgid "Report"
-msgstr "����"
-
-#: html.c:212 topuser.c:278
-=======
-#: html.c:192
-#, fuzzy
-msgid "SmartFilter report"
-msgstr "���ܹ���"
+msgstr "ÖÇÄܹýÂË"
 
-#: html.c:211 topuser.c:278
->>>>>>> origin/v2.3
+#: html.c:252 topuser.c:226
 msgid "IN-CACHE-OUT"
 msgstr "IN-CACHE-OUT"
 
-#: html.c:222
+#: html.c:263
 #, c-format
 msgid "Making report: %s\n"
-msgstr "���DZ���: %s\n"
+msgstr "±ê¼Ç±¨¸æ: %s\n"
 
-#: html.c:234 topuser.c:304 util.c:771
+#: html.c:273 topuser.c:250 util.c:732
 #, c-format
 msgid "There is a broken number of bytes in file %s\n"
-msgstr "�в��������ֽ��������ļ� %s\n"
+msgstr "Óв»ÍêÕûµÄ×Ö½ÚÊý×ÖÔÚÎļþ %s\n"
 
-#: html.c:250
+#: html.c:289
 #, c-format
 msgid "There is a broken in cache column in file %s\n"
-msgstr "�ж��ڻ����������ļ� %s\n"
+msgstr "ÖжÏÔÚ»º´æÁÐÄÚÔÚÎļþ %s\n"
 
-#: html.c:254
+#: html.c:293
 #, c-format
 msgid "There is a broken out of cache column in file %s (%d)\n"
-msgstr "�ж��ڻ����������ļ� %s(%d)\n"
+msgstr "ÖжÏÔÚ»º´æÁÐÍâÔÚÎļþ %s(%d)\n"
 
-#: html.c:268 topuser.c:355
+#: html.c:307 topuser.c:296
 msgid "date/time report"
-msgstr "����/ʱ�� ����"
+msgstr "ÈÕÆÚ/ʱ¼ä ±¨¸æ"
 
-#: html.c:321
+#: html.c:351
 msgid "DENIED"
-msgstr "��ֹ"
+msgstr "×èֹ"
 
-<<<<<<< HEAD
-#: html.c:330
-#, fuzzy, c-format
-msgid "Cannot delete unused file \"%s\" - %s\n"
-msgstr "�޷�ɾ����ʱ�ļ� %s - %s\n"
-
-#: html.c:336
-=======
-#: html.c:335
->>>>>>> origin/v2.3
+#: html.c:359
 #, c-format
 msgid "File name too long: %s/%s.ip\n"
-msgstr "�ļ�������: %s/%s.ip\n"
+msgstr "ÎļþÃû¹ý³¤: %s/%s.ip\n"
 
-#: html.c:340
+#: html.c:364
 #, c-format
 msgid "(html6) Cannot open file %s\n"
-msgstr "(html6)���ܴ����ļ� %s\n"
+msgstr "(html6)²»ÄÜ´ò¿ªÎļþ %s\n"
 
-#: html.c:345
+#: html.c:369
 #, c-format
 msgid "(html7) Cannot open file %s\n"
-msgstr "(html7) ���ܴ����ļ� %s\n"
+msgstr "(html7) ²»ÄÜ´ò¿ªÎļþ %s\n"
 
-#: html.c:356 html.c:417
+#: html.c:380 html.c:433
 #, c-format
 msgid "Maybe you have a broken user IP in your %s file\n"
-msgstr "�������в��������û�IP��ַ������ %s �ļ��� \n"
+msgstr "¿ÉÄÜÄãÓв»ÍêÕûµÄÓû§IPµØÖ·ÔÚÄãµÄ %s ÎļþÖÐ \n"
 
-#: html.c:365 log.c:1241
+#: html.c:389 log.c:1207
 #, c-format
 msgid "Maybe you have a broken day in your %s file\n"
-msgstr "�������в����������������� %s �ļ��� \n"
+msgstr "¿ÉÄÜÄãÓв»ÍêÕûµÄÈÕÆÚÔÚÄãµÄ %s ÎļþÖÐ \n"
 
-#: html.c:369 log.c:1200
+#: html.c:393 log.c:1166 log.c:1339
 #, c-format
 msgid "Maybe you have a broken time in your %s file\n"
-msgstr "�������в�������ʱ�������� %s �ļ���\n"
+msgstr "¿ÉÄÜÄãÓв»ÍêÕûµÄʱ¼äÔÚÄãµÄ %s ÎļþÖÐ\n"
 
-#: html.c:373 html.c:421
+#: html.c:397 html.c:437
 #, c-format
 msgid "Maybe you have a broken size in your %s file\n"
-msgstr "�������в������Ĵ�С������ %s �ļ���\n"
+msgstr "¿ÉÄÜÄãÓв»ÍêÕûµÄ´óСÔÚÄãµÄ %s ÎļþÖÐ\n"
 
-#: html.c:377 html.c:425 log.c:1030 log.c:1035
+#: html.c:401 html.c:441 log.c:1001 log.c:1006
 #, c-format
 msgid "Maybe you have a broken elapsed time in your %s file\n"
-msgstr "�������в������Ĺ�ȥʱ�������� %s �ļ���\n"
+msgstr "¿ÉÄÜÄãÓв»ÍêÕûµÄ¹ýȥʱ¼äÔÚÄãµÄ %s ÎļþÖÐ\n"
 
-#: html.c:399
+#: html.c:420
 #, c-format
 msgid "(html8) Cannot open file %s\n"
-msgstr "(html8) ���ܴ����ļ� %s\n"
+msgstr "(html8) ²»ÄÜ´ò¿ªÎļþ %s\n"
 
-#: html.c:533
+#: html.c:539
 #, c-format
 msgid "(html9) Cannot open file %s\n"
-msgstr "(html9) ���ܴ����ļ� %s\n"
+msgstr "(html9) ²»ÄÜ´ò¿ªÎļþ %s\n"
 
-#: html.c:548
+#: html.c:554
 #, c-format
 msgid "(html10) Cannot open file %s\n"
-msgstr "(html10) ���ܴ����ļ� %s\n"
+msgstr "(html10) ²»ÄÜ´ò¿ªÎļþ %s\n"
 
-#: html.c:555
+#: html.c:561
 #, c-format
 msgid "User %s limit exceeded (%d MB). Added to file %s\n"
-msgstr "�û�%s �������� (%d MB). ���ӵ��ļ� %s\n"
+msgstr "Óû§%s ³¬³öÏÞÖÆ (%d MB). Ôö¼Óµ½Îļþ %s\n"
 
-#: index.c:54
+#: index.c:49
 #, c-format
 msgid "Making index.html\n"
-msgstr "���� index.html\n"
-
-#: index.c:58 index.c:112 index.c:167 index.c:228 index.c:330 indexonly.c:38
-#: lastlog.c:56
-#, c-format
-msgid "Failed to open directory %s - %s\n"
-msgstr "�����ļ���ʱʧ�� %s - %s\n"
+msgstr "񈬀 index.html\n"
 
-#: index.c:143 index.c:195 index.c:256
+#: index.c:138 index.c:184 index.c:245
 #, c-format
 msgid "(index) Cannot open file %s - %s\n"
-msgstr "(index) ���ܴ����ļ� %s - %s\n"
+msgstr "(index) ²»ÄÜ´ò¿ªÎļþ %s - %s\n"
 
-#: index.c:146 index.c:427
+#: index.c:141 index.c:413
 msgid "SARG report"
 msgid_plural "SARG reports"
-msgstr[0] "SARG ����"
+msgstr[0] "SARG ±¨¸æ"
 
-#: index.c:149 index.c:202 index.c:263
+#: index.c:144 index.c:191 index.c:252
 msgid "YEAR"
-msgstr "��"
+msgstr "Äê"
 
-#: index.c:151
+#: index.c:144
 msgid "SIZE"
-msgstr "��С"
+msgstr "´óС"
 
-#: index.c:182
+#: index.c:171
 #, c-format
 msgid ""
 "Too many month directories in %s\n"
 "Supernumerary entries are ignored\n"
 msgstr ""
-"̫���·��ļ����� %s\n"
-"���������뱻����\n"
+"̫¶àÔ·ÝÎļþ¼ÐÔÚ %s\n"
+"¶àÓàµÄÊäÈë±»ºöÂÔ\n"
 
-#: index.c:198
+#: index.c:187
 #, c-format
 msgid "SARG: report for %04d"
 msgid_plural "SARG: reports for %04d"
 msgstr[0] "SARG report %04d"
 
-#: index.c:202 index.c:263
+#: index.c:191 index.c:252
 msgid "MONTH"
-msgstr "�·�"
+msgstr "Ô·Ý"
 
-#: index.c:243
+#: index.c:232
 #, c-format
 msgid ""
 "Too many day directories in %s\n"
 "Supernumerary entries are ignored\n"
 msgstr ""
-"�����������ļ����� %s\n"
-"��������������\n"
+"¹ý¶àµÄÈÕÆÚÎļþ¼ÐÔÚ %s\n"
+"¶àÓàÊä³ö±»Ìø¹ý\n"
 
-#: index.c:259
+#: index.c:248
 #, c-format
 msgid "SARG: report for %04d/%02d"
 msgid_plural "SARG: reports for %04d/%02d"
-msgstr[0] "SARG ���� %04d/%02d"
+msgstr[0] "SARG ±¨¸æ %04d/%02d"
 
-#: index.c:280 index.c:286 index.c:293 index.c:456
+#: index.c:269 index.c:275 index.c:282 index.c:428
 #, c-format
 msgid "Write error in the index %s\n"
-msgstr "����������� %s\n"
+msgstr "дÈë´íÎóµÄË÷Òý %s\n"
 
-#: index.c:282 index.c:288 index.c:295 index.c:458
+#: index.c:271 index.c:277 index.c:284 index.c:430
 #, c-format
 msgid "Failed to close the index file %s - %s\n"
-msgstr "�뿪�����ļ�ʱʧ�� %s - %s\n"
-
-#: index.c:340
-#, c-format
-msgid ""
-"The directory \"%s%s\" looks like a report directory but doesn't contain a "
-"sarg-date file. You should delete it\n"
-msgstr ""
+msgstr "À뿪Ë÷ÒýÎļþʱʧ°Ü %s - %s\n"
 
-#: index.c:345 index.c:405
+#: index.c:330 index.c:391
 #, c-format
 msgid "not enough memory to sort the index\n"
-msgstr "û���㹻���ڴ�ȥ��������\n"
+msgstr "ûÓÐ×ã¹»µÄÄÚ´æÈ¥ÅÅÐòË÷Òý\n"
 
-#: index.c:367
+#: index.c:353
 #, c-format
 msgid "Maybe you have a broken week day in your %s%s/sarg-date file\n"
-msgstr "�������в����������������� %s%s/sarg-date �ļ���\n"
+msgstr "¿ÉÄÜÄãÓв»ÍêÕûµÄÈÕÆÚÔÚÄãµÄ %s%s/sarg-date ÎļþÖÐ\n"
 
-#: index.c:371
+#: index.c:357
 #, c-format
 msgid "Maybe you have a broken month in your %s%s/sarg-date file\n"
-msgstr "�������в��������·������� %s%s/sarg-date �ļ���\n"
+msgstr "¿ÉÄÜÄãÓв»ÍêÕûµÄÔ·ÝÔÚÄãµÄ %s%s/sarg-date ÎļþÖÐ\n"
 
-#: index.c:375
+#: index.c:361
 #, c-format
 msgid "Maybe you have a broken day in your %s%s/sarg-date file\n"
-msgstr "�������в����������������� %s%s/sarg-date �ļ���\n"
+msgstr "¿ÉÄÜÄãÓв»ÍêÕûµÄÈÕÆÚÔÚÄãµÄ %s%s/sarg-date ÎļþÖÐ\n"
 
-#: index.c:379 index.c:389
+#: index.c:365 index.c:375
 #, c-format
 msgid "Maybe you have a broken time in your %s%s/sarg-date file\n"
-msgstr "�������в�������ʱ�������� %s%s/sarg-date �ļ���\n"
+msgstr "¿ÉÄÜÄãÓв»ÍêÕûµÄʱ¼äÔÚÄãµÄ %s%s/sarg-date ÎļþÖÐ\n"
 
-#: index.c:384
+#: index.c:370
 #, c-format
 msgid "Maybe you have a broken year in your %s%s/sarg-date file\n"
-msgstr "�������в����������������� %s%s/sarg-date �ļ���\n"
+msgstr "¿ÉÄÜÄãÓв»ÍêÕûµÄÄê·ÝÔÚÄãµÄ %s%s/sarg-date ÎļþÖÐ\n"
 
-#: index.c:397
+#: index.c:383
 #, c-format
 msgid "Not enough memory to store the directory name \"%s\" in the index\n"
-msgstr "û���㹻���ڴ���洢�ļ����� \"%s\" ��������\n"
+msgstr "ûÓÐ×ã¹»µÄÄÚ´æÀ´´æ´¢ÎļþÃûÔÚ \"%s\" ÔÚË÷ÒýÖÐ\n"
 
-#: index.c:424
+#: index.c:410
 #, c-format
 msgid "(index) Cannot open file %s\n"
-msgstr "(index) ���ܴ����ļ� %s\n"
+msgstr "(index) ²»ÄÜ´ò¿ªÎļþ %s\n"
 
-#: index.c:432
+#: index.c:416
 msgid "FILE/PERIOD"
-msgstr "�ļ�/����"
+msgstr "Îļþ/ÖÜÆÚ"
 
-#: index.c:432
+#: index.c:416
 msgid "CREATION DATE"
-msgstr "��������"
+msgstr "´´½¨ÈÕÆÚ"
 
-#. TRANSLATORS: This is a column header showing the users who visited each site.
-#. TRANSLATORS: This is a column header showing the number of users who visited a sites.
-#: index.c:432 siteuser.c:101 topsites.c:258
+#: index.c:416 siteuser.c:91 siteuser.c:93
 msgid "USERS"
-msgstr "�û�"
+msgstr "Óû§"
 
-#: index.c:561 index.c:663
+#: index.c:523 index.c:625
 #, c-format
 msgid "(index) rename error from \"%s\" to \"%s\" - %s\n"
-msgstr "(index)������������ \"%s\" �� \"%s\" - %s\n"
+msgstr "(index)ÖØÃüÃû´íÎó´Ó \"%s\" ÖÁ \"%s\" - %s\n"
 
-#: index.c:572
+#: index.c:534
 #, c-format
 msgid "failed to create link \"%s\" to \"%s\" - %s\n"
-msgstr "�������ʧ�� \"%s\" �� \"%s\" - %s\n"
+msgstr "´´½¨Á¬½Óʧ°Ü \"%s\" ÖÁ \"%s\" - %s\n"
 
 #: indexonly.c:46
 #, c-format
 msgid "Name of the file to remove is too long: %s/%s\n"
-msgstr "�Ƴ����ļ�������: %s/%s\n"
+msgstr "ÒƳýµÄÎļþÃû¹ý³¤: %s/%s\n"
 
-<<<<<<< HEAD
 #: indexonly.c:50
-#, fuzzy, c-format
-msgid "Failed to remove the file %s: %s\n"
-msgstr "�Ƴ��ļ�ʧ�� %s\n"
-
-=======
->>>>>>> origin/v2.3
-#: ip2name.c:66 ip2name.c:198
-#, c-format
-msgid "Chaining IP resolving module \"%s\"\n"
-msgstr ""
-
-#: ip2name.c:71
-#, c-format
-msgid "Ignoring duplicate module \"%s\" to resolve an IP address\n"
-msgstr ""
-
-#: ip2name.c:109
-#, c-format
-msgid "Unknown module \"%.*s\" to resolve the IP addresses\n"
-msgstr ""
-
-#: ip2name.c:133
-#, c-format
-msgid "No option to configure for module %s\n"
-msgstr ""
-
-#: ip2name.c:189
-#, c-format
-msgid "No known module to resolve an IP address using the DNS\n"
-msgstr ""
-
-#: ip2name.c:226
-#, fuzzy, c-format
-msgid "Not enough memory to store the names corresponding to the IP address\n"
-msgstr "û���㹻���ڴ���洢���ų���IP��ַ\n"
-
-#: ip2name.c:279
-#, fuzzy, c-format
-msgid "Cannot resolve host name %s: %s\n"
-msgstr " ����ɾ�� %s - %s\n"
-
-#: ip2name.c:286
-#, c-format
-msgid ""
-"Short structure returned by getaddrinfo for an IPv4 address: %d bytes "
-"instead of %d\n"
-msgstr ""
-
-#: ip2name.c:294
-#, c-format
-msgid ""
-"Short structure returned by getaddrinfo for an IPv6 address: %d bytes "
-"instead of %d\n"
-msgstr ""
-
-#: ip2name.c:299
-#, c-format
-msgid "Invalid address type %d returned when resolving host name \"%s\"\n"
-msgstr ""
-
-#: ip2name_dns.c:93
-#, fuzzy, c-format
-msgid ""
-<<<<<<< HEAD
-"IP to name resolution (getnameinfo) on IP address %s failed with error %d - "
-"%s\n"
-msgstr "IP��ַ�����ֵ�ת�� (getnameinfo) ��IP��ַ %s ��������ʧ��  %d - %s\n"
-=======
-"IP to name resolution (getnameinfo) on IP address \"%s\" failed with error "
-"%d - %s\n"
-msgstr "IP��ַ�����ֵ�ת�� (getnameinfo) ��IP��ַ %s ��������ʧ��  %d - %s\n"
->>>>>>> origin/v2.3
-
-#: ip2name_exec.c:61
 #, c-format
-msgid ""
-"Command to execute to resolve the IP addresses is too long (maximum is %d "
-"bytes)\n"
-msgstr ""
+msgid "Failed to remove the file %s\n"
+msgstr "ÒƳýÎļþʧ°Ü %s\n"
 
-#: ip2name_exec.c:86
+#: ip2name.c:57
 #, c-format
 msgid ""
-"No command to run to resolve an IP address. Please configure it in sarg."
-"conf\n"
-msgstr ""
-
-#: ip2name_exec.c:95
-#, fuzzy, c-format
-<<<<<<< HEAD
-msgid "IP address %s too long for the command to run\n"
-msgstr "IP��ַ�����򲻴��� %s\n"
-
-#: ip2name_exec.c:103
-#, fuzzy, c-format
-msgid "IP address %.*s too long for the command to run\n"
-msgstr "IP��ַ�����򲻴��� %s\n"
-=======
-msgid "IP address \"%s\" too long for the command to run\n"
-msgstr "IP��ַ�����򲻴��� %s\n"
-
-#: ip2name_exec.c:103
-#, fuzzy, c-format
-msgid "IP address \"%.*s\" too long for the command to run\n"
-msgstr "IP��ַ�����򲻴��� %s\n"
->>>>>>> origin/v2.3
-
-#: ip2name_exec.c:113
-#, fuzzy, c-format
-msgid "Cannot run command %s\n"
-msgstr "��������: %s\n"
-
-#: ip2name_exec.c:120
-#, fuzzy, c-format
-msgid "Command failed: %s\n"
-msgstr "����: %s\n"
+"IP to name resolution (getnameinfo) on IP address %s failed with error %d - %"
+"s\n"
+msgstr "IPµØÖ·µ½Ãû×ÖµÄת»» (getnameinfo) ÔÚIPµØÖ· %s ·¢Éú´íÎóʧ°Ü  %d - %s\n"
 
-#: lastlog.c:51 lastlog.c:106
+#: lastlog.c:52 lastlog.c:100
 #, c-format
 msgid "(lastlog) Cannot open temporary file %s\n"
-msgstr "(lastlog) ���ܴ�����ʱ�ļ� %s\n"
+msgstr "(lastlog) ²»ÄÜ´ò¿ªÁÙʱÎļþ %s\n"
 
-#: lastlog.c:65
+#: lastlog.c:66
 #, c-format
 msgid "Failed to get the creation time of %s\n"
-msgstr "��ȡ�ļ�����ʱ��ʱʧ�� %s\n"
+msgstr "»ñÈ¡Îļþ´´½¨Ê±¼äʱʧ°Ü %s\n"
 
-#: lastlog.c:119
+#: lastlog.c:113
 #, c-format
 msgid "Removing old report file %s\n"
-msgstr "�ƶ��ɵı����ļ� %s\n"
+msgstr "Òƶ¯¾ÉµÄ±¨¸æÎļþ %s\n"
 
-#: lastlog.c:121
+#: lastlog.c:115
 #, c-format
 msgid "Directory name too long: %s%s\n"
-msgstr "�ļ������ƹ���: %s%s\n"
+msgstr "Îļþ¼ÐÃû³Æ¹ý³¤: %s%s\n"
 
-<<<<<<< HEAD
-#: lastlog.c:131
+#: lastlog.c:125
 #, c-format
 msgid "Failed to delete the file %s\n"
-msgstr "ɾ���ļ�ʧ�� %s\n"
+msgstr "ɾ³ýÎļþʧ°Ü %s\n"
 
-#: log.c:406
-=======
-#: log.c:410
->>>>>>> origin/v2.3
+#: log.c:397
 #, c-format
 msgid "Too many log files passed on command line with option -l.\n"
-msgstr "�����˹�������־�ļ�ʹ�������в��� -l.\n"
+msgstr "´«ÈëÁ˹ý¶àµÄÈÕÖ¾ÎļþʹÓÃÃüÁîÐвÎÊý -l.\n"
 
-#: log.c:414
+#: log.c:401
 #, c-format
 msgid "Log file name too long passed on command line with option -l: %s\n"
-msgstr "���������в��� -l ����־�ļ�������: %s\n"
+msgstr "´«ÈëÃüÁîÐвÎÊý -l µÄÈÕÖ¾ÎļþÃû¹ý³¤: %s\n"
 
-#: log.c:423
+#: log.c:410
 #, c-format
 msgid "Too many redirector logs passed on command line with option -L.\n"
-msgstr "���������в��� -L���ض�����־�ļ�����.\n"
+msgstr "´«ÈëÃüÁîÐвÎÊý -LµÄÖض¨ÏòÈÕÖ¾Îļþ¹ý¶à.\n"
 
-#: log.c:427
+#: log.c:414
 #, c-format
 msgid ""
 "Redirector log file name too long passed on command line with opton -L: %s\n"
-msgstr "���������в��� -L ���ض�����־�ļ�������: %s\n"
+msgstr "´«ÈëÃüÁîÐвÎÊý -L µÄÖض¨ÏòÈÕÖ¾ÎļþÃû¹ý³¤: %s\n"
 
-#: log.c:461
-#, fuzzy, c-format
-msgid "Time period passed on the command line with option -t must be HH:MM\n"
-msgstr "ʱ�����䴫�������в��� -t ������\n"
-
-#: log.c:469
-#, fuzzy, c-format
-msgid ""
-"Time range passed on the command line with option -t must be HH:MM-HH:MM\n"
-msgstr "ʱ�����䴫�������в��� -t ������\n"
+#: log.c:449
+#, c-format
+msgid "The time range passed on the command line with option -t is invalid\n"
+msgstr "ʱ¼äÇø¼ä´«ÈëÃüÁîÐвÎÊý -t ²»´æÔÚ\n"
 
-#: log.c:497
-#, fuzzy, c-format
-msgid "Option -%c requires an argument\n"
-msgstr "ѡ�� -%c ��Ҫһ���ж�\n"
+#: log.c:454 log.c:459
+#, c-format
+msgid "Time period must be MM or MM:SS. Exit\n"
+msgstr "ʱ¼äÇø¼ä±ØÐëΪ MM »òÕß MM:SS.Exit\n"
 
-#: log.c:515
+#: log.c:503
 #, fuzzy, c-format
 msgid "Too many log files passed on command line.\n"
-msgstr "�����˹�������־�ļ�ʹ�������в��� -l.\n"
+msgstr "´«ÈëÁ˹ý¶àµÄÈÕÖ¾ÎļþʹÓÃÃüÁîÐвÎÊý -l.\n"
 
-#: log.c:519
+#: log.c:507
 #, fuzzy, c-format
 msgid "Log file name too long passed on command line: %s\n"
-msgstr "���������в��� -l ����־�ļ�������: %s\n"
+msgstr "´«ÈëÃüÁîÐвÎÊý -l µÄÈÕÖ¾ÎļþÃû¹ý³¤: %s\n"
 
-#: log.c:528
+#: log.c:516
 #, c-format
 msgid "Init\n"
 msgstr "Init\n"
 
-#: log.c:532
+#: log.c:520
 #, c-format
 msgid "Cannot open config file: %s - %s\n"
-msgstr "���ܴ��������ļ�: %s -%s\n"
+msgstr "²»ÄÜ´ò¿ªÅäÖÃÎļþ: %s -%s\n"
 
-#: log.c:640
+#: log.c:614
 #, c-format
 msgid ""
 "The output directory \"%s\" must be outside of the temporary directory \"%s"
 "\"\n"
 msgstr ""
 
-#: log.c:653
-#, fuzzy, c-format
-<<<<<<< HEAD
-msgid "Deleting directory %s\n"
-msgstr "�����ļ���ʱʧ�� %s - %s\n"
-=======
-msgid "Deleting temporary directory \"%s\"\n"
-msgstr "�����ļ���ʱʧ�� %s - %s\n"
->>>>>>> origin/v2.3
-
-#: log.c:662 log.c:695
+#: log.c:645 log.c:676
 #, c-format
 msgid "Parameters:\n"
-msgstr "����:\n"
+msgstr "²ÎÊý:\n"
 
-#: log.c:663 log.c:696
+#: log.c:646 log.c:677
 #, c-format
 msgid "          Hostname or IP address (-a) = %s\n"
-msgstr "          ����������IP��ַ(-a) = %s\n"
+msgstr "          Ö÷»úÃû»òÕßIPµØַ(-a) = %s\n"
 
-#: log.c:664 log.c:697
+#: log.c:647 log.c:678
 #, c-format
 msgid "                   Useragent log (-b) = %s\n"
-msgstr "                   �û�����  ��־w (-b) = %s\n"
+msgstr "                   Óû§´úÀí  ÈÕ־w (-b) = %s\n"
 
-#: log.c:665 log.c:698
+#: log.c:648 log.c:679
 #, c-format
 msgid "                    Exclude file (-c) = %s\n"
-msgstr "                    �ų� �ļ� (-c) = %s\n"
+msgstr "                    Åųý Îļþ (-c) = %s\n"
 
-#: log.c:666 log.c:699
+#: log.c:649 log.c:680
 #, c-format
 msgid "                 Date from-until (-d) = %s\n"
-msgstr "                 ���� ��-�� (-d) = %s\n"
+msgstr "                 ÈÕÆÚ ´Ó-ÖÁ (-d) = %s\n"
 
-#: log.c:667 log.c:700
+#: log.c:650 log.c:681
 #, c-format
 msgid "   Email address to send reports (-e) = %s\n"
-msgstr "   �ʼ���ַ������ͱ��� (-e) = %s\n"
+msgstr "   ÓʼþµØÖ·ÓÃÀ´·¢Ëͱ¨¸æ (-e) = %s\n"
 
-#: log.c:668 log.c:701
+#: log.c:651 log.c:682
 #, c-format
 msgid "                     Config file (-f) = %s\n"
-msgstr "                     �����ļ� (-f) = %s\n"
+msgstr "                     ÅäÖÃÎļþ (-f) = %s\n"
 
-#: log.c:670 log.c:703
+#: log.c:653 log.c:684
 #, c-format
 msgid "                     Date format (-g) = Europe (dd/mm/yyyy)\n"
-msgstr "                     ���ڸ�ʽ (-g) = ŷ�� (dd/mm/yyyy)\n"
+msgstr "                     ÈÕÆÚ¸ñʽ (-g) = Å·ÖÞ (dd/mm/yyyy)\n"
 
-#: log.c:672 log.c:705
+#: log.c:655 log.c:686
 #, c-format
 msgid "                     Date format (-g) = USA (mm/dd/yyyy)\n"
-msgstr "                     ���ڸ�ʽ (-g) = ��� (mm/dd/yyyy)\n"
+msgstr "                     ÈÕÆÚ¸ñʽ (-g) = ÃÀ¹ú (mm/dd/yyyy)\n"
 
-#: log.c:674 log.c:707
+#: log.c:657 log.c:688
 #, c-format
 msgid "                     Date format (-g) = Sites & Users (yyyy/ww)\n"
-msgstr "                     ���ڸ�ʽ (-g) = վ�� & �û� (yyyy/ww)\n"
+msgstr "                     ÈÕÆÚ¸ñʽ (-g) = Õ¾µã & Óû§ (yyyy/ww)\n"
 
-#: log.c:675 log.c:708
+#: log.c:658 log.c:689
 #, c-format
 msgid "                       IP report (-i) = %s\n"
-msgstr "                       IP���� (-i) = %s\n"
+msgstr "                       IP±¨¸æ (-i) = %s\n"
 
-#: log.c:675 log.c:676 log.c:681 log.c:683 log.c:688 log.c:689 log.c:708
-#: log.c:709 log.c:714 log.c:716 log.c:721 log.c:722
+#: log.c:658 log.c:663 log.c:665 log.c:670 log.c:671 log.c:689 log.c:694
+#: log.c:696 log.c:701 log.c:702
 msgid "Yes"
-msgstr "��"
+msgstr "ÊÇ"
 
-#: log.c:675 log.c:676 log.c:681 log.c:683 log.c:688 log.c:689 log.c:708
-#: log.c:709 log.c:714 log.c:716 log.c:721 log.c:722
+#: log.c:658 log.c:663 log.c:665 log.c:670 log.c:671 log.c:689 log.c:694
+#: log.c:696 log.c:701 log.c:702
 msgid "No"
-msgstr "��"
-
-#: log.c:676 log.c:709
-#, fuzzy, c-format
-msgid "            Keep temporary files (-k) = %s\n"
-msgstr "                   ��ʱ�ļ�Ŀ¼ (-w) = %s\n"
+msgstr "·ñ"
 
-#: log.c:678 log.c:711
+#: log.c:660 log.c:691
 #, c-format
 msgid "                       Input log (-l) = %s\n"
-msgstr "                       ��������־ (-l) = %s\n"
+msgstr "                       ÊäÈëµÄÈÕ־ (-l) = %s\n"
 
-#: log.c:680 log.c:713
+#: log.c:662 log.c:693
 #, c-format
 msgid "                  Redirector log (-L) = %s\n"
-msgstr "                  �ض�����־  (-L) = %s\n"
+msgstr "                  Öض¨ÏòÈÕ־  (-L) = %s\n"
 
-#: log.c:681 log.c:714
+#: log.c:663 log.c:694
 #, c-format
 msgid "              Resolve IP Address (-n) = %s\n"
-msgstr "              ת��IP��ַ (-n) = %s\n"
+msgstr "              ת»»IPµØַ (-n) = %s\n"
 
-#: log.c:682 log.c:715
+#: log.c:664 log.c:695
 #, c-format
 msgid "                      Output dir (-o) = %s\n"
-msgstr "                      ����Ŀ¼ (-o) = %s\n"
+msgstr "                      Êä³öĿ¼ (-o) = %s\n"
 
-#: log.c:683 log.c:716
+#: log.c:665 log.c:696
 #, c-format
 msgid "Use Ip Address instead of userid (-p) = %s\n"
-msgstr "ʹ��IP��ַ�����û�ID (-p) = %s\n"
+msgstr "ʹÓÃIPµØÖ·Ìæ´úÓû§ID (-p) = %s\n"
 
-#: log.c:684 log.c:717
+#: log.c:666 log.c:697
 #, c-format
 msgid "                   Accessed site (-s) = %s\n"
-msgstr "                   ����վ�� (-s) = %s\n"
+msgstr "                   ·ÃÎÊÕ¾µã (-s) = %s\n"
 
-#: log.c:685 log.c:718
+#: log.c:667 log.c:698
 #, c-format
 msgid "                            Time (-t) = %s\n"
-msgstr "                            ʱ�� (-t) = %s\n"
+msgstr "                            ʱ¼ä (-t) = %s\n"
 
-#: log.c:686 log.c:719
+#: log.c:668 log.c:699
 #, c-format
 msgid "                            User (-u) = %s\n"
-msgstr "                            �û� (-u) = %s\n"
+msgstr "                            Óû§ (-u) = %s\n"
 
-#: log.c:687 log.c:720
+#: log.c:669 log.c:700
 #, c-format
 msgid "                   Temporary dir (-w) = %s\n"
-msgstr "                   ��ʱ�ļ�Ŀ¼ (-w) = %s\n"
+msgstr "                   ÁÙʱÎļþĿ¼ (-w) = %s\n"
 
-#: log.c:688 log.c:721
+#: log.c:670 log.c:701
 #, c-format
 msgid "                  Debug messages (-x) = %s\n"
-msgstr "                  �����Ϣ (-x) = %s\n"
+msgstr "                  ¾À´íÐÅϢ (-x) = %s\n"
 
-#: log.c:689 log.c:722
+#: log.c:671 log.c:702
 #, c-format
 msgid "                Process messages (-z) = %s\n"
-msgstr "                ������Ϣ (-z) = %s\n"
-
-#: log.c:690 log.c:723
-#, c-format
-msgid " Previous reports to keep (--lastlog) = %d\n"
-msgstr ""
+msgstr "                ½ø³ÌÐÅÏ¢ (-z) = %s\n"
 
-#: log.c:724 log.c:728
+#: log.c:703 log.c:707
 #, c-format
 msgid "sarg version: %s\n"
-msgstr "sarg �汾: %s\n"
+msgstr "sarg °汾: %s\n"
 
-#: log.c:731
+#: log.c:710
 #, c-format
 msgid "Sarg compiled to report warnings if the output is inconsistent\n"
 msgstr ""
 
-<<<<<<< HEAD
 #: log.c:740
-=======
-#: log.c:761
->>>>>>> origin/v2.3
 #, c-format
 msgid "setrlimit error - %s\n"
-msgstr "setrlimit ���� - %s\n"
+msgstr "setrlimit ´íÎó - %s\n"
 
-#: log.c:772
+#: log.c:751
 #, c-format
 msgid "Not enough memory to read a log file\n"
-msgstr "û���㹻���ڴ�ȥ��ȡһ����־�ļ�\n"
+msgstr "ûÓÐ×ã¹»µÄÄÚ´æÈ¥¶ÁÈ¡Ò»¸öÈÕÖ¾Îļþ\n"
 
-#: log.c:781 log.c:788
+#: log.c:760 log.c:767
 #, c-format
 msgid "(log) Cannot open file: %s - %s\n"
-msgstr "(log) ���ܴ�����־�ļ�: %s - %s\n"
+msgstr "(log) ²»ÄÜ´ò¿ªÈÕÖ¾Îļþ: %s - %s\n"
 
-#: log.c:801
+#: log.c:780
 #, c-format
 msgid "Reading access log file: from stdin\n"
-msgstr "��ȡ������־�ļ�: �� stdin\n"
+msgstr "¶ÁÈ¡·ÃÎÊÈÕÖ¾Îļþ: ´Ó stdin\n"
 
-#: log.c:807
+#: log.c:786
 #, c-format
 msgid ""
 "Cannot get the modification time of input log file %s (%s). Processing it "
 "anyway\n"
-msgstr "���ܵõ�������־�ļ����޸�ʱ�� %s (%s). �������ڼ���\n"
+msgstr "²»Äܵõ½ÊäÈëÈÕÖ¾ÎļþµÄÐÞ¸Äʱ¼ä %s (%s). ½ø³ÌÕýÔÚ¼ÌÐø\n"
 
-#: log.c:811
+#: log.c:790
 #, c-format
 msgid "Ignoring old log file %s\n"
-msgstr "���Գ¾ɵ���־�ļ� %s\n"
+msgstr "ºöÂԳ¾ɵÄÈÕÖ¾Îļþ %s\n"
 
-#: log.c:818 log.c:889
+#: log.c:797 log.c:865
 #, c-format
 msgid "(log) Cannot open log file: %s - %s\n"
-msgstr "(log) ���ܴ�����־�ļ�: %s - %s\n"
+msgstr "(log) ²»ÄÜ´ò¿ªÈÕÖ¾Îļþ: %s - %s\n"
 
-#: log.c:821
+#: log.c:800
 #, c-format
 msgid "Reading access log file: %s\n"
-msgstr "��ȡ������־�ļ�: %s\n"
+msgstr "¶ÁÈ¡·ÃÎÊÈÕÖ¾Îļþ: %s\n"
 
-#: log.c:849
+#: log.c:828
 #, c-format
 msgid "SARG: Records in file: %lu, reading: %3.2f%%"
-msgstr "SARG: ��¼���ļ�: %lu, ��ȡ: %3.2f%%"
+msgstr "SARG: ¼Í¼ÔÚÎļþ: %lu, ¶Áȡ: %3.2f%%"
 
-#: log.c:863
+#: log.c:842
 #, c-format
 msgid "Log is from Microsoft ISA: %s\n"
-msgstr "��־���΢��ISA: %s\n"
+msgstr "ÈÕÖ¾À´×Ô΢ÈíISA: %s\n"
 
-#: log.c:871
+#: log.c:850
 #, c-format
 msgid "The name of the file is invalid: %s\n"
-msgstr "�ļ���������: %s\n"
-
-#: log.c:885
-#, fuzzy, c-format
-msgid "File name too long: %s/sarg_temp.log\n"
-msgstr "�ļ�������: %s/%s.ip\n"
+msgstr "ÎļþÃû²»´æÔÚ: %s\n"
 
-#: log.c:898
+#: log.c:874
 #, c-format
 msgid "SARG: Records in file: %lu, reading: %3.2lf%%"
-msgstr "SARG: ��¼���ļ�: %lu, ��ȡ: %3.2lf%%"
+msgstr "SARG: ¼Í¼ÔÚÎļþ: %lu, ¶Áȡ: %3.2lf%%"
 
-#: log.c:914
+#: log.c:890
 #, c-format
 msgid "Maybe you have a broken record or garbage in your exclusion string\n"
-msgstr "��������һ���������ļ�¼������������Ľ�ֹ�ַ���\n"
+msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄ¼Í¼»òÕßÀ¬»øÔÚÄãµÄ½ûÖ¹×Ö·û´®\n"
 
-#: log.c:935
+#: log.c:911
 #, c-format
 msgid "Maybe you have a broken time in your access.log file\n"
-msgstr "��������һ����������ʱ��������access.log�ļ�\n"
+msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄʱ¼äÔÚÄãµÄaccess.logÎļþ\n"
 
-#: log.c:996 log.c:1000 log.c:1005 log.c:1009 log.c:1013 log.c:1118 log.c:1122
-#: log.c:1126 log.c:1194 useragent.c:89
+#: log.c:972 log.c:976 log.c:981 log.c:985 log.c:989 log.c:1089 log.c:1093
+#: log.c:1097 log.c:1160 useragent.c:90
 #, c-format
 msgid "Maybe you have a broken date in your %s file\n"
-msgstr "��������һ�������������������� %s �ļ���\n"
+msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄÈÕÆÚÔÚÄãµÄ %s ÎļþÖÐ\n"
 
-#: log.c:1022 log.c:1133 log.c:1250
-#, fuzzy, c-format
-msgid "Invalid time found in %s\n"
-msgstr "��Ч��ʱ�����ļ��� %s\n"
-
-#: log.c:1040
+#: log.c:1011
 #, c-format
 msgid "Maybe you have a broken client IP address in your %s file\n"
-msgstr "��������һ���������Ŀͻ���IP��ַ������ %s �ļ���\n"
+msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄ¿Í»§¶ËIPµØÖ·ÔÚÄãµÄ %s ÎļþÖÐ\n"
 
-#: log.c:1044
+#: log.c:1015
 #, c-format
 msgid "Maybe you have a broken result code in your %s file\n"
-msgstr "��������һ���������Ľ������������� %s �ļ���\n"
+msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄ½á¹û´úÂëÔÚÄãµÄ %s ÎļþÖÐ\n"
 
-#: log.c:1048
+#: log.c:1019
 #, c-format
 msgid "Maybe you have a broken amount of data in your %s file\n"
-msgstr "��������һ���������������ܺ������� %s �ļ���\n"
+msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄÊý¾Ý×ܺÍÔÚÄãµÄ %s ÎļþÖÐ\n"
 
-#: log.c:1052
+#: log.c:1023
 #, c-format
 msgid "Maybe you have a broken request method in your %s file\n"
-msgstr "��������һ�������������󷽷������� %s �ļ���\n"
+msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄÐèÇó·½·¨ÔÚÄãµÄ %s ÎļþÖÐ\n"
 
-#: log.c:1060 log.c:1188
+#: log.c:1031 log.c:1154
 #, c-format
 msgid "Maybe you have a broken user ID in your %s file\n"
-msgstr "��������һ�����������û�ID������ %s �ļ���\n"
+msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄÓû§IDÔÚÄãµÄ %s ÎļþÖÐ\n"
 
-#: log.c:1069
+#: log.c:1040
 #, c-format
 msgid "Cannot convert the timestamp from the squid log file\n"
-msgstr "����ת��ʱ�����squid��־�ļ�\n"
+msgstr "²»ÄÜת»»Ê±¼ä´Á´ÓsquidÈÕÖ¾Îļþ\n"
 
-#: log.c:1182
+#: log.c:1148
 #, c-format
 msgid "Maybe you have a broken IP in your %s file\n"
-msgstr "��������һ����������IP��ַ������ %s �ļ���\n"
+msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄIPµØÖ·ÔÚÄãµÄ %s ÎļþÖÐ\n"
 
-#: log.c:1206
+#: log.c:1172
 #, c-format
 msgid "Maybe you have a broken download duration in your %s file\n"
-msgstr "��������һ�������������س���ʱ�������� %s �ļ���\n"
+msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄÏÂÔسÖÐøʱ¼äÔÚÄãµÄ %s ÎļþÖÐ\n"
 
-#: log.c:1212
+#: log.c:1178
 #, c-format
 msgid "Maybe you have a broken download size in your %s file\n"
-msgstr "��������һ�������������ش�С������ %s �ļ���\n"
+msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄÏÂÔØ´óСÔÚÄãµÄ %s ÎļþÖÐ\n"
 
-#: log.c:1220
+#: log.c:1186
 #, c-format
 msgid "Maybe you have a broken access code in your %s file\n"
-msgstr "��������һ���������ķ��ʴ��������� %s �ļ���\n"
+msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄ·ÃÎÊ´úÂëÔÚÄãµÄ %s ÎļþÖÐ\n"
 
-#: log.c:1233
+#: log.c:1199
 #, c-format
 msgid "Maybe you have a broken year in your %s file\n"
-msgstr "��������һ�������������������� %s �ļ���\n"
+msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄÄê·ÝÔÚÄãµÄ %s ÎļþÖÐ\n"
 
-#: log.c:1237
+#: log.c:1203
 #, c-format
 msgid "Maybe you have a broken month in your %s file\n"
-msgstr "��������һ�����������·������� %s �ļ���\n"
+msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄÔ·ÝÔÚÄãµÄ %s ÎļþÖÐ\n"
 
-#: log.c:1257
+#: log.c:1216
 #, c-format
 msgid "Unknown input log file format\n"
-msgstr "δ֪��������־�ļ���ʽ\n"
+msgstr "δ֪µÄÊäÈëÈÕÖ¾Îļþ¸ñʽ\n"
 
-#: log.c:1282
+#: log.c:1243
 #, c-format
 msgid "User ID too long: %s\n"
-msgstr "�û�ID����: %s\n"
+msgstr "Óû§ID¹ý³¤: %s\n"
 
-#: log.c:1295
+#: log.c:1256
 #, c-format
 msgid "Excluded code: %s\n"
-msgstr "���ų�����: %s\n"
+msgstr "ÒÑÅųý´úÂë: %s\n"
 
-#: log.c:1355
+#: log.c:1327
 #, c-format
 msgid "Excluded site: %s\n"
-msgstr "���ų�վ��: %s\n"
+msgstr "ÒÑÅųýÕ¾µã: %s\n"
 
-#: log.c:1407
+#: log.c:1395
 #, c-format
 msgid "Excluded user: %s\n"
-msgstr "���ų��û�: %s\n"
+msgstr "ÒÑÅųýÓû§: %s\n"
 
-#: log.c:1441
+#: log.c:1425
 #, c-format
 msgid "Not enough memory to store the user %s\n"
-msgstr "û���㹻���ڴ���洢�û� %s\n"
+msgstr "ûÓÐ×ã¹»µÄÄÚ´æÀ´´æ´¢Óû§ %s\n"
 
-#: log.c:1469
+#: log.c:1449
 #, c-format
 msgid "Failed to close the log file of user %s - %s\n"
-msgstr "�ر��û���־�ļ�ʧ�� %s - %s\n"
+msgstr "¹Ø±ÕÓû§ÈÕÖ¾Îļþʧ°Ü %s - %s\n"
 
-#: log.c:1479
+#: log.c:1459
 #, fuzzy, c-format
-<<<<<<< HEAD
 msgid "Temporary user file name too long: %s/%s.unsort\n"
-msgstr "��ʱ�û��ļ�������: %s/sarg/%s.unsort\n"
-=======
-msgid "Temporary user file name too long: %s/%s.user_unsort\n"
-msgstr "��ʱ�û��ļ�������: %s/sarg/%s.unsort\n"
->>>>>>> origin/v2.3
+msgstr "ÁÙʱÓû§ÎļþÃû¹ý³¤: %s/sarg/%s.unsort\n"
 
-#: log.c:1483 log.c:1503
+#: log.c:1463 log.c:1494
 #, c-format
 msgid "(log) Cannot open temporary file: %s - %s\n"
-msgstr "(log) ���ܴ�����ʱ�ļ�: %s - %s\n"
+msgstr "(log) ²»ÄÜ´ò¿ªÁÙʱÎļþ: %s - %s\n"
 
-#: log.c:1489
+#: log.c:1480
 #, c-format
 msgid "Write error in the log file of user %s\n"
-msgstr "��־�ļ��е��û�����д������ %s\n"
+msgstr "ÈÕÖ¾ÎļþÖеÄÓû§´æÔÚдÈë´íÎó %s\n"
 
-#: log.c:1554
+#: log.c:1543
 #, 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:1560
+#: log.c:1549
 #, c-format
 msgid "   Records read: %ld, written: %ld, excluded: %ld\n"
-msgstr "��¼ ��ȡ: %ld, ��д��: %ld, �ų�: %ld\n"
+msgstr "¼Í¼ ¶ÁÈ¡: %ld, ÒÑдÈë: %ld, Åųý: %ld\n"
 
-#: log.c:1582
+#: log.c:1571
 #, 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:1585
+#: log.c:1574
 #, c-format
 msgid "Common log format\n"
-msgstr "��ͨ��־��ʽ\n"
+msgstr "ÆÕͨÈÕÖ¾¸ñʽ\n"
 
-#: log.c:1588
+#: log.c:1577
 #, c-format
 msgid "Squid log format\n"
-msgstr "Squid��־��ʽ\n"
+msgstr "SquidÈÕÖ¾¸ñʽ\n"
 
-#: log.c:1591
+#: log.c:1580
 #, c-format
 msgid "Sarg log format\n"
-msgstr "Sarg��־��ʽ\n"
+msgstr "SargÈÕÖ¾¸ñʽ\n"
 
-#: log.c:1594
+#: log.c:1583
 #, c-format
 msgid "Log with invalid format\n"
-msgstr "�����ڵ���־��ʽ\n"
+msgstr "²»´æÔÚµÄÈÕÖ¾¸ñʽ\n"
 
-#: log.c:1598
+#: log.c:1587
 #, c-format
 msgid "No records found\n"
-msgstr "û���ҵ���¼\n"
+msgstr "ûÓÐÕÒµ½¼Í¼\n"
 
-#: log.c:1599 log.c:1712
+#: log.c:1588 log.c:1684
 #, c-format
 msgid "End\n"
-msgstr "����\n"
+msgstr "½áÊø\n"
 
-#: log.c:1613
+#: log.c:1602
 #, c-format
 msgid "Period covered by log files: %s-%s\n"
-msgstr "�ڼ䱻��־�ļ�����: %s - %s\n"
+msgstr "Æڼ䱻ÈÕÖ¾Îļþ¸²¸Ç: %s - %s\n"
 
-#: log.c:1617
+#: log.c:1606
 #, c-format
 msgid "Failed to build the string representation of the date range\n"
-msgstr "������ַ�����ʾ���ڵķ�Χʱʧ��\n"
+msgstr "½¨Á¢ÒÔ×Ö·û´®±íʾÈÕÆڵķ¶Î§Ê±Ê§°Ü\n"
 
-#: log.c:1622
-#, c-format
-msgid "date=%s\n"
-msgstr ""
-
-#: log.c:1623
-#, fuzzy, c-format
-msgid "period=%s\n"
-msgstr "�ڼ�: %s\n"
-
-#: log.c:1627
+#: log.c:1616
 #, c-format
 msgid "Period: %s\n"
-msgstr "�ڼ�: %s\n"
-
-#: log.c:1644
-#, fuzzy, c-format
-msgid "File name too long: %s/sarg-%s_%s-%s_%s.log\n"
-msgstr "�ļ�������: %s/%s%s\n"
+msgstr "ÆÚ¼ä: %s\n"
 
-#: log.c:1648
+#: log.c:1631
 #, c-format
 msgid "failed to rename %s to %s - %s\n"
-msgstr "������ʧ�� %s �� %s - %s\n"
-
-#: log.c:1658
-#, fuzzy, c-format
-msgid "Command too long: %s \"%s\"\n"
-msgstr "·������ %s/%s.ip\n"
+msgstr "ÖØÃüÃûʧ°Ü %s ÖÁ %s - %s\n"
 
-#: log.c:1670
+#: log.c:1650
 #, c-format
 msgid "Sarg parsed log saved as %s\n"
-msgstr "Sarg������־����Ϊ %s\n"
+msgstr "Sarg½âÎöÈÕÖ¾Áí´æΪ %s\n"
 
-#: log.c:1726
+#: log.c:1700
 #, c-format
 msgid "Loading password file from %s\n"
-msgstr "�����������ļ� %s\n"
+msgstr "¼ÓÔØÃÜÂë´ÓÎļþ %s\n"
 
-#: log.c:1729
+#: log.c:1703
 #, c-format
 msgid "(getusers) Cannot open file %s - %s\n"
-msgstr "(getusers) ���ܴ����ļ� %s - %s\n"
+msgstr "(getusers) ²»ÄÜ´ò¿ªÎļþ %s - %s\n"
 
-#: log.c:1734
+#: log.c:1708
 #, 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:1744
+#: log.c:1718
 #, c-format
 msgid "Failed to rewind the users file %s: %s\n"
-msgstr "ת���û��ļ�ʱʧ�� %s: %s\n"
+msgstr "ת´æÓû§Îļþʱʧ°Ü %s: %s\n"
 
-#: log.c:1749 util.c:1424
+#: log.c:1723 util.c:1397
 #, c-format
 msgid "malloc error (%ld)\n"
-msgstr "�ڴ���ҳ���� (%ld)\n"
+msgstr "ÄÚ´æ·ÖÒ³´íÎó (%ld)\n"
 
-#: log.c:1759
+#: log.c:1733
 #, c-format
 msgid "You have an invalid user in your %s file\n"
-msgstr "��һ����ڵ��û������� %s �ļ�\n"
+msgstr "ÓÐÒ»¸ö²»´æÔÚµÄÓû§ÔÚÄãµÄ %s Îļþ\n"
 
-#: longline.c:136
+#: longline.c:113 longline.c:126
 #, c-format
-<<<<<<< HEAD
 msgid "Not enough memory to read one more line from the input log file\n"
-msgstr "û���㹻���ڴ��ٶ�ȡ������־�ļ�\n"
-=======
-msgid "A text line is more than %d bytes long denoting a corrupted file\n"
-msgstr ""
-
-#: longline.c:141 longline.c:154
-#, fuzzy, c-format
-msgid "Not enough memory to read one more line from the file\n"
-msgstr "û���㹻���ڴ��ٶ�ȡ������־�ļ�\n"
->>>>>>> origin/v2.3
+msgstr "ûÓÐ×ã¹»µÄÄÚ´æÔÙ¶ÁÈ¡ÊäÈëÈÕÖ¾Îļþ\n"
 
-#: realtime.c:56 realtime.c:63
-#, fuzzy, c-format
-msgid "Cannot create a temporary file name to produce the report: %s\n"
-msgstr "�޷�ɾ����ʱ�ļ� %s - %s\n"
-
-#: realtime.c:71
+#: realtime.c:59
 #, c-format
 msgid "(realtime) mkstemp error - %s\n"
-msgstr "(realtime)mkstemp ���� - %s\n"
+msgstr "(realtime)mkstemp ´íÎó - %s\n"
 
-#: realtime.c:76 realtime.c:224
+#: realtime.c:64 realtime.c:209
 #, c-format
 msgid "Not enough memory to read the log file\n"
-msgstr "û���㹻���ڴ����ȡ��־�ļ�\n"
+msgstr "ûÓÐ×ã¹»µÄÄÚ´æÀ´¶ÁÈ¡ÈÕÖ¾Îļþ\n"
 
-#: realtime.c:83
+#: realtime.c:71
 #, fuzzy, c-format
 msgid "Failed to get the %d trailing lines of %s: %s\n"
-msgstr "��ȡ�ļ�����ʱ��ʱʧ�� %s\n"
+msgstr "»ñÈ¡Îļþ´´½¨Ê±¼äʱʧ°Ü %s\n"
 
-#: realtime.c:84
+#: realtime.c:72
 #, fuzzy, c-format
 msgid "tail command: %s\n"
-msgstr "����: %s\n"
+msgstr "ÃüÁî: %s\n"
 
-#: realtime.c:89
+#: realtime.c:77
 #, c-format
 msgid "Maybe a broken record or garbage was returned by %s\n"
-msgstr "�����в������ļ�¼����������ش� %s\n"
+msgstr "¿ÉÄÜÓв»ÍêÕûµÄ¼Í¼»òÕßÀ¬»ø·µ»Ø´Ó %s\n"
 
-#: realtime.c:126
+#: realtime.c:110
 #, c-format
 msgid "The time stamp at column 1 is too long\n"
-msgstr "ʱ��������1̫��\n"
-
-#: realtime.c:130
-#, fuzzy, c-format
-msgid "The time stamp decimal part at column 1 is too long\n"
-msgstr "ʱ��������1̫��\n"
+msgstr "ʱ¼ä´ÁÔÚÁÐ1Ì«³¤\n"
 
-#: realtime.c:134
+#: realtime.c:114
 #, c-format
 msgid "The connection duration at column 2 is too long\n"
-msgstr "��ӳ���ʱ������2����\n"
+msgstr "Á¬½Ó³ÖÐøʱ¼äÔÚÁÐ2¹ý³¤\n"
 
-#: realtime.c:142
+#: realtime.c:122
 #, c-format
 msgid "The IP address at column 3 is too long\n"
-msgstr "����3��IP��ַ����\n"
+msgstr "ÔÚÁÐ3µÄIPµØÖ·¹ý³¤\n"
 
-#: realtime.c:146
+#: realtime.c:126
 #, c-format
 msgid "The status at column 4 is too long\n"
-msgstr "����4��״̬̫��\n"
+msgstr "ÔÚÁÐ4µÄ״̬̫³¤\n"
 
-#: realtime.c:150
+#: realtime.c:130
 #, c-format
 msgid "The size at column 5 is too long\n"
-msgstr "��5�Ĵ�С����\n"
+msgstr "ÁÐ5µÄ´óС¹ý³¤\n"
 
-#: realtime.c:154
+#: realtime.c:134
 #, c-format
 msgid "The action at column 6 is too long\n"
-msgstr "��6�����ù���\n"
+msgstr "ÁÐ6µÄ×÷Óùý³¤\n"
 
-#: realtime.c:159 realtime.c:168 realtime.c:172 realtime.c:176
+#: realtime.c:139 realtime.c:148 realtime.c:152 realtime.c:156
 #, c-format
 msgid "The URL at column 7 is too long\n"
-msgstr "��7����ӹ���\n"
+msgstr "ÁÐ7µÄÁ¬½Ó¹ý³¤\n"
 
-#: realtime.c:163
+#: realtime.c:143
 #, c-format
 msgid "The user ID at column 8 is too long\n"
-msgstr "��8���û�ID����\n"
+msgstr "ÁÐ8µÄÓû§ID¹ý³¤\n"
 
-#: realtime.c:180
+#: realtime.c:160
 #, c-format
 msgid "The data at column 8 is too long\n"
-msgstr "��8�����ݹ���\n"
+msgstr "ÁÐ8µÄÊý¾Ý¹ý³¤\n"
 
-#: realtime.c:184
+#: realtime.c:164
 #, c-format
 msgid "The user at column 9 is too long\n"
-msgstr "��9���û�����\n"
+msgstr "ÁÐ9µÄÓû§¹ý³¤\n"
 
-#: realtime.c:217
+#: realtime.c:202
 #, c-format
 msgid "(realtime) open error %s - %s\n"
-msgstr "(realtime)�򿪴��� %s - %s\n"
+msgstr "(realtime)´ò¿ª´íÎó %s - %s\n"
 
-#: realtime.c:232
-#, fuzzy, c-format
-msgid "Invalid time column in file %s\n"
-msgstr "��Ч��ʱ�����ļ��� %s\n"
-
-#: realtime.c:236 redirector.c:495
-#, fuzzy, c-format
-msgid "Invalid IP address in file %s\n"
-msgstr "���ļ��д�����Ч������ %s\n"
-
-#: realtime.c:240
-#, fuzzy, c-format
-msgid "Invalid user name in file %s\n"
-msgstr "���ļ��д�����Ч���� %s\n"
-
-#: realtime.c:245 redirector.c:161 redirector.c:499
-#, fuzzy, c-format
-msgid "Invalid URL in file %s\n"
-msgstr "���ļ��д�����Ч������ %s\n"
-
-#: realtime.c:249
-#, fuzzy, c-format
-msgid "Invalid access type in file %s\n"
-msgstr "���ļ��д�����Ч������ %s\n"
-
-#: realtime.c:312
+#: realtime.c:292
 msgid "Realtime"
 msgstr "ʱʵ"
 
-#: realtime.c:313
+#: realtime.c:293
 msgid "Auto refresh"
-msgstr "�Զ�ˢ��"
+msgstr "×Ô¶¯Ë¢ÐÂ"
 
-#: realtime.c:314
+#: realtime.c:294
 msgid "TYPE"
-msgstr "����"
+msgstr "ÀàÐÍ"
 
-#: redirector.c:58
+#: repday.c:65
 #, c-format
-msgid ""
-"Invalid \"redirector_log_format\" option in your sarg.conf (too many "
-"characters before first tag)\n"
-msgstr ""
+msgid "Output file name too long: %s/%s/d%s.html\n"
+msgstr "Êä³öÎļþÃû¹ý³¤ %s/%s/d%s.html\n"
 
-#: redirector.c:72
+#: repday.c:70 repday.c:123
 #, c-format
-msgid ""
-"Invalid \"redirector_log_format\" option in your sarg.conf (missing # at end "
-"of tag)\n"
-msgstr ""
+msgid "(repday) Cannot open log file %s\n"
+msgstr "(repday) ²»ÄÜ´ò¿ªÎļþ %s\n"
 
-#: redirector.c:76
+#: repday.c:91 totday.c:89
 #, c-format
-msgid ""
-"Invalid \"redirector_log_format\" option in your sarg.conf (too many "
-"characters in column separator)\n"
-msgstr ""
-
-#: redirector.c:81
-#, fuzzy, c-format
-msgid "Parsing of tag \"%s\" in redirector log %s returned no result\n"
-msgstr "���ض�����־�ļ��������ַ���̫�� %s\n"
+msgid "Too many different dates in %s\n"
+msgstr "²»Í¬µÄÈÕÆÚÔÚ %s\n"
 
-#: redirector.c:93
+#: repday.c:98 squidguard_report.c:104
 #, c-format
-msgid "Hour string too long in redirector log file %s\n"
-msgstr "���ض�����־�ļ���Сʱ�ַ���̫�� %s\n"
+msgid "Invalid time in file %s\n"
+msgstr "ÎÞЧµÄʱ¼äÔÚÎļþÖÐ %s\n"
 
-#: redirector.c:100
-#, fuzzy, c-format
-msgid "Banning source name too long in redirector log file %s\n"
-msgstr "���ض�����־�ļ�����ֹ�б������� %s\n"
+#: repday.c:127
+msgid "Day report"
+msgstr "ÈÕ±¨"
+
+#: repday.c:145 repday.c:188
+msgid "H"
+msgstr "H"
+
+#: repday.c:184
+msgid "H:M:S"
+msgstr "H:M:S"
 
-#: redirector.c:107
+#: report.c:89
 #, c-format
-msgid "Banning list name too long in redirector log file %s\n"
-msgstr "���ض�����־�ļ�����ֹ�б������� %s\n"
+msgid ""
+"Cannot create the output directory name containing the period as part of the "
+"name\n"
+msgstr "²»ÄÜ´´½¨Êä³öÎļþ¼ÐÃû°üº¬ÆÚ¼äµÄ²¿·ÖÃû³Æ\n"
 
-#: redirector.c:114
+#: report.c:101 report.c:125 report.c:268 report.c:429 report.c:478
+#: report.c:514 report.c:589 report.c:848
 #, c-format
-msgid "IP address too long in redirector log file %s\n"
-msgstr "���ض�����־�ļ���IP��ַ���� %s\n"
+msgid "(report) Cannot open file %s\n"
+msgstr "(report) ²»ÄÜ´ò¿ªÎļþ %s\n"
 
-#: redirector.c:121
+#: report.c:121
 #, c-format
-msgid "User ID too long in redirector log file %s\n"
-msgstr "���ض�����־�ļ����û������� %s\n"
+msgid "(report) directory entry too long: %s/%s\n"
+msgstr "(report) Îļþ¼Ð¹ý³¤ %s/%s\n"
 
-#: redirector.c:138 splitlog.c:95
-#, fuzzy, c-format
-msgid "Invalid date found in file %s\n"
-msgstr "���ļ��д�����Ч������ %s\n"
+#: report.c:181
+#, c-format
+msgid "There is a broken smart info in file %s\n"
+msgstr "Óв»ÍêÕûµÄÖÇÄÜÐÅÏ¢ÔÚÎļþ %s\n"
 
-#: redirector.c:146
-#, fuzzy, c-format
-msgid "Invalid time found in file %s\n"
-msgstr "��Ч��ʱ�����ļ��� %s\n"
+#: report.c:281
+msgid "Site access report"
+msgstr "Õ¾µã·ÃÎʱ¨¸æ"
 
-#: redirector.c:151
-#, fuzzy, c-format
-msgid "Invalid redirected source in file %s\n"
-msgstr "���ļ��д�����Ч������ %s\n"
+#: report.c:396
+#, c-format
+msgid "Successful report generated on %s\n"
+msgstr "³É¹¦µÄÉú³É±¨¸æÔÚ %s\n"
 
-#: redirector.c:156
-#, fuzzy, c-format
-msgid "Invalid redirected list in file %s\n"
-msgstr "���ļ��д�����Ч������ %s\n"
+#: report.c:401
+#, c-format
+msgid "Successful report generated and sent to %s\n"
+msgstr "³É¹¦µÄ±¨¸æÉú³É²¢·¢ËÍÖÁ %s\n"
 
-#: redirector.c:166
-#, fuzzy, c-format
-msgid "Invalid source IP in file %s\n"
-msgstr "���ļ��д�����Ч������ %s\n"
+#: report.c:422
+#, c-format
+msgid "Making file: %s/%s\n"
+msgstr "Éú³ÉÎļþ: %s/%s\n"
 
-#: redirector.c:171 redirector.c:483
-#, fuzzy, c-format
-msgid "Invalid user in file %s\n"
-msgstr "���ļ��д�����Ч���� %s\n"
+#: report.c:424 report.c:473
+#, c-format
+msgid "Temporary file name too long: %s/%s.utmp\n"
+msgstr "ÁÙʱÎļþÃû¹ý³¤: %s/%s.utmp\n"
 
-#: redirector.c:228
+#: report.c:450
 #, c-format
-msgid "Reading redirector log file %s\n"
-msgstr "��ȡ�ض�����־�ļ� %s\n"
+msgid "Temporary file name too long: %s/%s.htmp\n"
+msgstr "ÁÙʱÎļþÃû¹ý³¤: %s/%s.htmp\n"
 
-#: redirector.c:255 redirector.c:260
+#: report.c:455
 #, c-format
-msgid ""
-"Not enough memory to store the name of the new redirector log to be read - "
-"%s\n"
-msgstr "��ȡ�µ��ض�����־�ļ���ʱû�е��㹻���ڴ� - %s\n"
-
-#: redirector.c:265 redirector.c:309 redirector.c:326 redirector.c:456
-#: redirector.c:461
-#, c-format
-msgid "(squidguard) Cannot open log file %s\n"
-msgstr "(squidguard) ���ܴ�����־�ļ� %s\n"
-
-#: redirector.c:270
-#, fuzzy, c-format
-msgid "Not enough memory to read the redirector log\n"
-msgstr "û���㹻���ڴ�ȥ��ȡ�ļ� %s\n"
-
-#: redirector.c:302
-msgid "No redirector logs provided to produce that kind of report\n"
-msgstr ""
-
-#: redirector.c:321
-#, c-format
-msgid "Cannot open squidGuard config file: %s\n"
-msgstr "���ܴ���sauidGuard �����ļ�: %s\n"
-
-#: redirector.c:412
-#, c-format
-msgid "%d more redirector entry not shown here&hellip;"
-msgid_plural "%d more redirector entries not shown here&hellip;"
-msgstr[0] ""
-
-#: redirector.c:449
-msgid "Redirector report not generated because it is empty\n"
-msgstr ""
-
-#: redirector.c:466
-#, fuzzy, c-format
-msgid "Not enough memory to read the processed redirector log\n"
-msgstr "û���㹻���ڴ����ȡ��־�ļ�\n"
-
-#: redirector.c:470 redirector.c:474
-msgid "Redirector report"
-msgstr "�ض��򱨸�"
-
-#: redirector.c:478
-msgid "RULE"
-msgstr "����"
-
-#: redirector.c:491 repday.c:97
-#, c-format
-msgid "Invalid time in file %s\n"
-msgstr "��Ч��ʱ�����ļ��� %s\n"
-
-#: redirector.c:503
-#, fuzzy, c-format
-msgid "Invalid rule in file %s\n"
-msgstr "���ļ��д�����Ч������ %s\n"
+msgid "(report-1) Cannot open file %s - %s\n"
+msgstr "(report-1) ²»ÄÜ´ò¿ªÎļþ %s - %s\n"
 
-#: redirector.c:569
+#: report.c:509
 #, c-format
-msgid "%d error found in the log file. Some entries may be missing."
-msgid_plural "%d errors found in the log file. Some entries may be missing."
-msgstr[0] ""
-
-#: repday.c:64
-#, c-format
-msgid "Output file name too long: %s/%s/d%s.html\n"
-msgstr "�����ļ������� %s/%s/d%s.html\n"
-
-#: repday.c:69 repday.c:122
-#, c-format
-msgid "(repday) Cannot open log file %s\n"
-msgstr "(repday) ���ܴ����ļ� %s\n"
-
-#: repday.c:90
-#, c-format
-msgid "Too many different dates in %s\n"
-msgstr "��ͬ�������� %s\n"
-
-#: repday.c:126
-msgid "Day report"
-msgstr "�ձ�"
-
-#. TRANSLATORS: It is an hour in the hourly report
-#: repday.c:145 repday.c:197
-#, c-format
-msgid "%02dH"
-msgstr ""
+msgid "Path too long %s/%s.utmp\n"
+msgstr "·¾¶¹ý³¤ %s/%s.utmp\n"
 
-#: repday.c:185
+#: report.c:551
 #, c-format
-msgid ""
-"Total downloaded bytes is %<PRIi64> instead of %<PRIi64> in the hourly "
-"report of user %s\n"
-msgstr ""
-
-#: repday.c:193
-msgid "H:M:S"
-msgstr "H:M:S"
+msgid "Path too long %s/%s.htmp\n"
+msgstr "·¾¶¹ý³¤ %s/%s.htmp\n"
 
-#: repday.c:237
-#, c-format
-msgid ""
-"Total elapsed time is %<PRIi64> instead of %<PRIi64> in the hourly report of "
-"user %s\n"
-msgstr ""
-
-#: report.c:88
-#, c-format
-msgid ""
-"Cannot create the output directory name containing the period as part of the "
-"name\n"
-msgstr "���ܴ��������ļ����������ڼ��IJ�������\n"
-
-#: report.c:93
-#, c-format
-msgid "outdirname=%s\n"
-msgstr ""
-
-#: report.c:100 report.c:124 report.c:245 report.c:427 report.c:468
-#: report.c:752
-#, c-format
-msgid "(report) Cannot open file %s\n"
-msgstr "(report) ���ܴ����ļ� %s\n"
-
-#: report.c:120
-#, fuzzy, c-format
-<<<<<<< HEAD
-msgid "(report) directory entry too long: %s/%s.log\n"
-msgstr "(report) �ļ��й��� %s/%s\n"
-=======
-msgid "(report) directory entry too long: %s/%s.user_log\n"
-msgstr "(report) �ļ��й��� %s/%s\n"
->>>>>>> origin/v2.3
-
-#: report.c:175
-#, c-format
-msgid "There is a broken smart info in file %s\n"
-msgstr "�в�������������Ϣ���ļ� %s\n"
-
-#: report.c:257
-msgid "Site access report"
-msgstr "վ�����ʱ���"
-
-#: report.c:267
-#, fuzzy
-msgid "DATE"
-msgstr "����/ʱ��"
-
-#: report.c:331
-#, fuzzy, c-format
-msgid "Failed to close temporary file for user %s - %s\n"
-msgstr "�ر��û���־�ļ�ʧ�� %s - %s\n"
-
-#: report.c:350
-msgid ""
-"Dansguardian report not produced because no dansguardian configuration file "
-"was provided\n"
-msgstr ""
-
-#: report.c:361
-msgid "Downloaded files report not requested in report_type\n"
-msgstr ""
-
-#: report.c:366
-msgid "Top sites report not requested in report_type\n"
-msgstr ""
-
-#: report.c:371
-msgid "Sites & users report not requested in report_type\n"
-msgstr ""
-
-#: report.c:376
-msgid "Denied accesses report not requested in report_type\n"
-msgstr ""
-
-#: report.c:381
-msgid "Authentication failures report not requested in report_type\n"
-msgstr ""
-
-#: report.c:393
-msgid "User's detailed report not requested in report_type\n"
-msgstr ""
-
-#: report.c:398
-#, c-format
-msgid "Successful report generated on %s\n"
-msgstr "�ɹ������ɱ����� %s\n"
-
-#: report.c:403
-#, c-format
-msgid "Successful report generated and sent to %s\n"
-msgstr "�ɹ��ı������ɲ������� %s\n"
-
-#: report.c:420
-#, c-format
-msgid "Making file: %s/%s\n"
-msgstr "�����ļ�: %s/%s\n"
-
-#: report.c:422
+#: report.c:556
 #, c-format
-msgid "Temporary file name too long: %s/%s.utmp\n"
-msgstr "��ʱ�ļ�������: %s/%s.utmp\n"
+msgid "(report-2) Cannot open file %s - %s\n"
+msgstr "(report-2)²»ÄÜ´ò¿ªÎļþ %s - %s\n"
 
-#: report.c:463
+#: report.c:584
 #, c-format
 msgid "Path too long %s/%s.ip\n"
-msgstr "·������ %s/%s.ip\n"
-
-#: report.c:491
-#, fuzzy, c-format
-msgid "Failed to write a line in %s\n"
-msgstr "д����һ��ʱʧ�� %s\n"
+msgstr "·¾¶¹ý³¤ %s/%s.ip\n"
 
-#: report.c:513
-#, c-format
-msgid "Failed to write the total line in %s\n"
-msgstr "д����һ��ʱʧ�� %s\n"
-
-#: report.c:539
+#: report.c:637
 #, c-format
 msgid "Invalid total number of accesses in %s\n"
-msgstr "�����ڵķ��������� %s\n"
+msgstr "²»´æÔڵķÃÎÊ×ÜÊýÔÚ %s\n"
 
-#: report.c:556
+#: report.c:654
 #, c-format
 msgid "Invalid total size in %s\n"
-msgstr "�����ڵ��ܴ�С�� %s\n"
+msgstr "²»´æÔÚµÄ×Ü´óСÔÚ %s\n"
 
-#: report.c:573
+#: report.c:671
 #, c-format
 msgid "Invalid total elapsed time in %s\n"
-msgstr "�������ܵĹ�ȥʱ���� %s\n"
+msgstr "²»´æÔÚ×ܵĹýȥʱ¼äÔÚ %s\n"
 
-#: report.c:590
+#: report.c:688
 #, c-format
 msgid "Invalid total cache hit in %s\n"
-msgstr "�����ڵĻ����������� %s\n"
+msgstr "²»´æÔڵĻº´æÃüÖÐ×ÜÊý %s\n"
 
-#: report.c:607
+#: report.c:705
 #, c-format
 msgid "Invalid total cache miss in %s\n"
-msgstr "�����ڵĻ���δ�������� %s\n"
+msgstr "²»´æÔڵĻº´æδÃüÖÐ×ÜÊý %s\n"
 
-#: report.c:617
+#: report.c:715
 #, c-format
 msgid "User name too long or invalid in %s\n"
-msgstr "�û����������߲����� %s\n"
+msgstr "Óû§Ãû¹ý³¤»òÕß²»´æÔÚ %s\n"
 
-#: report.c:633
+#: report.c:731
 #, c-format
 msgid "Invalid number of accesses in %s\n"
-msgstr "�����ڵķ����� %s\n"
+msgstr "²»´æÔڵķÃÎÊÊý %s\n"
 
-#: report.c:650
+#: report.c:748
 #, c-format
 msgid "Invalid number of bytes in %s\n"
-msgstr "�������ֽ���z %s\n"
+msgstr "²»´æÔÚ×Ö½ÚÊýz %s\n"
 
-#: report.c:659
+#: report.c:757
 #, c-format
 msgid "URL too long or invalid in %s\n"
-msgstr "��ӹ����򲻴��� %s\n"
+msgstr "Á¬½Ó¹ý³¤»ò²»´æÔÚ %s\n"
 
-#: report.c:667
+#: report.c:765
 #, c-format
 msgid "IP address too long or invalid in %s\n"
-msgstr "IP��ַ�����򲻴��� %s\n"
+msgstr "IPµØÖ·¹ý³¤»ò²»´æÔÚ %s\n"
 
-#: report.c:675
+#: report.c:773
 #, c-format
 msgid "Time too long or invalid in %s\n"
-msgstr "ʱ�������򲻴��� %s\n"
+msgstr "ʱ¼ä¹ý³¤»ò²»´æÔÚ %s\n"
 
-#: report.c:683
+#: report.c:781
 #, c-format
 msgid "Date too long or invalid in %s\n"
-msgstr "���ڹ����򲻴���z %s\n"
+msgstr "ÈÕÆÚ¹ý³¤»ò²»´æÔÚz %s\n"
 
-#: report.c:699
+#: report.c:797
 #, c-format
 msgid "Invalid elapsed time in %s\n"
-msgstr "�����ڵĵĹ�ȥʱ���� %s\n"
+msgstr "²»´æÔڵĵĹýȥʱ¼äÔÚ %s\n"
 
-#: report.c:716
+#: report.c:814
 #, c-format
 msgid "Invalid cache hit size in %s\n"
-msgstr "�����ڵĻ������д�С�� %s\n"
+msgstr "²»´æÔڵĻº´æÃüÖдóСÔÚ %s\n"
 
-#: report.c:733
+#: report.c:831
 #, c-format
 msgid "Invalid cache miss size in %s\n"
-msgstr "�����ڻ���δ���д�С�� %s\n"
-
-#: report.c:747
-#, fuzzy, c-format
-msgid "File name too long for %s/smartfilter.int_unsort\n"
-msgstr "�ļ�������: %s/%s%s\n"
-
-#: siteuser.c:52
-msgid "Sites and users report not generated because privacy option is on\n"
-msgstr ""
+msgstr "²»´æÔÚ»º´æδÃüÖдóСÔÚ %s\n"
 
-#: siteuser.c:74 siteuser.c:80
+#: siteuser.c:72 siteuser.c:78
 #, c-format
 msgid "(siteuser) Cannot open log file %s\n"
-msgstr "(siteuser) ���ܴ�����־�ļ� %s\n"
+msgstr "(siteuser) ²»ÄÜ´ò¿ªÈÕÖ¾Îļþ %s\n"
 
-#: siteuser.c:84 siteuser.c:88 topuser.c:236
+#: siteuser.c:82 siteuser.c:86 topuser.c:194
 msgid "Sites & Users"
-msgstr "վ�� & �û�"
-
-#: smartfilter.c:57
-#, fuzzy, c-format
-msgid "File name too long: %s/smartfilter.int_unsort\n"
-msgstr "�ļ�������: %s/%s%s\n"
+msgstr "Õ¾µã & Óû§"
 
-#: smartfilter.c:61
-#, fuzzy, c-format
-msgid "File name too long: %s/sarg-sites\n"
-msgstr "�ļ�������: %s/%s%s\n"
-
-#: smartfilter.c:65
-#, fuzzy, c-format
-<<<<<<< HEAD
-msgid "File name too long: %s/smartfilter.log\n"
-msgstr "�ļ�������: %s/%s.ip\n"
-=======
-msgid "File name too long: %s/smartfilter.int_log\n"
-msgstr "�ļ�������: %s/%s.ip\n"
->>>>>>> origin/v2.3
-
-#: smartfilter.c:69
-#, fuzzy, c-format
-msgid "File name too long: %s/smartfilter.html\n"
-msgstr "�ļ�������: %s/%s/denied_%s.html\n"
+#: siteuser.c:100
+#, c-format
+msgid "ERROR: Cannot load. Memory fault\n"
+msgstr "´íÎó: ²»ÄÜÔØÈë. ÄÚ´æ´íÎó \n"
 
-#: smartfilter.c:74
+#: smartfilter.c:67
 #, c-format
 msgid "cannot build the sort command to sort file %s\n"
-msgstr "���ܹ�����������������ļ� %s\n"
+msgstr "²»Äܹ¹½¨ÅÅÐòÃüÁîÀ´ÅÅÐòÎļþ %s\n"
 
-#: smartfilter.c:84 smartfilter.c:94
+#: smartfilter.c:77 smartfilter.c:84
 #, c-format
 msgid "(smartfilter) Cannot open log file %s\n"
-msgstr "(smartfilter)���ܴ�����־�ļ� %s\n"
-
-#: smartfilter.c:109 topuser.c:242
-msgid "SmartFilter"
-msgstr "���ܹ���"
+msgstr "(smartfilter)²»ÄÜ´ò¿ªÈÕÖ¾Îļþ %s\n"
 
-#: smartfilter.c:116 smartfilter.c:183
-msgid "SMARTFILTER"
-msgstr ""
-
-#: smartfilter.c:140 smartfilter.c:194 smartfilter.c:204 util.c:1617
+#: smartfilter.c:130 smartfilter.c:184 smartfilter.c:194 util.c:1591
 msgid "Generated by"
-msgstr "�� ����"
+msgstr "ÓÉ Éú³É"
 
-#: smartfilter.c:140 smartfilter.c:194 smartfilter.c:204 util.c:1617
+#: smartfilter.c:130 smartfilter.c:184 smartfilter.c:194 util.c:1591
 msgid "on"
 msgstr "on"
 
-#: smartfilter.c:146
+#: smartfilter.c:136
 #, c-format
 msgid "(smartfilter) Cannot open file %s\n"
-msgstr "(smartfilter) ���ܴ����ļ� %s\n"
-
-#: sort.c:66
-#, fuzzy, c-format
-<<<<<<< HEAD
-msgid "file name too long: %s/%s.utmp\n"
-msgstr "�ļ�������: %s/%s.ip\n"
+msgstr "(smartfilter) ²»ÄÜ´ò¿ªÎļþ %s\n"
 
-#: sort.c:70
-#, fuzzy, c-format
-msgid "file name too long: %s/htmlrel.txt\n"
-msgstr "���������ƹ���: %s/%s\n"
-
-#: sort.c:118
-#, fuzzy, c-format
-msgid "Sorting log %s/%s.unsort\n"
-msgstr "�û������� %s/%s.unsort\n"
-=======
-msgid "File name too long: %s/%s.utmp\n"
-msgstr "�ļ�������: %s/%s.ip\n"
-
-#: sort.c:70
-#, fuzzy, c-format
-msgid "File name too long: %s/htmlrel.txt\n"
-msgstr "���������ƹ���: %s/%s\n"
-
-#: sort.c:118
-#, fuzzy, c-format
-msgid "Sorting log %s/%s.user_unsort\n"
-msgstr "�û������� %s/%s.unsort\n"
->>>>>>> origin/v2.3
+#: sort.c:124
+#, c-format
+msgid "pre-sorting files\n"
+msgstr "Ô¤ÅÅÐòÎļþ\n"
 
-#: sort.c:125
+#: sort.c:154
 #, c-format
 msgid "user name too long to sort %s\n"
-msgstr "�û��������޷����� %s\n"
+msgstr "Óû§Ãû¹ý³¤ÎÞ·¨ÅÅÐò %s\n"
 
-#: sort.c:135
-<<<<<<< HEAD
+#: sort.c:164
 #, c-format
 msgid "user name too long for %s/%s.unsort\n"
-msgstr "�û������� %s/%s.unsort\n"
-=======
-#, fuzzy, c-format
-msgid "user name too long for %s/%s.user_unsort\n"
-msgstr "�û������� %s/%s.unsort\n"
->>>>>>> origin/v2.3
+msgstr "Óû§Ãû¹ý³¤ %s/%s.unsort\n"
 
-#: sort.c:156 topuser.c:171
+#: sort.c:177 topuser.c:142
 msgid "connect"
 msgstr ""
 
-#: sort.c:158
+#: sort.c:179
 #, fuzzy
 msgid "site"
-msgstr "����վ��"
+msgstr "ÈÈÃÅÕ¾µã"
 
-#: sort.c:160 topuser.c:174
+#: sort.c:181 topuser.c:145
 #, fuzzy
 msgid "time"
 msgstr "ʱʵ"
 
-#: sort.c:162 topuser.c:176
+#: sort.c:183 topuser.c:147
 msgid "bytes"
 msgstr ""
 
-#: sort.c:166 topuser.c:181
+#: sort.c:187 topuser.c:152
 msgid "normal"
 msgstr ""
 
-#: sort.c:168 topuser.c:184
+#: sort.c:189 topuser.c:155
 msgid "reverse"
 msgstr ""
 
-#: splitlog.c:70
+#: splitlog.c:46
+#, fuzzy, c-format
+msgid "(splitlog) Cannot open log file %s - %s\n"
+msgstr "(splitlog) ÎÞ·¨´ò¿ªÈÕÖ¾Îļþ %s\n"
+
+#: splitlog.c:58 squidguard_log.c:178
+#, fuzzy, c-format
+msgid "Invalid date found in file %s\n"
+msgstr "ÔÚÎļþÖдæÔÚÎÞЧµÄÈÕÆÚ %s\n"
+
+#: squidguard_log.c:56
 #, c-format
-msgid "(splitlog) Output path is too long: %s%s-YYYY-mm-dd\n"
-msgstr ""
+msgid "Reading redirector log file %s\n"
+msgstr "¶ÁÈ¡Öض¨ÏòÈÕÖ¾Îļþ %s\n"
 
-#: splitlog.c:82
+#: squidguard_log.c:83 squidguard_log.c:88
+#, c-format
+msgid ""
+"Not enough memory to store the name of the new redirector log to be read - %"
+"s\n"
+msgstr "¶ÁȡеÄÖض¨ÏòÈÕÖ¾ÎļþÃûʱûÓеÄ×ã¹»µÄÄÚ´æ - %s\n"
+
+#: squidguard_log.c:93 squidguard_log.c:296 squidguard_log.c:313
+#: squidguard_report.c:69 squidguard_report.c:74
+#, c-format
+msgid "(squidguard) Cannot open log file %s\n"
+msgstr "(squidguard) ²»ÄÜ´ò¿ªÈÕÖ¾Îļþ %s\n"
+
+#: squidguard_log.c:98
 #, fuzzy, c-format
-msgid "(splitlog) Cannot open log file %s - %s\n"
-msgstr "(splitlog) �޷�������־�ļ� %s\n"
+msgid "Not enough memory to read the redirector log\n"
+msgstr "ûÓÐ×ã¹»µÄÄÚ´æÈ¥¶ÁÈ¡Îļþ %s\n"
+
+#: squidguard_log.c:108
+#, c-format
+msgid "There is a broken record or garbage in your %s file\n"
+msgstr "Óв»ÍêÕûµÄ¼Í¼»òÀ¬»øÔÚÄãµÄ %s ÎļþÖÐ\n"
+
+#: squidguard_log.c:138
+#, c-format
+msgid "Hour string too long in redirector log file %s\n"
+msgstr "ÔÚÖض¨ÏòÈÕÖ¾ÎļþÖÐСʱ×Ö·û´®Ì«³¤ %s\n"
 
-#: splitlog.c:122
+#: squidguard_log.c:144
 #, fuzzy, c-format
-msgid "(splitlog) Cannot open output log file %s - %s\n"
-msgstr "(splitlog) �޷�������־�ļ� %s\n"
+msgid "Banning source name too long in redirector log file %s\n"
+msgstr "ÔÚÖض¨ÏòÈÕÖ¾ÎļþÖÐ×èÖ¹ÁбíÃû¹ý³¤ %s\n"
 
-#: topsites.c:72
-msgid "Top sites report not produced because privacy option is on\n"
-msgstr ""
+#: squidguard_log.c:150
+#, c-format
+msgid "Banning list name too long in redirector log file %s\n"
+msgstr "ÔÚÖض¨ÏòÈÕÖ¾ÎļþÖÐ×èÖ¹ÁбíÃû¹ý³¤ %s\n"
 
-#: topsites.c:95 topsites.c:101 topsites.c:217 topsites.c:228
+#: squidguard_log.c:156
 #, c-format
-msgid "(topsites) Cannot open log file %s\n"
-msgstr "(topsites) ���ܴ�����־�ļ� %s\n"
+msgid "IP address too long in redirector log file %s\n"
+msgstr "ÔÚÖض¨ÏòÈÕÖ¾ÎļþÖÐIPµØÖ·¹ý³¤ %s\n"
 
-#: topsites.c:179
+#: squidguard_log.c:162
 #, c-format
-msgid "Total statistics mismatch when reading %s to produce the top sites\n"
-msgstr ""
+msgid "User ID too long in redirector log file %s\n"
+msgstr "ÔÚÖض¨ÏòÈÕÖ¾ÎļþÖÐÓû§Ãû¹ý³¤ %s\n"
 
-#: topsites.c:232 topuser.c:235
-msgid "Top sites"
-msgstr "����վ��"
+#: squidguard_log.c:168
+#, c-format
+msgid "URL too long in redirector log file %s\n"
+msgstr "ÔÚÖض¨ÏòÈÕÖ¾ÎļþÖÐÁ¬½Ó¹ý³¤ %s\n"
+
+#: squidguard_log.c:185
+#, fuzzy, c-format
+msgid "Invalid time found in file %s\n"
+msgstr "ÎÞЧµÄʱ¼äÔÚÎļþÖÐ %s\n"
+
+#: squidguard_log.c:189
+#, fuzzy, c-format
+msgid "Invalid redirected source in file %s\n"
+msgstr "ÔÚÎļþÖдæÔÚÎÞЧµÄÈÕÆÚ %s\n"
+
+#: squidguard_log.c:193
+#, fuzzy, c-format
+msgid "Invalid redirected list in file %s\n"
+msgstr "ÔÚÎļþÖдæÔÚÎÞЧµÄÈÕÆÚ %s\n"
+
+#: squidguard_log.c:197 squidguard_report.c:112
+#, fuzzy, c-format
+msgid "Invalid URL in file %s\n"
+msgstr "ÔÚÎļþÖдæÔÚÎÞЧµÄÈÕÆÚ %s\n"
+
+#: squidguard_log.c:201
+#, fuzzy, c-format
+msgid "Invalid source IP in file %s\n"
+msgstr "ÔÚÎļþÖдæÔÚÎÞЧµÄÈÕÆÚ %s\n"
 
-#: topsites.c:237
+#: squidguard_log.c:205 squidguard_report.c:96
+#, fuzzy, c-format
+msgid "Invalid user in file %s\n"
+msgstr "ÔÚÎļþÖдæÔÚÎÞЧÊäÈë %s\n"
+
+#: squidguard_log.c:308
 #, c-format
-msgid "Top %d sites"
-msgstr "���� %d վ��"
+msgid "Cannot open squidGuard config file: %s\n"
+msgstr "²»ÄÜ´ò¿ªsauidGuard ÅäÖÃÎļþ: %s\n"
+
+#: squidguard_report.c:79
+#, fuzzy, c-format
+msgid "Not enough memory to read the processed redirector log\n"
+msgstr "ûÓÐ×ã¹»µÄÄÚ´æÀ´¶ÁÈ¡ÈÕÖ¾Îļþ\n"
+
+#: squidguard_report.c:83 squidguard_report.c:87
+msgid "Redirector report"
+msgstr "Öض¨Ïò±¨¸æ"
+
+#: squidguard_report.c:91
+msgid "RULE"
+msgstr "¹æÔò"
+
+#: squidguard_report.c:108
+#, fuzzy, c-format
+msgid "Invalid IP address in file %s\n"
+msgstr "ÔÚÎļþÖдæÔÚÎÞЧµÄÈÕÆÚ %s\n"
 
-#: topsites.c:280
+#: squidguard_report.c:116
 #, fuzzy, c-format
-msgid "The number of users is invalid in file %s\n"
-msgstr "������Ӳ��������ļ� %s\n"
+msgid "Invalid rule in file %s\n"
+msgstr "ÔÚÎļþÖдæÔÚÎÞЧµÄÈÕÆÚ %s\n"
 
-#: topsites.c:284
+#: topsites.c:83 topsites.c:89 topsites.c:175 topsites.c:184
+#, c-format
+msgid "(topsites) Cannot open log file %s\n"
+msgstr "(topsites) ²»ÄÜ´ò¿ªÈÕÖ¾Îļþ %s\n"
+
+#: topsites.c:188 topuser.c:193
+msgid "Top sites"
+msgstr "ÈÈÃÅÕ¾µã"
+
+#: topsites.c:193
+#, c-format
+msgid "Top %d sites"
+msgstr "ÈÈÃÅ %d Õ¾µã"
+
+#: topsites.c:220
 #, c-format
 msgid "The url is invalid in file %s\n"
-msgstr "������Ӳ��������ļ� %s\n"
+msgstr "Õâ¸öÁ¬½Ó²»´æÔÚÔÚÎļþ %s\n"
 
-#: topuser.c:45 topuser.c:87 topuser.c:93 topuser.c:200 topuser.c:211
+#: topuser.c:68 topuser.c:74 topuser.c:168 topuser.c:176 topuser.c:408
 #, c-format
 msgid "(topuser) Cannot open file %s\n"
-msgstr "(topuser) ���ܴ����ļ� %s\n"
+msgstr "(topuser) ²»ÄÜ´ò¿ªÎļþ %s\n"
 
-#: topuser.c:101 util.c:748
+#: topuser.c:82 util.c:709
 #, c-format
 msgid "Not enough memory to read the file %s\n"
-msgstr "û���㹻���ڴ�ȥ��ȡ�ļ� %s\n"
+msgstr "ûÓÐ×ã¹»µÄÄÚ´æÈ¥¶ÁÈ¡Îļþ %s\n"
 
-#: topuser.c:159
-#, c-format
-msgid "Total statistics mismatch when reading %s to produce the top users\n"
-msgstr ""
-
-#: topuser.c:168
+#: topuser.c:139
 #, fuzzy
 msgid "user"
-msgstr "�û�"
+msgstr "Óû§"
 
-#: topuser.c:215
+#: topuser.c:180
 #, c-format
 msgid "SARG report for %s"
-msgstr "SARG ���� %s"
+msgstr "SARG ±¨¸æ %s"
 
-#: topuser.c:222
+#: topuser.c:186
 #, c-format
 msgid "Sort: %s, %s"
 msgstr ""
 
-#: topuser.c:224
+#: topuser.c:188
 msgid "Top users"
-msgstr "�����û�"
-
-#. TRANSLATORS: This is the title of the main report page when no
-#. * top users list are requested.
-#.
-#: topuser.c:229
-msgid "Table of content"
-msgstr ""
+msgstr "ÈÈÃÅÓû§"
 
-#: topuser.c:238
+#: topuser.c:196
 msgid "Redirector"
-msgstr "�ض���"
+msgstr "Öض¨Ïò"
 
-#: topuser.c:240
+#: topuser.c:198
 msgid "Denied accesses"
-msgstr "��ֹ����"
+msgstr "×èÖ¹·ÃÎÊ"
 
-#: topuser.c:243
+#: topuser.c:201
 msgid "Useragent"
-msgstr "�û�����"
-
-#: topuser.c:250
-msgid "No top users report because it is not configured in report_type\n"
-msgstr ""
+msgstr "Óû§´úÀí"
 
-#: topuser.c:300
+#: topuser.c:246
 #, c-format
 msgid "There is a broken user in file %s\n"
-msgstr "�в��������û����ļ� %s\n"
+msgstr "Óв»ÍêÕûµÄÓû§ÔÚÎļþ %s\n"
 
-#: topuser.c:312
+#: topuser.c:258
 #, c-format
 msgid "There is a broken elpased time in file %s\n"
-msgstr "�в������Ĺ�ȥʱ�����ļ� %s\n"
+msgstr "Óв»ÍêÕûµÄ¹ýȥʱ¼äÔÚÎļþ %s\n"
 
-#: topuser.c:316
+#: topuser.c:262
 #, c-format
 msgid "There is a broken in-cache size in file %s\n"
-msgstr "�в������� in-cache ��С���ļ� %s\n"
+msgstr "Óв»ÍêÕûµÄ in-cache ´óСÔÚÎļþ %s\n"
 
-#: topuser.c:320
+#: topuser.c:266
 #, c-format
 msgid "There is a broken out-of-cache size in file %s\n"
-msgstr "�в������� out-of-cache ��С���ļ� %s\n"
+msgstr "Óв»ÍêÕûµÄ out-of-cache ´óСÔÚÎļþ %s\n"
 
-#: topuser.c:352
+#: topuser.c:293
 msgid "Graphic"
-msgstr "��ͼ"
+msgstr "ÊÓͼ"
 
-#: topuser.c:390
+#: topuser.c:321
 #, c-format
 msgid ""
-"The total of the in-cache and cache-miss is not 100%% at position %d (user "
-"%s)\n"
+"The total of the in-cache and cache-miss is not 100%% at position %d (user %"
+"s)\n"
 msgstr ""
 
-#: topuser.c:441
+#: topuser.c:363
 #, c-format
 msgid "The total of the in-cache and cache-miss is not 100%%\n"
 msgstr ""
 
-#: topuser.c:481
+#: topuser.c:402
 #, c-format
 msgid "Write error in top user list %s\n"
-msgstr "д�������������û��б� %s\n"
+msgstr "дÈë´íÎóÔÚÈÈÃÅÓû§Áбí %s\n"
 
-#: topuser.c:483
+#: topuser.c:404
 #, c-format
 msgid "Failed to close the top user list %s - %s\n"
-msgstr "�رջ�Ծ�û��б�ʱʧ�� %s - %s\n"
-
-#: totday.c:53
-#, fuzzy, c-format
-msgid "Not enough memory to store the daily statistics\n"
-msgstr "û���㹻���ڴ�ȥ�洢���\n"
+msgstr "¹Ø±Õ»îÔ¾Óû§Áбíʱʧ°Ü %s - %s\n"
 
-#: totday.c:104
-#, c-format
-msgid "Invalid date \"%s\" for the hourly statistics\n"
-msgstr ""
-
-#: totday.c:108
-#, c-format
-msgid "Invalid date component in \"%s\" for the hourly statistics\n"
-msgstr ""
-
-#: totday.c:113
-#, c-format
-msgid "Invalid hour %d for the hourly statistics\n"
-msgstr ""
-
-#: totday.c:121
-#, fuzzy, c-format
-msgid "Too many different dates for the hourly statistics\n"
-msgstr "��ͬ�������� %s\n"
-
-#: totday.c:153
+#: totday.c:58 totday.c:62
 #, c-format
 msgid "File name too long: %s/%s%s\n"
-msgstr "�ļ�������: %s/%s%s\n"
+msgstr "ÎļþÃû¹ý³¤: %s/%s%s\n"
 
-#: totday.c:158
+#: totday.c:67 totday.c:114
 #, c-format
 msgid "(totday) Cannot open log file %s\n"
-msgstr "(today) ���ܴ�����־�ļ� %s\n"
-
-#: totday.c:166
-#, fuzzy, c-format
-msgid "Invalid day index found in the hourly statistics\n"
-msgstr "���ļ��д�����Ч������ %s\n"
-
-#: url.c:152
-#, c-format
-msgid "Host name alias \"%s*%s\" contains too many wildcards (*)\n"
-msgstr ""
-
-#: url.c:159
-#, c-format
-msgid "Host name alias \"%*s\" must not end with a wildcard\n"
-msgstr ""
-
-#: url.c:186 url.c:198 url.c:222 url.c:246 url.c:256 url.c:322 url.c:331
-#: url.c:341 url.c:404 url.c:413 url.c:423 url.c:487 url.c:500
-#, fuzzy, c-format
-msgid "Not enough memory to store the host name aliasing directives\n"
-msgstr "û���㹻���ڴ���洢�ļ����� \"%s\" ��������\n"
-
-#: url.c:467
-#, fuzzy, c-format
-msgid "Invalid NUL character found in regular expression\n"
-msgstr "���ļ��д�����Ч������ %s\n"
-
-#: url.c:474
-#, c-format
-msgid "Unterminated regular expression\n"
-msgstr ""
-
-#: url.c:493
-#, fuzzy, c-format
-msgid "Failed to compile the regular expression \"%s\": %s\n"
-msgstr "ת���û��ļ�ʱʧ�� %s: %s\n"
-
-#: url.c:551
-#, c-format
-msgid ""
-"PCRE not compiled in therefore the regular expressions are not available in "
-"the host alias file\n"
-msgstr ""
-
-#: url.c:582
-#, fuzzy, c-format
-msgid "Reading host alias file \"%s\"\n"
-msgstr "��ȡ������־�ļ�: %s\n"
-
-#: url.c:585
-#, fuzzy, c-format
-msgid "Cannot read host name alias file \"%s\" - %s\n"
-msgstr "�޷�ɾ����ʱ�ļ� %s - %s\n"
-
-#: url.c:590
-#, fuzzy, c-format
-msgid "Not enough memory to read the host name aliases\n"
-msgstr "û���㹻���ڴ����ȡ�����ļ�\n"
+msgstr "(today) ²»ÄÜ´ò¿ªÈÕÖ¾Îļþ %s\n"
 
-#: url.c:609
+#: totday.c:139
 #, c-format
-msgid "List of host names to alias:\n"
-msgstr ""
+msgid "Cannot delete temporary file %s - %s\n"
+msgstr "ÎÞ·¨É¾³ýÁÙʱÎļþ %s - %s\n"
 
-#: url.c:612
+#: totger.c:44
 #, c-format
-msgid "  %s*%s => %s\n"
-msgstr ""
-
-#: url.c:614
-#, fuzzy, c-format
-msgid "  %s => %s\n"
-msgstr "����Ŀ¼ %s %s\n"
+msgid "(totger) Cannot open file %s\n"
+msgstr "(totger) ²»ÄÜ´ò¿ªÎļþ %s\n"
 
-#: url.c:616
+#: totger.c:49
 #, c-format
-msgid "  *%s => %s\n"
-msgstr ""
+msgid "Not enough memory to read the temporary file %s\n"
+msgstr "ûÓÐ×ã¹»µÄÄÚ´æÈ¥¶ÁÈ¡ÁÙʱÎļþ %s\n"
 
-#: url.c:619
+#: totger.c:66
 #, c-format
-msgid "  %d.%d.%d.%d/%d => %s\n"
-msgstr ""
+msgid "Failed to move to the end of %s - %s\n"
+msgstr "Òƶ¯µ½Ä©Î²Ê±Ê§°Ü %s - %s\n"
 
-#: url.c:622
+#: totger.c:75
 #, c-format
-msgid "  %x:%x:%x:%x:%x:%x:%x:%x/%d => %s\n"
-msgstr ""
+msgid "Failed to write the total line in %s\n"
+msgstr "дÈëµÚÒ»ÐÐʱʧ°Ü %s\n"
 
 #: usage.c:32
 #, c-format
 msgid "Usage: %s [options...]\n"
-msgstr "ʹ��: %s [ѡ��...]\n"
+msgstr "ʹÓÃ: %s [Ñ¡Ïî...]\n"
 
 #: usage.c:33
-#, fuzzy
-<<<<<<< HEAD
-msgid "     -a NAME|IP  Create report for host name or IP address"
-msgstr "     -a ����������IP��ַ"
-=======
-msgid "     -a NAME|IP     Create report for host name or IP address"
-msgstr "     -a ����������IP��ַ"
->>>>>>> origin/v2.3
+msgid "     -a Hostname or IP address"
+msgstr "     -a Ö÷»úÃû»òÕßIPµØÖ·"
+
+#: usage.c:34
+msgid "     -b Useragent log"
+msgstr "     -b Óû§´úÀíÈÕÖ¾"
 
 #: usage.c:35
-msgid "     -c FILE        Exclude connected hosts from the report"
-msgstr ""
+msgid "     -c Exclude file"
+msgstr "     -c ÅųýµÄÎļþ"
 
 #: usage.c:36
-#, fuzzy
-<<<<<<< HEAD
-msgid "     --convert   Convert the access.log file to a legible date"
-msgstr "     -convert ת�� access.log �ļ���һ���׶�������"
-=======
-msgid "     --convert      Convert the access.log file to a legible date"
-msgstr "     -convert ת�� access.log �ļ���һ���׶�������"
->>>>>>> origin/v2.3
+msgid "     -d Date from-until dd/mm/yyyy-dd/mm/yyyy"
+msgstr "     -d ÈÕÆÚ´Ó£­µ½ dd/mm/yyyy-dd/mm/yyyy"
 
 #: usage.c:37
-msgid "     --css          Output the internal CSS"
-msgstr ""
+msgid "     -e Email address to send reports (stdout for console)"
+msgstr "     -e ÓʼþµØÖ··¢Ëͱ¨¸æ (stdout for console)"
 
 #: usage.c:38
-#, fuzzy
-msgid ""
-<<<<<<< HEAD
-"     -d DATE     Date range to include in the report: from-until dd/mm/yyyy-"
-"dd/mm/yyyy"
-msgstr "     -d ���ڴӣ��� dd/mm/yyyy-dd/mm/yyyy"
+#, c-format
+msgid "     -f Config file (%s/sarg.conf)\n"
+msgstr "     -f ÅäÖÃÎļþ (%s/sarg.conf)\n"
 
 #: usage.c:39
-#, fuzzy
-msgid "     -e MAIL     Email address to send reports to (stdout for console)"
-msgstr "     -e �ʼ���ַ���ͱ��� (stdout for console)"
+msgid "     -g Date format [e=Europe -> dd/mm/yyyy, u=USA -> mm/dd/yyyy]"
+msgstr "     -g ÈÕÆÚ¸ñʽ [e=Å·ÖÞ -> dd/mm/yyyy, u=ÃÀ¹ú ->mm/dd/yyyy]"
 
 #: usage.c:40
-#, fuzzy, c-format
-msgid "     -f FILE     Config file to read (default is %s/sarg.conf)\n"
-msgstr "     -f �����ļ� (%s/sarg.conf)\n"
-=======
-"     -d DATE        Date range to include in the report: from-until dd/mm/"
-"yyyy-dd/mm/yyyy"
-msgstr "     -d ���ڴӣ��� dd/mm/yyyy-dd/mm/yyyy"
-
-#: usage.c:39
-#, fuzzy
-msgid ""
-"     -e MAIL        Email address to send reports to (stdout for console)"
-msgstr "     -e �ʼ���ַ���ͱ��� (stdout for console)"
-
-#: usage.c:40
-#, fuzzy, c-format
-msgid "     -f FILE        Config file to read (default is %s/sarg.conf)\n"
-msgstr "     -f �����ļ� (%s/sarg.conf)\n"
->>>>>>> origin/v2.3
+msgid "     -h This help"
+msgstr "     -h ÕâÀïÊÇ°ïÖú"
 
 #: usage.c:41
-#, fuzzy
-msgid ""
-<<<<<<< HEAD
-"     -g FMT      Date format [e=Europe -> dd/mm/yyyy, u=USA -> mm/dd/yyyy]"
-msgstr "     -g ���ڸ�ʽ [e=ŷ�� -> dd/mm/yyyy, u=��� ->mm/dd/yyyy]"
-
-#: usage.c:42
-#, fuzzy
-msgid "     -h          This help"
-msgstr "     -h �����ǰ���"
-
-#: usage.c:43
-#, fuzzy
-msgid "     --help      This help"
-msgstr "     -h �����ǰ���"
-
-#: usage.c:44
-#, fuzzy
-msgid "     -i          Reports by user and IP address"
-msgstr "     -i �û�������IP��ַ"
-=======
-"     -g FMT         Date format [e=Europe -> dd/mm/yyyy, u=USA -> mm/dd/yyyy]"
-msgstr "     -g ���ڸ�ʽ [e=ŷ�� -> dd/mm/yyyy, u=��� ->mm/dd/yyyy]"
+msgid "     -i Reports by user and IP address"
+msgstr "     -i Óû§±¨¸æºÍIPµØÖ·"
 
 #: usage.c:42
-#, fuzzy
-msgid "     -h             This help"
-msgstr "     -h �����ǰ���"
+msgid "     -l Input log"
+msgstr "     -l ÊäÈëÈÕÖ¾"
 
 #: usage.c:43
-#, fuzzy
-msgid "     --help         This help"
-msgstr "     -h �����ǰ���"
+msgid "     -n Resolve IP Address"
+msgstr "     -n ½âÎöIPµØÖ·"
 
 #: usage.c:44
-#, fuzzy
-msgid "     -i             Reports by user and IP address"
-msgstr "     -i �û�������IP��ַ"
->>>>>>> origin/v2.3
+msgid "     -o Output dir"
+msgstr "     -o Êä³öĿ¼"
 
 #: usage.c:45
-msgid "     --keeplogs     Keep every previously generated report"
-msgstr ""
+msgid "     -p Use Ip Address instead of userid (reports)"
+msgstr "     -p ʹÓÃIPµØÖ·Ìæ´úÓû§ID (reports)"
 
 #: usage.c:46
-#, fuzzy
-<<<<<<< HEAD
-msgid "     -l FILE     Input log"
-msgstr "     -l ������־"
-=======
-msgid "     -l FILE        Input log"
-msgstr "     -l ������־"
->>>>>>> origin/v2.3
+msgid "     -s Accessed site [Eg. www.microsoft.com, www.netscape.com]"
+msgstr "     -s ·ÃÎÊÕ¾µã [ÀýÈç www.microsoft.com, www.netscape.com]"
 
 #: usage.c:47
-msgid "     --lastlog      Set the number of previous reports to keep"
-msgstr ""
+msgid "     -t Time [HH, HH:MM]"
+msgstr "     -t ʱ¼ä[HH,HH:MM]"
 
 #: usage.c:48
-#, fuzzy
-<<<<<<< HEAD
-msgid "     -m          Advanced process messages"
-msgstr "                ������Ϣ (-z) = %s\n"
+msgid "     -u User"
+msgstr "     -u Óû§"
 
 #: usage.c:49
-#, fuzzy
-msgid "     -n          Resolve IP addresses using RDNS"
-msgstr "              ת��IP��ַ (-n) = %s\n"
-=======
-msgid "     -m             Advanced process messages"
-msgstr "                ������Ϣ (-z) = %s\n"
-
-#: usage.c:49
-#, fuzzy
-msgid "     -n             Resolve IP addresses using RDNS"
-msgstr "              ת��IP��ַ (-n) = %s\n"
->>>>>>> origin/v2.3
+msgid "     -w Temporary dir"
+msgstr "     -w ÁÙʱĿ¼"
 
 #: usage.c:50
-#, fuzzy
-msgid "     -o DIR         Report output directory"
-msgstr "     -w ��ʱĿ¼"
+msgid "     -x Debug messages"
+msgstr "     -x ²î´íÐÅÏ¢"
 
 #: usage.c:51
-#, fuzzy
-<<<<<<< HEAD
-msgid "     -p          Use Ip Address instead of userid (reports)"
-msgstr "     -p ʹ��IP��ַ�����û�ID (reports)"
-=======
-msgid "     -p             Use Ip Address instead of userid (reports)"
-msgstr "     -p ʹ��IP��ַ�����û�ID (reports)"
->>>>>>> origin/v2.3
+msgid "     -z Process messages"
+msgstr "     -z ½ø³ÌÐÅÏ¢"
 
 #: usage.c:52
-msgid "     -P PREFIX      Prepend a prefix to the splitted file names"
-msgstr ""
+msgid "     -convert Convert the access.log file to a legible date"
+msgstr "     -convert ת»» access.log Îļþµ½Ò»¸öÒ׶®µÄÈÕÆÚ"
 
 #: usage.c:53
-#, fuzzy
-<<<<<<< HEAD
-msgid "     -s SITE     Limit report to accessed site [eg. www.microsoft.com]"
-msgstr "     -s ����վ�� [���� www.microsoft.com, www.netscape.com]"
-
-#: usage.c:54
-#, fuzzy
-msgid "     --split     Split the log file by date in -d parameter"
-msgstr "     -split ʹ�����ڷ�����־�ļ� -d ����"
-=======
-msgid ""
-"     -s SITE        Limit report to accessed site [eg. www.microsoft.com]"
-msgstr "     -s ����վ�� [���� www.microsoft.com, www.netscape.com]"
-
-#: usage.c:54
-#, fuzzy
-msgid "     --split        Split the log file by date in -d parameter"
-msgstr "     -split ʹ�����ڷ�����־�ļ� -d ����"
->>>>>>> origin/v2.3
-
-#: usage.c:55
-msgid ""
-"     --splitprefix PREFIX\n"
-"                    Prepend a prefix to the splitted file names"
-msgstr ""
+msgid "     -split Split the log file by date in -d parameter"
+msgstr "     -split ʹÓÃÈÕÆÚ·ÖÀëÈÕÖ¾Îļþ -d ²ÎÊý"
 
-#: usage.c:57
-msgid "     -t TIME        Limit report to time range [HH:MM or HH:MM-HH:MM]"
-msgstr ""
-
-#: usage.c:58
-#, fuzzy
-<<<<<<< HEAD
-msgid "     -w DIR      Temporary directory"
-msgstr "     -w ��ʱĿ¼"
-
-#: usage.c:59
-#, fuzzy
-msgid "     -x          Debug messages"
-msgstr "     -x ������Ϣ"
-
-#: usage.c:60
-#, fuzzy
-msgid "     -z          Process messages"
-msgstr "     -z ������Ϣ"
-
-#: usage.c:63
+#: usage.c:56
 msgid ""
 "\n"
 "\tPlease donate to the sarg project:"
 msgstr ""
 "\n"
-"\t������Sarg��Ŀ:"
-=======
-msgid "     -u USER        Report only that user's activity"
-msgstr "     -i �û�������IP��ַ"
+"\tÇë¾èÖúSargÏîÄ¿:"
 
-#: usage.c:59
-#, fuzzy
-msgid "     -w DIR         Temporary directory"
-msgstr "     -w ��ʱĿ¼"
-
-#: usage.c:60
-#, fuzzy
-msgid "     -x             Debug messages"
-msgstr "     -x ������Ϣ"
-
-#: usage.c:61
-#, fuzzy
-msgid "     -z             Process messages"
-msgstr "     -z ������Ϣ"
->>>>>>> origin/v2.3
-
-#: useragent.c:65 useragent.c:70 useragent.c:146 useragent.c:158
-#: useragent.c:229 useragent.c:240 useragent.c:298
+#: useragent.c:66 useragent.c:71 useragent.c:144 useragent.c:153
+#: useragent.c:221 useragent.c:229 useragent.c:281
 #, c-format
 msgid "(useragent) Cannot open file %s\n"
-msgstr "(useragent) ���ܴ����ļ� %s\n"
+msgstr "(useragent) ²»ÄÜ´ò¿ªÎļþ %s\n"
 
-#: useragent.c:75
+#: useragent.c:76
 #, c-format
 msgid "Reading useragent log: %s\n"
-msgstr "��ȡ�û�������־: %s\n"
+msgstr "¶ÁÈ¡Óû§´úÀíÈÕ־: %s\n"
 
-#: useragent.c:100
+#: useragent.c:101
 #, c-format
 msgid "Maybe you have a broken useragent entry in your %s file\n"
-msgstr "�������в��������û����������� %s �ļ�\n"
+msgstr "¿ÉÄÜÄãÓв»ÍêÕûµÄÓû§´úÀíÔÚÄãµÄ %s Îļþ\n"
 
-#: useragent.c:122
+#: useragent.c:123
 #, c-format
 msgid "   Records read: %ld\n"
-msgstr "   ��¼ ��ȡ: %ld\n"
+msgstr "   ¼Í¼ ¶Áȡ: %ld\n"
 
-#: useragent.c:163
+#: useragent.c:158
 #, c-format
 msgid "Making Useragent report\n"
-msgstr "���ǵ��û�������\n"
+msgstr "±ê¼ÇµÄÓû§´úÀí±¨¸æ\n"
 
-#: useragent.c:165 useragent.c:166
+#: useragent.c:160 useragent.c:161
 msgid "Squid Useragent's Report"
-msgstr "Squid�û������ı���"
+msgstr "SquidÓû§´úÀíµÄ±¨¸æ"
 
-#: useragent.c:175 useragent.c:311
+#: useragent.c:170 useragent.c:291
 msgid "AGENT"
-msgstr "����"
+msgstr "´úÀí"
 
-#: useragent.c:180 useragent.c:250
+#: useragent.c:175 useragent.c:239
 #, c-format
 msgid "There is an invalid IP address in file %s\n"
-msgstr "��һ����Ч��IP��ַ���ļ� %s\n"
+msgstr "ÓÐÒ»¸öÎÞЧµÄIPµØÖ·ÔÚÎļþ %s\n"
 
-#: useragent.c:193 useragent.c:254 useragent.c:318
+#: useragent.c:188 useragent.c:243 useragent.c:298
 #, c-format
 msgid "There is an invalid useragent in file %s\n"
-msgstr "��һ����Ч���û��������ļ� %s\n"
+msgstr "ÓÐÒ»¸öÎÞЧµÄÓû§´úÀíÔÚÎļþ %s\n"
 
-#: userinfo.c:81
+#: userinfo.c:69
 #, c-format
 msgid "Not enough memory to store the user\n"
-msgstr "û���㹻���ڴ���洢�û� \n"
+msgstr "ûÓÐ×ã¹»µÄÄÚ´æÀ´´æ´¢Óû§ \n"
 
 #: usertab.c:64
 #, c-format
 msgid "(usertab) Cannot open file %s - %s\n"
-msgstr "(usertab) ���ܴ����ļ� %s - %s\n"
+msgstr "(usertab) ²»ÄÜ´ò¿ªÎļþ %s - %s\n"
 
 #: usertab.c:68
 #, c-format
 msgid "Failed to move till the end of the usertab file %s: %s\n"
-msgstr "�޷��ƶ�ֱ���û����ļ�ĩβ %s: %s\n"
+msgstr "ÎÞ·¨Òƶ¯Ö±µ½Óû§±íÎļþĩβ %s: %s\n"
+
+#: usertab.c:73
+#, c-format
+msgid "Cannot get the size of file %s"
+msgstr "²»ÄÜ»ñÈ¡ÎļþµÄ´óС %s"
 
 #: usertab.c:78
 #, c-format
 msgid "Failed to rewind the usertab file %s: %s\n"
-msgstr "�޷�ת���û����ļ� %s: %s\n"
+msgstr "ÎÞ·¨×ª»ØÓû§±íÎļþ %s: %s\n"
 
 #: usertab.c:82
 #, c-format
-msgid "ERROR: Cannot load. Memory fault\n"
-msgstr "����: ��������. �ڴ����� \n"
+msgid "ERROR: Cannot load. Memory fault"
+msgstr "´íÎó: ²»ÄܼÓÔØ,´æÄÚ´íÎó"
 
 #: usertab.c:93 usertab.c:102
 #, c-format
 msgid "The list of the users is too long in your %s file.\n"
-msgstr "�û��б����������� %s �ļ�.\n"
-
-#: usertab.c:149
-#, fuzzy, c-format
-msgid "Cannot prepare ldap URI for server %s on port %d\n"
-msgstr "���������LDAP������ %s ʹ�ö˿� %d\n"
+msgstr "Óû§Áбí¹ý³¤ÔÚÄãµÄ %s Îļþ.\n"
 
-#: usertab.c:155
-#, fuzzy, c-format
-msgid "Unable to connect to LDAP server %s on port %d: %d (%s)\n"
-msgstr "���������LDAP������ %s ʹ�ö˿� %d\n"
-
-#: usertab.c:161
+#: usertab.c:139
 #, c-format
-msgid "Could not disable LDAP_OPT_REFERRALS\n"
-msgstr ""
+msgid "Unable to connect to LDAP server %s on port %d\n"
+msgstr "²»ÄÜÁ¬½ÓÖÁLDAP·þÎñÆ÷ %s ʹÓÃ¶Ë¿Ú %d\n"
 
-#: usertab.c:166
+#: usertab.c:145
 #, c-format
 msgid "Could not set LDAP protocol version %d\n"
-msgstr "��������LDAPЭ���汾 %d\n"
+msgstr "²»ÄÜÉèÖÃLDAPЭÒé°汾 %d\n"
 
-#: usertab.c:173
+#: usertab.c:153
 #, c-format
 msgid "Cannot bind to LDAP server: %s\n"
-msgstr "���ܰ�����LDAP������: %s\n"
+msgstr "²»ÄÜ°ó¶¨ÖÁLDAP·þÎñÆ÷: %s\n"
 
-#: usertab.c:234
+#: usertab.c:192
 #, c-format
 msgid "LDAP search failed: %s\n"
-msgstr "LDAP����ʧ��: %s\n"
+msgstr "LDAPËÑË÷ʧ°Ü: %s\n"
 
-#: usertab.c:235
-#, c-format
-msgid "looking for \"%s\" at or below \"%s\"\n"
-msgstr ""
-
-#: usertab.c:266 usertab.c:276
+#: usertab.c:226 usertab.c:236
 #, c-format
 msgid "Loading User table: %s\n"
-msgstr "�����û���: %s\n"
+msgstr "ÔØÈëÓû§±í: %s\n"
 
-#: usertab.c:271
+#: usertab.c:231
 #, c-format
 msgid "LDAP module not compiled in sarg\n"
-msgstr "LDAPģ��û�б�����sarg��\n"
+msgstr "LDAPģ¿éûÓбàÒëÔÚsargÖÐ\n"
 
-#: util.c:55
+#: util.c:77
 #, c-format
 msgid "getword backtrace:\n"
-msgstr "getword ����:\n"
+msgstr "getword »ØËÝ:\n"
 
-#: util.c:74
+#: util.c:96
 #, c-format
 msgid "Cannot parse again the line as it was modified\n"
-msgstr "�����ٴν�����Ϊ���Ѿ����޸�\n"
+msgstr "²»ÄÜÔٴνâÎöÒòΪËüÒѾ­±»ÐÞ¸Ä\n"
 
-#: util.c:86
-#, c-format
-msgid "getword loop detected after %d bytes.\n"
-msgstr ""
-
-#: util.c:87 util.c:128 util.c:155 util.c:194 util.c:233
-#, c-format
-msgid "Line=\"%s\"\n"
-msgstr ""
-
-#: util.c:88 util.c:129 util.c:156 util.c:195 util.c:234
-#, c-format
-msgid "Record=\"%s\"\n"
-msgstr ""
-
-#: util.c:89 util.c:130 util.c:157 util.c:196 util.c:235
-#, c-format
-msgid "searching for 'x%x'\n"
-msgstr ""
-
-#: util.c:127
-#, c-format
-msgid "getword_multisep loop detected.\n"
-msgstr ""
-
-#: util.c:154
-#, c-format
-msgid "getword_skip loop detected after %d bytes.\n"
-msgstr ""
-
-#: util.c:187
-#, c-format
-msgid "Integer overflow detected in getword_atoll in line %s\n"
-msgstr ""
-
-#: util.c:193
-#, c-format
-msgid "getword_atoll loop detected after %d bytes.\n"
-msgstr ""
-
-#: util.c:226
-#, c-format
-msgid "Integer overflow detected in getword_atoi in line %s\n"
-msgstr ""
-
-#: util.c:232
-#, c-format
-msgid "getword_atoi loop detected after %d bytes.\n"
-msgstr ""
-
-#: util.c:263
+#: util.c:240
 #, c-format
 msgid "Invalid buffer passed to getword_ptr\n"
-msgstr "�����ڵĻ��������ݸ� getword_ptr\n"
+msgstr "²»´æÔڵĻº³åÇø´«µÝ¸ø getword_ptr\n"
 
-#: util.c:317
+#: util.c:294
 #, c-format
 msgid "Invalid path (%s). Please, use absolute paths only.\n"
 msgstr ""
-"�����ڵ�·�� (%s).\n"
-" ����ʹ�þ���·��.\n"
+"²»´æÔڵķ¾¶ (%s).\n"
+" Çë½öʹÓþø¶Ô·¾¶.\n"
 
-<<<<<<< HEAD
-#: util.c:318 util.c:333 util.c:345
+#: util.c:295 util.c:310 util.c:322
 #, c-format
 msgid "process aborted.\n"
-msgstr "������ֹ.\n"
+msgstr "½ø³ÌÖÐֹ.\n"
 
-#: util.c:325
-=======
-#: util.c:324
->>>>>>> origin/v2.3
+#: util.c:302
 #, c-format
 msgid "directory name too long: %s\n"
-msgstr "�ļ���������: %s\n"
+msgstr "Îļþ¼ÐÃû¹ý³¤: %s\n"
 
-#: util.c:358
+#: util.c:309 util.c:321
+#, c-format
+msgid "mkdir %s %s\n"
+msgstr "´´½¨Ä¿Â¼ %s %s\n"
+
+#: util.c:338
 #, c-format
 msgid ""
 "The requested number of digits passed to my_lltoa (%d) is bigger than the "
 "output buffer size (%d)\n"
-msgstr "���ݸ�my_lltoa (%d) ��λҪ�������������С (%d)\n"
+msgstr "´«µÝ¸ømy_lltoa (%d) ÊýλҪÇó´óÓÚÊä³ö»º´æ´óС (%d)\n"
 
-#: util.c:433
+#: util.c:413
 msgid ""
 "January,February,March,April,May,June,July,August,September,October,November,"
 "December"
-msgstr "һ��,����,����,����,����,����,����,����,����,ʮ��,ʮһ��,ʮ����"
-
-#: util.c:438 util.c:442
-#, c-format
-msgid ""
-"The internal list of month names is invalid. Please report this bug to the "
-"translator.\n"
-msgstr ""
+msgstr "Ò»ÔÂ,¶þÔÂ,ÈýÔÂ,ËÄÔÂ,ÎåÔÂ,ÁùÔÂ,ÆßÔÂ,°ËÔÂ,¾ÅÔÂ,Ê®ÔÂ,ʮһÔÂ,Ê®¶þÔÂ"
 
-#: util.c:458
+#: util.c:432
 msgid "SARG: "
 msgstr "SARG: "
 
-#: util.c:475
-#, fuzzy
-msgid "SARG: (info) "
-msgstr "SARG: "
-
-#: util.c:660
+#: util.c:616
 #, c-format
 msgid "Failed to read the date in %s\n"
-msgstr "��ȡ����ʧ�� %s\n"
+msgstr "¶ÁÈ¡ÈÕÆÚʧ°Ü %s\n"
 
-#: util.c:716
+#: util.c:674
 #, c-format
 msgid "Failed to read the number of users in %s\n"
-msgstr "��ȡ�û���ʧ�� %s\n"
+msgstr "¶ÁÈ¡Óû§Êýʧ°Ü %s\n"
 
-#: util.c:761
+#: util.c:722
 #, c-format
 msgid "There is a invalid user in file %s\n"
-msgstr "�в����ڵ��û����ļ� %s\n"
+msgstr "Óв»´æÔÚµÄÓû§ÔÚÎļþ %s\n"
 
-#: util.c:767
+#: util.c:728
 #, c-format
 msgid "There a broken total number of access in file %s\n"
-msgstr "�в������ķ����������ļ� %s\n"
+msgstr "Óв»ÍêÕûµÄ·ÃÎÊ×ÜÊýÔÚÎļþ %s\n"
 
-#: util.c:926
+#: util.c:897
 #, c-format
 msgid "Cannot copy images to target directory %simages\n"
-msgstr "���ܿ���������Ŀ���ļ��� %simages\n"
+msgstr "²»ÄÜ¿½±´¾µÏñµ½Ä¿±êÎļþ¼Ð %simages\n"
 
-#: util.c:939
+#: util.c:907
 #, c-format
 msgid "(util) Can't open directory %s: %s\n"
-msgstr "(util) ���ܴ����ļ��� %s: %s\n"
+msgstr "(util) ²»ÄÜ´ò¿ªÎļþ¼Ð %s: %s\n"
 
-#: util.c:947
+#: util.c:915
 #, c-format
 msgid "Cannot stat \"%s\" - %s\n"
-msgstr "���ܿ�ʼ \"%s\" - %s\n"
+msgstr "²»ÄÜ¿ªʼ \"%s\" - %s\n"
 
-#: util.c:958
+#: util.c:926
 #, c-format
 msgid "Failed to copy image %s to %s\n"
-msgstr "��������ʧ�� %s ��  %s\n"
+msgstr "¿½±´¾µÏñʧ°Ü %s µ½  %s\n"
 
-#: util.c:964 util.c:967
+#: util.c:932 util.c:935
 msgid "Cannot open file"
-msgstr "���ܴ����ļ�"
+msgstr "²»ÄÜ´ò¿ªÎļþ"
 
-#: util.c:1054 util.c:1077
+#: util.c:1022 util.c:1045
 #, c-format
 msgid "File %s already exists, moved to %s\n"
-msgstr "�ļ� %s �Ѿ�����, �ƶ��� %s\n"
+msgstr "Îļþ %s ÒѾ­´æÔÚ, Òƶ¯ÖÁ %s\n"
 
-#: util.c:1095
+#: util.c:1063
 #, c-format
 msgid "cannot open %s for writing\n"
-msgstr "���ܴ����ļ� %s �д��\n"
+msgstr "²»ÄÜ´ò¿ªÎļþ %s À´Ð´Èë\n"
 
-#: util.c:1104 util.c:1109
+#: util.c:1072 util.c:1077
 #, c-format
 msgid "Failed to write the date in %s\n"
-msgstr "д��ʱ��ʱʧ����w %s\n"
+msgstr "дÈëʱ¼äʱʧ°ÜÔÚw %s\n"
 
-#: util.c:1130
-#, fuzzy, c-format
-msgid "Invalid buffer length passed to the function to safely copy a string\n"
-msgstr "�����ڵĻ��������ݸ� getword_ptr\n"
-
-#: util.c:1209
+#: util.c:1160
 #, c-format
 msgid ""
 "The date passed as argument is not formated as dd/mm/yyyy or dd/mm/yyyy-dd/"
 "mm/yyyy\n"
-msgstr "��Ϊ����ʱ���ڸ�ʽ����Ϊdd/mm/yyyy or dd/mm/yyyy-dd/mm/yyyy\n"
+msgstr "×÷Ϊ²ÎÊýʱÈÕÆÚ¸ñʽ²»ÄÜΪdd/mm/yyyy or dd/mm/yyyy-dd/mm/yyyy\n"
 
-#: util.c:1214 util.c:1218
+#: util.c:1165 util.c:1169
 #, c-format
 msgid ""
 "The date range passed as argument is not formated as dd/mm/yyyy or dd/mm/"
 "yyyy-dd/mm/yyyy\n"
 msgstr ""
-"��Ϊ����������������ʽ����Ϊdd/mm/yyyy or dd/mm/yyyy-dd/mm/yyyy-dd/mm/yyyy\n"
+"×÷Ϊ²ÎÊýµÄÈÕÆÚÇø¼ä¸ñʽ²»ÄÜΪdd/mm/yyyy or dd/mm/yyyy-dd/mm/yyyy-dd/mm/yyyy\n"
 
-#: util.c:1231
+#: util.c:1182
 #, c-format
 msgid "Failed to get the current time\n"
-msgstr "�õ�׼ȷʱ��ʱʧ��\n"
+msgstr "µÃµ½×¼È·Ê±¼äʱʧ°Ü\n"
 
-#: util.c:1236
+#: util.c:1187
 #, c-format
 msgid "Invalid number of days in -d parameter\n"
-msgstr "��Ч������������ʹ�� -d ����ʱ\n"
+msgstr "ÎÞЧµÄÈÕÆÚÊý×ÖÔÚʹÓà -d ²ÎÊýʱ\n"
 
-#: util.c:1242 util.c:1266 util.c:1273 util.c:1282 util.c:1295
+#: util.c:1193 util.c:1217 util.c:1224 util.c:1233 util.c:1246
 #, c-format
 msgid "Cannot convert local time: %s\n"
-msgstr "����ת������ʱ��: %s\n"
+msgstr "²»ÄÜת»»±¾µØʱ¼ä: %s\n"
 
-#: util.c:1261
+#: util.c:1212
 #, c-format
 msgid "Invalid number of weeks in -d parameter\n"
-msgstr "��Ч����������ʹ�� -d ����ʱ\n"
+msgstr "ÎÞЧµÄÖÜÊý×ÖÔÚʹÓà -d ²ÎÊýʱ\n"
 
-#: util.c:1290
+#: util.c:1241
 #, c-format
 msgid "Invalid number of months in -d parameter\n"
-msgstr "��Ч���·�������ʹ�� -d ����ʱ\n"
+msgstr "ÎÞЧµÄÔ·ÝÊý×ÖÔÚʹÓà -d ²ÎÊýʱ\n"
 
-#: util.c:1324
+#: util.c:1275
 #, fuzzy, c-format
 msgid "Invalid date range passed on command line\n"
 msgstr "±äÁ¿´«µÝµÄÈÕÆÚ·¶Î§ÎÞЧ\n"
 
-#: util.c:1375
+#: util.c:1328
 #, c-format
 msgid "Purging temporary file sarg-general\n"
-msgstr "������ʱ�ļ�sarg-general\n"
+msgstr "Çå³þÁÙʱÎļþsarg-general\n"
 
-#: util.c:1378
+#: util.c:1331
 #, c-format
 msgid "(removetmp) directory too long to remove %s/sarg-period\n"
-msgstr "(removetmp) �ļ���̫�����ܱ�ɾ�� %s/sarg-period\n"
+msgstr "(removetmp) Îļþ¼ÐÌ«³¤²»Äܱ»É¾³ý %s/sarg-period\n"
 
-#: util.c:1382
+#: util.c:1335
 #, c-format
 msgid "(removetmp) Cannot open file %s\n"
-msgstr "(removetmp) ���ܴ����ļ� %s\n"
+msgstr "(removetmp) ²»ÄÜ´ò¿ªÎļþ %s\n"
+
+#: util.c:1343
+#, c-format
+msgid "Failed to rewind to the beginning of the file %s: %s\n"
+msgstr "תÏòÎļþ¿ªÊ¼²¿·Öʱʧ°Ü %s: %s\n"
 
-#: util.c:1387
+#: util.c:1348
+#, c-format
+msgid "Failed to write the total line in %s - %s\n"
+msgstr "дÈëËùÓÐÐÐʱʧ°Ü%s - %s\n"
+
+#: util.c:1353
+#, c-format
+msgid "Failed to truncate %s: %s\n"
+msgstr "½Ø¶Ìʱʧ°Ü %s: %s\n"
+
+#: util.c:1357
 #, c-format
 msgid "Failed to close %s after writing the total line - %s\n"
-msgstr "д��������֮���ر� %s ʱʧ�� - %s\n"
+msgstr "дÈëËùÓÐÐÐÖ®ºó¹Ø±Õ %s ʱʧ°Ü - %s\n"
 
-#: util.c:1404
+#: util.c:1377
 #, c-format
 msgid "(util) Cannot open file %s (exclude_codes)\n"
-msgstr "(util)���ܴ����ļ� %s (exclude_codes)\n"
+msgstr "(util)²»ÄÜ´ò¿ªÎļþ %s (exclude_codes)\n"
 
-#: util.c:1409
+#: util.c:1382
 #, c-format
 msgid "Failed to move till the end of the excluded codes file %s: %s\n"
-msgstr "���ų������ļ�֮ǰ�����ƶ����ļ� %s: %s\n"
+msgstr "ÔÚÅųý´úÂëÎļþ֮ǰ²»ÄÜÒƶ¯¸ÃÎļþ %s: %s\n"
 
-#: util.c:1418
+#: util.c:1391
 #, c-format
 msgid "Failed to rewind the excluded codes file %s: %s\n"
-msgstr "ת���ų������ļ�ʱʧ�� %s: %s\n"
+msgstr "תÏòÅųý´úÂëÎļþʱʧ°Ü %s: %s\n"
 
-#: util.c:1435
+#: util.c:1408
 #, c-format
 msgid "Too many codes to exclude in file %s\n"
-msgstr "���ļ��й����ı��뱻�ų� %s\n"
+msgstr "ÔÚÎļþÖйý¶àµÄ±àÂë±»Åųý %s\n"
 
-#: util.c:1589
+#: util.c:1563
 #, c-format
 msgid "Cannot get disk space because the path %s%s is too long\n"
-msgstr "���ܻ�ȡ���̿ռ���Ϊ·�� %s%s ����\n"
+msgstr "²»ÄÜ»ñÈ¡´ÅÅÌ¿Õ¼äÒòΪ·¾¶ %s%s ¹ý³¤\n"
 
-#: util.c:1593
+#: util.c:1567
 #, c-format
 msgid "Cannot get disk space with command %s\n"
-msgstr "���ܵõ����̿ռ�ʹ������ %s\n"
+msgstr "²»Äܵõ½´ÅÅÌ¿Õ¼äʹÓÃÃüÁî %s\n"
 
-#: util.c:1597
+#: util.c:1571
 #, c-format
 msgid "Cannot get disk size with command %s\n"
-msgstr "���ܻ�ȡ���̴�Сʹ������ %s\n"
+msgstr "²»ÄÜ»ñÈ¡´ÅÅÌ´óСʹÓÃÃüÁî %s\n"
 
-#: util.c:1602
+#: util.c:1576
 #, c-format
 msgid "The command %s failed\n"
-msgstr "���� %s ʧ��\n"
+msgstr "ÃüÁî %s ʧ°Ü\n"
 
-#: util.c:1786
+#: util.c:1734
 #, c-format
 msgid "SARG Version: %s\n"
-msgstr "SARG�汾: %s\n"
+msgstr "SARG°汾: %s\n"
 
-#: util.c:1818 util.c:1909 util.c:1951
+#: util.c:1766
 #, c-format
 msgid "directory name to delete too long: %s/%s\n"
-msgstr "�ļ�������̫������ɾ��: %s/%s\n"
+msgstr "Îļþ¼ÐÃû³ÆÌ«³¤²»ÄÜɾ³ý: %s/%s\n"
 
-#: util.c:1827
+#: util.c:1775
 #, c-format
 msgid "cannot stat %s\n"
-msgstr "���ܿ�ʼ %s\n"
+msgstr "²»ÄÜ¿ªʼ %s\n"
 
-<<<<<<< HEAD
-#: util.c:1835 util.c:1848
+#: util.c:1780 util.c:1793
 #, c-format
 msgid "cannot delete %s - %s\n"
-msgstr " ����ɾ�� %s - %s\n"
+msgstr " ²»ÄÜɾ³ý %s - %s\n"
 
-#: util.c:1841
-=======
-#: util.c:1838 util.c:1969
->>>>>>> origin/v2.3
+#: util.c:1786
 #, c-format
 msgid "unknown path type %s\n"
-msgstr "δ֪��·������ %s\n"
-
-#~ msgid "Sort"
-#~ msgstr "����"
-
-#, fuzzy
-#~ msgid "USER"
-#~ msgstr "�û�"
-
-#~ msgid "Temporary directory name too long: %s\n"
-#~ msgstr "��ʱ�ļ������ƹ���: %s\n"
-
-#~ msgid "SARG: MALICIUS CODE DETECTED.\n"
-#~ msgstr "SARG: MALICIUS �������⵽d.\n"
-
-#~ msgid ""
-#~ "SARG: I think someone is trying to execute arbitrary code in your system "
-#~ "using sarg.\n"
-#~ msgstr "SARG: ���������ڳ���ִ�������Ĵ���������ϵͳ��ʹ��sarg.\n"
-
-#~ msgid ""
-#~ "SARG: please review your access.log and/or your useragent.log file.\n"
-#~ msgstr "SARG: ���쿴access.log ��/�� useragent.log �ļ�.\n"
-
-#~ msgid "SARG: process stoped. No actions taken.\n"
-#~ msgstr "SARG: ������ֹ.û��ִ��.\n"
-
-#~ msgid "temporary directory too long: %s/sarg\n"
-#~ msgstr "��ʱ�ļ��й���: %s/sarg\n"
-
-#: util.c:1902 util.c:1944
-#, c-format
-msgid ""
-"Unknown file \"%s\" found in temporary directory \"%s\". It is not one of "
-"our files. Please check the temporary directory you gave to sarg. Adjust the "
-"path to a safe directory or manually delete the content of \"%s\"\n"
-msgstr ""
-
-#: util.c:1919 util.c:1960
-#, fuzzy, c-format
-msgid "cannot stat \"%s\"\n"
-msgstr "���ܿ�ʼ %s\n"
-
-#: util.c:1925
-#, c-format
-msgid "Unknown path type \"%s\". Check your temporary directory\n"
-msgstr ""
-
-#~ msgid "H"
-#~ msgstr "H"
-
-#, fuzzy
-#~ msgid ""
-#~ "SARG: Maybe you have a broken record or garbage in the names of the "
-#~ "months.\n"
-#~ msgstr "�����в������ļ�¼������������ļ� %s\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Maybe you have a broken record or garbage in the name of the months.\n"
-#~ msgstr "�����в������ļ�¼������������ļ� %s\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "\tPlease donate to the sarg project:"
-#~ msgstr ""
-#~ "\n"
-#~ "\t������Sarg��Ŀ:"
-
-#, fuzzy
-#~ msgid "Failed to delete the file \"%s\" after processing it - %s\n"
-#~ msgstr "ɾ���ļ�ʧ�� %s\n"
-
-#~ msgid "Report"
-#~ msgstr "����"
-
-#, fuzzy
-#~ msgid "Cannot delete unused file \"%s\" - %s\n"
-#~ msgstr "�޷�ɾ����ʱ�ļ� %s - %s\n"
-
-#, fuzzy
-#~ msgid "Failed to remove the file %s: %s\n"
-#~ msgstr "�Ƴ��ļ�ʧ�� %s\n"
-
-#~ msgid "Failed to delete the file %s\n"
-#~ msgstr "ɾ���ļ�ʧ�� %s\n"
-
-#~ msgid "process aborted.\n"
-#~ msgstr "������ֹ.\n"
-
-#~ msgid "cannot delete %s - %s\n"
-#~ msgstr " ����ɾ�� %s - %s\n"
-
-#~ msgid "     -b Useragent log"
-#~ msgstr "     -b �û�������־"
-
-#~ msgid "     -c Exclude file"
-#~ msgstr "     -c �ų����ļ�"
-
-#~ msgid "     -n Resolve IP Address"
-#~ msgstr "     -n ����IP��ַ"
-
-#~ msgid "     -o Output dir"
-#~ msgstr "     -o ����Ŀ¼"
-
-#~ msgid "     -t Time [HH, HH:MM]"
-#~ msgstr "     -t ʱ��[HH,HH:MM]"
-
-#~ msgid "     -u User"
-#~ msgstr "     -u �û�"
-
-#~ msgid "URL too long in redirector log file %s\n"
-#~ msgstr "���ض�����־�ļ�����ӹ��� %s\n"
-
-#~ msgid "Temporary file name too long: %s/%s.htmp\n"
-#~ msgstr "��ʱ�ļ�������: %s/%s.htmp\n"
-
-#~ msgid "(report-1) Cannot open file %s - %s\n"
-#~ msgstr "(report-1) ���ܴ����ļ� %s - %s\n"
-
-#~ msgid "Path too long %s/%s.htmp\n"
-#~ msgstr "·������ %s/%s.htmp\n"
-
-#~ msgid "(report-2) Cannot open file %s - %s\n"
-#~ msgstr "(report-2)���ܴ����ļ� %s - %s\n"
-
-#~ msgid "pre-sorting files\n"
-#~ msgstr "Ԥ�����ļ�\n"
-
-#~ msgid "Cannot delete temporary file %s - %s\n"
-#~ msgstr "�޷�ɾ����ʱ�ļ� %s - %s\n"
-
-#~ msgid "Cannot get the size of file %s"
-#~ msgstr "���ܻ�ȡ�ļ��Ĵ�С %s"
-
-#~ msgid "ERROR: Cannot load. Memory fault"
-#~ msgstr "����: ���ܼ���,���ڴ���"
-
-#, fuzzy
-#~ msgid "(html11) Cannot open file %s - %s\n"
-#~ msgstr "(html11) ���ܴ����ļ� %s\n"
-
-#~ msgid "(html11) read error in %s\n"
-#~ msgstr "(html11) ��ȡ������ %s\n"
-
-#~ msgid "IPv6 addresses are not supported (found in %s)\n"
-#~ msgstr "IPv6����֧��(found in %s)\n"
-
-#~ msgid "There is a broken record or garbage in your %s file\n"
-#~ msgstr "�в������ļ�¼����������� %s �ļ���\n"
-
-#~ msgid "Ignoring unknown user file %s\n"
-#~ msgstr "����δ֪���û��ļ� %s\n"
-
-#~ msgid "(html2) Cannot open file %s\n"
-#~ msgstr "(html2) ���ܴ�����־�ļ� %s\n"
-
-#~ msgid "Unknown user ID %s in directory %s\n"
-#~ msgstr "δ֪���û�ID %s ��Ŀ¼ %s\n"
-
-#~ msgid "Time period must be MM or MM:SS. Exit\n"
-#~ msgstr "ʱ����������Ϊ MM ���� MM:SS.Exit\n"
-
-#~ msgid "Path too long %s/%s.utmp\n"
-#~ msgstr "·������ %s/%s.utmp\n"
-
-#~ msgid "(totger) Cannot open file %s\n"
-#~ msgstr "(totger) ���ܴ����ļ� %s\n"
-
-#~ msgid "Not enough memory to read the temporary file %s\n"
-#~ msgstr "û���㹻���ڴ�ȥ��ȡ��ʱ�ļ� %s\n"
-
-#~ msgid "Failed to move to the end of %s - %s\n"
-#~ msgstr "�ƶ���ĩβʱʧ�� %s - %s\n"
-
-#~ msgid "Failed to rewind to the beginning of the file %s: %s\n"
-#~ msgstr "ת���ļ���ʼ����ʱʧ�� %s: %s\n"
-
-#~ msgid "Failed to write the total line in %s - %s\n"
-#~ msgstr "д��������ʱʧ��%s - %s\n"
-
-#~ msgid "Failed to truncate %s: %s\n"
-#~ msgstr "�ض�ʱʧ�� %s: %s\n"
+msgstr "δ֪µÄ·¾¶ÀàÐÍ %s\n"
 
 #~ msgid "Sort"
-#~ msgstr "����"
+#~ msgstr "ÅÅÐò"
 
 #, fuzzy
 #~ msgid "USER"
-#~ msgstr "�û�"
+#~ msgstr "Óû§"
 
 #~ msgid "Temporary directory name too long: %s\n"
-#~ msgstr "��ʱ�ļ������ƹ���: %s\n"
+#~ msgstr "ÁÙʱÎļþ¼ÐÃû³Æ¹ý³¤: %s\n"
 
 #~ msgid "SARG: MALICIUS CODE DETECTED.\n"
-#~ msgstr "SARG: MALICIUS �������⵽d.\n"
+#~ msgstr "SARG: MALICIUS ´úÂëÕì²⵽d.\n"
 
 #~ msgid ""
 #~ "SARG: I think someone is trying to execute arbitrary code in your system "
 #~ "using sarg.\n"
-#~ msgstr "SARG: ���������ڳ���ִ�������Ĵ���������ϵͳ��ʹ��sarg.\n"
+#~ msgstr "SARG: ÎÒÏëÓÐÈËÔÚ³¢ÊÔÖ´ÐÐÈÎÒâµÄ´úÂëÔÚÄãµÄϵͳÖÐʹÓÃsarg.\n"
 
 #~ msgid ""
 #~ "SARG: please review your access.log and/or your useragent.log file.\n"
-#~ msgstr "SARG: ���쿴access.log ��/�� useragent.log �ļ�.\n"
+#~ msgstr "SARG: Çë²ì¿´access.log ºÍ/»ò useragent.log Îļþ.\n"
 
 #~ msgid "SARG: process stoped. No actions taken.\n"
-#~ msgstr "SARG: ������ֹ.û��ִ��.\n"
+#~ msgstr "SARG: ½ø³ÌÖÐÖ¹.ûÓÐÖ´ÐÐ.\n"
 
 #~ msgid "temporary directory too long: %s/sarg\n"
-#~ msgstr "��ʱ�ļ��й���: %s/sarg\n"
+#~ msgstr "ÁÙʱÎļþ¼Ð¹ý³¤: %s/sarg\n"
 
 #~ msgid "(convlog) Cannot open log file %s\n"
-#~ msgstr "(convlog) ���ܴ�����־�ļ� %s\n"
+#~ msgstr "(convlog) ²»ÄÜ´ò¿ªÈÕÖ¾Îļþ %s\n"
 
 #~ msgid "user name too long for %s/%s/graph_day.png\n"
-#~ msgstr "�û������� %s/%s/graph_day.png\n"
+#~ msgstr "Óû§Ãû¹ý³¤ %s/%s/graph_day.png\n"
+
+#~ msgid "Option -%c require an argument\n"
+#~ msgstr "Ñ¡Ïî -%c ÐèÒªÒ»¸öÅжÏ\n"
+
+#~ msgid "Year string too long in redirector log file %s\n"
+#~ msgstr "ÔÚÖض¨ÏòÈÕÖ¾ÎļþÖÐÄê·Ý×Ö·û´®Ì«³¤ %s\n"
 
 #~ msgid "Month string too long in redirector log file %s\n"
-#~ msgstr "���ض�����־�ļ����·��ַ������� %s\n"
+#~ msgstr "ÔÚÖض¨ÏòÈÕÖ¾ÎļþÖÐÔ·Ý×Ö·û´®¹ý³¤ %s\n"
 
 #~ msgid "Day string too long in redirector log file %s\n"
-#~ msgstr "���ض�����־�ļ��������ַ���̫�� %s\n"
+#~ msgstr "ÔÚÖض¨ÏòÈÕÖ¾ÎļþÖÐÈÕÆÚ×Ö·û´®Ì«³¤ %s\n"
 
 #~ msgid "There is a broken rule in file %s\n"
-#~ msgstr "�в������Ĺ������ļ� %s\n"
+#~ msgstr "Óв»ÍêÕûµÄ¹æÔòÔÚÎļþ %s\n"
 
 #~ msgid "(authfail) read error in %s\n"
 #~ msgstr "(authfail) ¶ÁÈ¡´íÎó%s\n"
 
+#~ msgid "(dansguardian_report) Cannot open file %s\n"
+#~ msgstr "£¨dansguardian_report£©ÎÞ·¨´ò¿ªÎļþ%s\n"
+
 #~ msgid "(dansguardian_report) read error in %s\n"
 #~ msgstr "£¨dansguardian_report£©%s¶ÁÈ¡´íÎó\n"
 
@@ -3789,6 +2727,9 @@ msgstr ""
 #~ msgid "Decompressing log file: %s (uncompress)\n"
 #~ msgstr "½âѹËõÈÕÖ¾ÎļþÖÐ: %s (uncompress)\n"
 
+#~ msgid "compression command too long for log file %s\n"
+#~ msgstr "ѹËõÃüÁî¶ÔÓÚÈÕÖ¾Îļþ¹ý³¤ %s\n"
+
 #~ msgid "(denied) Cannot open file %s\n"
 #~ msgstr "£¨denied£©ÎÞ·¨´ò¿ªÎļþ %s\n"
 
@@ -3845,8 +2786,8 @@ msgstr ""
 
 #~ msgid "Maybe you have a broken elapsed time in your %s file (%d)\n"
 #~ msgstr ""
-#~ "´íÎóµÄÁ÷ÊÅʱ¼ä¿ÉÄÜ´æÔÚÓÚÄãµÄ %sÎļþÖÐ "
-#~ "(%d)\n"
+#~ "´íÎóµÄÁ÷ÊÅʱ¼ä¿ÉÄÜ´æÔÚÓÚÄãµÄ %sÎļþÖÐ (%"
+#~ "d)\n"
 
 #~ msgid ""
 #~ "SARG: The date range requested on the command line by option -d is "