#: topuser.c:194 useragent.c:141 useragent.c:224 useragent.c:293
#, c-format
msgid "sort command return status %d\n"
-msgstr "ÅÅÐòÃüÁî·µ»Ø״̬ %d\n"
+msgstr "���������״̬ %d\n"
- #: authfail.c:86 authfail.c:91 dansguardian_log.c:154 download.c:71
- #: email.c:141 html.c:395 lastlog.c:82 log.c:1690 realtime.c:104
+ #: 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:88 topsites.c:94
- #: topsites.c:204 topsites.c:209 topuser.c:195 useragent.c:142 useragent.c:147
+ #: 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
#, c-format
msgid "sort command: %s\n"
-msgstr "ÅÅÐòÃüÁî: %s\n"
+msgstr "��������: %s\n"
- #: authfail.c:90 authfail.c:100
+ #: authfail.c:92 authfail.c:102
#, c-format
msgid "(authfail) Cannot open file %s\n"
-msgstr "(authfail) ²»ÄÜ´ò¿ªÎļþ %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"
+
+#: authfail.c:104 authfail.c:108 topuser.c:241
++=======
+ #: authfail.c:106 authfail.c:110 topuser.c:241
++>>>>>>> origin/v2.3
msgid "Authentication Failures"
-msgstr "ÈÏ֤ʧ°Ü"
+msgstr "��֤ʧ��"
- #: authfail.c:106 dansguardian_report.c:82 denied.c:86 download.c:144
- #: grepday.c:559 redirector.c:471 siteuser.c:86 smartfilter.c:107
- #: smartfilter.c:175 topsites.c:225 topuser.c:218
+ #: 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
#, c-format
msgid "Period: %s"
-msgstr "Çø¼ä: %s"
+msgstr "����: %s"
- #: authfail.c:112 dansguardian_report.c:88 denied.c:92 download.c:150
- #: email.c:175 realtime.c:314 redirector.c:477 smartfilter.c:116
+ #: 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
msgid "USERID"
-msgstr "Óû§ID"
+msgstr "�û�ID"
- #: authfail.c:112 dansguardian_report.c:88 denied.c:92 download.c:150
- #: realtime.c:314 redirector.c:477 smartfilter.c:116 smartfilter.c:183
+ #: 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
msgid "IP/NAME"
-msgstr "IP/ÐÕÃû"
+msgstr "IP/����"
- #: authfail.c:112 dansguardian_report.c:88 denied.c:92 download.c:150
- #: realtime.c:314 redirector.c:477 smartfilter.c:116 smartfilter.c:183
+ #: 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
msgid "DATE/TIME"
-msgstr "ÈÕÆÚ/ʱ¼ä"
+msgstr "����/ʱ��"
- #: authfail.c:112 dansguardian_report.c:88 denied.c:92 download.c:150
- #: html.c:203 realtime.c:314 redirector.c:477 report.c:267 siteuser.c:95
- #: smartfilter.c:116 smartfilter.c:183 topsites.c:237
+ #. 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
msgid "ACCESSED SITE"
-msgstr "·ÃÎÊÕ¾µã"
+msgstr "����վ��"
- #: authfail.c:115 email.c:81 html.c:128 html.c:351 html.c:407 siteuser.c:109
- #: topsites.c:104 topsites.c:243
+ #: authfail.c:117 email.c:81 html.c:128 html.c:350 html.c:411 siteuser.c:110
+ #: topsites.c:106 topsites.c:264
#, c-format
msgid "Not enough memory to read file %s\n"
-msgstr "ûÓÐ×ã¹»µÄÄÚ´æÀ´¶ÁÈ¡Îļþ %s\n"
+msgstr "û���㹻���ڴ����ȡ�ļ� %s\n"
- #: authfail.c:122
+ #: authfail.c:124
#, c-format
msgid "There is a broken date in file %s\n"
-msgstr "Óв»ÍêÕûµÄÈÕÆÚÔÚÎļþ %s\n"
+msgstr "�в��������������ļ� %s\n"
- #: authfail.c:126
+ #: authfail.c:128
#, c-format
msgid "There is a broken time in file %s\n"
-msgstr "Óв»ÍêÕûµÄʱ¼äÔÚÎļþÖÐ %s\n"
+msgstr "�в�������ʱ�����ļ��� %s\n"
- #: authfail.c:130
+ #: authfail.c:132
#, c-format
msgid "There is a broken user ID in file %s\n"
-msgstr "Óв»ÍêÕûµÄÓû§IDÔÚÎļþÖÐ %s\n"
+msgstr "�в��������û�ID���ļ��� %s\n"
- #: authfail.c:134
+ #: authfail.c:136
#, c-format
msgid "There is a broken IP address in file %s\n"
-msgstr "Óв»ÍêÕûµÄIPµØÖ·ÔÚÎļþÖÐ %s\n"
+msgstr "�в�������IP��ַ���ļ��� %s\n"
- #: authfail.c:138 denied.c:107 download.c:165 html.c:150 html.c:239
+ #: authfail.c:140 denied.c:108 download.c:165 html.c:150 html.c:238
#, c-format
msgid "There is a broken url in file %s\n"
-msgstr "Óв»ÍêÕûµÄÁ¬½ÓÔÚÎļþÖÐ %s\n"
+msgstr "�в�������������ļ��� %s\n"
- #: authfail.c:147 denied.c:116 download.c:174 email.c:212 redirector.c:508
- #: siteuser.c:118 smartfilter.c:129 topuser.c:332
+ #: authfail.c:149 denied.c:117 download.c:174 email.c:212 redirector.c:509
+ #: siteuser.c:119 smartfilter.c:129 topuser.c:332
#, c-format
msgid "Unknown user ID %s in file %s\n"
-msgstr "δ֪µÄÓû§ID %s ÔÚÎļþ %s\n"
+msgstr "δ֪���û�ID %s ���ļ� %s\n"
- #: authfail.c:203 dansguardian_report.c:168 denied.c:175 download.c:229
- #: grepday.c:772 html.c:586 redirector.c:574 repday.c:240 siteuser.c:190
- #: topsites.c:291 useragent.c:332
+ #: authfail.c:205 dansguardian_report.c:169 denied.c:176 download.c:229
+ #: grepday.c:773 html.c:586 redirector.c:575 repday.c:240 siteuser.c:191
+ #: topsites.c:319 useragent.c:332
#, c-format
msgid "Write error in file %s\n"
-msgstr "ÔÚÎļþÖÐÓÐдÈë´íÎó %s\n"
+msgstr "���ļ�����д������ %s\n"
- #: authfail.c:205 convlog.c:80 dansguardian_report.c:170 denied.c:177
- #: download.c:231 grepday.c:774 html.c:588 redirector.c:576 repday.c:242
- #: siteuser.c:192 splitlog.c:112 splitlog.c:143 splitlog.c:147 topsites.c:293
+ #: 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:242
+ #: 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
#, c-format
msgid "Failed to close file %s - %s\n"
#: dansguardian_log.c:61 dansguardian_log.c:66 dansguardian_log.c:90
#, 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:94 lastlog.c:114 log.c:937 log.c:942 log.c:948
- #: log.c:956 log.c:960 log.c:964 log.c:969 log.c:974 log.c:1075 log.c:1079
- #: log.c:1083 log.c:1087 log.c:1091 log.c:1095 log.c:1099 log.c:1103
- #: log.c:1107 log.c:1140 log.c:1147 log.c:1171 topsites.c:250 topsites.c:255
+ #: 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
#, c-format
msgid "Maybe you have a broken record or garbage in your %s file\n"
#: dansguardian_log.c:112
#, fuzzy, c-format
msgid "Invalid IP address found in your dansguardian log file %s\n"
-msgstr "ÔÚÎļþÖдæÔÚÎÞЧµÄÈÕÆÚ %s\n"
+msgstr "���ļ��д�����Ч������ %s\n"
- #: dansguardian_log.c:120 dansguardian_report.c:98 html.c:361 log.c:952
- #: log.c:1050
+ #: dansguardian_log.c:120 dansguardian_report.c:99 html.c:360 log.c:958
+ #: log.c:1056
#, 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
#, c-format
msgid "Dansguardian report not generated because it is empty\n"
msgstr "£¨dansguardian_report£©ÎÞ·¨´ò¿ªÎļþ%s\n"
- #: dansguardian_report.c:71 dansguardian_report.c:76
+ #: dansguardian_report.c:72 dansguardian_report.c:77
#, c-format
msgid "(dansguardian_report) Cannot open log file %s\n"
-msgstr "(dansguardian_report) ²»ÄÜ´ò¿ªÈÕÖ¾Îļþ %s\n"
+msgstr "(dansguardian_report) ���ܴ�����־�ļ� %s\n"
- #: dansguardian_report.c:80 dansguardian_report.c:84 topuser.c:237
+ #: dansguardian_report.c:81 dansguardian_report.c:85 topuser.c:237
msgid "DansGuardian"
msgstr "DansGuardian"
- #: dansguardian_report.c:88
+ #: dansguardian_report.c:89
msgid "CAUSE"
-msgstr "ԭÒò"
+msgstr "ԭ��"
- #: dansguardian_report.c:102
+ #: dansguardian_report.c:103
#, 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
#: 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:92 datafile.c:148
#, c-format
#: datafile.c:97
#, c-format
msgid "Not enough memory to read the downloaded files.\n"
-msgstr "ûÓÐ×ã¹»µÄÄÚ´æÈ¥¶ÁÈ¡ÒÑÏÂÔØÎļþ. \n"
+msgstr "û���㹻���ڴ�ȥ��ȡ�������ļ�. \n"
- #: datafile.c:109 denied.c:103 download.c:161 report.c:166 smartfilter.c:123
+ #: datafile.c:109 denied.c:104 download.c:161 report.c:166 smartfilter.c:123
#, c-format
msgid "There is a broken record or garbage in file %s\n"
-msgstr "Óв»ÍêÕûµÄ¼Í¼»òÀ¬»øÔÚÎļþ %s\n"
+msgstr "�в������ļ�¼��������ļ� %s\n"
#: datafile.c:113
#, 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:138 topsites.c:118 topsites.c:137
+ #: report.c:304 siteuser.c:139 topsites.c:120 topsites.c:139
#, c-format
msgid "Not enough memory to store the url\n"
-msgstr "ûÓÐ×ã¹»µÄÄÚ´æÈ¥´æ´¢Á¬½Ó\n"
+msgstr "û���㹻���ڴ�ȥ�洢���\n"
#: datafile.c:198
#, c-format
msgid "Denied report not produced because it is empty\n"
msgstr ""
- #: denied.c:75 denied.c:80
+ #: denied.c:76 denied.c:81
#, c-format
msgid "(denied) Cannot open log file %s\n"
-msgstr "(denied)²»ÄÜ´ò¿ªÈÕÖ¾Îļþ %s\n"
+msgstr "(denied)���ܴ�����־�ļ� %s\n"
- #: denied.c:84 denied.c:88
+ #: denied.c:85 denied.c:89
msgid "Denied"
-msgstr "ÉùÃ÷"
+msgstr "����"
- #: denied.c:95
+ #: denied.c:96
#, 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"
msgid "Sort command too long when sorting file \"%s\" to \"%s\"\n"
msgstr "ѹËõÃüÁî¶ÔÓÚÈÕÖ¾Îļþ¹ý³¤ %s\n"
- #: email.c:161 log.c:363
+ #: email.c:161 log.c:364
msgid "Squid User Access Report"
-msgstr "SquidÓû§·ÃÎʱ¨¸æ"
+msgstr "Squid�û����ʱ���"
#: email.c:165
msgid "Decreasing Access (bytes)"
#: email.c:169 html.c:182 repday.c:127 report.c:258 useragent.c:167
msgid "Period"
-msgstr "ÆÚ¼ä"
+msgstr "�ڼ�"
- #: email.c:173 siteuser.c:93 topsites.c:235 topuser.c:260
+ #. 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
msgid "NUM"
-msgstr "Êý×Ö"
+msgstr "����"
- #: email.c:177 html.c:206 topsites.c:237 topuser.c:272
+ #. 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
msgid "CONNECT"
-msgstr "Á¬½Ó"
+msgstr "���"
- #: email.c:179 grepday.c:751 html.c:208 html.c:210 index.c:432 repday.c:140
- #: siteuser.c:97 topsites.c:237 topuser.c:274 topuser.c:276
+ #. 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
msgid "BYTES"
-msgstr "×Ö½Ú"
+msgstr "�ֽ�"
- #: email.c:181 grepday.c:764 html.c:214 topuser.c:280
+ #: email.c:181 grepday.c:765 html.c:213 topuser.c:280
msgid "ELAPSED TIME"
-msgstr "ÒÑʹÓÃʱ¼ä"
+msgstr "��ʹ��ʱ��"
- #: email.c:183 html.c:216 topuser.c:282
+ #: email.c:183 html.c:215 topuser.c:282
msgid "MILLISEC"
-msgstr "ºÁÃë"
+msgstr "����"
- #: email.c:185 html.c:218 report.c:267 topsites.c:237 topuser.c:284
+ #. 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
msgid "TIME"
-msgstr "ʱ¼ä"
+msgstr "ʱ��"
#: email.c:194 useragent.c:197
#, c-format
#: email.c:247 html.c:564 index.c:432 topuser.c:460
msgid "AVERAGE"
-msgstr "ƽ¾ùֵ"
+msgstr "ƽ��ֵ"
#. TRANSLATORS: The string is formatted using strftime. You can use
- #. * any string formatting marker allowed by strftime.
+ #. any string formatting marker allowed by strftime.
#: email.c:278
#, fuzzy, c-format
msgid "SARG report, %c"
#: email.c:281
#, fuzzy, c-format
msgid "Sending mail with command: %s\n"
-msgstr "ÃüÁî: %s\n"
+msgstr "����: %s\n"
- #: email.c:284 index.c:582 log.c:1672
+ #: email.c:284 index.c:582 log.c:1663
#, c-format
msgid "command return status %d\n"
-msgstr "ÃüÁî·µ»Ø״̬ %d\n"
+msgstr "�����״̬ %d\n"
- #: email.c:285 index.c:583 log.c:1673
+ #: email.c:285 index.c:583 log.c:1664
#, c-format
msgid "command: %s\n"
-msgstr "ÃüÁî: %s\n"
+msgstr "����: %s\n"
#: exclude.c:82 exclude.c:110
#, c-format
#: exclude.c:322
#, 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:1747 usertab.c:73 util.c:1417
+ #: exclude.c:327 log.c:1739 usertab.c:73 util.c:1414
#, c-format
msgid "Cannot get the size of file %s\n"
-msgstr "²»Äܵõ½ÎļþµÄ´óС %s\n"
+msgstr "���ܵõ��ļ��Ĵ�С %s\n"
#: exclude.c:332
#, c-format
#: exclude.c:337
#, c-format
msgid "malloc error (%ld bytes required)\n"
-msgstr "ÄÚ´æÒ²´íÎó (%ld bytes required)\n"
+msgstr "�ڴ�Ҳ���� (%ld bytes required)\n"
- #: getconf.c:209
+ #: getconf.c:210
#, c-format
msgid "The string value of parameter \"%s\" is too long\n"
-msgstr "²ÎÊýµÄ×Ö·û´®Öµ\"%s\" Ì«³¤\n"
+msgstr "�������ַ���ֵ\"%s\" ̫��\n"
- #: getconf.c:229
+ #: getconf.c:230
#, c-format
msgid "Missing double quote after parameter \"%s\"\n"
-msgstr "ÔÚ²ÎÊýÖ®ºóȱÉÙË«ÒýºÅ\"%s\"\n"
+msgstr "�ڲ���֮��ȱ��˫����\"%s\"\n"
- #: getconf.c:241
+ #: getconf.c:242
#, 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:262
+ #: getconf.c:263
#, 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:266
+ #: getconf.c:267
#, c-format
msgid "Missing second word for parameter \"%s\"\n"
-msgstr "²ÎÊýȱÉÙµÚ¶þ¸ö´Ê \"%s\"\n"
+msgstr "����ȱ�ٵڶ����� \"%s\"\n"
- #: getconf.c:276
+ #: getconf.c:277
#, 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:299
+ #: getconf.c:300
#, c-format
msgid "The integer value of parameter \"%s\" is invalid\n"
-msgstr "ÕûÊýÊýÖµ²ÎÊý \"%s\" ²»´æÔÚ\n"
+msgstr "������ֵ���� \"%s\" ������\n"
- #: getconf.c:351
+ #: getconf.c:352
#, c-format
msgid "Unknown value \"%s\" for parameter \"%s\"\n"
-msgstr "²»´æÔÚµÄÊýÖµ \"%s\" ²ÎÊý \"%s\"\n"
+msgstr "�����ڵ���ֵ \"%s\" ���� \"%s\"\n"
- #: getconf.c:355
+ #: getconf.c:356
#, c-format
msgid ""
"Value \"%s\" conflicts with other selected values for parameter \"%s\"\n"
-msgstr "ÊýÖµ \"%s\" ³åÍ»ÓëÆäËü±»Ñ¡¶¨µÄ²ÎÊýÊýֵ \"%s\"\n"
+msgstr "��ֵ \"%s\" ��ͻ��������ѡ���IJ�����ֵ \"%s\"\n"
- #: getconf.c:386
+ #: getconf.c:387
#, fuzzy, c-format
msgid "Unknown sort criterion \"%s\" for parameter \"%s\"\n"
-msgstr "²»´æÔÚµÄÊýÖµ \"%s\" ²ÎÊý \"%s\"\n"
+msgstr "�����ڵ���ֵ \"%s\" ���� \"%s\"\n"
- #: getconf.c:401
+ #: getconf.c:402
#, fuzzy, c-format
msgid "Unknown sort order \"%s\" for parameter \"%s\"\n"
-msgstr "²»´æÔÚµÄÊýÖµ \"%s\" ²ÎÊý \"%s\"\n"
+msgstr "�����ڵ���ֵ \"%s\" ���� \"%s\"\n"
- #: getconf.c:421
+ #: getconf.c:422
#, c-format
msgid "SARG: TAG: %s\n"
msgstr "SARG: TAG: %s\n"
#, 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:480
+ #: getconf.c:481
#, c-format
msgid "Error: Invalid syntax in hours tag!\n"
-msgstr "´íÎó: ²»´æÔڵľ䷨ÔÚСʱ±êÇ©ÖÐ!\n"
+msgstr "����: �����ڵľ䷨��Сʱ��ǩ��!\n"
- #: getconf.c:488
+ #: getconf.c:489
#, c-format
msgid "Error: Invalid syntax in weekdays tag!\n"
-msgstr "´íÎó: ²»´æÔڵľ䷨ÔÚÔÚʱ¼ä±êÇ©ÖÐ!\n"
+msgstr "����: �����ڵľ䷨����ʱ����ǩ��!\n"
- #: getconf.c:501
+ #: getconf.c:502
#, c-format
msgid "Too many log files in configuration file\n"
-msgstr "ÔÚÅäÖÃÎļþÖдæÔÚ¹ý¶àµÄÈÕÖ¾Îļþ\n"
+msgstr "�������ļ��д��ڹ�������־�ļ�\n"
- #: getconf.c:513
+ #: getconf.c:514
#, c-format
msgid "Too many redirector log files in configuration file\n"
-msgstr "ÔÚÅäÖÃÎļþÖÐÓжàÓàµÄÖض¨ÏòÈÕÖ¾Îļþ\n"
+msgstr "�������ļ����ж������ض�����־�ļ�\n"
- #: getconf.c:657 getconf.c:664
+ #: getconf.c:658 getconf.c:665
#, c-format
msgid "Template file name is too long in parameter \"AuthUserTemplateFile\"\n"
-msgstr "ÔÚ²ÎÊýÖÐÁÙʱÎļþÃû¹ý³¤\"AuthUserTemplateFile\"\n"
+msgstr "�ڲ�������ʱ�ļ�������\"AuthUserTemplateFile\"\n"
- #: getconf.c:682
+ #: getconf.c:683
#, c-format
msgid ""
"No graphs available as sarg was not compiled with libgd. Set \"graphs\" to "
"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:701
+ #: getconf.c:702
#, 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:706
+ #: getconf.c:707
#, 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:713
+ #: getconf.c:714
#, 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:760 getconf.c:765
+ #: getconf.c:763 getconf.c:768
#, c-format
msgid "The \"byte_cost\" parameter of the configuration file is invalid\n"
-msgstr "\"byte_cost\" ÅäÖÃÎļþµÄ²ÎÊý²»´æÔÚ\n"
+msgstr "\"byte_cost\" �����ļ��IJ���������\n"
- #: getconf.c:772
+ #: getconf.c:775
#, c-format
msgid "SARG: Unknown option %s\n"
-msgstr "SARG: δ֪µÄÑ¡Ïî %s\n"
+msgstr "SARG: δ֪��ѡ�� %s\n"
- #: getconf.c:781
+ #: getconf.c:784
#, c-format
msgid "Loading configuration from %s\n"
-msgstr "ÔØÈëÅäÖÃ´Ó %s\n"
+msgstr "�������ô� %s\n"
- #: getconf.c:784
+ #: getconf.c:787
#, c-format
msgid "(getconf) Cannot open file %s\n"
-msgstr "(getconf) ²»ÄÜ´ò¿ªÎļþ %s\n"
+msgstr "(getconf) ���ܴ����ļ� %s\n"
#: grepday.c:144
#, fuzzy, c-format
#: grepday.c:561
#, c-format
msgid "User: %s"
-msgstr "Óû§: %s"
+msgstr "�û�: %s"
- #: grepday.c:617 grepday.c:733
+ #: grepday.c:617 grepday.c:734
#, 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:691
+ #: grepday.c:621 grepday.c:692
#, c-format
msgid "(grepday) Cannot open log file %s\n"
-msgstr "(grepday) ²»ÄÜ´ò¿ªÈÕÖ¾Îļþ %s\n"
+msgstr "(grepday) ���ܴ�����־�ļ� %s\n"
#: grepday.c:638
#, c-format
#: grepday.c:679
#, c-format
msgid "user name too long for %s/%s.day\n"
-msgstr "Óû§Ãû¹ý³¤ %s/%s.day\n"
+msgstr "�û������� %s/%s.day\n"
- #: grepday.c:701 redirector.c:486 repday.c:81
+ #: grepday.c:702 redirector.c:487 repday.c:81
#, c-format
msgid "Invalid date in file %s\n"
-msgstr "ÔÚÎļþÖдæÔÚÎÞЧµÄÈÕÆÚ %s\n"
+msgstr "���ļ��д�����Ч������ %s\n"
- #: grepday.c:707
+ #: grepday.c:708
#, c-format
msgid "Invalid entry in file %s\n"
-msgstr "ÔÚÎļþÖдæÔÚÎÞЧÊäÈë %s\n"
+msgstr "���ļ��д�����Ч���� %s\n"
- #: grepday.c:713 repday.c:106
+ #: grepday.c:714 repday.c:106
#, c-format
msgid "Invalid number of bytes in file %s\n"
-msgstr "ÔÚÎļþÖдæÔÚÎÞЧµÄÊý×Ö×Ö½Ú %s\n"
+msgstr "���ļ��д�����Ч�������ֽ� %s\n"
- #: grepday.c:720 repday.c:113
+ #: grepday.c:721 repday.c:113
#, c-format
msgid "Invalid elapsed time in file %s\n"
-msgstr "ÔÚÎļþÖдæÔÚÎÞЧµÄʱ¼ä¶Î %s\n"
+msgstr "���ļ��д�����Ч��ʱ���� %s\n"
- #: grepday.c:737
+ #: grepday.c:738
#, fuzzy, c-format
msgid "(grepday) Cannot open output file %s\n"
-msgstr "(grepday) ²»ÄÜ´ò¿ªÈÕÖ¾Îļþ %s\n"
+msgstr "(grepday) ���ܴ�����־�ļ� %s\n"
- #: grepday.c:740
+ #: grepday.c:741
#, fuzzy
msgid "Graph report"
-msgstr "ÈÕ±¨"
+msgstr "�ձ�"
- #: grepday.c:747 grepday.c:760 index.c:263
+ #: grepday.c:748 grepday.c:761 index.c:263
msgid "DAYS"
-msgstr "ÈÕ"
+msgstr "��"
#: html.c:64
#, fuzzy, c-format
#: html.c:87
#, c-format
msgid "Destination directory too long: %s/%s\n"
-msgstr "Ŀ±êĿ¼¹ý³¤: %s/%s\n"
+msgstr "Ŀ��Ŀ¼����: %s/%s\n"
- #: html.c:98 index.c:543 index.c:551 util.c:332 util.c:344 util.c:934
+ #: 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"
+msgstr "�����ļ���ʱʧ�� %s - %s\n"
#: html.c:105
#, fuzzy, c-format
#: html.c:115
#, 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
+#, 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
- #: html.c:140 html.c:231 topuser.c:308
+ #: html.c:140 html.c:230 topuser.c:308
#, c-format
msgid "There is a broken number of access in file %s\n"
-msgstr "Óв»ÍêÕûµÄ·ÃÎÊÊý×ÖÔÚÎļþ %s\n"
+msgstr "�в������ķ����������ļ� %s\n"
#: html.c:145
#, c-format
msgid "There is a broken downloaded size in file %s\n"
-msgstr "Óв»ÍêÕûµÄÏÂÔØ´óСÔÚÎļþ %s\n"
+msgstr "�в����������ش�С���ļ� %s\n"
- #: html.c:154 html.c:243
+ #: html.c:154 html.c:242
#, c-format
msgid "There is a broken access code in file %s\n"
-msgstr "Óв»ÍêÕûµÄ·ÃÎÊ´úÂëÔÚÎļþ %s\n"
+msgstr "�в������ķ��ʴ������ļ� %s\n"
- #: html.c:158 html.c:247 report.c:171
+ #: html.c:158 html.c:246 report.c:171
#, c-format
msgid "There is a broken elapsed time in file %s\n"
-msgstr "Óв»ÍêÕûµÄʱ¼äÔÚÎļþ %s\n"
+msgstr "�в�������ʱ�����ļ� %s\n"
#: html.c:163
#, c-format
msgid "Sort: %s, %s"
msgstr ""
++<<<<<<< HEAD
+#: html.c:198 smartfilter.c:109 topuser.c:242
+msgid "SmartFilter"
+msgstr "���ܹ���"
+
+#: html.c:198
+msgid "Report"
+msgstr "����"
+
+#: html.c:212 topuser.c:278
++=======
+ #: html.c:192
+ #, fuzzy
+ msgid "SmartFilter report"
+ msgstr "ÖÇÄܹýÂË"
+
+ #: html.c:211 topuser.c:278
++>>>>>>> origin/v2.3
msgid "IN-CACHE-OUT"
msgstr "IN-CACHE-OUT"
- #: html.c:223
+ #: html.c:222
#, c-format
msgid "Making report: %s\n"
-msgstr "±ê¼Ç±¨¸æ: %s\n"
+msgstr "���DZ���: %s\n"
- #: html.c:235 topuser.c:304 util.c:774
+ #: html.c:234 topuser.c:304 util.c:771
#, c-format
msgid "There is a broken number of bytes in file %s\n"
-msgstr "Óв»ÍêÕûµÄ×Ö½ÚÊý×ÖÔÚÎļþ %s\n"
+msgstr "�в��������ֽ��������ļ� %s\n"
- #: html.c:251
+ #: html.c:250
#, c-format
msgid "There is a broken in cache column in file %s\n"
-msgstr "ÖжÏÔÚ»º´æÁÐÄÚÔÚÎļþ %s\n"
+msgstr "�ж��ڻ����������ļ� %s\n"
- #: html.c:255
+ #: html.c:254
#, 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:269 topuser.c:355
+ #: html.c:268 topuser.c:355
msgid "date/time report"
-msgstr "ÈÕÆÚ/ʱ¼ä ±¨¸æ"
+msgstr "����/ʱ�� ����"
- #: html.c:322
+ #: html.c:321
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
#, c-format
msgid "File name too long: %s/%s.ip\n"
-msgstr "ÎļþÃû¹ý³¤: %s/%s.ip\n"
+msgstr "�ļ�������: %s/%s.ip\n"
- #: html.c:341
+ #: html.c:340
#, c-format
msgid "(html6) Cannot open file %s\n"
-msgstr "(html6)²»ÄÜ´ò¿ªÎļþ %s\n"
+msgstr "(html6)���ܴ����ļ� %s\n"
- #: html.c:346
+ #: html.c:345
#, c-format
msgid "(html7) Cannot open file %s\n"
-msgstr "(html7) ²»ÄÜ´ò¿ªÎļþ %s\n"
+msgstr "(html7) ���ܴ����ļ� %s\n"
- #: html.c:357 html.c:413
+ #: html.c:356 html.c:417
#, 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:366 log.c:1235
+ #: html.c:365 log.c:1241
#, c-format
msgid "Maybe you have a broken day in your %s file\n"
-msgstr "¿ÉÄÜÄãÓв»ÍêÕûµÄÈÕÆÚÔÚÄãµÄ %s ÎļþÖÐ \n"
+msgstr "�������в����������������� %s �ļ��� \n"
- #: html.c:370 log.c:1194
+ #: html.c:369 log.c:1200
#, c-format
msgid "Maybe you have a broken time in your %s file\n"
-msgstr "¿ÉÄÜÄãÓв»ÍêÕûµÄʱ¼äÔÚÄãµÄ %s ÎļþÖÐ\n"
+msgstr "�������в�������ʱ�������� %s �ļ���\n"
- #: html.c:374 html.c:417
+ #: html.c:373 html.c:421
#, c-format
msgid "Maybe you have a broken size in your %s file\n"
-msgstr "¿ÉÄÜÄãÓв»ÍêÕûµÄ´óСÔÚÄãµÄ %s ÎļþÖÐ\n"
+msgstr "�������в������Ĵ�С������ %s �ļ���\n"
- #: html.c:378 html.c:421 log.c:1024 log.c:1029
+ #: html.c:377 html.c:425 log.c:1030 log.c:1035
#, c-format
msgid "Maybe you have a broken elapsed time in your %s file\n"
-msgstr "¿ÉÄÜÄãÓв»ÍêÕûµÄ¹ýȥʱ¼äÔÚÄãµÄ %s ÎļþÖÐ\n"
+msgstr "�������в������Ĺ�ȥʱ�������� %s �ļ���\n"
- #: html.c:400
+ #: html.c:399
#, c-format
msgid "(html8) Cannot open file %s\n"
-msgstr "(html8) ²»ÄÜ´ò¿ªÎļþ %s\n"
+msgstr "(html8) ���ܴ����ļ� %s\n"
#: html.c:533
#, c-format
#: index.c:432
msgid "CREATION DATE"
-msgstr "´´½¨ÈÕÆÚ"
+msgstr "��������"
- #: index.c:432 siteuser.c:100
+ #. 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
msgid "USERS"
-msgstr "Óû§"
+msgstr "�û�"
#: index.c:561 index.c:663
#, c-format
#: 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_dns.c:93
- #, c-format
+ #, 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
#: 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
#: lastlog.c:121
#, c-format
msgid "Directory name too long: %s%s\n"
-msgstr "Îļþ¼ÐÃû³Æ¹ý³¤: %s%s\n"
+msgstr "�ļ������ƹ���: %s%s\n"
+
++<<<<<<< HEAD
+#: lastlog.c:131
+#, c-format
+msgid "Failed to delete the file %s\n"
+msgstr "ɾ���ļ�ʧ�� %s\n"
+#: log.c:406
++=======
+ #: log.c:410
++>>>>>>> origin/v2.3
#, c-format
msgid "Too many log files passed on command line with option -l.\n"
-msgstr "´«ÈëÁ˹ý¶àµÄÈÕÖ¾ÎļþʹÓÃÃüÁîÐвÎÊý -l.\n"
+msgstr "�����˹�������־�ļ�ʹ�������в��� -l.\n"
- #: log.c:410
+ #: log.c:414
#, 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:419
+ #: log.c:423
#, c-format
msgid "Too many redirector logs passed on command line with option -L.\n"
-msgstr "´«ÈëÃüÁîÐвÎÊý -LµÄÖض¨ÏòÈÕÖ¾Îļþ¹ý¶à.\n"
+msgstr "���������в��� -L���ض�����־�ļ�����.\n"
- #: log.c:423
+ #: log.c:427
#, 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:457
+ #: log.c:461
#, fuzzy, c-format
msgid "Time period passed on the command line with option -t must be MM:SS\n"
-msgstr "ʱ¼äÇø¼ä´«ÈëÃüÁîÐвÎÊý -t ²»´æÔÚ\n"
+msgstr "ʱ�����䴫�������в��� -t ������\n"
- #: log.c:465
+ #: log.c:469
#, fuzzy, c-format
msgid ""
"Time range passed on the command line with option -t must be MM:SS-MM:SS\n"
-msgstr "ʱ¼äÇø¼ä´«ÈëÃüÁîÐвÎÊý -t ²»´æÔÚ\n"
+msgstr "ʱ�����䴫�������в��� -t ������\n"
- #: log.c:493
+ #: log.c:497
#, fuzzy, c-format
msgid "Option -%c requires an argument\n"
-msgstr "ѡÏî -%c ÐèÒªÒ»¸öÅжÏ\n"
+msgstr "ѡ�� -%c ��Ҫһ���ж�\n"
- #: log.c:511
+ #: log.c:515
#, fuzzy, c-format
msgid "Too many log files passed on command line.\n"
-msgstr "´«ÈëÁ˹ý¶àµÄÈÕÖ¾ÎļþʹÓÃÃüÁîÐвÎÊý -l.\n"
+msgstr "�����˹�������־�ļ�ʹ�������в��� -l.\n"
- #: log.c:515
+ #: log.c:519
#, 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:524
+ #: log.c:528
#, c-format
msgid "Init\n"
msgstr "Init\n"
- #: log.c:528
+ #: log.c:532
#, c-format
msgid "Cannot open config file: %s - %s\n"
-msgstr "²»ÄÜ´ò¿ªÅäÖÃÎļþ: %s -%s\n"
+msgstr "���ܴ��������ļ�: %s -%s\n"
- #: log.c:636
+ #: log.c:640
#, c-format
msgid ""
"The output directory \"%s\" must be outside of the temporary directory \"%s"
"\"\n"
msgstr ""
- #: log.c:649
+ #: 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:658 log.c:690
+ #: log.c:662 log.c:695
#, c-format
msgid "Parameters:\n"
-msgstr "²ÎÊý:\n"
+msgstr "����:\n"
- #: log.c:659 log.c:691
+ #: log.c:663 log.c:696
#, c-format
msgid " Hostname or IP address (-a) = %s\n"
-msgstr " Ö÷»úÃû»òÕßIPµØַ(-a) = %s\n"
+msgstr " ����������IP��ַ(-a) = %s\n"
- #: log.c:660 log.c:692
+ #: log.c:664 log.c:697
#, c-format
msgid " Useragent log (-b) = %s\n"
-msgstr " Óû§´úÀí ÈÕ־w (-b) = %s\n"
+msgstr " �û����� ��־w (-b) = %s\n"
- #: log.c:661 log.c:693
+ #: log.c:665 log.c:698
#, c-format
msgid " Exclude file (-c) = %s\n"
-msgstr " Åųý Îļþ (-c) = %s\n"
+msgstr " �ų� �ļ� (-c) = %s\n"
- #: log.c:662 log.c:694
+ #: log.c:666 log.c:699
#, c-format
msgid " Date from-until (-d) = %s\n"
-msgstr " ÈÕÆÚ ´Ó-ÖÁ (-d) = %s\n"
+msgstr " ���� ��-�� (-d) = %s\n"
- #: log.c:663 log.c:695
+ #: log.c:667 log.c:700
#, c-format
msgid " Email address to send reports (-e) = %s\n"
-msgstr " ÓʼþµØÖ·ÓÃÀ´·¢Ëͱ¨¸æ (-e) = %s\n"
+msgstr " �ʼ���ַ������ͱ��� (-e) = %s\n"
- #: log.c:664 log.c:696
+ #: log.c:668 log.c:701
#, c-format
msgid " Config file (-f) = %s\n"
-msgstr " ÅäÖÃÎļþ (-f) = %s\n"
+msgstr " �����ļ� (-f) = %s\n"
- #: log.c:666 log.c:698
+ #: log.c:670 log.c:703
#, 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:668 log.c:700
+ #: log.c:672 log.c:705
#, 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:670 log.c:702
+ #: log.c:674 log.c:707
#, c-format
msgid " Date format (-g) = Sites & Users (yyyy/ww)\n"
-msgstr " ÈÕÆÚ¸ñʽ (-g) = Õ¾µã & Óû§ (yyyy/ww)\n"
+msgstr " ���ڸ�ʽ (-g) = վ�� & �û� (yyyy/ww)\n"
- #: log.c:671 log.c:703
+ #: log.c:675 log.c:708
#, c-format
msgid " IP report (-i) = %s\n"
-msgstr " IP±¨¸æ (-i) = %s\n"
+msgstr " IP���� (-i) = %s\n"
- #: log.c:671 log.c:676 log.c:678 log.c:683 log.c:684 log.c:703 log.c:708
- #: log.c:710 log.c:715 log.c:716
+ #: 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
msgid "Yes"
-msgstr "ÊÇ"
+msgstr "��"
- #: log.c:671 log.c:676 log.c:678 log.c:683 log.c:684 log.c:703 log.c:708
- #: log.c:710 log.c:715 log.c:716
+ #: 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
msgid "No"
-msgstr "·ñ"
+msgstr "��"
- #: log.c:673 log.c:705
+ #: log.c:676 log.c:709
+ #, fuzzy, c-format
+ msgid " Keep temporary files (-k) = %s\n"
+ msgstr " ÁÙʱÎļþĿ¼ (-w) = %s\n"
+
+ #: log.c:678 log.c:711
#, c-format
msgid " Input log (-l) = %s\n"
-msgstr " ÊäÈëµÄÈÕ־ (-l) = %s\n"
+msgstr " ��������־ (-l) = %s\n"
- #: log.c:675 log.c:707
+ #: log.c:680 log.c:713
#, c-format
msgid " Redirector log (-L) = %s\n"
-msgstr " Öض¨ÏòÈÕ־ (-L) = %s\n"
+msgstr " �ض�����־ (-L) = %s\n"
- #: log.c:676 log.c:708
+ #: log.c:681 log.c:714
#, c-format
msgid " Resolve IP Address (-n) = %s\n"
-msgstr " ת»»IPµØַ (-n) = %s\n"
+msgstr " ת��IP��ַ (-n) = %s\n"
- #: log.c:677 log.c:709
+ #: log.c:682 log.c:715
#, c-format
msgid " Output dir (-o) = %s\n"
-msgstr " Êä³öĿ¼ (-o) = %s\n"
+msgstr " ����Ŀ¼ (-o) = %s\n"
- #: log.c:678 log.c:710
+ #: log.c:683 log.c:716
#, 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:679 log.c:711
+ #: log.c:684 log.c:717
#, c-format
msgid " Accessed site (-s) = %s\n"
-msgstr " ·ÃÎÊÕ¾µã (-s) = %s\n"
+msgstr " ����վ�� (-s) = %s\n"
- #: log.c:680 log.c:712
+ #: log.c:685 log.c:718
#, c-format
msgid " Time (-t) = %s\n"
-msgstr " ʱ¼ä (-t) = %s\n"
+msgstr " ʱ�� (-t) = %s\n"
- #: log.c:681 log.c:713
+ #: log.c:686 log.c:719
#, c-format
msgid " User (-u) = %s\n"
-msgstr " Óû§ (-u) = %s\n"
+msgstr " �û� (-u) = %s\n"
- #: log.c:682 log.c:714
+ #: log.c:687 log.c:720
#, c-format
msgid " Temporary dir (-w) = %s\n"
-msgstr " ÁÙʱÎļþĿ¼ (-w) = %s\n"
+msgstr " ��ʱ�ļ�Ŀ¼ (-w) = %s\n"
- #: log.c:683 log.c:715
+ #: log.c:688 log.c:721
#, c-format
msgid " Debug messages (-x) = %s\n"
-msgstr " ¾À´íÐÅϢ (-x) = %s\n"
+msgstr " �����Ϣ (-x) = %s\n"
- #: log.c:684 log.c:716
+ #: log.c:689 log.c:722
#, c-format
msgid " Process messages (-z) = %s\n"
-msgstr " ½ø³ÌÐÅϢ (-z) = %s\n"
+msgstr " ������Ϣ (-z) = %s\n"
- #: log.c:685 log.c:717
+ #: log.c:690 log.c:723
#, c-format
msgid " Previous reports to keep (--lastlog) = %d\n"
msgstr ""
- #: log.c:718 log.c:722
+ #: log.c:724 log.c:728
#, c-format
msgid "sarg version: %s\n"
-msgstr "sarg °汾: %s\n"
+msgstr "sarg �汾: %s\n"
- #: log.c:725
+ #: log.c:731
#, 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:766
+ #: log.c:772
#, c-format
msgid "Not enough memory to read a log file\n"
-msgstr "ûÓÐ×ã¹»µÄÄÚ´æÈ¥¶ÁÈ¡Ò»¸öÈÕÖ¾Îļþ\n"
+msgstr "û���㹻���ڴ�ȥ��ȡһ����־�ļ�\n"
- #: log.c:775 log.c:782
+ #: log.c:781 log.c:788
#, c-format
msgid "(log) Cannot open file: %s - %s\n"
-msgstr "(log) ²»ÄÜ´ò¿ªÈÕÖ¾Îļþ: %s - %s\n"
+msgstr "(log) ���ܴ�����־�ļ�: %s - %s\n"
- #: log.c:795
+ #: log.c:801
#, c-format
msgid "Reading access log file: from stdin\n"
-msgstr "¶ÁÈ¡·ÃÎÊÈÕÖ¾Îļþ: ´Ó stdin\n"
+msgstr "��ȡ������־�ļ�: �� stdin\n"
- #: log.c:801
+ #: log.c:807
#, 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:805
+ #: log.c:811
#, c-format
msgid "Ignoring old log file %s\n"
-msgstr "ºöÂԳ¾ɵÄÈÕÖ¾Îļþ %s\n"
+msgstr "���Գ¾ɵ���־�ļ� %s\n"
- #: log.c:812 log.c:883
+ #: log.c:818 log.c:889
#, c-format
msgid "(log) Cannot open log file: %s - %s\n"
-msgstr "(log) ²»ÄÜ´ò¿ªÈÕÖ¾Îļþ: %s - %s\n"
+msgstr "(log) ���ܴ�����־�ļ�: %s - %s\n"
- #: log.c:815
+ #: log.c:821
#, c-format
msgid "Reading access log file: %s\n"
-msgstr "¶ÁÈ¡·ÃÎÊÈÕÖ¾Îļþ: %s\n"
+msgstr "��ȡ������־�ļ�: %s\n"
- #: log.c:843
+ #: log.c:849
#, c-format
msgid "SARG: Records in file: %lu, reading: %3.2f%%"
-msgstr "SARG: ¼Í¼ÔÚÎļþ: %lu, ¶Áȡ: %3.2f%%"
+msgstr "SARG: ��¼���ļ�: %lu, ��ȡ: %3.2f%%"
- #: log.c:857
+ #: log.c:863
#, c-format
msgid "Log is from Microsoft ISA: %s\n"
-msgstr "ÈÕÖ¾À´×Ô΢ÈíISA: %s\n"
+msgstr "��־�����ISA: %s\n"
- #: log.c:865
+ #: log.c:871
#, c-format
msgid "The name of the file is invalid: %s\n"
-msgstr "ÎļþÃû²»´æÔÚ: %s\n"
+msgstr "�ļ���������: %s\n"
- #: log.c:879
+ #: log.c:885
#, fuzzy, c-format
msgid "File name too long: %s/sarg_temp.log\n"
-msgstr "ÎļþÃû¹ý³¤: %s/%s.ip\n"
+msgstr "�ļ�������: %s/%s.ip\n"
- #: log.c:892
+ #: log.c:898
#, c-format
msgid "SARG: Records in file: %lu, reading: %3.2lf%%"
-msgstr "SARG: ¼Í¼ÔÚÎļþ: %lu, ¶Áȡ: %3.2lf%%"
+msgstr "SARG: ��¼���ļ�: %lu, ��ȡ: %3.2lf%%"
- #: log.c:908
+ #: log.c:914
#, c-format
msgid "Maybe you have a broken record or garbage in your exclusion string\n"
-msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄ¼Í¼»òÕßÀ¬»øÔÚÄãµÄ½ûÖ¹×Ö·û´®\n"
+msgstr "��������һ���������ļ�¼������������Ľ�ֹ�ַ���\n"
- #: log.c:929
+ #: log.c:935
#, 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:990 log.c:994 log.c:999 log.c:1003 log.c:1007 log.c:1112 log.c:1116
- #: log.c:1120 log.c:1188 useragent.c:89
+ #: 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
#, c-format
msgid "Maybe you have a broken date in your %s file\n"
-msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄÈÕÆÚÔÚÄãµÄ %s ÎļþÖÐ\n"
+msgstr "��������һ�������������������� %s �ļ���\n"
- #: log.c:1016 log.c:1127 log.c:1244
+ #: log.c:1022 log.c:1133 log.c:1250
#, fuzzy, c-format
msgid "Invalid time found in %s\n"
-msgstr "ÎÞЧµÄʱ¼äÔÚÎļþÖÐ %s\n"
+msgstr "��Ч��ʱ�����ļ��� %s\n"
- #: log.c:1034
+ #: log.c:1040
#, 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:1038
+ #: log.c:1044
#, c-format
msgid "Maybe you have a broken result code in your %s file\n"
-msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄ½á¹û´úÂëÔÚÄãµÄ %s ÎļþÖÐ\n"
+msgstr "��������һ���������Ľ������������� %s �ļ���\n"
- #: log.c:1042
+ #: log.c:1048
#, c-format
msgid "Maybe you have a broken amount of data in your %s file\n"
-msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄÊý¾Ý×ܺÍÔÚÄãµÄ %s ÎļþÖÐ\n"
+msgstr "��������һ���������������ܺ������� %s �ļ���\n"
- #: log.c:1046
+ #: log.c:1052
#, c-format
msgid "Maybe you have a broken request method in your %s file\n"
-msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄÐèÇó·½·¨ÔÚÄãµÄ %s ÎļþÖÐ\n"
+msgstr "��������һ�������������������� %s �ļ���\n"
- #: log.c:1054 log.c:1182
+ #: log.c:1060 log.c:1188
#, 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:1063
+ #: log.c:1069
#, c-format
msgid "Cannot convert the timestamp from the squid log file\n"
-msgstr "²»ÄÜת»»Ê±¼ä´Á´ÓsquidÈÕÖ¾Îļþ\n"
+msgstr "����ת��ʱ�����squid��־�ļ�\n"
- #: log.c:1176
+ #: log.c:1182
#, c-format
msgid "Maybe you have a broken IP in your %s file\n"
-msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄIPµØÖ·ÔÚÄãµÄ %s ÎļþÖÐ\n"
+msgstr "��������һ����������IP��ַ������ %s �ļ���\n"
- #: log.c:1200
+ #: log.c:1206
#, c-format
msgid "Maybe you have a broken download duration in your %s file\n"
-msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄÏÂÔسÖÐøʱ¼äÔÚÄãµÄ %s ÎļþÖÐ\n"
+msgstr "��������һ�������������س���ʱ�������� %s �ļ���\n"
- #: log.c:1206
+ #: log.c:1212
#, c-format
msgid "Maybe you have a broken download size in your %s file\n"
-msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄÏÂÔØ´óСÔÚÄãµÄ %s ÎļþÖÐ\n"
+msgstr "��������һ�������������ش�С������ %s �ļ���\n"
- #: log.c:1214
+ #: log.c:1220
#, c-format
msgid "Maybe you have a broken access code in your %s file\n"
-msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄ·ÃÎÊ´úÂëÔÚÄãµÄ %s ÎļþÖÐ\n"
+msgstr "��������һ���������ķ��ʴ��������� %s �ļ���\n"
- #: log.c:1227
+ #: log.c:1233
#, c-format
msgid "Maybe you have a broken year in your %s file\n"
-msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄÄê·ÝÔÚÄãµÄ %s ÎļþÖÐ\n"
+msgstr "��������һ�������������������� %s �ļ���\n"
- #: log.c:1231
+ #: log.c:1237
#, c-format
msgid "Maybe you have a broken month in your %s file\n"
-msgstr "¿ÉÄÜÄãÓÐÒ»¸ö²»ÍêÕûµÄÔ·ÝÔÚÄãµÄ %s ÎļþÖÐ\n"
+msgstr "��������һ�����������·������� %s �ļ���\n"
- #: log.c:1251
+ #: log.c:1257
#, c-format
msgid "Unknown input log file format\n"
-msgstr "δ֪µÄÊäÈëÈÕÖ¾Îļþ¸ñʽ\n"
+msgstr "δ֪��������־�ļ���ʽ\n"
- #: log.c:1276
+ #: log.c:1282
#, c-format
msgid "User ID too long: %s\n"
-msgstr "Óû§ID¹ý³¤: %s\n"
+msgstr "�û�ID����: %s\n"
- #: log.c:1289
+ #: log.c:1295
#, c-format
msgid "Excluded code: %s\n"
-msgstr "ÒÑÅųý´úÂë: %s\n"
+msgstr "���ų�����: %s\n"
- #: log.c:1349
+ #: log.c:1355
#, c-format
msgid "Excluded site: %s\n"
-msgstr "ÒÑÅųýÕ¾µã: %s\n"
+msgstr "���ų�վ��: %s\n"
- #: log.c:1405
+ #: log.c:1407
#, c-format
msgid "Excluded user: %s\n"
-msgstr "ÒÑÅųýÓû§: %s\n"
+msgstr "���ų��û�: %s\n"
- #: log.c:1439
+ #: log.c:1441
#, c-format
msgid "Not enough memory to store the user %s\n"
-msgstr "ûÓÐ×ã¹»µÄÄÚ´æÀ´´æ´¢Óû§ %s\n"
+msgstr "û���㹻���ڴ���洢�û� %s\n"
- #: log.c:1467
+ #: log.c:1469
#, c-format
msgid "Failed to close the log file of user %s - %s\n"
-msgstr "¹Ø±ÕÓû§ÈÕÖ¾Îļþʧ°Ü %s - %s\n"
+msgstr "�ر��û���־�ļ�ʧ�� %s - %s\n"
- #: log.c:1477
+ #: log.c:1479
#, 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
- #: log.c:1481 log.c:1512
+ #: log.c:1483 log.c:1503
#, c-format
msgid "(log) Cannot open temporary file: %s - %s\n"
-msgstr "(log) ²»ÄÜ´ò¿ªÁÙʱÎļþ: %s - %s\n"
+msgstr "(log) ���ܴ�����ʱ�ļ�: %s - %s\n"
- #: log.c:1498
+ #: log.c:1489
#, c-format
msgid "Write error in the log file of user %s\n"
-msgstr "ÈÕÖ¾ÎļþÖеÄÓû§´æÔÚдÈë´íÎó %s\n"
+msgstr "��־�ļ��е��û�����д������ %s\n"
- #: log.c:1563
+ #: log.c:1554
#, 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:1569
+ #: log.c:1560
#, c-format
msgid " Records read: %ld, written: %ld, excluded: %ld\n"
-msgstr "¼Í¼ ¶ÁÈ¡: %ld, ÒÑдÈë: %ld, Åųý: %ld\n"
+msgstr "��¼ ��ȡ: %ld, ��д��: %ld, �ų�: %ld\n"
- #: log.c:1591
+ #: log.c:1582
#, 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:1594
+ #: log.c:1585
#, c-format
msgid "Common log format\n"
-msgstr "ÆÕͨÈÕÖ¾¸ñʽ\n"
+msgstr "��ͨ��־��ʽ\n"
- #: log.c:1597
+ #: log.c:1588
#, c-format
msgid "Squid log format\n"
-msgstr "SquidÈÕÖ¾¸ñʽ\n"
+msgstr "Squid��־��ʽ\n"
- #: log.c:1600
+ #: log.c:1591
#, c-format
msgid "Sarg log format\n"
-msgstr "SargÈÕÖ¾¸ñʽ\n"
+msgstr "Sarg��־��ʽ\n"
- #: log.c:1603
+ #: log.c:1594
#, c-format
msgid "Log with invalid format\n"
-msgstr "²»´æÔÚµÄÈÕÖ¾¸ñʽ\n"
+msgstr "�����ڵ���־��ʽ\n"
- #: log.c:1607
+ #: log.c:1598
#, c-format
msgid "No records found\n"
-msgstr "ûÓÐÕÒµ½¼Í¼\n"
+msgstr "û���ҵ���¼\n"
- #: log.c:1608 log.c:1720
+ #: log.c:1599 log.c:1712
#, c-format
msgid "End\n"
-msgstr "½áÊø\n"
+msgstr "����\n"
- #: log.c:1622
+ #: log.c:1613
#, c-format
msgid "Period covered by log files: %s-%s\n"
-msgstr "Æڼ䱻ÈÕÖ¾Îļþ¸²¸Ç: %s - %s\n"
+msgstr "�ڼ䱻��־�ļ�����: %s - %s\n"
- #: log.c:1626
+ #: log.c:1617
#, c-format
msgid "Failed to build the string representation of the date range\n"
-msgstr "½¨Á¢ÒÔ×Ö·û´®±íʾÈÕÆڵķ¶Î§Ê±Ê§°Ü\n"
+msgstr "������ַ�����ʾ���ڵķ�Χʱʧ��\n"
- #: log.c:1631
+ #: log.c:1622
#, c-format
msgid "date=%s\n"
msgstr ""
- #: log.c:1632
+ #: log.c:1623
#, fuzzy, c-format
msgid "period=%s\n"
-msgstr "ÆÚ¼ä: %s\n"
+msgstr "�ڼ�: %s\n"
- #: log.c:1636
+ #: log.c:1627
#, c-format
msgid "Period: %s\n"
-msgstr "ÆÚ¼ä: %s\n"
+msgstr "�ڼ�: %s\n"
- #: log.c:1653
+ #: 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/%s%s\n"
- #: log.c:1657
+ #: log.c:1648
#, c-format
msgid "failed to rename %s to %s - %s\n"
-msgstr "ÖØÃüÃûʧ°Ü %s ÖÁ %s - %s\n"
+msgstr "������ʧ�� %s �� %s - %s\n"
- #: log.c:1667
+ #: log.c:1658
#, fuzzy, c-format
msgid "Command too long: %s \"%s\"\n"
-msgstr "·¾¶¹ý³¤ %s/%s.ip\n"
+msgstr "·������ %s/%s.ip\n"
- #: log.c:1679
+ #: log.c:1670
#, c-format
msgid "Sarg parsed log saved as %s\n"
-msgstr "Sarg½âÎöÈÕÖ¾Áí´æΪ %s\n"
+msgstr "Sarg������־����Ϊ %s\n"
- #: log.c:1734
+ #: log.c:1726
#, c-format
msgid "Loading password file from %s\n"
-msgstr "¼ÓÔØÃÜÂë´ÓÎļþ %s\n"
+msgstr "�����������ļ� %s\n"
- #: log.c:1737
+ #: log.c:1729
#, c-format
msgid "(getusers) Cannot open file %s - %s\n"
-msgstr "(getusers) ²»ÄÜ´ò¿ªÎļþ %s - %s\n"
+msgstr "(getusers) ���ܴ����ļ� %s - %s\n"
- #: log.c:1742
+ #: log.c:1734
#, 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:1752
+ #: log.c:1744
#, c-format
msgid "Failed to rewind the users file %s: %s\n"
-msgstr "ת´æÓû§Îļþʱʧ°Ü %s: %s\n"
+msgstr "ת���û��ļ�ʱʧ�� %s: %s\n"
- #: log.c:1757 util.c:1427
+ #: log.c:1749 util.c:1424
#, c-format
msgid "malloc error (%ld)\n"
-msgstr "ÄÚ´æ·ÖÒ³´íÎó (%ld)\n"
+msgstr "�ڴ���ҳ���� (%ld)\n"
- #: log.c:1767
+ #: log.c:1759
#, c-format
msgid "You have an invalid user in your %s file\n"
-msgstr "ÓÐÒ»¸ö²»´æÔÚµÄÓû§ÔÚÄãµÄ %s Îļþ\n"
+msgstr "��һ����ڵ��û������� %s �ļ�\n"
- #: longline.c:113 longline.c:126
+ #: longline.c:136
#, 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
#: realtime.c:56 realtime.c:63
#, fuzzy, c-format
#: realtime.c:232
#, fuzzy, c-format
msgid "Invalid time column in file %s\n"
-msgstr "ÎÞЧµÄʱ¼äÔÚÎļþÖÐ %s\n"
+msgstr "��Ч��ʱ�����ļ��� %s\n"
- #: realtime.c:236 redirector.c:494
+ #: realtime.c:236 redirector.c:495
#, fuzzy, c-format
msgid "Invalid IP address in file %s\n"
-msgstr "ÔÚÎļþÖдæÔÚÎÞЧµÄÈÕÆÚ %s\n"
+msgstr "���ļ��д�����Ч������ %s\n"
#: realtime.c:240
#, fuzzy, c-format
msgid "Invalid user name in file %s\n"
-msgstr "ÔÚÎļþÖдæÔÚÎÞЧÊäÈë %s\n"
+msgstr "���ļ��д�����Ч���� %s\n"
- #: realtime.c:245 redirector.c:161 redirector.c:498
+ #: realtime.c:245 redirector.c:161 redirector.c:499
#, fuzzy, c-format
msgid "Invalid URL in file %s\n"
-msgstr "ÔÚÎļþÖдæÔÚÎÞЧµÄÈÕÆÚ %s\n"
+msgstr "���ļ��д�����Ч������ %s\n"
#: realtime.c:249
#, fuzzy, c-format
#: redirector.c:166
#, fuzzy, c-format
msgid "Invalid source IP in file %s\n"
-msgstr "ÔÚÎļþÖдæÔÚÎÞЧµÄÈÕÆÚ %s\n"
+msgstr "���ļ��д�����Ч������ %s\n"
- #: redirector.c:171 redirector.c:482
+ #: redirector.c:171 redirector.c:483
#, fuzzy, c-format
msgid "Invalid user in file %s\n"
-msgstr "ÔÚÎļþÖдæÔÚÎÞЧÊäÈë %s\n"
+msgstr "���ļ��д�����Ч���� %s\n"
#: redirector.c:228
#, c-format
msgid ""
"Not enough memory to store the name of the new redirector log to be read - "
"%s\n"
-msgstr "¶ÁȡеÄÖض¨ÏòÈÕÖ¾ÎļþÃûʱûÓеÄ×ã¹»µÄÄÚ´æ - %s\n"
+msgstr "��ȡ�µ��ض�����־�ļ���ʱû�е��㹻���ڴ� - %s\n"
- #: redirector.c:265 redirector.c:309 redirector.c:326 redirector.c:455
- #: redirector.c:460
+ #: 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"
+msgstr "(squidguard) ���ܴ�����־�ļ� %s\n"
#: redirector.c:270
#, fuzzy, c-format
msgid "Redirector report not generated because it is empty\n"
msgstr ""
- #: redirector.c:465
+ #: redirector.c:466
#, fuzzy, c-format
msgid "Not enough memory to read the processed redirector log\n"
-msgstr "ûÓÐ×ã¹»µÄÄÚ´æÀ´¶ÁÈ¡ÈÕÖ¾Îļþ\n"
+msgstr "û���㹻���ڴ����ȡ��־�ļ�\n"
- #: redirector.c:469 redirector.c:473
+ #: redirector.c:470 redirector.c:474
msgid "Redirector report"
-msgstr "Öض¨Ïò±¨¸æ"
+msgstr "�ض���"
- #: redirector.c:477
+ #: redirector.c:478
msgid "RULE"
-msgstr "¹æÔò"
+msgstr "����"
- #: redirector.c:490 repday.c:97
+ #: redirector.c:491 repday.c:97
#, c-format
msgid "Invalid time in file %s\n"
-msgstr "ÎÞЧµÄʱ¼äÔÚÎļþÖÐ %s\n"
+msgstr "��Ч��ʱ�����ļ��� %s\n"
- #: redirector.c:502
+ #: redirector.c:503
#, fuzzy, c-format
msgid "Invalid rule in file %s\n"
-msgstr "ÔÚÎļþÖдæÔÚÎÞЧµÄÈÕÆÚ %s\n"
+msgstr "���ļ��д�����Ч������ %s\n"
- #: redirector.c:568
+ #: redirector.c:569
#, 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 ""
#: report.c:100 report.c:124 report.c:245 report.c:427 report.c:468
- #: report.c:749
+ #: report.c:752
#, c-format
msgid "(report) Cannot open file %s\n"
-msgstr "(report) ²»ÄÜ´ò¿ªÎļþ %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
#: report.c:733
#, c-format
msgid "Invalid cache miss size in %s\n"
-msgstr "²»´æÔÚ»º´æδÃüÖдóСÔÚ %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 ""
#: 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
#: smartfilter.c:84 smartfilter.c:94
#, c-format
msgid "(smartfilter) Cannot open log file %s\n"
-msgstr "(smartfilter)²»ÄÜ´ò¿ªÈÕÖ¾Îļþ %s\n"
+msgstr "(smartfilter)���ܴ�����־�ļ� %s\n"
+ #: smartfilter.c:109 topuser.c:242
+ msgid "SmartFilter"
+ msgstr "ÖÇÄܹýÂË"
+
#: smartfilter.c:116 smartfilter.c:183
msgid "SMARTFILTER"
msgstr ""
- #: smartfilter.c:140 smartfilter.c:194 smartfilter.c:204 util.c:1620
+ #: smartfilter.c:140 smartfilter.c:194 smartfilter.c:204 util.c:1617
msgid "Generated by"
-msgstr "ÓÉ Éú³É"
+msgstr "�� ����"
- #: smartfilter.c:140 smartfilter.c:194 smartfilter.c:204 util.c:1620
+ #: smartfilter.c:140 smartfilter.c:194 smartfilter.c:204 util.c:1617
msgid "on"
msgstr "on"
#: sort.c:66
#, fuzzy, c-format
++<<<<<<< HEAD
+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.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:125
#, c-format
msgid "user name too long to sort %s\n"
-msgstr "Óû§Ãû¹ý³¤ÎÞ·¨ÅÅÐò %s\n"
+msgstr "�û������������� %s\n"
#: sort.c:135
++<<<<<<< HEAD
+#, 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
#: sort.c:156 topuser.c:171
msgid "connect"
#: splitlog.c:122
#, fuzzy, c-format
msgid "(splitlog) Cannot open output log file %s - %s\n"
-msgstr "(splitlog) ÎÞ·¨´ò¿ªÈÕÖ¾Îļþ %s\n"
+msgstr "(splitlog) ��������־�ļ� %s\n"
- #: topsites.c:70
+ #: topsites.c:72
msgid "Top sites report not produced because privacy option is on\n"
msgstr ""
- #: topsites.c:93 topsites.c:99 topsites.c:208 topsites.c:219
+ #: topsites.c:95 topsites.c:101 topsites.c:217 topsites.c:228
#, c-format
msgid "(topsites) Cannot open log file %s\n"
-msgstr "(topsites) ²»ÄÜ´ò¿ªÈÕÖ¾Îļþ %s\n"
+msgstr "(topsites) ���ܴ�����־�ļ� %s\n"
- #: topsites.c:172
+ #: topsites.c:179
#, c-format
msgid "Total statistics mismatch when reading %s to produce the top sites\n"
msgstr ""
- #: topsites.c:223 topuser.c:235
+ #: topsites.c:232 topuser.c:235
msgid "Top sites"
-msgstr "ÈÈÃÅÕ¾µã"
+msgstr "����վ��"
- #: topsites.c:228
+ #: topsites.c:237
#, c-format
msgid "Top %d sites"
-msgstr "ÈÈÃÅ %d Õ¾µã"
+msgstr "���� %d վ��"
- #: topsites.c:259
+ #: topsites.c:280
+ #, fuzzy, c-format
+ msgid "The number of users is invalid in file %s\n"
+ msgstr "Õâ¸öÁ¬½Ó²»´æÔÚÔÚÎļþ %s\n"
+
+ #: topsites.c:284
#, 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
#, c-format
msgid "(topuser) Cannot open file %s\n"
-msgstr "(topuser) ²»ÄÜ´ò¿ªÎļþ %s\n"
+msgstr "(topuser) ���ܴ����ļ� %s\n"
- #: topuser.c:101 util.c:751
+ #: topuser.c:101 util.c:748
#, c-format
msgid "Not enough memory to read the file %s\n"
-msgstr "ûÓÐ×ã¹»µÄÄÚ´æÈ¥¶ÁÈ¡Îļþ %s\n"
+msgstr "û���㹻���ڴ�ȥ��ȡ�ļ� %s\n"
#: topuser.c:159
#, c-format
#: 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
#: usage.c:35
- msgid " -c FILE Exclude connected hosts from the report"
+ msgid " -c FILE Exclude connected hosts from the report"
msgstr ""
#: 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
#: usage.c:37
- msgid " --css Output the internal CSS"
+ msgid " --css Output the internal CSS"
msgstr ""
#: 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"
+
+#: 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"
++=======
+ " -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
#: 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]"
+
+ #: 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µØÖ·"
++>>>>>>> origin/v2.3
#: usage.c:45
- msgid " --keeplogs Keep every previously generated report"
+ msgid " --keeplogs Keep every previously generated report"
msgstr ""
#: usage.c:46
#, fuzzy
++<<<<<<< HEAD
+msgid " -l FILE Input log"
+msgstr " -l ������־"
++=======
+ msgid " -l FILE Input log"
+ msgstr " -l ÊäÈëÈÕÖ¾"
++>>>>>>> origin/v2.3
#: usage.c:47
- msgid " --lastlog Set the number of previous reports to keep"
+ msgid " --lastlog Set the number of previous reports to keep"
msgstr ""
#: usage.c:48
#, fuzzy
++<<<<<<< HEAD
+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"
++=======
+ 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
#: usage.c:50
- msgid " -o DIR Report output directory"
- msgstr ""
+ #, fuzzy
+ msgid " -o DIR Report output directory"
+ msgstr " -w ÁÙʱĿ¼"
#: 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
#: usage.c:52
- msgid " -P PREFIX Prepend a prefix to the splitted file names"
+ msgid " -P PREFIX Prepend a prefix to the splitted file names"
msgstr ""
#: 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:55
- msgid " --splitprefix PREFIX Prepend a prefix to the splitted file names"
- msgstr ""
+ #: usage.c:54
+ #, fuzzy
+ msgid " --split Split the log file by date in -d parameter"
+ msgstr " -split ʹÓÃÈÕÆÚ·ÖÀëÈÕÖ¾Îļþ -d ²ÎÊý"
++>>>>>>> origin/v2.3
- #: usage.c:56
- msgid " -t TIME Limit report to time range [HH:MM or HH:MM-HH:MM]"
+ #: usage.c:55
+ msgid ""
+ " --splitprefix PREFIX\n"
+ " Prepend a prefix to the splitted file names"
msgstr ""
#: usage.c:57
#: 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
+msgid ""
+"\n"
+"\tPlease donate to the sarg project:"
+msgstr ""
+"\n"
+"\t������Sarg��Ŀ:"
++=======
+ msgid " -u USER Report only that user's activity"
+ msgstr " -i Óû§±¨¸æºÍIPµØÖ·"
+
+ #: 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
#: util.c:74
#, 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"
#, 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
+#, c-format
+msgid "process aborted.\n"
+msgstr "������ֹ.\n"
+#: util.c:325
++=======
+ #: util.c:324
++>>>>>>> origin/v2.3
#, c-format
msgid "directory name too long: %s\n"
-msgstr "Îļþ¼ÐÃû¹ý³¤: %s\n"
+msgstr "�ļ���������: %s\n"
- #: util.c:361
+ #: util.c:358
#, 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:436
+ #: util.c:433
msgid ""
"January,February,March,April,May,June,July,August,September,October,November,"
"December"
-msgstr "һÔÂ,¶þÔÂ,ÈýÔÂ,ËÄÔÂ,ÎåÔÂ,ÁùÔÂ,ÆßÔÂ,°ËÔÂ,¾ÅÔÂ,Ê®ÔÂ,ʮһÔÂ,Ê®¶þÔÂ"
+msgstr "һ��,����,����,����,����,����,����,����,����,ʮ��,ʮһ��,ʮ����"
- #: util.c:461
+ #: 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 ""
+
+ #: util.c:458
msgid "SARG: "
msgstr "SARG: "
msgid "SARG: (info) "
msgstr "SARG: "
- #: util.c:663
+ #: util.c:660
#, c-format
msgid "Failed to read the date in %s\n"
-msgstr "¶ÁÈ¡ÈÕÆÚʧ°Ü %s\n"
+msgstr "��ȡ����ʧ�� %s\n"
- #: util.c:719
+ #: util.c:716
#, c-format
msgid "Failed to read the number of users in %s\n"
-msgstr "¶ÁÈ¡Óû§Êýʧ°Ü %s\n"
+msgstr "��ȡ�û���ʧ�� %s\n"
- #: util.c:764
+ #: util.c:761
#, c-format
msgid "There is a invalid user in file %s\n"
-msgstr "Óв»´æÔÚµÄÓû§ÔÚÎļþ %s\n"
+msgstr "�в����ڵ��û����ļ� %s\n"
- #: util.c:770
+ #: util.c:767
#, c-format
msgid "There a broken total number of access in file %s\n"
-msgstr "Óв»ÍêÕûµÄ·ÃÎÊ×ÜÊýÔÚÎļþ %s\n"
+msgstr "�в������ķ����������ļ� %s\n"
- #: util.c:929
+ #: util.c:926
#, c-format
msgid "Cannot copy images to target directory %simages\n"
-msgstr "²»ÄÜ¿½±´¾µÏñµ½Ä¿±êÎļþ¼Ð %simages\n"
+msgstr "���ܿ���������Ŀ���ļ��� %simages\n"
- #: util.c:942
+ #: util.c:939
#, c-format
msgid "(util) Can't open directory %s: %s\n"
-msgstr "(util) ²»ÄÜ´ò¿ªÎļþ¼Ð %s: %s\n"
+msgstr "(util) ���ܴ����ļ��� %s: %s\n"
- #: util.c:950
+ #: util.c:947
#, c-format
msgid "Cannot stat \"%s\" - %s\n"
-msgstr "²»ÄÜ¿ªʼ \"%s\" - %s\n"
+msgstr "���ܿ�ʼ \"%s\" - %s\n"
- #: util.c:961
+ #: util.c:958
#, c-format
msgid "Failed to copy image %s to %s\n"
-msgstr "¿½±´¾µÏñʧ°Ü %s µ½ %s\n"
+msgstr "��������ʧ�� %s �� %s\n"
- #: util.c:967 util.c:970
+ #: util.c:964 util.c:967
msgid "Cannot open file"
-msgstr "²»ÄÜ´ò¿ªÎļþ"
+msgstr "���ܴ����ļ�"
- #: util.c:1057 util.c:1080
+ #: util.c:1054 util.c:1077
#, c-format
msgid "File %s already exists, moved to %s\n"
-msgstr "Îļþ %s ÒѾ´æÔÚ, Òƶ¯ÖÁ %s\n"
+msgstr "�ļ� %s �Ѿ�����, �ƶ��� %s\n"
- #: util.c:1098
+ #: util.c:1095
#, c-format
msgid "cannot open %s for writing\n"
-msgstr "²»ÄÜ´ò¿ªÎļþ %s À´Ð´Èë\n"
+msgstr "���ܴ����ļ� %s �д��\n"
- #: util.c:1107 util.c:1112
+ #: util.c:1104 util.c:1109
#, c-format
msgid "Failed to write the date in %s\n"
-msgstr "дÈëʱ¼äʱʧ°ÜÔÚw %s\n"
+msgstr "д��ʱ��ʱʧ����w %s\n"
- #: util.c:1133
+ #: util.c:1130
#, fuzzy, c-format
msgid "Invalid buffer length passed to the function to safely copy a string\n"
-msgstr "²»´æÔڵĻº³åÇø´«µÝ¸ø getword_ptr\n"
+msgstr "�����ڵĻ��������ݸ� getword_ptr\n"
- #: util.c:1212
+ #: util.c:1209
#, 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:1217 util.c:1221
+ #: util.c:1214 util.c:1218
#, 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:1234
+ #: util.c:1231
#, c-format
msgid "Failed to get the current time\n"
-msgstr "µÃµ½×¼È·Ê±¼äʱʧ°Ü\n"
+msgstr "�õ�ȷʱ��ʱʧ��\n"
- #: util.c:1239
+ #: util.c:1236
#, c-format
msgid "Invalid number of days in -d parameter\n"
-msgstr "ÎÞЧµÄÈÕÆÚÊý×ÖÔÚʹÓà -d ²ÎÊýʱ\n"
+msgstr "��Ч������������ʹ�� -d ����ʱ\n"
- #: util.c:1245 util.c:1269 util.c:1276 util.c:1285 util.c:1298
+ #: util.c:1242 util.c:1266 util.c:1273 util.c:1282 util.c:1295
#, c-format
msgid "Cannot convert local time: %s\n"
-msgstr "²»ÄÜת»»±¾µØʱ¼ä: %s\n"
+msgstr "����ת������ʱ��: %s\n"
- #: util.c:1264
+ #: util.c:1261
#, c-format
msgid "Invalid number of weeks in -d parameter\n"
-msgstr "ÎÞЧµÄÖÜÊý×ÖÔÚʹÓà -d ²ÎÊýʱ\n"
+msgstr "��Ч����������ʹ�� -d ����ʱ\n"
- #: util.c:1293
+ #: util.c:1290
#, c-format
msgid "Invalid number of months in -d parameter\n"
-msgstr "ÎÞЧµÄÔ·ÝÊý×ÖÔÚʹÓà -d ²ÎÊýʱ\n"
+msgstr "��Ч���·�������ʹ�� -d ����ʱ\n"
- #: util.c:1327
+ #: util.c:1324
#, fuzzy, c-format
msgid "Invalid date range passed on command line\n"
msgstr "±äÁ¿´«µÝµÄÈÕÆÚ·¶Î§ÎÞЧ\n"
- #: util.c:1378
+ #: util.c:1375
#, c-format
msgid "Purging temporary file sarg-general\n"
-msgstr "Çå³þÁÙʱÎļþsarg-general\n"
+msgstr "������ʱ�ļ�sarg-general\n"
- #: util.c:1381
+ #: util.c:1378
#, 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:1385
+ #: util.c:1382
#, c-format
msgid "(removetmp) Cannot open file %s\n"
-msgstr "(removetmp) ²»ÄÜ´ò¿ªÎļþ %s\n"
+msgstr "(removetmp) ���ܴ����ļ� %s\n"
- #: util.c:1390
+ #: util.c:1387
#, c-format
msgid "Failed to close %s after writing the total line - %s\n"
-msgstr "дÈëËùÓÐÐÐÖ®ºó¹Ø±Õ %s ʱʧ°Ü - %s\n"
+msgstr "д��������֮���ر� %s ʱʧ�� - %s\n"
- #: util.c:1407
+ #: util.c:1404
#, 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:1412
+ #: util.c:1409
#, 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:1421
+ #: util.c:1418
#, c-format
msgid "Failed to rewind the excluded codes file %s: %s\n"
-msgstr "תÏòÅųý´úÂëÎļþʱʧ°Ü %s: %s\n"
+msgstr "ת���ų������ļ�ʱʧ�� %s: %s\n"
- #: util.c:1438
+ #: util.c:1435
#, c-format
msgid "Too many codes to exclude in file %s\n"
-msgstr "ÔÚÎļþÖйý¶àµÄ±àÂë±»Åųý %s\n"
+msgstr "���ļ��й����ı��뱻�ų� %s\n"
- #: util.c:1592
+ #: util.c:1589
#, 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:1596
+ #: util.c:1593
#, c-format
msgid "Cannot get disk space with command %s\n"
-msgstr "²»Äܵõ½´ÅÅÌ¿Õ¼äʹÓÃÃüÁî %s\n"
+msgstr "���ܵõ����̿ռ�ʹ������ %s\n"
- #: util.c:1600
+ #: util.c:1597
#, c-format
msgid "Cannot get disk size with command %s\n"
-msgstr "²»ÄÜ»ñÈ¡´ÅÅÌ´óСʹÓÃÃüÁî %s\n"
+msgstr "���ܻ�ȡ���̴�Сʹ������ %s\n"
- #: util.c:1605
+ #: util.c:1602
#, c-format
msgid "The command %s failed\n"
-msgstr "ÃüÁî %s ʧ°Ü\n"
+msgstr "���� %s ʧ��\n"
- #: util.c:1789
+ #: util.c:1786
#, c-format
msgid "SARG Version: %s\n"
-msgstr "SARG°汾: %s\n"
+msgstr "SARG�汾: %s\n"
- #: util.c:1821
+ #: util.c:1818 util.c:1909 util.c:1951
#, c-format
msgid "directory name to delete too long: %s/%s\n"
-msgstr "Îļþ¼ÐÃû³ÆÌ«³¤²»ÄÜɾ³ý: %s/%s\n"
+msgstr "�ļ�������̫������ɾ��: %s/%s\n"
- #: util.c:1830
+ #: util.c:1827
#, c-format
msgid "cannot stat %s\n"
-msgstr "²»ÄÜ¿ªÊ¼ %s\n"
+msgstr "���ܿ�ʼ %s\n"
+
++<<<<<<< HEAD
+#: util.c:1835 util.c:1848
+#, c-format
+msgid "cannot delete %s - %s\n"
+msgstr " ����ɾ�� %s - %s\n"
+#: util.c:1841
++=======
+ #: util.c:1838 util.c:1969
++>>>>>>> origin/v2.3
#, c-format
msgid "unknown path type %s\n"
-msgstr "δ֪µÄ·¾¶ÀàÐÍ %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 ""
+
+ #, 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 Óû§´úÀíÈÕ־"
+#~ msgstr " -b �û�������־"
#~ msgid " -c Exclude file"
-#~ msgstr " -c ÅųýµÄÎļþ"
+#~ msgstr " -c �ų����ļ�"
#~ msgid " -n Resolve IP Address"
-#~ msgstr " -n ½âÎöIPµØַ"
+#~ msgstr " -n ����IP��ַ"
#~ msgid " -o Output dir"
-#~ msgstr " -o Êä³öĿ¼"
+#~ msgstr " -o ����Ŀ¼"
#~ msgid " -t Time [HH, HH:MM]"
-#~ msgstr " -t ʱ¼ä[HH,HH:MM]"
+#~ msgstr " -t ʱ��[HH,HH:MM]"
#~ msgid " -u User"
-#~ msgstr " -u Óû§"
+#~ msgstr " -u �û�"
#~ msgid "URL too long in redirector log file %s\n"
-#~ msgstr "ÔÚÖض¨ÏòÈÕÖ¾ÎļþÖÐÁ¬½Ó¹ý³¤ %s\n"
+#~ msgstr "���ض�����־�ļ�����ӹ��� %s\n"
#~ msgid "Temporary file name too long: %s/%s.htmp\n"
-#~ msgstr "ÁÙʱÎļþÃû¹ý³¤: %s/%s.htmp\n"
+#~ msgstr "��ʱ�ļ�������: %s/%s.htmp\n"
#~ msgid "(report-1) Cannot open file %s - %s\n"
-#~ msgstr "(report-1) ²»ÄÜ´ò¿ªÎļþ %s - %s\n"
+#~ msgstr "(report-1) ���ܴ����ļ� %s - %s\n"
#~ msgid "Path too long %s/%s.htmp\n"
-#~ msgstr "·¾¶¹ý³¤ %s/%s.htmp\n"
+#~ msgstr "·������ %s/%s.htmp\n"
#~ msgid "(report-2) Cannot open file %s - %s\n"
-#~ msgstr "(report-2)²»ÄÜ´ò¿ªÎļþ %s - %s\n"
+#~ msgstr "(report-2)���ܴ����ļ� %s - %s\n"
#~ msgid "pre-sorting files\n"
-#~ msgstr "ԤÅÅÐòÎļþ\n"
+#~ msgstr "Ԥ�����ļ�\n"
#~ msgid "Cannot delete temporary file %s - %s\n"
-#~ msgstr "ÎÞ·¨É¾³ýÁÙʱÎļþ %s - %s\n"
+#~ msgstr "��ɾ����ʱ�ļ� %s - %s\n"
#~ msgid "Cannot get the size of file %s"
-#~ msgstr "²»ÄÜ»ñÈ¡ÎļþµÄ´óС %s"
+#~ msgstr "���ܻ�ȡ�ļ��Ĵ�С %s"
#~ msgid "ERROR: Cannot load. Memory fault"
-#~ msgstr "´íÎó: ²»ÄܼÓÔØ,´æÄÚ´íÎó"
+#~ msgstr "����: ���ܼ���,���ڴ���"
#, fuzzy
#~ msgid "(html11) Cannot open file %s - %s\n"
projects / thirdparty / sarg.git / commitdiff
