release 21.8 with fixed fuser return code

diff --git a/ChangeLog b/ChangeLog
index 15bfe7833c5764a7f49b59ac4881faafdfd251bc..59c35cafd49c01f574a2f9cdca1d76ec75d5c9fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Changes in 21.8
+===============
+       * fuser returns 1 if no match found like before.
+       * fuser.1 spells behavior correctly Debian: #337190
+
+
 Changes in 21.7
 ===============
        * Upgraded SELinux code to new api, thanks to Chris PeBenito

diff --git a/configure.in b/configure.in
index dc084e74fc5727a3dc63aba2b4bb140eac413844..40796d4d592ff3e8aa496dc6ef8f8f8faca50588 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([psmisc],[21.7-pre1])
+AC_INIT([psmisc],[21.8])
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR([src/comm.h])
 AC_CONFIG_HEADER([config.h])

diff --git a/doc/fuser.1 b/doc/fuser.1
index 5d8076760026fb59b14b6aa5f1a51ade578b88f6..edf5461f56307616b900381237b72ec405adc4c5 100644 (file)
--- a/doc/fuser.1
+++ b/doc/fuser.1
@@ -1,4 +1,4 @@
-.TH FUSER 1 2005-09-13 "Linux" "User Commands"
+.TH FUSER 1 2005-11-05 "Linux" "User Commands"
 .SH NAME
 fuser \- identify processes using files or sockets
 .SH SYNOPSIS
@@ -50,7 +50,7 @@ found, \fBfuser\fP returns zero.
 In order to look up processes using TCP and UDP sockets, the corresponding
 name space has to be selected with the \fB\-n\fP option. By default
 \fBfuser\fP will look in both IPv6 and IPv4 sockets. To change the default,
-behavour, use the \fB\-4\fP and \fB\-6\fP options. The socket(s) can
+behavior, use the \fB\-4\fP and \fB\-6\fP options. The socket(s) can
 be specified by the local and remote port, and the remote address. All fields
 are optional, but commas in front of missing fields must be present:
 

diff --git a/po/ca.po b/po/ca.po
index acfcf5e5ded34f3830c5534aa3e33b62f656d4ce..8ad77cf5ceb747028829632cf1c88be320e36999 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 21.6cvs\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2005-10-07 17:24+1000\n"
+"POT-Creation-Date: 2005-11-05 15:19+1100\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"
@@ -170,7 +170,7 @@ msgid ""
 "       fuser -V\n"
 "Show which processes use the named files, sockets, or filesystems.\n"
 "\n"
-"     -a        display unused files too\n"
+"    -a        display unused files too\n"
 "    -c        mounted FS\n"
 "    -f        silently ignored (for POSIX compatibility)\n"
 "    -i        ask before killing (ignored without -k)\n"
@@ -248,7 +248,7 @@ msgstr ""
 
 #: src/fuser.c:435
 #, c-format
-msgid "Uknown local port AF %d\n"
+msgid "Unknown local port AF %d\n"
 msgstr ""
 
 #: src/fuser.c:484 src/fuser.c:534
@@ -256,35 +256,35 @@ msgstr ""
 msgid "Cannot open protocol file: %s"
 msgstr ""
 
-#: src/fuser.c:657
+#: src/fuser.c:641
 msgid "Namespace option requires an argument."
 msgstr ""
 
-#: src/fuser.c:666
+#: src/fuser.c:650
 msgid "Invalid namespace name"
 msgstr ""
 
-#: src/fuser.c:718
+#: src/fuser.c:702
 msgid "You can only use files with mountpoint option"
 msgstr ""
 
-#: src/fuser.c:738
+#: src/fuser.c:722
 msgid "No process specification given"
 msgstr ""
 
-#: src/fuser.c:743
+#: src/fuser.c:727
 msgid "You cannot use the mounted and mountpoint flags together"
 msgstr ""
 
-#: src/fuser.c:750
+#: src/fuser.c:734
 msgid "all option cannot be used with silent option."
 msgstr ""
 
-#: src/fuser.c:753
-msgid "You cannot search for only IPv4 and only IPv6 sockets a the same time"
+#: src/fuser.c:737
+msgid "You cannot search for only IPv4 and only IPv6 sockets at the same time"
 msgstr ""
 
-#: src/fuser.c:783
+#: src/fuser.c:771
 #, c-format
 msgid ""
 "\n"
@@ -293,21 +293,21 @@ msgstr ""
 "\n"
 "%*s USUARI      PID ACCÉS  ORDRE\n"
 
-#: src/fuser.c:807 src/fuser.c:832
+#: src/fuser.c:796 src/fuser.c:821
 msgid "(unknown)"
 msgstr ""
 
-#: src/fuser.c:892
+#: src/fuser.c:882
 #, c-format
 msgid "Cannot stat file %s: %s\n"
 msgstr ""
 
-#: src/fuser.c:983
+#: src/fuser.c:973
 #, c-format
 msgid "Cannot open /etc/mtab: %s\n"
 msgstr ""
 
-#: src/fuser.c:1044
+#: src/fuser.c:1034
 #, c-format
 msgid "Kill process %d ? (y/N) "
 msgstr "Voleu matar el procés %d? (s/N)"
@@ -335,6 +335,8 @@ msgid ""
 "    -n     sort output by PID\n"
 "    -p     show PIDs; implies -c\n"
 "    -u     show uid transitions\n"
+"    -U     use UTF-8 (Unicode) line drawing characters\n"
+"    -V     display version information\n"
 msgstr ""
 "Forma d'ús: pstree [ -a ] [ -c ] [ -h | -H pid ] [ -l ] [ -n ] [ -p ] [ -"
 "u ]\n"
@@ -352,18 +354,16 @@ msgstr ""
 "    -p     mostra els PID; implica -c\n"
 "    -u     mostra transicions de uid\n"
 
-#: src/pstree.c:760
+#: src/pstree.c:762
 #, fuzzy, c-format
 msgid "    -Z     show SELinux security contexts\n"
 msgstr ""
 "    -s     mostra els SID de Flask\n"
 "    -x     mostra els contextes de seguretat de Flask\n"
 
-#: src/pstree.c:763
+#: src/pstree.c:765
 #, fuzzy, c-format
 msgid ""
-"    -U     use UTF-8 (Unicode) line drawing characters\n"
-"    -V     display version information\n"
 "    PID    start at this PID; default is 1 (init)\n"
 "    USER   show only trees rooted at processes of this user\n"
 "\n"

diff --git a/po/de.po b/po/de.po
index 1107521ebbc577bc176309b5adf2dcb324e6033e..ac5405a809589c860c4641c3fbb07226e346406a 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 20.1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2005-10-07 17:24+1000\n"
+"POT-Creation-Date: 2005-11-05 15:19+1100\n"
 "PO-Revision-Date: 2004-11-02 13:36-0500\n"
 "Last-Translator: Wolfgang Schorer <wcc@wolfgangs.com>\n"
 "Language-Team: woolfy <woolfy@users.sourceforge.net>\n"
@@ -144,7 +144,7 @@ msgid ""
 "       fuser -V\n"
 "Show which processes use the named files, sockets, or filesystems.\n"
 "\n"
-"     -a        display unused files too\n"
+"    -a        display unused files too\n"
 "    -c        mounted FS\n"
 "    -f        silently ignored (for POSIX compatibility)\n"
 "    -i        ask before killing (ignored without -k)\n"
@@ -219,7 +219,7 @@ msgstr ""
 
 #: src/fuser.c:435
 #, c-format
-msgid "Uknown local port AF %d\n"
+msgid "Unknown local port AF %d\n"
 msgstr ""
 
 #: src/fuser.c:484 src/fuser.c:534
@@ -227,56 +227,56 @@ msgstr ""
 msgid "Cannot open protocol file: %s"
 msgstr ""
 
-#: src/fuser.c:657
+#: src/fuser.c:641
 msgid "Namespace option requires an argument."
 msgstr ""
 
-#: src/fuser.c:666
+#: src/fuser.c:650
 msgid "Invalid namespace name"
 msgstr ""
 
-#: src/fuser.c:718
+#: src/fuser.c:702
 msgid "You can only use files with mountpoint option"
 msgstr ""
 
-#: src/fuser.c:738
+#: src/fuser.c:722
 msgid "No process specification given"
 msgstr ""
 
-#: src/fuser.c:743
+#: src/fuser.c:727
 msgid "You cannot use the mounted and mountpoint flags together"
 msgstr ""
 
-#: src/fuser.c:750
+#: src/fuser.c:734
 msgid "all option cannot be used with silent option."
 msgstr ""
 
-#: src/fuser.c:753
-msgid "You cannot search for only IPv4 and only IPv6 sockets a the same time"
+#: src/fuser.c:737
+msgid "You cannot search for only IPv4 and only IPv6 sockets at the same time"
 msgstr ""
 
-#: src/fuser.c:783
+#: src/fuser.c:771
 #, c-format
 msgid ""
 "\n"
 "%*s USER        PID ACCESS COMMAND\n"
 msgstr ""
 
-#: src/fuser.c:807 src/fuser.c:832
+#: src/fuser.c:796 src/fuser.c:821
 msgid "(unknown)"
 msgstr ""
 
-#: src/fuser.c:892
+#: src/fuser.c:882
 #, c-format
 msgid "Cannot stat file %s: %s\n"
 msgstr ""
 
-#: src/fuser.c:983
+#: src/fuser.c:973
 #, c-format
 msgid "Cannot open /etc/mtab: %s\n"
 msgstr ""
 
-#: src/fuser.c:1044
+#: src/fuser.c:1034
 #, fuzzy, c-format
 msgid "Kill process %d ? (y/N) "
 msgstr "Prozess %d abbrechen? (y/n) "
@@ -304,18 +304,18 @@ msgid ""
 "    -n     sort output by PID\n"
 "    -p     show PIDs; implies -c\n"
 "    -u     show uid transitions\n"
+"    -U     use UTF-8 (Unicode) line drawing characters\n"
+"    -V     display version information\n"
 msgstr ""
 
-#: src/pstree.c:760
+#: src/pstree.c:762
 #, c-format
 msgid "    -Z     show SELinux security contexts\n"
 msgstr ""
 
-#: src/pstree.c:763
+#: src/pstree.c:765
 #, c-format
 msgid ""
