NLS updated.

Sync with Translation Project.

diff --git a/CHANGES b/CHANGES
index ea82ec8426fda93700b025ea8c202be2e90a63bb..6091d0366b319049eedef21863426e535bce3a42 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -21,6 +21,7 @@ xxxx/xx/xx: Version 9.1.6 - Sebastien Godard (sysstat <at> orange.fr)
        * [Ivana Varekova]: Added sysstat(5) manual page.
        * sar manual page updated.
        * DTD and XSD documents updated.
+       * NLS updated.
        * Split up prf_stats.c file into rndr_stats.c and xml_stats.c
        * Moved cron files in a separate cron subdirectory.
        * Made sysstat git aware.

diff --git a/nls/cs.po b/nls/cs.po
index 2fcfb49d9872f37efed0c6ae0dd6e6be5db905c1..59ce4fef8ec0384b223be37758b7f7f4860545fe 100644 (file)
--- a/nls/cs.po
+++ b/nls/cs.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: sysstat 9.1.4\n"
+"Project-Id-Version: sysstat 9.1.5\n"
 "Report-Msgid-Bugs-To: sysstat <at> orange.fr\n"
-"POT-Creation-Date: 2010-07-24 10:55+0200\n"
-"PO-Revision-Date: 2010-08-23 22:41+0200\n"
+"POT-Creation-Date: 2010-09-04 08:21+0200\n"
+"PO-Revision-Date: 2010-10-11 05:06+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -80,7 +80,7 @@ msgstr ""
 "Přepínače jsou:\n"
 "[-A] [-I {SUM|CPU|SCPU|ALL}] [-u] [-P {<procesor>[,…]|ALL}] [-V]\n"
 
-#: mpstat.c:530 pidstat.c:1806 sar.c:359
+#: mpstat.c:530 pidstat.c:1806 sar.c:360
 msgid "Average:"
 msgstr "Průměr:"
 
@@ -102,7 +102,7 @@ msgstr ""
 "[-t] [-u] [-V] [-w]\n"
 "[-p {<pid>[,…]|SELF|ALL}] [-T {TASK|CHILD|ALL}]\n"
 
-#: pidstat.c:199 sar.c:977
+#: pidstat.c:199 sar.c:978
 #, c-format
 msgid "Requested activities not available\n"
 msgstr "Požadované aktivity nejsou dostupné\n"
@@ -267,6 +267,7 @@ msgid ""
 "\t\tKeywords are:\n"
 "\t\tCPU\tCPU clock frequency\n"
 "\t\tFAN\tFans speed\n"
+"\t\tIN\tVoltage inputs\n"
 "\t\tTEMP\tDevices temperature\n"
 msgstr ""
 "\t-m {<klíčové_slovo>[,…]|ALL}\n"
@@ -274,9 +275,10 @@ msgstr ""
 "\t\tKlíčová slova jsou:\n"
 "\t\tCPU\tFrekvence procesoru\n"
 "\t\tFAN\tRychlost ventilátoru\n"
+"\t\tIN\tVstupní napětí\n"
 "\t\tTEMP\tTeplota zařízení\n"
 
-#: sar.c:138
+#: sar.c:139
 #, c-format
 msgid ""
 "\t-n { <keyword> [,...] | ALL }\n"
@@ -323,27 +325,27 @@ msgstr ""
 "\t\tEICMP6\tProvoz ICMP\t(v6) (chyby)\n"
 "\t\tUDP6\tProvoz UDP\t(v6)\n"
 
-#: sar.c:159
+#: sar.c:160
 #, c-format
 msgid "\t-q\tQueue length and load average statistics\n"
 msgstr "\t-q\tStatistiky délky fronty a průměrného vytížení\n"
 
-#: sar.c:160
+#: sar.c:161
 #, c-format
 msgid "\t-r\tMemory utilization statistics\n"
 msgstr "\t-r\tStatistiky využití paměti\n"
 
-#: sar.c:161
+#: sar.c:162
 #, c-format
 msgid "\t-R\tMemory statistics\n"
 msgstr "\t-R\tStatistiky paměti\n"
 
-#: sar.c:162
+#: sar.c:163
 #, c-format
 msgid "\t-S\tSwap space utilization statistics\n"
 msgstr "\t-S\tStatistiky využití odkládacího prostoru\n"
 
-#: sar.c:163
+#: sar.c:164
 #, c-format
 msgid ""
 "\t-u [ ALL ]\n"
@@ -352,57 +354,57 @@ msgstr ""
 "\t-u [ALL]\n"
 "\t\tStatistiky využití procesoru\n"
 
-#: sar.c:165
+#: sar.c:166
 #, c-format
 msgid "\t-v\tKernel table statistics\n"
 msgstr "\t-v\tStatistiky tabulky jádra\n"
 
-#: sar.c:166
+#: sar.c:167
 #, c-format
 msgid "\t-w\tTask creation and system switching statistics\n"
 msgstr "\t-w\tStatistiky vytváření úloh a systémového přepínání\n"
 
-#: sar.c:167
+#: sar.c:168
 #, c-format
 msgid "\t-W\tSwapping statistics\n"
 msgstr "\t-W\tStatistiky odkládání na disk\n"
 
-#: sar.c:168
+#: sar.c:169
 #, c-format
 msgid "\t-y\tTTY device statistics\n"
 msgstr "\t-y\tStatistiky zařízení TTY\n"
 
-#: sar.c:211
+#: sar.c:212
 #, c-format
 msgid "End of data collecting unexpected\n"
 msgstr "Neočekávaný konec sbírání dat\n"
 
-#: sar.c:779
+#: sar.c:780
 #, c-format
 msgid "Invalid data format\n"
 msgstr "Neplatný formát dat\n"
 
-#: sar.c:783
+#: sar.c:784
 #, c-format
 msgid "Using a wrong data collector from a different sysstat version\n"
 msgstr "Používání nesprávného sběrače dat z jiné verze sysstat\n"
 
-#: sar.c:803
+#: sar.c:804
 #, c-format
 msgid "Inconsistent input data\n"
 msgstr "Nekonzistentní vstupní data\n"
 
-#: sar.c:1224
+#: sar.c:1225
 #, c-format
 msgid "-f and -o options are mutually exclusive\n"
 msgstr "Přepínače -f a -o se navzájem vylučují\n"
 
-#: sar.c:1230
+#: sar.c:1231
 #, c-format
 msgid "Not reading from a system activity file (use -f option)\n"
 msgstr "Nečte se ze souboru se systémovými aktivitami (použijte přepínač -f)\n"
 
-#: sar.c:1331
+#: sar.c:1332
 #, c-format
 msgid "Cannot find the data collector (%s)\n"
 msgstr "Nelze najít sběrač dat (%s)\n"

diff --git a/nls/da.po b/nls/da.po
index a7a669434f73336d81bc6d300b50b61ad2f37402..5987b1507f238e338e728497a11bc1fe5f5fe0b1 100644 (file)
--- a/nls/da.po
+++ b/nls/da.po
@@ -10,10 +10,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: sysstat-9.1.4\n"
+"Project-Id-Version: sysstat-9.1.5\n"
 "Report-Msgid-Bugs-To: sysstat <at> orange.fr\n"
-"POT-Creation-Date: 2010-07-24 10:55+0200\n"
-"PO-Revision-Date: 2010-08-01 09:19+0200\n"
+"POT-Creation-Date: 2010-09-04 08:21+0200\n"
+"PO-Revision-Date: 2010-09-13 09:19+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "MIME-Version: 1.0\n"
@@ -84,7 +84,7 @@ msgstr ""
 "[ -A ] [ -I { SUM | CPU | SCPU | ALL } ] [ -u ] [ -P { <cpu> [,...] | ALL } ] [ -V ]\n"
 
 # sar.c:
-#: mpstat.c:530 pidstat.c:1806 sar.c:359
+#: mpstat.c:530 pidstat.c:1806 sar.c:360
 msgid "Average:"
 msgstr "Middel:"
 
@@ -106,7 +106,7 @@ msgstr ""
 "[ -t ] [ -u ] [ -V ] [ -w ]\n"
 "[ -p { <pid> [,...] | SELF | ALL } ] [ -T { TASK | CHILD | ALL } ]\n"
 
-#: pidstat.c:199 sar.c:977
+#: pidstat.c:199 sar.c:978
 #, c-format
 msgid "Requested activities not available\n"
 msgstr "Angivne aktiviteter er ikke tilgængelig\n"
@@ -272,16 +272,18 @@ msgid ""
 "\t\tKeywords are:\n"
 "\t\tCPU\tCPU clock frequency\n"
 "\t\tFAN\tFans speed\n"
+"\t\tIN\tVoltage inputs\n"
 "\t\tTEMP\tDevices temperature\n"
 msgstr ""
-"\t-m { <keyword> [,...] | ALL }\n"
+"\t-m { <nøgleord> [,...] | ALL }\n"
 "\t\tStatistik for strømstyring\n"
 "\t\tNøgleord er:\n"
 "\t\tCPU\tCPU-klokfrekvens\n"
 "\t\tFAN\tBlæserhastighed\n"
+"\t\tIN\tSpændingsinddata\n"
 "\t\tTEMP\tEnheders temperatur\n"
 
-#: sar.c:138
+#: sar.c:139
 #, c-format
 msgid ""
 "\t-n { <keyword> [,...] | ALL }\n"
@@ -328,27 +330,27 @@ msgstr ""
 "\t\tEICMP6\tICMP-trafik\t(v6) (fejl)\n"
 "\t\tUDP6\tUDP-trafik\t(v6)\n"
 
-#: sar.c:159
+#: sar.c:160
 #, c-format
 msgid "\t-q\tQueue length and load average statistics\n"
 msgstr "\t-q\tStatistik for kølængde og gennemsnitlig belastning\n"
 
-#: sar.c:160
+#: sar.c:161
 #, c-format
 msgid "\t-r\tMemory utilization statistics\n"
 msgstr "\t-r\tStatistik for hukommelsesforbrug\n"
 
-#: sar.c:161
+#: sar.c:162
 #, c-format
 msgid "\t-R\tMemory statistics\n"
 msgstr "\t-R\tHukommelsesstatistik\n"
 
-#: sar.c:162
+#: sar.c:163
 #, c-format
 msgid "\t-S\tSwap space utilization statistics\n"
 msgstr "\t-S\tStatistik for swappladsforbrug\n"
 
-#: sar.c:163
+#: sar.c:164
 #, c-format
 msgid ""
 "\t-u [ ALL ]\n"
@@ -357,57 +359,57 @@ msgstr ""
 "\t-u [ ALL ]\n"
 "\t\tStatistik for CPU-forbrug\n"
 
-#: sar.c:165
+#: sar.c:166
 #, c-format
 msgid "\t-v\tKernel table statistics\n"
 msgstr "\t-v\tStatistik for kernetabel\n"
 
-#: sar.c:166
+#: sar.c:167
 #, c-format
 msgid "\t-w\tTask creation and system switching statistics\n"
 msgstr "\t-w\tOpgaveoprettelse og statistik for systemskift\n"
 
-#: sar.c:167
+#: sar.c:168
 #, c-format
 msgid "\t-W\tSwapping statistics\n"
 msgstr "\t-W\tStatistik for swapping\n"
 
-#: sar.c:168
+#: sar.c:169
 #, c-format
 msgid "\t-y\tTTY device statistics\n"
 msgstr "\t-y\tTTY enhedsstatistik\n"
 
-#: sar.c:211
+#: sar.c:212
 #, c-format
 msgid "End of data collecting unexpected\n"
 msgstr "Uventet afslutning på dataindsamling\n"
 
-#: sar.c:779
+#: sar.c:780
 #, c-format
 msgid "Invalid data format\n"
 msgstr "Ugyldig dataformat\n"
 
-#: sar.c:783
+#: sar.c:784
 #, c-format
 msgid "Using a wrong data collector from a different sysstat version\n"
 msgstr "Bruger en forkert dataindsamler fra en anden sysstat version\n"
 
-#: sar.c:803
+#: sar.c:804
 #, c-format
 msgid "Inconsistent input data\n"
 msgstr "Inkonsistent inddata\n"
 
-#: sar.c:1224
+#: sar.c:1225
 #, c-format
 msgid "-f and -o options are mutually exclusive\n"
 msgstr "flagene -f og -o udelukker hinanden\n"
 
-#: sar.c:1230
+#: sar.c:1231
 #, c-format
 msgid "Not reading from a system activity file (use -f option)\n"
 msgstr "Læsning sker ikke fra en systemaktivitetsfil (brug flaget -f)\n"
 
-#: sar.c:1331
+#: sar.c:1332
 #, c-format
 msgid "Cannot find the data collector (%s)\n"
 msgstr "Kan ikke lokalisere dataindsamleren (%s)\n"

diff --git a/nls/de.po b/nls/de.po
index 8af934e3abf5e317d86afba110214b262a47f75f..8c6bcf3ce25335c1dac2b660ddbc914dc3e54dec 100644 (file)
--- a/nls/de.po
+++ b/nls/de.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: sysstat 9.1.3\n"
+"Project-Id-Version: sysstat 9.1.5\n"
 "Report-Msgid-Bugs-To: sysstat <at> orange.fr\n"
-"POT-Creation-Date: 2010-06-26 09:01+0200\n"
-"PO-Revision-Date: 2010-06-29 23:54+0100\n"
+"POT-Creation-Date: 2010-09-04 08:21+0200\n"
+"PO-Revision-Date: 2010-09-13 08:45+0100\n"
 "Last-Translator: Roland Illig <roland.illig@gmx.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -37,8 +37,8 @@ msgstr ""
 msgid "sysstat version %s\n"
 msgstr "sysstat version %s\n"
 
-#: ioconf.c:490 rd_stats.c:69 rd_stats.c:1842 sa_common.c:1052 sadc.c:586
-#: sadc.c:595 sadc.c:655
+#: ioconf.c:490 rd_stats.c:72 rd_stats.c:1831 sa_common.c:1052 sadc.c:593
+#: sadc.c:602 sadc.c:662
 #, c-format
 msgid "Cannot open %s: %s\n"
 msgstr "Kann nicht öffnen %s: %s\n"
@@ -80,7 +80,7 @@ msgstr ""
 "[ -A ] [ -I { SUM | CPU | SCPU | ALL } ] [ -u ] [ -P { <cpu> [,...] | ALL } ] [ -V ]\n"
 
 # sar.c:
-#: mpstat.c:530 pidstat.c:1806 sar.c:354
+#: mpstat.c:530 pidstat.c:1806 sar.c:360
 msgid "Average:"
 msgstr "Durchschn.:"
 
@@ -102,12 +102,12 @@ msgstr ""
 "[ -t ] [ -u ] [ -V ] [ -w ]\n"
 "[ -p { <pid> [,...] | SELF | ALL } ] [ -T { TASK | CHILD | ALL } ]\n"
 
-#: pidstat.c:199 sar.c:972
+#: pidstat.c:199 sar.c:978
 #, c-format
 msgid "Requested activities not available\n"
 msgstr "Die angeforderte Aktion ist nicht verfügbar.\n"
 
-#: rd_stats.c:1888
+#: rd_stats.c:1877
 #, c-format
 msgid "Cannot handle so many processors!\n"
 msgstr "Es sind zuviele Prozessoren vorhanden!\n"
@@ -142,12 +142,12 @@ msgstr "Diese Version von sysstat kann das Format dieser Datei (%#x) nicht mehr
 msgid "Requested activities not available in file %s\n"
 msgstr "Angeforderte Aktivität ist nicht verfügbar in Datei %s\n"
 
