bump version up

diff --git a/ChangeLog b/ChangeLog
index 1bd7163367842a7b70884e1e5203e70a587700ec..bf344dc2a9387851bf0253128c82bae75bf30121 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
-Changes in 21.6 (not released yet)
+Changes in 21.7
 ===============
+       * 
+
+Changes in 21.6
+===============
+
+2005-03-11
        * Minor typo (specificiation) fixed
        * Added closing bracket in fuser help
        * Added Finnish translation
@@ -17,6 +23,7 @@ Changes in 21.6 (not released yet)
        * Added Vietnamese translation
        * Fixed --enable-flask logic SF#1094205
        * Added Norwegian Bokmaal translation
+       * Fixed groff madness with fuser(1) Debian #298199
 
 Changes in 21.5
 ===============

diff --git a/configure.in b/configure.in
index 1bb7e0c64d9ae3c8ccab79e3e352c97f39f7d722..25583307a3797072d4cc2c1b8e41abf3c6cf203a 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.6pre1])
+AC_INIT([psmisc],[21.7cvs])
 AC_PREREQ(2.59)
 AC_CONFIG_SRCDIR([src/comm.h])
 AC_CONFIG_HEADER([config.h])
@@ -9,6 +9,7 @@ AM_INIT_AUTOMAKE([1.6])
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CPP
+AC_PROG_LN_S
 
 dnl checks for options
 AC_SUBST([FLASK_LINUX])

diff --git a/doc/fuser.1 b/doc/fuser.1
index ef7c3c635dd1536e694909c76d64a1019f073a28..8484a1d3fc98445ef17dd16922f78fa976f3705f 100644 (file)
--- a/doc/fuser.1
+++ b/doc/fuser.1
@@ -84,7 +84,7 @@ Select a different name space. The name spaces \fBfile\fP (file names, the
 default), \fBudp\fP (local UDP ports), and \fBtcp\fP (local TCP ports) are
 supported. For ports, either the port number or the symbolic name can be
 specified. If there is no ambiguity, the shortcut notation
-\fIname\fB/\fIspace\fP (e.g. \fIname\fB/\fIproto\fP) can be used.
+\fIname\fB/\fPIspace\fR (e.g. \fI80\fB/\fPtcp\fR ) can be used.
 .IP \fB\-s\fP
 Silent operation. \fB\-u\fP and \fB\-v\fP are ignored in this mode.
 \fB\-a\fP must not be used with \fB\-s\fP.

diff --git a/po/ca.po b/po/ca.po
index 307c732ed823109552bc14f339a1bce14792d576..71164810736d2d7cd0645b81a5f69bd6d1474a05 100644 (file)
--- a/po/ca.po
+++ b/po/ca.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 21.6cvs\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 11:52+1100\n"
+"Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
+"POT-Creation-Date: 2005-02-23 14:46+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"

diff --git a/po/de.po b/po/de.po
index 10bb5bfa97b48c91c99531155b92930fdacd396f..748e90a7387441e10d34bca39350f00847a3a648 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 20.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 11:52+1100\n"
+"Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
+"POT-Creation-Date: 2005-02-23 14:46+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"

diff --git a/po/eu.po b/po/eu.po
index f4fe5cf17976fb0c50299a12c1508bc21c2bbdcd..0924c1ee87556ca088d14c8992436c7f5b60a668 100644 (file)
--- a/po/eu.po
+++ b/po/eu.po
@@ -66,7 +66,8 @@ msgstr ""
 #: src/killall.c:402
 #, c-format
 msgid "usage: killall [-s sid] [-c context] [ -egiqvw ] [ -signal ] name ...\n"
-msgstr "erabilera: killall [-s sid] [-c context] [ .egiqvw ] [ -signal ] izena ...\n"
+msgstr ""
+"erabilera: killall [-s sid] [-c context] [ .egiqvw ] [ -signal ] izena ...\n"
 
 #: src/killall.c:405
 #, c-format
@@ -116,7 +117,8 @@ msgid ""
 msgstr ""
 "  -d,--sid            hil sid hori duen/duten prozesuak\n"
 "  -c,--context        hil scontext duten prozesuak bakarrik\n"