-"    -U     use UTF-8 (Unicode) line drawing characters\n"
-"    -V     display version information\n"
 "    PID    start at this PID; default is 1 (init)\n"
 "    USER   show only trees rooted at processes of this user\n"
 "\n"

diff --git a/po/eu.po b/po/eu.po
index 3337f3e550a14b4bfc3d1ef8d3f7778e0cc5ca87..b11a08f1d9f3d3b4d212d9487ee2e1279e9c20a8 100644 (file)
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 21.6pre1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2005-10-07 17:24+1000\n"
+"POT-Creation-Date: 2005-11-05 15:19+1100\n"
 "PO-Revision-Date: 2005-02-23 14:55+0100\n"
 "Last-Translator: Mikel Olasagasti <hey_neken@mundurat.net>\n"
 "Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n"
@@ -174,7 +174,7 @@ msgid ""
 "       fuser -V\n"
 "Show which processes use the named files, sockets, or filesystems.\n"
 "\n"
-"     -a        display unused files too\n"
+"    -a        display unused files too\n"
 "    -c        mounted FS\n"
 "    -f        silently ignored (for POSIX compatibility)\n"
 "    -i        ask before killing (ignored without -k)\n"
@@ -253,7 +253,7 @@ msgstr ""
 
 #: src/fuser.c:435
 #, c-format
-msgid "Uknown local port AF %d\n"
+msgid "Unknown local port AF %d\n"
 msgstr ""
 
 #: src/fuser.c:484 src/fuser.c:534
@@ -261,35 +261,35 @@ msgstr ""
 msgid "Cannot open protocol file: %s"
 msgstr ""
 
-#: src/fuser.c:657
+#: src/fuser.c:641
 msgid "Namespace option requires an argument."
 msgstr ""
 
-#: src/fuser.c:666
+#: src/fuser.c:650
 msgid "Invalid namespace name"
 msgstr ""
 
-#: src/fuser.c:718
+#: src/fuser.c:702
 msgid "You can only use files with mountpoint option"
 msgstr ""
 
-#: src/fuser.c:738
+#: src/fuser.c:722
 msgid "No process specification given"
 msgstr ""
 
-#: src/fuser.c:743
+#: src/fuser.c:727
 msgid "You cannot use the mounted and mountpoint flags together"
 msgstr ""
 
-#: src/fuser.c:750
+#: src/fuser.c:734
 msgid "all option cannot be used with silent option."
 msgstr ""
 
-#: src/fuser.c:753
-msgid "You cannot search for only IPv4 and only IPv6 sockets a the same time"
+#: src/fuser.c:737
+msgid "You cannot search for only IPv4 and only IPv6 sockets at the same time"
 msgstr ""
 
-#: src/fuser.c:783
+#: src/fuser.c:771
 #, c-format
 msgid ""
 "\n"
@@ -298,21 +298,21 @@ msgstr ""
 "\n"
 "%*s ERABILTZAILEA      PID SARRERA KOMANDOA\n"
 
-#: src/fuser.c:807 src/fuser.c:832
+#: src/fuser.c:796 src/fuser.c:821
 msgid "(unknown)"
 msgstr ""
 
-#: src/fuser.c:892
+#: src/fuser.c:882
 #, c-format
 msgid "Cannot stat file %s: %s\n"
 msgstr ""
 
-#: src/fuser.c:983
+#: src/fuser.c:973
 #, c-format
 msgid "Cannot open /etc/mtab: %s\n"
 msgstr ""
 
-#: src/fuser.c:1044
+#: src/fuser.c:1034
 #, c-format
 msgid "Kill process %d ? (y/N) "
 msgstr "%d prozesua hil? (y/N) "
@@ -340,6 +340,8 @@ msgid ""
 "    -n     sort output by PID\n"
 "    -p     show PIDs; implies -c\n"
 "    -u     show uid transitions\n"
+"    -U     use UTF-8 (Unicode) line drawing characters\n"
+"    -V     display version information\n"
 msgstr ""
 "erabilera: pstree [ -a ] [ -c ] [ -h | -H pid ] [ -l ] [ -n ] [ -p ] [ -u ]\n"
 "              [ -A | -G | -U ] [ pid | erabiltzailea]\n"
@@ -356,18 +358,16 @@ msgstr ""
 "    -p     erakutsi PIDak; -c erabiltzea esan nahi du\n"
 "    -u     erakutsi uid transizioak\n"
 
-#: src/pstree.c:760
+#: src/pstree.c:762
 #, fuzzy, c-format
 msgid "    -Z     show SELinux security contexts\n"
 msgstr ""
 "    -s     erakutsi SID flaskoaok\n"
 "    -x     erakutsi seguritate testuinguru flaskoak\n"
 
-#: src/pstree.c:763
+#: src/pstree.c:765
 #, fuzzy, c-format
 msgid ""
-"    -U     use UTF-8 (Unicode) line drawing characters\n"
-"    -V     display version information\n"
 "    PID    start at this PID; default is 1 (init)\n"
 "    USER   show only trees rooted at processes of this user\n"
 "\n"

diff --git a/po/fi.po b/po/fi.po
index ddc148a9ca590c81e0f4afaa3b1937a0e0a69734..e71689abcbbd80449c13982a44784eec78564d4a 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 21.5\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2005-10-07 17:24+1000\n"
+"POT-Creation-Date: 2005-11-05 15:19+1100\n"
 "PO-Revision-Date: 2004-10-29 15:14+0300\n"
 "Last-Translator: Lars Wirzenius <liw@iki.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -147,7 +147,7 @@ msgid ""
 "       fuser -V\n"
 "Show which processes use the named files, sockets, or filesystems.\n"
 "\n"
-"     -a        display unused files too\n"
+"    -a        display unused files too\n"
 "    -c        mounted FS\n"
 "    -f        silently ignored (for POSIX compatibility)\n"
 "    -i        ask before killing (ignored without -k)\n"
@@ -225,7 +225,7 @@ msgstr ""
 
 #: src/fuser.c:435
 #, c-format
-msgid "Uknown local port AF %d\n"
+msgid "Unknown local port AF %d\n"
 msgstr ""
 
 #: src/fuser.c:484 src/fuser.c:534
@@ -233,56 +233,56 @@ msgstr ""
 msgid "Cannot open protocol file: %s"
 msgstr ""
 
-#: src/fuser.c:657
+#: src/fuser.c:641
 msgid "Namespace option requires an argument."
 msgstr ""
 
-#: src/fuser.c:666
+#: src/fuser.c:650
 msgid "Invalid namespace name"
 msgstr ""
 
-#: src/fuser.c:718
+#: src/fuser.c:702
 msgid "You can only use files with mountpoint option"
 msgstr ""
 
-#: src/fuser.c:738
+#: src/fuser.c:722
 msgid "No process specification given"
 msgstr ""
 
-#: src/fuser.c:743
+#: src/fuser.c:727
 msgid "You cannot use the mounted and mountpoint flags together"
 msgstr ""
 
-#: src/fuser.c:750
+#: src/fuser.c:734
 msgid "all option cannot be used with silent option."
 msgstr ""
 
-#: src/fuser.c:753
-msgid "You cannot search for only IPv4 and only IPv6 sockets a the same time"
+#: src/fuser.c:737
+msgid "You cannot search for only IPv4 and only IPv6 sockets at the same time"
 msgstr ""
 
-#: src/fuser.c:783
+#: src/fuser.c:771
 #, c-format
 msgid ""
 "\n"
 "%*s USER        PID ACCESS COMMAND\n"
 msgstr ""
 
-#: src/fuser.c:807 src/fuser.c:832
+#: src/fuser.c:796 src/fuser.c:821
 msgid "(unknown)"
 msgstr ""
 
-#: src/fuser.c:892
+#: src/fuser.c:882
 #, c-format
 msgid "Cannot stat file %s: %s\n"
 msgstr ""
 
-#: src/fuser.c:983
+#: src/fuser.c:973
 #, c-format
 msgid "Cannot open /etc/mtab: %s\n"
 msgstr ""
 
-#: src/fuser.c:1044
+#: src/fuser.c:1034
 #, c-format
 msgid "Kill process %d ? (y/N) "
 msgstr "Lopeta prosess %d? (y=kyllä, N=ei) "
@@ -310,22 +310,24 @@ msgid ""
 "    -n     sort output by PID\n"
 "    -p     show PIDs; implies -c\n"
 "    -u     show uid transitions\n"
+"    -U     use UTF-8 (Unicode) line drawing characters\n"
+"    -V     display version information\n"
 msgstr ""
 
-#: src/pstree.c:760
+#: src/pstree.c:762
 #, fuzzy, c-format
 msgid "    -Z     show SELinux security contexts\n"
 msgstr "    -x     näytä Flask-kontekstit\n"
 
-#: src/pstree.c:763
-#, c-format
+#: src/pstree.c:765
+#, fuzzy, c-format
 msgid ""
-"    -U     use UTF-8 (Unicode) line drawing characters\n"
-"    -V     display version information\n"
 "    PID    start at this PID; default is 1 (init)\n"
 "    USER   show only trees rooted at processes of this user\n"
 "\n"
 msgstr ""
+"    kjä    näytä vain puita, jotka alkavat käyttäjän kjä omistuksessa\n"
+"\n"
 
 #: src/pstree.c:772
 #, fuzzy, c-format
@@ -457,13 +459,6 @@ msgstr ""
 #~ msgid "    pid    start at pid, default 1 (init))\n"
 #~ msgstr "    pid    aloita prosessista pid, oletuksena 1 (init-prosessi))\n"
 
-#~ msgid ""
-#~ "    user   show only trees rooted at processes of that user\n"
-#~ "\n"
-#~ msgstr ""
-#~ "    kjä    näytä vain puita, jotka alkavat käyttäjän kjä omistuksessa\n"
-#~ "\n"
-
 #~ msgid "pstree comes with ABSOLUTELY NO WARRANTY.\n"
 #~ msgstr "pstree:llä ei ole mitään takuuta.\n"
 

diff --git a/po/fr.po b/po/fr.po
index da2a20ea4a02920a8b65ec07ef1af67947c7a093..52dbb931e445452e301d3aaaaaa85b0b4fa65662 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 20.1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2005-10-07 17:24+1000\n"
+"POT-Creation-Date: 2005-11-05 15:19+1100\n"
 "PO-Revision-Date: 2002-04-12 21:33+1000\n"
 "Last-Translator: Marc Léger <sorata@users.sourceforge.net>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -143,7 +143,7 @@ msgid ""
 "       fuser -V\n"
 "Show which processes use the named files, sockets, or filesystems.\n"
 "\n"
