Merge remote branch 'origin/v2.3'

Conflicts:
	CMakeLists.txt
	configure.in
	po/zh_CN.po

diff --cc CMakeLists.txt
index 14582fe05a03e7bf2d636b362d78285d25c176c5,7bf2da0fd89307e33f667b63443a6e871be01db8..a9ea2d94dfa6da3a86eddd0c1bb0eb36fb7e05e7
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -1,9 -1,9 +1,9 @@@
  CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
  PROJECT(sarg C)
  SET(sarg_VERSION 2)
 -SET(sarg_REVISION "3.3-pre3")
 +SET(sarg_REVISION "4-pre1")
  SET(sarg_BUILD "")
- SET(sarg_BUILDDATE "Jul-16-2012")
+ SET(sarg_BUILDDATE "Jul-19-2012")
  
  INCLUDE(AddFileDependencies)
  INCLUDE(CheckIncludeFile)

diff --cc log.c
index 87ba2ebec8749ecd2d3bd2521d8b59113ff2d909,aeead6107bd12f3ada60b3c7c18556dcc4aa103c..494532e5db897523c4597f9e7666cd6eb12dfdce
--- 1/log.c
--- 2/log.c
+++ b/log.c
@@@ -353,19 -458,19 +353,19 @@@ int main(int argc,char *argv[]
  
                                if(strstr(optarg,"-") == 0) {
                                        if(sscanf(optarg,"%d:%d",&h1,&m1)!=2) {
-                                               debuga(_("Time period passed on the command line with option -t must be MM:SS\n"));
+                                               debuga(_("Time period passed on the command line with option -t must be HH:MM\n"));
                                                exit(EXIT_FAILURE);
                                        }
 -                                      hm=h1*100+m1;
 -                                      hmf=hm;
 +                                      ReadFilter.StartTime=h1*100+m1;
 +                                      ReadFilter.EndTime=ReadFilter.StartTime;
                                        snprintf(hm_str,sizeof(hm_str),"%02d:%02d",h1,m1);
                                } else {
                                        if(sscanf(optarg,"%d:%d-%d:%d",&h1,&m1,&h2,&m2)!=4) {
-                                               debuga(_("Time range passed on the command line with option -t must be MM:SS-MM:SS\n"));
+                                               debuga(_("Time range passed on the command line with option -t must be HH:MM-HH:MM\n"));
                                                exit(EXIT_FAILURE);
                                        }
 -                                      hm=h1*100+m1;
 -                                      hmf=h2*100+m2;
 +                                      ReadFilter.StartTime=h1*100+m1;
 +                                      ReadFilter.EndTime=h2*100+m2;
                                        snprintf(hm_str,sizeof(hm_str),"%02d:%02d-%02d:%02d",h1,m1,h2,m2);
                                }
                                break;

diff --cc po/bg.po
Simple merge

diff --cc po/ca.po
Simple merge

diff --cc po/cs.po
Simple merge

diff --cc po/de.po
Simple merge

diff --cc po/el.po
Simple merge

diff --cc po/es.po
Simple merge

diff --cc po/hu.po
Simple merge

diff --cc po/id.po
Simple merge

diff --cc po/it.po
Simple merge

diff --cc po/ja.po
Simple merge

diff --cc po/lv.po
Simple merge

diff --cc po/nl.po
Simple merge

diff --cc po/pl.po
Simple merge

diff --cc po/pt.po
Simple merge

diff --cc po/ro.po
Simple merge

diff --cc po/ru.po
Simple merge

diff --cc po/sk.po
Simple merge

diff --cc po/sr.po
Simple merge

diff --cc po/tr.po
Simple merge

diff --cc po/uk.po
Simple merge

diff --cc po/zh_CN.po
index 5782b99b870ea9dedfd5aa60f1fc9bdb04bf2dc3,ffd0c62acd31ad322c6585673f10b309e2323020..4295e6e3b22f91eca7d87422299402b53e362218
--- 1/po/zh_CN.po
--- 2/po/zh_CN.po
+++ b/po/zh_CN.po
@@@ -51,7 -51,7 +51,7 @@@ msgstr[0] "
  #: util.c:1845 util.c:1965
  #, fuzzy, c-format
  msgid "Cannot delete \"%s\": %s\n"
--msgstr " ²»ÄÜɾ³ý %s - %s\n"
++msgstr " ����ɾ�� %s - %s\n"
  
  #: authfail.c:77
  msgid "Authentication failures report not produced because it is empty\n"
@@@ -165,17 -149,17 +165,17 @@@ msgstr "��������ï¿
  #: 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: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
+ #: grepday.c:773 html.c:586 redirector.c:575 repday.c:245 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: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
+ #: 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
  #, c-format
@@@ -301,13 -285,8 +301,13 @@@ msgstr "�����ļ�: %s/%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"
++msgstr "(datafile) �ļ���·��̫��: %s/%s\n"
 +>>>>>>> origin/v2.3
  
  #: datafile.c:92 datafile.c:148
  #, c-format
@@@ -516,12 -487,12 +516,12 @@@ msgstr "��һ����ڵķ��ï
  #: email.c:206
  #, 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:145 repday.c:169 repday.c:195
- #: repday.c:219 topuser.c:426 useragent.c:311
+ #: 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
  msgid "TOTAL"
 -msgstr "×Üֵ"
 +msgstr "��ֵ"
  
  #: email.c:247 html.c:564 index.c:432 topuser.c:460
  msgid "AVERAGE"
@@@ -915,18 -886,12 +915,18 @@@ msgstr "(html3) ���ܴ����
  #: 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"
++msgstr "�ļ�������: %s/%s/denied_%s.html\n"
 +>>>>>>> origin/v2.3
  
  #: html.c:140 html.c:230 topuser.c:308
  #, c-format
@@@ -990,10 -944,9 +990,10 @@@ msgstr "����
  #: html.c:192
  #, fuzzy
  msgid "SmartFilter report"
--msgstr "ÖÇÄܹýÂË"
++msgstr "���ܹ���"
  
  #: html.c:211 topuser.c:278
 +>>>>>>> origin/v2.3
  msgid "IN-CACHE-OUT"
  msgstr "IN-CACHE-OUT"
  
@@@ -1308,15 -1244,9 +1308,15 @@@ 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"
++msgstr "IP��ַ�����ֵ�ת�� (getnameinfo) ��IP��ַ %s ��������ʧ��  %d - %s\n"
 +>>>>>>> origin/v2.3
  
  #: ip2name_exec.c:61
  #, c-format
@@@ -1334,23 -1264,13 +1334,23 @@@ 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"
++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"
++msgstr "IP��ַ�����򲻴��� %s\n"
 +>>>>>>> origin/v2.3
  
  #: ip2name_exec.c:113
  #, fuzzy, c-format
@@@ -1414,14 -1325,14 +1414,14 @@@ msgstr "���������вï¿
  
  #: log.c:461
  #, fuzzy, c-format
- msgid "Time period passed on the command line with option -t must be MM:SS\n"
+ msgid "Time period passed on the command line with option -t must be HH:MM\n"
 -msgstr "ʱ¼äÇø¼ä´«ÈëÃüÁîÐвÎÊý -t ²»´æÔÚ\n"
 +msgstr "ʱ�����䴫�������в��� -t ������\n"
  
  #: log.c:469
  #, fuzzy, c-format
  msgid ""
- "Time range passed on the command line with option -t must be MM:SS-MM:SS\n"
+ "Time range passed on the command line with option -t must be HH:MM-HH:MM\n"
 -msgstr "ʱ¼äÇø¼ä´«ÈëÃüÁîÐвÎÊý -t ²»´æÔÚ\n"
 +msgstr "ʱ�����䴫�������в��� -t ������\n"
  
  #: log.c:497
  #, fuzzy, c-format
@@@ -1457,13 -1368,8 +1457,13 @@@ 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"
++msgstr "�����ļ���ʱʧ�� %s - %s\n"
 +>>>>>>> origin/v2.3
  
  #: log.c:662 log.c:695
  #, c-format
@@@ -1533,7 -1439,7 +1533,7 @@@ msgstr "��
  #: log.c:676 log.c:709
  #, fuzzy, c-format
  msgid "            Keep temporary files (-k) = %s\n"
--msgstr "                   ÁÙʱÎļþĿ¼ (-w) = %s\n"
++msgstr "                   ��ʱ�ļ�Ŀ¼ (-w) = %s\n"
  
  #: log.c:678 log.c:711
  #, c-format
@@@ -1794,13 -1696,8 +1794,13 @@@ msgstr "�ر��û���־�ļï¿
  
  #: 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"
++msgstr "��ʱ�û��ļ�������: %s/sarg/%s.unsort\n"
 +>>>>>>> origin/v2.3
  
  #: log.c:1483 log.c:1503
  #, c-format
@@@ -1944,8 -1837,7 +1944,8 @@@ 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"
++msgstr "û���㹻���ڴ��ٶ�ȡ������־�ļ�\n"
 +>>>>>>> origin/v2.3
  
  #: realtime.c:56 realtime.c:63
  #, fuzzy, c-format
@@@ -2243,13 -2135,15 +2243,15 @@@ msgstr "��ͬ�������ï¿
  
  #: repday.c:126
  msgid "Day report"
 -msgstr "ÈÕ±¨"
 +msgstr "�ձ�"
  
- #: repday.c:144 repday.c:194
- msgid "H"
- msgstr "H"
+ #. TRANSLATORS: It is an hour in the hourly report
+ #: repday.c:145 repday.c:197
+ #, c-format
+ msgid "%02dH"
+ msgstr ""
  
- #: repday.c:182
+ #: repday.c:185
  #, c-format
  msgid ""
  "Total downloaded bytes is %<PRIi64> instead of %<PRIi64> in the hourly "
@@@ -2287,13 -2181,8 +2289,13 @@@ msgstr "(report) ���ܴ���ï¿
  
  #: 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"
++msgstr "(report) �ļ��й��� %s/%s\n"
 +>>>>>>> origin/v2.3
  
  #: report.c:175
  #, c-format
@@@ -2457,7 -2346,7 +2459,7 @@@ msgstr "�����ڻ���δ�
  #: report.c:747
  #, fuzzy, c-format
  msgid "File name too long for %s/smartfilter.int_unsort\n"
--msgstr "ÎļþÃû¹ý³¤: %s/%s%s\n"
++msgstr "�ļ�������: %s/%s%s\n"
  
  #: siteuser.c:52
  msgid "Sites and users report not generated because privacy option is on\n"
@@@ -2484,13 -2373,8 +2486,13 @@@ msgstr "�ļ�������: %s/
  
  #: 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"
++msgstr "�ļ�������: %s/%s.ip\n"
 +>>>>>>> origin/v2.3
  
  #: smartfilter.c:69
  #, fuzzy, c-format
@@@ -2509,7 -2393,7 +2511,7 @@@ msgstr "(smartfilter)���ܴ��ï
  
  #: smartfilter.c:109 topuser.c:242
  msgid "SmartFilter"
--msgstr "ÖÇÄܹýÂË"
++msgstr "���ܹ���"
  
  #: smartfilter.c:116 smartfilter.c:183
  msgid "SMARTFILTER"
@@@ -2530,49 -2414,28 +2532,49 @@@ msgstr "(smartfilter) ���ܴ��
  
  #: 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"
++msgstr "�ļ�������: %s/%s.ip\n"
  
  #: sort.c:70
  #, fuzzy, c-format
  msgid "File name too long: %s/htmlrel.txt\n"
--msgstr "ÊäÈëµÄÃû³Æ¹ý³¤: %s/%s\n"
++msgstr "���������ƹ���: %s/%s\n"
  
  #: sort.c:118
  #, fuzzy, c-format
  msgid "Sorting log %s/%s.user_unsort\n"
--msgstr "Óû§Ãû¹ý³¤ %s/%s.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"
++msgstr "�û������� %s/%s.unsort\n"
 +>>>>>>> origin/v2.3
  
  #: sort.c:156 topuser.c:171
  msgid "connect"
@@@ -2641,7 -2504,7 +2643,7 @@@ msgstr "���� %d վ��
  #: topsites.c:280
  #, fuzzy, c-format
  msgid "The number of users is invalid in file %s\n"
--msgstr "Õâ¸öÁ¬½Ó²»´æÔÚÔÚÎļþ %s\n"
++msgstr "������Ӳ��������ļ� %s\n"
  
  #: topsites.c:284
  #, c-format
@@@ -2881,13 -2744,8 +2883,13 @@@ msgstr "ʹ��: %s [ѡ��...]\n
  
  #: usage.c:33
  #, fuzzy
- msgid "     -a NAME|IP    Create report for host name or IP address"
- msgstr "     -a Ö÷»úÃû»òÕßIPµØÖ·"
 +<<<<<<< HEAD
 +msgid "     -a NAME|IP  Create report for host name or IP address"
 +msgstr "     -a ����������IP��ַ"
 +=======
 -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"
@@@ -2895,13 -2753,8 +2897,13 @@@ 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 Îļþµ½Ò»¸öÒ׶®µÄÈÕÆÚ"
++msgstr "     -convert ת�� access.log �ļ���һ���׶�������"
 +>>>>>>> origin/v2.3
  
  #: usage.c:37
  msgid "     --css          Output the internal CSS"
@@@ -2910,77 -2763,41 +2912,77 @@@ 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"
++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)"
++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"
++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]"
++msgstr "     -g ���ڸ�ʽ [e=ŷ�� -> dd/mm/yyyy, u=��� ->mm/dd/yyyy]"
  
  #: usage.c:42
  #, fuzzy
  msgid "     -h             This help"
