sysstat 10.0.4: Final packaging.

Sync'ed with translation project. CHANGES, lsm and spec files updated.

diff --git a/CHANGES b/CHANGES
index cdb6d04cebc9b545654fc66116e9b942febeb385..415aedd0878e30d56ed6f09f26969c7e406a6d33 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,6 @@
 Changes:
 
-xxxx/xx/xx: Version 10.0.4 - Sebastien Godard (sysstat <at> orange.fr)
+2012/03/07: Version 10.0.4 - Sebastien Godard (sysstat <at> orange.fr)
        * [Andrey Borzenkov]: Don't take virtual devices into account in
          sar -b results.
        * [Peter Schiffer]: iostat didn't display target device

diff --git a/nls/sysstat.pot b/nls/sysstat.pot
index c80c3dbf50f10962072432c003d0adf09b4f3fc0..4fe394b31eba5561988d3da077e35ca1ecbcd7bc 100644 (file)
--- a/nls/sysstat.pot
+++ b/nls/sysstat.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: sysstat <at> orange.fr\n"
-"POT-Creation-Date: 2011-11-20 16:55+0100\n"
+"POT-Creation-Date: 2012-03-03 13:59+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/nls/zh_CN.po b/nls/zh_CN.po
index 8b10146453556fe6f67fc4ae2d2d86a81a06ebfc..834ce05c299eb1b907697911e00d5e029bad6afa 100644 (file)
--- a/nls/zh_CN.po
+++ b/nls/zh_CN.po
@@ -2,14 +2,13 @@
 # sysstat 软件包的简体中文翻译.
 # Copyright (C) 2010 THE sysstat'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the sysstat package.
-# Ji ZhengYu <zhengyuji@gmail.com>, 2008, 2009, 2010, 2011.
-#
+# Ji ZhengYu <zhengyuji@gmail.com>, 2008, 2009, 2010, 2011, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: sysstat 10.0.2\n"
+"Project-Id-Version: sysstat 10.0.3\n"
 "Report-Msgid-Bugs-To: sysstat <at> orange.fr\n"
-"POT-Creation-Date: 2011-08-16 14:17+0200\n"
-"PO-Revision-Date: 2011-09-24 16:03+0800\n"
+"POT-Creation-Date: 2011-11-20 16:55+0100\n"
+"PO-Revision-Date: 2012-02-14 20:28+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -46,7 +45,7 @@ msgstr ""
 msgid "sysstat version %s\n"
 msgstr "sysstat 版本 %s\n"
 
-#: ioconf.c:490 rd_stats.c:68 rd_stats.c:2120 sa_common.c:1061 sadc.c:623
+#: ioconf.c:491 rd_stats.c:68 rd_stats.c:2120 sa_common.c:1061 sadc.c:623
 #: sadc.c:632 sadc.c:692
 #, c-format
 msgid "Cannot open %s: %s\n"
@@ -90,7 +89,7 @@ msgstr ""
 "[ -A ] [ -I { SUM | CPU | SCPU | ALL } ] [ -u ]\n"
 "[ -P { <cpu> [,...] | ON | ALL } ] [ -V ]\n"
 
-#: mpstat.c:582 pidstat.c:1823 sar.c:381
+#: mpstat.c:582 pidstat.c:1822 sar.c:381
 msgid "Average:"
 msgstr "平均时间:"
 
@@ -191,45 +190,45 @@ msgstr "无法写系统运行记录文件开始部分: %s\n"
 msgid "Cannot append data to that file (%s)\n"
 msgstr "无法向文件 (%s) 中追加记录\n"
 
-#: sadf.c:88
+#: sadf.c:86
 #, c-format
 msgid "Usage: %s [ options ] [ <interval> [ <count> ] ] [ <datafile> ]\n"
 msgstr "用法: %s [ 选项 ] [ <时间间隔> [ <次数> ] ] [ <数据文件> ]\n"
 
-#: sadf.c:91
+#: sadf.c:89
 #, c-format
 msgid ""
 "Options are:\n"
-"[ -d | -p | -x ] [ -C ] [ -H ] [ -h ] [ -T ] [ -t ] [ -V ]\n"
+"[ -d | -j | -p | -x ] [ -C ] [ -H ] [ -h ] [ -T ] [ -t ] [ -V ]\n"
 "[ -P { <cpu> [,...] | ALL } ] [ -s [ <hh:mm:ss> ] ] [ -e [ <hh:mm:ss> ] ]\n"
 "[ -- <sar_options> ]\n"
 msgstr ""
 "选项:\n"