-"     -a        display unused files too\n"
+"    -a        display unused files too\n"
 "    -c        mounted FS\n"
 "    -f        silently ignored (for POSIX compatibility)\n"
 "    -i        ask before killing (ignored without -k)\n"
@@ -219,7 +219,7 @@ msgstr ""
 
 #: src/fuser.c:435
 #, c-format
-msgid "Uknown local port AF %d\n"
+msgid "Unknown local port AF %d\n"
 msgstr ""
 
 #: src/fuser.c:484 src/fuser.c:534
@@ -227,56 +227,56 @@ msgstr ""
 msgid "Cannot open protocol file: %s"
 msgstr ""
 
-#: src/fuser.c:657
+#: src/fuser.c:641
 msgid "Namespace option requires an argument."
 msgstr ""
 
-#: src/fuser.c:666
+#: src/fuser.c:650
 msgid "Invalid namespace name"
 msgstr ""
 
-#: src/fuser.c:718
+#: src/fuser.c:702
 msgid "You can only use files with mountpoint option"
 msgstr ""
 
-#: src/fuser.c:738
+#: src/fuser.c:722
 msgid "No process specification given"
 msgstr ""
 
-#: src/fuser.c:743
+#: src/fuser.c:727
 msgid "You cannot use the mounted and mountpoint flags together"
 msgstr ""
 
-#: src/fuser.c:750
+#: src/fuser.c:734
 msgid "all option cannot be used with silent option."
 msgstr ""
 
-#: src/fuser.c:753
-msgid "You cannot search for only IPv4 and only IPv6 sockets a the same time"
+#: src/fuser.c:737
+msgid "You cannot search for only IPv4 and only IPv6 sockets at the same time"
 msgstr ""
 
-#: src/fuser.c:783
+#: src/fuser.c:771
 #, c-format
 msgid ""
 "\n"
 "%*s USER        PID ACCESS COMMAND\n"
 msgstr ""
 
-#: src/fuser.c:807 src/fuser.c:832
+#: src/fuser.c:796 src/fuser.c:821
 msgid "(unknown)"
 msgstr ""
 
-#: src/fuser.c:892
+#: src/fuser.c:882
 #, c-format
 msgid "Cannot stat file %s: %s\n"
 msgstr ""
 
-#: src/fuser.c:983
+#: src/fuser.c:973
 #, c-format
 msgid "Cannot open /etc/mtab: %s\n"
 msgstr ""
 
-#: src/fuser.c:1044
+#: src/fuser.c:1034
 #, fuzzy, c-format
 msgid "Kill process %d ? (y/N) "
 msgstr "Tuer le processus %d ? (y/n) "
@@ -304,18 +304,18 @@ msgid ""
 "    -n     sort output by PID\n"
 "    -p     show PIDs; implies -c\n"
 "    -u     show uid transitions\n"
+"    -U     use UTF-8 (Unicode) line drawing characters\n"
+"    -V     display version information\n"
 msgstr ""
 
-#: src/pstree.c:760
+#: src/pstree.c:762
 #, c-format
 msgid "    -Z     show SELinux security contexts\n"
 msgstr ""
 
-#: src/pstree.c:763
+#: src/pstree.c:765
 #, c-format
 msgid ""
-"    -U     use UTF-8 (Unicode) line drawing characters\n"
-"    -V     display version information\n"
 "    PID    start at this PID; default is 1 (init)\n"
 "    USER   show only trees rooted at processes of this user\n"
 "\n"

diff --git a/po/it.po b/po/it.po
index ee2aa903ced2d026722a10da2101b8ba2d01a3d8..e1521f8becd35fb6dea84233b78e8e11d30bb7ec 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 21.7-pre1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2005-10-07 17:24+1000\n"
+"POT-Creation-Date: 2005-11-05 15:19+1100\n"
 "PO-Revision-Date: 2005-10-31 10:13+0000\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -69,8 +69,10 @@ msgstr ""
 
 #: src/killall.c:493
 #, c-format
-msgid "Usage: killall [-Z CONTEXT] [-u USER] [ -eIgiqrvw ] [ -SIGNAL ] NAME...\n"
-msgstr "Uso: killall [-Z CONTESTO] [-u UTENTE] [ -eIgiqrvw ] [ -SEGNALE ] NOME...\n"
+msgid ""
+"Usage: killall [-Z CONTEXT] [-u USER] [ -eIgiqrvw ] [ -SIGNAL ] NAME...\n"
+msgstr ""
+"Uso: killall [-Z CONTESTO] [-u UTENTE] [ -eIgiqrvw ] [ -SEGNALE ] NOME...\n"
 
 #: src/killall.c:496
 #, c-format
@@ -99,7 +101,8 @@ msgstr ""
 "     killall -l, --list\n"
 "     killall -V --version\n"
 "\n"
-"  -e,--exact          richiede una corrispondenza esatta per i nomi molto lunghi\n"
+"  -e,--exact          richiede una corrispondenza esatta per i nomi molto "
+"lunghi\n"
 "  -I,--ignore-case    ignora maiuscole/minuscole nei nomi\n"
 "  -g,--process-group  termina il gruppo di processi invece del processo\n"
 "  -i,--interactive    chiede conferma prima di terminare\n"
@@ -160,7 +163,7 @@ msgid "%s is empty (not mounted ?)\n"
 msgstr "%s è vuoto (non montato?)\n"
 
 #: src/fuser.c:79
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: fuser [ -a | -s | -c ] [ -n SPACE ] [ -SIGNAL ] [ -kimuv ] NAME...\n"
 "             [ - ] [ -n SPACE ] [ -SIGNAL ] [ -kimuv ] NAME...\n"
@@ -168,7 +171,7 @@ msgid ""
 "       fuser -V\n"
 "Show which processes use the named files, sockets, or filesystems.\n"
 "\n"
-"     -a        display unused files too\n"
+"    -a        display unused files too\n"
 "    -c        mounted FS\n"
 "    -f        silently ignored (for POSIX compatibility)\n"
 "    -i        ask before killing (ignored without -k)\n"
@@ -247,8 +250,8 @@ msgstr "Impossibile risolvere la porta locale %s: %s\n"
 
 # FIXME UPSTREAM: Unknown
 #: src/fuser.c:435
-#, c-format
-msgid "Uknown local port AF %d\n"
+#, fuzzy, c-format
+msgid "Unknown local port AF %d\n"
 msgstr "Porta locale AF %d sconosciuta\n"
 
 #: src/fuser.c:484 src/fuser.c:534
@@ -256,35 +259,37 @@ msgstr "Porta locale AF %d sconosciuta\n"
 msgid "Cannot open protocol file: %s"
 msgstr "Impossibile aprire il file di protocollo: %s"
 
-#: src/fuser.c:657
+#: src/fuser.c:641
 msgid "Namespace option requires an argument."
 msgstr "L'opzione namespace richiede un argomento."
 
-#: src/fuser.c:666
+#: src/fuser.c:650
 msgid "Invalid namespace name"
 msgstr "Namespace non valido"
 
-#: src/fuser.c:718
+#: src/fuser.c:702
 msgid "You can only use files with mountpoint option"
 msgstr ""
 
-#: src/fuser.c:738
+#: src/fuser.c:722
 msgid "No process specification given"
 msgstr "Nessun tipo di processo specificato"
 
-#: src/fuser.c:743
+#: src/fuser.c:727
 msgid "You cannot use the mounted and mountpoint flags together"
 msgstr ""
 
-#: src/fuser.c:750
+#: src/fuser.c:734
 msgid "all option cannot be used with silent option."
 msgstr ""
 
-#: src/fuser.c:753
-msgid "You cannot search for only IPv4 and only IPv6 sockets a the same time"
-msgstr "Impossibile cercare solo socket IPv4 e solo socket IPv6 allo stesso tempo"
+#: src/fuser.c:737
+#, fuzzy
+msgid "You cannot search for only IPv4 and only IPv6 sockets at the same time"
+msgstr ""
+"Impossibile cercare solo socket IPv4 e solo socket IPv6 allo stesso tempo"
 
-#: src/fuser.c:783
+#: src/fuser.c:771
 #, c-format
 msgid ""
 "\n"
@@ -293,21 +298,21 @@ msgstr ""
 "\n"
 "%*s UTENTE      PID ACCESSO COMANDO\n"
 
-#: src/fuser.c:807 src/fuser.c:832
+#: src/fuser.c:796 src/fuser.c:821
 msgid "(unknown)"
 msgstr "(sconosciuto)"
 
-#: src/fuser.c:892
+#: src/fuser.c:882
 #, c-format
 msgid "Cannot stat file %s: %s\n"
 msgstr "Impossibile fare stat del file %s: %s\n"
 
-#: src/fuser.c:983
+#: src/fuser.c:973
 #, c-format
 msgid "Cannot open /etc/mtab: %s\n"
 msgstr "Impossibile aprire /etc/mtab: %s\n"
 
-#: src/fuser.c:1044
+#: src/fuser.c:1034
 #, c-format
 msgid "Kill process %d ? (y/N) "
 msgstr "Terminare il processo %d? (y/N) "
@@ -318,7 +323,7 @@ msgid "MAX_DEPTH not big enough.\n"
 msgstr "MAX_DEPTH non è sufficientemente grande.\n"
 
 #: src/pstree.c:744
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: pstree [ -a ] [ -c ] [ -h | -H PID ] [ -l ] [ -n ] [ -p ] [ -u ]\n"
 "              [ -A | -G | -U ] [ PID | USER ]\n"
@@ -335,6 +340,8 @@ msgid ""
 "    -n     sort output by PID\n"
 "    -p     show PIDs; implies -c\n"
 "    -u     show uid transitions\n"
+"    -U     use UTF-8 (Unicode) line drawing characters\n"
+"    -V     display version information\n"
 msgstr ""
 "Uso: pstree [ -a ] [ -c ] [ -h | -H PID ] [ -l ] [ -n ] [ -p ] [ -u ]\n"
 "            [ -A | -G | -U ] [ PID | UTENTE]\n"
@@ -352,16 +359,14 @@ msgstr ""
 "    -p        mostra i PID; implica -c\n"
 "    -u        mostra le transizioni di uid\n"
 