-"   (-s, -c elkarren artean esklusiboak dira eta beste argumentuen aurretik joan behar dute)\n"
+"   (-s, -c elkarren artean esklusiboak dira eta beste argumentuen aurretik "
+"joan behar dute)\n"
 "\n"
 
 #: src/killall.c:444 src/fuser.c:989 src/pstree.c:743
@@ -137,9 +139,11 @@ msgid ""
 "For more information about these matters, see the files named COPYING.\n"
 msgstr ""
 "PSmisc-k ez du INONGO BERMERIK.\n"
-"Software librea da, eta berriro bana daiteke GNU Lizentzia Publiko Orokorrak\n"
+"Software librea da, eta berriro bana daiteke GNU Lizentzia Publiko "
+"Orokorrak\n"
 "ezarritako baldintzak betez.\n"
-"Gai honi buruzko informazio gehiagorako, ikusi COPYING izena duten fitxategiak.\n"
+"Gai honi buruzko informazio gehiagorako, ikusi COPYING izena duten "
+"fitxategiak.\n"
 
 #: src/killall.c:563
 #, c-format
@@ -243,7 +247,8 @@ msgid ""
 "  udp/tcp names: [local_port][,[rmt_host][,[rmt_port]]]\n"
 "\n"
 msgstr ""
-"usage: fuser [ -a | -s | -c ] [ -n hutsuneak ] [ -seinalea ] [ -kimuv ] izena ...\n"
+"usage: fuser [ -a | -s | -c ] [ -n hutsuneak ] [ -seinalea ] [ -kimuv ] "
+"izena ...\n"
 "             [ - ] [ -n hutsuneak ] [ -seinalea ] [ -kimuv ] izena ...\n"
 "       fuser -l\n"
 "       fuser -V\n"
@@ -255,7 +260,8 @@ msgstr ""
 "    -i        galdetu hil baina lehenago (ignoratua -k gabe)\n"
 "    -l        zerrendatu seinale izenak\n"
 "    -m        muntatutako fitxategi sistemak\n"
-"    -n hutsuneak  bilatu hutsunean espezifikatutako izena (fitxategia, udp, edo tcp)\n"
+"    -n hutsuneak  bilatu hutsunean espezifikatutako izena (fitxategia, udp, "
+"edo tcp)\n"
 "    -s        operazio ixila\n"
 "    -signal   bidali seinalea SIGKILL beharrean\n"
 "    -u        erakutsi erabiltzaileen id-ak\n"
@@ -380,8 +386,11 @@ msgstr "Sakatu 'return' itxitzeko\n"
 msgid "%s: unknown signal; %s -l lists signals.\n"
 msgstr "%s: seinale ezezaguna; %s -l seinaleak zerrendatu.\n"
 
-#~ msgid "usage: pstree [ -a ] [ -c ] [ -h | -H pid ] [ -l ] [ -n ] [ -p ] [ -u ]\n"
-#~ msgstr "erabilera: pstree [ -a ] [ -c ] [ -h | -H pid ] [ -l ] [ -n ] [ -p ] [ -u ]\n"
+#~ msgid ""
+#~ "usage: pstree [ -a ] [ -c ] [ -h | -H pid ] [ -l ] [ -n ] [ -p ] [ -u ]\n"
+#~ msgstr ""
+#~ "erabilera: pstree [ -a ] [ -c ] [ -h | -H pid ] [ -l ] [ -n ] [ -p ] [ -"
+#~ "u ]\n"
 
 #~ msgid "              [ -A | -G | -U ] [ pid | user]\n"
 #~ msgstr "              [ -A | -G | -U ] [ pid | erabiltzailea]\n"
@@ -445,13 +454,19 @@ msgstr "%s: seinale ezezaguna; %s -l seinaleak zerrendatu.\n"
 #~ msgid "pstree comes with ABSOLUTELY NO WARRANTY.\n"
 #~ msgstr "pstree-k ez du INONGO BERMERIK.\n"
 
-#~ msgid "This is free software, and you are welcome to redistribute it under the terms\n"
+#~ msgid ""
+#~ "This is free software, and you are welcome to redistribute it under the "
+#~ "terms\n"
 #~ msgstr ""