-#: sadc.c:76
+#: sadc.c:81
 #, c-format
 msgid "Usage: %s [ options ] [ <interval> [ <count> ] ] [ <outfile> ]\n"
 msgstr "Aufruf: %s [ optionen... ] [ <intervall> [ <anzahl> ] ] [ <ausgabedatei> ]\n"
 
-#: sadc.c:79
+#: sadc.c:84
 #, c-format
 msgid ""
 "Options are:\n"
@@ -158,17 +158,17 @@ msgstr ""
 "[ -C <comment> ] [ -F ] [ -L ] [ -V ]\n"
 "[ -S { INT | DISK | IPV6 | POWER | SNMP | XDISK | ALL | XALL } ]\n"
 
-#: sadc.c:199
+#: sadc.c:206
 #, c-format
 msgid "Cannot write data to system activity file: %s\n"
 msgstr "Kann keine Daten in die Systemaktivitätendatei schreiben: %s\n"
 
-#: sadc.c:473
+#: sadc.c:480
 #, c-format
 msgid "Cannot write system activity file header: %s\n"
 msgstr "Kann den Kopf der Systemaktivitätendatei nicht schreiben: %s\n"
 
-#: sadc.c:749
+#: sadc.c:756
 #, c-format
 msgid "Cannot append data to that file (%s)\n"
 msgstr "An die Datei \"%s\" können keine Daten angehängt werden\n"
@@ -215,20 +215,20 @@ msgstr "Liste der Aktivit
 #, c-format
 msgid ""
 "Options are:\n"
-"[ -A ] [ -b ] [ -B ] [ -C ] [ -d ] [ -h ] [ -m ] [ -p ] [ -q ] [ -r ]\n"
+"[ -A ] [ -b ] [ -B ] [ -C ] [ -d ] [ -h ] [ -p ] [ -q ] [ -r ]\n"
 "[ -R ] [ -S ] [ -t ] [ -u [ ALL ] ] [ -v ] [ -V ] [ -w ] [ -W ] [ -y ]\n"
 "[ -I { <int> [,...] | SUM | ALL | XALL } ] [ -P { <cpu> [,...] | ALL } ]\n"
-"[ -n { <keyword> [,...] | ALL } ]\n"
+"[ -m { <keyword> [,...] | ALL } ] [ -n { <keyword> [,...] | ALL } ]\n"
 "[ -o [ <filename> ] | -f [ <filename> ] ]\n"
 "[ -i <interval> ] [ -s [ <hh:mm:ss> ] ] [ -e [ <hh:mm:ss> ] ]\n"
 msgstr ""
 "Optionen sind:\n"
-"[ -A ] [ -b ] [ -B ] [ -C ] [ -d ] [ -h ] [ -m ] [ -p ] [ -q ] [ -r ]\n"
+"[ -A ] [ -b ] [ -B ] [ -C ] [ -d ] [ -h ] [ -p ] [ -q ] [ -r ]\n"
 "[ -R ] [ -S ] [ -t ] [ -u [ ALL ] ] [ -v ] [ -V ] [ -w ] [ -W ] [ -y ]\n"
 "[ -I { <int> [,...] | SUM | ALL | XALL } ] [ -P { <cpu> [,...] | ALL } ]\n"
-"[ -n { <wort> [,...] | ALL } ]\n"
-"[ -o [ <dateiname> ] | -f [ <dateiname> ] ]\n"
-"[ -i <intervall> ] [ -s [ <hh:mm:ss> ] ] [ -e [ <hh:mm:ss> ] ]\n"
+"[ -n { <Schlüsselwort> [,...] | ALL } ]\n"
+"[ -o [ <Dateiname> ] | -f [ <Dateiname> ] ]\n"
+"[ -i <Intervall> ] [ -s [ <hh:mm:ss> ] ] [ -e [ <hh:mm:ss> ] ]\n"
 
 #: sar.c:126
 #, c-format
@@ -261,10 +261,24 @@ msgstr ""
 
 #: sar.c:132
 #, c-format
-msgid "\t-m\tPower management statistics\n"
-msgstr "\t-m\tEnergieverwaltungs-Statistik\n"
+msgid ""
+"\t-m { <keyword> [,...] | ALL }\n"
+"\t\tPower management statistics\n"
+"\t\tKeywords are:\n"
+"\t\tCPU\tCPU clock frequency\n"
+"\t\tFAN\tFans speed\n"
+"\t\tIN\tVoltage inputs\n"
+"\t\tTEMP\tDevices temperature\n"
+msgstr ""
+"\t-m { <Schlüsselwort> [,...] | ALL }\n"
+"\t\tPower-Management-Statistik\n"
+"\t\tSchlüsselwörter sind:\n"
+"\t\tCPU\tCPU-Taktfrequenz\n"
+"\t\tFAN\tLüftergeschwindigkeit\n"
+"\t\tIN\tEingangsspannung\n"
+"\t\tTEMP\tGerätetemperatur\n"
 
-#: sar.c:133
+#: sar.c:139
 #, c-format
 msgid ""
 "\t-n { <keyword> [,...] | ALL }\n"
@@ -311,27 +325,27 @@ msgstr ""
 "\t\tEICMP6\tICMP-Verkehr\t(v6) (Fehler)\n"
 "\t\tUDP6\tUDP-Verkehr\t(v6)\n"
 
-#: sar.c:154
+#: sar.c:160
 #, c-format
 msgid "\t-q\tQueue length and load average statistics\n"
 msgstr "\t-q\tWarteschlangen- und Systemauslastungs-Statistik\n"
 
-#: sar.c:155
+#: sar.c:161
 #, c-format
 msgid "\t-r\tMemory utilization statistics\n"
 msgstr "\t-r\tSpeicherverbrauchs-Statistik\n"
 
-#: sar.c:156
+#: sar.c:162
 #, c-format
 msgid "\t-R\tMemory statistics\n"
 msgstr "\t-R\tSpeicher-Statistik\n"
 
-#: sar.c:157
+#: sar.c:163
 #, c-format
 msgid "\t-S\tSwap space utilization statistics\n"
 msgstr "\t-S\tAuslagerungsspeicher-Statistik\n"
 
-#: sar.c:158
+#: sar.c:164
 #, c-format
 msgid ""
 "\t-u [ ALL ]\n"
@@ -340,61 +354,64 @@ msgstr ""
 "\t-u [ ALL ]\n"
 "\t\tCPU-Verbrauchs-Statistik\n"
 
-#: sar.c:160
+#: sar.c:166
 #, c-format
 msgid "\t-v\tKernel table statistics\n"
 msgstr "\t-v\tKernel-Tabellen-Statistik\n"
 
-#: sar.c:161
+#: sar.c:167
 #, c-format
 msgid "\t-w\tTask creation and system switching statistics\n"
 msgstr "\t-w\tTask-Erzeugungs- und Systemwechsel-Statistik\n"
 
-#: sar.c:162
+#: sar.c:168
 #, c-format
 msgid "\t-W\tSwapping statistics\n"
 msgstr "\t-W\tAuslagerungs-Statistik\n"
 
-#: sar.c:163
+#: sar.c:169
 #, c-format
 msgid "\t-y\tTTY device statistics\n"
 msgstr "\t-y\tTTY-Geräte-Statistik\n"
 
-#: sar.c:206
+#: sar.c:212
 #, c-format
 msgid "End of data collecting unexpected\n"
 msgstr "Unerwartetes Ende der gesammelten Daten\n"
 
-#: sar.c:774
+#: sar.c:780
 #, c-format
 msgid "Invalid data format\n"
 msgstr "ungültiges Datenformat\n"
 
-#: sar.c:778
+#: sar.c:784
 #, c-format
 msgid "Using a wrong data collector from a different sysstat version\n"
 msgstr "Datensammler von einer anderen sysstat-Version in Benutzung\n"
 
-#: sar.c:798
+#: sar.c:804
 #, c-format
 msgid "Inconsistent input data\n"
 msgstr "Inkonsistente Eingabedaten\n"
 
-#: sar.c:1207
+#: sar.c:1225
 #, c-format
 msgid "-f and -o options are mutually exclusive\n"
 msgstr "Die Optionen -f und -o schließen sich gegenseitig aus\n"
 
-#: sar.c:1213
+#: sar.c:1231
 #, c-format
 msgid "Not reading from a system activity file (use -f option)\n"
 msgstr "Bitte -f Option zur Angabe der Systemaktivitätendatei verwenden\n"
 
-#: sar.c:1314
+#: sar.c:1332
 #, c-format
 msgid "Cannot find the data collector (%s)\n"
 msgstr "Kann den Datensammler \"%s\" nicht finden\n"
 
+#~ msgid "\t-m\tPower management statistics\n"
+#~ msgstr "\t-m\tEnergieverwaltungs-Statistik\n"
+
 #~ msgid "Time: %s\n"
 #~ msgstr "Zeit: %s\n"
 

diff --git a/nls/fi.po b/nls/fi.po
index d7bb53febbf5f4248aceb33033aa5ed211af687a..f8554179bd154f9e6453deee79141fe7b6802dac 100644 (file)
--- a/nls/fi.po
+++ b/nls/fi.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: sysstat 9.1.4\n"
+"Project-Id-Version: sysstat 9.1.5\n"
 "Report-Msgid-Bugs-To: sysstat <at> orange.fr\n"
-"POT-Creation-Date: 2010-07-24 10:55+0200\n"
-"PO-Revision-Date: 2010-07-30 14:43+0200\n"
+"POT-Creation-Date: 2010-09-04 08:21+0200\n"
+"PO-Revision-Date: 2010-09-13 16:25+0200\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -80,7 +80,7 @@ msgstr ""
 "Valitsimet ovat:\n"
 "[ -A ] [ -I { SUM | CPU | SCPU | ALL } ] [ -u ] [ -P { <suoritin> [,...] | ALL } ] [ -V ]\n"
 
-#: mpstat.c:530 pidstat.c:1806 sar.c:359
+#: mpstat.c:530 pidstat.c:1806 sar.c:360
 msgid "Average:"
 msgstr "Keskiarvo:"
 
@@ -103,7 +103,7 @@ msgstr ""
 "[ -p { <prosessitunniste> [,...] | SELF | ALL } ] [ -T { TASK | CHILD | ALL } ]\n"
 
 #  Pyydetyt voi olla tilanteesta riippuen halutut, tiedustellut, kyseiset, haetut tms.
-#: pidstat.c:199 sar.c:977
+#: pidstat.c:199 sar.c:978
 #, c-format
 msgid "Requested activities not available\n"
 msgstr "Pyydetyt toiminnot eivät ole käytettävissä\n"
@@ -269,16 +269,18 @@ msgid ""
 "\t\tKeywords are:\n"
 "\t\tCPU\tCPU clock frequency\n"
 "\t\tFAN\tFans speed\n"
+"\t\tIN\tVoltage inputs\n"
 "\t\tTEMP\tDevices temperature\n"
 msgstr ""
 "\t-m { <avainsana> [,...] | ALL }\n"
-"\t\tTehonhallntatilastot\n"
+"\t\tTehonhallintatilastot\n"
 "\t\tAvainsanoja ovat:\n"
 "\t\tCPU\tProsessorin kellotaajuus\n"
 "\t\tFAN\tTuulettimen nopeus\n"
+"\t\tIN\tJännitesyötteet\n"
 "\t\tTEMP\tLaitteen lämpötila\n"
 
-#: sar.c:138
+#: sar.c:139
 #, c-format
 msgid ""
 "\t-n { <keyword> [,...] | ALL }\n"
@@ -325,27 +327,27 @@ msgstr ""
 "\t\tEICMP6\tICMP-liikenne\t(v6) (virheet)\n"
 "\t\tUDP6\tUDP-liikenne\t(v6)\n"
 
-#: sar.c:159
+#: sar.c:160
 #, c-format
 msgid "\t-q\tQueue length and load average statistics\n"
 msgstr "\t-q\tJonopituus- ja latauskeskiarvotilastot\n"
 
-#: sar.c:160
+#: sar.c:161
 #, c-format
 msgid "\t-r\tMemory utilization statistics\n"
 msgstr "\t-r\tMuistin käyttöastetilastot\n"
 
-#: sar.c:161
+#: sar.c:162
 #, c-format
 msgid "\t-R\tMemory statistics\n"
 msgstr "\t-R\tMuistitilastot\n"
 
-#: sar.c:162
+#: sar.c:163
 #, c-format
 msgid "\t-S\tSwap space utilization statistics\n"
 msgstr "\t-S\tNäennäismuistitilan käyttöastetilastot\n"
 
-#: sar.c:163
+#: sar.c:164
 #, c-format
 msgid ""
 "\t-u [ ALL ]\n"
@@ -354,57 +356,57 @@ msgstr ""
 "\t-u [ ALL ]\n"
 "\t\tSuorittimen käyttöastetilastot\n"
 
-#: sar.c:165
+#: sar.c:166
 #, c-format
 msgid "\t-v\tKernel table statistics\n"
 msgstr "\t-v\tKäyttöjärjestelmäytimen taulutilastot\n"
 
-#: sar.c:166
+#: sar.c:167
 #, c-format
 msgid "\t-w\tTask creation and system switching statistics\n"
 msgstr "\t-w\tTehtävän luonti- ja järjestelmänvaihtotilastot\n"
 
-#: sar.c:167
+#: sar.c:168
 #, c-format
 msgid "\t-W\tSwapping statistics\n"
 msgstr "\t-W\tNäennäismuisti vaihtamistilastot\n"
 
-#: sar.c:168
+#: sar.c:169
 #, c-format
 msgid "\t-y\tTTY device statistics\n"
 msgstr "\t-y\tTTY-laitetilastot\n"
 
-#: sar.c:211
+#: sar.c:212
 #, c-format
 msgid "End of data collecting unexpected\n"
 msgstr "Tiedonkeräyksen loppu odottamaton\n"
 
-#: sar.c:779
+#: sar.c:780
 #, c-format
 msgid "Invalid data format\n"
 msgstr "Virheellinen datamuoto\n"
 
-#: sar.c:783
+#: sar.c:784
 #, c-format
 msgid "Using a wrong data collector from a different sysstat version\n"
 msgstr "Käytetään väärää datakerääjää eri sysstat-versiosta\n"
 
-#: sar.c:803
+#: sar.c:804
 #, c-format
 msgid "Inconsistent input data\n"
 msgstr "Epäjohdonmukainen syötedata\n"
 
-#: sar.c:1224
+#: sar.c:1225
 #, c-format
 msgid "-f and -o options are mutually exclusive\n"
 msgstr "valitsimet ”-f” ja ”-o” ovat vastavuoroisesti poissulkevia\n"
 
-#: sar.c:1230
+#: sar.c:1231
 #, c-format
 msgid "Not reading from a system activity file (use -f option)\n"
 msgstr "Ei lueta järjestelmätoimintojen lokitiedostosta (käytä valitsinta ”-f”)\n"
 
-#: sar.c:1331
+#: sar.c:1332
 #, c-format
 msgid "Cannot find the data collector (%s)\n"
 msgstr "Datakerääjää (%s) ei löydy\n"

diff --git a/nls/fr.po b/nls/fr.po
index 83eb89e33603ca32c4007627327f1a7325d78114..b9048627829e4049963f84590f2ea88a87e935dd 100644 (file)
--- a/nls/fr.po
+++ b/nls/fr.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: sysstat 9.1.4\n"
+"Project-Id-Version: sysstat 9.1.5\n"
 "Report-Msgid-Bugs-To: sysstat <at> orange.fr\n"
