emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge branch 'master' into newlib

Browse Source 
Conflicts:
	pgrep.c
	proc/sysinfo.c
	ps/output.c
	skill.c
	top/top.c
	top/top.h
	w.c
This commit is contained in:
Craig Small 2015-10-28 21:09:26 +11:00
commit 471cf4cd36
20 changed files with 4022 additions and 723 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -51,6 +51,7 @@ dist_man_MANS = \
ps/ps.1 ps/ps.1
EXTRA_DIST = \ EXTRA_DIST = \
.version \
autogen.sh \ autogen.sh \
contrib \ contrib \
COPYING.LIB \ COPYING.LIB \
@ -138,7 +139,7 @@ w_SOURCES = w.c lib/fileutils.c
# proc/libprocps.la # proc/libprocps.la
# See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html # See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
LIBprocps_CURRENT=4 LIBprocps_CURRENT=5
LIBprocps_REVISION=0 LIBprocps_REVISION=0
LIBprocps_AGE=0 LIBprocps_AGE=0

16
NEWS
View File

@ -1,8 +1,24 @@
procps-ng-NEXT procps-ng-NEXT
---------------- ----------------
* ps: sort by cgroup Debian #692279
* ps: display control group name with -o cgname
procps-ng-3.3.11
----------------
* libprocps API 5:0:0
* pgrep: don't crash with -a -w flags. Merge 33, Debian #768190 * pgrep: don't crash with -a -w flags. Merge 33, Debian #768190
* skill: command line with signal number interpreted correctly * skill: command line with signal number interpreted correctly
* pmap: print process name even if smaps is unreadable Debian #775624 * pmap: print process name even if smaps is unreadable Debian #775624
* ps: sort by etimes column, uses etime Debian #794619
* ps, top: Add support for LXC containers. Ubuntu #1174911
* w: work with smaller window sizes Debian #183394
* w: correctly find "best" proc with pid wrap
* library: use merged systemd library Debian #731256
* kill,skill,pkill: fix option parsing
* top once again will fully honor a saved rcfile,
without requiring --disable-modern-top. Debian #762928, #762947
* vmstat: Not crash if partition appears before disk Debian #736628
* free: -s without -c works Debian #733758
procps-ng-3.3.10 procps-ng-3.3.10
---------------- ----------------

3
README.md
View File