-#~ "Software librea da, eta berriro bana daiteke GNU Lizentzia Publiko Orokorrak\n"
+#~ "Software librea da, eta berriro bana daiteke GNU Lizentzia Publiko "
+#~ "Orokorrak\n"
 #~ "ezarritako baldintzak betez.\n"
 
 #~ msgid "of the GNU General Public License.\n"
 #~ msgstr "GNU General Public License lizentziapean.\n"
 
-#~ msgid "For more information about these matters, see the files named COPYING.\n"
-#~ msgstr "Gai honi buruzko informazio gehiagorako, ikusi COPYING izena duten fitxategiak.\n"
+#~ msgid ""
+#~ "For more information about these matters, see the files named COPYING.\n"
+#~ msgstr ""
+#~ "Gai honi buruzko informazio gehiagorako, ikusi COPYING izena duten "
+#~ "fitxategiak.\n"

diff --git a/po/fi.po b/po/fi.po
index 8b8a1369db48ac1da90b026fc183b0abc51556b4..ac6e5060cfc7ef938b437e9f8b8b7b1b59a696c5 100644 (file)
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 21.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 11:52+1100\n"
+"Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
+"POT-Creation-Date: 2005-02-23 14:46+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"

diff --git a/po/fr.po b/po/fr.po
index 45ffba31a1c3a3cbae71299e0647e095accbc54c..b734a1af972b7c5c462bcc0c0d9fc2ef329a9691 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 20.1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 11:52+1100\n"
+"Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
+"POT-Creation-Date: 2005-02-23 14:46+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"

diff --git a/po/it.po b/po/it.po
index 9b4b717cdfe1675ee0a9161911c8cfac56fdc938..b395f0390ce74d21cf519c7fefaaa817b6264085 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -65,7 +65,8 @@ msgstr ""
 #: src/killall.c:402
 #, c-format
 msgid "usage: killall [-s sid] [-c context] [ -egiqvw ] [ -signal ] name ...\n"
-msgstr "Uso: killall [-s sid] [-c CONTESTO] [ -egiqvw ] [ -SEGNALE ] NOME ...\n"
+msgstr ""
+"Uso: killall [-s sid] [-c CONTESTO] [ -egiqvw ] [ -SEGNALE ] NOME ...\n"
 
 #: src/killall.c:405
 #, c-format
@@ -93,7 +94,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 dei processi invece del processo\n"
 "  -i,--interactive    chiede conferma prima di terminare\n"

diff --git a/po/nb.po b/po/nb.po
index 7640a8bf60fa956a019e52d15f4daf03f472ee9c..3a5bfcf9623f8ffb9576ed9abb4d68306fe20430 100644 (file)
--- a/po/nb.po
+++ b/po/nb.po
@@ -79,7 +79,8 @@ msgstr ""
 #: src/killall.c:402
 #, c-format
 msgid "usage: killall [-s sid] [-c context] [ -egiqvw ] [ -signal ] name ...\n"
-msgstr "Bruksmåte: killall [-s sid] [-c kontekst] [ -egiqvw ] [ -signal ] navn ...\n"
+msgstr ""
+"Bruksmåte: killall [-s sid] [-c kontekst] [ -egiqvw ] [ -signal ] navn ...\n"
 
 #: src/killall.c:405
 #, c-format
@@ -258,7 +259,8 @@ 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"
@@ -359,7 +361,8 @@ msgstr ""
 "    -U     tegn linjer med UTF-8-tegn (Unicode)\\n\n"
 "    -V     vis programversjon\\n\n"
 "    pid    begynn med angitt pid, standard er 1 (init)\\n\n"
-"    bruker bare vis trær med opphav fra prosesser tilhørende denne brukeren\\n\\n\n"
+"    bruker bare vis trær med opphav fra prosesser tilhørende denne brukeren"
+"\\n\\n\n"
 
 #: src/pstree.c:741
 #, c-format

diff --git a/po/nl.po b/po/nl.po
index 532722a37478f65b692258fe7312cd1cf47c96d2..d0286b7b0d0054426f37f8cf08e247061d91c78c 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -242,7 +242,8 @@ msgid ""
 "  udp/tcp names: [local_port][,[rmt_host][,[rmt_port]]]\n"
 "\n"
 msgstr ""