-"POT-Creation-Date: 2010-07-24 10:55+0200\n"
-"PO-Revision-Date: 2010-08-01 09:28+0100\n"
+"POT-Creation-Date: 2010-09-04 08:21+0200\n"
+"PO-Revision-Date: 2010-09-13 08:41+0100\n"
 "Last-Translator: Nicolas Provost <nprovost@quadriv.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "MIME-Version: 1.0\n"
@@ -79,7 +79,7 @@ msgstr ""
 "[ -A ] [ -I { SUM | CPU | SCPU | ALL } ] [ -u ] [ -P { <cpu> [,...] | ALL } ] [ -V ]\n"
 
 # sar.c:
-#: mpstat.c:530 pidstat.c:1806 sar.c:359
+#: mpstat.c:530 pidstat.c:1806 sar.c:360
 msgid "Average:"
 msgstr "Moyenne :"
 
@@ -101,7 +101,7 @@ msgstr ""
 "[ -t ] [ -u ] [ -V ] [ -w ]\n"
 "[ -p { <pid> [,...] | SELF | ALL } ] [ -T { TASK | CHILD | ALL } ]\n"
 
-#: pidstat.c:199 sar.c:977
+#: pidstat.c:199 sar.c:978
 #, c-format
 msgid "Requested activities not available\n"
 msgstr "Statistiques demandées non disponibles\n"
@@ -266,6 +266,7 @@ msgid ""
 "\t\tKeywords are:\n"
 "\t\tCPU\tCPU clock frequency\n"
 "\t\tFAN\tFans speed\n"
+"\t\tIN\tVoltage inputs\n"
 "\t\tTEMP\tDevices temperature\n"
 msgstr ""
 "\t-m { <motclef> [,...] | ALL }\n"
@@ -273,9 +274,10 @@ msgstr ""
 "\t\tMots-clefs possibles :\n"
 "\t\tCPU\tfréquence CPU\n"
 "\t\tFAN\tvitesse ventilateurs\n"
+"\t\tIN\ttensions en entrée\n"
 "\t\tTEMP\ttempérature périphériques\n"
 
-#: sar.c:138
+#: sar.c:139
 #, c-format
 msgid ""
 "\t-n { <keyword> [,...] | ALL }\n"
@@ -322,27 +324,27 @@ msgstr ""
 "\t\tEICMP6\tTrafic ICMP\t(v6) (erreurs)\n"
 "\t\tUDP6\tTrafic UDP\t(v6)\n"
 
-#: sar.c:159
+#: sar.c:160
 #, c-format
 msgid "\t-q\tQueue length and load average statistics\n"
 msgstr "\t-q\tStatistiques longueur de queue et charge moyenne\n"
 
-#: sar.c:160
+#: sar.c:161
 #, c-format
 msgid "\t-r\tMemory utilization statistics\n"
 msgstr "\t-r\tStatistiques d'utilisation mémoire\n"
 
-#: sar.c:161
+#: sar.c:162
 #, c-format
 msgid "\t-R\tMemory statistics\n"
 msgstr "\t-R\tStatistiques mémoire\n"
 
-#: sar.c:162
+#: sar.c:163
 #, c-format
 msgid "\t-S\tSwap space utilization statistics\n"
 msgstr "\t-S\tStatistiques d'utilisation de l'espace d'échange\n"
 
-#: sar.c:163
+#: sar.c:164
 #, c-format
 msgid ""
 "\t-u [ ALL ]\n"
@@ -351,57 +353,57 @@ msgstr ""
 "\t-u [ ALL ]\n"
 "\t\tStatistiques d'utlisation CPU\n"
 
-#: sar.c:165
+#: sar.c:166
 #, c-format
 msgid "\t-v\tKernel table statistics\n"
 msgstr "\t-v\tStatistiques table noyau\n"
 
-#: sar.c:166
+#: sar.c:167
 #, c-format
 msgid "\t-w\tTask creation and system switching statistics\n"
 msgstr "\t-w\tStatistiques de création et commutation de tâches par le système\n"
 
-#: sar.c:167
+#: sar.c:168
 #, c-format
 msgid "\t-W\tSwapping statistics\n"
 msgstr "\t-W\tStatistiques d'échange (mémoire)\n"
 
-#: sar.c:168
+#: sar.c:169
 #, c-format
 msgid "\t-y\tTTY device statistics\n"
 msgstr "\t-y\tStatistiques périph. consoles (TTY)\n"
 
-#: sar.c:211
+#: sar.c:212
 #, c-format
 msgid "End of data collecting unexpected\n"
 msgstr "Fin inattendue de collecte des données\n"
 
-#: sar.c:779
+#: sar.c:780
 #, c-format
 msgid "Invalid data format\n"
 msgstr "Format de données non valide\n"
 
-#: sar.c:783
+#: sar.c:784
 #, c-format
 msgid "Using a wrong data collector from a different sysstat version\n"
 msgstr "Utilisation d'un mauvais collecteur de données venant d'une autre version de sysstat\n"
 
-#: sar.c:803
+#: sar.c:804
 #, c-format
 msgid "Inconsistent input data\n"
 msgstr "Données inconsistantes en entrée\n"
 
-#: sar.c:1224
+#: sar.c:1225
 #, c-format
 msgid "-f and -o options are mutually exclusive\n"
 msgstr "Les options -f et -o ne peuvent être utilisées ensemble\n"
 
-#: sar.c:1230
+#: sar.c:1231
 #, c-format
 msgid "Not reading from a system activity file (use -f option)\n"
 msgstr "Pas de fichier d'activité système lisible (utilisez l'option -f)\n"
 
-#: sar.c:1331
+#: sar.c:1332
 #, c-format
 msgid "Cannot find the data collector (%s)\n"
 msgstr "Impossible de trouver le collecteur de données (%s)\n"

diff --git a/nls/id.po b/nls/id.po
index c3105bc47975340e5e49b556e561f3a184c935bd..ca5c0eb34a10c3a96b72179d7c7759f67aac855e 100644 (file)
--- a/nls/id.po
+++ b/nls/id.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: sysstat 9.1.4\n"
+"Project-Id-Version: sysstat 9.1.5\n"
 "Report-Msgid-Bugs-To: sysstat <at> orange.fr\n"
-"POT-Creation-Date: 2010-07-24 10:55+0200\n"
-"PO-Revision-Date: 2010-07-31 21:51+0700\n"
+"POT-Creation-Date: 2010-09-04 08:21+0200\n"
+"PO-Revision-Date: 2010-11-07 15:24+0700\n"
 "Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -77,7 +77,7 @@ msgstr ""
 "Opsinya adalah:\n"
 "[ -A ] [ -I { SUM | CPU | SCPU | ALL } ] [ -u ] [ -P { <cpu> [,...] | ALL } ] [ -V ]\n"
 
-#: mpstat.c:530 pidstat.c:1806 sar.c:359
+#: mpstat.c:530 pidstat.c:1806 sar.c:360
 msgid "Average:"
 msgstr "Rata-rata:"
 
@@ -99,7 +99,7 @@ msgstr ""
 "[ -t ] [ -u ] [ -V ] [ -w ]\n"
 "[ -p { <pid> [,...] | SELF | ALL } ] [ -T { TASK | CHILD | ALL } ]\n"
 
-#: pidstat.c:199 sar.c:977
+#: pidstat.c:199 sar.c:978
 #, c-format
 msgid "Requested activities not available\n"
 msgstr "Aktivitas yang diminta tak tersedia\n"
@@ -264,16 +264,18 @@ msgid ""
 "\t\tKeywords are:\n"
 "\t\tCPU\tCPU clock frequency\n"
 "\t\tFAN\tFans speed\n"
+"\t\tIN\tVoltage inputs\n"
 "\t\tTEMP\tDevices temperature\n"
 msgstr ""
 "\t-m { <kata kunci> [,...] | ALL }\n"
 "\t\tStatistik manajemen daya\n"
-"\t\tKata kuncinya adalah:\n"
+"\t\tKatakunci adalah:\n"
 "\t\tCPU\tFrekuensi jam CPU\n"
 "\t\tFAN\tKecepatan kipas\n"
+"\t\tIN\tMasukan voltase\n"
 "\t\tTEMP\tTemperatur divais\n"
 
-#: sar.c:138
+#: sar.c:139
 #, c-format
 msgid ""
 "\t-n { <keyword> [,...] | ALL }\n"
@@ -320,27 +322,27 @@ msgstr ""
 "\t\tEICMP6\tLalu lintas ICMP\t(v6) (galat)\n"
 "\t\tUDP6\tLalu lintas UDP\t(v6)\n"
 
-#: sar.c:159
+#: sar.c:160
 #, c-format
 msgid "\t-q\tQueue length and load average statistics\n"
 msgstr "\t-q\tPanjang antrean dan statistik rata-rata muatan\n"
 
-#: sar.c:160
+#: sar.c:161
 #, c-format
 msgid "\t-r\tMemory utilization statistics\n"
 msgstr "\t-r\tStatistik utilisasi memori\n"
 
-#: sar.c:161
+#: sar.c:162
 #, c-format
 msgid "\t-R\tMemory statistics\n"
 msgstr "\t-R\tStatistik memori\n"
 
-#: sar.c:162
+#: sar.c:163
 #, c-format
 msgid "\t-S\tSwap space utilization statistics\n"
 msgstr "\t-S\tStatistik utilisasi ruang swap\n"
 
-#: sar.c:163
+#: sar.c:164
 #, c-format
 msgid ""
 "\t-u [ ALL ]\n"
@@ -349,57 +351,57 @@ msgstr ""
 "\t-u [ ALL ]\n"
 "\t\tStatistik utilisasi CPU\n"
 
-#: sar.c:165
+#: sar.c:166
 #, c-format
 msgid "\t-v\tKernel table statistics\n"
 msgstr "\t-v\tStatistik tabel kernel\n"
 
-#: sar.c:166
+#: sar.c:167
 #, c-format
 msgid "\t-w\tTask creation and system switching statistics\n"
 msgstr "\t-w\tStatistik penukar sistem dan pembuatan tugas\n"
 
-#: sar.c:167
+#: sar.c:168
 #, c-format
 msgid "\t-W\tSwapping statistics\n"
 msgstr "\t-W\tStatistik swap\n"
 
-#: sar.c:168
+#: sar.c:169
 #, c-format
 msgid "\t-y\tTTY device statistics\n"
 msgstr "\t-y\tStatistik divais TTY\n"
 
-#: sar.c:211
+#: sar.c:212
 #, c-format
 msgid "End of data collecting unexpected\n"
 msgstr "Akhir pengumpulan data tak diharapkan\n"
 
-#: sar.c:779
+#: sar.c:780
 #, c-format
 msgid "Invalid data format\n"
 msgstr "Format data tak sah\n"
 
-#: sar.c:783
+#: sar.c:784
 #, c-format
 msgid "Using a wrong data collector from a different sysstat version\n"
 msgstr "Menggunakan pengumpul data yang salah dari versi sysstat yang berbeda\n"
 
-#: sar.c:803
+#: sar.c:804
 #, c-format
 msgid "Inconsistent input data\n"
 msgstr "Data masukan tidak konsisten\n"
 
-#: sar.c:1224
+#: sar.c:1225
 #, c-format
 msgid "-f and -o options are mutually exclusive\n"
 msgstr "opsi -f dan -o secara mutual eksklusif\n"
 
-#: sar.c:1230
+#: sar.c:1231
 #, c-format
 msgid "Not reading from a system activity file (use -f option)\n"
 msgstr "Tak membaca dari berkas aktivitas sistem (gunakan opsi -f)\n"
 
-#: sar.c:1331
+#: sar.c:1332
 #, c-format
 msgid "Cannot find the data collector (%s)\n"
 msgstr "Tak dapat menemukan pengumpul data (%s)\n"

diff --git a/nls/it.po b/nls/it.po
index 9b9236b1ecbc85241745792c4ea3424c1f9833c8..576d524918d1c710fc2e3f2ec38a48a34498680a 100644 (file)
--- a/nls/it.po
+++ b/nls/it.po
@@ -5,10 +5,10 @@
 # Vincenzo Campanella <vinz65@gmail.com>, 2008, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: sysstat-9.1.4\n"
+"Project-Id-Version: sysstat-9.1.5\n"
 "Report-Msgid-Bugs-To: sysstat <at> orange.fr\n"
-"POT-Creation-Date: 2010-07-24 10:55+0200\n"
-"PO-Revision-Date: 2010-07-31 11:53+0200\n"
+"POT-Creation-Date: 2010-09-04 08:21+0200\n"
+"PO-Revision-Date: 2010-09-13 08:47+0200\n"
 "Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -77,7 +77,7 @@ msgstr ""
 "Le opzioni sono:\n"
 "[ -A ] [ -I { SUM | CPU | SCPU | ALL } ] [ -u ] [ -P { <cpu> [,...] | ALL } ] [ -V ]\n"
 
-#: mpstat.c:530 pidstat.c:1806 sar.c:359
+#: mpstat.c:530 pidstat.c:1806 sar.c:360
 msgid "Average:"
 msgstr "Media:"
 
@@ -99,7 +99,7 @@ msgstr ""
 "[ -t ] [ -u ] [ -V ] [ -w ]\n"
 "[ -p { <pid> [,...] | SELF | ALL } ] [ -T { TASK | CHILD | ALL } ]\n"
 
-#: pidstat.c:199 sar.c:977
+#: pidstat.c:199 sar.c:978
 #, c-format
 msgid "Requested activities not available\n"
 msgstr "Le statistiche richieste non sono disponibili\n"
@@ -264,6 +264,7 @@ msgid ""
 "\t\tKeywords are:\n"
 "\t\tCPU\tCPU clock frequency\n"
 "\t\tFAN\tFans speed\n"
+"\t\tIN\tVoltage inputs\n"
 "\t\tTEMP\tDevices temperature\n"
 msgstr ""
 "\t-m { <parola chiave> [,...] | ALL }\n"
@@ -271,9 +272,10 @@ msgstr ""
 "\t\tLe parole chiave sono:\n"
 "\t\tCPU\tfrequenza del clock della CPU\n"
 "\t\tFAN\tVelocità delle ventole\n"
+"\t\tIN\tInput di voltaggio\n"
 "\t\tTEMP\tTemperatura dei dispositivi\n"
 
-#: sar.c:138
+#: sar.c:139
 #, c-format
 msgid ""
 "\t-n { <keyword> [,...] | ALL }\n"
@@ -320,27 +322,27 @@ msgstr ""
 "\t\tEICMP6\tTraffico ICMP\t(v6) (errori)\n"
 "\t\tUDP6\tTraffico UDP\t(v6)\n"
 
-#: sar.c:159
+#: sar.c:160
 #, c-format
 msgid "\t-q\tQueue length and load average statistics\n"
 msgstr "\t-q\tStatistiche sulla media della lunghezza della coda e del carico\n"
 
-#: sar.c:160
+#: sar.c:161
 #, c-format
 msgid "\t-r\tMemory utilization statistics\n"
 msgstr "\t-r\tStatistiche sull'uso della memoria\n"
 
-#: sar.c:161
+#: sar.c:162
 #, c-format
 msgid "\t-R\tMemory statistics\n"
 msgstr "\t-R\tStatistiche sulla memoria\n"
 
-#: sar.c:162
+#: sar.c:163
 #, c-format
 msgid "\t-S\tSwap space utilization statistics\n"
 msgstr "\t-S\tStatistiche sull'uso dello spazio di swap\n"
 