--msgstr "     -h ÕâÀïÊÇ°ïÖú"
++msgstr "     -h �����ǰ���"
  
  #: usage.c:43
  #, fuzzy
  msgid "     --help         This help"
--msgstr "     -h ÕâÀïÊÇ°ïÖú"
++msgstr "     -h �����ǰ���"
  
  #: usage.c:44
  #, fuzzy
  msgid "     -i             Reports by user and IP address"
--msgstr "     -i Óû§±¨¸æºÍIPµØÖ·"
++msgstr "     -i �û�������IP��ַ"
 +>>>>>>> origin/v2.3
  
  #: usage.c:45
  msgid "     --keeplogs     Keep every previously generated report"
@@@ -2988,13 -2805,8 +2990,13 @@@ msgstr "
  
  #: usage.c:46
  #, fuzzy
 +<<<<<<< HEAD
 +msgid "     -l FILE     Input log"
 +msgstr "     -l ������־"
 +=======
  msgid "     -l FILE        Input log"
--msgstr "     -l ÊäÈëÈÕÖ¾"
++msgstr "     -l ������־"
 +>>>>>>> origin/v2.3
  
  #: usage.c:47
  msgid "     --lastlog      Set the number of previous reports to keep"
@@@ -3002,38 -2814,23 +3004,38 @@@ 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"
++msgstr "                ������Ϣ (-z) = %s\n"
  
  #: usage.c:49
  #, fuzzy
  msgid "     -n             Resolve IP addresses using RDNS"