-"Gebruik:  fuser [ -a | -s | -c ] [ -n RUIMTE ] [ -SIGNAAL ] [ -kimuv ] NAAM...\n"
+"Gebruik:  fuser [ -a | -s | -c ] [ -n RUIMTE ] [ -SIGNAAL ] [ -kimuv ] "
+"NAAM...\n"
 "                [ - ] [ -n RUIMTE ] [ -SIGNAAL ] [ -kimuv ] NAAM...\n"
 "          fuser -l\n"
 "          fuser -V\n"

diff --git a/po/pl.po b/po/pl.po
index 2e24aaa9a2ad85f86531ff09355de5beac70da80..93be86641228e305d2f58ec0a930f181a7d624f0 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -64,7 +64,8 @@ msgstr ""
 #: src/killall.c:402
 #, c-format
 msgid "usage: killall [-s sid] [-c context] [ -egiqvw ] [ -signal ] name ...\n"
-msgstr "sk³adnia: killall [-s sid] [-c kontekst] [ -egiqvw ] [ -sygna³ ] nazwa ...\n"
+msgstr ""
+"sk³adnia: killall [-s sid] [-c kontekst] [ -egiqvw ] [ -sygna³ ] nazwa ...\n"
 
 #: src/killall.c:405
 #, c-format
@@ -92,8 +93,10 @@ 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"
@@ -113,7 +116,8 @@ msgid ""
 "\n"
 msgstr ""
 "  -d,--sid            zabicie tylko procesu(ów) maj±cych dany sid\n"
-"  -c,--context        zabicie tylko procesu(ów) maj±cych dany kontekst bezp.\n"
+"  -c,--context        zabicie tylko procesu(ów) maj±cych dany kontekst "
+"bezp.\n"
 "   (-s i -c wzajemnie siê wykluczaj± i musz± poprzedzaæ inne argumenty)\n"
 
 #: src/killall.c:444 src/fuser.c:989 src/pstree.c:743
@@ -240,7 +244,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"

diff --git a/po/pt.po b/po/pt.po
index 4cecca13f98611c1f99f5760d6c3a990a3f2e47c..2eab6d1d2af4d1c12d4b702d960d111b3afb162c 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 1.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 11:52+1100\n"
+"Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
+"POT-Creation-Date: 2005-02-23 14:46+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"

diff --git a/po/ro.po b/po/ro.po
index 55f519cc2d7164a44f9b573a095e2c37e2c1607f..d23e6e27b00719e037fdbdfd84f2b56a47677c60 100644 (file)
--- a/po/ro.po
+++ b/po/ro.po
@@ -67,7 +67,8 @@ msgstr ""
 #: src/killall.c:402
 #, c-format
 msgid "usage: killall [-s sid] [-c context] [ -egiqvw ] [ -signal ] name ...\n"
-msgstr "folosire: killall [-s sid] [-c context] [ -egiqvw ] [ -signal ] nume ...\n"
+msgstr ""
+"folosire: killall [-s sid] [-c context] [ -egiqvw ] [ -signal ] nume ...\n"
 
 #: src/killall.c:405
 #, c-format
@@ -245,7 +246,8 @@ msgid ""
 "  udp/tcp names: [local_port][,[rmt_host][,[rmt_port]]]\n"
 "\n"
 msgstr ""
-"folosire: fuser [ -a | -s | -c ] [ -n spaþiu ] [ -signal ] [ -kimuv ] nume ...\n"
+"folosire: fuser [ -a | -s | -c ] [ -n spaþiu ] [ -signal ] [ -kimuv ] "
+"nume ...\n"
 "             [ - ] [ -n spaþiu ] [ -signal ] [ -kimuv ] nume ...\n"
 "       fuser -l\n"
 "       fuser -V\n"
@@ -344,7 +346,8 @@ msgstr ""
 "   -U      foloseºte caractere de desenare UTF-8 (Unicode)\n"
 "   -V      afiºeazã informaþii despre versiune\n"
 "   pid     începe la pid, implicit 1 (init)\n"