-#: src/pstree.c:760
+#: src/pstree.c:762
 #, c-format
 msgid "    -Z     show SELinux security contexts\n"
 msgstr "    -Z     mostra i contesti di sicurezza SELinux\n"
 
-#: src/pstree.c:763
-#, c-format
+#: src/pstree.c:765
+#, fuzzy, c-format
 msgid ""
-"    -U     use UTF-8 (Unicode) line drawing characters\n"
-"    -V     display version information\n"
 "    PID    start at this PID; default is 1 (init)\n"
 "    USER   show only trees rooted at processes of this user\n"
 "\n"

diff --git a/po/nb.po b/po/nb.po
index e3cf74015856f676aa4e9c83984f0f6ec12a9569..2d3ac148ac3cc2fb9f88b1a5ca1d85f088e6a3db 100644 (file)
--- a/po/nb.po
+++ b/po/nb.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 21.7-pre1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2005-10-07 17:24+1000\n"
+"POT-Creation-Date: 2005-11-05 15:19+1100\n"
 "PO-Revision-Date: 2005-10-10 18:05+0200\n"
 "Last-Translator: Trond Endrestøl <Trond.Endrestol@fagskolen.gjovik.no>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
@@ -83,8 +83,11 @@ msgstr ""
 
 #: src/killall.c:493
 #, c-format
-msgid "Usage: killall [-Z CONTEXT] [-u USER] [ -eIgiqrvw ] [ -SIGNAL ] NAME...\n"
-msgstr "Bruksmåte: killall [-Z kontekst] [-u bruker] [ -egiqvw ] [ -signal ] navn ...\n"
+msgid ""
+"Usage: killall [-Z CONTEXT] [-u USER] [ -eIgiqrvw ] [ -SIGNAL ] NAME...\n"
+msgstr ""
+"Bruksmåte: killall [-Z kontekst] [-u bruker] [ -egiqvw ] [ -signal ] "
+"navn ...\n"
 
 #: src/killall.c:496
 #, c-format
@@ -172,7 +175,7 @@ msgid "%s is empty (not mounted ?)\n"
 msgstr "%s er tom (ikke montert?)\n"
 
 #: src/fuser.c:79
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: fuser [ -a | -s | -c ] [ -n SPACE ] [ -SIGNAL ] [ -kimuv ] NAME...\n"
 "             [ - ] [ -n SPACE ] [ -SIGNAL ] [ -kimuv ] NAME...\n"
@@ -180,7 +183,7 @@ msgid ""
 "       fuser -V\n"
 "Show which processes use the named files, sockets, or filesystems.\n"
 "\n"
-"     -a        display unused files too\n"
+"    -a        display unused files too\n"
 "    -c        mounted FS\n"
 "    -f        silently ignored (for POSIX compatibility)\n"
 "    -i        ask before killing (ignored without -k)\n"
@@ -200,12 +203,14 @@ msgid ""
 "  udp/tcp names: [local_port][,[rmt_host][,[rmt_port]]]\n"
 "\n"
 msgstr ""
-"Bruksmåte: fuser [ -a | -s | -c ] [ -n rom ] [ -signal ] [ -kimuv ] navn ...\n"
+"Bruksmåte: fuser [ -a | -s | -c ] [ -n rom ] [ -signal ] [ -kimuv ] "
+"navn ...\n"
 "                 [ - ] [ -n rom ] [ -signal ] [ -kimuv ] navn ...\n"
 "           fuser -l\n"
 "           fuser -V\n"
 "\n"
-"Vise hvilke prosesser som bruker de angitte filene, socketer eller filsystemer.\n"
+"Vise hvilke prosesser som bruker de angitte filene, socketer eller "
+"filsystemer.\n"
 "\n"
 "    -a        også vise ubrukte filer\n"
 "    -c        monterte filsystemer\n"
@@ -213,7 +218,8 @@ msgstr ""
 "    -k        drep prosesser som akserer den navngitte filen\n"
 "    -i        spør før dreping (ignorert uten -k)\n"
 "    -l        vis liste over tilgjengelige signalnavn\n"
-"    -m        vis alle prosesser som bruker de angitte monterte filesystemene\n"
+"    -m        vis alle prosesser som bruker de angitte monterte "
+"filesystemene\n"
 "    -n rom    søk i det angitte navnerommet (file, udp, eller tcp)\n"
 "    -s        stille utførelse\n"
 "    -signal   send dette signalet i stedet for SIGKILL\n"
@@ -258,8 +264,8 @@ msgid "Cannot resolve local port %s: %s\n"
 msgstr "Kan ikke løse lokalport %s: %s\n"
 
 #: src/fuser.c:435
-#, c-format
-msgid "Uknown local port AF %d\n"
+#, fuzzy, c-format
+msgid "Unknown local port AF %d\n"
 msgstr "Ukjent lokalport AF %d\n"
 
 #: src/fuser.c:484 src/fuser.c:534
@@ -267,37 +273,38 @@ msgstr "Ukjent lokalport AF %d\n"
 msgid "Cannot open protocol file: %s"
 msgstr "Kan ikke åpne protokollfil: %s"
 
-#: src/fuser.c:657
+#: src/fuser.c:641
 msgid "Namespace option requires an argument."
 msgstr "Navneromvalget krever et argument."
 
-#: src/fuser.c:666
+#: src/fuser.c:650
 msgid "Invalid namespace name"
 msgstr "Ugyldig navn på navnerom"
 
-#: src/fuser.c:718
+#: src/fuser.c:702
 msgid "You can only use files with mountpoint option"
 msgstr "Du kan bare bruke filer med monteringspunktvalget"
 
-#: src/fuser.c:738
+#: src/fuser.c:722
 msgid "No process specification given"
 msgstr "Ingen prosesspesifikasjon ble gitt"
 
-#: src/fuser.c:743
+#: src/fuser.c:727
 msgid "You cannot use the mounted and mountpoint flags together"
 msgstr "Du kan ikke bruke montert- og monteringspunktvalgene samtidig"
 
-#: src/fuser.c:750
+#: src/fuser.c:734
 msgid "all option cannot be used with silent option."
 msgstr "alle valg kan ikke bli brukt med stillevalget."
 
-#: src/fuser.c:753
-msgid "You cannot search for only IPv4 and only IPv6 sockets a the same time"
+#: src/fuser.c:737
+#, fuzzy
+msgid "You cannot search for only IPv4 and only IPv6 sockets at the same time"
 msgstr "Du kan ikke søke etter bare IPv4- og bare IPv6-socketer samtidig."
 
 # Oversettelsen av denne strengen er noe vanskelig da dette er en
 # tabelloverskrift som skal passe med selve tabellen. [TE, 2005-03-01]
-#: src/fuser.c:783
+#: src/fuser.c:771
 #, c-format
 msgid ""
 "\n"
@@ -306,21 +313,21 @@ msgstr ""
 "\n"
 "%*s BRUKER      PID ACCESS KOMMANDO\n"
 
-#: src/fuser.c:807 src/fuser.c:832
+#: src/fuser.c:796 src/fuser.c:821
 msgid "(unknown)"
 msgstr "(ukjent)"
 
-#: src/fuser.c:892
+#: src/fuser.c:882
 #, c-format
 msgid "Cannot stat file %s: %s\n"
 msgstr "Kan ikke kjøre stat på fila %s: %s\n"
 
-#: src/fuser.c:983
+#: src/fuser.c:973
 #, c-format
 msgid "Cannot open /etc/mtab: %s\n"
 msgstr "Kan ikke åpne /etc/mtab: %s\n"
 
-#: src/fuser.c:1044
+#: src/fuser.c:1034
 #, c-format
 msgid "Kill process %d ? (y/N) "
 msgstr "Drepe prosess %d ? (j/N) "
@@ -331,7 +338,7 @@ msgid "MAX_DEPTH not big enough.\n"
 msgstr "MAX_DEPTH er ikke stor nok.\n"
 
 #: src/pstree.c:744
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: pstree [ -a ] [ -c ] [ -h | -H PID ] [ -l ] [ -n ] [ -p ] [ -u ]\n"
 "              [ -A | -G | -U ] [ PID | USER ]\n"
@@ -348,6 +355,8 @@ msgid ""
 "    -n     sort output by PID\n"
 "    -p     show PIDs; implies -c\n"
 "    -u     show uid transitions\n"
+"    -U     use UTF-8 (Unicode) line drawing characters\n"
+"    -V     display version information\n"
 msgstr ""
 "Bruksmåte: pstree [ -a ] [ -c ] [ -h | -H pid ] [ -l ] [ -n ] [ -p ] [ -u ]\n"
 "                  [ -A | -G | -U ] [ pid | bruker]\n"
@@ -366,16 +375,14 @@ msgstr ""
 "    -p     vis PIDs; medfører -c\n"
 "    -u     vis uid-overganger\n"
 
-#: src/pstree.c:760
+#: src/pstree.c:762
 #, c-format
 msgid "    -Z     show SELinux security contexts\n"
 msgstr "    -Z     vis SELinux sikkerhetskontekster\n"
 
-#: src/pstree.c:763
-#, c-format
+#: src/pstree.c:765
+#, fuzzy, c-format
 msgid ""
-"    -U     use UTF-8 (Unicode) line drawing characters\n"
-"    -V     display version information\n"
 "    PID    start at this PID; default is 1 (init)\n"
 "    USER   show only trees rooted at processes of this user\n"
 "\n"

diff --git a/po/nl.po b/po/nl.po
index 2561a6ce7a7462c6a363221c1cebf7df0860f7ee..f7dcf7656a882b904cec03fdca0768ec8f53b3d7 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 21.7-pre1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2005-10-07 17:24+1000\n"
+"POT-Creation-Date: 2005-11-05 15:19+1100\n"
 "PO-Revision-Date: 2005-10-10 23:49+0200\n"
 "Last-Translator: Benno Schulenberg <benno@nietvergeten.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -69,8 +69,10 @@ msgstr ""
 
 #: src/killall.c:493
 #, c-format
-msgid "Usage: killall [-Z CONTEXT] [-u USER] [ -eIgiqrvw ] [ -SIGNAL ] NAME...\n"
-msgstr "Gebruik:  killall [-Z CONTEXT] [-u USER] [ -egiIqrvw ] [-SIGNAAL] NAAM...\n"
+msgid ""
+"Usage: killall [-Z CONTEXT] [-u USER] [ -eIgiqrvw ] [ -SIGNAL ] NAME...\n"
+msgstr ""
+"Gebruik:  killall [-Z CONTEXT] [-u USER] [ -egiIqrvw ] [-SIGNAAL] NAAM...\n"
 
 #: src/killall.c:496
 #, c-format