-#: sar.c:163
+#: sar.c:164
 #, c-format
 msgid ""
 "\t-u [ ALL ]\n"
@@ -349,57 +351,57 @@ msgstr ""
 "\t-u [ ALL ]\n"
 "\t\tStatistiche sull'uso della CPU\n"
 
-#: sar.c:165
+#: sar.c:166
 #, c-format
 msgid "\t-v\tKernel table statistics\n"
 msgstr "\t-v\tStatistiche sulla tabella del kernel\n"
 
-#: sar.c:166
+#: sar.c:167
 #, c-format
 msgid "\t-w\tTask creation and system switching statistics\n"
 msgstr "\t-w\tStatistiche sulla creazione di attività e sui cambiamenti del sistema\n"
 
-#: sar.c:167
+#: sar.c:168
 #, c-format
 msgid "\t-W\tSwapping statistics\n"
 msgstr "\t-W\tStatistiche sullo swap\n"
 
-#: sar.c:168
+#: sar.c:169
 #, c-format
 msgid "\t-y\tTTY device statistics\n"
 msgstr "\t-y\tStatistiche sui device TTY\n"
 
-#: sar.c:211
+#: sar.c:212
 #, c-format
 msgid "End of data collecting unexpected\n"
 msgstr "Fine inattesa della raccolta dei dati\n"
 
-#: sar.c:779
+#: sar.c:780
 #, c-format
 msgid "Invalid data format\n"
 msgstr "Formato dei dati non valido\n"
 
-#: sar.c:783
+#: sar.c:784
 #, c-format
 msgid "Using a wrong data collector from a different sysstat version\n"
 msgstr "Utilizzo di un collettore di dati errato da una versione differente di sysstat\n"
 
-#: sar.c:803
+#: sar.c:804
 #, c-format
 msgid "Inconsistent input data\n"
 msgstr "Dati in ingresso inconsistenti\n"
 
-#: sar.c:1224
+#: sar.c:1225
 #, c-format
 msgid "-f and -o options are mutually exclusive\n"
 msgstr "Le opzioni -f e -o si escludono a vicenda\n"
 
-#: sar.c:1230
+#: sar.c:1231
 #, c-format
 msgid "Not reading from a system activity file (use -f option)\n"
 msgstr "La lettura non avviene da un file delle statistiche del sistema (usare l'opzione -f)\n"
 
-#: sar.c:1331
+#: sar.c:1332
 #, c-format
 msgid "Cannot find the data collector (%s)\n"
 msgstr "Impossibile trovare il collettore dei dati (%s)\n"

diff --git a/nls/ja.po b/nls/ja.po
index 40afd17cb88279f6bb524da0ff658d6c78223262..ab44e7940b52a068c8ea189a765673adae38edee 100644 (file)
--- a/nls/ja.po
+++ b/nls/ja.po
@@ -1,84 +1,112 @@
 # NLS support for the sysstat package.
 # This file is distributed under the same license as the sysstat package.
-# Copyright (C) 1999-2009 Free Software Foundation, Inc.
+# Copyright (C) 1999-2010 Free Software Foundation, Inc.
 # Sebastien GODARD <sysstat [at] orange.fr>, 1999.
-# Japanese translation by Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2008-2009.
+# Japanese translation by Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2008-2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: sysstat 9.0.3\n"
+"Project-Id-Version: sysstat 9.1.5\n"
 "Report-Msgid-Bugs-To: sysstat <at> orange.fr\n"
-"POT-Creation-Date: 2009-05-17 16:16+0200\n"
-"PO-Revision-Date: 2009-11-12 06:06+0900\n"
+"POT-Creation-Date: 2010-09-04 08:21+0200\n"
+"PO-Revision-Date: 2010-09-19 11:43+0900\n"
 "Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: cifsiostat.c:69 iostat.c:79 mpstat.c:86 nfsiostat.c:68 pidstat.c:78
+#: sar.c:88
+#, c-format
+msgid "Usage: %s [ options ] [ <interval> [ <count> ] ]\n"
+msgstr "使い方: %s [ オプション ] [ <間隔> [ <回数> ] ]\n"
+
+#: cifsiostat.c:72 nfsiostat.c:71
+#, c-format
+msgid ""
+"Options are:\n"
+"[ -h ] [ -k | -m ] [ -t ] [ -V ]\n"
+msgstr ""
+"利用可能なオプション:\n"
+"[ -h ] [ -k | -m ] [ -t ] [ -V ]\n"
+
 #: common.c:57
 #, c-format
 msgid "sysstat version %s\n"
 msgstr "sysstat バージョン %s\n"
 
-#: ioconf.c:479 iostat.c:504 rd_stats.c:69 rd_stats.c:2126 rd_stats.c:2243
-#: sa_common.c:1052 sadc.c:591 sadc.c:600 sadc.c:660
+#: ioconf.c:490 rd_stats.c:72 rd_stats.c:1831 sa_common.c:1052 sadc.c:593
+#: sadc.c:602 sadc.c:662
 #, c-format
 msgid "Cannot open %s: %s\n"
 msgstr "%s を開けません: %s\n"
 
-#: iostat.c:81 mpstat.c:83 pidstat.c:77 sar.c:88
+#: iostat.c:82
 #, c-format
-msgid "Usage: %s [ options ] [ <interval> [ <count> ] ]\n"
-msgstr "使い方: %s [ オプション ] [ <間隔> [ <回数> ] ]\n"
+msgid ""
+"Options are:\n"
+"[ -c ] [ -d ] [ -N ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ]\n"
+"[ <device> [...] | ALL ] [ -p [ <device> [,...] | ALL ] ] [ --debuginfo ]\n"
+msgstr ""
+"利用可能なオプション:\n"
+"[ -c ] [ -d ] [ -N ] [ -n ] [ -h ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ]\n"
+"[ <デバイス> [...] | ALL ] [ -p [ <デバイス> [,...] | ALL ] ] [ --debuginfo ]\n"
 
-#: iostat.c:84
+#: iostat.c:86
 #, c-format
 msgid ""
 "Options are:\n"
-"[ -c ] [ -d ] [ -N ] [ -n ] [ -h ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ]\n"
+"[ -c ] [ -d ] [ -N ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ]\n"
 "[ <device> [...] | ALL ] [ -p [ <device> [,...] | ALL ] ]\n"
 msgstr ""
 "利用可能なオプション:\n"
 "[ -c ] [ -d ] [ -N ] [ -n ] [ -h ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ]\n"
-"[ <デバイス> [ ... ] | ALL ] [ -p [ <デバイス> [,...] | ALL ] ]\n"
+"[ <デバイス> [...] | ALL ] [ -p [ <デバイス> [,...] | ALL ] ]\n"
+
+#: iostat.c:312
+#, c-format
+msgid "Cannot find disk data\n"
+msgstr "ディスクデータが見つかりません\n"
 
-#: mpstat.c:86
+#: mpstat.c:89
 #, c-format
 msgid ""
 "Options are:\n"
-"[ -A ] [ -I { SUM | CPU | ALL } ] [ -u ] [ -P { <cpu> [,...] | ALL } ] [ -V ]\n"
+"[ -A ] [ -I { SUM | CPU | SCPU | ALL } ] [ -u ] [ -P { <cpu> [,...] | ALL } ] [ -V ]\n"
 msgstr ""
 "利用可能なオプション:\n"
-"[ -A ] [ -I { SUM | CPU | ALL } ] [ -u ] [ -P { <CPU> [,...] | ALL } ] [ -V ]\n"
+"[ -A ] [ -I { SUM | CPU | SCPU | ALL } ] [ -u ] [ -P { <cpu> [,...] | ALL } ] [ -V ]\n"
 
 # sar.c:
-#: mpstat.c:457 pidstat.c:1683 sar.c:354
+#: mpstat.c:530 pidstat.c:1806 sar.c:360
 msgid "Average:"
 msgstr "平均値:"
 
-#: mpstat.c:769
+#: mpstat.c:873
 #, c-format
 msgid "Not that many processors!\n"
 msgstr "そんなに CPU はありません!\n"
 
-#: pidstat.c:80
+#: pidstat.c:81
 #, c-format
 msgid ""
 "Options are:\n"
-"[ -C <command> ] [ -d ] [ -h ] [ -I ] [ -l ] [ -r ] [ -t ] [ -u ] [ -V ] [ -w ]\n"
+"[ -C <command> ] [ -d ] [ -h ] [ -I ] [ -l ] [ -r ] [ -s ]\n"
+"[ -t ] [ -u ] [ -V ] [ -w ]\n"
 "[ -p { <pid> [,...] | SELF | ALL } ] [ -T { TASK | CHILD | ALL } ]\n"
 msgstr ""
 "利用可能なオプション:\n"
-"[ -C <コマンド> ] [ -d ] [ -h ] [ -I ] [ -l ] [ -r ] [ -t ] [ -u ] [ -V ] [ -w ]\n"
+"[ -C <コマンド> ] [ -d ] [ -h ] [ -I ] [ -l ] [ -r ] [ -s ]\n"
+"[ -t ] [ -u ] [ -V ] [ -w ]\n"
 "[ -p { <pid> [,...] | SELF | ALL } ] [ -T { TASK | CHILD | ALL } ]\n"
 
-#: pidstat.c:197 sar.c:968
+#: pidstat.c:199 sar.c:978
 #, c-format
 msgid "Requested activities not available\n"
 msgstr "要求された動作情報は利用できません\n"
 
-#: rd_stats.c:2289
+#: rd_stats.c:1877
 #, c-format
 msgid "Cannot handle so many processors!\n"
 msgstr "そんなに大量のプロセッサは扱えません!\n"
@@ -113,12 +141,12 @@ msgstr "sysstat の現在のバージョンではこのデータファイル (%#
 msgid "Requested activities not available in file %s\n"
 msgstr "要求された動作情報はファイル %s 内にはありません\n"
 
-#: sadc.c:76
+#: sadc.c:81
 #, c-format
 msgid "Usage: %s [ options ] [ <interval> [ <count> ] ] [ <outfile> ]\n"
 msgstr "使い方: %s [ オプション ] [ <間隔> [ <回数> ] ] [ <出力ファイル> ]\n"
 
-#: sadc.c:79
+#: sadc.c:84
 #, c-format
 msgid ""
 "Options are:\n"
@@ -129,17 +157,17 @@ msgstr ""
 "[ -C <コメント> ] [ -F ] [ -L ] [ -V ]\n"
 "[ -S { INT | DISK | IPV6 | POWER | SNMP | XDISK | ALL | XALL } ]\n"
 
-#: sadc.c:199
+#: sadc.c:206
 #, c-format
 msgid "Cannot write data to system activity file: %s\n"
 msgstr "システム動作情報ファイルに書き込みができません: %s\n"
 
-#: sadc.c:478
+#: sadc.c:480
 #, c-format
 msgid "Cannot write system activity file header: %s\n"
 msgstr "システム動作情報ファイルのヘッダに書き込みができません: %s\n"
 
-#: sadc.c:754
+#: sadc.c:756
 #, c-format
 msgid "Cannot append data to that file (%s)\n"
 msgstr "ファイル (%s) にデータを追加できません\n"
@@ -150,34 +178,34 @@ msgid "Usage: %s [ options ] [ <interval> [ <count> ] ] [ <datafile> ]\n"
 msgstr "使い方: %s [ オプション ] [ <間隔> [ <回数> ] ] [ <データファイル名> ]\n"
 
 #: sadf.c:88
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Options are:\n"
-"[ -d | -D | -H | -p | -x ] [ -h ] [ -t ] [ -V ]\n"
+"[ -d | -D | -H | -p | -x ] [ -C ] [ -h ] [ -t ] [ -V ]\n"
 "[ -P { <cpu> [,...] | ALL } ] [ -s [ <hh:mm:ss> ] ] [ -e [ <hh:mm:ss> ] ]\n"
 "[ -- <sar_options> ]\n"
 msgstr ""
 "利用可能なオプション:\n"
 "[ -d | -D | -H | -p | -x ] [ -C ] [ -h ] [ -t ] [ -V ]\n"
 "[ -P { <cpu> [,...] | ALL } ] [ -s [ <hh:mm:ss> ] ] [ -e [ <hh:mm:ss> ] ]\n"
-"[ -- <sar のオプション...> ]\n"
+"[ -- <sar のオプション> ]\n"
 
-#: sadf.c:541
+#: sadf.c:609
 #, c-format
 msgid "System activity data file: %s (%#x)\n"
 msgstr "システム動作情報ファイル: %s (%#x)\n"
 
-#: sadf.c:550
+#: sadf.c:618
 #, c-format
 msgid "Host: "
 msgstr "ホスト名: "
 
-#: sadf.c:556
+#: sadf.c:624
 #, c-format
 msgid "Size of a long int: %d\n"
 msgstr "long int のサイズ: %d\n"
 
-#: sadf.c:558
+#: sadf.c:626
 #, c-format
 msgid "List of activities:\n"
 msgstr "動作情報のリスト:\n"
@@ -186,17 +214,18 @@ msgstr "動作情報のリスト:\n"
 #, c-format
 msgid ""
 "Options are:\n"
-"[ -A ] [ -b ] [ -B ] [ -C ] [ -d ] [ -h ] [ -m ] [ -p ] [ -q ] [ -r ] [ -R ]\n"
-"[ -S ] [ -t ] [ -u [ ALL ] ] [ -v ] [ -V ] [ -w ] [ -W ] [ -y ]\n"
+"[ -A ] [ -b ] [ -B ] [ -C ] [ -d ] [ -h ] [ -p ] [ -q ] [ -r ]\n"
+"[ -R ] [ -S ] [ -t ] [ -u [ ALL ] ] [ -v ] [ -V ] [ -w ] [ -W ] [ -y ]\n"
 "[ -I { <int> [,...] | SUM | ALL | XALL } ] [ -P { <cpu> [,...] | ALL } ]\n"
-"[ -n { <keyword> [,...] | ALL } ]\n"
+"[ -m { <keyword> [,...] | ALL } ] [ -n { <keyword> [,...] | ALL } ]\n"
 "[ -o [ <filename> ] | -f [ <filename> ] ]\n"
 "[ -i <interval> ] [ -s [ <hh:mm:ss> ] ] [ -e [ <hh:mm:ss> ] ]\n"
 msgstr ""
 "利用可能なオプション:\n"
-"[ -A ] [ -b ] [ -B ] [ -C ] [ -d ] [ -h ] [ -m ] [ -p ] [ -q ] [ -r ] [ -R ]\n"
-"[ -S ] [ -t ] [ -u [ ALL ] ] [ -v ] [ -V ] [ -w ] [ -W ] [ -y ]\n"
+"[ -A ] [ -b ] [ -B ] [ -C ] [ -d ] [ -h ] [ -p ] [ -q ] [ -r ]\n"
+"[ -R ] [ -S ] [ -t ] [ -u [ ALL ] ] [ -v ] [ -V ] [ -w ] [ -W ] [ -y ]\n"
 "[ -I { <int> [,...] | SUM | ALL | XALL } ] [ -P { <cpu> [,...] | ALL } ]\n"
+"[ -m { <キーワード> [,...] | ALL } ] [ -n { <キーワード> [,...] | ALL } ]\n"
 "[ -o [ <ファイル名> ] | -f [ <ファイル名> ] ]\n"
 "[ -i <間隔> ] [ -s [ <hh:mm:ss> ] ] [ -e [ <hh:mm:ss> ] ]\n"
 