-"   utiliz  aratã numai arborii cu rãdacinã la procesele acestui utiliz[ator]\n"
+"   utiliz  aratã numai arborii cu rãdacinã la procesele acestui utiliz"
+"[ator]\n"
 "\n"
 
 #: src/pstree.c:741

diff --git a/po/sv.po b/po/sv.po
index 5c7e04568dafe777be7bdddc399bc5506f4400ec..cc31af37b402d139640e91c6efd4c1bf30207722 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: psmisc 21.3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-23 11:52+1100\n"
+"Report-Msgid-Bugs-To: csmall@small.dropbear.id.au\n"
+"POT-Creation-Date: 2005-02-23 14:46+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"

diff --git a/po/vi.po b/po/vi.po
index f977b0ebbe3196f25c8de2dda6555583db3ed2ef..1d4ebc5f09ea5b5aa9ad136615713e44d1041a49 100644 (file)
--- a/po/vi.po
+++ b/po/vi.po
@@ -64,7 +64,9 @@ msgstr ""
 #: src/killall.c:402
 #, c-format
 msgid "usage: killall [-s sid] [-c context] [ -egiqvw ] [ -signal ] name ...\n"
-msgstr "cách sử dụng: killall [-s sid] [-c ngữ_cảnh] [ -egiqvw ] [ -tín_hiệu ] tên ...\n"
+msgstr ""
+"cách sử dụng: killall [-s sid] [-c ngữ_cảnh] [ -egiqvw ] [ -tín_hiệu ] "
+"tên ...\n"
 
 #: src/killall.c:405
 #, c-format
@@ -241,7 +243,8 @@ msgid ""
 "  udp/tcp names: [local_port][,[rmt_host][,[rmt_port]]]\n"
 "\n"
 msgstr ""
-"cách sử dụng: fuser [ -a | -s | -c ] [ -n space ] [ -signal ] [ -kimuv ] name ...\n"
+"cách sử dụng: fuser [ -a | -s | -c ] [ -n space ] [ -signal ] [ -kimuv ] "
+"name ...\n"
 "             [ - ] [ -n space ] [ -signal ] [ -kimuv ] tên ...\n"
 "       fuser -l\n"
 "       fuser -V\n"
@@ -253,7 +256,8 @@ msgstr ""
 "    -i        xin trước khi buộc kết thứ (sẽ bỏ qua nếu không có -k)\n"
 "    -l        _ghi danh sách_ tên tín hiệu\n"
 "    -m      hệ thống tập tin (FS) được _lắp_\n"
-"    -n space  tìm kiếm trong _miền tên_ (namespace) ấy (tập tin, udp, hay tcp)\n"
+"    -n space  tìm kiếm trong _miền tên_ (namespace) ấy (tập tin, udp, hay "
+"tcp)\n"
 "    -s        thi hành _âm thầm_\n"
 "    -signal   gởi _tín hiệu_ thay thế lệnh SIGKILL\n"
 "    -u        trình bày ID của các _người dùng_\n"
@@ -263,7 +267,8 @@ msgstr ""
 "    -6        tìm kiếm chỉ ổ cắm loại IPv6\n"
 "    -         lập tùy chọn lại\n"
 "\n"
-"  tên udp/tcp: [local_port][,[rmt_host][,[rmt_port]]] (cổng địa phương, máy chủ từ xa, cổng từ xa)\n"
+"  tên udp/tcp: [local_port][,[rmt_host][,[rmt_port]]] (cổng địa phương, máy "
+"chủ từ xa, cổng từ xa)\n"
 "\n"
 
 #: src/fuser.c:987
@@ -304,7 +309,8 @@ msgid ""
 "    -p     show PIDs; implies -c\n"
 "    -u     show uid transitions\n"
 msgstr ""
-"cách sử dụng: pstree [ -a ] [ -c ] [ -h | -H pid ] [ -l ] [ -n ] [ -p ] [ -u ]\n"
+"cách sử dụng: pstree [ -a ] [ -c ] [ -h | -H pid ] [ -l ] [ -n ] [ -p ] [ -"
+"u ]\n"
 "              [ -A | -G | -U ] [ pid | người_dùng]\n"
 "       pstree -V\n"
 "\n"