@@ -160,7 +162,7 @@ msgid "%s is empty (not mounted ?)\n"
 msgstr "%s is leeg -- niet aangekoppeld?\n"
 
 #: src/fuser.c:79
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: fuser [ -a | -s | -c ] [ -n SPACE ] [ -SIGNAL ] [ -kimuv ] NAME...\n"
 "             [ - ] [ -n SPACE ] [ -SIGNAL ] [ -kimuv ] NAME...\n"
@@ -168,7 +170,7 @@ msgid ""
 "       fuser -V\n"
 "Show which processes use the named files, sockets, or filesystems.\n"
 "\n"
-"     -a        display unused files too\n"
+"    -a        display unused files too\n"
 "    -c        mounted FS\n"
 "    -f        silently ignored (for POSIX compatibility)\n"
 "    -i        ask before killing (ignored without -k)\n"
@@ -247,8 +249,8 @@ msgid "Cannot resolve local port %s: %s\n"
 msgstr "Kan lokale poort %s nergens toe herleiden: %s\n"
 
 #: src/fuser.c:435
-#, c-format
-msgid "Uknown local port AF %d\n"
+#, fuzzy, c-format
+msgid "Unknown local port AF %d\n"
 msgstr "Onbekende lokale poort AF %d\n"
 
 #: src/fuser.c:484 src/fuser.c:534
@@ -256,35 +258,36 @@ msgstr "Onbekende lokale poort AF %d\n"
 msgid "Cannot open protocol file: %s"
 msgstr "Kan protocolbestand niet openen: %s"
 
-#: src/fuser.c:657
+#: src/fuser.c:641
 msgid "Namespace option requires an argument."
 msgstr "De naamsruimte-optie -n vereist een argument."
 
-#: src/fuser.c:666
+#: src/fuser.c:650
 msgid "Invalid namespace name"
 msgstr "Ongeldige naamsruimte"
 
-#: src/fuser.c:718
+#: src/fuser.c:702
 msgid "You can only use files with mountpoint option"
 msgstr "Bij opties -c of -m mogen alleen bestandsnamen gegeven worden"
 
-#: src/fuser.c:738
+#: src/fuser.c:722
 msgid "No process specification given"
 msgstr "Geen naam van bestand of socket opgegeven"
 
-#: src/fuser.c:743
+#: src/fuser.c:727
 msgid "You cannot use the mounted and mountpoint flags together"
 msgstr "Opties -c en -m mogen niet allebei gebruikt worden"
 
-#: src/fuser.c:750
+#: src/fuser.c:734
 msgid "all option cannot be used with silent option."
 msgstr "Opties -a en -s gaan niet samen"
 
-#: src/fuser.c:753
-msgid "You cannot search for only IPv4 and only IPv6 sockets a the same time"
+#: src/fuser.c:737
+#, fuzzy
+msgid "You cannot search for only IPv4 and only IPv6 sockets at the same time"
 msgstr "De opties -4 en -6 gaan niet samen"
 
-#: src/fuser.c:783
+#: src/fuser.c:771
 #, c-format
 msgid ""
 "\n"
@@ -293,21 +296,21 @@ msgstr ""
 "\n"
 "%*s GEBRUIKER   PID TOEGANGSOPDRACHT\n"
 
-#: src/fuser.c:807 src/fuser.c:832
+#: src/fuser.c:796 src/fuser.c:821
 msgid "(unknown)"
 msgstr "(onbekend)"
 
-#: src/fuser.c:892
+#: src/fuser.c:882
 #, c-format
 msgid "Cannot stat file %s: %s\n"
 msgstr "Kan status van bestand %s niet bepalen: %s\n"
 
-#: src/fuser.c:983
+#: src/fuser.c:973
 #, c-format
 msgid "Cannot open /etc/mtab: %s\n"
 msgstr "Kan /etc/mtab niet openen: %s\n"
 
-#: src/fuser.c:1044
+#: src/fuser.c:1034
 #, c-format
 msgid "Kill process %d ? (y/N) "
 msgstr "Proces %d afbreken? (j/N) "
@@ -318,7 +321,7 @@ msgid "MAX_DEPTH not big enough.\n"
 msgstr "Maximumdiepte MAX_DEPTH is niet groot genoeg.\n"
 
 #: src/pstree.c:744
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: pstree [ -a ] [ -c ] [ -h | -H PID ] [ -l ] [ -n ] [ -p ] [ -u ]\n"
 "              [ -A | -G | -U ] [ PID | USER ]\n"
@@ -335,6 +338,8 @@ msgid ""
 "    -n     sort output by PID\n"
 "    -p     show PIDs; implies -c\n"
 "    -u     show uid transitions\n"
+"    -U     use UTF-8 (Unicode) line drawing characters\n"
+"    -V     display version information\n"
 msgstr ""
 "Gebruik:  pstree [-a] [-c] [ -h | -H PID ] [-l] [-n] [-p] [-u]\n"
 "                 [ -A | -G | -U ]  [ PID | USER ]\n"
@@ -353,16 +358,14 @@ msgstr ""
 "    -p      PIDs tonen (dit impliceert -c)\n"
 "    -u      UID-overgangen tonen\n"
 
-#: src/pstree.c:760
+#: src/pstree.c:762
 #, c-format
 msgid "    -Z     show SELinux security contexts\n"
 msgstr "    -Z      SELinux-veiligheidscontexten tonen\n"
 
-#: src/pstree.c:763
-#, c-format
+#: src/pstree.c:765
+#, fuzzy, c-format
 msgid ""
-"    -U     use UTF-8 (Unicode) line drawing characters\n"
-"    -V     display version information\n"
 "    PID    start at this PID; default is 1 (init)\n"
 "    USER   show only trees rooted at processes of this user\n"
 "\n"

diff --git a/po/pl.po b/po/pl.po
index f2b8f28bf4dfb8d34900a468eb98b93fb7b49393..1305ab8a084c26ba23eacdf4310422cdab8fa949 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 21.7-pre1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2005-10-07 17:24+1000\n"
+"POT-Creation-Date: 2005-11-05 15:19+1100\n"
 "PO-Revision-Date: 2005-10-10 18:09+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -68,8 +68,11 @@ msgstr ""
 
 #: src/killall.c:493
 #, c-format
-msgid "Usage: killall [-Z CONTEXT] [-u USER] [ -eIgiqrvw ] [ -SIGNAL ] NAME...\n"
-msgstr "Sk³adnia: killall [-Z kontekst] [-u U¯YTKOWNIK] [ -eIgiqrvw ] [ -SYGNA£ ] NAZWA...\n"
+msgid ""
+"Usage: killall [-Z CONTEXT] [-u USER] [ -eIgiqrvw ] [ -SIGNAL ] NAME...\n"
+msgstr ""
+"Sk³adnia: killall [-Z kontekst] [-u U¯YTKOWNIK] [ -eIgiqrvw ] [ -SYGNA£ ] "
+"NAZWA...\n"
 
 #: src/killall.c:496
 #, c-format
@@ -98,15 +101,18 @@ msgstr ""
 "          killall -l, --list\n"
 "          killall -V --version\n"
 "\n"
-"  -e,--exact          wymaganie dok³adnego dopasowania dla bardzo d³ugich nazw\n"
-"  -I,--ignore-case    dopasowywanie nazw procesów niewra¿liwe na wielko¶æ liter\n"
+"  -e,--exact          wymaganie dok³adnego dopasowania dla bardzo d³ugich "
+"nazw\n"
+"  -I,--ignore-case    dopasowywanie nazw procesów niewra¿liwe na wielko¶æ "
+"liter\n"
 "  -g,--process-group  zabicie grupy procesów zamiast procesu\n"
 "  -i,--interactive    pytanie o potwierdzenie przed zabiciem\n"
 "  -l,--list           wypisanie wszystkich znanych nazw sygna³ów\n"
 "  -q,--quiet          nie wy¶wietlanie narzekañ\n"
 "  -r,--regexp         u¿ycie NAZWY jako rozszerzonego wyra¿enia regularnego\n"
 "  -s,--signal SYGNA£  wys³anie podanego sygna³u zamiast SIGTERM\n"
-"  -u, --user U¯YTK    zabicie tylko procesów dzia³aj±cych jako podany u¿ytkownik\n"
+"  -u, --user U¯YTK    zabicie tylko procesów dzia³aj±cych jako podany "
+"u¿ytkownik\n"
 "  -v,--verbose        informowanie czy wys³anie sygna³u siê powiod³o\n"
 "  -V,--version        wy¶wietlenie informacji o wersji\n"
 "  -w,--wait           zaczekanie na ¶mieræ procesów\n"
@@ -117,7 +123,8 @@ msgid ""
 "  -Z,--context REGEXP kill only process(es) having context\n"
 "                      (must precede other arguments)\n"
 msgstr ""
-"  -Z,--context REGEXP zabicie tylko procesu(ów) maj±cych dany kontekst bezp.\n"
+"  -Z,--context REGEXP zabicie tylko procesu(ów) maj±cych dany kontekst "
+"bezp.\n"
 "                        (musi poprzedzaæ inne argumenty)\n"
 
 #: src/killall.c:536 src/fuser.c:108 src/pstree.c:774
@@ -158,7 +165,7 @@ msgid "%s is empty (not mounted ?)\n"
 msgstr "%s jest pusty (nie podmontowany?)\n"
 
 #: src/fuser.c:79
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: fuser [ -a | -s | -c ] [ -n SPACE ] [ -SIGNAL ] [ -kimuv ] NAME...\n"
 "             [ - ] [ -n SPACE ] [ -SIGNAL ] [ -kimuv ] NAME...\n"
@@ -166,7 +173,7 @@ msgid ""
 "       fuser -V\n"
 "Show which processes use the named files, sockets, or filesystems.\n"
 "\n"
-"     -a        display unused files too\n"
+"    -a        display unused files too\n"
 "    -c        mounted FS\n"
 "    -f        silently ignored (for POSIX compatibility)\n"
 "    -i        ask before killing (ignored without -k)\n"
@@ -186,7 +193,8 @@ msgid ""
 "  udp/tcp names: [local_port][,[rmt_host][,[rmt_port]]]\n"
 "\n"
 msgstr ""
