From a244d64488eaa74f8f2a61461503d6189931ac62 Mon Sep 17 00:00:00 2001 From: Sebastien Godard Date: Thu, 8 Mar 2012 20:19:57 +0100 Subject: [PATCH] sysstat 10.0.4: Final packaging. Sync'ed with translation project. CHANGES, lsm and spec files updated. --- CHANGES | 2 +- nls/sysstat.pot | 2 +- nls/zh_CN.po | 31 +++++++++++----------- sysstat-10.0.3.lsm => sysstat-10.0.4.lsm | 12 ++++----- sysstat-10.0.3.spec => sysstat-10.0.4.spec | 2 +- 5 files changed, 24 insertions(+), 25 deletions(-) rename sysstat-10.0.3.lsm => sysstat-10.0.4.lsm (91%) rename sysstat-10.0.3.spec => sysstat-10.0.4.spec (99%) diff --git a/CHANGES b/CHANGES index cdb6d04..415aedd 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,6 @@ Changes: -xxxx/xx/xx: Version 10.0.4 - Sebastien Godard (sysstat orange.fr) +2012/03/07: Version 10.0.4 - Sebastien Godard (sysstat 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 c80c3db..4fe394b 100644 --- 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 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 \n" "Language-Team: LANGUAGE \n" diff --git a/nls/zh_CN.po b/nls/zh_CN.po index 8b10146..834ce05 100644 --- 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 , 2008, 2009, 2010, 2011. -# +# Ji ZhengYu , 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 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 \n" "Language-Team: Chinese (simplified) \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 { [,...] | 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 ] [ [ ] ] [ ]\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 { [,...] | ALL } ] [ -s [ ] ] [ -e [ ] ]\n" "[ -- ]\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 { [,...] | ALL } ] [ -s [ <时:分:秒> ] ] [ -e [ <时:分:秒> ] ]\n" "[ -- ]\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 5b294e0..63badf7 100644 --- 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 84c637d..22f0318 100644 --- 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 -- 2.40.0