@@ -231,10 +260,24 @@ msgstr ""
 
 #: sar.c:132
 #, c-format
-msgid "\t-m\tPower management statistics\n"
-msgstr "\t-m\t電力管理状況\n"
+msgid ""
+"\t-m { <keyword> [,...] | ALL }\n"
+"\t\tPower management statistics\n"
+"\t\tKeywords are:\n"
+"\t\tCPU\tCPU clock frequency\n"
+"\t\tFAN\tFans speed\n"
+"\t\tIN\tVoltage inputs\n"
+"\t\tTEMP\tDevices temperature\n"
+msgstr ""
+"\t-m { <キーワード> [,...] | ALL }\n"
+"\t\t電源管理状態の\n"
+"\t\tキーワード:\n"
+"\t\tCPU\tCPU 周波数\n"
+"\t\tFAN\tファン回転数\n"
+"\t\tIN\t入力電圧\n"
+"\t\tTEMP\tデバイス温度\n"
 
-#: sar.c:133
+#: sar.c:139
 #, c-format
 msgid ""
 "\t-n { <keyword> [,...] | ALL }\n"
@@ -281,27 +324,27 @@ msgstr ""
 "\t\tEICMP6\tICMP トラフィック\t(v6) (エラー)\n"
 "\t\tUDP6\tUDP トラフィック\t(v6)\n"
 
-#: sar.c:154
+#: sar.c:160
 #, c-format
 msgid "\t-q\tQueue length and load average statistics\n"
 msgstr "\t-q\tQキューの長さとロードアベレージの状態\n"
 
-#: sar.c:155
+#: sar.c:161
 #, c-format
 msgid "\t-r\tMemory utilization statistics\n"
 msgstr "\t-r\tメモリ利用率の状態\n"
 
-#: sar.c:156
+#: sar.c:162
 #, c-format
 msgid "\t-R\tMemory statistics\n"
 msgstr "\t-R\tメモリの状況\n"
 
-#: sar.c:157
+#: sar.c:163
 #, c-format
 msgid "\t-S\tSwap space utilization statistics\n"
 msgstr "\t-S\tスワップ領域の利用状況\n"
 
-#: sar.c:158
+#: sar.c:164
 #, c-format
 msgid ""
 "\t-u [ ALL ]\n"
@@ -310,59 +353,59 @@ msgstr ""
 "\t-u [ ALL ]\n"
 "\t\tCPU 利用の利用状況\n"
 
-#: sar.c:160
+#: sar.c:166
 #, c-format
 msgid "\t-v\tKernel table statistics\n"
 msgstr "\t-v\tカーネルのテーブル状態\n"
 
-#: sar.c:161
+#: sar.c:167
 #, c-format
 msgid "\t-w\tTask creation and system switching statistics\n"
 msgstr "\t-w\tタスクの作成とシステムスイッチの状態\n"
 
 # , c-format
-#: sar.c:162
+#: sar.c:168
 #, c-format
 msgid "\t-W\tSwapping statistics\n"
 msgstr "\t-W\tスワップの状態\n"
 
 # , c-format
-#: sar.c:163
+#: sar.c:169
 #, c-format
 msgid "\t-y\tTTY device statistics\n"
 msgstr "\t-y\tTTY デバイスの状態\n"
 
-#: sar.c:206
+#: sar.c:212
 #, c-format
 msgid "End of data collecting unexpected\n"
 msgstr "データの収集が予期無く終了しました\n"
 
-#: sar.c:774
+#: sar.c:780
 #, c-format
 msgid "Invalid data format\n"
 msgstr "データ形式が正しくありません\n"
 
-#: sar.c:778
+#: sar.c:784
 #, c-format
 msgid "Using a wrong data collector from a different sysstat version\n"
 msgstr "異なるバージョンの sysstat のデータ収集プログラムによる不正なデータを使っています\n"
 
-#: sar.c:798
+#: sar.c:804
 #, c-format
 msgid "Inconsistent input data\n"
 msgstr "矛盾した入力データです\n"
 
-#: sar.c:1203
+#: sar.c:1225
 #, c-format
 msgid "-f and -o options are mutually exclusive\n"
 msgstr "-f と -o オプションは相互に排他的です\n"
 
-#: sar.c:1209
+#: sar.c:1231
 #, c-format
 msgid "Not reading from a system activity file (use -f option)\n"
 msgstr "システム動作情報ファイルの読み込みがありません (-f オプションを使ってください)\n"
 
-#: sar.c:1310
+#: sar.c:1332
 #, c-format
 msgid "Cannot find the data collector (%s)\n"
 msgstr "データ収集プログラム (%s) が見つかりません\n"

diff --git a/nls/nl.po b/nls/nl.po
index 82043903d78765d5913b59d90c0e3507c04b9268..ce08f67368cb89fd841333136628519d7e8c984f 100644 (file)
--- a/nls/nl.po
+++ b/nls/nl.po
@@ -6,10 +6,10 @@
 # Benno Schulenberg <benno@vertaalt.nl>, 2008, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: sysstat-9.1.4\n"
+"Project-Id-Version: sysstat-9.1.5\n"
 "Report-Msgid-Bugs-To: sysstat <at> orange.fr\n"
-"POT-Creation-Date: 2010-07-24 10:55+0200\n"
-"PO-Revision-Date: 2010-07-31 15:29+0200\n"
+"POT-Creation-Date: 2010-09-04 08:21+0200\n"
+"PO-Revision-Date: 2010-09-13 12:42+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgstr ""
 "[ -A ] [ -I { SUM | CPU | SCPU | ALL } ] [ -u ] [ -P { <cpu>[,...] | ALL } ] [ -V ]\n"
 
 # sar.c:
-#: mpstat.c:530 pidstat.c:1806 sar.c:359
+#: mpstat.c:530 pidstat.c:1806 sar.c:360
 msgid "Average:"
 msgstr "Gemiddeld:"
 
@@ -103,7 +103,7 @@ msgstr ""
 "[ -t ] [ -u ] [ -V ] [ -w ]\n"
 "[ -p { <pid>[,...] | SELF | ALL } ] [ -T { TASK | CHILD | ALL } ]\n"
 
-#: pidstat.c:199 sar.c:977
+#: pidstat.c:199 sar.c:978
 #, c-format
 msgid "Requested activities not available\n"
 msgstr "De gevraagde activiteiten zijn niet beschikbaar\n"
@@ -268,6 +268,7 @@ msgid ""
 "\t\tKeywords are:\n"
 "\t\tCPU\tCPU clock frequency\n"
 "\t\tFAN\tFans speed\n"
+"\t\tIN\tVoltage inputs\n"
 "\t\tTEMP\tDevices temperature\n"
 msgstr ""
 "\t-m { <sleutelwoord> [,...] | ALL }\n"
@@ -275,9 +276,10 @@ msgstr ""
 "\t\tMogelijke sleutelwoorden:\n"
 "\t\tCPU\tprocessorklokfrequentie\n"
 "\t\tFAN\tventilatorsnelheid\n"
-"\t\tTEMP\tapparaattemperatuur\n"
+"\t\tIN\tvoedingsspanningen\n"
+"\t\tTEMP\tapparaattemperaturen\n"
 
-#: sar.c:138
+#: sar.c:139
 #, c-format
 msgid ""
 "\t-n { <keyword> [,...] | ALL }\n"
@@ -324,27 +326,27 @@ msgstr ""
 "\t\tEICMP6\tICMP-verkeer\t(v6) (fouten)\n"
 "\t\tUDP6\tUDP-verkeer\t(v6)\n"
 
-#: sar.c:159
+#: sar.c:160
 #, c-format
 msgid "\t-q\tQueue length and load average statistics\n"
 msgstr "\t-q\tStatistieken van wachtrijlengte en gemiddelde belasting\n"
 
-#: sar.c:160
+#: sar.c:161
 #, c-format
 msgid "\t-r\tMemory utilization statistics\n"
 msgstr "\t-r\tGeheugenbenuttingsstatistieken\n"
 
-#: sar.c:161
+#: sar.c:162
 #, c-format
 msgid "\t-R\tMemory statistics\n"
 msgstr "\t-R\tGeheugenstatistieken\n"
 
-#: sar.c:162
+#: sar.c:163
 #, c-format
 msgid "\t-S\tSwap space utilization statistics\n"
 msgstr "\t-S\tStatistieken van swap-ruimtebenutting\n"
 
-#: sar.c:163
+#: sar.c:164
 #, c-format
 msgid ""
 "\t-u [ ALL ]\n"
@@ -353,57 +355,57 @@ msgstr ""
 "\t-u [ ALL ]\n"
 "\t\tStatistieken van processorbenutting\n"
 
-#: sar.c:165
+#: sar.c:166
 #, c-format
 msgid "\t-v\tKernel table statistics\n"
 msgstr "\t-v\tStatistieken van kerneltabel\n"
 
-#: sar.c:166
+#: sar.c:167
 #, c-format
 msgid "\t-w\tTask creation and system switching statistics\n"
 msgstr "\t-w\tStatistieken van taakcreatie en systeemschakeling\n"
 
-#: sar.c:167
+#: sar.c:168
 #, c-format
 msgid "\t-W\tSwapping statistics\n"
 msgstr "\t-W\tSwapping-statistieken\n"
 
-#: sar.c:168
+#: sar.c:169
 #, c-format
 msgid "\t-y\tTTY device statistics\n"
 msgstr "\t-y\tStatistieken van TTY-apparaat\n"
 
-#: sar.c:211
+#: sar.c:212
 #, c-format
 msgid "End of data collecting unexpected\n"
 msgstr "Onverwacht einde van verzamelen van gegevens\n"
 
-#: sar.c:779
+#: sar.c:780
 #, c-format
 msgid "Invalid data format\n"
 msgstr "Ongeldige gegevensindeling\n"
 
-#: sar.c:783
+#: sar.c:784
 #, c-format
 msgid "Using a wrong data collector from a different sysstat version\n"
 msgstr "Een verkeerde gegevensverzamelaar van een andere sysstat-versie wordt gebruikt\n"
 
-#: sar.c:803
+#: sar.c:804
 #, c-format
 msgid "Inconsistent input data\n"
 msgstr "Inconsistente gegevens gelezen\n"
 
-#: sar.c:1224
+#: sar.c:1225
 #, c-format
 msgid "-f and -o options are mutually exclusive\n"
 msgstr "Opties '-f' en '-o' gaan niet samen.\n"
 
-#: sar.c:1230
+#: sar.c:1231
 #, c-format
 msgid "Not reading from a system activity file (use -f option)\n"
 msgstr "Er wordt geen activiteitsbestand gelezen (gebruik optie '-f')\n"
 
-#: sar.c:1331
+#: sar.c:1332
 #, c-format
 msgid "Cannot find the data collector (%s)\n"
 msgstr "Kan de gegevensverzamelaar niet vinden (%s)\n"

diff --git a/nls/pl.po b/nls/pl.po
index eaf3c894ac1c2ae3131adb6be95a20645cbf0814..fd7e9965662493cb5fcdd5f72c26a631c55dda9a 100644 (file)
--- a/nls/pl.po
+++ b/nls/pl.po
@@ -1,48 +1,69 @@
 # Polish NLS support for the sysstat package.
 # Copyright (C) 1999 Sébastien GODARD <sysstat [at] orange.fr> (msgids).
 # This file is distributed under the same license as the sysstat package.
-# Robert Luberda <robert@debian.org>, 2008 - 2009
+# Robert Luberda <robert@debian.org>, 2008 - 2010
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: sysstat 9.1.1\n"
+"Project-Id-Version: sysstat 9.1.5\n"
 "Report-Msgid-Bugs-To: sysstat <at> orange.fr\n"
-"POT-Creation-Date: 2010-02-21 11:47+0100\n"
-"PO-Revision-Date: 2010-03-14 19:05+0100\n"
+"POT-Creation-Date: 2010-09-04 08:21+0200\n"
+"PO-Revision-Date: 2010-09-14 00:06+0200\n"
 "Last-Translator: Robert Luberda <robert@debian.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: cifsiostat.c:69 iostat.c:79 mpstat.c:86 nfsiostat.c:68 pidstat.c:78
+#: sar.c:88
+#, c-format
+msgid "Usage: %s [ options ] [ <interval> [ <count> ] ]\n"
+msgstr "Użycie: %s [ opcje ] [ <interwał> [ <liczba> ] ]\n"
+
+#: cifsiostat.c:72 nfsiostat.c:71
+#, c-format
+msgid ""
+"Options are:\n"
+"[ -h ] [ -k | -m ] [ -t ] [ -V ]\n"
+msgstr ""
+"Opcje to:\n"
+"[ -h ] [ -k | -m ] [ -t ] [ -V ]\n"
+
 #: common.c:57
 #, c-format
 msgid "sysstat version %s\n"
 msgstr "sysstat w wersji %s\n"
 
-#: ioconf.c:490 rd_stats.c:69 rd_stats.c:1842 sa_common.c:1052 sadc.c:589
-#: sadc.c:598 sadc.c:658
+#: ioconf.c:490 rd_stats.c:72 rd_stats.c:1831 sa_common.c:1052 sadc.c:593
+#: sadc.c:602 sadc.c:662
 #, c-format
 msgid "Cannot open %s: %s\n"
 msgstr "Nie można otworzyć %s: %s\n"
 
-#: iostat.c:81 mpstat.c:86 pidstat.c:77 sar.c:88
+#: iostat.c:82
 #, c-format
-msgid "Usage: %s [ options ] [ <interval> [ <count> ] ]\n"
-msgstr "Użycie: %s [ opcje ] [ <interwał> [ <liczba> ] ]\n"
+msgid ""
+"Options are:\n"
+"[ -c ] [ -d ] [ -N ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ]\n"
+"[ <device> [...] | ALL ] [ -p [ <device> [,...] | ALL ] ] [ --debuginfo ]\n"
+msgstr ""
+"Opcje to:\n"
+"[ -c ] [ -d ] [ -N ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ]\n"
+"[ <urządzenie> [...] | ALL ] [ -p [ <urządzenie> [,...] | ALL ] ] [ --debuginfo ]\n"
 
-#: iostat.c:84
+#: iostat.c:86
 #, c-format
 msgid ""
 "Options are:\n"
-"[ -c ] [ -d ] [ -N ] [ -n ] [ -h ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ]\n"
+"[ -c ] [ -d ] [ -N ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ]\n"
 "[ <device> [...] | ALL ] [ -p [ <device> [,...] | ALL ] ]\n"
 msgstr ""
 "Opcje to:\n"
-"[ -c ] [ -d ] [ -N ] [ -n ] [ -h ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ]\n"
+"[ -c ] [ -d ] [ -N ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ]\n"
 "[ <urządzenie> [...] | ALL ] [ -p [ <urządzenie> [,...] | ALL ] ]\n"
 
-#: iostat.c:340
+#: iostat.c:312
 #, c-format
 msgid "Cannot find disk data\n"
 msgstr "Nie można znaleźć danych o dyskach\n"
@@ -57,32 +78,34 @@ msgstr ""
 "[ -A ] [ -I { SUM | CPU | SCPU | ALL } ] [ -u ] [ -P { <cpu> [,...] | ALL } ] [ -V ]\n"
 
 # sar.c:
-#: mpstat.c:504 pidstat.c:1683 sar.c:354
+#: mpstat.c:530 pidstat.c:1806 sar.c:360
 msgid "Average:"
 msgstr "Średnia:"
 
-#: mpstat.c:847
+#: mpstat.c:873
 #, c-format
 msgid "Not that many processors!\n"
 msgstr "Nie ma aż tylu procesorów!\n"
 