-"Sk³adnia: fuser [ -a | -s | -c ] [ -n PRZESTRZEÑ ] [ -SYGNA£ ] [ -kimuv ] NAZWA...\n"
+"Sk³adnia: fuser [ -a | -s | -c ] [ -n PRZESTRZEÑ ] [ -SYGNA£ ] [ -kimuv ] "
+"NAZWA...\n"
 "                [ - ] [ -n PRZESTRZEÑ ] [ -SYGNA£ ] [ -kimuv ] NAZWA...\n"
 "          fuser -l\n"
 "          fuser -V\n"
@@ -244,8 +252,8 @@ msgid "Cannot resolve local port %s: %s\n"
 msgstr "Nie mo¿na rozwi±zaæ portu lokalnego %s: %s\n"
 
 #: src/fuser.c:435
-#, c-format
-msgid "Uknown local port AF %d\n"
+#, fuzzy, c-format
+msgid "Unknown local port AF %d\n"
 msgstr "Nieznana rodzina adresów portu lokalnego %d\n"
 
 #: src/fuser.c:484 src/fuser.c:534
@@ -253,35 +261,36 @@ msgstr "Nieznana rodzina adres
 msgid "Cannot open protocol file: %s"
 msgstr "Nie mo¿na otworzyæ pliku protoko³u: %s"
 
-#: src/fuser.c:657
+#: src/fuser.c:641
 msgid "Namespace option requires an argument."
 msgstr "Opcja przestrzeni nazw wymaga argumentu."
 
-#: src/fuser.c:666
+#: src/fuser.c:650
 msgid "Invalid namespace name"
 msgstr "Niepoprawna nazwa przestrzeni nazw"
 
-#: src/fuser.c:718
+#: src/fuser.c:702
 msgid "You can only use files with mountpoint option"
 msgstr "Z opcj± punktu montowania mo¿na u¿ywaæ tylko plików"
 
-#: src/fuser.c:738
+#: src/fuser.c:722
 msgid "No process specification given"
 msgstr "Nie podano okre¶lenia procesów"
 
-#: src/fuser.c:743
+#: src/fuser.c:727
 msgid "You cannot use the mounted and mountpoint flags together"
 msgstr "Nie mo¿na u¿yæ jednocze¶nie flag podmontowanego i punktu montowania"
 
-#: src/fuser.c:750
+#: src/fuser.c:734
 msgid "all option cannot be used with silent option."
 msgstr "opcja wszystkich plików nie mo¿e byæ u¿yta z opcj± ciszy."
 
-#: src/fuser.c:753
-msgid "You cannot search for only IPv4 and only IPv6 sockets a the same time"
+#: src/fuser.c:737
+#, fuzzy
+msgid "You cannot search for only IPv4 and only IPv6 sockets at the same time"
 msgstr "Nie mo¿na naraz szukaæ gniazd wy³±cznie IPv4 i wy³±cznie IPv6"
 
-#: src/fuser.c:783
+#: src/fuser.c:771
 #, c-format
 msgid ""
 "\n"
@@ -290,21 +299,21 @@ msgstr ""
 "\n"
 "%*s U¯YTKOWNIK  PID DOSTÊP POLECENIE\n"
 
-#: src/fuser.c:807 src/fuser.c:832
+#: src/fuser.c:796 src/fuser.c:821
 msgid "(unknown)"
 msgstr "(nieznany)"
 
-#: src/fuser.c:892
+#: src/fuser.c:882
 #, c-format
 msgid "Cannot stat file %s: %s\n"
 msgstr "Nie mo¿na wykonaæ stat na pliku %s: %s\n"
 
-#: src/fuser.c:983
+#: src/fuser.c:973
 #, c-format
 msgid "Cannot open /etc/mtab: %s\n"
 msgstr "Nie mo¿na otworzyæ /etc/mtab: %s\n"
 
-#: src/fuser.c:1044
+#: src/fuser.c:1034
 #, c-format
 msgid "Kill process %d ? (y/N) "
 msgstr "Zabiæ proces %d? (y/N) "
@@ -315,7 +324,7 @@ msgid "MAX_DEPTH not big enough.\n"
 msgstr "MAX_DEPTH jest zbyt ma³e.\n"
 
 #: src/pstree.c:744
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Usage: pstree [ -a ] [ -c ] [ -h | -H PID ] [ -l ] [ -n ] [ -p ] [ -u ]\n"
 "              [ -A | -G | -U ] [ PID | USER ]\n"
@@ -332,6 +341,8 @@ msgid ""
 "    -n     sort output by PID\n"
 "    -p     show PIDs; implies -c\n"
 "    -u     show uid transitions\n"
+"    -U     use UTF-8 (Unicode) line drawing characters\n"
+"    -V     display version information\n"
 msgstr ""
 "Sk³adnia: pstree [ -a ] [ -c ] [ -h | -H PID ] [ -l ] [ -n ] [ -p ] [ -u ]\n"
 "                 [ -A | -G | -U ] [ PID | U¯YTKOWNIK ]\n"
@@ -349,16 +360,14 @@ msgstr ""
 "    -p     wy¶wietlanie PID-ów; w³±cza tak¿e -c\n"
 "    -u     wy¶wietlanie zmian uidów\n"
 
-#: src/pstree.c:760
+#: src/pstree.c:762
 #, c-format
 msgid "    -Z     show SELinux security contexts\n"
 msgstr "    -Z     wy¶wietlanie kontekstów bezpieczeñstwa SELinuksa\n"
 
-#: src/pstree.c:763
-#, c-format
+#: src/pstree.c:765
+#, fuzzy, c-format
 msgid ""
-"    -U     use UTF-8 (Unicode) line drawing characters\n"
-"    -V     display version information\n"
 "    PID    start at this PID; default is 1 (init)\n"
 "    USER   show only trees rooted at processes of this user\n"
 "\n"

diff --git a/po/psmisc.pot b/po/psmisc.pot
index e8036f2a2e68a81ab48f0d13d1d3b17acfdbd427..68d308f51a0a103812943a7f2419618c482a9ca9 100644 (file)
--- a/po/psmisc.pot
+++ b/po/psmisc.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2005-10-07 17:24+1000\n"
+"POT-Creation-Date: 2005-11-05 15:19+1100\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"
@@ -137,7 +137,7 @@ msgid ""
 "       fuser -V\n"
 "Show which processes use the named files, sockets, or filesystems.\n"
 "\n"
-"     -a        display unused files too\n"
+"    -a        display unused files too\n"
 "    -c        mounted FS\n"
 "    -f        silently ignored (for POSIX compatibility)\n"
 "    -i        ask before killing (ignored without -k)\n"
@@ -190,7 +190,7 @@ msgstr ""
 
 #: src/fuser.c:435
 #, c-format
-msgid "Uknown local port AF %d\n"
+msgid "Unknown local port AF %d\n"
 msgstr ""
 
 #: src/fuser.c:484 src/fuser.c:534
@@ -198,56 +198,56 @@ msgstr ""
 msgid "Cannot open protocol file: %s"
 msgstr ""
 
-#: src/fuser.c:657
+#: src/fuser.c:641
 msgid "Namespace option requires an argument."
 msgstr ""
 
-#: src/fuser.c:666
+#: src/fuser.c:650
 msgid "Invalid namespace name"
 msgstr ""
 
-#: src/fuser.c:718
+#: src/fuser.c:702
 msgid "You can only use files with mountpoint option"
 msgstr ""
 
-#: src/fuser.c:738
+#: src/fuser.c:722
 msgid "No process specification given"
 msgstr ""
 
-#: src/fuser.c:743
+#: src/fuser.c:727
 msgid "You cannot use the mounted and mountpoint flags together"
 msgstr ""
 
-#: src/fuser.c:750
+#: src/fuser.c:734
 msgid "all option cannot be used with silent option."
 msgstr ""
 
-#: src/fuser.c:753
-msgid "You cannot search for only IPv4 and only IPv6 sockets a the same time"
+#: src/fuser.c:737
+msgid "You cannot search for only IPv4 and only IPv6 sockets at the same time"
 msgstr ""
 
-#: src/fuser.c:783
+#: src/fuser.c:771
 #, c-format
 msgid ""
 "\n"
 "%*s USER        PID ACCESS COMMAND\n"
 msgstr ""
 
-#: src/fuser.c:807 src/fuser.c:832
+#: src/fuser.c:796 src/fuser.c:821
 msgid "(unknown)"
 msgstr ""
 
-#: src/fuser.c:892
+#: src/fuser.c:882
 #, c-format
 msgid "Cannot stat file %s: %s\n"
 msgstr ""
 
-#: src/fuser.c:983
+#: src/fuser.c:973
 #, c-format
 msgid "Cannot open /etc/mtab: %s\n"
 msgstr ""
 
-#: src/fuser.c:1044
+#: src/fuser.c:1034
 #, c-format
 msgid "Kill process %d ? (y/N) "
 msgstr ""
@@ -275,18 +275,18 @@ msgid ""
 "    -n     sort output by PID\n"
 "    -p     show PIDs; implies -c\n"
 "    -u     show uid transitions\n"
+"    -U     use UTF-8 (Unicode) line drawing characters\n"
+"    -V     display version information\n"
 msgstr ""
 
-#: src/pstree.c:760
+#: src/pstree.c:762
 #, c-format
 msgid "    -Z     show SELinux security contexts\n"
 msgstr ""
 
-#: src/pstree.c:763
+#: src/pstree.c:765
 #, c-format
 msgid ""
-"    -U     use UTF-8 (Unicode) line drawing characters\n"
-"    -V     display version information\n"
 "    PID    start at this PID; default is 1 (init)\n"
 "    USER   show only trees rooted at processes of this user\n"
 "\n"

diff --git a/po/pt.po b/po/pt.po
index e82bde6d469dbc65b6215a71c2f1ee2dec85edd4..faf842e8cc0f9eb6c9b95181412fc5baf583a7e5 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 1.0\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2005-10-07 17:24+1000\n"
+"POT-Creation-Date: 2005-11-05 15:19+1100\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"
@@ -142,7 +142,7 @@ msgid ""
 "       fuser -V\n"
 "Show which processes use the named files, sockets, or filesystems.\n"
 "\n"
-"     -a        display unused files too\n"
+"    -a        display unused files too\n"
 "    -c        mounted FS\n"
 "    -f        silently ignored (for POSIX compatibility)\n"
 "    -i        ask before killing (ignored without -k)\n"