--msgstr "              ת»»IPµØÖ· (-n) = %s\n"
++msgstr "              ת��IP��ַ (-n) = %s\n"
 +>>>>>>> origin/v2.3
  
  #: usage.c:50
  #, fuzzy
  msgid "     -o DIR         Report output directory"
--msgstr "     -w ÁÙʱĿ¼"
++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)"
++msgstr "     -p ʹ��IP��ַ�����û�ID (reports)"
 +>>>>>>> origin/v2.3
  
  #: usage.c:52
  msgid "     -P PREFIX      Prepend a prefix to the splitted file names"
@@@ -3041,24 -2838,14 +3043,24 @@@ 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]"
++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 ²ÎÊý"
++msgstr "     -split ʹ�����ڷ�����־�ļ� -d ����"
 +>>>>>>> origin/v2.3
  
  #: usage.c:55
  msgid ""
@@@ -3072,46 -2859,23 +3074,46 @@@ 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
 +msgid ""
 +"\n"
 +"\tPlease donate to the sarg project:"
 +msgstr ""
 +"\n"
 +"\t������Sarg��Ŀ:"
 +=======
  msgid "     -u USER        Report only that user's activity"
--msgstr "     -i Óû§±¨¸æºÍIPµØַ"
++msgstr "     -i �û�������IP��ַ"
  
  #: usage.c:59
  #, fuzzy
  msgid "     -w DIR         Temporary directory"