-#: pidstat.c:80
+#: pidstat.c:81
 #, c-format
 msgid ""
 "Options are:\n"
-"[ -C <command> ] [ -d ] [ -h ] [ -I ] [ -l ] [ -r ] [ -t ] [ -u ] [ -V ] [ -w ]\n"
+"[ -C <command> ] [ -d ] [ -h ] [ -I ] [ -l ] [ -r ] [ -s ]\n"
+"[ -t ] [ -u ] [ -V ] [ -w ]\n"
 "[ -p { <pid> [,...] | SELF | ALL } ] [ -T { TASK | CHILD | ALL } ]\n"
 msgstr ""
 "Opcje to:\n"
-"[ -C <polecenie> ] [ -d ] [ -h ] [ -I ] [ -l ] [ -r ] [ -t ] [ -u ] [ -V ] [ -w ]\n"
+"[ -C <polecenie> ] [ -d ] [ -h ] [ -I ] [ -l ] [ -r ] [ -s ]\n"
+"[ -t ] [ -u ] [ -V ] [ -w ]\n"
 "[ -p { <pid> [,...] | SELF | ALL } ] [ -T { TASK | CHILD | ALL } ]\n"
 
-#: pidstat.c:197 sar.c:972
+#: pidstat.c:199 sar.c:978
 #, c-format
 msgid "Requested activities not available\n"
 msgstr "Żądane statystyki nie są dostępne\n"
 
-#: rd_stats.c:1888
+#: rd_stats.c:1877
 #, c-format
 msgid "Cannot handle so many processors!\n"
 msgstr "Zbyt dużo procesorów!\n"
@@ -117,12 +140,12 @@ msgstr "Bieżąca wersja pakietu sysstat nie obsługuje już formatu tego pliku
 msgid "Requested activities not available in file %s\n"
 msgstr "Żądane statystyki nie są dostępne w pliku %s\n"
 
-#: sadc.c:76
+#: sadc.c:81
 #, c-format
 msgid "Usage: %s [ options ] [ <interval> [ <count> ] ] [ <outfile> ]\n"
 msgstr "Użycie: %s [ opcje ] [ <interwał> [ <liczba> ] ] [ <plik_wyjściowy> ]\n"
 
-#: sadc.c:79
+#: sadc.c:84
 #, c-format
 msgid ""
 "Options are:\n"
@@ -133,17 +156,17 @@ msgstr ""
 "[ -C <komentarz> ] [ -F ] [ -L ] [ -V ]\n"
 "[ -S { INT | DISK | IPV6 | POWER | SNMP | XDISK | ALL | XALL } ]\n"
 
-#: sadc.c:199
+#: sadc.c:206
 #, c-format
 msgid "Cannot write data to system activity file: %s\n"
 msgstr "Nie można zapisać danych do pliku aktywności systemu: %s\n"
 
-#: sadc.c:476
+#: sadc.c:480
 #, c-format
 msgid "Cannot write system activity file header: %s\n"
 msgstr "Nie można zapisać nagłówka pliku aktywności systemu: %s\n"
 
-#: sadc.c:752
+#: sadc.c:756
 #, c-format
 msgid "Cannot append data to that file (%s)\n"
 msgstr "Nie można dopisać danych do tego pliku (%s)\n"
@@ -190,18 +213,18 @@ msgstr "Lista aktywności:\n"
 #, c-format
 msgid ""
 "Options are:\n"
-"[ -A ] [ -b ] [ -B ] [ -C ] [ -d ] [ -h ] [ -m ] [ -p ] [ -q ] [ -r ]\n"
+"[ -A ] [ -b ] [ -B ] [ -C ] [ -d ] [ -h ] [ -p ] [ -q ] [ -r ]\n"
 "[ -R ] [ -S ] [ -t ] [ -u [ ALL ] ] [ -v ] [ -V ] [ -w ] [ -W ] [ -y ]\n"
 "[ -I { <int> [,...] | SUM | ALL | XALL } ] [ -P { <cpu> [,...] | ALL } ]\n"
-"[ -n { <keyword> [,...] | ALL } ]\n"
+"[ -m { <keyword> [,...] | ALL } ] [ -n { <keyword> [,...] | ALL } ]\n"
 "[ -o [ <filename> ] | -f [ <filename> ] ]\n"
 "[ -i <interval> ] [ -s [ <hh:mm:ss> ] ] [ -e [ <hh:mm:ss> ] ]\n"
 msgstr ""
 "Opcje to:\n"
-"[ -A ] [ -b ] [ -B ] [ -C ] [ -d ] [ -h ] [ -m ] [ -p ] [ -q ] [ -r ]\n"
+"[ -A ] [ -b ] [ -B ] [ -C ] [ -d ] [ -h ] [ -p ] [ -q ] [ -r ]\n"
 "[ -R ] [ -S ] [ -t ] [ -u [ ALL ] ] [ -v ] [ -V ] [ -w ] [ -W ] [ -y ]\n"
-"[ -I { <przerwanie> [,...] | SUM | ALL | XALL } ] [ -P { <cpu> [,...] | ALL } ]\n"
-"[ -n { <słowo_kluczowe> [,...] | ALL } ]\n"
+"[ -I { <int> [,...] | SUM | ALL | XALL } ] [ -P { <cpu> [,...] | ALL } ]\n"
+"[ -m { <słowo_kluczowe> [,...] | ALL } ] [ -n { <słowo_kluczowe> [,...] | ALL } ]\n"
 "[ -o [ <nazwa_pliku> ] | -f [ <nazwa_pliku> ] ]\n"
 "[ -i <interwał> ] [ -s [ <hh:mm:ss> ] ] [ -e [ <hh:mm:ss> ] ]\n"
 
@@ -236,10 +259,24 @@ msgstr ""
 
 #: sar.c:132
 #, c-format
-msgid "\t-m\tPower management statistics\n"
-msgstr "\t-B\tStatystyki zarządzania energią\n"
+msgid ""
+"\t-m { <keyword> [,...] | ALL }\n"
+"\t\tPower management statistics\n"
+"\t\tKeywords are:\n"
+"\t\tCPU\tCPU clock frequency\n"
+"\t\tFAN\tFans speed\n"
+"\t\tIN\tVoltage inputs\n"
+"\t\tTEMP\tDevices temperature\n"
+msgstr ""
+"\t-m { <słowo_kluczowe> [,...] | ALL }\n"
+"\t\tStatystyki zarządzania pamięcią\n"
+"\t\tDostępne słowa kluczowe:\n"
+"\t\tCPU\tCzęstotliwość zegara CPU\n"
+"\t\tFAN\tPrędkość wentylatorów\n"
+"\t\tIN\tNapięcie wejściowe\n"
+"\t\tTEMP\tTemperatura urządzeń\n"
 
-#: sar.c:133
+#: sar.c:139
 #, c-format
 msgid ""
 "\t-n { <keyword> [,...] | ALL }\n"
@@ -286,27 +323,27 @@ msgstr ""
 "\t\tEICMP6\tRuch ICMP\t(v6) (błędy)\n"
 "\t\tUDP6\tRuch UDP\t(v6)\n"
 
-#: sar.c:154
+#: sar.c:160
 #, c-format
 msgid "\t-q\tQueue length and load average statistics\n"
 msgstr "\t-q\tStatystyki kolejkowania procesów i średniego obciążenia systemu\n"
 
-#: sar.c:155
+#: sar.c:161
 #, c-format
 msgid "\t-r\tMemory utilization statistics\n"
 msgstr "\t-r\tStatystyki wykorzystania pamięci\n"
 
-#: sar.c:156
+#: sar.c:162
 #, c-format
 msgid "\t-R\tMemory statistics\n"
 msgstr "\t-R\tStatystyki pamięci\n"
 
-#: sar.c:157
+#: sar.c:163
 #, c-format
 msgid "\t-S\tSwap space utilization statistics\n"
 msgstr "\t-S\tStatystyki wykorzystania przestrzeni wymiany\n"
 
-#: sar.c:158
+#: sar.c:164
 #, c-format
 msgid ""
 "\t-u [ ALL ]\n"
@@ -315,57 +352,57 @@ msgstr ""
 "\t-u [ ALL ]\n"
 "\t\tStatystyki wykorzystania procesora\n"
 
-#: sar.c:160
+#: sar.c:166
 #, c-format
 msgid "\t-v\tKernel table statistics\n"
 msgstr "\t-v\tStatystyki tabeli jądra\n"
 
-#: sar.c:161
+#: sar.c:167
 #, c-format
 msgid "\t-w\tTask creation and system switching statistics\n"
 msgstr "\t-w\tStatystyki tworzenia zadań i przełączania systemu\n"
 
-#: sar.c:162
+#: sar.c:168
 #, c-format
 msgid "\t-W\tSwapping statistics\n"
 msgstr "\t-W\tStatystyki wymiany\n"
 
-#: sar.c:163
+#: sar.c:169
 #, c-format
 msgid "\t-y\tTTY device statistics\n"
 msgstr "\t-y\tStatystyki terminali\n"
 
-#: sar.c:206
+#: sar.c:212
 #, c-format
 msgid "End of data collecting unexpected\n"
 msgstr "Niespodziewany koniec zbieranych danych\n"
 
-#: sar.c:774
+#: sar.c:780
 #, c-format
 msgid "Invalid data format\n"
 msgstr "Niepoprawny format danych\n"
 
-#: sar.c:778
+#: sar.c:784
 #, c-format
 msgid "Using a wrong data collector from a different sysstat version\n"
 msgstr "Używany program do zbierania danych pochodzi z innej wersji pakietu sysstat\n"
 
-#: sar.c:798
+#: sar.c:804
 #, c-format
 msgid "Inconsistent input data\n"
 msgstr "Niespójne dane wejściowe\n"
 
-#: sar.c:1207
+#: sar.c:1225
 #, c-format
 msgid "-f and -o options are mutually exclusive\n"
 msgstr "Opcje -f i -o się wykluczają\n"
 
-#: sar.c:1213
+#: sar.c:1231
 #, c-format
 msgid "Not reading from a system activity file (use -f option)\n"
 msgstr "Czytanie danych nie z pliku aktywności systemu (proszę użyć opcji -f)\n"
 
-#: sar.c:1314
+#: sar.c:1332
 #, c-format
 msgid "Cannot find the data collector (%s)\n"
 msgstr "Nie można znaleźć programu do zbierania danych (%s)\n"

diff --git a/nls/ru.po b/nls/ru.po
index 9b9e41ab484046d7745d13fbf6d70839b6bc3a70..ae8a05c724b73da5cff429336597b7f700fdf8ab 100644 (file)
--- a/nls/ru.po
+++ b/nls/ru.po
@@ -8,10 +8,10 @@
 # Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: sysstat 9.1.4\n"
+"Project-Id-Version: sysstat 9.1.5\n"
 "Report-Msgid-Bugs-To: sysstat <at> orange.fr\n"
-"POT-Creation-Date: 2010-07-24 10:55+0200\n"
-"PO-Revision-Date: 2010-07-31 08:41+0400\n"
+"POT-Creation-Date: 2010-09-04 08:21+0200\n"
+"PO-Revision-Date: 2010-09-13 19:22+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
 "MIME-Version: 1.0\n"
@@ -83,7 +83,7 @@ msgstr ""
 "[ -A ] [ -I { SUM | CPU | SCPU | ALL } ] [ -u ] [ -P { <ЦП> [,...] | ALL } ] [ -V ]\n"
 
 # sar.c:
-#: mpstat.c:530 pidstat.c:1806 sar.c:359
+#: mpstat.c:530 pidstat.c:1806 sar.c:360
 msgid "Average:"
 msgstr "Среднее:"
 
@@ -105,7 +105,7 @@ msgstr ""
 "[ -t ] [ -u ] [ -V ] [ -w ]\n"
 "[ -p { <pid> [,...] | SELF | ALL } ] [ -T { TASK | CHILD | ALL } ]\n"
 
-#: pidstat.c:199 sar.c:977
+#: pidstat.c:199 sar.c:978
 #, c-format
 msgid "Requested activities not available\n"
 msgstr "Запрошенный показатель недоступен\n"
@@ -270,6 +270,7 @@ msgid ""
 "\t\tKeywords are:\n"
 "\t\tCPU\tCPU clock frequency\n"
 "\t\tFAN\tFans speed\n"
+"\t\tIN\tVoltage inputs\n"
 "\t\tTEMP\tDevices temperature\n"
 msgstr ""
 "\t-m { <ключ_слово> [,...] | ALL }\n"
@@ -277,9 +278,10 @@ msgstr ""
 "\t\tКлючевые слова:\n"
 "\t\tCPU\tчастота работы ЦП\n"
 "\t\tFAN\tскорость вращения вентиляторов\n"
+"\t\tIN\tВходные напряжения\n"
 "\t\tTEMP\tтемпература устройств\n"
 
-#: sar.c:138
+#: sar.c:139
 #, c-format
 msgid ""
 "\t-n { <keyword> [,...] | ALL }\n"
@@ -326,27 +328,27 @@ msgstr ""
 "\t\tEICMP6\tICMP трафик\t(v6) (errors)\n"
 "\t\tUDP6\tUDP трафик\t(v6)\n"
 
-#: sar.c:159
+#: sar.c:160
 #, c-format
 msgid "\t-q\tQueue length and load average statistics\n"
 msgstr "\t-q\tСтатистика по длине и средней загрузке очереди\n"
 
-#: sar.c:160
+#: sar.c:161
 #, c-format
 msgid "\t-r\tMemory utilization statistics\n"
 msgstr "\t-r\tСтатистика по использованию памяти\n"
 
-#: sar.c:161
+#: sar.c:162
 #, c-format
 msgid "\t-R\tMemory statistics\n"
 msgstr "\t-R\tСтатистика по памяти\n"
 
-#: sar.c:162
+#: sar.c:163
 #, c-format
 msgid "\t-S\tSwap space utilization statistics\n"
 msgstr "\t-S\tСтатистика по использованию области подкачки\n"
 
-#: sar.c:163
+#: sar.c:164
 #, c-format
 msgid ""
 "\t-u [ ALL ]\n"
@@ -355,57 +357,57 @@ msgstr ""
 "\t-u [ ALL ]\n"
 "\t\tСтатистика по использованию ЦП\n"
 
-#: sar.c:165
+#: sar.c:166
 #, c-format
 msgid "\t-v\tKernel table statistics\n"
 msgstr "\t-v\tСтатистика по таблице ядра\n"
 
-#: sar.c:166
+#: sar.c:167
 #, c-format
 msgid "\t-w\tTask creation and system switching statistics\n"
 msgstr "\t-w\tСтатистика по созданию задач и системным переключениям\n"
 
-#: sar.c:167
+#: sar.c:168
 #, c-format
 msgid "\t-W\tSwapping statistics\n"
 msgstr "\t-W\tСтатистика по подкачке\n"
 
-#: sar.c:168
+#: sar.c:169
 #, c-format
 msgid "\t-y\tTTY device statistics\n"
 msgstr "\t-y\tСтатистика по устройствам TTY\n"
 
-#: sar.c:211
+#: sar.c:212
 #, c-format
 msgid "End of data collecting unexpected\n"
 msgstr "Неожиданно закончились собираемые данные\n"
 
-#: sar.c:779
+#: sar.c:780
 #, c-format
 msgid "Invalid data format\n"
 msgstr "Неправильный формат данных\n"
 