-"[ -d | -p | -x ] [ -C ] [ -H ] [ -h ] [ -T ] [ -t ] [ -V ]\n"
+"[ -d | -j | -p | -x ] [ -C ] [ -H ] [ -h ] [ -T ] [ -t ] [ -V ]\n"
 "[ -P { <cpu> [,...] | ALL } ] [ -s [ <时:分:秒> ] ] [ -e [ <时:分:秒> ] ]\n"
 "[ -- <sar 选项> ]\n"
 
-#: sadf_misc.c:379
+#: sadf_misc.c:595
 #, c-format
 msgid "System activity data file: %s (%#x)\n"
 msgstr "系统运行记录数据文件: %s (%#x)\n"
 
-#: sadf_misc.c:388
+#: sadf_misc.c:604
 #, c-format
 msgid "Host: "
 msgstr "主机:"
 
-#: sadf_misc.c:394
+#: sadf_misc.c:610
 #, c-format
 msgid "Size of a long int: %d\n"
 msgstr "长整型数的字节大小: %d\n"
 
-#: sadf_misc.c:396
+#: sadf_misc.c:612
 #, c-format
 msgid "List of activities:\n"
 msgstr "运行记录列表:\n"
 
-#: sadf_misc.c:409
+#: sadf_misc.c:625
 #, c-format
 msgid "\t[Unknown activity format]"
 msgstr "\\t[未知的记录格式]"

diff --git a/sysstat-10.0.3.lsm b/sysstat-10.0.4.lsm
similarity index 91%
rename from sysstat-10.0.3.lsm
rename to sysstat-10.0.4.lsm
index 5b294e0402f50620d07a680f2fd505e09d0cab77..63badf7a6fea5fd1eae95dae05786497355cb478 100644 (file)
--- a/sysstat-10.0.3.lsm
+++ b/sysstat-10.0.4.lsm
@@ -1,7 +1,7 @@
 Begin4
 Title:         sysstat - the sar, sadf, mpstat, iostat, nfsiostat, cifsiostat and pidstat commands for Linux
-Version:       10.0.3
-Entered-date:  2011-11-27
+Version:       10.0.4
+Entered-date:  2012-03-07
 Description:   The sysstat package contains the sar, sadf, mpstat, iostat,
                pidstat, nfsiostat, cifsiostat and sa tools for Linux.
                The sar command collects and reports system activity
@@ -28,10 +28,10 @@ Keywords:   system administration, sar, sadf, iostat, mpstat, pidstat, nfsiostat,
 Author:                sebastien.godard@orange.fr (Sebastien Godard)
 Maintained-by: sebastien.godard@orange.fr (Sebastien Godard)
 Primary-site:  http://pagesperso-orange.fr/sebastien.godard/
-               341kB sysstat-10.0.3.tar.gz
-               266kB sysstat-10.0.3.tar.bz2
-               345kB sysstat-10.0.3-1.src.rpm
-               337kB sysstat-10.0.3-1.i586.rpm
+               345kB sysstat-10.0.4.tar.gz
+               271kB sysstat-10.0.4.tar.bz2
+               349kB sysstat-10.0.4-1.src.rpm
+               342kB sysstat-10.0.4-1.i586.rpm
 Alternate-site:        ibiblio.org /pub/linux/system/status
 Copying-policy:        GPL
 End

diff --git a/sysstat-10.0.3.spec b/sysstat-10.0.4.spec
similarity index 99%
rename from sysstat-10.0.3.spec
rename to sysstat-10.0.4.spec
index 84c637da9c66cc67d682205f383cd3911af2961f..22f03184c5b85b73f194d83462a07612093770a1 100644 (file)
--- a/sysstat-10.0.3.spec
+++ b/sysstat-10.0.4.spec
@@ -1,6 +1,6 @@
 Summary:       SAR, SADF, MPSTAT, IOSTAT, NFSIOSTAT, CIFSIOSTAT and PIDSTAT for Linux
 Name:          sysstat
-Version:       10.0.3
+Version:       10.0.4
 Release:       1
 License:       GPL
 Group:                 Applications/System