--msgstr "     -w ÁÙʱĿ¼"
++msgstr "     -w ��ʱĿ¼"
  
  #: usage.c:60
  #, fuzzy
  msgid "     -x             Debug messages"
--msgstr "     -x ²î´íÐÅϢ"
++msgstr "     -x ������Ϣ"
  
  #: usage.c:61
  #, fuzzy
  msgid "     -z             Process messages"
--msgstr "     -z ½ø³ÌÐÅÏ¢"
++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
@@@ -3584,7 -3302,7 +3586,7 @@@ msgstr "
  #: util.c:1919 util.c:1960
  #, fuzzy, c-format
  msgid "cannot stat \"%s\"\n"
--msgstr "²»ÄÜ¿ªʼ %s\n"
++msgstr "���ܿ�ʼ %s\n"
  
  #: util.c:1925
  #, c-format
@@@ -3595,88 -3316,88 +3600,88 @@@ msgstr "
  #~ msgid ""
  #~ "SARG: Maybe you have a broken record or garbage in the names of the "
  #~ "months.\n"
--#~ msgstr "¿ÉÄÜÓв»ÍêÕûµÄ¼Í¼»òÕßÀ¬»ø´æÔÚÎļþ %s\n"
++#~ msgstr "�����в������ļ�¼������������ļ� %s\n"
  
  #, fuzzy
  #~ msgid ""
  #~ "Maybe you have a broken record or garbage in the name of the months.\n"