@@ -221,7 +221,7 @@ msgstr ""
 
 #: src/fuser.c:435
 #, c-format
-msgid "Uknown local port AF %d\n"
+msgid "Unknown local port AF %d\n"
 msgstr ""
 
 #: src/fuser.c:484 src/fuser.c:534
@@ -229,56 +229,56 @@ msgstr ""
 msgid "Cannot open protocol file: %s"
 msgstr ""
 
-#: src/fuser.c:657
+#: src/fuser.c:641
 msgid "Namespace option requires an argument."
 msgstr ""
 
-#: src/fuser.c:666
+#: src/fuser.c:650
 msgid "Invalid namespace name"
 msgstr ""
 
-#: src/fuser.c:718
+#: src/fuser.c:702
 msgid "You can only use files with mountpoint option"
 msgstr ""
 
-#: src/fuser.c:738
+#: src/fuser.c:722
 msgid "No process specification given"
 msgstr ""
 
-#: src/fuser.c:743
+#: src/fuser.c:727
 msgid "You cannot use the mounted and mountpoint flags together"
 msgstr ""
 
-#: src/fuser.c:750
+#: src/fuser.c:734
 msgid "all option cannot be used with silent option."
 msgstr ""
 
-#: src/fuser.c:753
-msgid "You cannot search for only IPv4 and only IPv6 sockets a the same time"
+#: src/fuser.c:737
+msgid "You cannot search for only IPv4 and only IPv6 sockets at the same time"
 msgstr ""
 
-#: src/fuser.c:783
+#: src/fuser.c:771
 #, c-format
 msgid ""
 "\n"
 "%*s USER        PID ACCESS COMMAND\n"
 msgstr ""
 
-#: src/fuser.c:807 src/fuser.c:832
+#: src/fuser.c:796 src/fuser.c:821
 msgid "(unknown)"
 msgstr ""
 
-#: src/fuser.c:892
+#: src/fuser.c:882
 #, c-format
 msgid "Cannot stat file %s: %s\n"
 msgstr ""
 
-#: src/fuser.c:983
+#: src/fuser.c:973
 #, c-format
 msgid "Cannot open /etc/mtab: %s\n"
 msgstr ""
 
-#: src/fuser.c:1044
+#: src/fuser.c:1034
 #, fuzzy, c-format
 msgid "Kill process %d ? (y/N) "
 msgstr "Aborta processo %d ? (y/n) "
@@ -306,18 +306,18 @@ msgid ""
 "    -n     sort output by PID\n"
 "    -p     show PIDs; implies -c\n"
 "    -u     show uid transitions\n"
+"    -U     use UTF-8 (Unicode) line drawing characters\n"
+"    -V     display version information\n"
 msgstr ""
 
-#: src/pstree.c:760
+#: src/pstree.c:762
 #, c-format
 msgid "    -Z     show SELinux security contexts\n"
 msgstr ""
 
-#: src/pstree.c:763
+#: src/pstree.c:765
 #, c-format
 msgid ""
-"    -U     use UTF-8 (Unicode) line drawing characters\n"
-"    -V     display version information\n"
 "    PID    start at this PID; default is 1 (init)\n"
 "    USER   show only trees rooted at processes of this user\n"
 "\n"

diff --git a/po/ro.po b/po/ro.po
index 63ec865b80afc5b883148ea6bb222d72100ccd6a..35c40efa99688c1fc27b73ff98e684604a8440d8 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc-21.6pre1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2005-10-07 17:24+1000\n"
+"POT-Creation-Date: 2005-11-05 15:19+1100\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"
@@ -173,7 +173,7 @@ msgid ""
 "       fuser -V\n"
 "Show which processes use the named files, sockets, or filesystems.\n"
 "\n"
-"     -a        display unused files too\n"
+"    -a        display unused files too\n"
 "    -c        mounted FS\n"
 "    -f        silently ignored (for POSIX compatibility)\n"
 "    -i        ask before killing (ignored without -k)\n"
@@ -251,7 +251,7 @@ msgstr ""
 
 #: src/fuser.c:435
 #, c-format
-msgid "Uknown local port AF %d\n"
+msgid "Unknown local port AF %d\n"
 msgstr ""
 
 #: src/fuser.c:484 src/fuser.c:534
@@ -259,35 +259,35 @@ msgstr ""
 msgid "Cannot open protocol file: %s"
 msgstr ""
 
-#: src/fuser.c:657
+#: src/fuser.c:641
 msgid "Namespace option requires an argument."
 msgstr ""
 
-#: src/fuser.c:666
+#: src/fuser.c:650
 msgid "Invalid namespace name"
 msgstr ""
 
-#: src/fuser.c:718
+#: src/fuser.c:702
 msgid "You can only use files with mountpoint option"
 msgstr ""
 
-#: src/fuser.c:738
+#: src/fuser.c:722
 msgid "No process specification given"
 msgstr ""
 
-#: src/fuser.c:743
+#: src/fuser.c:727
 msgid "You cannot use the mounted and mountpoint flags together"
 msgstr ""
 
-#: src/fuser.c:750
+#: src/fuser.c:734
 msgid "all option cannot be used with silent option."
 msgstr ""
 
-#: src/fuser.c:753
-msgid "You cannot search for only IPv4 and only IPv6 sockets a the same time"
+#: src/fuser.c:737
+msgid "You cannot search for only IPv4 and only IPv6 sockets at the same time"
 msgstr ""
 
-#: src/fuser.c:783
+#: src/fuser.c:771
 #, c-format
 msgid ""
 "\n"
@@ -296,21 +296,21 @@ msgstr ""
 "\n"
 "%*s UTILIZATOR  PID ACCES  COMANDÃ\n"
 
-#: src/fuser.c:807 src/fuser.c:832
+#: src/fuser.c:796 src/fuser.c:821
 msgid "(unknown)"
 msgstr ""
 
-#: src/fuser.c:892
+#: src/fuser.c:882
 #, c-format
 msgid "Cannot stat file %s: %s\n"
 msgstr ""
 
-#: src/fuser.c:983
+#: src/fuser.c:973
 #, c-format
 msgid "Cannot open /etc/mtab: %s\n"
 msgstr ""
 
-#: src/fuser.c:1044
+#: src/fuser.c:1034
 #, c-format
 msgid "Kill process %d ? (y/N) "
 msgstr "Terminã process %d ? (y/N) "
@@ -338,6 +338,8 @@ msgid ""
 "    -n     sort output by PID\n"
 "    -p     show PIDs; implies -c\n"
 "    -u     show uid transitions\n"
+"    -U     use UTF-8 (Unicode) line drawing characters\n"
+"    -V     display version information\n"
 msgstr ""
 "usage: pstree [ -a ] [ -c ] [ -h | -H pid ] [ -l ] [ -n ] [ -p ] [ -u ]\n"
 "              [ -A | -G | -U ] [ pid | user]\n"
@@ -354,18 +356,16 @@ msgstr ""
 "    -p     afiºeazã PID-urile; implicã -c\n"
 "    -u     afiºeazã tranziþiilr uid\n"
 
-#: src/pstree.c:760
+#: src/pstree.c:762
 #, fuzzy, c-format
 msgid "    -Z     show SELinux security contexts\n"
 msgstr ""
 "    -s     aratã SID-urile Flask\n"
 "    -x     aratã contextele de securitate Flask\n"
 
-#: src/pstree.c:763
+#: src/pstree.c:765
 #, fuzzy, c-format
 msgid ""
-"    -U     use UTF-8 (Unicode) line drawing characters\n"
-"    -V     display version information\n"
 "    PID    start at this PID; default is 1 (init)\n"
 "    USER   show only trees rooted at processes of this user\n"
 "\n"

diff --git a/po/sv.po b/po/sv.po
index 92444582b1c650ca907f08388b43fbfeccf8432d..e5983d19dda7f60825bd75fde95c8cdc2eb73cc9 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 21.3\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2005-10-07 17:24+1000\n"
+"POT-Creation-Date: 2005-11-05 15:19+1100\n"
 "PO-Revision-Date: 2004-11-02 13:37-0500\n"
 "Last-Translator: Joakim Mared <joakim at bfcom dot se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -154,7 +154,7 @@ msgid ""
 "       fuser -V\n"
 "Show which processes use the named files, sockets, or filesystems.\n"
 "\n"
-"     -a        display unused files too\n"
+"    -a        display unused files too\n"
 "    -c        mounted FS\n"
 "    -f        silently ignored (for POSIX compatibility)\n"
 "    -i        ask before killing (ignored without -k)\n"
@@ -230,7 +230,7 @@ msgstr ""
 
 #: src/fuser.c:435
 #, c-format
-msgid "Uknown local port AF %d\n"
+msgid "Unknown local port AF %d\n"
 msgstr ""
 
 #: src/fuser.c:484 src/fuser.c:534
@@ -238,56 +238,56 @@ msgstr ""
 msgid "Cannot open protocol file: %s"
 msgstr ""
 
-#: src/fuser.c:657
+#: src/fuser.c:641
 msgid "Namespace option requires an argument."
 msgstr ""
 
-#: src/fuser.c:666
+#: src/fuser.c:650
 msgid "Invalid namespace name"
 msgstr ""
 
-#: src/fuser.c:718
+#: src/fuser.c:702
 msgid "You can only use files with mountpoint option"
 msgstr ""
 
-#: src/fuser.c:738
+#: src/fuser.c:722
 msgid "No process specification given"
 msgstr ""
 
-#: src/fuser.c:743
+#: src/fuser.c:727
 msgid "You cannot use the mounted and mountpoint flags together"
 msgstr ""
 
-#: src/fuser.c:750
+#: src/fuser.c:734
 msgid "all option cannot be used with silent option."
 msgstr ""
 
-#: src/fuser.c:753
-msgid "You cannot search for only IPv4 and only IPv6 sockets a the same time"
+#: src/fuser.c:737
+msgid "You cannot search for only IPv4 and only IPv6 sockets at the same time"
 msgstr ""
 
-#: src/fuser.c:783
+#: src/fuser.c:771
 #, c-format
 msgid ""
 "\n"
 "%*s USER        PID ACCESS COMMAND\n"
 msgstr ""
 
-#: src/fuser.c:807 src/fuser.c:832
+#: src/fuser.c:796 src/fuser.c:821
 msgid "(unknown)"
 msgstr ""
 