-#: sar.c:783
+#: sar.c:784
 #, c-format
 msgid "Using a wrong data collector from a different sysstat version\n"
 msgstr "Используется ошибочное средство сбора данных от другой версии sysstat\n"
 
-#: sar.c:803
+#: sar.c:804
 #, c-format
 msgid "Inconsistent input data\n"
 msgstr "Несогласованные входные данные\n"
 
-#: sar.c:1224
+#: sar.c:1225
 #, c-format
 msgid "-f and -o options are mutually exclusive\n"
 msgstr "Параметры -f и -o являются взаимоисключающими\n"
 
-#: sar.c:1230
+#: sar.c:1231
 #, c-format
 msgid "Not reading from a system activity file (use -f option)\n"
 msgstr "Не выполняем чтение из файла системных показателей (используйте параметр -f)\n"
 
-#: sar.c:1331
+#: sar.c:1332
 #, c-format
 msgid "Cannot find the data collector (%s)\n"
 msgstr "Не удалось найти средство сбора данных (%s)\n"

diff --git a/nls/sysstat.pot b/nls/sysstat.pot
index 224461ae48a175be6894258705e2de28a181f9f9..a2a140d6b41def2541c8607dd36ec981517679f9 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: 2010-10-24 21:41+0200\n"
+"POT-Creation-Date: 2010-11-06 15:34+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"
@@ -34,8 +34,8 @@ msgstr ""
 msgid "sysstat version %s\n"
 msgstr ""
 
-#: ioconf.c:490 rd_stats.c:72 rd_stats.c:2145 sa_common.c:1057 sadc.c:608
-#: sadc.c:617 sadc.c:677
+#: ioconf.c:490 rd_stats.c:72 rd_stats.c:2155 sa_common.c:1060 sadc.c:613
+#: sadc.c:622 sadc.c:682
 #, c-format
 msgid "Cannot open %s: %s\n"
 msgstr ""
@@ -92,38 +92,38 @@ msgstr ""
 msgid "Requested activities not available\n"
 msgstr ""
 
-#: rd_stats.c:2191
+#: rd_stats.c:2201
 #, c-format
 msgid "Cannot handle so many processors!\n"
 msgstr ""
 
-#: sa_common.c:866
+#: sa_common.c:869
 #, c-format
 msgid "Error while reading system activity file: %s\n"
 msgstr ""
 
-#: sa_common.c:876
+#: sa_common.c:879
 #, c-format
 msgid "End of system activity file unexpected\n"
 msgstr ""
 
-#: sa_common.c:894
+#: sa_common.c:897
 #, c-format
 msgid "File created using sar/sadc from sysstat version %d.%d.%d"
 msgstr ""
 
-#: sa_common.c:925
+#: sa_common.c:928
 #, c-format
 msgid "Invalid system activity file: %s\n"
 msgstr ""
 
-#: sa_common.c:932
+#: sa_common.c:935
 #, c-format
 msgid ""
 "Current sysstat version can no longer read the format of this file (%#x)\n"
 msgstr ""
 
-#: sa_common.c:1164
+#: sa_common.c:1167
 #, c-format
 msgid "Requested activities not available in file %s\n"
 msgstr ""
@@ -141,27 +141,27 @@ msgid ""
 "[ -S { INT | DISK | IPV6 | POWER | SNMP | XDISK | ALL | XALL } ]\n"
 msgstr ""
 
-#: sadc.c:208
+#: sadc.c:213
 #, c-format
 msgid "Cannot write data to system activity file: %s\n"
 msgstr ""
 
-#: sadc.c:495
+#: sadc.c:500
 #, c-format
 msgid "Cannot write system activity file header: %s\n"
 msgstr ""
 
-#: sadc.c:776
+#: sadc.c:781
 #, c-format
 msgid "Cannot append data to that file (%s)\n"
 msgstr ""
 
-#: sadf.c:85
+#: sadf.c:86
 #, c-format
 msgid "Usage: %s [ options ] [ <interval> [ <count> ] ] [ <datafile> ]\n"
 msgstr ""
 
-#: sadf.c:88
+#: sadf.c:89
 #, c-format
 msgid ""
 "Options are:\n"
@@ -170,27 +170,27 @@ msgid ""
 "[ -- <sar_options> ]\n"
 msgstr ""
 
-#: sadf.c:609
+#: sadf.c:610
 #, c-format
 msgid "System activity data file: %s (%#x)\n"
 msgstr ""
 
-#: sadf.c:618
+#: sadf.c:619
 #, c-format
 msgid "Host: "
 msgstr ""
 
-#: sadf.c:624
+#: sadf.c:625
 #, c-format
 msgid "Size of a long int: %d\n"
 msgstr ""
 
-#: sadf.c:626
+#: sadf.c:627
 #, c-format
 msgid "List of activities:\n"
 msgstr ""
 
-#: sadf.c:638
+#: sadf.c:639
 #, c-format
 msgid "\t[Unknown activity format]"
 msgstr ""

diff --git a/nls/vi.po b/nls/vi.po
index 4ba00d5dce43930655eddb124c02430d6958de02..05289f02a73461d2d301a623867293bd34f59670 100644 (file)
--- a/nls/vi.po
+++ b/nls/vi.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: sysstat 9.1.1\n"
+"Project-Id-Version: sysstat 9.1.5\n"
 "Report-Msgid-Bugs-To: sysstat <at> orange.fr\n"
-"POT-Creation-Date: 2010-02-21 11:47+0100\n"
-"PO-Revision-Date: 2010-03-06 19:48+0930\n"
+"POT-Creation-Date: 2010-09-04 08:21+0200\n"
+"PO-Revision-Date: 2010-10-01 18:09+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -17,36 +17,59 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.8\n"
 
+#: cifsiostat.c:69 iostat.c:79 mpstat.c:86 nfsiostat.c:68 pidstat.c:78
+#: sar.c:88
+#, c-format
+msgid "Usage: %s [ options ] [ <interval> [ <count> ] ]\n"
+msgstr "Sử dụng: %s [ tùy_chọn... ] [ <khoảng> [ <đếm> ] ]\n"
+
+#: cifsiostat.c:72 nfsiostat.c:71
+#, c-format
+msgid ""
+"Options are:\n"
+"[ -h ] [ -k | -m ] [ -t ] [ -V ]\n"
+msgstr ""
+"Tuỳ chọn:\n"
+"[ -h ] [ -k | -m ] [ -t ] [ -V ]\n"
+
 #: common.c:57
 #, c-format
 msgid "sysstat version %s\n"
 msgstr "sysstat phiên bản %s\n"
 
-#: ioconf.c:490 rd_stats.c:69 rd_stats.c:1842 sa_common.c:1052 sadc.c:589
-#: sadc.c:598 sadc.c:658
+#: ioconf.c:490 rd_stats.c:72 rd_stats.c:1831 sa_common.c:1052 sadc.c:593
+#: sadc.c:602 sadc.c:662
 #, c-format
 msgid "Cannot open %s: %s\n"
 msgstr "Không thể mở %s: %s\n"
 
-#: iostat.c:81 mpstat.c:86 pidstat.c:77 sar.c:88
+#: iostat.c:82
 #, c-format
-msgid "Usage: %s [ options ] [ <interval> [ <count> ] ]\n"
-msgstr "Sử dụng: %s [ tùy_chọn... ] [ <khoảng> [ <đếm> ] ]\n"
+msgid ""
+"Options are:\n"
+"[ -c ] [ -d ] [ -N ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ]\n"
+"[ <device> [...] | ALL ] [ -p [ <device> [,...] | ALL ] ] [ --debuginfo ]\n"
+msgstr ""
+"Tuỳ chọn:\n"
+"[ -c ] [ -d ] [ -N ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ]\n"
+"[ <thiết_bị> [...] | ALL ] [ -p [ <thiết_bị> [,...] | ALL ] ] [ --debuginfo ]\n"
+"\n"
+"ALL    tất cả\n"
 
-#: iostat.c:84
+#: iostat.c:86
 #, c-format
 msgid ""
 "Options are:\n"
-"[ -c ] [ -d ] [ -N ] [ -n ] [ -h ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ]\n"
+"[ -c ] [ -d ] [ -N ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ]\n"
 "[ <device> [...] | ALL ] [ -p [ <device> [,...] | ALL ] ]\n"
 msgstr ""
-"Tùy chọn:\n"
-"[ -c ] [ -d ] [ -N ] [ -n ] [ -h ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ]\n"
-"[ <thiết_bị> [ ... ] | ALL ] [ -p [ <thiết_bị> [,...] | ALL ] ]\n"
+"Tuỳ chọn:\n"
+"[ -c ] [ -d ] [ -N ] [ -k | -m ] [ -t ] [ -V ] [ -x ] [ -z ]\n"
+"[ <thiết_bị> [...] | ALL ] [ -p [ <thiết_bị> [,...] | ALL ] ]\n"
 "\n"
-"ALL\ttất cả\n"
+"ALL    tất cả\n"
 
-#: iostat.c:340
+#: iostat.c:312
 #, c-format
 msgid "Cannot find disk data\n"
 msgstr "Không tìm thấy dữ liệu về đĩa\n"
@@ -64,37 +87,40 @@ msgstr ""
 "CPU, cpu\tđơn vị xử lý trung tâm\n"
 "ALL\ttất cả\n"
 
-#: mpstat.c:504 pidstat.c:1683 sar.c:354
+#: mpstat.c:530 pidstat.c:1806 sar.c:360
 msgid "Average:"
 msgstr "Trung bình:"
 
-#: mpstat.c:847
+#: mpstat.c:873
 #, c-format
 msgid "Not that many processors!\n"
 msgstr "Quá nhiều bộ xử lý !\n"
 
-#: pidstat.c:80
+#: pidstat.c:81
 #, c-format
 msgid ""
 "Options are:\n"
-"[ -C <command> ] [ -d ] [ -h ] [ -I ] [ -l ] [ -r ] [ -t ] [ -u ] [ -V ] [ -w ]\n"
+"[ -C <command> ] [ -d ] [ -h ] [ -I ] [ -l ] [ -r ] [ -s ]\n"
+"[ -t ] [ -u ] [ -V ] [ -w ]\n"
 "[ -p { <pid> [,...] | SELF | ALL } ] [ -T { TASK | CHILD | ALL } ]\n"
 msgstr ""
 "Tùy chọn:\n"
-"[ -C <command> ] [ -d ] [ -h ] [ -I ] [ -l ] [ -r ] [ -t ] [ -u ] [ -V ] [ -w ]\n"
+"[ -C <lệnh> ] [ -d ] [ -h ] [ -I ] [ -l ] [ -r ] [ -s ]\n"
+"[ -t ] [ -u ] [ -V ] [ -w ]\n"
 "[ -p { <pid> [,...] | SELF | ALL } ] [ -T { TASK | CHILD | ALL } ]\n"
 "\n"
+"pid        mã số tiến trình\n"
 "SELF\t\tmình\n"
 "ALL\t\ttất cả\n"
 "TASK\tcông việc\n"
 "CHILD\tcon\n"
 
-#: pidstat.c:197 sar.c:972
+#: pidstat.c:199 sar.c:978
 #, c-format
 msgid "Requested activities not available\n"
 msgstr "Hoạt động yêu cầu vẫn không sẵn sàng\n"
 
-#: rd_stats.c:1888
+#: rd_stats.c:1877
 #, c-format
 msgid "Cannot handle so many processors!\n"
 msgstr "Quá nhiều bộ xử lý để xử lý !\n"
@@ -129,12 +155,12 @@ msgstr "Phiên bản sysstat hiện thời không còn có khả năng đọc l
 msgid "Requested activities not available in file %s\n"
 msgstr "Hoạt động đã yêu cầu vẫn không sẵn sàng trong tập tin %s\n"
 
-#: sadc.c:76
+#: sadc.c:81
 #, c-format
 msgid "Usage: %s [ options ] [ <interval> [ <count> ] ] [ <outfile> ]\n"
 msgstr "Sử dụng: %s [ tùy_chọn... ] [ <khoảng> [ <đếm> ] ] [ <tập_tin_kết_xuất> ]\n"
 
-#: sadc.c:79
+#: sadc.c:84
 #, c-format
 msgid ""
 "Options are:\n"
@@ -149,17 +175,17 @@ msgstr ""
 "POWER\tđiện năng\n"
 "ALL\t\ttất cả\n"
 
-#: sadc.c:199
+#: sadc.c:206
 #, c-format
 msgid "Cannot write data to system activity file: %s\n"
 msgstr "Không thể ghi dữ liệu vào tập tin hoạt động hệ thống: %s\n"
 
-#: sadc.c:476
+#: sadc.c:480
 #, c-format
 msgid "Cannot write system activity file header: %s\n"
 msgstr "Không thể ghi phần đầu tập tin hoạt động hệ thống: %s\n"
 
-#: sadc.c:752
+#: sadc.c:756
 #, c-format
 msgid "Cannot append data to that file (%s)\n"
 msgstr "Không thể phụ thêm dữ liệu vào tập tin đó (%s)\n"
@@ -209,19 +235,19 @@ msgstr "Danh sách các hoạt động:\n"
 #, c-format
 msgid ""
 "Options are:\n"
-"[ -A ] [ -b ] [ -B ] [ -C ] [ -d ] [ -h ] [ -m ] [ -p ] [ -q ] [ -r ]\n"
+"[ -A ] [ -b ] [ -B ] [ -C ] [ -d ] [ -h ] [ -p ] [ -q ] [ -r ]\n"
 "[ -R ] [ -S ] [ -t ] [ -u [ ALL ] ] [ -v ] [ -V ] [ -w ] [ -W ] [ -y ]\n"
 "[ -I { <int> [,...] | SUM | ALL | XALL } ] [ -P { <cpu> [,...] | ALL } ]\n"
-"[ -n { <keyword> [,...] | ALL } ]\n"
+"[ -m { <keyword> [,...] | ALL } ] [ -n { <keyword> [,...] | ALL } ]\n"
 "[ -o [ <filename> ] | -f [ <filename> ] ]\n"
 "[ -i <interval> ] [ -s [ <hh:mm:ss> ] ] [ -e [ <hh:mm:ss> ] ]\n"
 msgstr ""
 "Tùy chọn:\n"
-" -A ] [ -b ] [ -B ] [ -C ] [ -d ] [ -h ] [ -m ] [ -p ] [ -q ] [ -r ]\n"
+"[ -A ] [ -b ] [ -B ] [ -C ] [ -d ] [ -h ] [ -p ] [ -q ] [ -r ]\n"
 "[ -R ] [ -S ] [ -t ] [ -u [ ALL ] ] [ -v ] [ -V ] [ -w ] [ -W ] [ -y ]\n"
 "[ -I { <int> [,...] | SUM | ALL | XALL } ] [ -P { <cpu> [,...] | ALL } ]\n"
-"[ -n { <từ_khoá> [,...] | ALL } ]\n"
-"[ -o [ <tên_tập_tin> ] | -f [ <tên_tập_tin> ] ]\n"
+"[ -m { <từ_khoá> [,...] | ALL } ] [ -n { <từ_khoá> [,...] | ALL } ]\n"
+"[ -o [ <tên_tá»\87p> ] | -f [ <tên_tá»\87p> ] ]\n"
 "[ -i <khoảng> ] [ -s [ <hh:mm:ss> ] ] [ -e [ <hh:mm:ss> ] ]\n"
 "n\n"
 "ALL\ttất cả\n"
@@ -269,10 +295,26 @@ msgstr ""
 
 #: sar.c:132
 #, c-format
