Last 22.12 release, waiting for tp

Updated the po files, waiting for translations
peekfd off-by-one patch applied

diff --git a/ChangeLog b/ChangeLog
index 4935be21ddc4b6b52537e1efed135b2561f37da4..d68b895c99b387d48b3526f8b7f80c17ef6050cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Changes in 22.12
+================
+       * In fuser, switched the ipv6 and ipv4 checks around Debian #581604
+       * peekfd configure patch for x86_64 SF#2986027
+       * peekfd works with ARM and MIPS thanks to patch by Arnaud Patard
+       * peekfd off-by-one patch applied SF#1948351
+
 Changes in 22.11
 ================
        * Another attempted at killall -SIGNAME Debian #573924

diff --git a/configure.ac b/configure.ac
index e42dff804e545b15919b1feec0e8ab7dafa18256..b6b6a7d6f1fb2e8c4c59bdd03b9d0262d702d8d8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.61)
-AC_INIT([psmisc],[22.11])
+AC_INIT([psmisc],[22.12])
 AC_CONFIG_SRCDIR([src/comm.h])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_AUX_DIR([config])
@@ -65,9 +65,13 @@ AC_CHECK_MEMBERS([struct user_regs_struct.orig_eax,
                struct user_regs_struct.rax,
                struct user_regs_struct.rdi,
                struct user_regs_struct.rsi,
-               struct user_regs_struct.rdx], [],[], [#include <sys/user.h>])
+               struct user_regs_struct.rdx], [],[],
+    [#include <sys/types.h #include <sys/user.h>])
 AC_CHECK_MEMBERS([struct pt_regs.orig_gpr3,
                struct pt_regs.gpr], [],[], [#include <linux/ptrace.h>])
+AC_CHECK_MEMBERS([struct pt_regs.uregs],[],[], [#include <asm/ptrace.h>])
+AC_CHECK_MEMBERS([struct pt_regs.regs],[],[], [#include <asm/ptrace.h>])
+
 AM_CONDITIONAL(WANT_PEEKFD_I386,
  test $ac_cv_member_struct_user_regs_struct_orig_eax = yes &&
    test $ac_cv_member_struct_user_regs_struct_eax = yes &&
@@ -83,6 +87,10 @@ AM_CONDITIONAL(WANT_PEEKFD_X86_64,
 AM_CONDITIONAL(WANT_PEEKFD_PPC,
    test $ac_cv_member_struct_pt_regs_orig_gpr3 = yes &&
    test $ac_cv_member_struct_pt_regs_gpr = yes )
+AM_CONDITIONAL(WANT_PEEKFD_ARM,
+   test $ac_cv_member_struct_pt_regs_uregs = yes)
+AM_CONDITIONAL(WANT_PEEKFD_MIPS,
+   test $ac_cv_member_struct_pt_regs_regs = yes)
 
 dnl Check for language stuff
 AM_GNU_GETTEXT([external])

diff --git a/po/bg.po b/po/bg.po
index 231f36afef2b2bb2ff3e21a588e73cef78e78d0a..7480f35ddefdafe6997b266c0cd6795e1b4fcc20 100644 (file)
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 22.2pre1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2010-03-28 18:17+1100\n"
+"POT-Creation-Date: 2010-05-29 20:15+1000\n"
 "PO-Revision-Date: 2006-03-07 11:49+0200\n"
 "Last-Translator: Anton Zinoviev <zinoviev@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -100,7 +101,7 @@ msgstr ""
 "Copyright © 1993-2005 Werner Almesberger и Craig Small\n"
 "\n"
 
-#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:89 src/prtstat.c:68
+#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:108 src/prtstat.c:68
 #: src/pstree.c:806
 #, c-format
 msgid ""
@@ -369,24 +370,24 @@ msgstr "Максималният брой имена е %d\n"
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s е празна (не е монтирана?)\n"
 
-#: src/peekfd.c:77
+#: src/peekfd.c:96
 #, c-format
 msgid "Error attaching to pid %i\n"
 msgstr ""
 
-#: src/peekfd.c:85
+#: src/peekfd.c:104
 #, fuzzy, c-format
 msgid "peekfd (PSmisc) %s\n"
 msgstr "pstree (PSmisc) %s\n"
 
-#: src/peekfd.c:87
+#: src/peekfd.c:106
 #, c-format
 msgid ""
 "Copyright (C) 2007 Trent Waddington\n"
 "\n"
 msgstr ""
 
-#: src/peekfd.c:97
+#: src/peekfd.c:116
 #, c-format
 msgid ""
 "Usage: peekfd [-8] [-n] [-c] [-d] [-V] [-h] <pid> [<fd> ..]\n"

diff --git a/po/ca.po b/po/ca.po
index 432af48e6728aa8759c91f632bd082ae6374dec4..dd849dcf3ae991b81dcea4df6ffa766ed153a2e4 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 21.6cvs\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2010-03-28 18:17+1100\n"
+"POT-Creation-Date: 2010-05-29 20:15+1000\n"
 "PO-Revision-Date: 2004-12-08 12:46+0100\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -94,7 +95,7 @@ msgstr ""
 "Copyright (C) 1993-2002 Werner Almesberger i Craig Small\n"
 "\n"
 
-#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:89 src/prtstat.c:68
+#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:108 src/prtstat.c:68
 #: src/pstree.c:806
 #, c-format
 msgid ""
@@ -357,24 +358,24 @@ msgstr "El nombre m
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s és buit (no s'ha muntat?)\n"
 
-#: src/peekfd.c:77
+#: src/peekfd.c:96
 #, c-format
 msgid "Error attaching to pid %i\n"
 msgstr ""
 
-#: src/peekfd.c:85
+#: src/peekfd.c:104
 #, fuzzy, c-format
 msgid "peekfd (PSmisc) %s\n"
 msgstr "pstree (psmisc) %s\n"
 
-#: src/peekfd.c:87
+#: src/peekfd.c:106
 #, c-format
 msgid ""
 "Copyright (C) 2007 Trent Waddington\n"
 "\n"
 msgstr ""
 
-#: src/peekfd.c:97
+#: src/peekfd.c:116
 #, c-format
 msgid ""
 "Usage: peekfd [-8] [-n] [-c] [-d] [-V] [-h] <pid> [<fd> ..]\n"

diff --git a/po/cs.po b/po/cs.po
index 85db77bb16f9b9f51b6ba084e3a27290d0fa4ccc..d21f3e32eb159c8be4083ae3702d8504bc22cd57 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 22.11-pre1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2010-03-28 18:17+1100\n"
+"POT-Creation-Date: 2010-05-29 20:15+1000\n"
 "PO-Revision-Date: 2010-03-28 19:35+0200\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -99,7 +100,7 @@ msgstr ""
 "Copyright © 1993–2010 Werner Almesberger a Craig Small\n"
 "\n"
 
-#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:89 src/prtstat.c:68
+#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:108 src/prtstat.c:68
 #: src/pstree.c:806
 #, c-format
 msgid ""
@@ -361,17 +362,17 @@ msgstr "Maximální počet názvů je %d\n"
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s je prázdný (není připojen?)\n"
 
-#: src/peekfd.c:77
+#: src/peekfd.c:96
 #, c-format
 msgid "Error attaching to pid %i\n"
 msgstr "Chyba při připojování se na PID %i\n"
 
-#: src/peekfd.c:85
+#: src/peekfd.c:104
 #, c-format
 msgid "peekfd (PSmisc) %s\n"
 msgstr "peekfd (PSmisc) %s\n"
 
-#: src/peekfd.c:87
+#: src/peekfd.c:106
 #, c-format
 msgid ""
 "Copyright (C) 2007 Trent Waddington\n"
@@ -380,7 +381,7 @@ msgstr ""
 "Copyright © 2007 Trent Waddington\n"
 "\n"
 
-#: src/peekfd.c:97
+#: src/peekfd.c:116
 #, c-format
 msgid ""
 "Usage: peekfd [-8] [-n] [-c] [-d] [-V] [-h] <pid> [<fd> ..]\n"

diff --git a/po/de.po b/po/de.po
index e2bbcf02598e48a46d41a3d3a219422263b38621..a058cbd3160d5344c7c002256c3baecae8b96c59 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 22.11-pre1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2010-03-28 18:17+1100\n"
+"POT-Creation-Date: 2010-05-29 20:15+1000\n"
 "PO-Revision-Date: 2010-03-28 23:45+0100\n"
 "Last-Translator: Roland Illig <roland.illig@gmx.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -100,7 +101,7 @@ msgstr ""
 "Copyright (C) 1993-2010 Werner Almesberger und Craig Small\n"
 "\n"
 
-#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:89 src/prtstat.c:68
+#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:108 src/prtstat.c:68
 #: src/pstree.c:806
 #, c-format
 msgid ""
@@ -363,17 +364,17 @@ msgstr "Die maximale Anzahl von Namen ist %d\n"
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s ist leer (Dateisystem möglicherweise nicht eingebunden?)\n"
 
-#: src/peekfd.c:77
+#: src/peekfd.c:96
 #, c-format
 msgid "Error attaching to pid %i\n"
 msgstr "Fehler beim Anhängen an PID %i\n"
 
-#: src/peekfd.c:85
+#: src/peekfd.c:104
 #, c-format
 msgid "peekfd (PSmisc) %s\n"
 msgstr "peekfd (PSmisc) %s\n"
 
-#: src/peekfd.c:87
+#: src/peekfd.c:106
 #, c-format
 msgid ""
 "Copyright (C) 2007 Trent Waddington\n"
@@ -382,7 +383,7 @@ msgstr ""
 "Copyright (C) 2007 Trent Waddington\n"
 "\n"
 
-#: src/peekfd.c:97
+#: src/peekfd.c:116
 #, c-format
 msgid ""
 "Usage: peekfd [-8] [-n] [-c] [-d] [-V] [-h] <pid> [<fd> ..]\n"

diff --git a/po/el.po b/po/el.po
index 6e68c0767bb6829d6da65b09d06e7b67b4cd2342..4d0a04b271abd4315a2ab4aab75a5ee706180cd4 100644 (file)
--- a/po/el.po
+++ b/po/el.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc-22.6\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2010-03-28 18:17+1100\n"
+"POT-Creation-Date: 2010-05-29 20:15+1000\n"
 "PO-Revision-Date: 2008-06-15 18:31+0300\n"
 "Last-Translator: Lefteris Dimitroulakis <edimitro@tee.gr>\n"
 "Language-Team: Greek <team@lists.gnome.gr>\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -96,7 +97,7 @@ msgstr ""
 "Copyright (C) 1993-2005 Werner Almesberger και Craig Small\n"
 "\n"
 
-#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:89 src/prtstat.c:68
+#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:108 src/prtstat.c:68
 #: src/pstree.c:806
 #, c-format
 msgid ""
@@ -360,17 +361,17 @@ msgstr "Μέγιστος αριθμός ονομάτων είναι %d\n"
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s είναι άδειο (μή προσαρτημένο ;)\n"
 
-#: src/peekfd.c:77
+#: src/peekfd.c:96
 #, c-format
 msgid "Error attaching to pid %i\n"
 msgstr "Σφάλμα κατά την πρόσδεση στη διεργασία με pid %i\n"
 
-#: src/peekfd.c:85
+#: src/peekfd.c:104
 #, c-format
 msgid "peekfd (PSmisc) %s\n"
 msgstr "peekfd (PSmisc) %s\n"
 
-#: src/peekfd.c:87
+#: src/peekfd.c:106
 #, c-format
 msgid ""
 "Copyright (C) 2007 Trent Waddington\n"
@@ -379,7 +380,7 @@ msgstr ""
 "Copyright (C) 2007 Trent Waddington\n"
 "\n"
 
-#: src/peekfd.c:97
+#: src/peekfd.c:116
 #, c-format
 msgid ""
 "Usage: peekfd [-8] [-n] [-c] [-d] [-V] [-h] <pid> [<fd> ..]\n"

diff --git a/po/eu.po b/po/eu.po
index 787d2dddfd94c5f51c1803da8d73e9ffc8facf0e..8cf31f62eb06d4f1d590328245f9f1fcd5219b08 100644 (file)
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 22.11-pre1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2010-03-28 18:17+1100\n"
+"POT-Creation-Date: 2010-05-29 20:15+1000\n"
 "PO-Revision-Date: 2010-03-29 10:09+0100\n"
 "Last-Translator: Mikel Olasagasti <hey_neken@mundurat.net>\n"
 "Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -98,7 +99,7 @@ msgstr ""
 "Copyright (C) 1993-2010 Werner Almesberger eta Craig Small\n"
 "\n"
 
-#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:89 src/prtstat.c:68
+#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:108 src/prtstat.c:68
 #: src/pstree.c:806
 #, c-format
 msgid ""
@@ -367,17 +368,17 @@ msgstr "Izen kopuru gehiengoa %d da\n"
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s hutsik dago (muntatu gabea?)\n"
 
-#: src/peekfd.c:77
+#: src/peekfd.c:96
 #, c-format
 msgid "Error attaching to pid %i\n"
 msgstr "Errorea %i prozesura atxikitzen\n"
 
-#: src/peekfd.c:85
+#: src/peekfd.c:104
 #, c-format
 msgid "peekfd (PSmisc) %s\n"
 msgstr "peekfd (PSmisc) %s\n"
 
-#: src/peekfd.c:87
+#: src/peekfd.c:106
 #, c-format
 msgid ""
 "Copyright (C) 2007 Trent Waddington\n"
@@ -386,7 +387,7 @@ msgstr ""
 "Copyright (C) 2007 Trent Waddington\n"
 "\n"
 
-#: src/peekfd.c:97
+#: src/peekfd.c:116
 #, c-format
 msgid ""
 "Usage: peekfd [-8] [-n] [-c] [-d] [-V] [-h] <pid> [<fd> ..]\n"
@@ -511,8 +512,8 @@ msgstr ""
 "CPU denborak\n"
 "  Prozesu hau    (erabiltzailea sistema gonbidatua blkio): %6.2f %6.2f %6.2f "
 "%6.2f\n"
-"  Seme prozesuak (erabiltzailea sistema gonbidatua):       %6.2f %6.2f %"
-"6.2f\n"
+"  Seme prozesuak (erabiltzailea sistema gonbidatua):       %6.2f %6.2f "
+"%6.2f\n"
 
 #: src/prtstat.c:189
 #, c-format

diff --git a/po/fi.po b/po/fi.po
index d7ba8d1c8c3169599773bea237c7b93c40f22f36..f42872be7b60bde2718f088de9fb16fd761cea6c 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 22.11-pre1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2010-03-28 18:17+1100\n"
+"POT-Creation-Date: 2010-05-29 20:15+1000\n"
 "PO-Revision-Date: 2010-04-05 09:56+0200\n"
 "Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -103,7 +104,7 @@ msgstr ""
 "Copyright © 1993-2010 Werner Almesberger ja Craig Small\n"
 "\n"
 
-#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:89 src/prtstat.c:68
+#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:108 src/prtstat.c:68
 #: src/pstree.c:806
 #, c-format
 msgid ""
@@ -376,17 +377,17 @@ msgstr "Suurin sallittu määrä nimiä on %d\n"
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s on tyhjä (ei liitetty?)\n"
 
-#: src/peekfd.c:77
+#: src/peekfd.c:96
 #, c-format
 msgid "Error attaching to pid %i\n"
 msgstr "Virhe liityttäessä pid-tunnukseen %i\n"
 
-#: src/peekfd.c:85
+#: src/peekfd.c:104
 #, c-format
 msgid "peekfd (PSmisc) %s\n"
 msgstr "peekfd (PSmisc) %s\n"
 
-#: src/peekfd.c:87
+#: src/peekfd.c:106
 #, c-format
 msgid ""
 "Copyright (C) 2007 Trent Waddington\n"
@@ -395,7 +396,7 @@ msgstr ""
 "Copyright © 2007 Trent Waddington\n"
 "\n"
 
-#: src/peekfd.c:97
+#: src/peekfd.c:116
 #, c-format
 msgid ""
 "Usage: peekfd [-8] [-n] [-c] [-d] [-V] [-h] <pid> [<fd> ..]\n"
@@ -519,8 +520,8 @@ msgid ""
 "  Child processes (user system guest):       %6.2f %6.2f %6.2f\n"
 msgstr ""
 "Suoritinajat\n"
-"  Tämä prosessi    (käyttäjä järjestelmä vieras blkio): %6.2f %6.2f %6.2f %"
-"6.2f\n"
+"  Tämä prosessi    (käyttäjä järjestelmä vieras blkio): %6.2f %6.2f %6.2f "
+"%6.2f\n"
 "  Lapsiprosessit (käyttäjä järjestelmä vieras blkio): %6.2f %6.2f %6.2f\n"
 
 #: src/prtstat.c:189

diff --git a/po/fr.po b/po/fr.po
index 262c245f11f3b1a6ba8c3e92bfefd4982b9ff949..4730903738e22531364761ec902d3c583fa4c522 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,10 +10,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc-22.11-pre1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2010-03-28 18:17+1100\n"
+"POT-Creation-Date: 2010-05-29 20:15+1000\n"
 "PO-Revision-Date: 2010-03-29 15:15+0200\n"
 "Last-Translator: Frédéric Marchal <fmarchal@perso.be>\n"
 "Language-Team: French <traduc@traduc.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -104,7 +105,7 @@ msgstr ""
 "Copyright (C) 1993-2010 Werner Almesberger et Craig Small\n"
 "\n"
 
-#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:89 src/prtstat.c:68
+#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:108 src/prtstat.c:68
 #: src/pstree.c:806
 #, c-format
 msgid ""
@@ -374,17 +375,17 @@ msgstr "Le nombre maximum de noms est %d\n"
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s est vide (pas monté ?)\n"
 
-#: src/peekfd.c:77
+#: src/peekfd.c:96
 #, c-format
 msgid "Error attaching to pid %i\n"
 msgstr "Erreur lors de l'attachement au pid %i\n"
 
-#: src/peekfd.c:85
+#: src/peekfd.c:104
 #, c-format
 msgid "peekfd (PSmisc) %s\n"
 msgstr "peekfd (PSmisc) %s\n"
 
-#: src/peekfd.c:87
+#: src/peekfd.c:106
 #, c-format
 msgid ""
 "Copyright (C) 2007 Trent Waddington\n"
@@ -393,7 +394,7 @@ msgstr ""
 "Copyright (C) 2007 Trent Waddington\n"
 "\n"
 
-#: src/peekfd.c:97
+#: src/peekfd.c:116
 #, c-format
 msgid ""
 "Usage: peekfd [-8] [-n] [-c] [-d] [-V] [-h] <pid> [<fd> ..]\n"
@@ -516,8 +517,8 @@ msgid ""
 "  Child processes (user system guest):       %6.2f %6.2f %6.2f\n"
 msgstr ""
 "Temps CPU\n"
-"  Ce processus   (utilisateur système invité blkio): %6.2f %6.2f %6.2f %"
-"6.2f\n"
+"  Ce processus   (utilisateur système invité blkio): %6.2f %6.2f %6.2f "
+"%6.2f\n"
 "  Processus fils (utilisateur système invitéà:       %6.2f %6.2f %6.2f\n"
 
 #: src/prtstat.c:189

diff --git a/po/hu.po b/po/hu.po
index ab0fe727e643b1ce83865f38228ae33122c376b9..393324af0d129b52e0b1700e6ba68071277d1178 100644 (file)
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 22.8rc1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2010-03-28 18:17+1100\n"
+"POT-Creation-Date: 2010-05-29 20:15+1000\n"
 "PO-Revision-Date: 2009-07-19 03:53+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -100,7 +101,7 @@ msgstr ""
 "Copyright (C) 1993-2005 Werner Almesberger és Craig Small\n"
 "\n"
 
-#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:89 src/prtstat.c:68
+#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:108 src/prtstat.c:68
 #: src/pstree.c:806
 #, c-format
 msgid ""
@@ -365,17 +366,17 @@ msgstr "A nevek maximális száma %d\n"
 msgid "%s is empty (not mounted ?)\n"
 msgstr "a(z) %s üres (nincs csatlakoztatva?)\n"
 
-#: src/peekfd.c:77
+#: src/peekfd.c:96
 #, c-format
 msgid "Error attaching to pid %i\n"
 msgstr "Hiba a csatlakozás közben a(z) %i folyamatazonosítóhoz\n"
 
-#: src/peekfd.c:85
+#: src/peekfd.c:104
 #, c-format
 msgid "peekfd (PSmisc) %s\n"
 msgstr "peekfd (PSmisc) %s\n"
 
-#: src/peekfd.c:87
+#: src/peekfd.c:106
 #, c-format
 msgid ""
 "Copyright (C) 2007 Trent Waddington\n"
@@ -384,7 +385,7 @@ msgstr ""
 "Copyright (C) 2007 Trent Waddington\n"
 "\n"
 
-#: src/peekfd.c:97
+#: src/peekfd.c:116
 #, c-format
 msgid ""
 "Usage: peekfd [-8] [-n] [-c] [-d] [-V] [-h] <pid> [<fd> ..]\n"

diff --git a/po/id.po b/po/id.po
index 429eefc6bdbd6b320cc1e923904b8c5fb761ee6a..c625435f24a7489fdb78299aff9c5b4aa95c9c2a 100644 (file)
--- a/po/id.po
+++ b/po/id.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 22.11-pre1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2010-03-28 18:17+1100\n"
+"POT-Creation-Date: 2010-05-29 20:15+1000\n"
 "PO-Revision-Date: 2010-03-28 19:30+0700\n"
 "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -97,7 +98,7 @@ msgstr ""
 "Hak Cipta (C) 1993-2010 Werner Almesberger dan Craid Small\n"
 "\n"
 
-#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:89 src/prtstat.c:68
+#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:108 src/prtstat.c:68
 #: src/pstree.c:806
 #, c-format
 msgid ""
@@ -365,17 +366,17 @@ msgstr "Jumlah maksimal dari nama adalah %d\n"
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s adalah kosong (belum dimount ?)\n"
 
-#: src/peekfd.c:77
+#: src/peekfd.c:96
 #, c-format
 msgid "Error attaching to pid %i\n"
 msgstr "Error mengattach ke pid %i\n"
 
-#: src/peekfd.c:85
+#: src/peekfd.c:104
 #, c-format
 msgid "peekfd (PSmisc) %s\n"
 msgstr "peekfd (PSmisc) %s\n"
 
-#: src/peekfd.c:87
+#: src/peekfd.c:106
 #, c-format
 msgid ""
 "Copyright (C) 2007 Trent Waddington\n"
@@ -384,7 +385,7 @@ msgstr ""
 "Hak Cipta (C) 2008 Trent Waddington\n"
 "\n"
 
-#: src/peekfd.c:97
+#: src/peekfd.c:116
 #, c-format
 msgid ""
 "Usage: peekfd [-8] [-n] [-c] [-d] [-V] [-h] <pid> [<fd> ..]\n"

diff --git a/po/it.po b/po/it.po
index c6c4ff344458e456ff80682a5d3888ab9c480f35..ab78fd9d038c038447a7ca2975f8d6b34ecb946d 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 22.8rc1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2010-03-28 18:17+1100\n"
+"POT-Creation-Date: 2010-05-29 20:15+1000\n"
 "PO-Revision-Date: 2009-07-15 13:47+0100\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -94,7 +95,7 @@ msgstr ""
 "Copyright (C) 1993-2005 Werner Almesberger e Craig Small\n"
 "\n"
 
-#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:89 src/prtstat.c:68
+#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:108 src/prtstat.c:68
 #: src/pstree.c:806
 #, c-format
 msgid ""
@@ -361,17 +362,17 @@ msgstr "Il massimo numero di nomi è %d\n"
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s è vuoto (non montato?)\n"
 
-#: src/peekfd.c:77
+#: src/peekfd.c:96
 #, c-format
 msgid "Error attaching to pid %i\n"
 msgstr "Errore nel collegarsi al pid %i\n"
 
-#: src/peekfd.c:85
+#: src/peekfd.c:104
 #, c-format
 msgid "peekfd (PSmisc) %s\n"
 msgstr "peekfd (PSmisc) %s\n"
 
-#: src/peekfd.c:87
+#: src/peekfd.c:106
 #, c-format
 msgid ""
 "Copyright (C) 2007 Trent Waddington\n"
@@ -381,7 +382,7 @@ msgstr ""
 "\n"
 
 # FIXME
-#: src/peekfd.c:97
+#: src/peekfd.c:116
 #, c-format
 msgid ""
 "Usage: peekfd [-8] [-n] [-c] [-d] [-V] [-h] <pid> [<fd> ..]\n"

diff --git a/po/ja.po b/po/ja.po
index 555383937a2c90339382a44a1a7481d1679387b4..dd2ebd2bf826c0a45dbaf7a5d26839d78cfba7ec 100644 (file)
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 22.2pre1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2010-03-28 18:17+1100\n"
+"POT-Creation-Date: 2010-05-29 20:15+1000\n"
 "PO-Revision-Date: 2006-03-20 10:31+0900\n"
 "Last-Translator: GOTO Masanori <gotom@debian.or.jp>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -98,7 +99,7 @@ msgstr ""
 "Copyright (C) 1993-2005 Werner Almesberger and Craig Small\n"
 "\n"
 
-#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:89 src/prtstat.c:68
+#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:108 src/prtstat.c:68
 #: src/pstree.c:806
 #, c-format
 msgid ""
@@ -362,24 +363,24 @@ msgstr "̾
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s ¤Ï¶õ¥Ç¥£¥ì¥¯¥È¥ê (¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤Ê¤¤?)\n"
 
-#: src/peekfd.c:77
+#: src/peekfd.c:96
 #, c-format
 msgid "Error attaching to pid %i\n"
 msgstr ""
 
-#: src/peekfd.c:85
+#: src/peekfd.c:104
 #, fuzzy, c-format
 msgid "peekfd (PSmisc) %s\n"
 msgstr "pstree (PSmisc) %s\n"
 
-#: src/peekfd.c:87
+#: src/peekfd.c:106
 #, c-format
 msgid ""
 "Copyright (C) 2007 Trent Waddington\n"
 "\n"
 msgstr ""
 
-#: src/peekfd.c:97
+#: src/peekfd.c:116
 #, c-format
 msgid ""
 "Usage: peekfd [-8] [-n] [-c] [-d] [-V] [-h] <pid> [<fd> ..]\n"

diff --git a/po/nb.po b/po/nb.po
index 5f293c425d584a9a793a6d21bfa72a27b8efca5d..873607f87e5b34f6eaf1fd58b661b7eab3a5e31a 100644 (file)
--- a/po/nb.po
+++ b/po/nb.po
@@ -22,10 +22,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 22.2pre1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2010-03-28 18:17+1100\n"
+"POT-Creation-Date: 2010-05-29 20:15+1000\n"
 "PO-Revision-Date: 2006-03-07 12:01+0100\n"
 "Last-Translator: Trond Endrestøl <Trond.Endrestol@fagskolen.gjovik.no>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -113,7 +114,7 @@ msgstr ""
 "Copyright (C) 1993-2005 Werner Almesberger og Craig Small\n"
 "\n"
 
-#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:89 src/prtstat.c:68
+#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:108 src/prtstat.c:68
 #: src/pstree.c:806
 #, c-format
 msgid ""
@@ -377,24 +378,24 @@ msgstr "Maksimalt antall navn er %d\n"
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s er tom (ikke montert?)\n"
 
-#: src/peekfd.c:77
+#: src/peekfd.c:96
 #, c-format
 msgid "Error attaching to pid %i\n"
 msgstr ""
 
-#: src/peekfd.c:85
+#: src/peekfd.c:104
 #, fuzzy, c-format
 msgid "peekfd (PSmisc) %s\n"
 msgstr "pstree (psmisc) %s\n"
 
-#: src/peekfd.c:87
+#: src/peekfd.c:106
 #, c-format
 msgid ""
 "Copyright (C) 2007 Trent Waddington\n"
 "\n"
 msgstr ""
 
-#: src/peekfd.c:97
+#: src/peekfd.c:116
 #, c-format
 msgid ""
 "Usage: peekfd [-8] [-n] [-c] [-d] [-V] [-h] <pid> [<fd> ..]\n"

diff --git a/po/nl.po b/po/nl.po
index d329da39e912e695b5d3f65440654dcbf22c6b76..c23c7af73fbeb277b6090d41b8749f97fccf1811 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc-22.11-pre1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2010-03-28 18:17+1100\n"
+"POT-Creation-Date: 2010-05-29 20:15+1000\n"
 "PO-Revision-Date: 2010-04-04 12:18+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -103,7 +104,7 @@ msgstr ""
 "Copyright (C) 1993-2010 Werner Almesberger en Craig Small\n"
 "\n"
 
-#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:89 src/prtstat.c:68
+#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:108 src/prtstat.c:68
 #: src/pstree.c:806
 #, c-format
 msgid ""
@@ -365,17 +366,17 @@ msgstr "Het maximum aantal namen is %d\n"
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s is leeg -- misschien niet aangekoppeld?\n"
 
-#: src/peekfd.c:77
+#: src/peekfd.c:96
 #, c-format
 msgid "Error attaching to pid %i\n"
 msgstr "Fout tijdens aanhechten aan PID %i\n"
 
-#: src/peekfd.c:85
+#: src/peekfd.c:104
 #, c-format
 msgid "peekfd (PSmisc) %s\n"
 msgstr "peekfd (PSmisc) %s\n"
 
-#: src/peekfd.c:87
+#: src/peekfd.c:106
 #, c-format
 msgid ""
 "Copyright (C) 2007 Trent Waddington\n"
@@ -384,7 +385,7 @@ msgstr ""
 "Copyright (C) 2007 Trent Waddington\n"
 "\n"
 
-#: src/peekfd.c:97
+#: src/peekfd.c:116
 #, c-format
 msgid ""
 "Usage: peekfd [-8] [-n] [-c] [-d] [-V] [-h] <pid> [<fd> ..]\n"

diff --git a/po/pl.po b/po/pl.po
index f46e8eed8e42d4627459a0047dfc3eec579c5f7a..de539db93487c47d57291dfabc6ca8a5e5543d90 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 22.11-pre1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2010-03-28 18:17+1100\n"
+"POT-Creation-Date: 2010-05-29 20:15+1000\n"
 "PO-Revision-Date: 2010-03-28 19:24+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -97,7 +98,7 @@ msgstr ""
 "Copyright (C) 1993-2010 Werner Almesberger i Craig Small\n"
 "\n"
 
-#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:89 src/prtstat.c:68
+#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:108 src/prtstat.c:68
 #: src/pstree.c:806
 #, c-format
 msgid ""
@@ -363,17 +364,17 @@ msgstr "Maksymalna liczba nazw to %d\n"
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s jest pusty (nie podmontowany?)\n"
 
-#: src/peekfd.c:77
+#: src/peekfd.c:96
 #, c-format
 msgid "Error attaching to pid %i\n"
 msgstr "B³±d podczas pod³±czania do procesu %i\n"
 
-#: src/peekfd.c:85
+#: src/peekfd.c:104
 #, c-format
 msgid "peekfd (PSmisc) %s\n"
 msgstr "peekfd (PSmisc) %s\n"
 
-#: src/peekfd.c:87
+#: src/peekfd.c:106
 #, c-format
 msgid ""
 "Copyright (C) 2007 Trent Waddington\n"
@@ -382,7 +383,7 @@ msgstr ""
 "Copyright (C) 2007 Trent Waddington\n"
 "\n"
 
-#: src/peekfd.c:97
+#: src/peekfd.c:116
 #, c-format
 msgid ""
 "Usage: peekfd [-8] [-n] [-c] [-d] [-V] [-h] <pid> [<fd> ..]\n"
@@ -505,8 +506,8 @@ msgid ""
 "  Child processes (user system guest):       %6.2f %6.2f %6.2f\n"
 msgstr ""
 "Czasy procesora\n"
-"  Ten proces      (u¿ytkownika systemowy go¶cinny blkio): %6.2f %6.2f %6.2f %"
-"6.2f\n"
+"  Ten proces      (u¿ytkownika systemowy go¶cinny blkio): %6.2f %6.2f %6.2f "
+"%6.2f\n"
 "  Procesy potomne (u¿ytkownika systemowy go¶cinny:        %6.2f %6.2f %6.2f\n"
 
 #: src/prtstat.c:189

diff --git a/po/psmisc.pot b/po/psmisc.pot
index 33ec75cf8c03bc693b3859bb2cea075669ba107c..afc95e483ac186aaf6b37ec98d0fc2933ea32e97 100644 (file)
--- a/po/psmisc.pot
+++ b/po/psmisc.pot
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2010-03-28 18:17+1100\n"
+"POT-Creation-Date: 2010-05-29 20:15+1000\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,7 +69,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:89 src/prtstat.c:68
+#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:108 src/prtstat.c:68
 #: src/pstree.c:806
 #, c-format
 msgid ""
@@ -295,24 +296,24 @@ msgstr ""
 msgid "%s is empty (not mounted ?)\n"
 msgstr ""
 
-#: src/peekfd.c:77
+#: src/peekfd.c:96
 #, c-format
 msgid "Error attaching to pid %i\n"
 msgstr ""
 
-#: src/peekfd.c:85
+#: src/peekfd.c:104
 #, c-format
 msgid "peekfd (PSmisc) %s\n"
 msgstr ""
 
-#: src/peekfd.c:87
+#: src/peekfd.c:106
 #, c-format
 msgid ""
 "Copyright (C) 2007 Trent Waddington\n"
 "\n"
 msgstr ""
 
-#: src/peekfd.c:97
+#: src/peekfd.c:116
 #, c-format
 msgid ""
 "Usage: peekfd [-8] [-n] [-c] [-d] [-V] [-h] <pid> [<fd> ..]\n"

diff --git a/po/pt.po b/po/pt.po
index e9bcf2494149a3103680a3427a4900e66fcda0a7..73e71311106fcd6e6c3a4f0e3891992bf2dd6572 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 1.0\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2010-03-28 18:17+1100\n"
+"POT-Creation-Date: 2010-05-29 20:15+1000\n"
 "PO-Revision-Date: 2001-10-28 22:14-0200\n"
 "Last-Translator: Edesio Costa e Silva <edesio+psmisc@ieee.org>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
@@ -66,7 +67,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:89 src/prtstat.c:68
+#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:108 src/prtstat.c:68
 #: src/pstree.c:806
 #, fuzzy, c-format
 msgid ""
@@ -300,24 +301,24 @@ msgstr "N
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s está vazio (não está montado?)\n"
 
-#: src/peekfd.c:77
+#: src/peekfd.c:96
 #, c-format
 msgid "Error attaching to pid %i\n"
 msgstr ""
 
-#: src/peekfd.c:85
+#: src/peekfd.c:104
 #, fuzzy, c-format
 msgid "peekfd (PSmisc) %s\n"
 msgstr "fuser (psmisc) %s\n"
 
-#: src/peekfd.c:87
+#: src/peekfd.c:106
 #, c-format
 msgid ""
 "Copyright (C) 2007 Trent Waddington\n"
 "\n"
 msgstr ""
 
-#: src/peekfd.c:97
+#: src/peekfd.c:116
 #, c-format
 msgid ""
 "Usage: peekfd [-8] [-n] [-c] [-d] [-V] [-h] <pid> [<fd> ..]\n"

diff --git a/po/ro.po b/po/ro.po
index 3ce2a5c002421c2adc3d7752965ba29aa32ff32b..6e880ea7b2a79c07c72a2e7fbf416a9182b3a64a 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc-21.6pre1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2010-03-28 18:17+1100\n"
+"POT-Creation-Date: 2010-05-29 20:15+1000\n"
 "PO-Revision-Date: 2005-02-24 12:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -72,7 +73,7 @@ msgstr ""
 "Copyright (C) 1993-2002 Werner Almesberger ºi Craig Small\n"
 "\n"
 
-#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:89 src/prtstat.c:68
+#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:108 src/prtstat.c:68
 #: src/pstree.c:806
 #, c-format
 msgid ""
@@ -335,24 +336,24 @@ msgstr "Num
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s este gol (nu este montat ?)\n"
 
-#: src/peekfd.c:77
+#: src/peekfd.c:96
 #, c-format
 msgid "Error attaching to pid %i\n"
 msgstr ""
 
-#: src/peekfd.c:85
+#: src/peekfd.c:104
 #, fuzzy, c-format
 msgid "peekfd (PSmisc) %s\n"
 msgstr "pstree (psmisc) %s\n"
 
-#: src/peekfd.c:87
+#: src/peekfd.c:106
 #, c-format
 msgid ""
 "Copyright (C) 2007 Trent Waddington\n"
 "\n"
 msgstr ""
 
-#: src/peekfd.c:97
+#: src/peekfd.c:116
 #, c-format
 msgid ""
 "Usage: peekfd [-8] [-n] [-c] [-d] [-V] [-h] <pid> [<fd> ..]\n"

diff --git a/po/ru.po b/po/ru.po
index 88720c97546786287a3baff11b50d085a20b58ab..d320fb7f3b8ca8503076e9f1c6c31729a2385b53 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,16 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 22.11-pre1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2010-03-28 18:17+1100\n"
+"POT-Creation-Date: 2010-05-29 20:15+1000\n"
 "PO-Revision-Date: 2010-03-28 19:36+0400\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: src/fuser.c:105
 #, c-format
@@ -104,7 +105,7 @@ msgstr ""
 "Copyright (C) 1993-2010 Werner Almesberger and Craig Small\n"
 "\n"
 
-#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:89 src/prtstat.c:68
+#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:108 src/prtstat.c:68
 #: src/pstree.c:806
 #, c-format
 msgid ""
@@ -373,17 +374,17 @@ msgstr "Количество имён не может превышать %d\n"
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s пуст (не смонтирован?)\n"
 
-#: src/peekfd.c:77
+#: src/peekfd.c:96
 #, c-format
 msgid "Error attaching to pid %i\n"
 msgstr "Ошибка присоединения к процессу с pid %i\n"
 
-#: src/peekfd.c:85
+#: src/peekfd.c:104
 #, c-format
 msgid "peekfd (PSmisc) %s\n"
 msgstr "peekfd (PSmisc) %s\n"
 
-#: src/peekfd.c:87
+#: src/peekfd.c:106
 #, c-format
 msgid ""
 "Copyright (C) 2007 Trent Waddington\n"
@@ -392,7 +393,7 @@ msgstr ""
 "Copyright (C) 2007 Trent Waddington\n"
 "\n"
 
-#: src/peekfd.c:97
+#: src/peekfd.c:116
 #, c-format
 msgid ""
 "Usage: peekfd [-8] [-n] [-c] [-d] [-V] [-h] <pid> [<fd> ..]\n"
@@ -515,8 +516,8 @@ msgid ""
 "  Child processes (user system guest):       %6.2f %6.2f %6.2f\n"
 msgstr ""
 "Процессорное время\n"
-"  Этот процесс      (польз. систем. гостевое blkio): %6.2f %6.2f %6.2f %"
-"6.2f\n"
+"  Этот процесс      (польз. систем. гостевое blkio): %6.2f %6.2f %6.2f "
+"%6.2f\n"
 "  Дочерние процессы (польз. систем. гостевое):       %6.2f %6.2f %6.2f\n"
 
 #: src/prtstat.c:189

diff --git a/po/sv.po b/po/sv.po
index d40293a0ffb80fdbd3fed28b525d32d13681a543..44226bb487fa5c79cf499efd97f0f57ba811b771 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 22.10\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2010-03-28 18:17+1100\n"
+"POT-Creation-Date: 2010-05-29 20:15+1000\n"
 "PO-Revision-Date: 2010-01-08 10:49+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -96,7 +97,7 @@ msgstr ""
 "Copyright © 1993-2010 Werner Almesberger och Craig Small\n"
 "\n"
 
-#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:89 src/prtstat.c:68
+#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:108 src/prtstat.c:68
 #: src/pstree.c:806
 #, c-format
 msgid ""
@@ -361,17 +362,17 @@ msgstr "Maximalt antal namn är %d\n"
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s är tom (inte monterad?)\n"
 
-#: src/peekfd.c:77
+#: src/peekfd.c:96
 #, c-format
 msgid "Error attaching to pid %i\n"
 msgstr "Fel vid koppling till pid %i\n"
 
-#: src/peekfd.c:85
+#: src/peekfd.c:104
 #, c-format
 msgid "peekfd (PSmisc) %s\n"
 msgstr "peekfd (PSmisc) %s\n"
 
-#: src/peekfd.c:87
+#: src/peekfd.c:106
 #, c-format
 msgid ""
 "Copyright (C) 2007 Trent Waddington\n"
@@ -380,7 +381,7 @@ msgstr ""
 "Copyright © 2007 Trent Waddington\n"
 "\n"
 
-#: src/peekfd.c:97
+#: src/peekfd.c:116
 #, c-format
 msgid ""
 "Usage: peekfd [-8] [-n] [-c] [-d] [-V] [-h] <pid> [<fd> ..]\n"

diff --git a/po/vi.po b/po/vi.po
index c86938f025452938da4bbf07424b5acc8b3b9d93..6c65197674f20992992b6f5030e0f0fa593a09e2 100644 (file)
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 22.11-pre1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2010-03-28 18:17+1100\n"
+"POT-Creation-Date: 2010-05-29 20:15+1000\n"
 "PO-Revision-Date: 2010-03-29 21:25+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,7 +49,8 @@ msgstr ""
 "có tên đưa ra.\n"
 "\n"
 "  -a,--all              cũng hiển thị các tập tin không dùng\n"
-"  -i,--interactive      hỏi trước khi ép buộc (bị bỏ qua mà không có « -k »)\n"
+"  -i,--interactive      hỏi trước khi ép buộc (bị bỏ qua mà không có « -k "
+"»)\n"
 "  -k,--kill             buộc kết thúc mỗi tiến trình đang truy cập đến tập "
 "tin có tên đưa ra\n"
 "  -l,--list-signals     liệt kê những tên tín hiệu vẫn sẵn sàng\n"
@@ -98,7 +100,7 @@ msgstr ""
 "Tác quyền © năm 1993-2010 của Werner Almesberger và Craig Small\n"
 "\n"
 
-#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:89 src/prtstat.c:68
+#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:108 src/prtstat.c:68
 #: src/pstree.c:806
 #, c-format
 msgid ""
@@ -362,17 +364,17 @@ msgstr "Số tên tối đa là %d\n"
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s trống (lắp chưa?)\n"
 
-#: src/peekfd.c:77
+#: src/peekfd.c:96
 #, c-format
 msgid "Error attaching to pid %i\n"
 msgstr "Gặp lỗi khi đính kèm đến PID %i\n"
 
-#: src/peekfd.c:85
+#: src/peekfd.c:104
 #, c-format
 msgid "peekfd (PSmisc) %s\n"
 msgstr "peekfd (PSmisc) %s\n"
 
-#: src/peekfd.c:87
+#: src/peekfd.c:106
 #, c-format
 msgid ""
 "Copyright (C) 2007 Trent Waddington\n"
@@ -381,7 +383,7 @@ msgstr ""
 "Tác quyền © năm 2007 của Trent Waddington\n"
 "\n"
 
-#: src/peekfd.c:97
+#: src/peekfd.c:116
 #, c-format
 msgid ""
 "Usage: peekfd [-8] [-n] [-c] [-d] [-V] [-h] <pid> [<fd> ..]\n"
@@ -561,7 +563,8 @@ msgstr "Phải cung cấp ít nhất một PID (mã số tiến trình)."
 #, c-format
 msgid "/proc is not mounted, cannot stat /proc/self/stat.\n"
 msgstr ""
-"Chưa gắn kết « /proc » thì không lấy được trạng thái về « /proc/self/stat ».\n"
+"Chưa gắn kết « /proc » thì không lấy được trạng thái về « /proc/self/stat "
+"».\n"
 
 #: src/pstree.c:774
 #, c-format

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0cb8e07894d745e05792f40b2aab1fd5dabf2ef8..b64659804ee50adcc0ac2d83ba359a4fabbf7be4 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 22.6\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2010-03-28 18:17+1100\n"
+"POT-Creation-Date: 2010-05-29 20:15+1000\n"
 "PO-Revision-Date: 2007-11-06 21:28+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -95,7 +96,7 @@ msgstr ""
 "版权所有 © 1993-2005 Werner Almesberger 和 Craig Small\n"
 "\n"
 
-#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:89 src/prtstat.c:68
+#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:108 src/prtstat.c:68
 #: src/pstree.c:806
 #, c-format
 msgid ""
@@ -354,17 +355,17 @@ msgstr "最大名字数量是 %d\n"
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s 是空的 (未挂载?)\n"
 
-#: src/peekfd.c:77
+#: src/peekfd.c:96
 #, c-format
 msgid "Error attaching to pid %i\n"
 msgstr "帮定%i号进程时发生错误\n"
 
-#: src/peekfd.c:85
+#: src/peekfd.c:104
 #, c-format
 msgid "peekfd (PSmisc) %s\n"
 msgstr "peekfd (PSmisc) %s\n"
 
-#: src/peekfd.c:87
+#: src/peekfd.c:106
 #, c-format
 msgid ""
 "Copyright (C) 2007 Trent Waddington\n"
@@ -373,7 +374,7 @@ msgstr ""
 "版权所有 © 2007 Trent Waddington\n"
 "\n"
 
-#: src/peekfd.c:97
+#: src/peekfd.c:116
 #, c-format
 msgid ""
 "Usage: peekfd [-8] [-n] [-c] [-d] [-V] [-h] <pid> [<fd> ..]\n"

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7b8a2fca2d4071c4f7a27f5b2192b28a2315a32f..474a0ca52b4da9edecbb1a6d627449036cce432c 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 22.6\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2010-03-28 18:17+1100\n"
+"POT-Creation-Date: 2010-05-29 20:15+1000\n"
 "PO-Revision-Date: 2009-03-23 23:10+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -95,7 +96,7 @@ msgstr ""
 "著作權 © 1993-2005 Werner Almesberger 與 Craig Small\n"
 "\n"
 
-#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:89 src/prtstat.c:68
+#: src/fuser.c:138 src/killall.c:680 src/peekfd.c:108 src/prtstat.c:68
 #: src/pstree.c:806
 #, c-format
 msgid ""
@@ -355,17 +356,17 @@ msgstr "名稱的最大數量為 %d\n"
 msgid "%s is empty (not mounted ?)\n"
 msgstr "%s 是空的 (尚未掛載？)\n"
 
-#: src/peekfd.c:77
+#: src/peekfd.c:96
 #, c-format
 msgid "Error attaching to pid %i\n"
 msgstr "附加到 pid %i 時發生錯誤\n"
 
-#: src/peekfd.c:85
+#: src/peekfd.c:104
 #, c-format
 msgid "peekfd (PSmisc) %s\n"
 msgstr "peekfd (PSmisc) %s\n"
 
-#: src/peekfd.c:87
+#: src/peekfd.c:106
 #, c-format
 msgid ""
 "Copyright (C) 2007 Trent Waddington\n"
@@ -374,7 +375,7 @@ msgstr ""
 "著作權 © 2007 Trent Waddington\n"
 "\n"
 
-#: src/peekfd.c:97
+#: src/peekfd.c:116
 #, c-format
 msgid ""
 "Usage: peekfd [-8] [-n] [-c] [-d] [-V] [-h] <pid> [<fd> ..]\n"

diff --git a/src/Makefile.am b/src/Makefile.am
index d53907284b9715237ea186b50f9619feedaf12bb..a7898a2b361dd9b4c6f6f6251b66dd0bb8e2138a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,6 +14,15 @@ if WANT_PEEKFD_PPC
   bin_PROGRAMS += peekfd
   AM_CFLAGS += -DPPC
 endif
+if WANT_PEEKFD_ARM
+  bin_PROGRAMS += peekfd
+  AM_CFLAGS += -DARM
+endif
+if WANT_PEEKFD_MIPS
+  bin_PROGRAMS += peekfd
+  AM_CFLAGS += -DMIPS
+endif
+
 
 fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h
 

diff --git a/src/fuser.c b/src/fuser.c
index 25dd9fd16a8bdbea42a624d2a50f4f1fd23010b2..f748c91aeb6a0197fe504bd3accd166ecf63bda2 100644 (file)
--- a/src/fuser.c
+++ b/src/fuser.c
@@ -1056,7 +1056,7 @@ int main(int argc, char *argv[])
        if (ipv4_only && ipv6_only)
                usage(_
                      ("You cannot search for only IPv4 and only IPv6 sockets at the same time"));
-       if (!ipv4_only) {
+       if (!ipv6_only) {
 #endif
                if (tcp_connection_list != NULL)
                        find_net_sockets(&match_inodes, tcp_connection_list,
@@ -1066,7 +1066,7 @@ int main(int argc, char *argv[])
                                         "udp", netdev);
 #ifdef WITH_IPV6
        }
-       if (!ipv6_only) {
+       if (!ipv4_only) {
                if (tcp6_connection_list != NULL)
                        find_net6_sockets(&match_inodes, tcp6_connection_list,
                                          "tcp", netdev);
@@ -1489,7 +1489,7 @@ kill_matched_proc(struct procs *proc_head, const opt_type opts,
                  const int sig_number)
 {
        struct procs *pptr;
-  pid_t *mypid;
+  pid_t mypid;
 
   mypid = getpid();
 

diff --git a/src/peekfd.c b/src/peekfd.c
index 64ee5465f2db08582955601f50ed076ea6d66f29..2c30f25c207e6f5e29aca1ebd456303e46adbee9 100644 (file)
--- a/src/peekfd.c
+++ b/src/peekfd.c
@@ -27,6 +27,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/syscall.h>
+#include <asm/ptrace.h>
 #include <byteswap.h>
 #include <endian.h>
 #include <sys/user.h>
@@ -54,6 +55,24 @@
        #define REG_PARAM1 orig_gpr3
        #define REG_PARAM2 gpr[4]
        #define REG_PARAM3 gpr[5]
+#elif defined(ARM)
+#ifndef __ARM_EABI__
+#error arm oabi not supported
+#endif
+       #define REG_ORIG_ACCUM ARM_r7
+       #define REG_ACCUM ARM_r0
+       #define REG_PARAM1 ARM_ORIG_r0
+       #define REG_PARAM2 ARM_r1
+       #define REG_PARAM3 ARM_r2
+#elif defined(MIPS)
+#ifndef MIPSEL
+#error only little endian supported
+#endif
+       #define REG_ORIG_ACCUM regs[3]
+       #define REG_ACCUM regs[2]
+       #define REG_PARAM1 regs[4]
+       #define REG_PARAM2 regs[5]
+       #define REG_PARAM3 regs[6]
 #ifndef PT_ORIG_R3
        #define PT_ORIG_R3 34
 #endif
@@ -180,7 +199,7 @@ int main(int argc, char **argv)
       numfds = argc - optind;
       fds = malloc(sizeof(int) * numfds);
          for (i = 0; i < numfds; i++)
-               fds[i] = atoi(argv[optind + i]);
+               fds[i] = atoi(argv[optind + i + 1]);
     }
 
        attach(target_pid);
@@ -208,6 +227,17 @@ int main(int argc, char **argv)
                        regs.gpr[4] = ptrace(PTRACE_PEEKUSER, pid, 4 * PT_R4, 0);
                        regs.gpr[5] = ptrace(PTRACE_PEEKUSER, pid, 4 * PT_R5, 0);
                        regs.orig_gpr3 = ptrace(PTRACE_PEEKUSER, pid, 4 * PT_ORIG_R3, 0);
+#elif defined(ARM)
+                       struct pt_regs regs;
+                       ptrace(PTRACE_GETREGS, pid, 0, &regs);
+#elif defined(MIPS)
+                       struct pt_regs regs;
+                       long pc = ptrace(PTRACE_PEEKUSER, pid, 64, 0);
+                       regs.regs[2] = ptrace(PTRACE_PEEKUSER,pid,2,0);
+                       regs.regs[3] = ptrace(PTRACE_PEEKTEXT, pid, pc - 8, 0) & 0xffff;
+                       regs.regs[4] = ptrace(PTRACE_PEEKUSER,pid,4,0);
+                       regs.regs[5] = ptrace(PTRACE_PEEKUSER,pid,5,0);
+                       regs.regs[6] = ptrace(PTRACE_PEEKUSER,pid,6,0);
 #else
                        struct user_regs_struct regs;
                        ptrace(PTRACE_GETREGS, pid, 0, &regs);