-#: src/fuser.c:892
+#: src/fuser.c:882
 #, c-format
 msgid "Cannot stat file %s: %s\n"
 msgstr ""
 
-#: src/fuser.c:983
+#: src/fuser.c:973
 #, c-format
 msgid "Cannot open /etc/mtab: %s\n"
 msgstr ""
 
-#: src/fuser.c:1044
+#: src/fuser.c:1034
 #, fuzzy, c-format
 msgid "Kill process %d ? (y/N) "
 msgstr "Avsluta process %d ? (y/n) "
@@ -315,22 +315,24 @@ msgid ""
 "    -n     sort output by PID\n"
 "    -p     show PIDs; implies -c\n"
 "    -u     show uid transitions\n"
+"    -U     use UTF-8 (Unicode) line drawing characters\n"
+"    -V     display version information\n"
 msgstr ""
 
-#: src/pstree.c:760
+#: src/pstree.c:762
 #, fuzzy, c-format
 msgid "    -Z     show SELinux security contexts\n"
 msgstr "    -x     visa Flask säkerhetssammanhang\n"
 
-#: src/pstree.c:763
-#, c-format
+#: src/pstree.c:765
+#, fuzzy, c-format
 msgid ""
-"    -U     use UTF-8 (Unicode) line drawing characters\n"
-"    -V     display version information\n"
 "    PID    start at this PID; default is 1 (init)\n"
 "    USER   show only trees rooted at processes of this user\n"
 "\n"
 msgstr ""
+"    anv.   visa endast träd med sin rot bland denna användares processer\n"
+"\n"
 
 #: src/pstree.c:772
 #, fuzzy, c-format
@@ -464,13 +466,6 @@ msgstr ""
 #~ msgid "    pid    start at pid, default 1 (init))\n"
 #~ msgstr "    pid    börja vid pid, standardvärde 1 (init))\n"
 
-#~ msgid ""
-#~ "    user   show only trees rooted at processes of that user\n"
-#~ "\n"
-#~ msgstr ""
-#~ "    anv.   visa endast träd med sin rot bland denna användares processer\n"
-#~ "\n"
-
 #~ msgid "pstree comes with ABSOLUTELY NO WARRANTY.\n"
 #~ msgstr ""
 #~ "Följande text är en informell översättning som enbart tillhandahålls i "

diff --git a/po/vi.po b/po/vi.po
index ba050df64cc72b1bcd4838241236b2310aa9c645..4bf893e147690370f96d5650dffe9ae0d7ce680b 100644 (file)
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 21.6pre1\n"
 "Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
-"POT-Creation-Date: 2005-10-07 17:24+1000\n"
+"POT-Creation-Date: 2005-11-05 15:19+1100\n"
 "PO-Revision-Date: 2005-02-24 13:32+0950\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -170,7 +170,7 @@ msgid ""
 "       fuser -V\n"
 "Show which processes use the named files, sockets, or filesystems.\n"
 "\n"
-"     -a        display unused files too\n"
+"    -a        display unused files too\n"
 "    -c        mounted FS\n"
 "    -f        silently ignored (for POSIX compatibility)\n"
 "    -i        ask before killing (ignored without -k)\n"
@@ -250,7 +250,7 @@ msgstr ""
 
 #: src/fuser.c:435
 #, c-format
-msgid "Uknown local port AF %d\n"
+msgid "Unknown local port AF %d\n"
 msgstr ""
 
 #: src/fuser.c:484 src/fuser.c:534
@@ -258,35 +258,35 @@ msgstr ""
 msgid "Cannot open protocol file: %s"
 msgstr ""
 
-#: src/fuser.c:657
+#: src/fuser.c:641
 msgid "Namespace option requires an argument."
 msgstr ""
 
-#: src/fuser.c:666
+#: src/fuser.c:650
 msgid "Invalid namespace name"
 msgstr ""
 
-#: src/fuser.c:718
+#: src/fuser.c:702
 msgid "You can only use files with mountpoint option"
 msgstr ""
 
-#: src/fuser.c:738
+#: src/fuser.c:722
 msgid "No process specification given"
 msgstr ""
 
-#: src/fuser.c:743
+#: src/fuser.c:727
 msgid "You cannot use the mounted and mountpoint flags together"
 msgstr ""
 
-#: src/fuser.c:750
+#: src/fuser.c:734
 msgid "all option cannot be used with silent option."
 msgstr ""
 
-#: src/fuser.c:753
-msgid "You cannot search for only IPv4 and only IPv6 sockets a the same time"
+#: src/fuser.c:737
+msgid "You cannot search for only IPv4 and only IPv6 sockets at the same time"
 msgstr ""
 
-#: src/fuser.c:783
+#: src/fuser.c:771
 #, c-format
 msgid ""
 "\n"
@@ -295,21 +295,21 @@ msgstr ""
 "\n"
 "%*s NGƯỜI_DÙNG        LỆNH TRUY CẬP PID\n"
 
-#: src/fuser.c:807 src/fuser.c:832
+#: src/fuser.c:796 src/fuser.c:821
 msgid "(unknown)"
 msgstr ""
 
-#: src/fuser.c:892
+#: src/fuser.c:882
 #, c-format
 msgid "Cannot stat file %s: %s\n"
 msgstr ""
 
-#: src/fuser.c:983
+#: src/fuser.c:973
 #, c-format
 msgid "Cannot open /etc/mtab: %s\n"
 msgstr ""
 
-#: src/fuser.c:1044
+#: src/fuser.c:1034
 #, c-format
 msgid "Kill process %d ? (y/N) "
 msgstr "Có buốc kết thức tiến trình %d không? (y/N) (có/không)"
@@ -337,6 +337,8 @@ msgid ""
 "    -n     sort output by PID\n"
 "    -p     show PIDs; implies -c\n"
 "    -u     show uid transitions\n"
+"    -U     use UTF-8 (Unicode) line drawing characters\n"
+"    -V     display version information\n"
 msgstr ""
 "cách sử dụng: pstree [ -a ] [ -c ] [ -h | -H pid ] [ -l ] [ -n ] [ -p ] [ -"
 "u ]\n"
@@ -354,18 +356,16 @@ msgstr ""
 "    -p     hiển thị các PID; ngụ ý đối số -c\n"
 "    -u     hiển thị mọi việc chuyển tiếp _uid_\n"
 
-#: src/pstree.c:760
+#: src/pstree.c:762
 #, fuzzy, c-format
 msgid "    -Z     show SELinux security contexts\n"
 msgstr ""
 "    -s     hiển thị các SID loại Flask\n"
 "    -x     hiển thị các ngữ cảnh bảo mật loại Flask\n"
 
-#: src/pstree.c:763
+#: src/pstree.c:765
 #, fuzzy, c-format
 msgid ""
-"    -U     use UTF-8 (Unicode) line drawing characters\n"
-"    -V     display version information\n"
 "    PID    start at this PID; default is 1 (init)\n"
 "    USER   show only trees rooted at processes of this user\n"
 "\n"

diff --git a/src/fuser.c b/src/fuser.c
index ab071d7d4c07d29198db1728d5129386cfc292be..83c901c33bfae4a38e699fe3438005e5f77e7e60 100644 (file)
--- a/src/fuser.c
+++ b/src/fuser.c
@@ -59,7 +59,7 @@ static void check_dir(const pid_t pid, const char *dirname, struct device_list *
 static void check_map(const pid_t pid, const char *filename, struct device_list *dev_head, struct inode_list *ino_head, const uid_t uid, const char access);
 static struct stat *get_pidstat(const pid_t pid, const char *filename);
 static uid_t getpiduid(const pid_t pid);
-static void print_matches(struct names *names_head, const opt_type opts, const int sig_number);
+static int print_matches(struct names *names_head, const opt_type opts, const int sig_number);
 static void kill_matched_proc(struct procs *pptr, const opt_type opts, const int sig_number);
 
 static dev_t get_netdev(void);
@@ -568,23 +568,7 @@ void find_net6_sockets(struct inode_list **ino_list, struct ip6_connections *con
 
 int main(int argc, char *argv[])
 {
-       static struct option long_options[] = {
-               {"all", 0, 0, 'a'},
-               {"mountpoint", 0, 0, 'c'},
-               {"help", 0, 0, 'h'},
-               {"interactive", 0, 0, 'i'},
-               {"kill", 0, 0, 'k'},
-               {"list", 0, 0, 'l'},
-               {"mounted", 0, 0, 'm'},
-               {"name-space", 1, 0, 'n'},
-               {"silent", 0, 0, 's'},
-               {"show-user", 0, 0, 'u'},
-               {"verbose", 0, 0, 'v'},
-               {"version", 0, 0, 'V'},
-               {0, 0, 0, 0}
-       };
        opt_type opts; 
-       struct option *opt_ptr;
        int sig_number;
        int ipv4_only, ipv6_only;
        unsigned char default_namespace = NAMESPACE_FILE;
@@ -767,17 +751,21 @@ int main(int argc, char *argv[])
        debug_match_lists(names_head, match_inodes, match_devices);
 #endif
        scan_procs(names_head, match_inodes, match_devices);
-       print_matches(names_head,opts, sig_number);
-       return 0;
+       return print_matches(names_head,opts, sig_number);
 }
 
-static void print_matches(struct names *names_head, const opt_type opts, const int sig_number)
+/* 
+ * returns 0 if match, 1 if no match
+ */
+static int print_matches(struct names *names_head, const opt_type opts, const int sig_number)
 {
        struct names *nptr;
        struct procs *pptr;
        char first;
        int len;
        struct passwd *pwent = NULL;
+       int have_match = 1;
+       
        
        if (opts & OPT_VERBOSE)
                fprintf(stderr, _("\n%*s USER        PID ACCESS COMMAND\n"),
@@ -791,6 +779,7 @@ static void print_matches(struct names *names_head, const opt_type opts, const i
                        len++;
                }
                for (pptr = nptr->matched_procs; pptr != NULL ; pptr = pptr->next) {
+                       have_match = 0;
                        if (opts & (OPT_VERBOSE|OPT_USER)) {
                                if (pwent == NULL || pwent->pw_uid != pptr->uid)
                                        pwent = getpwuid(pptr->uid);
@@ -848,6 +837,7 @@ static void print_matches(struct names *names_head, const opt_type opts, const i
                        kill_matched_proc(nptr->matched_procs,  opts, sig_number);
 
        } /* next name */
+       return have_match;
 
 }