--#~ msgstr "¿ÉÄÜÓв»ÍêÕûµÄ¼Í¼»òÕßÀ¬»ø´æÔÚÎļþ %s\n"
++#~ msgstr "�����в������ļ�¼������������ļ� %s\n"
  
  #~ msgid ""
  #~ "\n"
  #~ "\tPlease donate to the sarg project:"
  #~ msgstr ""
  #~ "\n"
--#~ "\tÇë¾èÖúSargÏîĿ:"
++#~ "\t������Sarg��Ŀ:"
  
  #, fuzzy
  #~ msgid "Failed to delete the file \"%s\" after processing it - %s\n"
--#~ msgstr "ɾ³ýÎļþʧ°Ü %s\n"
++#~ msgstr "ɾ���ļ�ʧ�� %s\n"
  
  #~ msgid "Report"
--#~ msgstr "±¨¸æ"
++#~ msgstr "����"
  
  #, fuzzy
  #~ msgid "Cannot delete unused file \"%s\" - %s\n"
--#~ msgstr "ÎÞ·¨É¾³ýÁÙʱÎļþ %s - %s\n"
++#~ msgstr "�޷�ɾ����ʱ�ļ� %s - %s\n"
  
  #, fuzzy
  #~ msgid "Failed to remove the file %s: %s\n"
--#~ msgstr "ÒƳýÎļþʧ°Ü %s\n"
++#~ msgstr "�Ƴ��ļ�ʧ�� %s\n"
  
  #~ msgid "Failed to delete the file %s\n"
--#~ msgstr "ɾ³ýÎļþʧ°Ü %s\n"
++#~ msgstr "ɾ���ļ�ʧ�� %s\n"
  
  #~ msgid "process aborted.\n"
--#~ msgstr "½ø³ÌÖÐֹ.\n"
++#~ msgstr "������ֹ.\n"
  
  #~ msgid "cannot delete %s - %s\n"
--#~ msgstr " ²»ÄÜɾ³ý %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"