-msgid "\t-m\tPower management statistics\n"
-msgstr "\t-m\tthống kê quản lý điện năng\n"
+msgid ""
+"\t-m { <keyword> [,...] | ALL }\n"
+"\t\tPower management statistics\n"
+"\t\tKeywords are:\n"
+"\t\tCPU\tCPU clock frequency\n"
+"\t\tFAN\tFans speed\n"
+"\t\tIN\tVoltage inputs\n"
+"\t\tTEMP\tDevices temperature\n"
+msgstr ""
+"\t-m { <từ_khoá> [,...] | ALL }\n"
+"\t\tThống kê về quản lý điện năng\n"
+"\t\tTừ khoá:\n"
+"\t\tCPU\tTần số của đồng hồ CPU\n"
+"\t\tFAN\tTốc độ của quạt điện\n"
+"\t\tIN\tĐầu vào điện áp\n"
+"\t\tTEMP\tNhiệt độ của thiết bị\n"
+"\n"
+"ALL    tất cả\n"
 
-#: sar.c:133
+#: sar.c:139
 #, c-format
 msgid ""
 "\t-n { <keyword> [,...] | ALL }\n"
@@ -323,27 +365,27 @@ msgstr ""
 "\t\tEICMP6\tTrọng tải ICMP\t(v6) (lỗi)\n"
 "\t\tUDP6\tTrọng tải UDP\t(v6)\n"
 
-#: sar.c:154
+#: sar.c:160
 #, c-format
 msgid "\t-q\tQueue length and load average statistics\n"
 msgstr "\t-q\tthống kê về chiều dài hàng đợi và tải trọng trung bình\n"
 
-#: sar.c:155
+#: sar.c:161
 #, c-format
 msgid "\t-r\tMemory utilization statistics\n"
 msgstr "\t-r\tthống kê sử dụng bộ nhớ\n"
 
-#: sar.c:156
+#: sar.c:162
 #, c-format
 msgid "\t-R\tMemory statistics\n"
 msgstr "\t-R\tthống kê bộ nhớ\n"
 
-#: sar.c:157
+#: sar.c:163
 #, c-format
 msgid "\t-S\tSwap space utilization statistics\n"
 msgstr "\t-S\tthống kê vùng trao đổi\n"
 
-#: sar.c:158
+#: sar.c:164
 #, c-format
 msgid ""
 "\t-u [ ALL ]\n"
@@ -354,57 +396,60 @@ msgstr ""
 "\n"
 "ALL\ttất cả\n"
 
-#: sar.c:160
+#: sar.c:166
 #, c-format
 msgid "\t-v\tKernel table statistics\n"
 msgstr "\t-v\tthống kê bảng hạt nhân\n"
 
-#: sar.c:161
+#: sar.c:167
 #, c-format
 msgid "\t-w\tTask creation and system switching statistics\n"
 msgstr "\t-w\tthống kê về tạo công việc và chuyển đổi hệ thống\n"
 
-#: sar.c:162
+#: sar.c:168
 #, c-format
 msgid "\t-W\tSwapping statistics\n"
 msgstr "\t-W\tthống kê trao đổi\n"
 
-#: sar.c:163
+#: sar.c:169
 #, c-format
 msgid "\t-y\tTTY device statistics\n"
 msgstr "\t-y\tthống kê thiết bị TTY\n"
 
-#: sar.c:206
+#: sar.c:212
 #, c-format
 msgid "End of data collecting unexpected\n"
 msgstr "Kết thúc bất thường khi thu thập dữ liệu\n"
 
-#: sar.c:774
+#: sar.c:780
 #, c-format
 msgid "Invalid data format\n"
 msgstr "Định dạng dữ liệu không hợp lệ\n"
 
-#: sar.c:778
+#: sar.c:784
 #, c-format
 msgid "Using a wrong data collector from a different sysstat version\n"
 msgstr "Dùng một bộ thu thập không đúng từ một phiên bản sysstat khác\n"
 
-#: sar.c:798
+#: sar.c:804
 #, c-format
 msgid "Inconsistent input data\n"
 msgstr "Dữ liệu nhập vào không phải thống nhất\n"
 
-#: sar.c:1207
+#: sar.c:1225
 #, c-format
 msgid "-f and -o options are mutually exclusive\n"
 msgstr "Hai tùy chọn « -f » và « -o » loại từ lẫn nhau\n"
 
-#: sar.c:1213
+#: sar.c:1231
 #, c-format
 msgid "Not reading from a system activity file (use -f option)\n"
 msgstr "Không phải đọc từ tập tin hoạt động hệ thống (dùng tùy chọn « -f »)\n"
 
-#: sar.c:1314
+#: sar.c:1332
 #, c-format
 msgid "Cannot find the data collector (%s)\n"
 msgstr "Không tìm thấy bộ thu thập dữ liệu (%s)\n"
+
+#~ msgid "\t-m\tPower management statistics\n"
+#~ msgstr "\t-m\tthống kê quản lý điện năng\n"

diff --git a/nls/zh_CN.po b/nls/zh_CN.po
index 6722c3483c7e9f8c38be21556b1446707ebdfb70..243400fcb9a4bbacae11a2b5a478572317e3f3be 100644 (file)
--- a/nls/zh_CN.po
+++ b/nls/zh_CN.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: sysstat 9.1.3\n"
+"Project-Id-Version: sysstat 9.1.5\n"
 "Report-Msgid-Bugs-To: sysstat <at> orange.fr\n"
-"POT-Creation-Date: 2010-06-26 09:01+0200\n"
-"PO-Revision-Date: 2010-07-06 15:22+0800\n"
+"POT-Creation-Date: 2010-09-04 08:21+0200\n"
+"PO-Revision-Date: 2010-09-19 13:16+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -36,8 +36,8 @@ msgstr ""
 msgid "sysstat version %s\n"
 msgstr "sysstat 版本 %s\n"
 
-#: ioconf.c:490 rd_stats.c:69 rd_stats.c:1842 sa_common.c:1052 sadc.c:586
-#: sadc.c:595 sadc.c:655
+#: ioconf.c:490 rd_stats.c:72 rd_stats.c:1831 sa_common.c:1052 sadc.c:593
+#: sadc.c:602 sadc.c:662
 #, c-format
 msgid "Cannot open %s: %s\n"
 msgstr "无法打开 %s: %s\n"
@@ -78,7 +78,7 @@ msgstr ""
 "选项:\n"
 "[ -A ] [ -I { SUM | CPU | SCPU | ALL } ] [ -u ] [ -P { <cpu> [,...] | ALL } ] [ -V ]\n"
 
-#: mpstat.c:530 pidstat.c:1806 sar.c:354
+#: mpstat.c:530 pidstat.c:1806 sar.c:360
 msgid "Average:"
 msgstr "平均时间:"
 
@@ -100,12 +100,12 @@ msgstr ""
 "[ -t ] [ -u ] [ -V ] [ -w ]\n"
 "[ -p { <进程号> [,...] | SELF | ALL } ] [ -T { TASK | CHILD | ALL } ]\n"
 
-#: pidstat.c:199 sar.c:972
+#: pidstat.c:199 sar.c:978
 #, c-format
 msgid "Requested activities not available\n"
 msgstr "所需的运行记录无法获得\n"
 
-#: rd_stats.c:1888
+#: rd_stats.c:1877
 #, c-format
 msgid "Cannot handle so many processors!\n"
 msgstr "处理器太多，无法处理！\n"
@@ -140,12 +140,12 @@ msgstr "当前版本的 sysstat 已无法读取此文件格式 (%#x)\n"
 msgid "Requested activities not available in file %s\n"
 msgstr "所需的运行记录在此文件 %s 中无法获得\n"
 
-#: sadc.c:76
+#: sadc.c:81
 #, c-format
 msgid "Usage: %s [ options ] [ <interval> [ <count> ] ] [ <outfile> ]\n"
 msgstr "用法: %s [ 选项 ] [ <时间间隔> [ <次数> ] ] [ <输出文件> ]\n"
 
-#: sadc.c:79
+#: sadc.c:84
 #, c-format
 msgid ""
 "Options are:\n"
@@ -156,17 +156,17 @@ msgstr ""
 "[ -C <注释> ] [ -F ] [ -L ] [ -V ]\n"
 "[ -S { INT | DISK | IPV6 | POWER | SNMP | XDISK | ALL | XALL } ]\n"
 
-#: sadc.c:199
+#: sadc.c:206
 #, c-format
 msgid "Cannot write data to system activity file: %s\n"
 msgstr "无法将数据写入系统运行记录文件: %s\n"
 
-#: sadc.c:473
+#: sadc.c:480
 #, c-format
 msgid "Cannot write system activity file header: %s\n"
 msgstr "无法写系统运行记录文件开始部分: %s\n"
 
-#: sadc.c:749
+#: sadc.c:756
 #, c-format
 msgid "Cannot append data to that file (%s)\n"
 msgstr "无法向文件 (%s) 中追加记录\n"
@@ -213,10 +213,10 @@ msgstr "运行记录列表:\n"
 #, c-format
 msgid ""
 "Options are:\n"
-"[ -A ] [ -b ] [ -B ] [ -C ] [ -d ] [ -h ] [ -m ] [ -p ] [ -q ] [ -r ]\n"
+"[ -A ] [ -b ] [ -B ] [ -C ] [ -d ] [ -h ] [ -p ] [ -q ] [ -r ]\n"
 "[ -R ] [ -S ] [ -t ] [ -u [ ALL ] ] [ -v ] [ -V ] [ -w ] [ -W ] [ -y ]\n"
 "[ -I { <int> [,...] | SUM | ALL | XALL } ] [ -P { <cpu> [,...] | ALL } ]\n"
-"[ -n { <keyword> [,...] | ALL } ]\n"
+"[ -m { <keyword> [,...] | ALL } ] [ -n { <keyword> [,...] | ALL } ]\n"
 "[ -o [ <filename> ] | -f [ <filename> ] ]\n"
 "[ -i <interval> ] [ -s [ <hh:mm:ss> ] ] [ -e [ <hh:mm:ss> ] ]\n"
 msgstr ""
@@ -224,7 +224,7 @@ msgstr ""
 "[ -A ] [ -b ] [ -B ] [ -C ] [ -d ] [ -h ] [ -m ] [ -p ] [ -q ] [ -r ]\n"
 "[ -R ] [ -S ] [ -t ] [ -u [ ALL ] ] [ -v ] [ -V ] [ -w ] [ -W ] [ -y ]\n"
 "[ -I { <中断> [,...] | SUM | ALL | XALL } ] [ -P { <cpu> [,...] | ALL } ]\n"
-"[ -n { <关键词> [,...] | ALL } ]\n"
+"[ -m { <关键词> [,...] | ALL } ] [ -n { <关键词> [,...] | ALL } ]\n"
 "[ -o [ <文件名> ] | -f [ <文件名> ] ]\n"
 "[ -i <时间间隔> ] [ -s [ <时:分:秒> ] ] [ -e [ <时:分:秒> ] ]\n"
 
@@ -259,10 +259,24 @@ msgstr ""
 
 #: sar.c:132
 #, c-format
-msgid "\t-m\tPower management statistics\n"
-msgstr "\t-m\t电源管理信息状况\n"
+msgid ""
+"\t-m { <keyword> [,...] | ALL }\n"
+"\t\tPower management statistics\n"
+"\t\tKeywords are:\n"
+"\t\tCPU\tCPU clock frequency\n"
+"\t\tFAN\tFans speed\n"
+"\t\tIN\tVoltage inputs\n"
+"\t\tTEMP\tDevices temperature\n"
+msgstr ""
+"\t-m { <关键词> [,...] | ALL }\n"
+"\t\t电源管理统计信息\n"
+"\t\t关键字:\n"
+"\t\tCPU\tCPU 频率\n"
+"\t\tFAN\t风扇速度\n"
+"\t\tIN\t输入电压\n"
+"\t\tTEMP\t设备温度\n"
 
-#: sar.c:133
+#: sar.c:139
 #, c-format
 msgid ""
 "\t-n { <keyword> [,...] | ALL }\n"
@@ -309,27 +323,27 @@ msgstr ""
 "\t\tEICMP6\tICMP 流\t(v6) (错误)\n"
 "\t\tUDP6\tUDP 流\t(v6)\n"
 
-#: sar.c:154
+#: sar.c:160
 #, c-format
 msgid "\t-q\tQueue length and load average statistics\n"
 msgstr "\t-q\t队列长度和平均负载\n"
 
-#: sar.c:155
+#: sar.c:161
 #, c-format
 msgid "\t-r\tMemory utilization statistics\n"
 msgstr "\t-r\t内存利用率\n"
 
-#: sar.c:156
+#: sar.c:162
 #, c-format
 msgid "\t-R\tMemory statistics\n"
 msgstr "\t-R\t内存状况\n"
 
-#: sar.c:157
+#: sar.c:163
 #, c-format
 msgid "\t-S\tSwap space utilization statistics\n"
 msgstr "\t-S\t交换空间利用率\n"
 
-#: sar.c:158
+#: sar.c:164
 #, c-format
 msgid ""
 "\t-u [ ALL ]\n"
@@ -338,61 +352,64 @@ msgstr ""
 "\t-u [ ALL ]\n"
 "\t\tCPU 利用率\n"
 
-#: sar.c:160
+#: sar.c:166
 #, c-format
 msgid "\t-v\tKernel table statistics\n"
 msgstr "\t-v\tKernel table 状况\n"
 
-#: sar.c:161
+#: sar.c:167
 #, c-format
 msgid "\t-w\tTask creation and system switching statistics\n"
 msgstr "\t-w\t任务创建与系统转换统计信息\n"
 
-#: sar.c:162
+#: sar.c:168
 #, c-format
 msgid "\t-W\tSwapping statistics\n"
 msgstr "\t-W\t交换信息\n"
 
-#: sar.c:163
+#: sar.c:169
 #, c-format
 msgid "\t-y\tTTY device statistics\n"
 msgstr "\t-y\tTTY 设备状况\n"
 
-#: sar.c:206
+#: sar.c:212
 #, c-format
 msgid "End of data collecting unexpected\n"
 msgstr "数据流结尾有未知错误\n"
 
-#: sar.c:774
+#: sar.c:780
 #, c-format
 msgid "Invalid data format\n"
 msgstr "无效的数据格式\n"
 
-#: sar.c:778
+#: sar.c:784
 #, c-format
 msgid "Using a wrong data collector from a different sysstat version\n"
 msgstr "正在使用来自不同版本 sysstat 的错误的数据收集器\n"
 
-#: sar.c:798
+#: sar.c:804
 #, c-format
 msgid "Inconsistent input data\n"
 msgstr "所取数据前后不一致\n"
 
-#: sar.c:1207
+#: sar.c:1225
 #, c-format
 msgid "-f and -o options are mutually exclusive\n"
 msgstr "-f 和 -o 选项不能同时使用\n"
 
-#: sar.c:1213
+#: sar.c:1231
 #, c-format
 msgid "Not reading from a system activity file (use -f option)\n"
 msgstr "无法查看系统活动记录文件 (用 -f 选项)\n"
 
-#: sar.c:1314
+#: sar.c:1332
 #, c-format
 msgid "Cannot find the data collector (%s)\n"
 msgstr "无法找到数据收集器 (%s)\n"
 
+#~ msgid "\t-m\tPower management statistics\n"
+#~ msgstr "\t-m\t电源管理信息状况\n"
+
 #~ msgid "-x and -p options are mutually exclusive\n"
 #~ msgstr "-x 和 -p 选项不能同时使用\n"