@ -1,3 +1,4 @@
[![build status](https://gitlab.com/ci/projects/2142/status.png?ref=master)](https://gitlab.com/ci/projects/2142?ref=master)
procps procps
====== ======
@ -48,4 +49,4 @@ page.
The email list for the developers and users of procps is found at The email list for the developers and users of procps is found at
http://www.freelists.org/archive/procps/ http://www.freelists.org/archive/procps/
This email list discusses the development of procps and is used by distributions This email list discusses the development of procps and is used by distributions
to also forward or discuss bugs. to also forward or discuss bugs.

17
configure.ac
View File

@ -13,7 +13,6 @@ AC_CONFIG_HEADERS([config.h])
# Checks for programs. # Checks for programs.
AC_USE_SYSTEM_EXTENSIONS(_GNU_SOURCE) AC_USE_SYSTEM_EXTENSIONS(_GNU_SOURCE)
AC_PROG_CXX
AC_PROG_AWK AC_PROG_AWK
AC_PROG_CC AC_PROG_CC
AC_PROG_CC_STDC AC_PROG_CC_STDC
@ -149,19 +148,11 @@ AC_ARG_WITH([systemd],
[AS_HELP_STRING([--with-systemd], [enable systemd support])], [AS_HELP_STRING([--with-systemd], [enable systemd support])],
[], [with_systemd=no] [], [with_systemd=no]
) )
if test "x$with_systemd" != xno; then AS_IF([test "x$with_systemd" != "xno"], [
PKG_CHECK_MODULES([SYSTEMD], [libsystemd-login >= 206], [], [ PKG_CHECK_MODULES([SYSTEMD], [libsystemd])
AC_CHECK_LIB(systemd-login, sd_pid_get_slice, [have_systemd=yes], [have_systemd=no])
if test "x$have_systemd" = xno; then
AC_MSG_ERROR([systemd support missing/incomplete (requires >= 206)])
fi
SYSTEMD_LIBS="-lsystemd-login"
])
AM_CONDITIONAL(WITH_SYSTEMD, true)
AC_DEFINE(WITH_SYSTEMD, 1, [enable systemd support]) AC_DEFINE(WITH_SYSTEMD, 1, [enable systemd support])
else ])
AM_CONDITIONAL(WITH_SYSTEMD, false) AM_CONDITIONAL([WITH_SYSTEMD], [test x$with_systemd != xno])
fi
# AC_ARG_ENABLEs # AC_ARG_ENABLEs
AC_ARG_ENABLE([pidof], AC_ARG_ENABLE([pidof],

3
free.c
View File

@ -150,7 +150,7 @@ static const char *scale_size(unsigned long size, int flags, struct commandline_
/* human readable output */ /* human readable output */
up = nextup; up = nextup;
for (i = 1; up[0] != '0'; i++, up++) { for (i = 1; up[0] != 0; i++, up++) {
switch (i) { switch (i) {
case 1: case 1:
if (4 >= snprintf(buf, sizeof(buf), "%ld%c", (long)size * 1024, *up)) if (4 >= snprintf(buf, sizeof(buf), "%ld%c", (long)size * 1024, *up))
@ -326,6 +326,7 @@ int main(int argc, char **argv)
break; break;
case 's': case 's':
flags |= FREE_REPEAT; flags |= FREE_REPEAT;
errno = 0;
args.repeat_interval = (1000000 * strtof(optarg, &endptr)); args.repeat_interval = (1000000 * strtof(optarg, &endptr));
if (errno || optarg == endptr || (endptr && *endptr)) if (errno || optarg == endptr || (endptr && *endptr))
xerrx(EXIT_FAILURE, _("seconds argument `%s' failed"), optarg); xerrx(EXIT_FAILURE, _("seconds argument `%s' failed"), optarg);

3367
man-po/pl.po Normal file
View File

File diff suppressed because it is too large Load Diff

12
pidof.c
View File

@ -106,20 +106,18 @@ static char *pid_link (pid_t pid, const char *base_name)
{ {
char link [1000]; char link [1000];
char *result; char *result;
int path_alloc_size; ssize_t path_alloc_size;
int len; ssize_t len;
snprintf(link, sizeof(link), "/proc/%d/%s", pid, base_name); snprintf(link, sizeof(link), "/proc/%d/%s", pid, base_name);
len = path_alloc_size = 0; len = path_alloc_size = 0;
result = NULL; result = NULL;
do { do {
if (len == path_alloc_size) { grow_size(path_alloc_size);
grow_size (path_alloc_size); result = xrealloc(result, path_alloc_size);
result = (char *) xrealloc (result, path_alloc_size);
}
if ((len = readlink(link, result, path_alloc_size - 1)) < 0) { if ((len = readlink(link, result, path_alloc_size)) < 0) {
len = 0; len = 0;
break; break;
} }

182
po/de.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: procps-ng-3.3.10-rc1\n" "Project-Id-Version: procps-ng-3.3.10-rc1\n"
"Report-Msgid-Bugs-To: procps@freelists.org\n" "Report-Msgid-Bugs-To: procps@freelists.org\n"
"POT-Creation-Date: 2015-06-19 20:33+1000\n" "POT-Creation-Date: 2015-08-09 15:59+1000\n"
"PO-Revision-Date: 2014-09-10 20:18+0100\n" "PO-Revision-Date: 2014-09-10 20:18+0100\n"
"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n" "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
"Language-Team: German <translation-team-de@lists.sourceforge.net>\n" "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@ -18,7 +18,7 @@ msgstr ""
"X-Generator: Poedit 1.5.4\n" "X-Generator: Poedit 1.5.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: free.c:74 slabtop.c:189 uptime.c:59 w.c:447 #: free.c:74 slabtop.c:189 uptime.c:59 w.c:449
#, c-format #, c-format
msgid " %s [options]\n" msgid " %s [options]\n"
msgstr " %s [OPTIONEN]\n" msgstr " %s [OPTIONEN]\n"
@ -106,7 +106,7 @@ msgstr " -c N, --count N Ausgabe N-mal wiederholen, dann beenden\n"
msgid " -w, --wide wide output\n" msgid " -w, --wide wide output\n"
msgstr " -w, --wide breite Ausgabe\n" msgstr " -w, --wide breite Ausgabe\n"
#: free.c:95 w.c:456 #: free.c:95 w.c:458
msgid " --help display this help and exit\n" msgid " --help display this help and exit\n"
msgstr " --help diese Hilfe anzeigen und beenden\n" msgstr " --help diese Hilfe anzeigen und beenden\n"
@ -114,26 +114,26 @@ msgstr " --help diese Hilfe anzeigen und beenden\n"
msgid "Multiple unit options doesn't make sense." msgid "Multiple unit options doesn't make sense."
msgstr "" msgstr ""
#: free.c:328 #: free.c:329
#, c-format #, c-format
msgid "seconds argument `%s' failed" msgid "seconds argument `%s' failed"
msgstr "Sekunden-Argument »%s« fehlgeschlagen " msgstr "Sekunden-Argument »%s« fehlgeschlagen "
#: free.c:331 #: free.c:332
#, c-format #, c-format
msgid "seconds argument `%s' is not positive number" msgid "seconds argument `%s' is not positive number"
msgstr "Sekunden-Argument »%s« ist keine positive Zahl" msgstr "Sekunden-Argument »%s« ist keine positive Zahl"
#: free.c:337 #: free.c:338
msgid "failed to parse count argument" msgid "failed to parse count argument"
msgstr "Anzahl im Argument konnte nicht verarbeitet werden" msgstr "Anzahl im Argument konnte nicht verarbeitet werden"
#: free.c:340 #: free.c:341
#, c-format #, c-format
msgid "failed to parse count argument: '%s'" msgid "failed to parse count argument: '%s'"
msgstr "Anzahl im Argument konnte nicht verarbeitet werden: »%s«" msgstr "Anzahl im Argument konnte nicht verarbeitet werden: »%s«"
#: free.c:361 #: free.c:362
#, c-format #, c-format
msgid "" msgid ""
" total used free shared buffers " " total used free shared buffers "
@ -142,7 +142,7 @@ msgstr ""
" gesamt benutzt frei gemeins. Puffer " " gesamt benutzt frei gemeins. Puffer "
"Cache verfügbar" "Cache verfügbar"
#: free.c:363 #: free.c:364
#, c-format #, c-format
msgid "" msgid ""
" total used free shared buff/cache " " total used free shared buff/cache "
@ -151,23 +151,23 @@ msgstr ""
" gesamt benutzt frei gemns. Puffer/Cache " " gesamt benutzt frei gemns. Puffer/Cache "
"verfügbar" "verfügbar"
#: free.c:366 #: free.c:367
msgid "Mem:" msgid "Mem:"
msgstr "Speicher:" msgstr "Speicher:"
#: free.c:386 #: free.c:387
msgid "Low:" msgid "Low:"
msgstr "Niedrig:" msgstr "Niedrig:"
#: free.c:392 #: free.c:393
msgid "High:" msgid "High:"
msgstr "Hoch:" msgstr "Hoch:"
#: free.c:399 #: free.c:400
msgid "Swap:" msgid "Swap:"
msgstr "Swap:" msgstr "Swap:"
#: free.c:406 #: free.c:407
msgid "Total:" msgid "Total:"
msgstr "Gesamt:" msgstr "Gesamt:"
@ -323,11 +323,11 @@ msgstr "Keine Zahl: %s"
msgid "Error reading reference namespace information\n" msgid "Error reading reference namespace information\n"
msgstr "Fehler beim Lesen der Informationen für den Referenz-Namensraum\n" msgstr "Fehler beim Lesen der Informationen für den Referenz-Namensraum\n"
#: pgrep.c:610 pidof.c:226 pidof.c:267 sysctl.c:643 #: pgrep.c:610 pidof.c:224 pidof.c:265 sysctl.c:643
msgid "internal error" msgid "internal error"
msgstr "Interner Fehler" msgstr "Interner Fehler"
#: pgrep.c:878 #: pgrep.c:876
#, c-format #, c-format
msgid "" msgid ""
"-L without -F makes no sense\n" "-L without -F makes no sense\n"
@ -336,7 +336,7 @@ msgstr ""
"-L ohne -F ergibt keinen Sinn.\n" "-L ohne -F ergibt keinen Sinn.\n"
"Rufen Sie »%s --help« auf für weitere Informationen." "Rufen Sie »%s --help« auf für weitere Informationen."
#: pgrep.c:885 #: pgrep.c:883
#, c-format #, c-format
msgid "" msgid ""
"pidfile not valid\n" "pidfile not valid\n"
@ -345,7 +345,7 @@ msgstr ""
"pidfile ist ungültig\n" "pidfile ist ungültig\n"
"Rufen Sie »%s --help« auf für weitere Informationen." "Rufen Sie »%s --help« auf für weitere Informationen."
#: pgrep.c:893 #: pgrep.c:891
#, c-format #, c-format
msgid "" msgid ""
"only one pattern can be provided\n" "only one pattern can be provided\n"
@ -354,7 +354,7 @@ msgstr ""
"nur ein Muster kann angegeben werden\n" "nur ein Muster kann angegeben werden\n"
"Rufen Sie »%s --help« auf für weitere Informationen." "Rufen Sie »%s --help« auf für weitere Informationen."
#: pgrep.c:897 #: pgrep.c:895
#, c-format #, c-format
msgid "" msgid ""
"no matching criteria specified\n" "no matching criteria specified\n"
@ -363,12 +363,12 @@ msgstr ""
"keine Übereinstimmungskriterien angegeben\n" "keine Übereinstimmungskriterien angegeben\n"
"Rufen Sie »%s --help« auf für weitere Informationen." "Rufen Sie »%s --help« auf für weitere Informationen."
#: pgrep.c:924 #: pgrep.c:922
#, c-format #, c-format
msgid "%s killed (pid %lu)\n" msgid "%s killed (pid %lu)\n"
msgstr "%s abgewürgt (PID %lu)\n" msgstr "%s abgewürgt (PID %lu)\n"
#: pgrep.c:930 #: pgrep.c:928
#, c-format #, c-format
msgid "killing pid %ld failed" msgid "killing pid %ld failed"
msgstr "Abwürgen von Prozess-ID %ld fehlgeschlagen" msgstr "Abwürgen von Prozess-ID %ld fehlgeschlagen"
@ -399,7 +399,7 @@ msgstr ""
" -o, --omit-pid <PID, …> Prozesse mit den angegebenen PID(s)\n" " -o, --omit-pid <PID, …> Prozesse mit den angegebenen PID(s)\n"
" auslassen\n" " auslassen\n"
#: pidof.c:270 #: pidof.c:268
#, c-format #, c-format
msgid "illegal omit pid value (%s)!\n" msgid "illegal omit pid value (%s)!\n"
msgstr "Ungültiger Wert für auszulassende PID (%s)!\n" msgstr "Ungültiger Wert für auszulassende PID (%s)!\n"
@ -553,8 +553,8 @@ msgstr " gesamt %16ldK\n"
msgid " total %8ldK\n" msgid " total %8ldK\n"
msgstr " gesamt %8ldK\n" msgstr " gesamt %8ldK\n"
#: pmap.c:767 skill.c:502 skill.c:535 skill.c:624 tload.c:128 tload.c:133 #: pmap.c:767 skill.c:500 skill.c:533 skill.c:620 tload.c:128 tload.c:133
#: vmstat.c:959 vmstat.c:968 watch.c:707 #: vmstat.c:959 vmstat.c:968 watch.c:708
msgid "failed to parse argument" msgid "failed to parse argument"
msgstr "Argument konnte nicht eingelesen werden" msgstr "Argument konnte nicht eingelesen werden"
@ -1550,12 +1550,12 @@ msgstr "-T mit H/-m/m, aber keine PID für SPID zum Folgen"
msgid "-L with H/-m/m but no PID/PGID/SID/SESS for NLWP to follow" msgid "-L with H/-m/m but no PID/PGID/SID/SESS for NLWP to follow"
msgstr "-L mit H/-m/m, aber keine PID/PGID/SID/SESS für NLWP zum Folgen" msgstr "-L mit H/-m/m, aber keine PID/PGID/SID/SESS für NLWP zum Folgen"
#: pwdx.c:38 #: pwdx.c:37
#, c-format #, c-format
msgid " %s [options] pid...\n" msgid " %s [options] pid...\n"
msgstr " %s [Optionen] pid …\n" msgstr " %s [Optionen] pid …\n"
#: pwdx.c:114 #: pwdx.c:113
#, c-format #, c-format
msgid "invalid process id: %s" msgid "invalid process id: %s"
msgstr "ungültige Prozess‐ID: %s" msgstr "ungültige Prozess‐ID: %s"
@ -1715,56 +1715,56 @@ msgstr ""
"Negative Prioritätskennziffern sind Benutzern mit Administratorrechten\n" "Negative Prioritätskennziffern sind Benutzern mit Administratorrechten\n"
"vorbehalten.\n" "vorbehalten.\n"
#: skill.c:462 #: skill.c:457
#, c-format #, c-format
msgid "unknown signal name %s" msgid "unknown signal name %s"
msgstr "Unbekannter Signalname %s" msgstr "Unbekannter Signalname %s"
#: skill.c:482 #: skill.c:477
#, c-format #, c-format
msgid "invalid argument %c" msgid "invalid argument %c"
msgstr "ungültiges Argument %c" msgstr "ungültiges Argument %c"
#: skill.c:515 #: skill.c:513
#, c-format #, c-format
msgid "something at line %d\n" msgid "something at line %d\n"
msgstr "etwas in Zeile %d\n" msgstr "etwas in Zeile %d\n"
#: skill.c:538 #: skill.c:536
#, c-format #, c-format
msgid "priority %lu out of range" msgid "priority %lu out of range"
msgstr "Priorität %lu ist außerhalb des Wertebereiches" msgstr "Priorität %lu ist außerhalb des Wertebereiches"
#: skill.c:653 #: skill.c:649
#, c-format #, c-format
msgid "invalid pid number %s" msgid "invalid pid number %s"
msgstr "ungültige PID-Nummer %s" msgstr "ungültige PID-Nummer %s"
#: skill.c:657 #: skill.c:653
msgid "error reading reference namespace information" msgid "error reading reference namespace information"
msgstr "Fehler beim Lesen der Informationen für Referenz-Namensraum" msgstr "Fehler beim Lesen der Informationen für Referenz-Namensraum"
#: skill.c:665 #: skill.c:661
msgid "invalid namespace list" msgid "invalid namespace list"
msgstr "Ungültige Namensraumliste" msgstr "Ungültige Namensraumliste"
#: skill.c:703 #: skill.c:699
msgid "no process selection criteria" msgid "no process selection criteria"
msgstr "Keine Kriterien zur Prozessauswahl" msgstr "Keine Kriterien zur Prozessauswahl"
#: skill.c:706 #: skill.c:702
msgid "general flags may not be repeated" msgid "general flags may not be repeated"
msgstr "Allgemeine Schalter dürfen nicht wiederholt angegeben werden" msgstr "Allgemeine Schalter dürfen nicht wiederholt angegeben werden"
#: skill.c:709 #: skill.c:705
msgid "-i makes no sense with -v, -f, and -n" msgid "-i makes no sense with -v, -f, and -n"
msgstr "-i ergibt keinen Sinn mit -v, -f und -n" msgstr "-i ergibt keinen Sinn mit -v, -f und -n"
#: skill.c:711 #: skill.c:707
msgid "-v makes no sense with -i and -f" msgid "-v makes no sense with -i and -f"
msgstr "-v ergibt keinen Sinn mit -i und -f" msgstr "-v ergibt keinen Sinn mit -i und -f"
#: skill.c:756 #: skill.c:752
#, c-format #, c-format
msgid "skill: \"%s\" is not supported\n" msgid "skill: \"%s\" is not supported\n"
msgstr "skill: »%s« wird nicht unterstützt\n" msgstr "skill: »%s« wird nicht unterstützt\n"
@ -2120,7 +2120,7 @@ msgid "Effective User Id"
msgstr "Effektive Benutzer‐ID" msgstr "Effektive Benutzer‐ID"
#. Translation Hint: maximum 'USER' = 7 #. Translation Hint: maximum 'USER' = 7
#: top/top_nls.c:133 w.c:590 #: top/top_nls.c:133 w.c:587
msgid "USER" msgid "USER"
msgstr "USER" msgstr "USER"
@ -3422,7 +3422,7 @@ msgstr ""
#: top/top_nls.c:646 #: top/top_nls.c:646
#, c-format #, c-format
msgid "" msgid ""
"Inspection~2 Pause at: pid ~1%d~6 running ~1%s~6 as user ~1%s~6\n" "Inspection~2 Pause at: pid ~1%d~6, running ~1%s~6\n"
"Use~2: left/right then <Enter> to ~1select~5 an option; 'q' or <Esc> to " "Use~2: left/right then <Enter> to ~1select~5 an option; 'q' or <Esc> to "
"~1end~5 !\n" "~1end~5 !\n"
"Options~2: ~1%s\n" "Options~2: ~1%s\n"
@ -3431,7 +3431,7 @@ msgstr ""
#: top/top_nls.c:651 #: top/top_nls.c:651
#, c-format #, c-format
msgid "" msgid ""
"Inspection~2 View at: ~1%s~3, ~1%s~3, ~1%s~3. Locating: ~1%s~6\n" "Inspection~2 View at pid: ~1%s~3, running ~1%s~3. Locating: ~1%s~6\n"
"Use~2: left/right/up/down/etc to ~1navigate~5 the output; 'L'/'&' to " "Use~2: left/right/up/down/etc to ~1navigate~5 the output; 'L'/'&' to "
"~1locate~5/~1next~5.\n" "~1locate~5/~1next~5.\n"
"Or~2: <Enter> to ~1select another~5; 'q' or <Esc> to ~1end~5 !\n" "Or~2: <Enter> to ~1select another~5; 'q' or <Esc> to ~1end~5 !\n"
@ -3929,22 +3929,22 @@ msgstr "-S benötigt k, K, m oder M (Vorgabe ist KiB)"
msgid "partition was not found\n" msgid "partition was not found\n"
msgstr "Partition wurde nicht gefunden\n" msgstr "Partition wurde nicht gefunden\n"
#: watch.c:89 #: watch.c:90
#, c-format #, c-format
msgid " %s [options] command\n" msgid " %s [options] command\n"
msgstr " %s [Optionen] Befehl\n" msgstr " %s [Optionen] Befehl\n"
#: watch.c:91 #: watch.c:92
msgid " -b, --beep beep if command has a non-zero exit\n" msgid " -b, --beep beep if command has a non-zero exit\n"
msgstr "" msgstr ""
" -e, --errexit Warnklang abspielen, wenn die Ausgabe des\n" " -e, --errexit Warnklang abspielen, wenn die Ausgabe des\n"
" Befehls nicht Null ist\n" " Befehls nicht Null ist\n"
#: watch.c:92 #: watch.c:93
msgid " -c, --color interpret ANSI color and style sequences\n" msgid " -c, --color interpret ANSI color and style sequences\n"
msgstr " -c, --color ANSI-Farb- und Stilsequenzen interpretieren\n" msgstr " -c, --color ANSI-Farb- und Stilsequenzen interpretieren\n"
#: watch.c:93 #: watch.c:94
msgid "" msgid ""
" -d, --differences[=<permanent>]\n" " -d, --differences[=<permanent>]\n"
" highlight changes between updates\n" " highlight changes between updates\n"
@ -3953,181 +3953,164 @@ msgstr ""
" Änderungen zwischen Aktualisierungen\n" " Änderungen zwischen Aktualisierungen\n"
" hervorheben\n" " hervorheben\n"
#: watch.c:95 #: watch.c:96
msgid " -e, --errexit exit if command has a non-zero exit\n" msgid " -e, --errexit exit if command has a non-zero exit\n"
msgstr "" msgstr ""
" -e, --errexit abbrechen, wenn die Ausgabe des Befehls\n" " -e, --errexit abbrechen, wenn die Ausgabe des Befehls\n"
" nicht Null ist\n" " nicht Null ist\n"
#: watch.c:96 #: watch.c:97
msgid " -g, --chgexit exit when output from command changes\n" msgid " -g, --chgexit exit when output from command changes\n"
msgstr "" msgstr ""
" -g, --chgexit beenden, wenn sich die Ausgabe des Befehls\n" " -g, --chgexit beenden, wenn sich die Ausgabe des Befehls\n"
" ändert\n" " ändert\n"
#: watch.c:97 #: watch.c:98
msgid " -n, --interval <secs> seconds to wait between updates\n" msgid " -n, --interval <secs> seconds to wait between updates\n"
msgstr "" msgstr ""
" -n, --interval <Sek> Wartezeit zwischen Aktualisierungen\n" " -n, --interval <Sek> Wartezeit zwischen Aktualisierungen\n"
" in Sekunden\n" " in Sekunden\n"
#: watch.c:98 #: watch.c:99
msgid " -p, --precise attempt run command in precise intervals\n" msgid " -p, --precise attempt run command in precise intervals\n"
msgstr "" msgstr ""
" -p, --precise versuchen, den Befehl in präzisen\n" " -p, --precise versuchen, den Befehl in präzisen\n"
" Intervallen auszuführen\n" " Intervallen auszuführen\n"
#: watch.c:99 #: watch.c:100
msgid " -t, --no-title turn off header\n" msgid " -t, --no-title turn off header\n"
msgstr " -t, --no-title Kopfzeile nicht anzeigen\n" msgstr " -t, --no-title Kopfzeile nicht anzeigen\n"
#: watch.c:100 #: watch.c:101
msgid " -x, --exec pass command to exec instead of \"sh -c\"\n" msgid " -x, --exec pass command to exec instead of \"sh -c\"\n"
msgstr "" msgstr ""
" -x, --exec auszuführenden Befehl übergeben anstelle\n" " -x, --exec auszuführenden Befehl übergeben anstelle\n"
" von »sh -c«\n" " von »sh -c«\n"
#: watch.c:103 #: watch.c:104
msgid " -v, --version output version information and exit\n" msgid " -v, --version output version information and exit\n"
msgstr " -v, --version Versionsinformation anzeigen und beenden\n" msgstr " -v, --version Versionsinformation anzeigen und beenden\n"
#: watch.c:375 #: watch.c:376
#, c-format #, c-format
msgid "Every %.1fs: " msgid "Every %.1fs: "
msgstr "Alle %.1fs: " msgstr "Alle %.1fs: "
#: watch.c:436 #: watch.c:437
msgid "unable to create IPC pipes" msgid "unable to create IPC pipes"
msgstr "IPC-Pipes konnten nicht angelegt werden" msgstr "IPC-Pipes konnten nicht angelegt werden"
#: watch.c:446 #: watch.c:447
msgid "unable to fork process" msgid "unable to fork process"
msgstr "Prozess kann nicht geforkt werden" msgstr "Prozess kann nicht geforkt werden"
#: watch.c:451 #: watch.c:452
msgid "dup2 failed" msgid "dup2 failed"
msgstr "dup2 fehlgeschlagen" msgstr "dup2 fehlgeschlagen"
#: watch.c:458 #: watch.c:459
#, c-format #, c-format
msgid "unable to execute '%s'" msgid "unable to execute '%s'"
msgstr "»%s« kann nicht ausgeführt werden" msgstr "»%s« kann nicht ausgeführt werden"
#: watch.c:475 #: watch.c:476
msgid "fdopen" msgid "fdopen"
msgstr "fdopen" msgstr "fdopen"
#: watch.c:621 #: watch.c:622
msgid "waitpid" msgid "waitpid"
msgstr "waitpid" msgstr "waitpid"
#: watch.c:629 #: watch.c:630
msgid "command exit with a non-zero status, press a key to exit" msgid "command exit with a non-zero status, press a key to exit"
msgstr "" msgstr ""
"der Befehl wurde mit einem von Null verschiedenen Exit-Status beendet, " "der Befehl wurde mit einem von Null verschiedenen Exit-Status beendet, "
"drücken Sie eine Taste zum Beenden" "drücken Sie eine Taste zum Beenden"
#: watch.c:754 #: watch.c:755
#, c-format #, c-format
msgid "unicode handling error\n" msgid "unicode handling error\n"
msgstr "Unicode-Verarbeitungsfehler\n" msgstr "Unicode-Verarbeitungsfehler\n"
#: watch.c:760 #: watch.c:761
#, c-format #, c-format
msgid "unicode handling error (malloc)\n" msgid "unicode handling error (malloc)\n"
msgstr "Unicode-Verarbeitungsfehler (malloc)\n" msgstr "Unicode-Verarbeitungsfehler (malloc)\n"
#: w.c:240 w.c:255 #: w.c:241 w.c:256
#, c-format #, c-format
msgid " %2ludays" msgid " %2ludays"
msgstr " %2lu Tage" msgstr " %2lu Tage"
#. Translation Hint: Minutes:Seconds #. Translation Hint: Minutes:Seconds
#. Translation Hint: Hours:Minutes #. Translation Hint: Hours:Minutes
#: w.c:249 w.c:259 #: w.c:250 w.c:260
#, c-format #, c-format
msgid " %2lu:%02um" msgid " %2lu:%02um"
msgstr " %2lu:%02u m" msgstr " %2lu:%02u m"
#. Translation Hint: Seconds:Centiseconds #. Translation Hint: Seconds:Centiseconds
#: w.c:267 #: w.c:268
#, c-format #, c-format
msgid " %2lu.%02us" msgid " %2lu.%02us"
msgstr " %2lu.%02u s" msgstr " %2lu.%02u s"
#: w.c:449 #: w.c:451
msgid " -h, --no-header do not print header\n" msgid " -h, --no-header do not print header\n"
msgstr " -h, --no-header keinen Header ausgeben\n" msgstr " -h, --no-header keinen Header ausgeben\n"
#: w.c:450 #: w.c:452
msgid " -u, --no-current ignore current process username\n" msgid " -u, --no-current ignore current process username\n"
msgstr " -u, --no-current Benutzername des aktuellen Prozesses ignorieren\n" msgstr " -u, --no-current Benutzername des aktuellen Prozesses ignorieren\n"
#: w.c:451 #: w.c:453
msgid " -s, --short short format\n" msgid " -s, --short short format\n"
msgstr " -s, --short Kurzformat\n" msgstr " -s, --short Kurzformat\n"
#: w.c:452 #: w.c:454
msgid " -f, --from show remote hostname field\n" msgid " -f, --from show remote hostname field\n"
msgstr " -f, --from Feld für entfernten Rechnernamen anzeigen\n" msgstr " -f, --from Feld für entfernten Rechnernamen anzeigen\n"
#: w.c:453 #: w.c:455
msgid " -o, --old-style old style output\n" msgid " -o, --old-style old style output\n"
msgstr " -o, --old-style Ausgabe im alten Stil\n" msgstr " -o, --old-style Ausgabe im alten Stil\n"
#: w.c:454 #: w.c:456
msgid "" msgid ""
" -i, --ip-addr display IP address instead of hostname (if possible)\n" " -i, --ip-addr display IP address instead of hostname (if possible)\n"
msgstr "" msgstr ""
" -i, --ip-addr IP-Adresse anstelle des Rechnernamens anzeigen\n" " -i, --ip-addr IP-Adresse anstelle des Rechnernamens anzeigen\n"
" (falls möglich)\n" " (falls möglich)\n"
#: w.c:551 #: w.c:553
#, c-format #, c-format
msgid "" msgid ""
"User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n" "User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n"
msgstr "" msgstr ""
#: w.c:561 #: w.c:563
#, c-format #, c-format
msgid "" msgid ""
"from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n" "from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n"
msgstr "" msgstr ""
#: w.c:573
#, c-format
msgid "%d column window is too narrow"
msgstr "Fenster mit %d Spalten ist zu klein"
#: w.c:575
#, c-format
msgid "%d column width exceeds command buffer size, truncating to %d"
msgstr ""
"die Breite der Spalte %d überschreitet die Puffergröße des Befehls, wird auf "
"%d abgeschnitten "
#: w.c:581
#, c-format
msgid "warning: screen width %d suboptimal"
msgstr "Warnung: Bildschirmbreite %d ist nicht optimal"
#. Translation Hint: Following five uppercase messages are #. Translation Hint: Following five uppercase messages are
#. * headers. Try to keep alignment intact. #. * headers. Try to keep alignment intact.
#: w.c:590 #: w.c:587
#, c-format #, c-format
msgid "%-*s TTY " msgid "%-*s TTY "
msgstr "%-*s TTY " msgstr "%-*s TTY "
#: w.c:592 #: w.c:589
msgid "FROM" msgid "FROM"
msgstr "VON" msgstr "VON"
#: w.c:594 #: w.c:591
#, c-format #, c-format
msgid " LOGIN@ IDLE JCPU PCPU WHAT\n" msgid " LOGIN@ IDLE JCPU PCPU WHAT\n"
msgstr "" msgstr ""
#: w.c:596 #: w.c:593
#, c-format #, c-format
msgid " IDLE WHAT\n" msgid " IDLE WHAT\n"
msgstr "" msgstr ""
@ -4173,3 +4156,14 @@ msgstr ""
#, c-format #, c-format
msgid "%s from %s\n" msgid "%s from %s\n"
msgstr "%s von %s\n" msgstr "%s von %s\n"
#~ msgid "%d column window is too narrow"
#~ msgstr "Fenster mit %d Spalten ist zu klein"
#~ msgid "%d column width exceeds command buffer size, truncating to %d"
#~ msgstr ""
#~ "die Breite der Spalte %d überschreitet die Puffergröße des Befehls, wird "
#~ "auf %d abgeschnitten "
#~ msgid "warning: screen width %d suboptimal"
#~ msgstr "Warnung: Bildschirmbreite %d ist nicht optimal"

186
po/fr.po
View File

@ -22,7 +22,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: procps-ng 3.3.10-rc1\n" "Project-Id-Version: procps-ng 3.3.10-rc1\n"
"Report-Msgid-Bugs-To: procps@freelists.org\n" "Report-Msgid-Bugs-To: procps@freelists.org\n"
"POT-Creation-Date: 2015-06-19 20:33+1000\n" "POT-Creation-Date: 2015-08-09 15:59+1000\n"
"PO-Revision-Date: 2015-03-22 11:32+0100\n" "PO-Revision-Date: 2015-03-22 11:32+0100\n"
"Last-Translator: Stéphane Aulery <lkppo@free.fr>\n" "Last-Translator: Stéphane Aulery <lkppo@free.fr>\n"
"Language-Team: French <traduc@traduc.org>\n" "Language-Team: French <traduc@traduc.org>\n"
@ -32,7 +32,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: free.c:74 slabtop.c:189 uptime.c:59 w.c:447 #: free.c:74 slabtop.c:189 uptime.c:59 w.c:449
#, c-format #, c-format
msgid " %s [options]\n" msgid " %s [options]\n"
msgstr " %s [options]\n" msgstr " %s [options]\n"
@ -121,7 +121,7 @@ msgstr " -c N, --count N répéter l'affichage N fois puis termine\n"
msgid " -w, --wide wide output\n" msgid " -w, --wide wide output\n"
msgstr " -w, --wide sortie large\n" msgstr " -w, --wide sortie large\n"
#: free.c:95 w.c:456 #: free.c:95 w.c:458
msgid " --help display this help and exit\n" msgid " --help display this help and exit\n"
msgstr " --help afficher cette aide et termine\n" msgstr " --help afficher cette aide et termine\n"
@ -129,26 +129,26 @@ msgstr " --help afficher cette aide et termine\n"
msgid "Multiple unit options doesn't make sense." msgid "Multiple unit options doesn't make sense."
msgstr "" msgstr ""
#: free.c:328 #: free.c:329
#, c-format #, c-format
msgid "seconds argument `%s' failed" msgid "seconds argument `%s' failed"
msgstr "l'argument des secondes « %s » n'est pas valable" msgstr "l'argument des secondes « %s » n'est pas valable"
#: free.c:331 #: free.c:332
#, c-format #, c-format
msgid "seconds argument `%s' is not positive number" msgid "seconds argument `%s' is not positive number"
msgstr "l'argument des secondes « %s » n'est pas un nombre positif" msgstr "l'argument des secondes « %s » n'est pas un nombre positif"
#: free.c:337 #: free.c:338
msgid "failed to parse count argument" msgid "failed to parse count argument"
msgstr "l'argument du nombre de répétitions ne peut pas être décodé" msgstr "l'argument du nombre de répétitions ne peut pas être décodé"
#: free.c:340 #: free.c:341
#, c-format #, c-format
msgid "failed to parse count argument: '%s'" msgid "failed to parse count argument: '%s'"
msgstr "échec du décodage de l'argument du nombre de répétitions: « %s »" msgstr "échec du décodage de l'argument du nombre de répétitions: « %s »"
#: free.c:361 #: free.c:362
#, c-format #, c-format
msgid "" msgid ""
" total used free shared buffers " " total used free shared buffers "
@ -157,7 +157,7 @@ msgstr ""
" total utilisé libre partagé tampons " " total utilisé libre partagé tampons "
"cache disponible" "cache disponible"
#: free.c:363 #: free.c:364
#, c-format #, c-format
msgid "" msgid ""
" total used free shared buff/cache " " total used free shared buff/cache "
@ -166,23 +166,23 @@ msgstr ""
" total utilisé libre partagé tamp/cache " " total utilisé libre partagé tamp/cache "
"disponible" "disponible"
#: free.c:366 #: free.c:367
msgid "Mem:" msgid "Mem:"
msgstr "Mem:" msgstr "Mem:"
#: free.c:386 #: free.c:387
msgid "Low:" msgid "Low:"
msgstr "Basse:" msgstr "Basse:"
#: free.c:392 #: free.c:393
msgid "High:" msgid "High:"
msgstr "Haute:" msgstr "Haute:"
#: free.c:399 #: free.c:400
msgid "Swap:" msgid "Swap:"
msgstr "Partition d'échange:" msgstr "Partition d'échange:"
#: free.c:406 #: free.c:407
msgid "Total:" msgid "Total:"
msgstr "Total:" msgstr "Total:"
@ -344,11 +344,11 @@ msgid "Error reading reference namespace information\n"
msgstr "" msgstr ""
"Erreur lors de la lecture des informations de l'espace de nom de référence\n" "Erreur lors de la lecture des informations de l'espace de nom de référence\n"
#: pgrep.c:610 pidof.c:226 pidof.c:267 sysctl.c:643 #: pgrep.c:610 pidof.c:224 pidof.c:265 sysctl.c:643
msgid "internal error" msgid "internal error"
msgstr "erreur interne" msgstr "erreur interne"
#: pgrep.c:878 #: pgrep.c:876
#, c-format #, c-format
msgid "" msgid ""
"-L without -F makes no sense\n" "-L without -F makes no sense\n"
@ -357,7 +357,7 @@ msgstr ""
"-L sans -F n'a pas de sens\n" "-L sans -F n'a pas de sens\n"
"Essayez « %s --help » pour plus d'informations." "Essayez « %s --help » pour plus d'informations."
#: pgrep.c:885 #: pgrep.c:883
#, c-format #, c-format
msgid "" msgid ""
"pidfile not valid\n" "pidfile not valid\n"
@ -366,7 +366,7 @@ msgstr ""
"fichier pid pas valable\n" "fichier pid pas valable\n"
"Essayez « %s --help » pour plus d'informations." "Essayez « %s --help » pour plus d'informations."
#: pgrep.c:893 #: pgrep.c:891
#, c-format #, c-format
msgid "" msgid ""
"only one pattern can be provided\n" "only one pattern can be provided\n"
@ -375,7 +375,7 @@ msgstr ""
"fournissez un seul motif à la fois\n" "fournissez un seul motif à la fois\n"
"Essayez « %s --help » pour plus d'informations." "Essayez « %s --help » pour plus d'informations."
#: pgrep.c:897 #: pgrep.c:895
#, c-format #, c-format
msgid "" msgid ""
"no matching criteria specified\n" "no matching criteria specified\n"
@ -384,12 +384,12 @@ msgstr ""
"aucun critère correspondant spécifié\n" "aucun critère correspondant spécifié\n"
"Essayez « %s --help » pour plus d'informations." "Essayez « %s --help » pour plus d'informations."
#: pgrep.c:924 #: pgrep.c:922
#, c-format #, c-format
msgid "%s killed (pid %lu)\n" msgid "%s killed (pid %lu)\n"
msgstr "%s tué (pid %lu)\n" msgstr "%s tué (pid %lu)\n"
#: pgrep.c:930 #: pgrep.c:928
#, c-format #, c-format
msgid "killing pid %ld failed" msgid "killing pid %ld failed"
msgstr "le pid %ld n'a pu être tué" msgstr "le pid %ld n'a pu être tué"
@ -418,7 +418,7 @@ msgstr ""
msgid " -o, --omit-pid <PID,...> omit processes with PID\n" msgid " -o, --omit-pid <PID,...> omit processes with PID\n"
msgstr " -o, --omit-pid <PID,…> omet les processus avec ce PID\n" msgstr " -o, --omit-pid <PID,…> omet les processus avec ce PID\n"
#: pidof.c:270 #: pidof.c:268
#, c-format #, c-format
msgid "illegal omit pid value (%s)!\n" msgid "illegal omit pid value (%s)!\n"
msgstr "valeur de pid à omettre invalide (%s) !\n" msgstr "valeur de pid à omettre invalide (%s) !\n"
@ -570,8 +570,8 @@ msgstr " total %16ldK\n"
msgid " total %8ldK\n" msgid " total %8ldK\n"
msgstr " total %8ldK\n" msgstr " total %8ldK\n"
#: pmap.c:767 skill.c:502 skill.c:535 skill.c:624 tload.c:128 tload.c:133 #: pmap.c:767 skill.c:500 skill.c:533 skill.c:620 tload.c:128 tload.c:133
#: vmstat.c:959 vmstat.c:968 watch.c:707 #: vmstat.c:959 vmstat.c:968 watch.c:708
msgid "failed to parse argument" msgid "failed to parse argument"
msgstr "échec de l'analyse de l'argument" msgstr "échec de l'analyse de l'argument"
@ -1565,12 +1565,12 @@ msgstr "-T avec H/-m/m mais aucun PID à suivre pour SPID"
msgid "-L with H/-m/m but no PID/PGID/SID/SESS for NLWP to follow" msgid "-L with H/-m/m but no PID/PGID/SID/SESS for NLWP to follow"
msgstr "-L comme H/-m/m mais sans PID/PGID/SID/SESS à suivre pour NLWP" msgstr "-L comme H/-m/m mais sans PID/PGID/SID/SESS à suivre pour NLWP"
#: pwdx.c:38 #: pwdx.c:37
#, c-format #, c-format
msgid " %s [options] pid...\n" msgid " %s [options] pid...\n"
msgstr " %s [options] pid…\n" msgstr " %s [options] pid…\n"
#: pwdx.c:114 #: pwdx.c:113
#, c-format #, c-format
msgid "invalid process id: %s" msgid "invalid process id: %s"
msgstr "ID de processus invalide: %s" msgstr "ID de processus invalide: %s"
@ -1732,57 +1732,57 @@ msgstr ""
"rapide).\n" "rapide).\n"
"Les priorités négatives sont accessibles aux seuls administrateurs.\n" "Les priorités négatives sont accessibles aux seuls administrateurs.\n"
#: skill.c:462 #: skill.c:457
#, c-format #, c-format
msgid "unknown signal name %s" msgid "unknown signal name %s"
msgstr "nom de signal %s inconnu" msgstr "nom de signal %s inconnu"
#: skill.c:482 #: skill.c:477
#, c-format #, c-format
msgid "invalid argument %c" msgid "invalid argument %c"
msgstr "argument %c invalide" msgstr "argument %c invalide"
#: skill.c:515 #: skill.c:513
#, c-format #, c-format
msgid "something at line %d\n" msgid "something at line %d\n"
msgstr "quelque chose à la ligne %d\n" msgstr "quelque chose à la ligne %d\n"
#: skill.c:538 #: skill.c:536
#, c-format #, c-format
msgid "priority %lu out of range" msgid "priority %lu out of range"
msgstr "priorité %lu hors limites" msgstr "priorité %lu hors limites"
#: skill.c:653 #: skill.c:649
#, c-format #, c-format
msgid "invalid pid number %s" msgid "invalid pid number %s"
msgstr "numéro de pid %s invalide" msgstr "numéro de pid %s invalide"
#: skill.c:657 #: skill.c:653
msgid "error reading reference namespace information" msgid "error reading reference namespace information"
msgstr "" msgstr ""
"erreur lors de la lecture de l'information de l'espace de nom de référence" "erreur lors de la lecture de l'information de l'espace de nom de référence"
#: skill.c:665 #: skill.c:661
msgid "invalid namespace list" msgid "invalid namespace list"
msgstr "liste d'espace de noms invalide" msgstr "liste d'espace de noms invalide"
#: skill.c:703 #: skill.c:699
msgid "no process selection criteria" msgid "no process selection criteria"
msgstr "aucun critère de sélection de processus" msgstr "aucun critère de sélection de processus"
#: skill.c:706 #: skill.c:702
msgid "general flags may not be repeated" msgid "general flags may not be repeated"
msgstr "les fanions généraux ne peuvent pas être répétés" msgstr "les fanions généraux ne peuvent pas être répétés"
#: skill.c:709 #: skill.c:705
msgid "-i makes no sense with -v, -f, and -n" msgid "-i makes no sense with -v, -f, and -n"
msgstr "-i n'a pas de sens avec -v, -f et -n" msgstr "-i n'a pas de sens avec -v, -f et -n"
#: skill.c:711 #: skill.c:707
msgid "-v makes no sense with -i and -f" msgid "-v makes no sense with -i and -f"
msgstr "-v n'a pas de sens avec -i et -f" msgstr "-v n'a pas de sens avec -i et -f"
#: skill.c:756 #: skill.c:752
#, c-format #, c-format
msgid "skill: \"%s\" is not supported\n" msgid "skill: \"%s\" is not supported\n"
msgstr "compétence: « %s » n'est pas supporté\n" msgstr "compétence: « %s » n'est pas supporté\n"
@ -2142,7 +2142,7 @@ msgid "Effective User Id"
msgstr "ID util. effectif" msgstr "ID util. effectif"
#. Translation Hint: maximum 'USER' = 7 #. Translation Hint: maximum 'USER' = 7
#: top/top_nls.c:133 w.c:590 #: top/top_nls.c:133 w.c:587
msgid "USER" msgid "USER"
msgstr "UTIL." msgstr "UTIL."
@ -3569,9 +3569,9 @@ msgstr ""
"%s %s:~3 %9.9s~2total,~3 %9.9s~2libr,~3 %9.9s~2util.~3 %9.9s~2dispo %s~3\n" "%s %s:~3 %9.9s~2total,~3 %9.9s~2libr,~3 %9.9s~2util.~3 %9.9s~2dispo %s~3\n"
#: top/top_nls.c:646 #: top/top_nls.c:646
#, c-format #, fuzzy, c-format
msgid "" msgid ""
"Inspection~2 Pause at: pid ~1%d~6 running ~1%s~6 as user ~1%s~6\n" "Inspection~2 Pause at: pid ~1%d~6, running ~1%s~6\n"
"Use~2: left/right then <Enter> to ~1select~5 an option; 'q' or <Esc> to " "Use~2: left/right then <Enter> to ~1select~5 an option; 'q' or <Esc> to "
"~1end~5 !\n" "~1end~5 !\n"
"Options~2: ~1%s\n" "Options~2: ~1%s\n"
@ -3582,9 +3582,9 @@ msgstr ""
"Options~2: ~1%s\n" "Options~2: ~1%s\n"
#: top/top_nls.c:651 #: top/top_nls.c:651
#, c-format #, fuzzy, c-format
msgid "" msgid ""
"Inspection~2 View at: ~1%s~3, ~1%s~3, ~1%s~3. Locating: ~1%s~6\n" "Inspection~2 View at pid: ~1%s~3, running ~1%s~3. Locating: ~1%s~6\n"
"Use~2: left/right/up/down/etc to ~1navigate~5 the output; 'L'/'&' to " "Use~2: left/right/up/down/etc to ~1navigate~5 the output; 'L'/'&' to "
"~1locate~5/~1next~5.\n" "~1locate~5/~1next~5.\n"
"Or~2: <Enter> to ~1select another~5; 'q' or <Esc> to ~1end~5 !\n" "Or~2: <Enter> to ~1select another~5; 'q' or <Esc> to ~1end~5 !\n"
@ -4083,24 +4083,24 @@ msgstr "-S requiert k, K, m ou M (KiB par défaut)"
msgid "partition was not found\n" msgid "partition was not found\n"
msgstr "la partition n'a pas été trouvée\n" msgstr "la partition n'a pas été trouvée\n"
#: watch.c:89 #: watch.c:90
#, c-format #, c-format
msgid " %s [options] command\n" msgid " %s [options] command\n"
msgstr " %s [options] commande\n" msgstr " %s [options] commande\n"
#: watch.c:91 #: watch.c:92
msgid " -b, --beep beep if command has a non-zero exit\n" msgid " -b, --beep beep if command has a non-zero exit\n"
msgstr "" msgstr ""
" -b, --beep émet un bip si la commande sort avec un code non " " -b, --beep émet un bip si la commande sort avec un code non "
"nul\n" "nul\n"
#: watch.c:92 #: watch.c:93
msgid " -c, --color interpret ANSI color and style sequences\n" msgid " -c, --color interpret ANSI color and style sequences\n"
msgstr "" msgstr ""
" -c, --color interprète les séquences de couleurs et de styles " " -c, --color interprète les séquences de couleurs et de styles "
"ANSI\n" "ANSI\n"
#: watch.c:93 #: watch.c:94
msgid "" msgid ""
" -d, --differences[=<permanent>]\n" " -d, --differences[=<permanent>]\n"
" highlight changes between updates\n" " highlight changes between updates\n"
@ -4109,132 +4109,132 @@ msgstr ""
" met en évidence les changements entre mises à " " met en évidence les changements entre mises à "
"jours\n" "jours\n"
#: watch.c:95 #: watch.c:96
msgid " -e, --errexit exit if command has a non-zero exit\n" msgid " -e, --errexit exit if command has a non-zero exit\n"
msgstr "" msgstr ""
" -e, --errexit termine si la commande sort avec un code non nul\n" " -e, --errexit termine si la commande sort avec un code non nul\n"
#: watch.c:96 #: watch.c:97
msgid " -g, --chgexit exit when output from command changes\n" msgid " -g, --chgexit exit when output from command changes\n"
msgstr "" msgstr ""
" -g, --chgexit termine quand la sortie de la commande change\n" " -g, --chgexit termine quand la sortie de la commande change\n"
#: watch.c:97 #: watch.c:98
msgid " -n, --interval <secs> seconds to wait between updates\n" msgid " -n, --interval <secs> seconds to wait between updates\n"
msgstr " -n, --interval <sec> secondes de délai entre mises à jours\n" msgstr " -n, --interval <sec> secondes de délai entre mises à jours\n"
#: watch.c:98 #: watch.c:99
msgid " -p, --precise attempt run command in precise intervals\n" msgid " -p, --precise attempt run command in precise intervals\n"
msgstr "" msgstr ""
" -p, --precise essaie d'exécuter la commande à intervalles " " -p, --precise essaie d'exécuter la commande à intervalles "
"réguliers\n" "réguliers\n"
#: watch.c:99 #: watch.c:100
msgid " -t, --no-title turn off header\n" msgid " -t, --no-title turn off header\n"
msgstr " -t, --no-title masque l'en-tête\n" msgstr " -t, --no-title masque l'en-tête\n"
#: watch.c:100 #: watch.c:101
msgid " -x, --exec pass command to exec instead of \"sh -c\"\n" msgid " -x, --exec pass command to exec instead of \"sh -c\"\n"
msgstr "" msgstr ""
" -x, --exec passe la commande à exec au lieu de « sh -c »\n" " -x, --exec passe la commande à exec au lieu de « sh -c »\n"
#: watch.c:103 #: watch.c:104
msgid " -v, --version output version information and exit\n" msgid " -v, --version output version information and exit\n"
msgstr " -v, --version affiche les informations de version et sort\n" msgstr " -v, --version affiche les informations de version et sort\n"
#: watch.c:375 #: watch.c:376
#, c-format #, c-format
msgid "Every %.1fs: " msgid "Every %.1fs: "
msgstr "Toutes les %.1lfs: " msgstr "Toutes les %.1lfs: "
#: watch.c:436 #: watch.c:437
msgid "unable to create IPC pipes" msgid "unable to create IPC pipes"
msgstr "impossible de créer les tubes IPC" msgstr "impossible de créer les tubes IPC"
#: watch.c:446 #: watch.c:447
msgid "unable to fork process" msgid "unable to fork process"
msgstr "impossible de clôner le processus" msgstr "impossible de clôner le processus"
#: watch.c:451 #: watch.c:452
msgid "dup2 failed" msgid "dup2 failed"
msgstr "dup2 a échoué" msgstr "dup2 a échoué"
#: watch.c:458 #: watch.c:459
#, c-format #, c-format
msgid "unable to execute '%s'" msgid "unable to execute '%s'"
msgstr "impossible d'exécuter « %s »" msgstr "impossible d'exécuter « %s »"
#: watch.c:475 #: watch.c:476
msgid "fdopen" msgid "fdopen"
msgstr "fdopen" msgstr "fdopen"
#: watch.c:621 #: watch.c:622
msgid "waitpid" msgid "waitpid"
msgstr "waitpid" msgstr "waitpid"
#: watch.c:629 #: watch.c:630
msgid "command exit with a non-zero status, press a key to exit" msgid "command exit with a non-zero status, press a key to exit"
msgstr "" msgstr ""
"la commande s'est terminée avec un statut non nul, pressez une touche pour " "la commande s'est terminée avec un statut non nul, pressez une touche pour "
"terminer" "terminer"
#: watch.c:754 #: watch.c:755
#, c-format #, c-format
msgid "unicode handling error\n" msgid "unicode handling error\n"
msgstr "erreur de gestion de unicode\n" msgstr "erreur de gestion de unicode\n"
#: watch.c:760 #: watch.c:761
#, c-format #, c-format
msgid "unicode handling error (malloc)\n" msgid "unicode handling error (malloc)\n"
msgstr "erreur de gestion de unicode (malloc)\n" msgstr "erreur de gestion de unicode (malloc)\n"
#: w.c:240 w.c:255 #: w.c:241 w.c:256
#, c-format #, c-format
msgid " %2ludays" msgid " %2ludays"
msgstr "%2lujours" msgstr "%2lujours"
#. Translation Hint: Minutes:Seconds #. Translation Hint: Minutes:Seconds
#. Translation Hint: Hours:Minutes #. Translation Hint: Hours:Minutes
#: w.c:249 w.c:259 #: w.c:250 w.c:260
#, c-format #, c-format
msgid " %2lu:%02um" msgid " %2lu:%02um"
msgstr " %2lu:%02um" msgstr " %2lu:%02um"
#. Translation Hint: Seconds:Centiseconds #. Translation Hint: Seconds:Centiseconds
#: w.c:267 #: w.c:268
#, c-format #, c-format
msgid " %2lu.%02us" msgid " %2lu.%02us"
msgstr " %2lu.%02us" msgstr " %2lu.%02us"
#: w.c:449 #: w.c:451
msgid " -h, --no-header do not print header\n" msgid " -h, --no-header do not print header\n"
msgstr " -h, --no-header n'affiche pas l'en-tête\n" msgstr " -h, --no-header n'affiche pas l'en-tête\n"
#: w.c:450 #: w.c:452
msgid " -u, --no-current ignore current process username\n" msgid " -u, --no-current ignore current process username\n"
msgstr "" msgstr ""
" -u, --no-current ignore le nom d'utilisateur du processus courant\n" " -u, --no-current ignore le nom d'utilisateur du processus courant\n"
#: w.c:451 #: w.c:453
msgid " -s, --short short format\n" msgid " -s, --short short format\n"
msgstr " -s, --short format court\n" msgstr " -s, --short format court\n"
#: w.c:452 #: w.c:454
msgid " -f, --from show remote hostname field\n" msgid " -f, --from show remote hostname field\n"
msgstr " -f, --from montre le champ du nom d'hôte distant\n" msgstr " -f, --from montre le champ du nom d'hôte distant\n"
#: w.c:453 #: w.c:455
msgid " -o, --old-style old style output\n" msgid " -o, --old-style old style output\n"
msgstr " -o, --old-style sortie dans l'ancien style\n" msgstr " -o, --old-style sortie dans l'ancien style\n"
#: w.c:454 #: w.c:456
msgid "" msgid ""
" -i, --ip-addr display IP address instead of hostname (if possible)\n" " -i, --ip-addr display IP address instead of hostname (if possible)\n"
msgstr "" msgstr ""
" -i, --ip-addr affiche l'adresse IP au lieu du nom d'hôte (si " " -i, --ip-addr affiche l'adresse IP au lieu du nom d'hôte (si "
"possible)\n" "possible)\n"
#: w.c:551 #: w.c:553
#, c-format #, c-format
msgid "" msgid ""
"User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n" "User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n"
@ -4242,7 +4242,7 @@ msgstr ""
"la longueur « utilisateur » dans l'environnement PROCPS_USERLEN doit être " "la longueur « utilisateur » dans l'environnement PROCPS_USERLEN doit être "
"entre 8 et %i, ignoré.\n" "entre 8 et %i, ignoré.\n"
#: w.c:561 #: w.c:563
#, c-format #, c-format
msgid "" msgid ""
"from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n" "from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n"
@ -4250,40 +4250,23 @@ msgstr ""
"la longueur « de » dans l'environnement PROCPS_FROMLEN doit être entre 8 et " "la longueur « de » dans l'environnement PROCPS_FROMLEN doit être entre 8 et "
"%d, ignoré.\n" "%d, ignoré.\n"
#: w.c:573
#, c-format
msgid "%d column window is too narrow"
msgstr "la fenêtre avec %d colonnes est trop étroite"
#: w.c:575
#, c-format
msgid "%d column width exceeds command buffer size, truncating to %d"
msgstr ""
"la largeur de colonne %d dépasse la taille du tampon de commande, tronqué à "
"%d"
#: w.c:581
#, c-format
msgid "warning: screen width %d suboptimal"
msgstr "attention: la largeur %d de l'écran n'est pas optimale"
#. Translation Hint: Following five uppercase messages are #. Translation Hint: Following five uppercase messages are
#. * headers. Try to keep alignment intact. #. * headers. Try to keep alignment intact.
#: w.c:590 #: w.c:587
#, c-format #, c-format
msgid "%-*s TTY " msgid "%-*s TTY "
msgstr "%-*s TTY " msgstr "%-*s TTY "
#: w.c:592 #: w.c:589
msgid "FROM" msgid "FROM"
msgstr "DE " msgstr "DE "
#: w.c:594 #: w.c:591
#, c-format #, c-format
msgid " LOGIN@ IDLE JCPU PCPU WHAT\n" msgid " LOGIN@ IDLE JCPU PCPU WHAT\n"
msgstr " LOGIN@ IDLE JCPU PCPU QUOI\n" msgstr " LOGIN@ IDLE JCPU PCPU QUOI\n"
#: w.c:596 #: w.c:593
#, c-format #, c-format
msgid " IDLE WHAT\n" msgid " IDLE WHAT\n"
msgstr " IDLE QUOI\n" msgstr " IDLE QUOI\n"
@ -4336,6 +4319,17 @@ msgstr "%s de %s\n"
#~ msgid "alternate System.map file must follow N" #~ msgid "alternate System.map file must follow N"
#~ msgstr "le fichier System.map alternatif doit suivre N" #~ msgstr "le fichier System.map alternatif doit suivre N"
#~ msgid "%d column window is too narrow"
#~ msgstr "la fenêtre avec %d colonnes est trop étroite"
#~ msgid "%d column width exceeds command buffer size, truncating to %d"
#~ msgstr ""
#~ "la largeur de colonne %d dépasse la taille du tampon de commande, tronqué "
#~ "à %d"
#~ msgid "warning: screen width %d suboptimal"
#~ msgstr "attention: la largeur %d de l'écran n'est pas optimale"
#~ msgid "" #~ msgid ""
#~ " -o, --old use old format (without -/+buffers/cache line)\n" #~ " -o, --old use old format (without -/+buffers/cache line)\n"
#~ msgstr "" #~ msgstr ""

184
po/pl.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: procps-ng-3.3.10-rc1\n" "Project-Id-Version: procps-ng-3.3.10-rc1\n"
"Report-Msgid-Bugs-To: procps@freelists.org\n" "Report-Msgid-Bugs-To: procps@freelists.org\n"
"POT-Creation-Date: 2015-06-19 20:33+1000\n" "POT-Creation-Date: 2015-08-09 15:59+1000\n"
"PO-Revision-Date: 2015-01-23 23:06+0100\n" "PO-Revision-Date: 2015-01-23 23:06+0100\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n" "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: free.c:74 slabtop.c:189 uptime.c:59 w.c:447 #: free.c:74 slabtop.c:189 uptime.c:59 w.c:449
#, c-format #, c-format
msgid " %s [options]\n" msgid " %s [options]\n"
msgstr " %s [opcje]\n" msgstr " %s [opcje]\n"
@ -103,7 +103,7 @@ msgstr " -c N, --count N powtórzenie wypisania N razy i zakończenie\n"
msgid " -w, --wide wide output\n" msgid " -w, --wide wide output\n"
msgstr " -w, --wide szeroki format wyjścia\n" msgstr " -w, --wide szeroki format wyjścia\n"
#: free.c:95 w.c:456 #: free.c:95 w.c:458
msgid " --help display this help and exit\n" msgid " --help display this help and exit\n"
msgstr " --help wyświetlenie tego opisu i zakończenie\n" msgstr " --help wyświetlenie tego opisu i zakończenie\n"
@ -111,26 +111,26 @@ msgstr " --help wyświetlenie tego opisu i zakończenie\n"
msgid "Multiple unit options doesn't make sense." msgid "Multiple unit options doesn't make sense."
msgstr "" msgstr ""
#: free.c:328 #: free.c:329
#, c-format #, c-format
msgid "seconds argument `%s' failed" msgid "seconds argument `%s' failed"
msgstr "niezrozumiały argument liczby sekund `%s'" msgstr "niezrozumiały argument liczby sekund `%s'"
#: free.c:331 #: free.c:332
#, c-format #, c-format
msgid "seconds argument `%s' is not positive number" msgid "seconds argument `%s' is not positive number"
msgstr "argument liczby sekund `%s' nie jest liczbą dodatnią" msgstr "argument liczby sekund `%s' nie jest liczbą dodatnią"
#: free.c:337 #: free.c:338
msgid "failed to parse count argument" msgid "failed to parse count argument"
msgstr "niezrozumiały argument liczby powtórzeń" msgstr "niezrozumiały argument liczby powtórzeń"
#: free.c:340 #: free.c:341
#, c-format #, c-format
msgid "failed to parse count argument: '%s'" msgid "failed to parse count argument: '%s'"
msgstr "niezrozumiały argument liczby powtórzeń: '%s'" msgstr "niezrozumiały argument liczby powtórzeń: '%s'"
#: free.c:361 #: free.c:362
#, c-format #, c-format
msgid "" msgid ""
" total used free shared buffers " " total used free shared buffers "
@ -139,7 +139,7 @@ msgstr ""
" razem użyte wolne dzielone bufory w " " razem użyte wolne dzielone bufory w "
"cache dostępne" "cache dostępne"
#: free.c:363 #: free.c:364
#, c-format #, c-format
msgid "" msgid ""
" total used free shared buff/cache " " total used free shared buff/cache "
@ -148,23 +148,23 @@ msgstr ""
" razem użyte wolne dzielone buf/cache " " razem użyte wolne dzielone buf/cache "
"dostępne" "dostępne"
#: free.c:366 #: free.c:367
msgid "Mem:" msgid "Mem:"
msgstr "Pamięć:" msgstr "Pamięć:"
#: free.c:386 #: free.c:387
msgid "Low:" msgid "Low:"
msgstr "Niska:" msgstr "Niska:"
#: free.c:392 #: free.c:393
msgid "High:" msgid "High:"
msgstr "Wysoka:" msgstr "Wysoka:"
#: free.c:399 #: free.c:400
msgid "Swap:" msgid "Swap:"
msgstr "Wymiana:" msgstr "Wymiana:"
#: free.c:406 #: free.c:407
msgid "Total:" msgid "Total:"
msgstr "Razem:" msgstr "Razem:"
@ -322,11 +322,11 @@ msgstr "nie podano liczby: %s"
msgid "Error reading reference namespace information\n" msgid "Error reading reference namespace information\n"
msgstr "Błąd przy odczycie informacji o przestrzeni nazw odniesienia\n" msgstr "Błąd przy odczycie informacji o przestrzeni nazw odniesienia\n"
#: pgrep.c:610 pidof.c:226 pidof.c:267 sysctl.c:643 #: pgrep.c:610 pidof.c:224 pidof.c:265 sysctl.c:643
msgid "internal error" msgid "internal error"
msgstr "błąd wewnętrzny" msgstr "błąd wewnętrzny"
#: pgrep.c:878 #: pgrep.c:876
#, c-format #, c-format
msgid "" msgid ""
"-L without -F makes no sense\n" "-L without -F makes no sense\n"
@ -335,7 +335,7 @@ msgstr ""
"-L bez -F nie ma sensu\n" "-L bez -F nie ma sensu\n"
"`%s --help' pokaże więcej informacji." "`%s --help' pokaże więcej informacji."
#: pgrep.c:885 #: pgrep.c:883
#, c-format #, c-format
msgid "" msgid ""
"pidfile not valid\n" "pidfile not valid\n"
@ -344,7 +344,7 @@ msgstr ""
"nieprawidłowy plik pid\n" "nieprawidłowy plik pid\n"
"`%s --help' pokaże więcej informacji." "`%s --help' pokaże więcej informacji."
#: pgrep.c:893 #: pgrep.c:891
#, c-format #, c-format
msgid "" msgid ""
"only one pattern can be provided\n" "only one pattern can be provided\n"
@ -353,7 +353,7 @@ msgstr ""
"można podać tylko jeden wzorzec\n" "można podać tylko jeden wzorzec\n"
"`%s --help' pokaże więcej informacji." "`%s --help' pokaże więcej informacji."
#: pgrep.c:897 #: pgrep.c:895
#, c-format #, c-format
msgid "" msgid ""
"no matching criteria specified\n" "no matching criteria specified\n"
@ -362,12 +362,12 @@ msgstr ""
"nie podano kryterium dopasowania\n" "nie podano kryterium dopasowania\n"
"`%s --help' pokaże więcej informacji." "`%s --help' pokaże więcej informacji."
#: pgrep.c:924 #: pgrep.c:922
#, c-format #, c-format
msgid "%s killed (pid %lu)\n" msgid "%s killed (pid %lu)\n"
msgstr "zabito %s (pid %lu)\n" msgstr "zabito %s (pid %lu)\n"
#: pgrep.c:930 #: pgrep.c:928
#, c-format #, c-format
msgid "killing pid %ld failed" msgid "killing pid %ld failed"
msgstr "zabicie PID-u %ld nie powiodło się" msgstr "zabicie PID-u %ld nie powiodło się"
@ -395,7 +395,7 @@ msgstr ""
msgid " -o, --omit-pid <PID,...> omit processes with PID\n" msgid " -o, --omit-pid <PID,...> omit processes with PID\n"
msgstr " -o, --omit-pid <PID,...> pominięcie procesów o podanych PID-ach\n" msgstr " -o, --omit-pid <PID,...> pominięcie procesów o podanych PID-ach\n"
#: pidof.c:270 #: pidof.c:268
#, c-format #, c-format
msgid "illegal omit pid value (%s)!\n" msgid "illegal omit pid value (%s)!\n"
msgstr "błędna wartość PID-u do pominięcia (%s)!\n" msgstr "błędna wartość PID-u do pominięcia (%s)!\n"
@ -548,8 +548,8 @@ msgstr " razem %16ldK\n"
msgid " total %8ldK\n" msgid " total %8ldK\n"
msgstr " razem %8ldK\n" msgstr " razem %8ldK\n"
#: pmap.c:767 skill.c:502 skill.c:535 skill.c:624 tload.c:128 tload.c:133 #: pmap.c:767 skill.c:500 skill.c:533 skill.c:620 tload.c:128 tload.c:133
#: vmstat.c:959 vmstat.c:968 watch.c:707 #: vmstat.c:959 vmstat.c:968 watch.c:708
msgid "failed to parse argument" msgid "failed to parse argument"
msgstr "niezrozumiały argument" msgstr "niezrozumiały argument"
@ -1532,12 +1532,12 @@ msgid "-L with H/-m/m but no PID/PGID/SID/SESS for NLWP to follow"
msgstr "" msgstr ""
"-L z H/-m/m, ale brak pola PID/PGID/SID/SESS, po którym miałoby być NLWP" "-L z H/-m/m, ale brak pola PID/PGID/SID/SESS, po którym miałoby być NLWP"
#: pwdx.c:38 #: pwdx.c:37
#, c-format #, c-format
msgid " %s [options] pid...\n" msgid " %s [options] pid...\n"
msgstr "%s [opcje] pid...\n" msgstr "%s [opcje] pid...\n"
#: pwdx.c:114 #: pwdx.c:113
#, c-format #, c-format
msgid "invalid process id: %s" msgid "invalid process id: %s"
msgstr "błędny identyfikator procesu: %s" msgstr "błędny identyfikator procesu: %s"
@ -1692,56 +1692,56 @@ msgstr ""
"Numer priorytetu to liczba od +20 (najwolniej) do -20 (najszybciej).\n" "Numer priorytetu to liczba od +20 (najwolniej) do -20 (najszybciej).\n"
"Liczby ujemne są zarezerwowane dla administratorów.\n" "Liczby ujemne są zarezerwowane dla administratorów.\n"
#: skill.c:462 #: skill.c:457
#, c-format #, c-format
msgid "unknown signal name %s" msgid "unknown signal name %s"
msgstr "nieznana nazwa sygnału %s" msgstr "nieznana nazwa sygnału %s"
#: skill.c:482 #: skill.c:477
#, c-format #, c-format
msgid "invalid argument %c" msgid "invalid argument %c"
msgstr "błędny argument %c" msgstr "błędny argument %c"
#: skill.c:515 #: skill.c:513
#, c-format #, c-format
msgid "something at line %d\n" msgid "something at line %d\n"
msgstr "coś w linii %d\n" msgstr "coś w linii %d\n"
#: skill.c:538 #: skill.c:536
#, c-format #, c-format
msgid "priority %lu out of range" msgid "priority %lu out of range"
msgstr "priorytet %lu jest spoza zakresu" msgstr "priorytet %lu jest spoza zakresu"
#: skill.c:653 #: skill.c:649
#, c-format #, c-format
msgid "invalid pid number %s" msgid "invalid pid number %s"
msgstr "błędny numer pid %s" msgstr "błędny numer pid %s"
#: skill.c:657 #: skill.c:653
msgid "error reading reference namespace information" msgid "error reading reference namespace information"
msgstr "błąd odczytu informacji o przestrzeni nazw odniesienia" msgstr "błąd odczytu informacji o przestrzeni nazw odniesienia"
#: skill.c:665 #: skill.c:661
msgid "invalid namespace list" msgid "invalid namespace list"
msgstr "błędna lista przestrzeni nazw" msgstr "błędna lista przestrzeni nazw"
#: skill.c:703 #: skill.c:699
msgid "no process selection criteria" msgid "no process selection criteria"
msgstr "nie podano kryteriów wyboru" msgstr "nie podano kryteriów wyboru"
#: skill.c:706 #: skill.c:702
msgid "general flags may not be repeated" msgid "general flags may not be repeated"
msgstr "flag ogólnych nie można powtarzać" msgstr "flag ogólnych nie można powtarzać"
#: skill.c:709 #: skill.c:705
msgid "-i makes no sense with -v, -f, and -n" msgid "-i makes no sense with -v, -f, and -n"
msgstr "-i nie ma sensu z -v, -f ani -n" msgstr "-i nie ma sensu z -v, -f ani -n"
#: skill.c:711 #: skill.c:707
msgid "-v makes no sense with -i and -f" msgid "-v makes no sense with -i and -f"
msgstr "-v nie ma sensu z -i ani -f" msgstr "-v nie ma sensu z -i ani -f"
#: skill.c:756 #: skill.c:752
#, c-format #, c-format
msgid "skill: \"%s\" is not supported\n" msgid "skill: \"%s\" is not supported\n"
msgstr "skill: \"%s\" nie jest obsługiwany\n" msgstr "skill: \"%s\" nie jest obsługiwany\n"
@ -2097,7 +2097,7 @@ msgid "Effective User Id"
msgstr "Id. użytkownika efektywnego" msgstr "Id. użytkownika efektywnego"
#. Translation Hint: maximum 'USER' = 7 #. Translation Hint: maximum 'USER' = 7
#: top/top_nls.c:133 w.c:590 #: top/top_nls.c:133 w.c:587
msgid "USER" msgid "USER"
msgstr "UŻYTK." msgstr "UŻYTK."
@ -3511,9 +3511,9 @@ msgstr ""
"%s %s:~3 %9.9s~2razem,~3 %9.9s~2wolne,~3 %9.9s~2użyte.~3 %9.9s~2dost. %s~3\n" "%s %s:~3 %9.9s~2razem,~3 %9.9s~2wolne,~3 %9.9s~2użyte.~3 %9.9s~2dost. %s~3\n"
#: top/top_nls.c:646 #: top/top_nls.c:646
#, c-format #, fuzzy, c-format
msgid "" msgid ""
"Inspection~2 Pause at: pid ~1%d~6 running ~1%s~6 as user ~1%s~6\n" "Inspection~2 Pause at: pid ~1%d~6, running ~1%s~6\n"
"Use~2: left/right then <Enter> to ~1select~5 an option; 'q' or <Esc> to " "Use~2: left/right then <Enter> to ~1select~5 an option; 'q' or <Esc> to "
"~1end~5 !\n" "~1end~5 !\n"
"Options~2: ~1%s\n" "Options~2: ~1%s\n"
@ -3524,9 +3524,9 @@ msgstr ""
"Opcje~2: ~1%s\n" "Opcje~2: ~1%s\n"
#: top/top_nls.c:651 #: top/top_nls.c:651
#, c-format #, fuzzy, c-format
msgid "" msgid ""
"Inspection~2 View at: ~1%s~3, ~1%s~3, ~1%s~3. Locating: ~1%s~6\n" "Inspection~2 View at pid: ~1%s~3, running ~1%s~3. Locating: ~1%s~6\n"
"Use~2: left/right/up/down/etc to ~1navigate~5 the output; 'L'/'&' to " "Use~2: left/right/up/down/etc to ~1navigate~5 the output; 'L'/'&' to "
"~1locate~5/~1next~5.\n" "~1locate~5/~1next~5.\n"
"Or~2: <Enter> to ~1select another~5; 'q' or <Esc> to ~1end~5 !\n" "Or~2: <Enter> to ~1select another~5; 'q' or <Esc> to ~1end~5 !\n"
@ -4023,21 +4023,21 @@ msgstr "-S wymaga k, K, m lub M (domyślnie KiB)"
msgid "partition was not found\n" msgid "partition was not found\n"
msgstr "nie znaleziono partycji\n" msgstr "nie znaleziono partycji\n"
#: watch.c:89 #: watch.c:90
#, c-format #, c-format
msgid " %s [options] command\n" msgid " %s [options] command\n"
msgstr " %s [opcje] polecenie\n" msgstr " %s [opcje] polecenie\n"
#: watch.c:91 #: watch.c:92
msgid " -b, --beep beep if command has a non-zero exit\n" msgid " -b, --beep beep if command has a non-zero exit\n"
msgstr " -b, --beep piknięcie, jeśli polecenie zwróci błąd\n" msgstr " -b, --beep piknięcie, jeśli polecenie zwróci błąd\n"
#: watch.c:92 #: watch.c:93
msgid " -c, --color interpret ANSI color and style sequences\n" msgid " -c, --color interpret ANSI color and style sequences\n"
msgstr "" msgstr ""
" -c, --color interpretowanie sekwencji kolorów i styli ANSI\n" " -c, --color interpretowanie sekwencji kolorów i styli ANSI\n"
#: watch.c:93 #: watch.c:94
msgid "" msgid ""
" -d, --differences[=<permanent>]\n" " -d, --differences[=<permanent>]\n"
" highlight changes between updates\n" " highlight changes between updates\n"
@ -4045,132 +4045,132 @@ msgstr ""
" -d, --differences[=<trwałe>]\n" " -d, --differences[=<trwałe>]\n"
" podświetlanie zmian między uaktualnieniami\n" " podświetlanie zmian między uaktualnieniami\n"
#: watch.c:95 #: watch.c:96
msgid " -e, --errexit exit if command has a non-zero exit\n" msgid " -e, --errexit exit if command has a non-zero exit\n"
msgstr " -e, --errexit zakończenie, jeśli polecenie zwróci błąd\n" msgstr " -e, --errexit zakończenie, jeśli polecenie zwróci błąd\n"
#: watch.c:96 #: watch.c:97
msgid " -g, --chgexit exit when output from command changes\n" msgid " -g, --chgexit exit when output from command changes\n"
msgstr "" msgstr ""
" -g, --chgexit zakończenie, jeśli wyjście polecenia się zmieni\n" " -g, --chgexit zakończenie, jeśli wyjście polecenia się zmieni\n"
#: watch.c:97 #: watch.c:98
msgid " -n, --interval <secs> seconds to wait between updates\n" msgid " -n, --interval <secs> seconds to wait between updates\n"
msgstr "" msgstr ""
" -n, --interval <sek> liczba sekund do odczekania między uaktualnieniami\n" " -n, --interval <sek> liczba sekund do odczekania między uaktualnieniami\n"
#: watch.c:98 #: watch.c:99
msgid " -p, --precise attempt run command in precise intervals\n" msgid " -p, --precise attempt run command in precise intervals\n"
msgstr "" msgstr ""
" -p, --precise próba uruchamiania polecenia w dokładnych " " -p, --precise próba uruchamiania polecenia w dokładnych "
"odstępach\n" "odstępach\n"
#: watch.c:99 #: watch.c:100
msgid " -t, --no-title turn off header\n" msgid " -t, --no-title turn off header\n"
msgstr " -t, --no-title wyłączenie nagłówka\n" msgstr " -t, --no-title wyłączenie nagłówka\n"
#: watch.c:100 #: watch.c:101
msgid " -x, --exec pass command to exec instead of \"sh -c\"\n" msgid " -x, --exec pass command to exec instead of \"sh -c\"\n"
msgstr "" msgstr ""
" -x, --exec przekazanie polecenia do uruchomienia zamiast \"sh -" " -x, --exec przekazanie polecenia do uruchomienia zamiast \"sh -"
"c\"\n" "c\"\n"
#: watch.c:103 #: watch.c:104
msgid " -v, --version output version information and exit\n" msgid " -v, --version output version information and exit\n"
msgstr " -v, --version wypisanie informacji o wejściu i zakończenie\n" msgstr " -v, --version wypisanie informacji o wejściu i zakończenie\n"
#: watch.c:375 #: watch.c:376
#, c-format #, c-format
msgid "Every %.1fs: " msgid "Every %.1fs: "
msgstr "Co %.1fs: " msgstr "Co %.1fs: "
#: watch.c:436 #: watch.c:437
msgid "unable to create IPC pipes" msgid "unable to create IPC pipes"
msgstr "nie można utworzyć potoków IPC" msgstr "nie można utworzyć potoków IPC"
#: watch.c:446 #: watch.c:447
msgid "unable to fork process" msgid "unable to fork process"
msgstr "nie można rozgałęzić procesu" msgstr "nie można rozgałęzić procesu"
#: watch.c:451 #: watch.c:452
msgid "dup2 failed" msgid "dup2 failed"
msgstr "dup2 nie powiodło się" msgstr "dup2 nie powiodło się"
#: watch.c:458 #: watch.c:459
#, c-format #, c-format
msgid "unable to execute '%s'" msgid "unable to execute '%s'"
msgstr "nie można uruchomić '%s'" msgstr "nie można uruchomić '%s'"
#: watch.c:475 #: watch.c:476
msgid "fdopen" msgid "fdopen"
msgstr "fdopen" msgstr "fdopen"
#: watch.c:621 #: watch.c:622
msgid "waitpid" msgid "waitpid"
msgstr "waitpid" msgstr "waitpid"
#: watch.c:629 #: watch.c:630
msgid "command exit with a non-zero status, press a key to exit" msgid "command exit with a non-zero status, press a key to exit"
msgstr "" msgstr ""
"polecenie zakończyło się kodem błędnym; proszę nacisnąć klawisz, aby " "polecenie zakończyło się kodem błędnym; proszę nacisnąć klawisz, aby "
"zakończyć" "zakończyć"
#: watch.c:754 #: watch.c:755
#, c-format #, c-format
msgid "unicode handling error\n" msgid "unicode handling error\n"
msgstr "błąd obsługi unikodu\n" msgstr "błąd obsługi unikodu\n"
#: watch.c:760 #: watch.c:761
#, c-format #, c-format
msgid "unicode handling error (malloc)\n" msgid "unicode handling error (malloc)\n"
msgstr "błąd obsługi unikodu (malloc)\n" msgstr "błąd obsługi unikodu (malloc)\n"
#: w.c:240 w.c:255 #: w.c:241 w.c:256
#, c-format #, c-format
msgid " %2ludays" msgid " %2ludays"
msgstr " %2ludni" msgstr " %2ludni"
#. Translation Hint: Minutes:Seconds #. Translation Hint: Minutes:Seconds
#. Translation Hint: Hours:Minutes #. Translation Hint: Hours:Minutes
#: w.c:249 w.c:259 #: w.c:250 w.c:260
#, c-format #, c-format
msgid " %2lu:%02um" msgid " %2lu:%02um"
msgstr " %2lu:%02um" msgstr " %2lu:%02um"
#. Translation Hint: Seconds:Centiseconds #. Translation Hint: Seconds:Centiseconds
#: w.c:267 #: w.c:268
#, c-format #, c-format
msgid " %2lu.%02us" msgid " %2lu.%02us"
msgstr " %2lu.%02us" msgstr " %2lu.%02us"
#: w.c:449 #: w.c:451
msgid " -h, --no-header do not print header\n" msgid " -h, --no-header do not print header\n"
msgstr " -h, --no-header bez wypisywania nagłówka\n" msgstr " -h, --no-header bez wypisywania nagłówka\n"
#: w.c:450 #: w.c:452
msgid " -u, --no-current ignore current process username\n" msgid " -u, --no-current ignore current process username\n"
msgstr " -u, --no-current pominiecie użytkownika bieżącego procesu\n" msgstr " -u, --no-current pominiecie użytkownika bieżącego procesu\n"
#: w.c:451 #: w.c:453
msgid " -s, --short short format\n" msgid " -s, --short short format\n"
msgstr " -s, --short format krótki\n" msgstr " -s, --short format krótki\n"
#: w.c:452 #: w.c:454
msgid " -f, --from show remote hostname field\n" msgid " -f, --from show remote hostname field\n"
msgstr " -f, --from wyświetlenie pola nazwy zdalnego hosta\n" msgstr " -f, --from wyświetlenie pola nazwy zdalnego hosta\n"
#: w.c:453 #: w.c:455
msgid " -o, --old-style old style output\n" msgid " -o, --old-style old style output\n"
msgstr " -o, --old-style wyjście w starym stylu\n" msgstr " -o, --old-style wyjście w starym stylu\n"
#: w.c:454 #: w.c:456
msgid "" msgid ""
" -i, --ip-addr display IP address instead of hostname (if possible)\n" " -i, --ip-addr display IP address instead of hostname (if possible)\n"
msgstr "" msgstr ""
" -i, --ip-addr wyświetlanie adresów IP zamiast nazw (jeśli to " " -i, --ip-addr wyświetlanie adresów IP zamiast nazw (jeśli to "
"możliwe)\n" "możliwe)\n"
#: w.c:551 #: w.c:553
#, c-format #, c-format
msgid "" msgid ""
"User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n" "User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n"
@ -4178,7 +4178,7 @@ msgstr ""
"Zmienna długości użytkowników PROCS_USERLEN musi być pomiędzy 8 a %i, " "Zmienna długości użytkowników PROCS_USERLEN musi być pomiędzy 8 a %i, "
"zignorowano.\n" "zignorowano.\n"
#: w.c:561 #: w.c:563
#, c-format #, c-format
msgid "" msgid ""
"from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n" "from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n"
@ -4186,39 +4186,23 @@ msgstr ""
"Zmienna długości miejsca logowania PROCPS_FROMLEN musi być pomiędzy 8 a %d, " "Zmienna długości miejsca logowania PROCPS_FROMLEN musi być pomiędzy 8 a %d, "
"zignorowano\n" "zignorowano\n"
#: w.c:573
#, c-format
msgid "%d column window is too narrow"
msgstr "Okno o szerokości %d jest za wąskie"
#: w.c:575
#, c-format
msgid "%d column width exceeds command buffer size, truncating to %d"
msgstr ""
"Szerokość okna %d przekracza rozmiar bufora polecenia, ograniczenie do %d"
#: w.c:581
#, c-format
msgid "warning: screen width %d suboptimal"
msgstr "uwaga: szerokość ekranu %d nie jest optymalna"
#. Translation Hint: Following five uppercase messages are #. Translation Hint: Following five uppercase messages are
#. * headers. Try to keep alignment intact. #. * headers. Try to keep alignment intact.
#: w.c:590 #: w.c:587
#, c-format #, c-format
msgid "%-*s TTY " msgid "%-*s TTY "
msgstr "%-*s TTY " msgstr "%-*s TTY "
#: w.c:592 #: w.c:589
msgid "FROM" msgid "FROM"
msgstr "Z " msgstr "Z "
#: w.c:594 #: w.c:591
#, c-format #, c-format
msgid " LOGIN@ IDLE JCPU PCPU WHAT\n" msgid " LOGIN@ IDLE JCPU PCPU WHAT\n"
msgstr " ZAL.OD BEZCZ. JCPU PCPU CO\n" msgstr " ZAL.OD BEZCZ. JCPU PCPU CO\n"
#: w.c:596 #: w.c:593
#, c-format #, c-format
msgid " IDLE WHAT\n" msgid " IDLE WHAT\n"
msgstr " BEZCZ. CO\n" msgstr " BEZCZ. CO\n"
@ -4270,3 +4254,13 @@ msgstr "%s z pakietu %s\n"
#~ msgid "alternate System.map file must follow N" #~ msgid "alternate System.map file must follow N"
#~ msgstr "po N musi wystąpić alternatywny plik System.map" #~ msgstr "po N musi wystąpić alternatywny plik System.map"
#~ msgid "%d column window is too narrow"
#~ msgstr "Okno o szerokości %d jest za wąskie"
#~ msgid "%d column width exceeds command buffer size, truncating to %d"
#~ msgstr ""
#~ "Szerokość okna %d przekracza rozmiar bufora polecenia, ograniczenie do %d"
#~ msgid "warning: screen width %d suboptimal"
#~ msgstr "uwaga: szerokość ekranu %d nie jest optymalna"

347
po/procps-ng.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: procps@freelists.org\n" "Report-Msgid-Bugs-To: procps@freelists.org\n"
"POT-Creation-Date: 2015-06-20 13:08-0500\n" "POT-Creation-Date: 2015-08-09 15:59+1000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n" "Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: free.c:74 slabtop.c:189 uptime.c:59 w.c:447 #: free.c:74 slabtop.c:189 uptime.c:59 w.c:449
#, c-format #, c-format
msgid " %s [options]\n" msgid " %s [options]\n"
msgstr "" msgstr ""
@ -94,7 +94,7 @@ msgstr ""
msgid " -w, --wide wide output\n" msgid " -w, --wide wide output\n"
msgstr "" msgstr ""
#: free.c:95 w.c:456 #: free.c:95 w.c:458
msgid " --help display this help and exit\n" msgid " --help display this help and exit\n"
msgstr "" msgstr ""
@ -102,91 +102,55 @@ msgstr ""
msgid "Multiple unit options doesn't make sense." msgid "Multiple unit options doesn't make sense."
msgstr "" msgstr ""
#: free.c:328 #: free.c:329
#, c-format #, c-format
msgid "seconds argument `%s' failed" msgid "seconds argument `%s' failed"
msgstr "" msgstr ""
#: free.c:331 #: free.c:332
#, c-format #, c-format
msgid "seconds argument `%s' is not positive number" msgid "seconds argument `%s' is not positive number"
msgstr "" msgstr ""
#: free.c:337 #: free.c:338
msgid "failed to parse count argument" msgid "failed to parse count argument"
msgstr "" msgstr ""
#: free.c:340 #: free.c:341
#, c-format #, c-format
msgid "failed to parse count argument: '%s'" msgid "failed to parse count argument: '%s'"
msgstr "" msgstr ""
#: free.c:361 #: free.c:362
#, c-format #, c-format
msgid " total used free shared buffers cache available" msgid " total used free shared buffers cache available"
msgstr "" msgstr ""
#: free.c:363 #: free.c:364
#, c-format #, c-format
msgid " total used free shared buff/cache available" msgid " total used free shared buff/cache available"
msgstr "" msgstr ""
#: free.c:366 #: free.c:367
msgid "Mem:" msgid "Mem:"
msgstr "" msgstr ""
#: free.c:386 #: free.c:387
msgid "Low:" msgid "Low:"
msgstr "" msgstr ""
#: free.c:392 #: free.c:393
msgid "High:" msgid "High:"
msgstr "" msgstr ""
#: free.c:399 #: free.c:400
msgid "Swap:" msgid "Swap:"
msgstr "" msgstr ""
#: free.c:406 #: free.c:407
msgid "Total:" msgid "Total:"
msgstr "" msgstr ""
#: include/c.h:153
msgid ""
"\n"
"Usage:\n"
msgstr ""
#: include/c.h:154
msgid ""
"\n"
"Options:\n"
msgstr ""
#: include/c.h:155
msgid "\n"
msgstr ""
#: include/c.h:156
msgid " -h, --help display this help and exit\n"
msgstr ""
#: include/c.h:157
msgid " -V, --version output version information and exit\n"
msgstr ""
#: include/c.h:158
#, c-format
msgid ""
"\n"
"For more details see %s.\n"
msgstr ""
#: include/c.h:160
#, c-format
msgid "%s from %s\n"
msgstr ""
#: lib/fileutils.c:38 #: lib/fileutils.c:38
msgid "write error" msgid "write error"
msgstr "" msgstr ""
@ -326,44 +290,44 @@ msgstr ""
msgid "Error reading reference namespace information\n" msgid "Error reading reference namespace information\n"
msgstr "" msgstr ""
#: pgrep.c:610 pidof.c:226 pidof.c:267 sysctl.c:643 #: pgrep.c:610 pidof.c:224 pidof.c:265 sysctl.c:643
msgid "internal error" msgid "internal error"
msgstr "" msgstr ""
#: pgrep.c:878 #: pgrep.c:876
#, c-format #, c-format
msgid "" msgid ""
"-L without -F makes no sense\n" "-L without -F makes no sense\n"
"Try `%s --help' for more information." "Try `%s --help' for more information."
msgstr "" msgstr ""
#: pgrep.c:885 #: pgrep.c:883
#, c-format #, c-format
msgid "" msgid ""
"pidfile not valid\n" "pidfile not valid\n"
"Try `%s --help' for more information." "Try `%s --help' for more information."
msgstr "" msgstr ""
#: pgrep.c:893 #: pgrep.c:891
#, c-format #, c-format
msgid "" msgid ""
"only one pattern can be provided\n" "only one pattern can be provided\n"
"Try `%s --help' for more information." "Try `%s --help' for more information."
msgstr "" msgstr ""
#: pgrep.c:897 #: pgrep.c:895
#, c-format #, c-format
msgid "" msgid ""
"no matching criteria specified\n" "no matching criteria specified\n"
"Try `%s --help' for more information." "Try `%s --help' for more information."
msgstr "" msgstr ""
#: pgrep.c:924 #: pgrep.c:922
#, c-format #, c-format
msgid "%s killed (pid %lu)\n" msgid "%s killed (pid %lu)\n"
msgstr "" msgstr ""
#: pgrep.c:930 #: pgrep.c:928
#, c-format #, c-format
msgid "killing pid %ld failed" msgid "killing pid %ld failed"
msgstr "" msgstr ""
@ -389,7 +353,7 @@ msgstr ""
msgid " -o, --omit-pid <PID,...> omit processes with PID\n" msgid " -o, --omit-pid <PID,...> omit processes with PID\n"
msgstr "" msgstr ""
#: pidof.c:270 #: pidof.c:268
#, c-format #, c-format
msgid "illegal omit pid value (%s)!\n" msgid "illegal omit pid value (%s)!\n"
msgstr "" msgstr ""
@ -538,8 +502,8 @@ msgstr ""
msgid " total %8ldK\n" msgid " total %8ldK\n"
msgstr "" msgstr ""
#: pmap.c:767 skill.c:502 skill.c:535 skill.c:624 tload.c:128 tload.c:133 #: pmap.c:767 skill.c:500 skill.c:533 skill.c:620 tload.c:128 tload.c:133
#: vmstat.c:959 vmstat.c:968 watch.c:707 #: vmstat.c:959 vmstat.c:968 watch.c:708
msgid "failed to parse argument" msgid "failed to parse argument"
msgstr "" msgstr ""
@ -1470,12 +1434,12 @@ msgstr ""
msgid "-L with H/-m/m but no PID/PGID/SID/SESS for NLWP to follow" msgid "-L with H/-m/m but no PID/PGID/SID/SESS for NLWP to follow"
msgstr "" msgstr ""
#: pwdx.c:38 #: pwdx.c:37
#, c-format #, c-format
msgid " %s [options] pid...\n" msgid " %s [options] pid...\n"
msgstr "" msgstr ""
#: pwdx.c:114 #: pwdx.c:113
#, c-format #, c-format
msgid "invalid process id: %s" msgid "invalid process id: %s"
msgstr "" msgstr ""
@ -1603,56 +1567,56 @@ msgid ""
"Negative priority numbers are restricted to administrative users.\n" "Negative priority numbers are restricted to administrative users.\n"
msgstr "" msgstr ""
#: skill.c:462 #: skill.c:457
#, c-format #, c-format
msgid "unknown signal name %s" msgid "unknown signal name %s"
msgstr "" msgstr ""
#: skill.c:482 #: skill.c:477
#, c-format #, c-format
msgid "invalid argument %c" msgid "invalid argument %c"
msgstr "" msgstr ""
#: skill.c:515 #: skill.c:513
#, c-format #, c-format
msgid "something at line %d\n" msgid "something at line %d\n"
msgstr "" msgstr ""
#: skill.c:538 #: skill.c:536
#, c-format #, c-format
msgid "priority %lu out of range" msgid "priority %lu out of range"
msgstr "" msgstr ""
#: skill.c:653 #: skill.c:649
#, c-format #, c-format
msgid "invalid pid number %s" msgid "invalid pid number %s"
msgstr "" msgstr ""
#: skill.c:657 #: skill.c:653
msgid "error reading reference namespace information" msgid "error reading reference namespace information"
msgstr "" msgstr ""
#: skill.c:665 #: skill.c:661
msgid "invalid namespace list" msgid "invalid namespace list"
msgstr "" msgstr ""
#: skill.c:703 #: skill.c:699
msgid "no process selection criteria" msgid "no process selection criteria"
msgstr "" msgstr ""
#: skill.c:706 #: skill.c:702
msgid "general flags may not be repeated" msgid "general flags may not be repeated"
msgstr "" msgstr ""
#: skill.c:709 #: skill.c:705
msgid "-i makes no sense with -v, -f, and -n" msgid "-i makes no sense with -v, -f, and -n"
msgstr "" msgstr ""
#: skill.c:711 #: skill.c:707
msgid "-v makes no sense with -i and -f" msgid "-v makes no sense with -i and -f"
msgstr "" msgstr ""
#: skill.c:756 #: skill.c:752
#, c-format #, c-format
msgid "skill: \"%s\" is not supported\n" msgid "skill: \"%s\" is not supported\n"
msgstr "" msgstr ""
@ -1992,7 +1956,7 @@ msgid "Effective User Id"
msgstr "" msgstr ""
#. Translation Hint: maximum 'USER' = 7 #. Translation Hint: maximum 'USER' = 7
#: top/top_nls.c:133 w.c:590 #: top/top_nls.c:133 w.c:587
msgid "USER" msgid "USER"
msgstr "" msgstr ""
@ -3168,7 +3132,7 @@ msgstr ""
#: top/top_nls.c:646 #: top/top_nls.c:646
#, c-format #, c-format
msgid "" msgid ""
"Inspection~2 Pause at: pid ~1%d~6 running ~1%s~6 as user ~1%s~6\n" "Inspection~2 Pause at: pid ~1%d~6, running ~1%s~6\n"
"Use~2: left/right then <Enter> to ~1select~5 an option; 'q' or <Esc> to ~1end~5 !\n" "Use~2: left/right then <Enter> to ~1select~5 an option; 'q' or <Esc> to ~1end~5 !\n"
"Options~2: ~1%s\n" "Options~2: ~1%s\n"
msgstr "" msgstr ""
@ -3176,7 +3140,7 @@ msgstr ""
#: top/top_nls.c:651 #: top/top_nls.c:651
#, c-format #, c-format
msgid "" msgid ""
"Inspection~2 View at: ~1%s~3, ~1%s~3, ~1%s~3. Locating: ~1%s~6\n" "Inspection~2 View at pid: ~1%s~3, running ~1%s~3. Locating: ~1%s~6\n"
"Use~2: left/right/up/down/etc to ~1navigate~5 the output; 'L'/'&' to ~1locate~5/~1next~5.\n" "Use~2: left/right/up/down/etc to ~1navigate~5 the output; 'L'/'&' to ~1locate~5/~1next~5.\n"
"Or~2: <Enter> to ~1select another~5; 'q' or <Esc> to ~1end~5 !\n" "Or~2: <Enter> to ~1select another~5; 'q' or <Esc> to ~1end~5 !\n"
msgstr "" msgstr ""
@ -3650,181 +3614,202 @@ msgstr ""
msgid "partition was not found\n" msgid "partition was not found\n"
msgstr "" msgstr ""
#: w.c:240 w.c:255 #: watch.c:90
#, c-format
msgid " %s [options] command\n"
msgstr ""
#: watch.c:92
msgid " -b, --beep beep if command has a non-zero exit\n"
msgstr ""
#: watch.c:93
msgid " -c, --color interpret ANSI color and style sequences\n"
msgstr ""
#: watch.c:94
msgid ""
" -d, --differences[=<permanent>]\n"
" highlight changes between updates\n"
msgstr ""
#: watch.c:96
msgid " -e, --errexit exit if command has a non-zero exit\n"
msgstr ""
#: watch.c:97
msgid " -g, --chgexit exit when output from command changes\n"
msgstr ""
#: watch.c:98
msgid " -n, --interval <secs> seconds to wait between updates\n"
msgstr ""
#: watch.c:99
msgid " -p, --precise attempt run command in precise intervals\n"
msgstr ""
#: watch.c:100
msgid " -t, --no-title turn off header\n"
msgstr ""
#: watch.c:101
msgid " -x, --exec pass command to exec instead of \"sh -c\"\n"
msgstr ""
#: watch.c:104
msgid " -v, --version output version information and exit\n"
msgstr ""
#: watch.c:376
#, c-format
msgid "Every %.1fs: "
msgstr ""
#: watch.c:437
msgid "unable to create IPC pipes"
msgstr ""
#: watch.c:447
msgid "unable to fork process"
msgstr ""
#: watch.c:452
msgid "dup2 failed"
msgstr ""
#: watch.c:459
#, c-format
msgid "unable to execute '%s'"
msgstr ""
#: watch.c:476
msgid "fdopen"
msgstr ""
#: watch.c:622
msgid "waitpid"
msgstr ""
#: watch.c:630
msgid "command exit with a non-zero status, press a key to exit"
msgstr ""
#: watch.c:755
#, c-format
msgid "unicode handling error\n"
msgstr ""
#: watch.c:761
#, c-format
msgid "unicode handling error (malloc)\n"
msgstr ""
#: w.c:241 w.c:256
#, c-format #, c-format
msgid " %2ludays" msgid " %2ludays"
msgstr "" msgstr ""
#. Translation Hint: Minutes:Seconds #. Translation Hint: Minutes:Seconds
#. Translation Hint: Hours:Minutes #. Translation Hint: Hours:Minutes
#: w.c:249 w.c:259 #: w.c:250 w.c:260
#, c-format #, c-format
msgid " %2lu:%02um" msgid " %2lu:%02um"
msgstr "" msgstr ""
#. Translation Hint: Seconds:Centiseconds #. Translation Hint: Seconds:Centiseconds
#: w.c:267 #: w.c:268
#, c-format #, c-format
msgid " %2lu.%02us" msgid " %2lu.%02us"
msgstr "" msgstr ""
#: w.c:449 #: w.c:451
msgid " -h, --no-header do not print header\n" msgid " -h, --no-header do not print header\n"
msgstr "" msgstr ""
#: w.c:450 #: w.c:452
msgid " -u, --no-current ignore current process username\n" msgid " -u, --no-current ignore current process username\n"
msgstr "" msgstr ""
#: w.c:451 #: w.c:453
msgid " -s, --short short format\n" msgid " -s, --short short format\n"
msgstr "" msgstr ""
#: w.c:452 #: w.c:454
msgid " -f, --from show remote hostname field\n" msgid " -f, --from show remote hostname field\n"
msgstr "" msgstr ""
#: w.c:453 #: w.c:455
msgid " -o, --old-style old style output\n" msgid " -o, --old-style old style output\n"
msgstr "" msgstr ""
#: w.c:454 #: w.c:456
msgid " -i, --ip-addr display IP address instead of hostname (if possible)\n" msgid " -i, --ip-addr display IP address instead of hostname (if possible)\n"
msgstr "" msgstr ""
#: w.c:551 #: w.c:553
#, c-format #, c-format
msgid "User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n" msgid "User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n"
msgstr "" msgstr ""
#: w.c:561 #: w.c:563
#, c-format #, c-format
msgid "from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n" msgid "from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n"
msgstr "" msgstr ""
#: w.c:573
#, c-format
msgid "%d column window is too narrow"
msgstr ""
#: w.c:575
#, c-format
msgid "%d column width exceeds command buffer size, truncating to %d"
msgstr ""
#: w.c:581
#, c-format
msgid "warning: screen width %d suboptimal"
msgstr ""
#. Translation Hint: Following five uppercase messages are #. Translation Hint: Following five uppercase messages are
#. * headers. Try to keep alignment intact. #. * headers. Try to keep alignment intact.
#: w.c:590 #: w.c:587
#, c-format #, c-format
msgid "%-*s TTY " msgid "%-*s TTY "
msgstr "" msgstr ""
#: w.c:592 #: w.c:589
msgid "FROM" msgid "FROM"
msgstr "" msgstr ""
#: w.c:594 #: w.c:591
#, c-format #, c-format
msgid " LOGIN@ IDLE JCPU PCPU WHAT\n" msgid " LOGIN@ IDLE JCPU PCPU WHAT\n"
msgstr "" msgstr ""
#: w.c:596 #: w.c:593
#, c-format #, c-format
msgid " IDLE WHAT\n" msgid " IDLE WHAT\n"
msgstr "" msgstr ""
#: watch.c:89 #: include/c.h:153
#, c-format
msgid " %s [options] command\n"
msgstr ""
#: watch.c:91
msgid " -b, --beep beep if command has a non-zero exit\n"
msgstr ""
#: watch.c:92
msgid " -c, --color interpret ANSI color and style sequences\n"
msgstr ""
#: watch.c:93
msgid "" msgid ""
" -d, --differences[=<permanent>]\n" "\n"
" highlight changes between updates\n" "Usage:\n"
msgstr "" msgstr ""
#: watch.c:95 #: include/c.h:154
msgid " -e, --errexit exit if command has a non-zero exit\n" msgid ""
"\n"
"Options:\n"
msgstr "" msgstr ""
#: watch.c:96 #: include/c.h:155
msgid " -g, --chgexit exit when output from command changes\n" msgid "\n"
msgstr "" msgstr ""
#: watch.c:97 #: include/c.h:156
msgid " -n, --interval <secs> seconds to wait between updates\n" msgid " -h, --help display this help and exit\n"
msgstr "" msgstr ""
#: watch.c:98 #: include/c.h:157
msgid " -p, --precise attempt run command in precise intervals\n" msgid " -V, --version output version information and exit\n"
msgstr "" msgstr ""
#: watch.c:99 #: include/c.h:158
msgid " -t, --no-title turn off header\n"
msgstr ""
#: watch.c:100
msgid " -x, --exec pass command to exec instead of \"sh -c\"\n"
msgstr ""
#: watch.c:103
msgid " -v, --version output version information and exit\n"
msgstr ""
#: watch.c:375
#, c-format #, c-format
msgid "Every %.1fs: " msgid ""
"\n"
"For more details see %s.\n"
msgstr "" msgstr ""
#: watch.c:436 #: include/c.h:160
msgid "unable to create IPC pipes"
msgstr ""
#: watch.c:446
msgid "unable to fork process"
msgstr ""
#: watch.c:451
msgid "dup2 failed"
msgstr ""
#: watch.c:458
#, c-format #, c-format
msgid "unable to execute '%s'" msgid "%s from %s\n"
msgstr ""
#: watch.c:475
msgid "fdopen"
msgstr ""
#: watch.c:621
msgid "waitpid"
msgstr ""
#: watch.c:629
msgid "command exit with a non-zero status, press a key to exit"
msgstr ""
#: watch.c:754
#, c-format
msgid "unicode handling error\n"
msgstr ""
#: watch.c:760
#, c-format
msgid "unicode handling error (malloc)\n"
msgstr "" msgstr ""

182
po/uk.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: procps-ng-3.3.10-rc1\n" "Project-Id-Version: procps-ng-3.3.10-rc1\n"
"Report-Msgid-Bugs-To: procps@freelists.org\n" "Report-Msgid-Bugs-To: procps@freelists.org\n"
"POT-Creation-Date: 2015-06-19 20:33+1000\n" "POT-Creation-Date: 2015-08-09 15:59+1000\n"
"PO-Revision-Date: 2014-09-10 07:37+0300\n" "PO-Revision-Date: 2014-09-10 07:37+0300\n"
"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
"Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n" "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@ -19,7 +19,7 @@ msgstr ""
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Lokalize 1.5\n" "X-Generator: Lokalize 1.5\n"
#: free.c:74 slabtop.c:189 uptime.c:59 w.c:447 #: free.c:74 slabtop.c:189 uptime.c:59 w.c:449
#, c-format #, c-format
msgid " %s [options]\n" msgid " %s [options]\n"
msgstr " %s [параметри]\n" msgstr " %s [параметри]\n"
@ -109,7 +109,7 @@ msgstr ""
msgid " -w, --wide wide output\n" msgid " -w, --wide wide output\n"
msgstr " -w, --wide виведення у широкому форматі\n" msgstr " -w, --wide виведення у широкому форматі\n"
#: free.c:95 w.c:456 #: free.c:95 w.c:458
msgid " --help display this help and exit\n" msgid " --help display this help and exit\n"
msgstr " --help показати цю довідку та вийти\n" msgstr " --help показати цю довідку та вийти\n"
@ -117,26 +117,26 @@ msgstr " --help показати цю довідку та вийти\n"
msgid "Multiple unit options doesn't make sense." msgid "Multiple unit options doesn't make sense."
msgstr "" msgstr ""
#: free.c:328 #: free.c:329
#, c-format #, c-format
msgid "seconds argument `%s' failed" msgid "seconds argument `%s' failed"
msgstr "помилка аргументу секунд, «%s»" msgstr "помилка аргументу секунд, «%s»"
#: free.c:331 #: free.c:332
#, c-format #, c-format
msgid "seconds argument `%s' is not positive number" msgid "seconds argument `%s' is not positive number"
msgstr "аргумент секунд, «%s», не є додатним числом" msgstr "аргумент секунд, «%s», не є додатним числом"
#: free.c:337 #: free.c:338
msgid "failed to parse count argument" msgid "failed to parse count argument"
msgstr "не вдалося обробити аргумент кількості" msgstr "не вдалося обробити аргумент кількості"
#: free.c:340 #: free.c:341
#, c-format #, c-format
msgid "failed to parse count argument: '%s'" msgid "failed to parse count argument: '%s'"
msgstr "не вдалося обробити аргумент кількості: «%s»" msgstr "не вдалося обробити аргумент кількості: «%s»"
#: free.c:361 #: free.c:362
#, c-format #, c-format
msgid "" msgid ""
" total used free shared buffers " " total used free shared buffers "
@ -145,7 +145,7 @@ msgstr ""
" загалом використ. вільна спільна буфери " " загалом використ. вільна спільна буфери "
"кеш дост." "кеш дост."
#: free.c:363 #: free.c:364
#, c-format #, c-format
msgid "" msgid ""
" total used free shared buff/cache " " total used free shared buff/cache "
@ -153,23 +153,23 @@ msgid ""
msgstr "" msgstr ""
" загалом використ. вільна спільна буфери/кеш дост." " загалом використ. вільна спільна буфери/кеш дост."
#: free.c:366 #: free.c:367
msgid "Mem:" msgid "Mem:"
msgstr "Пам.:" msgstr "Пам.:"
#: free.c:386 #: free.c:387
msgid "Low:" msgid "Low:"
msgstr "Нижня:" msgstr "Нижня:"
#: free.c:392 #: free.c:393
msgid "High:" msgid "High:"
msgstr "Верхня:" msgstr "Верхня:"
#: free.c:399 #: free.c:400
msgid "Swap:" msgid "Swap:"
msgstr "Своп.:" msgstr "Своп.:"
#: free.c:406 #: free.c:407
msgid "Total:" msgid "Total:"
msgstr "Загалом:" msgstr "Загалом:"
@ -336,11 +336,11 @@ msgstr "не є числом: %s"
msgid "Error reading reference namespace information\n" msgid "Error reading reference namespace information\n"
msgstr "Помилка під час спроби читання даних щодо еталонного простору назв\n" msgstr "Помилка під час спроби читання даних щодо еталонного простору назв\n"
#: pgrep.c:610 pidof.c:226 pidof.c:267 sysctl.c:643 #: pgrep.c:610 pidof.c:224 pidof.c:265 sysctl.c:643
msgid "internal error" msgid "internal error"
msgstr "внутрішня помилка" msgstr "внутрішня помилка"
#: pgrep.c:878 #: pgrep.c:876
#, c-format #, c-format
msgid "" msgid ""
"-L without -F makes no sense\n" "-L without -F makes no sense\n"
@ -349,7 +349,7 @@ msgstr ""
"-L без -F позбавлений сенсу\n" "-L без -F позбавлений сенсу\n"
"Спробуйте «%s --help», щоб отримати додаткову інформацію." "Спробуйте «%s --help», щоб отримати додаткову інформацію."
#: pgrep.c:885 #: pgrep.c:883
#, c-format #, c-format
msgid "" msgid ""
"pidfile not valid\n" "pidfile not valid\n"
@ -358,7 +358,7 @@ msgstr ""
"некоректний pidfile\n" "некоректний pidfile\n"
"Спробуйте команду «%s --help», щоб дізнатися більше." "Спробуйте команду «%s --help», щоб дізнатися більше."
#: pgrep.c:893 #: pgrep.c:891
#, c-format #, c-format
msgid "" msgid ""
"only one pattern can be provided\n" "only one pattern can be provided\n"
@ -367,7 +367,7 @@ msgstr ""
"можна вказувати лише один шаблон\n" "можна вказувати лише один шаблон\n"
"Спробуйте «%s --help», щоб отримати додаткову інформацію." "Спробуйте «%s --help», щоб отримати додаткову інформацію."
#: pgrep.c:897 #: pgrep.c:895
#, c-format #, c-format
msgid "" msgid ""
"no matching criteria specified\n" "no matching criteria specified\n"
@ -376,12 +376,12 @@ msgstr ""
"не вказано критеріїв відповідності\n" "не вказано критеріїв відповідності\n"
"Спробуйте «%s --help», щоб отримати додаткову інформацію." "Спробуйте «%s --help», щоб отримати додаткову інформацію."
#: pgrep.c:924 #: pgrep.c:922
#, c-format #, c-format
msgid "%s killed (pid %lu)\n" msgid "%s killed (pid %lu)\n"
msgstr "роботу %s завершено (pid %lu)\n" msgstr "роботу %s завершено (pid %lu)\n"
#: pgrep.c:930 #: pgrep.c:928
#, c-format #, c-format
msgid "killing pid %ld failed" msgid "killing pid %ld failed"
msgstr "не вдалося завершити роботу pid %ld" msgstr "не вдалося завершити роботу pid %ld"
@ -410,7 +410,7 @@ msgstr ""
msgid " -o, --omit-pid <PID,...> omit processes with PID\n" msgid " -o, --omit-pid <PID,...> omit processes with PID\n"
msgstr " -o, --omit-pid <PID,...> пропускати процеси із вказаним PID\n" msgstr " -o, --omit-pid <PID,...> пропускати процеси із вказаним PID\n"
#: pidof.c:270 #: pidof.c:268
#, c-format #, c-format
msgid "illegal omit pid value (%s)!\n" msgid "illegal omit pid value (%s)!\n"
msgstr "некоректне значення pid для пропускання (%s)!\n" msgstr "некоректне значення pid для пропускання (%s)!\n"
@ -562,8 +562,8 @@ msgstr " загалом %16ld К\n"
msgid " total %8ldK\n" msgid " total %8ldK\n"
msgstr " загалом %8ld К\n" msgstr " загалом %8ld К\n"
#: pmap.c:767 skill.c:502 skill.c:535 skill.c:624 tload.c:128 tload.c:133 #: pmap.c:767 skill.c:500 skill.c:533 skill.c:620 tload.c:128 tload.c:133
#: vmstat.c:959 vmstat.c:968 watch.c:707 #: vmstat.c:959 vmstat.c:968 watch.c:708
msgid "failed to parse argument" msgid "failed to parse argument"
msgstr "не вдалося обробити аргумент" msgstr "не вдалося обробити аргумент"
@ -1549,12 +1549,12 @@ msgstr "-T з H/-m/m, але без PID для використання з SPID"
msgid "-L with H/-m/m but no PID/PGID/SID/SESS for NLWP to follow" msgid "-L with H/-m/m but no PID/PGID/SID/SESS for NLWP to follow"
msgstr "-L з H/-m/m, але немає PID/PGID/SID/SESS для використання з NLWP" msgstr "-L з H/-m/m, але немає PID/PGID/SID/SESS для використання з NLWP"
#: pwdx.c:38 #: pwdx.c:37
#, c-format #, c-format
msgid " %s [options] pid...\n" msgid " %s [options] pid...\n"
msgstr " %s [параметри] pid...\n" msgstr " %s [параметри] pid...\n"
#: pwdx.c:114 #: pwdx.c:113
#, c-format #, c-format
msgid "invalid process id: %s" msgid "invalid process id: %s"
msgstr "некоректний ідентифікатор процесу: %s" msgstr "некоректний ідентифікатор процесу: %s"
@ -1711,56 +1711,56 @@ msgstr ""
"Від’ємними значеннями можуть скористатися лише користувачі з\n" "Від’ємними значеннями можуть скористатися лише користувачі з\n"
"адміністративними правами доступу.\n" "адміністративними правами доступу.\n"
#: skill.c:462 #: skill.c:457
#, c-format #, c-format
msgid "unknown signal name %s" msgid "unknown signal name %s"
msgstr "невідома назва сигналу, %s" msgstr "невідома назва сигналу, %s"
#: skill.c:482 #: skill.c:477
#, c-format #, c-format
msgid "invalid argument %c" msgid "invalid argument %c"
msgstr "некоректний аргумент, %c" msgstr "некоректний аргумент, %c"
#: skill.c:515 #: skill.c:513
#, c-format #, c-format
msgid "something at line %d\n" msgid "something at line %d\n"
msgstr "щось у рядку %d\n" msgstr "щось у рядку %d\n"
#: skill.c:538 #: skill.c:536
#, c-format #, c-format
msgid "priority %lu out of range" msgid "priority %lu out of range"
msgstr "рівень пріоритетності %lu лежить поза межами припустимого діапазону" msgstr "рівень пріоритетності %lu лежить поза межами припустимого діапазону"
#: skill.c:653 #: skill.c:649
#, c-format #, c-format
msgid "invalid pid number %s" msgid "invalid pid number %s"
msgstr "некоректне число pid %s" msgstr "некоректне число pid %s"
#: skill.c:657 #: skill.c:653
msgid "error reading reference namespace information" msgid "error reading reference namespace information"
msgstr "помилка під час спроби читання даних щодо еталонного простору назв" msgstr "помилка під час спроби читання даних щодо еталонного простору назв"
#: skill.c:665 #: skill.c:661
msgid "invalid namespace list" msgid "invalid namespace list"
msgstr "некоректний список просторів назв" msgstr "некоректний список просторів назв"
#: skill.c:703 #: skill.c:699
msgid "no process selection criteria" msgid "no process selection criteria"
msgstr "немає критерію вибору процесу" msgstr "немає критерію вибору процесу"
#: skill.c:706 #: skill.c:702
msgid "general flags may not be repeated" msgid "general flags may not be repeated"
msgstr "не можна повторювати загальні прапорці" msgstr "не можна повторювати загальні прапорці"
#: skill.c:709 #: skill.c:705
msgid "-i makes no sense with -v, -f, and -n" msgid "-i makes no sense with -v, -f, and -n"
msgstr "-i не має сенсу з -v, -f та -n" msgstr "-i не має сенсу з -v, -f та -n"
#: skill.c:711 #: skill.c:707
msgid "-v makes no sense with -i and -f" msgid "-v makes no sense with -i and -f"
msgstr "-v не має сенсу з -i та -f" msgstr "-v не має сенсу з -i та -f"
#: skill.c:756 #: skill.c:752
#, c-format #, c-format
msgid "skill: \"%s\" is not supported\n" msgid "skill: \"%s\" is not supported\n"
msgstr "skill: підтримки «%s» не передбачено\n" msgstr "skill: підтримки «%s» не передбачено\n"
@ -2117,7 +2117,7 @@ msgid "Effective User Id"
msgstr "Ідентифікатор ефективного користувача" msgstr "Ідентифікатор ефективного користувача"
#. Translation Hint: maximum 'USER' = 7 #. Translation Hint: maximum 'USER' = 7
#: top/top_nls.c:133 w.c:590 #: top/top_nls.c:133 w.c:587
msgid "USER" msgid "USER"
msgstr "КОР." msgstr "КОР."
@ -3541,9 +3541,9 @@ msgstr ""
"%s %s:~3 %9.9s~2загал,~3 %9.9s~2вільн,~3 %9.9s~2вик.~3 %9.9s~2дост %s~3\n" "%s %s:~3 %9.9s~2загал,~3 %9.9s~2вільн,~3 %9.9s~2вик.~3 %9.9s~2дост %s~3\n"
#: top/top_nls.c:646 #: top/top_nls.c:646
#, c-format #, fuzzy, c-format
msgid "" msgid ""
"Inspection~2 Pause at: pid ~1%d~6 running ~1%s~6 as user ~1%s~6\n" "Inspection~2 Pause at: pid ~1%d~6, running ~1%s~6\n"
"Use~2: left/right then <Enter> to ~1select~5 an option; 'q' or <Esc> to " "Use~2: left/right then <Enter> to ~1select~5 an option; 'q' or <Esc> to "
"~1end~5 !\n" "~1end~5 !\n"
"Options~2: ~1%s\n" "Options~2: ~1%s\n"
@ -3554,9 +3554,9 @@ msgstr ""
"Пункти~2: ~1%s\n" "Пункти~2: ~1%s\n"
#: top/top_nls.c:651 #: top/top_nls.c:651
#, c-format #, fuzzy, c-format
msgid "" msgid ""
"Inspection~2 View at: ~1%s~3, ~1%s~3, ~1%s~3. Locating: ~1%s~6\n" "Inspection~2 View at pid: ~1%s~3, running ~1%s~3. Locating: ~1%s~6\n"
"Use~2: left/right/up/down/etc to ~1navigate~5 the output; 'L'/'&' to " "Use~2: left/right/up/down/etc to ~1navigate~5 the output; 'L'/'&' to "
"~1locate~5/~1next~5.\n" "~1locate~5/~1next~5.\n"
"Or~2: <Enter> to ~1select another~5; 'q' or <Esc> to ~1end~5 !\n" "Or~2: <Enter> to ~1select another~5; 'q' or <Esc> to ~1end~5 !\n"
@ -4060,24 +4060,24 @@ msgstr "для -S слід вказати k, K, m або M (типовою од
msgid "partition was not found\n" msgid "partition was not found\n"
msgstr "розділ не знайдено\n" msgstr "розділ не знайдено\n"
#: watch.c:89 #: watch.c:90
#, c-format #, c-format
msgid " %s [options] command\n" msgid " %s [options] command\n"
msgstr " %s [параметри] команда\n" msgstr " %s [параметри] команда\n"
#: watch.c:91 #: watch.c:92
msgid " -b, --beep beep if command has a non-zero exit\n" msgid " -b, --beep beep if command has a non-zero exit\n"
msgstr "" msgstr ""
" -b, --beep гудок, якщо виконання команди завершується " " -b, --beep гудок, якщо виконання команди завершується "
"ненульовим станом\n" "ненульовим станом\n"
#: watch.c:92 #: watch.c:93
msgid " -c, --color interpret ANSI color and style sequences\n" msgid " -c, --color interpret ANSI color and style sequences\n"
msgstr "" msgstr ""
" -c, --color обробляти послідовності символів ANSI для кольорів " " -c, --color обробляти послідовності символів ANSI для кольорів "
"і стилю\n" "і стилю\n"
#: watch.c:93 #: watch.c:94
msgid "" msgid ""
" -d, --differences[=<permanent>]\n" " -d, --differences[=<permanent>]\n"
" highlight changes between updates\n" " highlight changes between updates\n"
@ -4085,129 +4085,129 @@ msgstr ""
" -d, --differences[=<сталість>]\n" " -d, --differences[=<сталість>]\n"
" позначати відмінності між оновленнями\n" " позначати відмінності між оновленнями\n"
#: watch.c:95 #: watch.c:96
msgid " -e, --errexit exit if command has a non-zero exit\n" msgid " -e, --errexit exit if command has a non-zero exit\n"
msgstr "" msgstr ""
" -e, --errexit вийти, якщо виконання команди завершується " " -e, --errexit вийти, якщо виконання команди завершується "
"ненульовим станом\n" "ненульовим станом\n"
#: watch.c:96 #: watch.c:97
msgid " -g, --chgexit exit when output from command changes\n" msgid " -g, --chgexit exit when output from command changes\n"
msgstr "" msgstr ""
" -g, --chgexit вийти, якщо змінюються дані, виведені командою\n" " -g, --chgexit вийти, якщо змінюються дані, виведені командою\n"
#: watch.c:97 #: watch.c:98
msgid " -n, --interval <secs> seconds to wait between updates\n" msgid " -n, --interval <secs> seconds to wait between updates\n"
msgstr " -n, --interval <число> кількість секунд очікування між оновленнями\n" msgstr " -n, --interval <число> кількість секунд очікування між оновленнями\n"
#: watch.c:98 #: watch.c:99
msgid " -p, --precise attempt run command in precise intervals\n" msgid " -p, --precise attempt run command in precise intervals\n"
msgstr "" msgstr ""
" -p, --precise намагатися виконувати команду з точними проміжками\n" " -p, --precise намагатися виконувати команду з точними проміжками\n"
#: watch.c:99 #: watch.c:100
msgid " -t, --no-title turn off header\n" msgid " -t, --no-title turn off header\n"
msgstr " -t, --no-title вимкнути заголовок\n" msgstr " -t, --no-title вимкнути заголовок\n"
#: watch.c:100 #: watch.c:101
msgid " -x, --exec pass command to exec instead of \"sh -c\"\n" msgid " -x, --exec pass command to exec instead of \"sh -c\"\n"
msgstr " -x, --exec передати команду exec, а не \"sh -c\"\n" msgstr " -x, --exec передати команду exec, а не \"sh -c\"\n"
#: watch.c:103 #: watch.c:104
msgid " -v, --version output version information and exit\n" msgid " -v, --version output version information and exit\n"
msgstr " -v, --version вивести інформацію про версію та вийти\n" msgstr " -v, --version вивести інформацію про версію та вийти\n"
#: watch.c:375 #: watch.c:376
#, c-format #, c-format
msgid "Every %.1fs: " msgid "Every %.1fs: "
msgstr "Кожні %.1f с: " msgstr "Кожні %.1f с: "
#: watch.c:436 #: watch.c:437
msgid "unable to create IPC pipes" msgid "unable to create IPC pipes"
msgstr "не вдалося створити канали IPC" msgstr "не вдалося створити канали IPC"
#: watch.c:446 #: watch.c:447
msgid "unable to fork process" msgid "unable to fork process"
msgstr "не вдалося розгалузити процес" msgstr "не вдалося розгалузити процес"
#: watch.c:451 #: watch.c:452
msgid "dup2 failed" msgid "dup2 failed"
msgstr "помилка dup2" msgstr "помилка dup2"
#: watch.c:458 #: watch.c:459
#, c-format #, c-format
msgid "unable to execute '%s'" msgid "unable to execute '%s'"
msgstr "не вдалося виконати «%s»" msgstr "не вдалося виконати «%s»"
#: watch.c:475 #: watch.c:476
msgid "fdopen" msgid "fdopen"
msgstr "fdopen" msgstr "fdopen"
#: watch.c:621 #: watch.c:622
msgid "waitpid" msgid "waitpid"
msgstr "waitpid" msgstr "waitpid"
#: watch.c:629 #: watch.c:630
msgid "command exit with a non-zero status, press a key to exit" msgid "command exit with a non-zero status, press a key to exit"
msgstr "" msgstr ""
"виконання команди завершено з ненульовим повідомлення щодо стану, натисніть " "виконання команди завершено з ненульовим повідомлення щодо стану, натисніть "
"клавішу, щоб завершити роботу" "клавішу, щоб завершити роботу"
#: watch.c:754 #: watch.c:755
#, c-format #, c-format
msgid "unicode handling error\n" msgid "unicode handling error\n"
msgstr "помилка обробки unicode\n" msgstr "помилка обробки unicode\n"
#: watch.c:760 #: watch.c:761
#, c-format #, c-format
msgid "unicode handling error (malloc)\n" msgid "unicode handling error (malloc)\n"
msgstr "помилка обробки unicode (malloc)\n" msgstr "помилка обробки unicode (malloc)\n"
#: w.c:240 w.c:255 #: w.c:241 w.c:256
#, c-format #, c-format
msgid " %2ludays" msgid " %2ludays"
msgstr " %2lu днів" msgstr " %2lu днів"
#. Translation Hint: Minutes:Seconds #. Translation Hint: Minutes:Seconds
#. Translation Hint: Hours:Minutes #. Translation Hint: Hours:Minutes
#: w.c:249 w.c:259 #: w.c:250 w.c:260
#, c-format #, c-format
msgid " %2lu:%02um" msgid " %2lu:%02um"
msgstr " %2lu:%02um" msgstr " %2lu:%02um"
#. Translation Hint: Seconds:Centiseconds #. Translation Hint: Seconds:Centiseconds
#: w.c:267 #: w.c:268
#, c-format #, c-format
msgid " %2lu.%02us" msgid " %2lu.%02us"
msgstr " %2lu,%02us" msgstr " %2lu,%02us"
#: w.c:449 #: w.c:451
msgid " -h, --no-header do not print header\n" msgid " -h, --no-header do not print header\n"
msgstr " -h, --no-header не виводити заголовок\n" msgstr " -h, --no-header не виводити заголовок\n"
#: w.c:450 #: w.c:452
msgid " -u, --no-current ignore current process username\n" msgid " -u, --no-current ignore current process username\n"
msgstr " -u, --no-current ігнорувати ім’я користувача поточного процесу\n" msgstr " -u, --no-current ігнорувати ім’я користувача поточного процесу\n"
#: w.c:451 #: w.c:453
msgid " -s, --short short format\n" msgid " -s, --short short format\n"
msgstr " -s, --short скорочений формат\n" msgstr " -s, --short скорочений формат\n"
#: w.c:452 #: w.c:454
msgid " -f, --from show remote hostname field\n" msgid " -f, --from show remote hostname field\n"
msgstr " -f, --from вивести поле назви віддаленого вузла\n" msgstr " -f, --from вивести поле назви віддаленого вузла\n"
#: w.c:453 #: w.c:455
msgid " -o, --old-style old style output\n" msgid " -o, --old-style old style output\n"
msgstr " -o, --old-style виведення даних у застарілому форматі\n" msgstr " -o, --old-style виведення даних у застарілому форматі\n"
#: w.c:454 #: w.c:456
msgid "" msgid ""
" -i, --ip-addr display IP address instead of hostname (if possible)\n" " -i, --ip-addr display IP address instead of hostname (if possible)\n"
msgstr "" msgstr ""
" -i, --ip-addr виводити IP-адресу замість назви вузла (якщо можна)\n" " -i, --ip-addr виводити IP-адресу замість назви вузла (якщо можна)\n"
#: w.c:551 #: w.c:553
#, c-format #, c-format
msgid "" msgid ""
"User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n" "User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n"
@ -4215,7 +4215,7 @@ msgstr ""
"Значення довжини для середовища користувача, PROCPS_USERLEN, має належати " "Значення довжини для середовища користувача, PROCPS_USERLEN, має належати "
"діапазону від 8 до %i, ігноруємо.\n" "діапазону від 8 до %i, ігноруємо.\n"
#: w.c:561 #: w.c:563
#, c-format #, c-format
msgid "" msgid ""
"from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n" "from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n"
@ -4223,38 +4223,23 @@ msgstr ""
"значення довжини вхідних даних середовища, PROCPS_FROMLEN, має бути від 8 до " "значення довжини вхідних даних середовища, PROCPS_FROMLEN, має бути від 8 до "
"%d, ігноруємо\n" "%d, ігноруємо\n"
#: w.c:573
#, c-format
msgid "%d column window is too narrow"
msgstr "вікно у %d стовпчиків є надто вузьким"
#: w.c:575
#, c-format
msgid "%d column width exceeds command buffer size, truncating to %d"
msgstr "ширина у %d перевищує розмір буфера команд, зменшуємо її до %d"
#: w.c:581
#, c-format
msgid "warning: screen width %d suboptimal"
msgstr "попередження: ширина екрана %d не є оптимальною"
#. Translation Hint: Following five uppercase messages are #. Translation Hint: Following five uppercase messages are
#. * headers. Try to keep alignment intact. #. * headers. Try to keep alignment intact.
#: w.c:590 #: w.c:587
#, c-format #, c-format
msgid "%-*s TTY " msgid "%-*s TTY "
msgstr "%-*s TTY " msgstr "%-*s TTY "
#: w.c:592 #: w.c:589
msgid "FROM" msgid "FROM"
msgstr "З" msgstr "З"
#: w.c:594 #: w.c:591
#, c-format #, c-format
msgid " LOGIN@ IDLE JCPU PCPU WHAT\n" msgid " LOGIN@ IDLE JCPU PCPU WHAT\n"
msgstr " LOGIN@ IDLE JCPU PCPU WHAT\n" msgstr " LOGIN@ IDLE JCPU PCPU WHAT\n"
#: w.c:596 #: w.c:593
#, c-format #, c-format
msgid " IDLE WHAT\n" msgid " IDLE WHAT\n"
msgstr " IDLE WHAT\n" msgstr " IDLE WHAT\n"
@ -4307,6 +4292,15 @@ msgstr "%s з %s\n"
#~ msgid "alternate System.map file must follow N" #~ msgid "alternate System.map file must follow N"
#~ msgstr "після N має бути вказано альтернативний файл System.map" #~ msgstr "після N має бути вказано альтернативний файл System.map"
#~ msgid "%d column window is too narrow"
#~ msgstr "вікно у %d стовпчиків є надто вузьким"
#~ msgid "%d column width exceeds command buffer size, truncating to %d"
#~ msgstr "ширина у %d перевищує розмір буфера команд, зменшуємо її до %d"
#~ msgid "warning: screen width %d suboptimal"
#~ msgstr "попередження: ширина екрана %d не є оптимальною"
#~ msgid "" #~ msgid ""
#~ " -o, --old use old format (without -/+buffers/cache line)\n" #~ " -o, --old use old format (without -/+buffers/cache line)\n"
#~ msgstr "" #~ msgstr ""

182
po/vi.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: procps-ng 3.3.10-rc1\n" "Project-Id-Version: procps-ng 3.3.10-rc1\n"
"Report-Msgid-Bugs-To: procps@freelists.org\n" "Report-Msgid-Bugs-To: procps@freelists.org\n"
"POT-Creation-Date: 2015-06-19 20:33+1000\n" "POT-Creation-Date: 2015-08-09 15:59+1000\n"
"PO-Revision-Date: 2014-09-13 08:57+0700\n" "PO-Revision-Date: 2014-09-13 08:57+0700\n"
"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@ -19,7 +19,7 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n" "Plural-Forms: nplurals=1; plural=0;\n"
"X-Poedit-Basepath: ../\n" "X-Poedit-Basepath: ../\n"
#: free.c:74 slabtop.c:189 uptime.c:59 w.c:447 #: free.c:74 slabtop.c:189 uptime.c:59 w.c:449
#, c-format #, c-format
msgid " %s [options]\n" msgid " %s [options]\n"
msgstr " %s [các tùy chọn]\n" msgstr " %s [các tùy chọn]\n"
@ -105,7 +105,7 @@ msgstr " -c N, --count N in lặp lại N lần rồi thoát\n"
msgid " -w, --wide wide output\n" msgid " -w, --wide wide output\n"
msgstr " -w, --wide kết xuất rộng\n" msgstr " -w, --wide kết xuất rộng\n"
#: free.c:95 w.c:456 #: free.c:95 w.c:458
msgid " --help display this help and exit\n" msgid " --help display this help and exit\n"
msgstr " --help hiển thị trợ giúp này rồi thoát\n" msgstr " --help hiển thị trợ giúp này rồi thoát\n"
@ -113,26 +113,26 @@ msgstr " --help hiển thị trợ giúp này rồi thoát\n"
msgid "Multiple unit options doesn't make sense." msgid "Multiple unit options doesn't make sense."
msgstr "" msgstr ""
#: free.c:328 #: free.c:329
#, c-format #, c-format
msgid "seconds argument `%s' failed" msgid "seconds argument `%s' failed"
msgstr "đối số thứ hai “%s” bị lỗi" msgstr "đối số thứ hai “%s” bị lỗi"
#: free.c:331 #: free.c:332
#, c-format #, c-format
msgid "seconds argument `%s' is not positive number" msgid "seconds argument `%s' is not positive number"
msgstr "đối số thứ hai “%s” không phải là số nguyên dương" msgstr "đối số thứ hai “%s” không phải là số nguyên dương"
#: free.c:337 #: free.c:338
msgid "failed to parse count argument" msgid "failed to parse count argument"
msgstr "gặp lỗi khi phân tích số lượng đối số" msgstr "gặp lỗi khi phân tích số lượng đối số"
#: free.c:340 #: free.c:341
#, c-format #, c-format
msgid "failed to parse count argument: '%s'" msgid "failed to parse count argument: '%s'"
msgstr "gặp lỗi khi phân tích số lượng đối số: “%s”" msgstr "gặp lỗi khi phân tích số lượng đối số: “%s”"
#: free.c:361 #: free.c:362
#, c-format #, c-format
msgid "" msgid ""
" total used free shared buffers " " total used free shared buffers "
@ -141,7 +141,7 @@ msgstr ""
" tổng dùng trống chsẻ đệm nhớ " " tổng dùng trống chsẻ đệm nhớ "
"tạm sẵn sàng" "tạm sẵn sàng"
#: free.c:363 #: free.c:364
#, c-format #, c-format
msgid "" msgid ""
" total used free shared buff/cache " " total used free shared buff/cache "
@ -150,23 +150,23 @@ msgstr ""
" tổng dùng trống chsẻ đệm/tạm sẵn " " tổng dùng trống chsẻ đệm/tạm sẵn "
"sàng" "sàng"
#: free.c:366 #: free.c:367
msgid "Mem:" msgid "Mem:"
msgstr "BNhớ:" msgstr "BNhớ:"
#: free.c:386 #: free.c:387
msgid "Low:" msgid "Low:"
msgstr "Thấp:" msgstr "Thấp:"
#: free.c:392 #: free.c:393
msgid "High:" msgid "High:"
msgstr "Cao:" msgstr "Cao:"
#: free.c:399 #: free.c:400
msgid "Swap:" msgid "Swap:"
msgstr "Tráo đổi:" msgstr "Tráo đổi:"
#: free.c:406 #: free.c:407
msgid "Total:" msgid "Total:"
msgstr "Tổng:" msgstr "Tổng:"
@ -320,11 +320,11 @@ msgstr "không phải con số: %s"
msgid "Error reading reference namespace information\n" msgid "Error reading reference namespace information\n"
msgstr "Gặp lỗi khi đọc thông tin tham chiếu không gian tên\n" msgstr "Gặp lỗi khi đọc thông tin tham chiếu không gian tên\n"
#: pgrep.c:610 pidof.c:226 pidof.c:267 sysctl.c:643 #: pgrep.c:610 pidof.c:224 pidof.c:265 sysctl.c:643
msgid "internal error" msgid "internal error"
msgstr "lỗi nội bộ" msgstr "lỗi nội bộ"
#: pgrep.c:878 #: pgrep.c:876
#, c-format #, c-format
msgid "" msgid ""
"-L without -F makes no sense\n" "-L without -F makes no sense\n"
@ -333,7 +333,7 @@ msgstr ""
"-L mà không có -F là không hợp lý\n" "-L mà không có -F là không hợp lý\n"
"Chạy “%s --help” để biết thêm chi tiết." "Chạy “%s --help” để biết thêm chi tiết."
#: pgrep.c:885 #: pgrep.c:883
#, c-format #, c-format
msgid "" msgid ""
"pidfile not valid\n" "pidfile not valid\n"
@ -342,7 +342,7 @@ msgstr ""
"tập tin mã số tiến trình không hợp lệ\n" "tập tin mã số tiến trình không hợp lệ\n"
"Chạy “%s --help” để biết thêm chi tiết." "Chạy “%s --help” để biết thêm chi tiết."
#: pgrep.c:893 #: pgrep.c:891
#, c-format #, c-format
msgid "" msgid ""
"only one pattern can be provided\n" "only one pattern can be provided\n"
@ -351,7 +351,7 @@ msgstr ""
"chỉ được dùng một mẫu tìm kiếm\n" "chỉ được dùng một mẫu tìm kiếm\n"
"Hãy chạy lệnh “%s --help” để có thêm thông tin." "Hãy chạy lệnh “%s --help” để có thêm thông tin."
#: pgrep.c:897 #: pgrep.c:895
#, c-format #, c-format
msgid "" msgid ""
"no matching criteria specified\n" "no matching criteria specified\n"
@ -360,12 +360,12 @@ msgstr ""
"chưa chỉ định tiêu chí tìm kiếm\n" "chưa chỉ định tiêu chí tìm kiếm\n"
"Hãy chạy lệnh “%s --help” để có thêm thông tin." "Hãy chạy lệnh “%s --help” để có thêm thông tin."
#: pgrep.c:924 #: pgrep.c:922
#, c-format #, c-format
msgid "%s killed (pid %lu)\n" msgid "%s killed (pid %lu)\n"
msgstr "đã giết %s (mã số tiến trình %lu)\n" msgstr "đã giết %s (mã số tiến trình %lu)\n"
#: pgrep.c:930 #: pgrep.c:928
#, c-format #, c-format
msgid "killing pid %ld failed" msgid "killing pid %ld failed"
msgstr "gặp lỗi khi giết tiến trình mã số %ld" msgstr "gặp lỗi khi giết tiến trình mã số %ld"
@ -392,7 +392,7 @@ msgstr ""
msgid " -o, --omit-pid <PID,...> omit processes with PID\n" msgid " -o, --omit-pid <PID,...> omit processes with PID\n"
msgstr " -o, --omit-pid <PID,...> bỏ qua các tiến trình có mã số này\n" msgstr " -o, --omit-pid <PID,...> bỏ qua các tiến trình có mã số này\n"
#: pidof.c:270 #: pidof.c:268
#, c-format #, c-format
msgid "illegal omit pid value (%s)!\n" msgid "illegal omit pid value (%s)!\n"
msgstr "giá trị mã số tiến trình bỏ qua không hợp lệ (%s)!\n" msgstr "giá trị mã số tiến trình bỏ qua không hợp lệ (%s)!\n"
@ -541,8 +541,8 @@ msgstr " tổng %16ldK\n"
msgid " total %8ldK\n" msgid " total %8ldK\n"
msgstr " tổng %8ldK\n" msgstr " tổng %8ldK\n"
#: pmap.c:767 skill.c:502 skill.c:535 skill.c:624 tload.c:128 tload.c:133 #: pmap.c:767 skill.c:500 skill.c:533 skill.c:620 tload.c:128 tload.c:133
#: vmstat.c:959 vmstat.c:968 watch.c:707 #: vmstat.c:959 vmstat.c:968 watch.c:708
msgid "failed to parse argument" msgid "failed to parse argument"
msgstr "gặp lỗi khi phân tích đối số" msgstr "gặp lỗi khi phân tích đối số"
@ -1521,12 +1521,12 @@ msgstr "-T với H/-m/m nhưng lại không có mã số tiến trình cho SPID
msgid "-L with H/-m/m but no PID/PGID/SID/SESS for NLWP to follow" msgid "-L with H/-m/m but no PID/PGID/SID/SESS for NLWP to follow"
msgstr "-L với H/-m/m nhưng không có PID/PGID/SID/SESS cho NLWP để theo" msgstr "-L với H/-m/m nhưng không có PID/PGID/SID/SESS cho NLWP để theo"
#: pwdx.c:38 #: pwdx.c:37
#, c-format #, c-format
msgid " %s [options] pid...\n" msgid " %s [options] pid...\n"
msgstr " %s [các-tùy-chọn] pid...\n" msgstr " %s [các-tùy-chọn] pid...\n"
#: pwdx.c:114 #: pwdx.c:113
#, c-format #, c-format
msgid "invalid process id: %s" msgid "invalid process id: %s"
msgstr "mã số tiến trình không hợp lệ: %s" msgstr "mã số tiến trình không hợp lệ: %s"
@ -1680,56 +1680,56 @@ msgstr ""
"Số của mức ưu tiên là từ +20 (thấp nhất) đến -20 (nhanh nhất).\n" "Số của mức ưu tiên là từ +20 (thấp nhất) đến -20 (nhanh nhất).\n"
"Các mức ưu tiên là số âm là được hạn chế cho những người quản trị.\n" "Các mức ưu tiên là số âm là được hạn chế cho những người quản trị.\n"
#: skill.c:462 #: skill.c:457
#, c-format #, c-format
msgid "unknown signal name %s" msgid "unknown signal name %s"
msgstr "không hiểu tên tín hiệu: %s" msgstr "không hiểu tên tín hiệu: %s"
#: skill.c:482 #: skill.c:477
#, c-format #, c-format
msgid "invalid argument %c" msgid "invalid argument %c"
msgstr "đối số %c không hợp lệ" msgstr "đối số %c không hợp lệ"
#: skill.c:515 #: skill.c:513
#, c-format #, c-format
msgid "something at line %d\n" msgid "something at line %d\n"
msgstr "cái gì đó tại dòng %d\n" msgstr "cái gì đó tại dòng %d\n"
#: skill.c:538 #: skill.c:536
#, c-format #, c-format
msgid "priority %lu out of range" msgid "priority %lu out of range"
msgstr "mức ưu tiên %lu nằm ngoài phạm vi" msgstr "mức ưu tiên %lu nằm ngoài phạm vi"
#: skill.c:653 #: skill.c:649
#, c-format #, c-format
msgid "invalid pid number %s" msgid "invalid pid number %s"
msgstr "mã số tiến trình không hợp lệ %s" msgstr "mã số tiến trình không hợp lệ %s"
#: skill.c:657 #: skill.c:653
msgid "error reading reference namespace information" msgid "error reading reference namespace information"
msgstr "lỗi đọc thông tin không gian tên tham chiếu" msgstr "lỗi đọc thông tin không gian tên tham chiếu"
#: skill.c:665 #: skill.c:661
msgid "invalid namespace list" msgid "invalid namespace list"
msgstr "danh sách không gian tên không hợp lệ" msgstr "danh sách không gian tên không hợp lệ"
#: skill.c:703 #: skill.c:699
msgid "no process selection criteria" msgid "no process selection criteria"
msgstr "chưa có tiêu chí chọn tiến trình" msgstr "chưa có tiêu chí chọn tiến trình"
#: skill.c:706 #: skill.c:702
msgid "general flags may not be repeated" msgid "general flags may not be repeated"
msgstr "các cờ chung không thể lặp lại" msgstr "các cờ chung không thể lặp lại"
#: skill.c:709 #: skill.c:705
msgid "-i makes no sense with -v, -f, and -n" msgid "-i makes no sense with -v, -f, and -n"
msgstr "-i không hợp lý với -v, -f, và -n" msgstr "-i không hợp lý với -v, -f, và -n"
#: skill.c:711 #: skill.c:707
msgid "-v makes no sense with -i and -f" msgid "-v makes no sense with -i and -f"
msgstr "-v không hợp lý với -i và -f" msgstr "-v không hợp lý với -i và -f"
#: skill.c:756 #: skill.c:752
#, c-format #, c-format
msgid "skill: \"%s\" is not supported\n" msgid "skill: \"%s\" is not supported\n"
msgstr "skill: \"%s\" không được hỗ trợ\n" msgstr "skill: \"%s\" không được hỗ trợ\n"
@ -2081,7 +2081,7 @@ msgid "Effective User Id"
msgstr "Mã số người dùng chịu tác động" msgstr "Mã số người dùng chịu tác động"
#. Translation Hint: maximum 'USER' = 7 #. Translation Hint: maximum 'USER' = 7
#: top/top_nls.c:133 w.c:590 #: top/top_nls.c:133 w.c:587
msgid "USER" msgid "USER"
msgstr "NG_DÙNG" msgstr "NG_DÙNG"
@ -3497,9 +3497,9 @@ msgstr ""
"%s %s:~3 %9.9s~2tổng,~3 %9.9s~2trống,~3 %9.9s~2dùng.~3 %9.9s~2%s sẵnsàng~3\n" "%s %s:~3 %9.9s~2tổng,~3 %9.9s~2trống,~3 %9.9s~2dùng.~3 %9.9s~2%s sẵnsàng~3\n"
#: top/top_nls.c:646 #: top/top_nls.c:646
#, c-format #, fuzzy, c-format
msgid "" msgid ""
"Inspection~2 Pause at: pid ~1%d~6 running ~1%s~6 as user ~1%s~6\n" "Inspection~2 Pause at: pid ~1%d~6, running ~1%s~6\n"
"Use~2: left/right then <Enter> to ~1select~5 an option; 'q' or <Esc> to " "Use~2: left/right then <Enter> to ~1select~5 an option; 'q' or <Esc> to "
"~1end~5 !\n" "~1end~5 !\n"
"Options~2: ~1%s\n" "Options~2: ~1%s\n"
@ -3511,9 +3511,9 @@ msgstr ""
"Tùy chọn~2: ~1%s\n" "Tùy chọn~2: ~1%s\n"
#: top/top_nls.c:651 #: top/top_nls.c:651
#, c-format #, fuzzy, c-format
msgid "" msgid ""
"Inspection~2 View at: ~1%s~3, ~1%s~3, ~1%s~3. Locating: ~1%s~6\n" "Inspection~2 View at pid: ~1%s~3, running ~1%s~3. Locating: ~1%s~6\n"
"Use~2: left/right/up/down/etc to ~1navigate~5 the output; 'L'/'&' to " "Use~2: left/right/up/down/etc to ~1navigate~5 the output; 'L'/'&' to "
"~1locate~5/~1next~5.\n" "~1locate~5/~1next~5.\n"
"Or~2: <Enter> to ~1select another~5; 'q' or <Esc> to ~1end~5 !\n" "Or~2: <Enter> to ~1select another~5; 'q' or <Esc> to ~1end~5 !\n"
@ -4010,20 +4010,20 @@ msgstr "-S cần k, K, m hay M (mặc định là KiB)"
msgid "partition was not found\n" msgid "partition was not found\n"
msgstr "không tìm thấy phân vùng\n" msgstr "không tìm thấy phân vùng\n"
#: watch.c:89 #: watch.c:90
#, c-format #, c-format
msgid " %s [options] command\n" msgid " %s [options] command\n"
msgstr " %s [các-tùy-chọn] lệnh\n" msgstr " %s [các-tùy-chọn] lệnh\n"
#: watch.c:91 #: watch.c:92
msgid " -b, --beep beep if command has a non-zero exit\n" msgid " -b, --beep beep if command has a non-zero exit\n"
msgstr " -b, --beep kêu bíp nếu lệnh thoát khác không\n" msgstr " -b, --beep kêu bíp nếu lệnh thoát khác không\n"
#: watch.c:92 #: watch.c:93
msgid " -c, --color interpret ANSI color and style sequences\n" msgid " -c, --color interpret ANSI color and style sequences\n"
msgstr " -c, --color phiên dịch màu ANSI và dãy kiểu\n" msgstr " -c, --color phiên dịch màu ANSI và dãy kiểu\n"
#: watch.c:93 #: watch.c:94
msgid "" msgid ""
" -d, --differences[=<permanent>]\n" " -d, --differences[=<permanent>]\n"
" highlight changes between updates\n" " highlight changes between updates\n"
@ -4031,122 +4031,122 @@ msgstr ""
" -d, --differences[=<permanent>]\n" " -d, --differences[=<permanent>]\n"
" tô sáng các thay đổi giữa những lần cập nhật\n" " tô sáng các thay đổi giữa những lần cập nhật\n"
#: watch.c:95 #: watch.c:96
msgid " -e, --errexit exit if command has a non-zero exit\n" msgid " -e, --errexit exit if command has a non-zero exit\n"
msgstr " -e, --errexit thoát nếu lệnh kết thúc khác không\n" msgstr " -e, --errexit thoát nếu lệnh kết thúc khác không\n"
#: watch.c:96 #: watch.c:97
msgid " -g, --chgexit exit when output from command changes\n" msgid " -g, --chgexit exit when output from command changes\n"
msgstr " -g, --chgexit thoát khi kết xuất từ lệnh có thay đổi\n" msgstr " -g, --chgexit thoát khi kết xuất từ lệnh có thay đổi\n"
#: watch.c:97 #: watch.c:98
msgid " -n, --interval <secs> seconds to wait between updates\n" msgid " -n, --interval <secs> seconds to wait between updates\n"
msgstr " -n, --interval <giây> số giây đợi giữa các lần cập nhật\n" msgstr " -n, --interval <giây> số giây đợi giữa các lần cập nhật\n"
#: watch.c:98 #: watch.c:99
msgid " -p, --precise attempt run command in precise intervals\n" msgid " -p, --precise attempt run command in precise intervals\n"
msgstr " -p, --precise cố chạy lệnh ở nhịp thời gian chính xác\n" msgstr " -p, --precise cố chạy lệnh ở nhịp thời gian chính xác\n"
#: watch.c:99 #: watch.c:100
msgid " -t, --no-title turn off header\n" msgid " -t, --no-title turn off header\n"
msgstr " -t, --no-title không in phần đầu\n" msgstr " -t, --no-title không in phần đầu\n"
#: watch.c:100 #: watch.c:101
msgid " -x, --exec pass command to exec instead of \"sh -c\"\n" msgid " -x, --exec pass command to exec instead of \"sh -c\"\n"
msgstr " -x, --exec chuyển lệnh cho exec thay cho \"sh -c\"\n" msgstr " -x, --exec chuyển lệnh cho exec thay cho \"sh -c\"\n"
#: watch.c:103 #: watch.c:104
msgid " -v, --version output version information and exit\n" msgid " -v, --version output version information and exit\n"
msgstr " -v, --version hiển thị thông tin phiên bản rồi thoát\n" msgstr " -v, --version hiển thị thông tin phiên bản rồi thoát\n"
#: watch.c:375 #: watch.c:376
#, c-format #, c-format
msgid "Every %.1fs: " msgid "Every %.1fs: "
msgstr "Mỗi %.1fs: " msgstr "Mỗi %.1fs: "
#: watch.c:436 #: watch.c:437
msgid "unable to create IPC pipes" msgid "unable to create IPC pipes"
msgstr "không thể tạo đường ống IPC" msgstr "không thể tạo đường ống IPC"
#: watch.c:446 #: watch.c:447
msgid "unable to fork process" msgid "unable to fork process"
msgstr "không thể rẽ nhánh tiến trình" msgstr "không thể rẽ nhánh tiến trình"
#: watch.c:451 #: watch.c:452
msgid "dup2 failed" msgid "dup2 failed"
msgstr "dup2 bị lỗi" msgstr "dup2 bị lỗi"
#: watch.c:458 #: watch.c:459
#, c-format #, c-format
msgid "unable to execute '%s'" msgid "unable to execute '%s'"
msgstr "không thể thực hiện “%s”" msgstr "không thể thực hiện “%s”"
#: watch.c:475 #: watch.c:476
msgid "fdopen" msgid "fdopen"
msgstr "fdopen" msgstr "fdopen"
#: watch.c:621 #: watch.c:622
msgid "waitpid" msgid "waitpid"
msgstr "waitpid" msgstr "waitpid"
#: watch.c:629 #: watch.c:630
msgid "command exit with a non-zero status, press a key to exit" msgid "command exit with a non-zero status, press a key to exit"
msgstr "lệnh kết thúc với mã thoát khác không, hãy bấm phím bất kỳ để thoát" msgstr "lệnh kết thúc với mã thoát khác không, hãy bấm phím bất kỳ để thoát"
#: watch.c:754 #: watch.c:755
#, c-format #, c-format
msgid "unicode handling error\n" msgid "unicode handling error\n"
msgstr "xử lý unicode gặp lỗi\n" msgstr "xử lý unicode gặp lỗi\n"
#: watch.c:760 #: watch.c:761
#, c-format #, c-format
msgid "unicode handling error (malloc)\n" msgid "unicode handling error (malloc)\n"
msgstr "xử lý unicode gặp lỗi (malloc)\n" msgstr "xử lý unicode gặp lỗi (malloc)\n"
#: w.c:240 w.c:255 #: w.c:241 w.c:256
#, c-format #, c-format
msgid " %2ludays" msgid " %2ludays"
msgstr " %2lungày" msgstr " %2lungày"
#. Translation Hint: Minutes:Seconds #. Translation Hint: Minutes:Seconds
#. Translation Hint: Hours:Minutes #. Translation Hint: Hours:Minutes
#: w.c:249 w.c:259 #: w.c:250 w.c:260
#, c-format #, c-format
msgid " %2lu:%02um" msgid " %2lu:%02um"
msgstr " %2lu:%02uphút" msgstr " %2lu:%02uphút"
#. Translation Hint: Seconds:Centiseconds #. Translation Hint: Seconds:Centiseconds
#: w.c:267 #: w.c:268
#, c-format #, c-format
msgid " %2lu.%02us" msgid " %2lu.%02us"
msgstr " %2lu.%02ugiây" msgstr " %2lu.%02ugiây"
#: w.c:449 #: w.c:451
msgid " -h, --no-header do not print header\n" msgid " -h, --no-header do not print header\n"
msgstr " -h, --no-header không in phần đầu\n" msgstr " -h, --no-header không in phần đầu\n"
#: w.c:450 #: w.c:452
msgid " -u, --no-current ignore current process username\n" msgid " -u, --no-current ignore current process username\n"
msgstr " -u, --no-current bỏ qua tiến trình từ người dùng hiện tại\n" msgstr " -u, --no-current bỏ qua tiến trình từ người dùng hiện tại\n"
#: w.c:451 #: w.c:453
msgid " -s, --short short format\n" msgid " -s, --short short format\n"
msgstr " -s, --short định dạng ngắn gọn\n" msgstr " -s, --short định dạng ngắn gọn\n"
#: w.c:452 #: w.c:454
msgid " -f, --from show remote hostname field\n" msgid " -f, --from show remote hostname field\n"
msgstr " -f, --from hiển thị trường tên máy chủ\n" msgstr " -f, --from hiển thị trường tên máy chủ\n"
#: w.c:453 #: w.c:455
msgid " -o, --old-style old style output\n" msgid " -o, --old-style old style output\n"
msgstr " -o, --old-style hiển thị kiểu cũ\n" msgstr " -o, --old-style hiển thị kiểu cũ\n"
#: w.c:454 #: w.c:456
msgid "" msgid ""
" -i, --ip-addr display IP address instead of hostname (if possible)\n" " -i, --ip-addr display IP address instead of hostname (if possible)\n"
msgstr " -i, --ip-addr hiển thị địa chỉ IP thay cho tên máy (nếu được)\n" msgstr " -i, --ip-addr hiển thị địa chỉ IP thay cho tên máy (nếu được)\n"
#: w.c:551 #: w.c:553
#, c-format #, c-format
msgid "" msgid ""
"User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n" "User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n"
@ -4154,7 +4154,7 @@ msgstr ""
"“chiều dài biến môi trường của người dùng” PROCPS_USERLEN phải nằm giữa 8 và " "“chiều dài biến môi trường của người dùng” PROCPS_USERLEN phải nằm giữa 8 và "
"%d, nên bỏ qua\n" "%d, nên bỏ qua\n"
#: w.c:561 #: w.c:563
#, c-format #, c-format
msgid "" msgid ""
"from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n" "from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n"
@ -4162,38 +4162,23 @@ msgstr ""
"“chiều dài biến môi trường từ” PROCPS_FROMLEN phải nằm giữa 8 và %d, nên bỏ " "“chiều dài biến môi trường từ” PROCPS_FROMLEN phải nằm giữa 8 và %d, nên bỏ "
"qua\n" "qua\n"
#: w.c:573
#, c-format
msgid "%d column window is too narrow"
msgstr "cửa sổ %d cột là quá hẹp"
#: w.c:575
#, c-format
msgid "%d column width exceeds command buffer size, truncating to %d"
msgstr "độ rộng cột %d là vượt quá cỡ bộ đệm lệnh, cắt ngắn thành %d"
#: w.c:581
#, c-format
msgid "warning: screen width %d suboptimal"
msgstr "cảnh báo: độ rộng màn hình %d gần dưới điểm cực thuận"
#. Translation Hint: Following five uppercase messages are #. Translation Hint: Following five uppercase messages are
#. * headers. Try to keep alignment intact. #. * headers. Try to keep alignment intact.
#: w.c:590 #: w.c:587
#, c-format #, c-format
msgid "%-*s TTY " msgid "%-*s TTY "
msgstr "%-*s TTY " msgstr "%-*s TTY "
#: w.c:592 #: w.c:589
msgid "FROM" msgid "FROM"
msgstr "TỪ" msgstr "TỪ"
#: w.c:594 #: w.c:591
#, c-format #, c-format
msgid " LOGIN@ IDLE JCPU PCPU WHAT\n" msgid " LOGIN@ IDLE JCPU PCPU WHAT\n"
msgstr " ĐNHẬP@ NGHỈ JCPU PCPU GÌ\n" msgstr " ĐNHẬP@ NGHỈ JCPU PCPU GÌ\n"
#: w.c:596 #: w.c:593
#, c-format #, c-format
msgid " IDLE WHAT\n" msgid " IDLE WHAT\n"
msgstr " NGHỈ GÌ\n" msgstr " NGHỈ GÌ\n"
@ -4246,6 +4231,15 @@ msgstr "%s nằm trong gói phần mềm “%s”.\n"
#~ msgid "alternate System.map file must follow N" #~ msgid "alternate System.map file must follow N"
#~ msgstr "tập tin System.map thay thế phải theo sau N" #~ msgstr "tập tin System.map thay thế phải theo sau N"
#~ msgid "%d column window is too narrow"
#~ msgstr "cửa sổ %d cột là quá hẹp"
#~ msgid "%d column width exceeds command buffer size, truncating to %d"
#~ msgstr "độ rộng cột %d là vượt quá cỡ bộ đệm lệnh, cắt ngắn thành %d"
#~ msgid "warning: screen width %d suboptimal"
#~ msgstr "cảnh báo: độ rộng màn hình %d gần dưới điểm cực thuận"
#~ msgid "" #~ msgid ""
#~ " -o, --old use old format (without -/+buffers/cache line)\n" #~ " -o, --old use old format (without -/+buffers/cache line)\n"
#~ msgstr "" #~ msgstr ""

2
ps/common.h
View File

@ -456,7 +456,7 @@ extern char *myname;
/* sortformat.c */ /* sortformat.c */
extern int defer_sf_option(const char *arg, int source); extern int defer_sf_option(const char *arg, int source);
extern const char *process_sf_options(int localbroken); extern const char *process_sf_options();
extern void reset_sortformat(void); extern void reset_sortformat(void);
/* select.c */ /* select.c */

17
ps/global.c
View File

@ -382,14 +382,7 @@ static const char *set_personality(void){
return NULL; return NULL;
case_default: /* use defaults for ps, ignoring other environment variables */ case_default: /* use defaults for ps, ignoring other environment variables */
return NULL;
case_unknown: /* defaults, but also check inferior environment variables */ case_unknown: /* defaults, but also check inferior environment variables */
if(
getenv("UNIX95") /* Irix */
|| getenv("POSIXLY_CORRECT") /* most gnu stuff */
|| (getenv("POSIX2") && !strcmp(getenv("POSIX2"), "on")) /* Unixware 7 */
) personality = PER_BROKEN_o;
return NULL; return NULL;
case_aix: case_aix:
@ -431,8 +424,9 @@ static const char *set_personality(void){
case_irix: case_irix:
case_sgi: case_sgi:
s = getenv("_XPG"); s = getenv("_XPG");
if(s && s[0]>'0' && s[0]<='9') personality = PER_BROKEN_o; if(s && s[0]>'0' && s[0]<='9')
else personality = PER_IRIX_l; return NULL;
personality = PER_IRIX_l;
return NULL; return NULL;
case_os390: /* IBM's OS/390 OpenEdition on the S/390 mainframe */ case_os390: /* IBM's OS/390 OpenEdition on the S/390 mainframe */
@ -443,13 +437,13 @@ static const char *set_personality(void){
case_hp: case_hp:
case_hpux: case_hpux:
personality = PER_BROKEN_o | PER_HPUX_x; personality = PER_HPUX_x;
return NULL; return NULL;
case_svr4: case_svr4:
case_sysv: case_sysv:
case_sco: case_sco:
personality = PER_BROKEN_o | PER_SVR4_x; personality = PER_SVR4_x;
return NULL; return NULL;
case_posix: case_posix:
@ -457,7 +451,6 @@ static const char *set_personality(void){
case_unix95: case_unix95:
case_unix98: case_unix98:
case_unix: case_unix:
personality = PER_BROKEN_o;
return NULL; return NULL;
} }

22
ps/parser.c
View File

@ -51,7 +51,6 @@ static int ps_argc; /* global argc */
static char **ps_argv; /* global argv */ static char **ps_argv; /* global argv */
static int thisarg; /* index into ps_argv */ static int thisarg; /* index into ps_argv */
static char *flagptr; /* current location in ps_argv[thisarg] */ static char *flagptr; /* current location in ps_argv[thisarg] */
static int not_pure_unix = 0; /* set by BSD and GNU options */
static int force_bsd = 0; /* set when normal parsing fails */ static int force_bsd = 0; /* set when normal parsing fails */
#define exclusive(x) if((ps_argc != 2) || strcmp(ps_argv[1],x)) \ #define exclusive(x) if((ps_argc != 2) || strcmp(ps_argv[1],x)) \
@ -71,7 +70,6 @@ static void display_ps_version(void)
*/ */
static const char *get_opt_arg(void){ static const char *get_opt_arg(void){
if(*(flagptr+1)){ /* argument is part of ps_argv[thisarg] */ if(*(flagptr+1)){ /* argument is part of ps_argv[thisarg] */
not_pure_unix = 1;
return flagptr+1; return flagptr+1;
} }
if(thisarg+2 > ps_argc) return NULL; /* there is nothing left */ if(thisarg+2 > ps_argc) return NULL; /* there is nothing left */
@ -233,18 +231,6 @@ static const char *parse_sysv_option(void){
flagptr = ps_argv[thisarg]; flagptr = ps_argv[thisarg];
while(*++flagptr){ while(*++flagptr){
// Find any excuse to ignore stupid Unix98 misfeatures.
//
// This list of options is ONLY for those defined by the
// "IEEE Std 1003.1, 2004 Edition", "ISO/IEC 9945:2003",
// or "Version 2 of the Single Unix Specification".
//
// It may be time to re-think the existence of this list.
// In the meantime, please do not add to it. The list is
// intended to ONLY contain flags defined by the POSIX and UNIX
// standards published by The Open Group, IEEE, and ISO.
if(!strchr("aAdefgGlnoptuU", *flagptr)) not_pure_unix = 1; // dude, -Z ain't in POSIX
switch(*flagptr){ switch(*flagptr){
case 'A': case 'A':
trace("-A selects all processes\n"); trace("-A selects all processes\n");
@ -415,7 +401,7 @@ static const char *parse_sysv_option(void){
trace("-o user-defined format\n"); trace("-o user-defined format\n");
arg=get_opt_arg(); arg=get_opt_arg();
if(!arg) return _("format specification must follow -o"); if(!arg) return _("format specification must follow -o");
not_pure_unix |= defer_sf_option(arg, SF_U_o); defer_sf_option(arg, SF_U_o);
return NULL; /* can't have any more options */ return NULL; /* can't have any more options */
case 'p': /* end */ case 'p': /* end */
trace("-p select by PID\n"); trace("-p select by PID\n");
@ -1121,7 +1107,6 @@ static const char *parse_all_options(void){
trace("parse_all_options calling arg_type for \"%s\"\n", ps_argv[thisarg]); trace("parse_all_options calling arg_type for \"%s\"\n", ps_argv[thisarg]);
at = arg_type(ps_argv[thisarg]); at = arg_type(ps_argv[thisarg]);
trace("ps_argv[thisarg] is %s\n", ps_argv[thisarg]); trace("ps_argv[thisarg] is %s\n", ps_argv[thisarg]);
if(at != ARG_SYSV) not_pure_unix = 1;
switch(at){ switch(at){
case ARG_GNU: case ARG_GNU:
err = parse_gnu_option(); err = parse_gnu_option();
@ -1212,7 +1197,7 @@ int arg_parse(int argc, char *argv[]){
if(err) goto try_bsd; if(err) goto try_bsd;
err = thread_option_check(); err = thread_option_check();
if(err) goto try_bsd; if(err) goto try_bsd;
err = process_sf_options(!not_pure_unix); err = process_sf_options();
if(err) goto try_bsd; if(err) goto try_bsd;
err = select_bits_setup(); err = select_bits_setup();
if(err) goto try_bsd; if(err) goto try_bsd;
@ -1231,7 +1216,6 @@ try_bsd:
ps_argv = argv; ps_argv = argv;
thisarg = 0; thisarg = 0;
/* no need to reset flagptr */ /* no need to reset flagptr */
not_pure_unix=1;
force_bsd=1; force_bsd=1;
prefer_bsd_defaults=1; prefer_bsd_defaults=1;
if(!( (PER_OLD_m|PER_BSD_m) & personality )) /* if default m setting... */ if(!( (PER_OLD_m|PER_BSD_m) & personality )) /* if default m setting... */
@ -1242,7 +1226,7 @@ try_bsd:
if(err2) goto total_failure; if(err2) goto total_failure;
err2 = thread_option_check(); err2 = thread_option_check();
if(err2) goto total_failure; if(err2) goto total_failure;
err2 = process_sf_options(!not_pure_unix); err2 = process_sf_options();
if(err2) goto total_failure; if(err2) goto total_failure;
err2 = select_bits_setup(); err2 = select_bits_setup();
if(err2) goto total_failure; if(err2) goto total_failure;

11
ps/sortformat.c
View File

@ -31,7 +31,6 @@
#include "common.h" #include "common.h"
static sf_node *sf_list = NULL; /* deferred sorting and formatting */ static sf_node *sf_list = NULL; /* deferred sorting and formatting */
static int broken; /* use gross Unix98 parsing? */
static int have_gnu_sort = 0; /* if true, "O" must be format */ static int have_gnu_sort = 0; /* if true, "O" must be format */
static int already_parsed_sort = 0; /* redundantly set in & out of fn */ static int already_parsed_sort = 0; /* redundantly set in & out of fn */
static int already_parsed_format = 0; static int already_parsed_format = 0;
@ -203,7 +202,6 @@ double_percent:
/*************************************************************** /***************************************************************
* Used to parse option O lists. Option O is shared between * Used to parse option O lists. Option O is shared between
* sorting and formatting. Users may expect one or the other. * sorting and formatting. Users may expect one or the other.
* The "broken" flag enables a really bad Unix98 misfeature.
* Put each completed format_node onto the list starting at ->f_cooked * Put each completed format_node onto the list starting at ->f_cooked
*/ */
static const char *format_parse(sf_node *sfn){ static const char *format_parse(sf_node *sfn){
@ -233,9 +231,6 @@ static const char *format_parse(sf_node *sfn){
} }
need_item=1; need_item=1;
break; break;
case '=':
if(broken) goto out;
/* fall through */
default: default:
if(need_item) items++; if(need_item) items++;
need_item=0; need_item=0;
@ -498,7 +493,6 @@ static const char *short_sort_parse(sf_node *sfn){
/* /*
* Used to parse option O lists. Option O is shared between * Used to parse option O lists. Option O is shared between
* sorting and formatting. Users may expect one or the other. * sorting and formatting. Users may expect one or the other.
* The "broken" flag enables a really bad Unix98 misfeature.
* Recursion is to preserve original order. * Recursion is to preserve original order.
*/ */
static const char *parse_O_option(sf_node *sfn){ static const char *parse_O_option(sf_node *sfn){
@ -748,12 +742,9 @@ static const char *generate_sysv_list(void){
* sorting and formatting. Users may expect one or the other. * sorting and formatting. Users may expect one or the other.
* The "broken" flag enables a really bad Unix98 misfeature. * The "broken" flag enables a really bad Unix98 misfeature.
*/ */
const char *process_sf_options(int localbroken){ const char *process_sf_options(void){
sf_node *sf_walk; sf_node *sf_walk;
if(personality & PER_BROKEN_o) localbroken = 1;
if(personality & PER_GOOD_o) localbroken = 0;
broken = localbroken;
if(sf_list){ if(sf_list){
const char *err; const char *err;
err = parse_O_option(sf_list); err = parse_O_option(sf_list);

6
pwdx.c
View File

@ -65,7 +65,7 @@ int main(int argc, char *argv[])
{ {
int ch; int ch;
int retval = 0, i; int retval = 0, i;
int alloclen = 128; ssize_t alloclen = 128;
char *pathbuf; char *pathbuf;
static const struct option longopts[] = { static const struct option longopts[] = {
@ -99,7 +99,7 @@ int main(int argc, char *argv[])
if (argc == 0) if (argc == 0)
usage(stderr); usage(stderr);
pathbuf = malloc(alloclen); pathbuf = xmalloc(alloclen);
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
char *s; char *s;
@ -128,7 +128,7 @@ int main(int argc, char *argv[])
*/ */
while ((len = readlink(buf, pathbuf, alloclen)) == alloclen) { while ((len = readlink(buf, pathbuf, alloclen)) == alloclen) {
alloclen *= 2; alloclen *= 2;
pathbuf = realloc(pathbuf, alloclen); pathbuf = xrealloc(pathbuf, alloclen);
} }
free(buf); free(buf);

2
sysctl.c
View File

@ -653,7 +653,7 @@ static int PreloadSystem(void)
} }
if (stat(DEFAULT_PRELOAD, &ts) < 0 || S_ISREG(ts.st_mode)) { if (stat(DEFAULT_PRELOAD, &ts) == 0 && S_ISREG(ts.st_mode)) {
if (!Quiet) if (!Quiet)
printf(_("* Applying %s ...\n"), DEFAULT_PRELOAD); printf(_("* Applying %s ...\n"), DEFAULT_PRELOAD);
rc |= Preload(DEFAULT_PRELOAD); rc |= Preload(DEFAULT_PRELOAD);

1
watch.c
View File

@ -49,6 +49,7 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#ifdef WITH_WATCH8BIT #ifdef WITH_WATCH8BIT
# define _XOPEN_SOURCE_EXTENDED 1
# include <wchar.h> # include <wchar.h>
# include <wctype.h> # include <wctype.h>
# include <ncursesw/ncurses.h> # include <ncursesw/ncurses.h>