From 2617d03a33a2e68a6ee6fed2278fcac6a3fb59b4 Mon Sep 17 00:00:00 2001 From: Victor Ananjevsky Date: Fri, 26 Jun 2015 23:03:11 +1000 Subject: [PATCH 01/43] sysctl: Correct stat on /etc/sysctl.conf sysctl --system fails when the file /etc/sysctl.conf doesn't exists. This happens due to wrong check of stat(2) return code. Reference: https://www.freelists.org/post/procps/sysctl Signed-off-by: Craig Small --- sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysctl.c b/sysctl.c index dcf3a710..b19e2ee5 100644 --- a/sysctl.c +++ b/sysctl.c @@ -655,7 +655,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) printf(_("* Applying %s ...\n"), DEFAULT_PRELOAD); rc |= Preload(DEFAULT_PRELOAD); From c4318389ac5372aa59cb2f4b34cd13939879c6cf Mon Sep 17 00:00:00 2001 From: Andrew Wilcox Date: Sun, 5 Jul 2015 14:37:48 -0500 Subject: [PATCH 02/43] Add _XOPEN_SOURCE_EXTENDED definition in WATCH8BIT This is required for POSIX correctness (see http://lists.gnu.org/archive/html/bug-ncurses/2011-07/msg00004.html), and additionally is required for building procps against the musl C library. --- watch.c | 1 + 1 file changed, 1 insertion(+) diff --git a/watch.c b/watch.c index 40beacad..de46730c 100644 --- a/watch.c +++ b/watch.c @@ -49,6 +49,7 @@ #include #include #ifdef WITH_WATCH8BIT +# define _XOPEN_SOURCE_EXTENDED 1 # include # include # include From d1d2ccf732fec40e0d48640f1d23a476a002d987 Mon Sep 17 00:00:00 2001 From: Filipe Brandenburger Date: Thu, 4 Jun 2015 22:07:49 -0700 Subject: [PATCH 03/43] skill: fix command line with signal, again Have skill_sig_option sanitize the command line by properly decrementing *argc after moving the arguments to remove the -signal one. One bug caused by this issue was when running `kill -1`, then the code would interpret -1 as both SIGHUP and as process group -1 and send SIGHUP to all of them. Or `kill -28` which would send SIGWINCH to process group -2 (in another bug, the -pgid support only accepts a single digit, fix for that bug will follow.) This also reverts commit 7610b3128e6ac4 ("skill: fix command line with signal") which worked around this bug in `skill` and also removes the "sigopt" hack which worked around this bug in `kill`. The skill_sig_option implementation is compatible with signal_option() from pgrep.c. I plan to factor them out into a single source file in a follow up commit, to prevent the duplication. This commit fixes the issues reported above. I also tested the issues from commit 7610b3128e6ac4, `skill -9 -t pts/0` works as expected, also tried `kill` with -signal and a number of pids and it worked as expected. Also tested that `make check` and `make distcheck` keep working. Signed-off-by: Filipe Brandenburger --- skill.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/skill.c b/skill.c index 9a19a8bb..9e499739 100644 --- a/skill.c +++ b/skill.c @@ -398,17 +398,15 @@ static void __attribute__ ((__noreturn__)) skillsnice_usage(FILE * out) static int skill_sig_option(int *argc, char **argv) { - int i, nargs = *argc; + int i; int signo = -1; - for (i = 1; i < nargs; i++) { + for (i = 1; i < *argc; i++) { if (argv[i][0] == '-') { signo = signal_name_to_number(argv[i] + 1); if (-1 < signo) { - if (nargs - i) { - nargs--; - memmove(argv + i, argv + i + 1, - sizeof(char *) * (nargs - i)); - } + memmove(argv + i, argv + i + 1, + sizeof(char *) * (*argc - i)); + (*argc)--; return signo; } } @@ -421,7 +419,6 @@ static void __attribute__ ((__noreturn__)) kill_main(int argc, char **argv) { int signo, i; - int sigopt = 0; int loop = 1; long pid; int exitvalue = EXIT_SUCCESS; @@ -446,8 +443,6 @@ static void __attribute__ ((__noreturn__)) signo = skill_sig_option(&argc, argv); if (signo < 0) signo = SIGTERM; - else - sigopt++; opterr=0; /* suppress errors on -123 */ while (loop == 1 && (i = getopt_long(argc, argv, "l::Ls:hV", longopts, NULL)) != -1) @@ -495,7 +490,7 @@ static void __attribute__ ((__noreturn__)) kill_usage(stderr); } - argc -= optind + sigopt; + argc -= optind; argv += optind; for (i = 0; i < argc; i++) { @@ -588,10 +583,8 @@ static void skillsnice_parse(int argc, prino = snice_prio_option(&argc, argv); else if (program == PROG_SKILL) { signo = skill_sig_option(&argc, argv); - if (-1 < signo) { + if (-1 < signo) sig_or_pri = signo; - argc -= 1; - } } pid_count = 0; From 27b2937d2d4151d595c1170fb9381d5a0a0f67da Mon Sep 17 00:00:00 2001 From: Filipe Brandenburger Date: Thu, 4 Jun 2015 22:27:03 -0700 Subject: [PATCH 04/43] kill: print usage if no pid is passed in command line This makes a command such as `kill -TERM` or `kill -9` fails and prints usage, instead of silently succeeding. The behavior is consistent with how `kill` behaves without an explicit signal, or with the behavior of the `kill` builtin in a shell like bash. Signed-off-by: Filipe Brandenburger --- skill.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/skill.c b/skill.c index 9e499739..f8f4e499 100644 --- a/skill.c +++ b/skill.c @@ -493,6 +493,9 @@ static void __attribute__ ((__noreturn__)) argc -= optind; argv += optind; + if (argc < 1) + kill_usage(stderr); + for (i = 0; i < argc; i++) { pid = strtol_or_err(argv[i], _("failed to parse argument")); if (!kill((pid_t) pid, signo)) From 9646f7cba47e078855d1fc5e3be9fb05b1b89629 Mon Sep 17 00:00:00 2001 From: Filipe Brandenburger Date: Thu, 4 Jun 2015 22:33:02 -0700 Subject: [PATCH 05/43] pkill: reject -signal number with trailing garbage This commit prevents pkill from accepting something like `-1garbage` as a SIGHUP. The previous code was using atoi() which does not check for trailing garbage and would parse the above as 1. Handling numeric signals in signal_option() is not really necessary, since signal_name_to_number() will recognize numeric signals and parse them properly using strtol() and checking for trailing garbage. It also checks that the numeric signals are in the proper range. So all we need to do is remove the buggy numeric signal handling here. Tested with `pkill -1garbage sleep`, after this patch it will complain that "1" is not a valid option, which is the expected. Signed-off-by: Filipe Brandenburger --- pgrep.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/pgrep.c b/pgrep.c index 9a61e6d5..539a2d84 100644 --- a/pgrep.c +++ b/pgrep.c @@ -661,8 +661,6 @@ static int signal_option(int *argc, char **argv) for (i = 1; i < *argc; i++) { if (argv[i][0] == '-') { sig = signal_name_to_number(argv[i] + 1); - if (sig == -1 && isdigit(argv[i][1])) - sig = atoi(argv[i] + 1); if (-1 < sig) { memmove(argv + i, argv + i + 1, sizeof(char *) * (*argc - i)); From 4e7f42375a9aa860365e6007a53a357df60964f1 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Thu, 9 Jul 2015 22:12:10 +1000 Subject: [PATCH 06/43] build-sys: use merged systemd library Since systemd 209 released in Feb 2014 three systemd libraries including systemd-login have been merged. This change merely checks for, and links to, the new library. References: http://lists.freedesktop.org/archives/systemd-devel/2014-February/017146.html https://bugs.debian.org/731256 --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 612097f7..48d4a594 100644 --- a/configure.ac +++ b/configure.ac @@ -150,10 +150,10 @@ AC_ARG_WITH([systemd], [], [with_systemd=no] ) if test "x$with_systemd" != xno; then - PKG_CHECK_MODULES([SYSTEMD], [libsystemd-login >= 206], [], [ - AC_CHECK_LIB(systemd-login, sd_pid_get_slice, [have_systemd=yes], [have_systemd=no]) + PKG_CHECK_MODULES([SYSTEMD], [libsystemd], [], [ + AC_CHECK_LIB(systemd, 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)]) + AC_MSG_ERROR([systemd support missing/incomplete (requires >= 209)]) fi SYSTEMD_LIBS="-lsystemd-login" ]) From 5e73c832623cc99442a5d5bc2100b4d7ad323eb8 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Thu, 9 Jul 2015 23:11:40 +1000 Subject: [PATCH 07/43] build-sys: Clean up libsystemd in configure The previous commit got rid of some but not all the library. The format of it was a little odd with the library being explicitly defined instead of letting autoconf do it for you. --- configure.ac | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 48d4a594..675e2184 100644 --- a/configure.ac +++ b/configure.ac @@ -149,19 +149,11 @@ AC_ARG_WITH([systemd], [AS_HELP_STRING([--with-systemd], [enable systemd support])], [], [with_systemd=no] ) -if test "x$with_systemd" != xno; then - PKG_CHECK_MODULES([SYSTEMD], [libsystemd], [], [ - AC_CHECK_LIB(systemd, 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 >= 209)]) - fi - SYSTEMD_LIBS="-lsystemd-login" - ]) - AM_CONDITIONAL(WITH_SYSTEMD, true) +AS_IF([test "x$with_systemd" != "xno"], [ + PKG_CHECK_MODULES([SYSTEMD], [libsystemd]) AC_DEFINE(WITH_SYSTEMD, 1, [enable systemd support]) -else - AM_CONDITIONAL(WITH_SYSTEMD, false) -fi +]) +AM_CONDITIONAL([WITH_SYSTEMD], [test x$with_systemd != xno]) # AC_ARG_ENABLEs AC_ARG_ENABLE([pidof], From 30986cb22e2f26d83cbb8516bf25d3fa5c9a577d Mon Sep 17 00:00:00 2001 From: Tobias Stoeckmann Date: Sat, 11 Jul 2015 21:28:47 +0200 Subject: [PATCH 08/43] Handle out of memory conditions. malloc and realloc could return NULL when no memory is available. The code doesn't handle errors, so use xmalloc/xrealloc instead. While at it, sync alloclen's type with len's type, so both are ssize_t. --- pwdx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pwdx.c b/pwdx.c index 07bedfc8..3e0afca6 100644 --- a/pwdx.c +++ b/pwdx.c @@ -65,7 +65,7 @@ int main(int argc, char *argv[]) { int ch; int retval = 0, i; - int alloclen = 128; + ssize_t alloclen = 128; char *pathbuf; static const struct option longopts[] = { @@ -99,7 +99,7 @@ int main(int argc, char *argv[]) if (argc == 0) usage(stderr); - pathbuf = malloc(alloclen); + pathbuf = xmalloc(alloclen); for (i = 0; i < argc; i++) { char *s; @@ -128,7 +128,7 @@ int main(int argc, char *argv[]) */ while ((len = readlink(buf, pathbuf, alloclen)) == alloclen) { alloclen *= 2; - pathbuf = realloc(pathbuf, alloclen); + pathbuf = xrealloc(pathbuf, alloclen); } free(buf); From e8430bad0057c8880f2f453ea90b8414ed30d0d5 Mon Sep 17 00:00:00 2001 From: Tobias Stoeckmann Date: Sat, 11 Jul 2015 21:30:31 +0200 Subject: [PATCH 09/43] Fix readlink's do-while-loop The function pid_link tries to handle programs which contain very long paths to their executables. If 1024 bytes are not enough to contain the path, the loop wants to get more and more space until the path can fit. The loop's condition does not fit though. readlink will never return a value higher than its supplied size limit, which is "path_alloc_size - 1", therefore the loop-check of "len == path_alloc_size" will always be false: the loop will never be repeated. While at it, the if-condition inside the loop's body can be omitted, because it is always true. --- pidof.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pidof.c b/pidof.c index d1a9f315..8712d113 100644 --- a/pidof.c +++ b/pidof.c @@ -103,20 +103,18 @@ static char *pid_link (pid_t pid, const char *base_name) { char link [PROCPATHLEN]; char *result; - int path_alloc_size; - int len; + ssize_t path_alloc_size; + ssize_t len; snprintf(link, sizeof(link), "/proc/%d/%s", pid, base_name); len = path_alloc_size = 0; result = NULL; do { - if (len == path_alloc_size) { - grow_size (path_alloc_size); - result = (char *) xrealloc (result, path_alloc_size); - } + grow_size(path_alloc_size); + result = 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; break; } From c07f6c5e6d6170ef3f2373b4d86988184c3235bf Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Sun, 12 Jul 2015 04:44:44 -0500 Subject: [PATCH 10/43] top: improve vertical scroll management for 'i' toggle When a user is taking advantage of the scroll features it is likely a scrolled vertical position is well past the first displayable task. That is especially true of top's forest view ('V') mode where those early systemd attached processes are generally not very interesting. As such, should the idle mode toggle ('i') be employed a distorted display is almost guaranteed because tasks that have used some cpu, and thus should be displayed, have already been skipped by virtue of their position. So this patch temporarily nullifies vertical scrolling during the period when idle tasks are not being shown. Signed-off-by: Jim Warner --- top/top.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/top/top.c b/top/top.c index 273c4a54..5a805345 100644 --- a/top/top.c +++ b/top/top.c @@ -4612,6 +4612,12 @@ static void keys_task (int ch) { VIZTOGw(w, Show_CMDLIN); break; case 'i': + { static WIN_t *w_sav; + static int beg_sav; + if (w_sav != w) { beg_sav = 0; w_sav = w; } + if (CHKw(w, Show_IDLEPS)) { beg_sav = w->begtask; w->begtask = 0; } + else { w->begtask = beg_sav; beg_sav = 0; } + } VIZTOGw(w, Show_IDLEPS); break; case 'J': From 857bb39d31e55df015d0b73913a09be847a2f8e7 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Tue, 21 Jul 2015 22:25:06 +1000 Subject: [PATCH 11/43] w: Fix choice of current process If there is a PID wrap-around w will choose the wrong process. For example: $ ps x -o pgrp,tpgid,start,tty,cmd | grep pts/3 3834 3834 21:50:26 pts/3 ssh server 4461 4461 21:57:14 pts/2 grep pts/3 23410 3834 21:07:17 pts/3 mutt 26071 3834 Jul 13 pts/3 /bin/bash w will show the user as: csmall pts/3 my-laptop:S.1 13Jul15 5:54 1.36s 1.13s /bin/bash So why? w scans the process table and has two ways of finding the best match. #1 match things like terminal,username and process group, find oldest #2 match utmp pid to process tgid The problem is that #2 trumped #1, which is fine when your login process is numerically lower than your other processes. However in this case 26071 is larger and appears later in the readdir() than the correct process, which is 3834. The fix is not not overwrite best if it already exists. Signed-off-by: Craig Small --- w.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/w.c b/w.c index 4c8a6193..b310c190 100644 --- a/w.c +++ b/w.c @@ -347,7 +347,8 @@ static const proc_t *getproc(const utmp_t * restrict const u, const proc_t *restrict const tmp = *pptr; if (unlikely(tmp->tgid == u->ut_pid)) { *found_utpid = 1; - best = tmp; + if (!best) + best = tmp; } if (tmp->tty != line) continue; From 151c05b4978b2022eda1d6e509e65f74eb491312 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Tue, 21 Jul 2015 22:45:02 +1000 Subject: [PATCH 12/43] w: Adjust command width w would error out if the window size was smaller than 71 or some other fields through environment grew too big. The code was a little convoluted as well. The minimum length for command was 3, which is pretty useless. This change does the following: w doesn't care by default the window size w will adjust the command length up and down, to a minimum of 7 characters. if the fields don't fit, w will line-wrap each line. The idea being its better the line-wrap than it is to error out. References: https://bugs.debian.org/183394 Signed-off-by: Craig Small --- w.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/w.c b/w.c index b310c190..8a19aa90 100644 --- a/w.c +++ b/w.c @@ -70,6 +70,7 @@ typedef struct utmp utmp_t; #endif #define MAX_CMD_WIDTH 512 +#define MIN_CMD_WIDTH 7 /* * This routine is careful since some programs leave utmp strings @@ -570,16 +571,11 @@ int main(int argc, char **argv) maxcmd = atoi(p); else maxcmd = MAX_CMD_WIDTH; - if (maxcmd < 71) - xerrx(EXIT_FAILURE, _("%d column window is too narrow"), maxcmd); - if (MAX_CMD_WIDTH < maxcmd) { - xwarnx(_("%d column width exceeds command buffer size, truncating to %d"), - maxcmd, MAX_CMD_WIDTH); + if (MAX_CMD_WIDTH < maxcmd) maxcmd = MAX_CMD_WIDTH; - } maxcmd -= 21 + userlen + (from ? fromlen : 0) + (longform ? 20 : 0); - if (maxcmd < 3) - xwarnx(_("warning: screen width %d suboptimal"), win.ws_col); + if (maxcmd < MIN_CMD_WIDTH) + maxcmd = MIN_CMD_WIDTH; procs = readproctab(PROC_FILLCOM | PROC_FILLUSR | PROC_FILLSTAT); From a7f0f3d7fe72df96bee00e2da3480a10b8aa3f1a Mon Sep 17 00:00:00 2001 From: Craig Small Date: Tue, 28 Jul 2015 22:47:15 +1000 Subject: [PATCH 13/43] build-sys: Add gitlab CI job file --- .gitlab-ci.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..03f8fe6d --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,16 @@ +# This file is generated by GitLab CI +'': + script: [] + tags: + except: + - tags +Testsuites: + script: + - "./autogen.sh" + - "./configure" + - make + - make check + - make clean + tags: + except: + - tags From 9cc6ed10c87ac25ded3bcc1ad5c54d05d656d99e Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Mon, 27 Jul 2015 00:00:00 -0500 Subject: [PATCH 14/43] top: eliminate 'user' from the inspection view headers Since it's possible that euser name is not being shown or the horizontal position had been scrolled past that USER column, then part of those headers will be blank. So it doesn't make sense to try and show the USER that is associated with a process at all. Thus, this commit simply removes the 'user' provision from both headers. Signed-off-by: Jim Warner --- top/top.c | 15 +++++++-------- top/top_nls.c | 4 ++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/top/top.c b/top/top.c index 5a805345..f7a65932 100644 --- a/top/top.c +++ b/top/top.c @@ -3074,10 +3074,9 @@ static int insp_view_choice (proc_t *obj) { #define hzAMT 8 #endif #define maxLN (Screen_rows - (Msg_row +1)) - #define makHD(b1,b2,b3) { \ - snprintf(b1, sizeof(b1), "%s", make_num(obj->tid, 5, 1, AUTOX_NO)); \ - snprintf(b2, sizeof(b2), "%s", make_str(obj->cmd, 8, 1, AUTOX_NO)); \ - snprintf(b3, sizeof(b3), "%s", make_str(obj->euser, 8, 1, AUTOX_NO)); } + #define makHD(b1,b2) { \ + snprintf(b1, sizeof(b1), "%d", obj->tid); \ + snprintf(b2, sizeof(b2), "%s", obj->cmd); } #define makFS(dst) { if (Insp_sel->flen < 22) \ snprintf(dst, sizeof(dst), "%s", Insp_sel->fstr); \ else snprintf(dst, sizeof(dst), "%.19s...", Insp_sel->fstr); } @@ -3089,17 +3088,17 @@ signify_that: adj_geometry(); for (;;) { - char pid[6], cmd[9], usr[9]; + char pid[6], cmd[16]; if (curcol < 0) curcol = 0; if (curlin >= Insp_nl) curlin = Insp_nl -1; if (curlin < 0) curlin = 0; makFS(buf) - makHD(pid,cmd,usr) + makHD(pid,cmd) putp(Cap_home); show_special(1, fmtmk(N_unq(YINSP_hdview_fmt) - , pid, cmd, usr, (Insp_sel->fstr[0]) ? buf : " N/A ")); // nls_maybe + , pid, cmd, (Insp_sel->fstr[0]) ? buf : " N/A ")); // nls_maybe insp_show_pgs(curcol, curlin, maxLN); fflush(stdout); /* fflush(stdin) didn't do the trick, so we'll just dip a little deeper @@ -3209,7 +3208,7 @@ signify_that: mkSEL(sels); putp(Cap_home); show_special(1, fmtmk(N_unq(YINSP_hdsels_fmt) - , pid, p->cmd, p->euser, sels)); + , pid, p->cmd, sels)); INSP_MKSL(0, " "); if (Frames_signal) goto signify_that; diff --git a/top/top_nls.c b/top/top_nls.c index 1928b172..93e5619c 100644 --- a/top/top_nls.c +++ b/top/top_nls.c @@ -644,12 +644,12 @@ static void build_uniq_nlstab (void) { "%s %s:~3 %9.9s~2total,~3 %9.9s~2free,~3 %9.9s~2used.~3 %9.9s~2avail %s~3\n"); Uniq_nlstab[YINSP_hdsels_fmt] = _("" - "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 to ~1select~5 an option; 'q' or to ~1end~5 !\n" "Options~2: ~1%s\n"); Uniq_nlstab[YINSP_hdview_fmt] = _("" - "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" "Or~2: to ~1select another~5; 'q' or to ~1end~5 !\n"); } From 9ba65bad8ef1bb994f3edd45063878daa1beb78c Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Mon, 27 Jul 2015 00:00:00 -0500 Subject: [PATCH 15/43] top: miscellaneous accumulated tweaks to code/comments Jeeze, to correct spelling on one single word (incure) you had to go and align the entire comments paragraph? [ well, at least there's one other minor code change ] Signed-off-by: Jim Warner --- top/top.c | 2 +- top/top.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/top/top.c b/top/top.c index f7a65932..3c4f3f2c 100644 --- a/top/top.c +++ b/top/top.c @@ -1915,7 +1915,7 @@ static void build_headers (void) { if (EU_MAXPFLGS <= f) continue; #endif if (EU_CMD == f && CHKw(w, Show_CMDLIN)) Frames_libflags |= L_CMDLINE; - Frames_libflags |= Fieldstab[w->procflgs[i]].lflg; + Frames_libflags |= Fieldstab[f].lflg; s = scat(s, justify_pad(N_col(f) , VARcol(f) ? w->varcolsz : Fieldstab[f].width , CHKw(w, Fieldstab[f].align))); diff --git a/top/top.h b/top/top.h index 28a1a240..ddf34f13 100644 --- a/top/top.h +++ b/top/top.h @@ -255,11 +255,11 @@ typedef struct HST_t { int pid; // record 'key' } HST_t; #else - /* This structure supports 'history' processing and records the - bare minimum of needed information from one frame to the next -- - we don't calc and save data that goes unused like the old top nor - do we incure the overhead of sorting to support a binary search - (or worse, a friggin' for loop) when retrieval is necessary! */ + /* This structure supports 'history' processing and records the bare + minimum of needed information from one frame to the next -- we do + not calc and save data that goes unused like the old top nor will + we incur the additional overhead of sort to support binary search + (or worse, a friggin' for loop) when retrievals become necessary! */ typedef struct HST_t { TIC_t tics; // last frame's tics count unsigned long maj, min; // last frame's maj/min_flt counts From 8226ca983856d2d023dc52e5d56ec92552b5bf18 Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Fri, 31 Jul 2015 00:00:00 -0500 Subject: [PATCH 16/43] top: avoid an unnecessary conversion for 'USED' column When the USED column was introduced the proc_t.vm_swap & proc_t.resident values were added together. However, using 'resident' required an additional PROC_FILL flag not to mention extra conversion of pages to kibibytes. So now we'll use an already present vm_rss value which removes any special handling for top's derived column. And while we're at it we'll trade some more 'resident' field uses with that more immediately usable 'vm_rss'. Reference(s): commit 709785e20bd19dc28546d19c45bb7444a56f88b9 Signed-off-by: Jim Warner --- top/top.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/top/top.c b/top/top.c index 3c4f3f2c..5686c136 100644 --- a/top/top.c +++ b/top/top.c @@ -283,7 +283,7 @@ SCB_NUMx(PGD, pgrp) SCB_NUMx(PID, tid) SCB_NUMx(PPD, ppid) SCB_NUMx(PRI, priority) -SCB_NUM1(RES, resident) // also serves MEM ! +SCB_NUM1(RES, vm_rss) // also serves MEM ! SCB_STRX(SGD, supgid) SCB_STRS(SGN, supgrp) SCB_NUM1(SHR, share) @@ -316,7 +316,7 @@ SCB_STRS(UEN, euser) SCB_NUMx(URD, ruid) SCB_STRS(URN, ruser) SCB_NUMx(USD, suid) -SCB_NUM2(USE, resident, vm_swap) +SCB_NUM2(USE, vm_rss, vm_swap) SCB_STRS(USN, suser) SCB_NUM1(VRT, size) SCB_NUM1(WCH, wchan) @@ -1689,7 +1689,6 @@ end_justifies: #define L_OUSER PROC_FILLSTATUS | PROC_FILLUSR #define L_EGROUP PROC_FILLSTATUS | PROC_FILLGRP #define L_SUPGRP PROC_FILLSTATUS | PROC_FILLSUPGRP -#define L_USED PROC_FILLSTATUS | PROC_FILLMEM #define L_NS PROC_FILLNS #define L_LXC PROC_FILL_LXC // make 'none' non-zero (used to be important to Frames_libflags) @@ -1742,21 +1741,21 @@ static FLD_t Fieldstab[] = { { 6, -1, A_right, SF(TME), L_stat }, { 9, -1, A_right, SF(TME), L_stat }, // EU_TM2 slot #ifdef BOOST_PERCNT - { 5, -1, A_right, SF(RES), L_statm }, // EU_MEM slot + { 5, -1, A_right, SF(RES), L_status }, // EU_MEM slot #else - { 4, -1, A_right, SF(RES), L_statm }, // EU_MEM slot + { 4, -1, A_right, SF(RES), L_status }, // EU_MEM slot #endif #ifndef NOBOOST_MEMS { 7, SK_Kb, A_right, SF(VRT), L_statm }, { 6, SK_Kb, A_right, SF(SWP), L_status }, - { 6, SK_Kb, A_right, SF(RES), L_statm }, + { 6, SK_Kb, A_right, SF(RES), L_status }, { 6, SK_Kb, A_right, SF(COD), L_statm }, { 7, SK_Kb, A_right, SF(DAT), L_statm }, { 6, SK_Kb, A_right, SF(SHR), L_statm }, #else { 5, SK_Kb, A_right, SF(VRT), L_statm }, { 4, SK_Kb, A_right, SF(SWP), L_status }, - { 4, SK_Kb, A_right, SF(RES), L_statm }, + { 4, SK_Kb, A_right, SF(RES), L_status }, { 4, SK_Kb, A_right, SF(COD), L_statm }, { 5, SK_Kb, A_right, SF(DAT), L_statm }, { 4, SK_Kb, A_right, SF(SHR), L_statm }, @@ -1782,9 +1781,9 @@ static FLD_t Fieldstab[] = { { 3, -1, A_right, SF(FV1), L_stat }, { 3, -1, A_right, SF(FV2), L_stat }, #ifndef NOBOOST_MEMS - { 6, SK_Kb, A_right, SF(USE), L_USED }, + { 6, SK_Kb, A_right, SF(USE), L_status }, #else - { 4, SK_Kb, A_right, SF(USE), L_USED }, + { 4, SK_Kb, A_right, SF(USE), L_status }, #endif { 10, -1, A_right, SF(NS1), L_NS }, // IPCNS { 10, -1, A_right, SF(NS2), L_NS }, // MNTNS @@ -5393,7 +5392,7 @@ static const char *task_show (const WIN_t *q, const proc_t *p) { cp = make_str(p->lxcname, W, Js, EU_LXC); break; case EU_MEM: - cp = scale_pcnt((float)pages2K(p->resident) * 100 / kb_main_total, W, Jn); + cp = scale_pcnt((float)p->vm_rss * 100 / kb_main_total, W, Jn); break; case EU_NCE: cp = make_num(p->nice, W, Jn, AUTOX_NO); @@ -5433,7 +5432,7 @@ static const char *task_show (const WIN_t *q, const proc_t *p) { cp = make_num(p->priority, W, Jn, AUTOX_NO); break; case EU_RES: - cp = scale_mem(S, pages2K(p->resident), W, Jn); + cp = scale_mem(S, p->vm_rss, W, Jn); break; case EU_SGD: makeVAR(p->supgid); @@ -5491,7 +5490,7 @@ static const char *task_show (const WIN_t *q, const proc_t *p) { cp = make_num(p->suid, W, Jn, EU_USD); break; case EU_USE: - cp = scale_mem(S, (p->vm_swap + pages2K(p->resident)), W, Jn); + cp = scale_mem(S, (p->vm_swap + p->vm_rss), W, Jn); break; case EU_USN: cp = make_str(p->suser, W, Js, EU_USN); From 3da298c1d6b9c82e99e7025162657a8b5e2ce551 Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Mon, 3 Aug 2015 00:00:00 -0500 Subject: [PATCH 17/43] top: fix unlikely edge case wherein all fields are off While testing a newlib interface for pids acquisitions I encountered some unexpected results if an idiot user (me) turns off all displayable fields. So, this commit ensures that the PID field will be shown as a minimum. Signed-off-by: Jim Warner --- top/top.c | 1 + 1 file changed, 1 insertion(+) diff --git a/top/top.c b/top/top.c index 5686c136..9d0e56aa 100644 --- a/top/top.c +++ b/top/top.c @@ -1994,6 +1994,7 @@ static void calibrate_fields (void) { #endif } } + if (!w->totpflgs) w->pflgsall[w->totpflgs++] = EU_PID; /* build a preliminary columns header not to exceed screen width while accounting for a possible leading window number */ From 313f9367397e2f1275186f5384371c9a5e24a8b0 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Thu, 6 Aug 2015 22:08:13 +1000 Subject: [PATCH 18/43] ps: enable sort by etimes ps has two columns showing the same data which is elapsed time, just the format is changed: etimes - elapsed time in seconds etime - elapsed time in DD-hh:mm:ss ps used to only sort by etime but not etimes, by making etimes and alias of etime for sorting both flags work. References: https://bugs.debian.org/794619 Signed-off-by: Craig Small --- NEWS | 1 + ps/output.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index d47f40d2..47c1c3df 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ procps-ng-NEXT * pgrep: don't crash with -a -w flags. Merge 33, Debian #768190 * skill: command line with signal number interpreted correctly * pmap: print process name even if smaps is unreadable Debian #775624 + * ps: sort by etimes column, uses etime Debian #794619 procps-ng-3.3.10 ---------------- diff --git a/ps/output.c b/ps/output.c index 270f4273..63ba2688 100644 --- a/ps/output.c +++ b/ps/output.c @@ -1467,7 +1467,7 @@ static const format_struct format_array[] = { {"environ","ENVIRONMENT",pr_nop, sr_nop, 11, ENV, LNx, PO|UNLIMITED}, {"esp", "ESP", pr_esp, sr_kstk_esp, 8, 0, LNX, TO|RIGHT}, {"etime", "ELAPSED", pr_etime, sr_etime, 11, 0, U98, ET|RIGHT}, /* was 7 wide */ -{"etimes", "ELAPSED", pr_etimes, sr_nop, 7, 0, BSD, ET|RIGHT}, /* FreeBSD */ +{"etimes", "ELAPSED", pr_etimes, sr_etime, 7, 0, BSD, ET|RIGHT}, /* FreeBSD */ {"euid", "EUID", pr_euid, sr_euid, 5, 0, LNX, ET|RIGHT}, {"euser", "EUSER", pr_euser, sr_euser, 8, USR, LNX, ET|USER}, {"f", "F", pr_flag, sr_flags, 1, 0, XXX, ET|RIGHT}, /*flags*/ From e54b37249870b9cc0ef86dc1107511b68a06bb04 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Thu, 6 Aug 2015 22:35:02 +1000 Subject: [PATCH 19/43] Update NEWS entry --- NEWS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS b/NEWS index 47c1c3df..009cf8fa 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,11 @@ procps-ng-NEXT * skill: command line with signal number interpreted correctly * 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 procps-ng-3.3.10 ---------------- From 871c4a46756baf4e26b35e41666223ad7a1d2d7a Mon Sep 17 00:00:00 2001 From: Craig Small Date: Thu, 6 Aug 2015 12:41:44 +0000 Subject: [PATCH 20/43] add CI badge --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 02215edf..592626d8 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![build status](https://ci.gitlab.com/projects/2142/status.png?ref=master)](https://ci.gitlab.com/projects/2142?ref=master) + procps ====== @@ -48,4 +50,4 @@ page. The email list for the developers and users of procps is found at http://www.freelists.org/archive/procps/ 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. \ No newline at end of file From b4923fa7450824f9ed85fe5ce0d7a0d721329304 Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Thu, 6 Aug 2015 08:43:48 -0500 Subject: [PATCH 21/43] miscellaneous: a final cleanup prior to release 3.3.11 This patch just eliminates some eol whitespace, adds a missing eof newline and contributes yet one additional entry to the NEWS summary regarding saved top rcfiles. Signed-off-by: Jim Warner --- .gitlab-ci.yml | 4 ++-- NEWS | 4 +++- README.md | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03f8fe6d..e1e58e0f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ # This file is generated by GitLab CI '': script: [] - tags: + tags: except: - tags Testsuites: @@ -11,6 +11,6 @@ Testsuites: - make - make check - make clean - tags: + tags: except: - tags diff --git a/NEWS b/NEWS index 009cf8fa..6ff07259 100644 --- a/NEWS +++ b/NEWS @@ -6,9 +6,11 @@ procps-ng-NEXT * 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 + * 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 procps-ng-3.3.10 ---------------- diff --git a/README.md b/README.md index 592626d8..b7007a8e 100644 --- a/README.md +++ b/README.md @@ -50,4 +50,4 @@ page. The email list for the developers and users of procps is found at http://www.freelists.org/archive/procps/ This email list discusses the development of procps and is used by distributions -to also forward or discuss bugs. \ No newline at end of file +to also forward or discuss bugs. From 1f67b7dc711686252651a29ec3d7a4e0763fb099 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Sat, 8 Aug 2015 17:14:36 +1000 Subject: [PATCH 22/43] Add notice in news about vmstat --- NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS b/NEWS index 6ff07259..a0283480 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,7 @@ procps-ng-NEXT * 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 procps-ng-3.3.10 ---------------- From fd007d6d1df1714bda1338d8423c8c72238a6a14 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Sat, 8 Aug 2015 21:04:01 +1000 Subject: [PATCH 23/43] free: Parse -s option correctly. If the -s option was the first option on the command line, free would report seconds argument failed. This only appeared on the Debian free, not the one in git. Closer examination revealed that if a valid float string is given to strtof() it doesn't set errno to 0, but just leaves it alone. As we are explicitly testing errno for overflows, this means the previous errno change is picked up here. The simple answer is to set errno to 0 before calling strtof(). References: https://bugs.debian/org/733758 https://enc.com.au/2015/08/08/be-careful-with-errno/ --- NEWS | 1 + free.c | 1 + 2 files changed, 2 insertions(+) diff --git a/NEWS b/NEWS index a0283480..af985014 100644 --- a/NEWS +++ b/NEWS @@ -12,6 +12,7 @@ procps-ng-NEXT * 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 ---------------- diff --git a/free.c b/free.c index b19e07ff..6c72138c 100644 --- a/free.c +++ b/free.c @@ -323,6 +323,7 @@ int main(int argc, char **argv) break; case 's': flags |= FREE_REPEAT; + errno = 0; args.repeat_interval = (1000000 * strtof(optarg, &endptr)); if (errno || optarg == endptr || (endptr && *endptr)) xerrx(EXIT_FAILURE, _("seconds argument `%s' failed"), optarg); From 5686cc5cb54f27cb0f42c50cae22578de0473eda Mon Sep 17 00:00:00 2001 From: Craig Small Date: Sun, 9 Aug 2015 16:27:37 +1000 Subject: [PATCH 24/43] build-sys: include .version in EXTRA_DIST .version is created in the top_srdir which when building normally doesn't present a problem. When make distcheck is run, the source directory is made read-only and it fails with permission denied. The version of misc/git-version-gen is old and is missing the instruction to add .version to EXTRA_DIST. This commit does just that. make distcheck now passes. References: https://github.com/gagern/gnulib/blob/master/build-aux/git-version-gen https://lists.gnu.org/archive/html/bug-gnulib/2011-08/msg00000.html Signed-off-by: Craig Small --- Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.am b/Makefile.am index ba74103e..aca94b90 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,6 +51,7 @@ dist_man_MANS = \ ps/ps.1 EXTRA_DIST = \ + .version \ autogen.sh \ contrib \ COPYING.LIB \ From a849d8526040946583b8f73dd57be2f13b5e1cb1 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Sun, 9 Aug 2015 17:37:44 +1000 Subject: [PATCH 25/43] translations: Update all and fix Polish Translation files downloaded from TP. Polish file fixed for man-po, there were two bad sequences. References: http://www.freelists.org/post/procps/Bad-sequences-in-the-manpo-translations Signed-off-by: Craig Small --- man-po/pl.po | 3367 ++++++++++++++++++++++++++++++++++++++++++++++ po/de.po | 182 ++- po/fr.po | 186 ++- po/pl.po | 184 ++- po/procps-ng.pot | 347 +++-- po/uk.po | 182 ++- po/vi.po | 182 ++- 7 files changed, 3976 insertions(+), 654 deletions(-) create mode 100644 man-po/pl.po diff --git a/man-po/pl.po b/man-po/pl.po new file mode 100644 index 00000000..14d7072e --- /dev/null +++ b/man-po/pl.po @@ -0,0 +1,3367 @@ +# Polish translation of procps-ng man. +# Copyright (C) 2014 Free Software Foundation, Inc. +# This file is distributed under the same license as the procps-ng package. +# Jakub Bogusz , 2014-2015. +# +msgid "" +msgstr "" +"Project-Id-Version: procps-ng-man 3.3.10-rc3\n" +"POT-Creation-Date: 2014-09-16 19:45+0300\n" +"PO-Revision-Date: 2015-05-17 21:45+0200\n" +"Last-Translator: Jakub Bogusz \n" +"Language-Team: Polish \n" +"Language: pl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. type: TH +#: free.1:5 +#, no-wrap +msgid "FREE" +msgstr "FREE" + +#. type: TH +#: free.1:5 +#, no-wrap +msgid "July 2014" +msgstr "lipiec 2014" + +#. type: TH +#: free.1:5 kill.1:8 pgrep.1:5 pmap.1:8 pwdx.1:6 skill.1:9 slabtop.1:5 +#: sysctl.8:9 sysctl.conf.5:9 tload.1:4 uptime.1:3 vmstat.8:3 w.1:3 watch.1:1 +#, no-wrap +msgid "procps-ng" +msgstr "procps-ng" + +#. type: TH +#: free.1:5 kill.1:8 pgrep.1:5 pidof.1:18 pmap.1:8 pwdx.1:6 skill.1:9 +#: slabtop.1:5 tload.1:4 uptime.1:3 w.1:3 watch.1:1 +#, no-wrap +msgid "User Commands" +msgstr "Polecenia użytkownika" + +#. type: SH +#: free.1:6 kill.1:9 pgrep.1:6 pidof.1:19 pmap.1:9 pwdx.1:7 skill.1:10 +#: slabtop.1:6 sysctl.8:10 sysctl.conf.5:10 tload.1:5 uptime.1:4 vmstat.8:4 +#: w.1:4 watch.1:2 +#, no-wrap +msgid "NAME" +msgstr "NAZWA" + +#. type: Plain text +#: free.1:8 +msgid "free - Display amount of free and used memory in the system" +msgstr "free - wyświetlanie ilości wolnej i użytej pamięci w systemie" + +#. type: SH +#: free.1:8 kill.1:11 pgrep.1:8 pidof.1:21 pmap.1:11 pwdx.1:9 skill.1:12 +#: slabtop.1:8 sysctl.8:12 tload.1:7 uptime.1:6 vmstat.8:6 w.1:6 watch.1:4 +#, no-wrap +msgid "SYNOPSIS" +msgstr "SKŁADNIA" + +#. type: Plain text +#: free.1:11 +msgid "B [I]" +msgstr "B [I]" + +#. type: SH +#: free.1:11 kill.1:14 pgrep.1:14 pidof.1:32 pmap.1:14 skill.1:22 slabtop.1:11 +#: sysctl.8:18 sysctl.conf.5:12 tload.1:10 uptime.1:9 vmstat.8:10 w.1:9 +#: watch.1:7 +#, no-wrap +msgid "DESCRIPTION" +msgstr "OPIS" + +#. type: Plain text +#: free.1:17 +msgid "B displays the total amount of free and used physical and swap memory in the system, as well as the buffers and caches used by the kernel. The information is gathered by parsing /proc/meminfo. The displayed columns are:" +msgstr "B wyświetla całkowitą ilość wolnej i użytej pamięci fizycznej oraz pamięci wymiany w systemie, a także rozmiary buforów i pamięci podręcznych używanych przez jądro. Informacje są zbierane poprzez analizę /proc/meminfo. Wyświetlane kolumny to:" + +#. type: TP +#: free.1:17 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: free.1:20 +msgid "Total installed memory (MemTotal and SwapTotal in /proc/meminfo)" +msgstr "Całkowita zainstalowana pamięć (MemTotal oraz SwapTotal w /proc/meminfo)" + +#. type: TP +#: free.1:20 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: free.1:23 +msgid "Used memory (calculated as B - B - B - B)" +msgstr "Pamięć użyta (liczona jako B - B - B -B)" + +#. type: TP +#: free.1:23 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: free.1:26 +msgid "Unused memory (MemFree and SwapFree in /proc/meminfo)" +msgstr "Pamięć nie używana (MemFree oraz SwapFree w /proc/meminfo)" + +#. type: TP +#: free.1:26 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: free.1:30 +msgid "Memory used (mostly) by tmpfs (Shmem in /proc/meminfo, available on kernels 2.6.32, displayed as zero if not available)" +msgstr "Pamięć używana (głównie) przez tmpfs (Shmem w /proc/meminfo, dostępne w jądrach 2.6.32, wyświetlana jako zero, jeśli wartość nie jest dostępna)" + +#. type: TP +#: free.1:30 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: free.1:33 +msgid "Memory used by kernel buffers (Buffers in /proc/meminfo)" +msgstr "Pamięć używana przez bufory jądra (Buffers w /proc/meminfo)" + +#. type: TP +#: free.1:33 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: free.1:36 +msgid "Memory used by the page cache and slabs (Cached and Slab in /proc/meminfo)" +msgstr "Pamięć używana przez cache stron oraz płyty (Cached i Slab w /proc/meminfo)" + +#. type: TP +#: free.1:36 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: free.1:39 +msgid "Sum of B and B" +msgstr "Suma B i B" + +#. type: TP +#: free.1:39 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: free.1:48 +msgid "Estimation of how much memory is available for starting new applications, without swapping. Unlike the data provided by the B or B fields, this field takes into account page cache and also that not all reclaimable memory slabs will be reclaimed due to items being in use (MemAvailable in /proc/meminfo, available on kernels 3.14, emulated on kernels 2.6.27+, otherwise the same as B)" +msgstr "Przybliżenie, jak dużo pamięci jest dostępne do uruchamiania nowych aplikacji bez swapowania. W przeciwieństwie do danych udostępnianych w polach B czy B, to pole bierze pod uwagę cache stron oraz to, że nie wszystkie płyty pamięci podlegające reklamacji zostaną zwrócone (MemAvailable w /proc/meminfo, dostępne w jądrach 3.14, emulowane w jądrach 2.6.27+, w innych przypadkach - to samo, co B)" + +#. type: SH +#: free.1:48 kill.1:30 pgrep.1:39 pidof.1:36 pmap.1:16 pwdx.1:12 skill.1:35 +#: slabtop.1:16 tload.1:15 uptime.1:26 vmstat.8:19 watch.1:17 +#, no-wrap +msgid "OPTIONS" +msgstr "OPCJE" + +#. type: TP +#: free.1:49 +#, no-wrap +msgid "B<-b>, B<--bytes>" +msgstr "B<-b>, B<--bytes>" + +#. type: Plain text +#: free.1:52 +msgid "Display the amount of memory in bytes." +msgstr "Wyświetlanie ilości pamięci w bajtach." + +#. type: TP +#: free.1:52 +#, no-wrap +msgid "B<-k>, B<--kilo>" +msgstr "B<-k>, B<--kilo>" + +#. type: Plain text +#: free.1:55 +msgid "Display the amount of memory in kilobytes. This is the default." +msgstr "Wyświetlanie ilości pamięci w kilobajtach (zachowanie domyślne)." + +#. type: TP +#: free.1:55 +#, no-wrap +msgid "B<-m>, B<--mega>" +msgstr "B<-m>, B<--mega>" + +#. type: Plain text +#: free.1:58 +msgid "Display the amount of memory in megabytes." +msgstr "Wyświetlanie ilości pamięci w megabajtach." + +#. type: TP +#: free.1:58 +#, no-wrap +msgid "B<-g>, B<--giga>" +msgstr "B<-g>, B<--giga>" + +#. type: Plain text +#: free.1:61 +msgid "Display the amount of memory in gigabytes." +msgstr "Wyświetlanie ilości pamięci w gigabajtach." + +#. type: TP +#: free.1:61 +#, no-wrap +msgid "B<--tera>" +msgstr "B<--tera>" + +#. type: Plain text +#: free.1:64 +msgid "Display the amount of memory in terabytes." +msgstr "Wyświetlanie ilości pamięci w terabajtach." + +#. type: TP +#: free.1:64 +#, no-wrap +msgid "B<-h>, B<--human>" +msgstr "B<-h>, B<--human>" + +#. type: Plain text +#: free.1:68 +msgid "Show all output fields automatically scaled to shortest three digit unit and display the units of print out. Following units are used." +msgstr "Wyświetlanie wszystkich pól wyjściowych automatycznie przeskalowanych do najkrótszej trzycyfrowej jednostki wraz z użytą jednostką. Używane są następujące jednostki:" + +#. type: Plain text +#: free.1:75 +#, no-wrap +msgid "" +" B = bytes\n" +" K = kilos\n" +" M = megas\n" +" G = gigas\n" +" T = teras\n" +msgstr "" +" B = bajty\n" +" K = kilobajty\n" +" M = megabajty\n" +" G = gigabajty\n" +" T = terabajty\n" + +#. type: Plain text +#: free.1:79 +msgid "If unit is missing, and you have petabyte of RAM or swap, the number is in terabytes and columns might not be aligned with header." +msgstr "Jeśli brak jednostki, a w systemie jest petabajt RAM-u lub obszaru wymiany, liczba będzie w terabajtach, a kolumny mogą nie być wyrównane z nagłówkiem." + +#. type: TP +#: free.1:79 vmstat.8:79 +#, no-wrap +msgid "B<-w>, B<--wide>" +msgstr "B<-w>, B<--wide>" + +#. type: Plain text +#: free.1:84 +msgid "Switch to the wide mode. The wide mode produces lines longer than 80 characters. In this mode B and B are reported in two separate columns." +msgstr "Przełączenie w tryb szeroki, z liniami przekraczającymi 80 znaków. W tym trybie B oraz B są wypisywane w dwóch osobnych kolumnach." + +#. type: TP +#: free.1:84 +#, no-wrap +msgid "B<-c>, B<--count> I" +msgstr "B<-c>, B<--count> I" + +#. type: Plain text +#: free.1:91 +msgid "Display the result I times. Requires the B<-s> option." +msgstr "Wyświetlenie wyniku podaną I razy. Wymaga opcji B<-s>." + +#. type: TP +#: free.1:91 +#, no-wrap +msgid "B<-l>, B<--lohi>" +msgstr "B<-l>, B<--lohi>" + +#. type: Plain text +#: free.1:94 +msgid "Show detailed low and high memory statistics." +msgstr "Wyświetlanie szczegółowych statystyk niskiej i wysokiej pamięci." + +#. type: TP +#: free.1:94 +#, no-wrap +msgid "B<-s>, B<--seconds> I" +msgstr "B<-s>, B<--seconds> I" + +#. type: Plain text +#: free.1:102 +msgid "Continuously display the result delay I apart. You may actually specify any floating point number for I, B(3) is used for microsecond resolution delay times." +msgstr "Stałe wyświetlanie wyników co podaną liczbę I. Można podać dowolną liczbę zmiennoprzecinkową, obsługiwane są opóźnienia z dokładnością do mikrosekundy dzięki użyciu funkcji B(3)." + +#. type: TP +#: free.1:102 +#, no-wrap +msgid "B<--si>" +msgstr "B<--si>" + +#. type: Plain text +#: free.1:105 +msgid "Use power of 1000 not 1024." +msgstr "Użycie potęg liczby 1000 zamiast 1024." + +#. type: TP +#: free.1:105 +#, no-wrap +msgid "B<-t>, B<--total>" +msgstr "B<-t>, B<--total>" + +#. type: Plain text +#: free.1:108 +msgid "Display a line showing the column totals." +msgstr "Wyświetlanie linii pokazującej podsumowanie kolumn." + +#. type: TP +#: free.1:108 w.1:48 +#, no-wrap +msgid "B<--help>" +msgstr "B<--help>" + +#. type: Plain text +#: free.1:111 +msgid "Print help." +msgstr "Wyświetlenie opisu." + +#. type: TP +#: free.1:111 pgrep.1:157 pmap.1:59 pwdx.1:13 skill.1:61 slabtop.1:35 +#: sysctl.8:122 tload.1:28 uptime.1:36 vmstat.8:84 w.1:54 +#, no-wrap +msgid "B<-V>, B<--version>" +msgstr "B<-V>, B<--version>" + +#. type: Plain text +#: free.1:114 skill.1:64 w.1:57 +msgid "Display version information." +msgstr "Wyświetlenie informacji o wersji." + +#. type: SH +#: free.1:115 slabtop.1:76 sysctl.8:151 sysctl.conf.5:44 tload.1:32 +#: uptime.1:39 vmstat.8:199 w.1:70 +#, no-wrap +msgid "FILES" +msgstr "PLIKI" + +#. type: TP +#: free.1:116 +#, no-wrap +msgid "/proc/meminfo" +msgstr "/proc/meminfo" + +#. type: Plain text +#: free.1:119 +msgid "memory information" +msgstr "informacje dotyczące pamięci" + +#. type: SH +#: free.1:120 kill.1:72 pgrep.1:231 pidof.1:58 pmap.1:77 pwdx.1:19 skill.1:102 +#: slabtop.1:80 sysctl.8:155 sysctl.conf.5:63 tload.1:35 uptime.1:56 +#: vmstat.8:206 w.1:77 +#, no-wrap +msgid "SEE ALSO" +msgstr "ZOBACZ TAKŻE" + +#. type: Plain text +#: free.1:125 +msgid "B(1), B(1), B(1), B(8)." +msgstr "B(1), B(1), B(1), B(8)." + +#. type: SH +#: free.1:125 slabtop.1:95 tload.1:48 uptime.1:46 vmstat.8:216 w.1:84 +#: watch.1:184 +#, no-wrap +msgid "AUTHORS" +msgstr "AUTORZY" + +#. type: Plain text +#: free.1:127 +msgid "Written by Brian Edmonds." +msgstr "Program napisał Brian Edmonds." + +#. type: SH +#: free.1:127 kill.1:90 pgrep.1:248 pmap.1:82 pwdx.1:29 skill.1:118 +#: slabtop.1:101 sysctl.8:162 sysctl.conf.5:69 tload.1:56 uptime.1:61 +#: vmstat.8:226 w.1:94 +#, no-wrap +msgid "REPORTING BUGS" +msgstr "ZGŁASZANIE BŁĘDÓW" + +#. type: Plain text +#: kill.1:8 pgrep.1:5 pidof.1:18 pwdx.1:6 skill.1:9 slabtop.1:5 snice.1:1 +#: sysctl.conf.5:9 tload.1:4 uptime.1:3 vmstat.8:3 w.1:3 watch.1:1 +msgid "Please send bug reports to E<.UR procps@freelists.org> E<.UE>" +msgstr "Zgłoszenia błędów prosimy wysyłać na adres E<.UR procps@freelists.org> E<.UE>" + +#. type: TH +#: kill.1:8 +#, no-wrap +msgid "KILL" +msgstr "KILL" + +#. type: TH +#: kill.1:8 skill.1:9 +#, no-wrap +msgid "October 2011" +msgstr "październik 2011" + +#. type: Plain text +#: kill.1:11 +msgid "kill - send a signal to a process" +msgstr "kill - wysłanie sygnału do procesu" + +#. type: Plain text +#: kill.1:14 +msgid "B [options] EpidE [...]" +msgstr "B [opcje] EpidE [...]" + +#. type: Plain text +#: kill.1:30 +msgid "The default signal for kill is TERM. Use B<-l> or B<-L> to list available signals. Particularly useful signals include HUP, INT, KILL, STOP, CONT, and 0. Alternate signals may be specified in three ways: B<-9>, B<-SIGKILL> or B<-KILL>. Negative PID values may be used to choose whole process groups; see the PGID column in ps command output. A PID of B<-1> is special; it indicates all processes except the kill process itself and init." +msgstr "Domyślny sygnał to TERM. Aby uzyskać listę sygnałów, można użyć opcji B<-l> lub B<-L>. Przydatne sygnały to w szczególności HUP, INT, KILL, STOP, CONT oraz 0. Alternatywny sygnał można podać na trzy sposoby: B<-9>, B<-SIGKILL> oraz B<-KILL>. Ujemne wartości PID pozwalają wybrać całe grupy procesów - p. kolumna PGID w wyjściu polecenia ps. PID B<-1> jest specjalny - oznacza wszystkie procesy z wyjątkiem samego procesu kill oraz inita." + +#. type: TP +#: kill.1:31 +#, no-wrap +msgid "BpidE [...]>" +msgstr "BpidE [...]>" + +#. type: Plain text +#: kill.1:34 +msgid "Send signal to every EpidE listed." +msgstr "Wysłanie sygnału to każdego podanego EpiduE." + +#. type: TP +#: kill.1:34 +#, no-wrap +msgid "B<-EsignalE>" +msgstr "B<-EsygnałE>" + +#. type: TQ +#: kill.1:36 +#, no-wrap +msgid "B<-s EsignalE>" +msgstr "B<-s EsygnałE>" + +#. type: TQ +#: kill.1:38 +#, no-wrap +msgid "B<--signal EsignalE>" +msgstr "B<--signal EsygnałE>" + +#. type: Plain text +#: kill.1:46 +msgid "Specify the B to be sent. The signal can be specified by using name or number. The behavior of signals is explained in B(7) manual page." +msgstr "Podanie B do wysłania. Sygnał można określić przy użyciu nazwy lub numeru. Zachowanie sygnałów jest wyjaśnione na stronie podręcznika B(7)." + +#. type: TP +#: kill.1:46 +#, no-wrap +msgid "B<-l>, B<--list> [I]" +msgstr "B<-l>, B<--list> [I]" + +#. type: Plain text +#: kill.1:50 +msgid "List signal names. This option has optional argument, which will convert signal number to signal name, or other way round." +msgstr "Lista nazw sygnałów. Ta opcja ma opcjonalny argument, który pozwala zamienić numer sygnału na jego nazwę lub odwrotnie." + +#. type: TP +#: kill.1:50 skill.1:45 +#, no-wrap +msgid "B<-L>,B<\\ --table>" +msgstr "B<-L>,B<\\ --table>" + +#. type: Plain text +#: kill.1:53 +msgid "List signal names in a nice table." +msgstr "Lista nazw sygnałów w ładnej tabelce." + +#. type: SH +#: kill.1:55 pgrep.1:208 slabtop.1:85 vmstat.8:184 +#, no-wrap +msgid "NOTES" +msgstr "UWAGI" + +#. type: Plain text +#: kill.1:59 +msgid "Your shell (command line interpreter) may have a built-in kill command. You may need to run the command described here as /bin/kill to solve the conflict." +msgstr "Powłoka (interpreter linii poleceń) może mieć wbudowane polecenie kill. Aby uniknąć konfliktu, może zaistnieć potrzeba uruchomienia niniejszego polecenia jako /bin/kill." + +#. type: SH +#: kill.1:59 pgrep.1:169 skill.1:92 sysctl.8:125 watch.1:79 +#, no-wrap +msgid "EXAMPLES" +msgstr "PRZYKŁADY" + +#. type: TP +#: kill.1:60 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: kill.1:63 +msgid "Kill all processes you can kill." +msgstr "Zabicie wszystkich procesów, do których mamy uprawnienia." + +#. type: TP +#: kill.1:63 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: kill.1:66 +msgid "Translate number 11 into a signal name." +msgstr "Zamiana numeru 11 na nazwę sygnału." + +#. type: TP +#: kill.1:66 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: kill.1:69 +msgid "List the available signal choices in a nice table." +msgstr "Lista dostępnych sygnałów w ładnej tabelce." + +#. type: TP +#: kill.1:69 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: kill.1:72 +msgid "Send the default signal, SIGTERM, to all those processes." +msgstr "Wysłanie domyślnego sygnału (SIGTERM) do wszystkich podanych procesów." + +#. type: Plain text +#: kill.1:80 +msgid "B(2), B(1), B(1), B(1), B(1), B(7), B(1)" +msgstr "B(2), B(1), B(1), B(1), B(1), B(7), B(1)" + +#. type: SH +#: kill.1:80 pgrep.1:239 pmap.1:80 pwdx.1:22 skill.1:110 +#, no-wrap +msgid "STANDARDS" +msgstr "STANDARDY" + +#. type: Plain text +#: kill.1:84 +msgid "This command meets appropriate standards. The B<-L> flag is Linux-specific." +msgstr "To polecenie jest zgodne z odpowiednimi standardami. Flaga B<-L> jest specyficzna dla Linuksa." + +#. type: SH +#: kill.1:84 pgrep.1:244 pidof.1:61 pwdx.1:24 skill.1:112 sysctl.8:158 +#: sysctl.conf.5:65 +#, no-wrap +msgid "AUTHOR" +msgstr "AUTOR" + +#. type: Plain text +#: kill.1:90 +msgid "E<.UR albert@users.sf.net> Albert Cahalan E<.UE> wrote kill in 1999 to replace a bsdutils one that was not standards compliant. The util-linux one might also work correctly." +msgstr "E<.UR albert@users.sf.net> Albert Cahalan E<.UE> napisał program kill w roku 1999, aby zastąpić narzędzie z pakietu bsdutils, które nie było zgodne ze standardami. Narzędzie z pakietu util-linux także może działać poprawnie." + +#. type: TH +#: pgrep.1:5 +#, no-wrap +msgid "PGREP" +msgstr "PGREP" + +#. type: TH +#: pgrep.1:5 +#, no-wrap +msgid "October 2012" +msgstr "październik 2012" + +#. type: Plain text +#: pgrep.1:8 +msgid "pgrep, pkill - look up or signal processes based on name and other attributes" +msgstr "pgrep, pkill - wyszukiwanie lub wysyłanie sygnałów do procesów na podstawie nazwy i innych atrybutów" + +#. type: Plain text +#: pgrep.1:11 +msgid "B [options] pattern" +msgstr "B [opcje] wzorzec" + +#. type: Plain text +#: pgrep.1:14 +msgid "B [options] pattern" +msgstr "B [opcje] wzorzec" + +#. type: Plain text +#: pgrep.1:19 +msgid "B looks through the currently running processes and lists the process IDs which match the selection criteria to stdout. All the criteria have to match. For example," +msgstr "B przeszukuje aktualnie działające procesy i wypisuje na standardowym wyjściu identyfikatory procesów, które pasują do wybranych kryteriów. Wszystkie kryteria muszą pasować. Na przykład:" + +#. type: Plain text +#: pgrep.1:21 +msgid "$ pgrep -u root sshd" +msgstr "$ pgrep -u root sshd" + +#. type: Plain text +#: pgrep.1:27 +msgid "will only list the processes called B AND owned by B. On the other hand," +msgstr "wypisze tylko listę procesów o nazwie B ORAZ będących własnością B. Z drugiej strony:" + +#. type: Plain text +#: pgrep.1:29 +msgid "$ pgrep -u root,daemon" +msgstr "$ pgrep -u root,daemon" + +#. type: Plain text +#: pgrep.1:34 +msgid "will list the processes owned by B OR B." +msgstr "wypisze procesy, których właścicielem jest B LUB B." + +#. type: Plain text +#: pgrep.1:39 +msgid "B will send the specified signal (by default B) to each process instead of listing them on stdout." +msgstr "B zamiast wypisywania procesów wyśle do każdego podany sygnał (domyślnie B)." + +#. type: TP +#: pgrep.1:40 +#, no-wrap +msgid "B<->I" +msgstr "B<->I" + +#. type: TQ +#: pgrep.1:42 +#, no-wrap +msgid "B<--signal> I" +msgstr "B<--signal> I" + +#. type: Plain text +#: pgrep.1:48 +msgid "Defines the signal to send to each matched process. Either the numeric or the symbolic signal name can be used. (B only.)" +msgstr "Określenie sygnału, jaki ma być wysłany do wszystkich pasujących procesów. Może być numerem lub nazwą sygnału. (tylko B)" + +#. type: TP +#: pgrep.1:48 +#, no-wrap +msgid "B<-c>, B<--count>" +msgstr "B<-c>, B<--count>" + +#. type: Plain text +#: pgrep.1:53 +msgid "Suppress normal output; instead print a count of matching processes. When count does not match anything, e.g. returns zero, the command will return non-zero value." +msgstr "Pominięcie zwykłego wyjścia; zamiast niego wypisanie liczby pasujących procesów. Jeśli nic nie zostanie policzone (np. liczba będzie zerem), polecenie zwróci wartość niezerową." + +#. type: TP +#: pgrep.1:53 +#, no-wrap +msgid "B<-d>, B<--delimiter> I" +msgstr "B<-d>, B<--delimiter> I" + +#. type: Plain text +#: pgrep.1:59 +msgid "Sets the string used to delimit each process ID in the output (by default a newline). (B only.)" +msgstr "Ustawienie łańcucha oddzielającego identyfikatory procesów na wyjściu (domyślnie nowa linia). (tylko B)" + +#. type: TP +#: pgrep.1:59 +#, no-wrap +msgid "B<-f>, B<--full>" +msgstr "B<-f>, B<--full>" + +#. type: Plain text +#: pgrep.1:66 +msgid "The I is normally only matched against the process name. When B<-f> is set, the full command line is used." +msgstr "I normalnie jest dopasowywany tylko do nazwy procesu. Z ustawioną opcją B<-f>, wykorzystywana jest cała linia poleceń." + +#. type: TP +#: pgrep.1:66 +#, no-wrap +msgid "B<-g>, B<--pgroup> I,..." +msgstr "B<-g>, B<--pgroup> I,..." + +#. type: Plain text +#: pgrep.1:74 +msgid "Only match processes in the process group IDs listed. Process group 0 is translated into B's or B's own process group." +msgstr "Dopasowanie tylko do procesów z grup o podanych identyfikatorach. Grupa procesów 0 jest tłumaczona na własną grupę procesów polecenia B lub B." + +#. type: TP +#: pgrep.1:74 +#, no-wrap +msgid "B<-G>, B<--group> I,..." +msgstr "B<-G>, B<--group> I,..." + +#. type: Plain text +#: pgrep.1:78 +msgid "Only match processes whose real group ID is listed. Either the numerical or symbolical value may be used." +msgstr "Dopasowanie tylko do procesów o podanych identyfikatorach grup rzeczywistych. Można użyć wartości liczbowych lub symbolicznych." + +#. type: TP +#: pgrep.1:78 +#, no-wrap +msgid "B<-l>, B<--list-name>" +msgstr "B<-l>, B<--list-name>" + +#. type: Plain text +#: pgrep.1:83 +msgid "List the process name as well as the process ID. (B only.)" +msgstr "Wypisanie nazw oraz identyfikatorów procesów. (tylko B)" + +#. type: TP +#: pgrep.1:83 +#, no-wrap +msgid "B<-a>, B<--list-full>" +msgstr "B<-a>, B<--list-full>" + +#. type: Plain text +#: pgrep.1:88 +msgid "List the full command line as well as the process ID. (B only.)" +msgstr "Wypisanie pełnych linii poleceń oraz identyfikatorów procesów. (tylko B)" + +#. type: TP +#: pgrep.1:88 +#, no-wrap +msgid "B<-n>, B<--newest>" +msgstr "B<-n>, B<--newest>" + +#. type: Plain text +#: pgrep.1:91 +msgid "Select only the newest (most recently started) of the matching processes." +msgstr "Wybór tylko najnowszych (najpóźniej uruchomionych) spośród pasujących procesów." + +#. type: TP +#: pgrep.1:91 +#, no-wrap +msgid "B<-o>, B<--oldest>" +msgstr "B<-o>, B<--oldest>" + +#. type: Plain text +#: pgrep.1:94 +msgid "Select only the oldest (least recently started) of the matching processes." +msgstr "Wybór tylko najstarszych (najwcześniej uruchomionych) spośród pasujących procesów." + +#. type: TP +#: pgrep.1:94 +#, no-wrap +msgid "B<-P>, B<--parent> I,..." +msgstr "B<-P>, B<--parent> I,..." + +#. type: Plain text +#: pgrep.1:97 +msgid "Only match processes whose parent process ID is listed." +msgstr "Dopasowanie tylko do procesów o wymienionych identyfikatorach procesów rodziców." + +#. type: TP +#: pgrep.1:97 +#, no-wrap +msgid "B<-s>, B<--session> I,..." +msgstr "B<-s>, B<--session> I,..." + +#. type: Plain text +#: pgrep.1:105 +msgid "Only match processes whose process session ID is listed. Session ID 0 is translated into B's or B's own session ID." +msgstr "Dopasowanie tylko do procesów o wymienionych identyfikatorach sesji procesów. Identyfikator sesji 0 jest tłumaczony na własny procesu B lub B." + +#. type: TP +#: pgrep.1:105 +#, no-wrap +msgid "B<-t>, B<--terminal> I,..." +msgstr "B<-t>, B<--terminal> I,..." + +#. type: Plain text +#: pgrep.1:109 +msgid "Only match processes whose controlling terminal is listed. The terminal name should be specified without the \"/dev/\" prefix." +msgstr "Dopasowanie tylko do procesów o wymienionych terminalach sterujących. Nazwa terminala powinna być podana bez przedrostka \"/dev/\"." + +#. type: TP +#: pgrep.1:109 +#, no-wrap +msgid "B<-u>, B<--euid> I,..." +msgstr "B<-u>, B<--euid> I,..." + +#. type: Plain text +#: pgrep.1:113 +msgid "Only match processes whose effective user ID is listed. Either the numerical or symbolical value may be used." +msgstr "Dopasowanie tylko do procesów o wymienionych identyfikatorach użytkowników efektywnych. Można użyć wartości liczbowych lub symbolicznych." + +#. type: TP +#: pgrep.1:113 +#, no-wrap +msgid "B<-U>, B<--uid> I,..." +msgstr "B<-U>, B<--uid> I,..." + +#. type: Plain text +#: pgrep.1:117 +msgid "Only match processes whose real user ID is listed. Either the numerical or symbolical value may be used." +msgstr "Dopasowanie tylko do procesów o wymienionych identyfikatorach użytkowników rzeczywistych. Można użyć wartości liczbowych lub symbolicznych." + +#. type: TP +#: pgrep.1:117 +#, no-wrap +msgid "B<-v>, B<--inverse>" +msgstr "B<-v>, B<--inverse>" + +#. type: Plain text +#: pgrep.1:124 +msgid "Negates the matching. This option is usually used in B's context. In B's context the short option is disabled to avoid accidental usage of the option." +msgstr "Negacja dopasowania. Zwykle używana w kontekście programu B. W kontekście B krótka opcja jest wyłączona, aby zapobiec przypadkowemu użyciu." + +#. type: TP +#: pgrep.1:124 +#, no-wrap +msgid "B<-w>, B<--lightweight>" +msgstr "B<-w>, B<--lightweight>" + +#. type: Plain text +#: pgrep.1:131 +msgid "Shows all thread ids instead of pids in B's context. In B's context this option is disabled." +msgstr "Wyświetlenie wszystkich identyfikatorów wątków zamiast pidów w kontekście programu B. W kontekście B ta opcja jest wyłączona." + +#. type: TP +#: pgrep.1:131 +#, no-wrap +msgid "B<-x>, B<--exact>" +msgstr "B<-x>, B<--exact>" + +#. type: Plain text +#: pgrep.1:137 +msgid "Only match processes whose names (or command line if -f is specified) B match the I." +msgstr "Dopasowanie tylko do procesów, których nazwy (lub linie poleceń, jeśli podano opcję -f) pasują B do I." + +#. type: TP +#: pgrep.1:137 +#, no-wrap +msgid "B<-F>, B<--pidfile> I" +msgstr "B<-F>, B<--pidfile> I" + +#. type: Plain text +#: pgrep.1:145 +msgid "Read I's from file. This option is perhaps more useful for B than B." +msgstr "Odczyt Iów z pliku. Ta opcja jest zwykle bardziej przydatna dla programu B niż B." + +#. type: TP +#: pgrep.1:145 +#, no-wrap +msgid "B<-L>, B<--logpidfile>" +msgstr "B<-L>, B<--logpidfile>" + +#. type: Plain text +#: pgrep.1:148 +msgid "Fail if pidfile (see -F) not locked." +msgstr "Niepowodzenie, jeśli plik PID (p. opcja -F) nie jest zablokowany." + +#. type: TP +#: pgrep.1:148 skill.1:80 +#, no-wrap +msgid "B<--ns >I" +msgstr "B<--ns >I" + +#. type: Plain text +#: pgrep.1:153 +msgid "Match processes that belong to the same namespaces. Required to run as root to match processes from other users. See --nslist for how to limit which namespaces to match." +msgstr "Dopasowanie do procesów należących do tych samych przestrzeni nazw. Wymagane w przypadku uruchamiania przez roota, aby dopasować do procesów innych użytkowników. Więcej o ograniczaniu dopasowywanych przestrzeni nazw przy opcji --nslist." + +#. type: TP +#: pgrep.1:153 +#, no-wrap +msgid "B<--nslist >IB<,...>" +msgstr "B<--nslist >IB<,...>" + +#. type: Plain text +#: pgrep.1:157 +msgid "Match only the provided namespaces. Available namespaces: ipc, mnt, net, pid, user,uts." +msgstr "Dopasowanie tylko do podanych przestrzeni nazw. Dostępne przestrzenie: ipc, mnt, net, pid, user, uts." + +#. type: Plain text +#: pgrep.1:160 pmap.1:62 slabtop.1:38 sysctl.8:125 tload.1:31 vmstat.8:87 +#: watch.1:72 +msgid "Display version information and exit." +msgstr "Wyświetlenie informacji o wersji i zakończenie." + +#. type: TP +#: pgrep.1:160 pmap.1:56 pwdx.1:16 skill.1:58 slabtop.1:38 sysctl.8:119 +#: tload.1:25 uptime.1:30 vmstat.8:87 watch.1:66 +#, no-wrap +msgid "B<-h>, B<--help>" +msgstr "B<-h>, B<--help>" + +#. type: Plain text +#: pgrep.1:163 vmstat.8:90 +msgid "Display help and exit." +msgstr "Wyświetlenie opisu i zakończenie." + +#. type: SH +#: pgrep.1:164 +#, no-wrap +msgid "OPERANDS" +msgstr "ARGUMENTY" + +#. type: TP +#: pgrep.1:165 +#, no-wrap +msgid "I" +msgstr "I" + +#. type: Plain text +#: pgrep.1:169 +msgid "Specifies an Extended Regular Expression for matching against the process names or command lines." +msgstr "Określenie rozszerzonego wyrażenia regularnego do dopasowania nazwy procesu lub linii poleceń." + +#. type: Plain text +#: pgrep.1:173 +msgid "Example 1: Find the process ID of the B daemon:" +msgstr "Przykład 1: znalezienie identyfikatora procesu demona B:" + +#. type: Plain text +#: pgrep.1:175 +msgid "$ pgrep -u root named" +msgstr "$ pgrep -u root named" + +#. type: Plain text +#: pgrep.1:179 +msgid "Example 2: Make B reread its configuration file:" +msgstr "Przykład 2: wymuszenie ponownego odczytu pliku konfiguracyjnego przez program B:" + +#. type: Plain text +#: pgrep.1:181 +msgid "$ pkill -HUP syslogd" +msgstr "$ pkill -HUP syslogd" + +#. type: Plain text +#: pgrep.1:185 +msgid "Example 3: Give detailed information on all B processes:" +msgstr "Przykład 3: podanie szczegółowych informacji o wszystkich procesach B:" + +#. type: Plain text +#: pgrep.1:187 +msgid "$ ps -fp $(pgrep -d, -x xterm)" +msgstr "$ ps -fp $(pgrep -d, -x xterm)" + +#. type: Plain text +#: pgrep.1:191 +msgid "Example 4: Make all B processes run nicer:" +msgstr "Przykład 4: zwiększenie nice wszystkich procesów B:" + +#. type: Plain text +#: pgrep.1:193 +msgid "$ renice +4 $(pgrep netscape)" +msgstr "$ renice +4 $(pgrep netscape)" + +#. type: SH +#: pgrep.1:193 pidof.1:50 pmap.1:62 watch.1:151 +#, no-wrap +msgid "EXIT STATUS" +msgstr "KOD WYJŚCIA" + +#. type: TP +#: pgrep.1:195 +#, no-wrap +msgid "0" +msgstr "0" + +#. type: Plain text +#: pgrep.1:198 +msgid "One or more processes matched the criteria." +msgstr "Dopasowano jeden lub więcej procesów." + +#. type: TP +#: pgrep.1:198 +#, no-wrap +msgid "1" +msgstr "1" + +#. type: Plain text +#: pgrep.1:201 +msgid "No processes matched." +msgstr "Nie dopasowano żadnego procesu." + +#. type: TP +#: pgrep.1:201 +#, no-wrap +msgid "2" +msgstr "2" + +#. type: Plain text +#: pgrep.1:204 +msgid "Syntax error in the command line." +msgstr "Błąd składni w linii poleceń." + +#. type: TP +#: pgrep.1:204 +#, no-wrap +msgid "3" +msgstr "3" + +#. type: Plain text +#: pgrep.1:207 +msgid "Fatal error: out of memory etc." +msgstr "Błąd krytyczny: brak pamięci itp." + +#. type: Plain text +#: pgrep.1:212 +msgid "The process name used for matching is limited to the 15 characters present in the output of /proc/I/stat. Use the -f option to match against the complete command line, /proc/I/cmdline." +msgstr "Nazwa procesu używana przy dopasowaniu jest ograniczona do 15 znaków obecnych w wyjściu /proc/I/stat. Aby dopasować do pełnej linii poleceń (/proc/I/cmdline), należy użyć opcji -f." + +#. type: Plain text +#: pgrep.1:219 +msgid "The running B or B process will never report itself as a match." +msgstr "Działający proces B ani B nigdy nie zgłosi siebie jako dopasowania." + +#. type: SH +#: pgrep.1:219 tload.1:40 vmstat.8:214 watch.1:116 +#, no-wrap +msgid "BUGS" +msgstr "BŁĘDY" + +#. type: Plain text +#: pgrep.1:228 +msgid "The options B<-n> and B<-o> and B<-v> can not be combined. Let me know if you need to do this." +msgstr "Opcji B<-n>, B<-o> oraz B<-v> nie można łączyć. Gdyby było to przydatne, proszę zawiadomić autora." + +#. type: Plain text +#: pgrep.1:230 +msgid "Defunct processes are reported." +msgstr "Zgłoszono procesy nie funkcjonujące." + +#. type: Plain text +#: pgrep.1:239 +msgid "B(1), B(7), B(7), B(1), B(1), B(1), B(2)" +msgstr "B(1), B(7), B(7), B(1), B(1), B(1), B(2)" + +#. type: Plain text +#: pgrep.1:244 +msgid "B and B were introduced in Sun's Solaris 7. This implementation is fully compatible." +msgstr "B oraz B pojawiły się w Solarisie 7 firmy Sun. Ta implementacja jest w pełni zgodna." + +#. type: Plain text +#: pgrep.1:248 +msgid "E<.UR kjetilho@ifi.uio.no> Kjetil Torgrim Homme E<.UE>" +msgstr "E<.UR kjetilho@ifi.uio.no> Kjetil Torgrim Homme E<.UE>" + +#. type: TH +#: pidof.1:18 +#, no-wrap +msgid "PIDOF" +msgstr "PIDOF" + +#. type: TH +#: pidof.1:18 +#, no-wrap +msgid "24 Jul 2013" +msgstr "24 lip 2013" + +#. type: Plain text +#: pidof.1:21 +msgid "pidof -- find the process ID of a running program." +msgstr "pidof - wyszukiwanie identyfikatora procesu działającego programu." + +#. type: Plain text +#: pidof.1:32 +msgid "B [B<-s>] [B<-c>] [B<-x>] [B<-o> I] [B<-o> I] B [B]" +msgstr "B [B<-s>] [B<-c>] [B<-x>] [B<-o> I] [B<-o> I] B [B]" + +#. type: Plain text +#: pidof.1:36 +msgid "B finds the process id's (pids) of the named programs. It prints those id's on the standard output." +msgstr "B znajduje identyfikatory procesów (pidy) programów o podanych nazwach i wypisuje je na standardowym wyjściu." + +#. type: IP +#: pidof.1:37 +#, no-wrap +msgid "-s" +msgstr "-s" + +#. type: Plain text +#: pidof.1:39 +msgid "Single shot - this instructs the program to only return one I." +msgstr "Tryb pojedynczy - program zwróci tylko jeden I." + +#. type: IP +#: pidof.1:39 +#, no-wrap +msgid "-c" +msgstr "-c" + +#. type: Plain text +#: pidof.1:43 +msgid "Only return process ids that are running with the same root directory. This option is ignored for non-root users, as they will be unable to check the current root directory of processes they do not own." +msgstr "Zwrócenie tylko identyfikatorów procesów działających z tym samym katalogiem głównym. Ta opcja jest ignorowana dla użytkowników innych niż root, ponieważ wtedy nie można sprawdzić katalogu głównego procesów, których nie jest się właścicielem." + +#. type: IP +#: pidof.1:43 +#, no-wrap +msgid "-x" +msgstr "-x" + +#. type: Plain text +#: pidof.1:46 +msgid "Scripts too - this causes the program to also return process id's of shells running the named scripts." +msgstr "Także skrypty - program zwróci także identyfikatory procesów powłok wykonujących skrypty o podanych nazwach." + +#. type: IP +#: pidof.1:46 +#, no-wrap +msgid "-o I" +msgstr "-o I" + +#. type: Plain text +#: pidof.1:50 +msgid "Tells I to omit processes with that process id. The special pid B<%PPID> can be used to name the parent process of the I program, in other words the calling shell or shell script." +msgstr "Pominięcie procesów o podanym identyfikatorze. Specjalny pid B<%PPID> oznacza rodzica procesu programu I, czyli powłokę lub skrypt go uruchamiający." + +#. type: TP +#: pidof.1:51 pmap.1:66 watch.1:155 +#, no-wrap +msgid "B<0>" +msgstr "B<0>" + +#. type: Plain text +#: pidof.1:54 +msgid "At least one program was found with the requested name." +msgstr "Znaleziono przynajmniej jeden program o żądanej nazwie." + +#. type: TP +#: pidof.1:54 pmap.1:69 watch.1:158 +#, no-wrap +msgid "B<1>" +msgstr "B<1>" + +#. type: Plain text +#: pidof.1:57 +msgid "No program was found with the requested name." +msgstr "Nie znaleziono żadnego programu o żądanej nazwie." + +#. type: Plain text +#: pidof.1:61 +msgid "B(1), B(1)" +msgstr "B(1), B(1)" + +#. type: Plain text +#: pkill.1:1 +msgid "Jaromir Capik Ejcapik@redhat.comE" +msgstr "Jaromir Capik Ejcapik@redhat.comE" + +#. type: TH +#: pmap.1:8 +#, no-wrap +msgid "PMAP" +msgstr "PMAP" + +#. type: TH +#: pmap.1:8 +#, no-wrap +msgid "September 2012" +msgstr "wrzesień 2012" + +#. type: Plain text +#: pmap.1:11 +msgid "pmap - report memory map of a process" +msgstr "pmap - informacje o odwzorowaniu pamięci procesu" + +#. type: Plain text +#: pmap.1:14 +msgid "B [I] I [...]" +msgstr "B [I] I [...]" + +#. type: Plain text +#: pmap.1:16 +msgid "The pmap command reports the memory map of a process or processes." +msgstr "Polecenie pmap wypisuje mapę pamięci procesu lub procesów." + +#. type: TP +#: pmap.1:17 +#, no-wrap +msgid "B<-x>, B<--extended>" +msgstr "B<-x>, B<--extended>" + +#. type: Plain text +#: pmap.1:20 +msgid "Show the extended format." +msgstr "Wyświetlanie w formacie rozszerzonym." + +#. type: TP +#: pmap.1:20 +#, no-wrap +msgid "B<-d>, B<--device>" +msgstr "B<-d>, B<--device>" + +#. type: Plain text +#: pmap.1:23 +msgid "Show the device format." +msgstr "Wyświetlanie w formacie urządzeń." + +#. type: TP +#: pmap.1:23 sysctl.8:54 +#, no-wrap +msgid "B<-q>, B<--quiet>" +msgstr "B<-q>, B<--quiet>" + +#. type: Plain text +#: pmap.1:26 +msgid "Do not display some header or footer lines." +msgstr "Bez wyświetlania linii nagłówka i stopki." + +#. type: TP +#: pmap.1:26 +#, no-wrap +msgid "B<-A>, B<--range> I,I" +msgstr "B<-A>, B<--range> I,I" + +#. type: Plain text +#: pmap.1:34 +msgid "Limit results to the given range to I and I address range. Notice that the low and high arguments are single string separated with comma." +msgstr "Ograniczenie wyników do podanego przedziału adresów: I,I. Limity dolny i górny podaje się rozdzielone przecinkiem jako pojedynczy argument." + +#. type: TP +#: pmap.1:34 sysctl.8:110 +#, no-wrap +msgid "B<-X>" +msgstr "B<-X>" + +#. type: Plain text +#: pmap.1:38 +msgid "Show even more details than the B<-x> option. WARNING: format changes according to I" +msgstr "Wypisywanie jeszcze więcej szczegółów niż z opcją B<-x>. UWAGA: format zmienia się z I" + +#. type: TP +#: pmap.1:38 +#, no-wrap +msgid "B<-XX>" +msgstr "B<-XX>" + +#. type: Plain text +#: pmap.1:41 +msgid "Show everything the kernel provides" +msgstr "Wypisywanie wszystkiego, co udostępnia jądro" + +#. type: TP +#: pmap.1:41 +#, no-wrap +msgid "B<-p>, B<--show-path>" +msgstr "B<-p>, B<--show-path>" + +#. type: Plain text +#: pmap.1:44 +msgid "Show full path to files in the mapping column" +msgstr "Wypisywanie pełnych ścieżek do plików w kolumnie odwzorowań" + +#. type: TP +#: pmap.1:44 +#, no-wrap +msgid "B<-c>, B<--read-rc>" +msgstr "B<-c>, B<--read-rc>" + +#. type: Plain text +#: pmap.1:47 +msgid "Read the default configuration" +msgstr "Odczyt domyślnej konfiguracji" + +#. type: TP +#: pmap.1:47 +#, no-wrap +msgid "B<-C>, B<--read-rc-from> I" +msgstr "B<-C>, B<--read-rc-from> I" + +#. type: Plain text +#: pmap.1:50 +msgid "Read the configuration from I" +msgstr "Odczyt konfiguracji z I" + +#. type: TP +#: pmap.1:50 +#, no-wrap +msgid "B<-n>, B<--create-rc>" +msgstr "B<-n>, B<--create-rc>" + +#. type: Plain text +#: pmap.1:53 +msgid "Create new default configuration" +msgstr "Utworzenie nowej konfiguracji domyślnej" + +#. type: TP +#: pmap.1:53 +#, no-wrap +msgid "B<-N>, B<--create-rc-to> I" +msgstr "B<-N>, B<--create-rc-to> I" + +#. type: Plain text +#: pmap.1:56 +msgid "Create new configuration to I" +msgstr "Utworzenie nowej konfiguracji w I" + +#. type: Plain text +#: pmap.1:59 skill.1:61 sysctl.8:122 w.1:51 watch.1:69 +msgid "Display help text and exit." +msgstr "Wyświetlenie tekstu pomocy i zakończenie." + +#. type: Plain text +#: pmap.1:69 watch.1:158 +msgid "Success." +msgstr "Sukces." + +#. type: Plain text +#: pmap.1:72 +msgid "Failure." +msgstr "Niepowodzenie." + +#. type: TP +#: pmap.1:72 +#, no-wrap +msgid "B<42>" +msgstr "B<42>" + +#. type: Plain text +#: pmap.1:75 +msgid "Did not find all processes asked for." +msgstr "Nie znaleziono wszystkich żądanych procesów." + +#. type: Plain text +#: pmap.1:80 pwdx.1:22 +msgid "B(1), B(1)" +msgstr "B(1), B(1)" + +#. type: Plain text +#: pmap.1:82 +msgid "No standards apply, but pmap looks an awful lot like a SunOS command." +msgstr "Polecenia pmap nie dotyczą żadne standardy, ale wygląda równie brzydko, co polecenie SunOS." + +#. type: TH +#: pwdx.1:6 +#, no-wrap +msgid "PWDX" +msgstr "PWDX" + +#. type: TH +#: pwdx.1:6 slabtop.1:5 tload.1:4 watch.1:1 +#, no-wrap +msgid "June 2011" +msgstr "czerwiec 2011" + +#. type: Plain text +#: pwdx.1:9 +msgid "pwdx - report current working directory of a process" +msgstr "pwdx - informacja o bieżącym katalogu roboczym procesu" + +#. type: Plain text +#: pwdx.1:12 +msgid "B [I] I [...]" +msgstr "B [I] I [...]" + +#. type: Plain text +#: pwdx.1:16 +msgid "Output version information and exit." +msgstr "Wypisanie informacji o wersji i zakończenie." + +#. type: Plain text +#: pwdx.1:19 +msgid "Output help screen and exit." +msgstr "Wyświetlenie ekranu pomocy i zakończenie." + +#. type: Plain text +#: pwdx.1:24 +msgid "No standards apply, but pwdx looks an awful lot like a SunOS command." +msgstr "Polecenia pwdx nie dotyczą żadne standardy, ale wygląda równie brzydko, co polecenie SunOS." + +#. type: Plain text +#: pwdx.1:29 +msgid "E<.UR nmiell@gmail.com> Nicholas Miell E<.UE> wrote pwdx in 2004." +msgstr "E<.UR nmiell@gmail.com> Nicholas Miell E<.UE> napisał pwdx w 2004 roku." + +#. type: TH +#: skill.1:9 +#, no-wrap +msgid "SKILL" +msgstr "SKILL" + +#. type: Plain text +#: skill.1:12 +msgid "skill, snice - send a signal or report process status" +msgstr "skill, snice - wysłanie sygnału lub informacja o stanie procesu" + +#. type: Plain text +#: skill.1:17 +msgid "B [I] [I] I" +msgstr "B [I] [I] I" + +#. type: Plain text +#: skill.1:22 +msgid "B [I] [I] I" +msgstr "B [I] [I] I" + +#. type: Plain text +#: skill.1:26 +msgid "These tools are obsolete and unportable. The command syntax is poorly defined. Consider using the killall, pkill, and pgrep commands instead." +msgstr "Niniejsze narzędzia są przestarzałe i nieprzenośne. Składnia poleceń jest słabo zdefiniowana. Zamiast nich lepiej używać poleceń killall, pkill oraz pgrep." + +#. type: Plain text +#: skill.1:31 +msgid "The default signal for skill is TERM. Use -l or -L to list available signals. Particularly useful signals include HUP, INT, KILL, STOP, CONT, and 0. Alternate signals may be specified in three ways: -9 -SIGKILL -KILL." +msgstr "Domyśli sygnał dla programu skill to TERM. Listę dostępnych sygnałów można uzyskać przy użyciu -l lub -L. Szczególnie przydatne sygnały to HUP, INT, KILL, STOP, CONT oraz 0. Alternatywne sygnały można podać na trzy sposoby: -9 -SIGKILL -KILL." + +#. type: Plain text +#: skill.1:35 +msgid "The default priority for snice is +4. Priority numbers range from +20 (slowest) to -20 (fastest). Negative priority numbers are restricted to administrative users." +msgstr "Domyślny priorytet dla programu snice to +4. Numery priorytetów są z przedziału +20 (najwolniej) do -20 (najszybciej). Numery ujemne są zastrzeżone dla administratorów." + +#. type: TP +#: skill.1:36 +#, no-wrap +msgid "B<-f>,B<\\ --fast>" +msgstr "B<-f>,B<\\ --fast>" + +#. type: Plain text +#: skill.1:39 +msgid "Fast mode. This option has not been implemented." +msgstr "Tryb szybki. Ta opcja nie została zaimplementowana." + +#. type: TP +#: skill.1:39 +#, no-wrap +msgid "B<-i>,B<\\ --interactive>" +msgstr "B<-i>,B<\\ --interactive>" + +#. type: Plain text +#: skill.1:42 +msgid "Interactive use. You will be asked to approve each action." +msgstr "Tryb interaktywny. Użytkownik będzie pytany o każdą akcję." + +#. type: TP +#: skill.1:42 +#, no-wrap +msgid "B<-l>,B<\\ --list>" +msgstr "B<-l>,B<\\ --list>" + +#. type: Plain text +#: skill.1:45 +msgid "List all signal names." +msgstr "Lista wszystkich nazw sygnałów." + +#. type: Plain text +#: skill.1:48 +msgid "List all signal names in a nice table." +msgstr "Lista wszystkich nazw sygnałów w ładnej tabelce." + +#. type: TP +#: skill.1:48 +#, no-wrap +msgid "B<-n>,B<\\ --no-action>" +msgstr "B<-n>,B<\\ --no-action>" + +#. type: Plain text +#: skill.1:52 +msgid "No action; perform a simulation of events that would occur but do not actually change the system." +msgstr "Bez akcji; wykonanie symulacji zdarzeń, które by nastąpiły, ale bez zmian w systemie." + +#. type: TP +#: skill.1:52 +#, no-wrap +msgid "B<-v>,B<\\ --verbose>" +msgstr "B<-v>,B<\\ --verbose>" + +#. type: Plain text +#: skill.1:55 +msgid "Verbose; explain what is being done." +msgstr "Tryb szczegółowy; wyjaśnianie, co jest wykonywane." + +#. type: TP +#: skill.1:55 +#, no-wrap +msgid "B<-w>,B<\\ --warnings>" +msgstr "B<-w>,B<\\ --warnings>" + +#. type: Plain text +#: skill.1:58 +msgid "Enable warnings. This option has not been implemented." +msgstr "Włączenie ostrzeżeń. Ta opcja nie została zaimplementowana." + +#. type: SH +#: skill.1:65 +#, no-wrap +msgid "PROCESS SELECTION OPTIONS" +msgstr "OPCJE WYBORU PROCESÓW" + +#. type: Plain text +#: skill.1:68 +msgid "Selection criteria can be: terminal, user, pid, command. The options below may be used to ensure correct interpretation." +msgstr "Kryterium wyboru może być: terminal, użytkownik, pid, polecenie. W celu zapewnienia właściwej interpretacji można użyć poniższych opcji." + +#. type: TP +#: skill.1:68 +#, no-wrap +msgid "B<-t>, B<--tty> I" +msgstr "B<-t>, B<--tty> I" + +#. type: Plain text +#: skill.1:71 +msgid "The next expression is a terminal (tty or pty)." +msgstr "Następne wyrażenie jest terminalem (tty lub pty)." + +#. type: TP +#: skill.1:71 +#, no-wrap +msgid "B<-u>, B<--user> I" +msgstr "B<-u>, B<--user> I" + +#. type: Plain text +#: skill.1:74 +msgid "The next expression is a username." +msgstr "Następne wyrażenie jest nazwą użytkownika." + +#. type: TP +#: skill.1:74 +#, no-wrap +msgid "B<-p>, B<--pid> I" +msgstr "B<-p>, B<--pid> I" + +#. type: Plain text +#: skill.1:77 +msgid "The next expression is a process ID number." +msgstr "Następne wyrażenie jest liczbowym identyfikatorem procesu." + +#. type: TP +#: skill.1:77 +#, no-wrap +msgid "B<-c>, B<--command> I" +msgstr "B<-c>, B<--command> I" + +#. type: Plain text +#: skill.1:80 +msgid "The next expression is a command name." +msgstr "następne wyrażenie jest nazwą polecenia." + +#. type: Plain text +#: skill.1:83 +msgid "Match the processes that belong to the same namespace as pid." +msgstr "Dopasowanie procesów należących do tej samej przestrzeni nazw, co pid." + +#. type: TP +#: skill.1:83 +#, no-wrap +msgid "B<--nslist >I" +msgstr "B<--nslist >I" + +#. type: Plain text +#: skill.1:87 +msgid "list which namespaces will be considered for the --ns option. Available namespaces: ipc, mnt, net, pid, user, uts." +msgstr "lista przestrzeni nazw uwzględnianych w opcji --ns. Dostępne przestrzenie: ipc, mnt, net, pid, user, uts." + +#. type: SH +#: skill.1:88 +#, no-wrap +msgid "SIGNALS" +msgstr "SYGNAŁY" + +#. type: Plain text +#: skill.1:92 +msgid "The behavior of signals is explained in B(7) manual page." +msgstr "Zachowanie sygnałów jest wyjaśnione na stronie podręcznika B(7)." + +#. type: TP +#: skill.1:93 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: skill.1:96 +msgid "Slow down seti and crack commands." +msgstr "Spowolnienie poleceń seti oraz crack." + +#. type: TP +#: skill.1:96 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: skill.1:99 +msgid "Kill users on PTY devices." +msgstr "Zabicie użytkowników na urządzeniach PTY." + +#. type: TP +#: skill.1:99 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: skill.1:102 +msgid "Stop three users." +msgstr "Zatrzymanie trzech użytkowników." + +#. type: Plain text +#: skill.1:110 +msgid "B(1), B(2), B(1), B(1), B(1), B(1), B(7)" +msgstr "B(1), B(2), B(1), B(1), B(1), B(1), B(7)" + +#. type: Plain text +#: skill.1:112 +msgid "No standards apply." +msgstr "Żadne standardy nie dotyczą tych poleceń." + +#. type: Plain text +#: skill.1:118 +msgid "E<.UR albert@users.sf.net> Albert Cahalan E<.UE> wrote skill and snice in 1999 as a replacement for a non-free version." +msgstr "E<.UR albert@users.sf.net> Albert Cahalan E<.UE> napisał programy skill i snice w roku 1999 jako zamiennik wersji nie będących oprogramowaniem wolnodostępnym." + +#. type: TH +#: slabtop.1:5 +#, no-wrap +msgid "SLABTOP" +msgstr "SLABTOP" + +#. type: Plain text +#: slabtop.1:8 +msgid "slabtop - display kernel slab cache information in real time" +msgstr "slabtop - wyświetlanie informacji o pamięci podręcznej płyt jądra w czasie rzeczywistym" + +#. type: Plain text +#: slabtop.1:11 +msgid "B [I]" +msgstr "B [I]" + +#. type: Plain text +#: slabtop.1:16 +msgid "B displays detailed kernel slab cache information in real time. It displays a listing of the top caches sorted by one of the listed sort criteria. It also displays a statistics header filled with slab layer information." +msgstr "B wyświetla szczegółowe informacje o pamięci podręcznej płyt jądra w czasie rzeczywistym. Wyświetla listę pierwszych bloków posortowanych według jednego z kryteriów. Wyświetla także nagłówek statystyk wypełniony informacjami o warstwie płyt." + +#. type: Plain text +#: slabtop.1:21 +msgid "Normal invocation of B does not require any options. The behavior, however, can be fine-tuned by specifying one or more of the following flags:" +msgstr "Zwykłe wywołanie programu B nie wymaga żadnych opcji. Zachowanie może być jednak dostosowane szczegółowo poprzez podanie jednej lub większej liczby z następujących flag:" + +#. type: TP +#: slabtop.1:21 +#, no-wrap +msgid "B<-d>, B<--delay>=I" +msgstr "B<-d>, B<--delay>=I" + +#. type: Plain text +#: slabtop.1:29 +msgid "Refresh the display every I in seconds. By default, B refreshes the display every three seconds. To exit the program, hit B" +msgstr "Odświeżanie ekranu co I sekund. Domyślnie B odświeża ekran co 3 sekundy. Program można zakończyć naciskając klawisz B." + +#. type: TP +#: slabtop.1:29 +#, no-wrap +msgid "B<-s>, B<--sort>=I" +msgstr "B<-s>, B<--sort>=I" + +#. type: Plain text +#: slabtop.1:32 +msgid "Sort by I, where I is one of the sort criteria." +msgstr "Sortowanie według I, gdzie I to jedno z kryteriów sortowania." + +#. type: TP +#: slabtop.1:32 +#, no-wrap +msgid "B<-o>, B<--once>" +msgstr "B<-o>, B<--once>" + +#. type: Plain text +#: slabtop.1:35 +msgid "Display the output once and then exit." +msgstr "Jednorazowe wyświetlenie wyjścia i zakończenie." + +#. type: Plain text +#: slabtop.1:41 +msgid "Display usage information and exit." +msgstr "Wyświetlenie informacji o składni i zakończenie." + +#. type: SH +#: slabtop.1:41 +#, no-wrap +msgid "SORT CRITERIA" +msgstr "KRYTERIA SORTOWANIA" + +#. type: Plain text +#: slabtop.1:45 +msgid "The following are valid sort criteria used to sort the individual slab caches and thereby determine what are the \"top\" slab caches to display. The default sort criteria is to sort by the number of objects (\"o\")." +msgstr "Poniżej podane są poprawne kryteria sortowania dla poszczególnych pamięci podręcznych płyt, określające, czym mają być \"pierwsze bloki\" do wyświetlenia. Domyślnym kryterium sortowania jest liczba obiektów (\"o\")." + +#. type: Plain text +#: slabtop.1:48 +msgid "The sort criteria can also be changed while slabtop is running by pressing the associated character." +msgstr "Kryterium sortowania można zmienić także w trakcie działania slabtopa przez naciśnięcie powiązanego klawisza." + +#. type: tbl table +#: slabtop.1:50 +#, no-wrap +msgid "B\n" +msgstr "B\n" + +#. type: tbl table +#: slabtop.1:51 +#, no-wrap +msgid "a\tnumber of active objects\tACTIVE\n" +msgstr "a\tliczba aktywnych obiektów\tAKTYWNE\n" + +#. type: tbl table +#: slabtop.1:52 +#, no-wrap +msgid "b\tobjects per slab\tOBJ/SLAB\n" +msgstr "b\tliczba obiektów na płytę\tOB./PŁ.\n" + +#. type: tbl table +#: slabtop.1:53 +#, no-wrap +msgid "c\tcache size\tCACHE SIZE\n" +msgstr "c\trozmiar pamięci podręcznej\tROZM.CACHE\n" + +#. type: tbl table +#: slabtop.1:54 +#, no-wrap +msgid "l\tnumber of slabs\tSLABS\n" +msgstr "l\tliczba płyt\tPŁYTY\n" + +#. type: tbl table +#: slabtop.1:55 +#, no-wrap +msgid "v\tnumber of active slabs\tN/A\n" +msgstr "v\tliczba aktywnych płyt\tN/A\n" + +#. type: tbl table +#: slabtop.1:56 +#, no-wrap +msgid "n\tname\tNAME\n" +msgstr "n\tnazwa\tNAZWA\n" + +#. type: tbl table +#: slabtop.1:57 +#, no-wrap +msgid "o\tnumber of objects\tOBJS\n" +msgstr "o\tliczba obiektów\tOB.\n" + +#. type: tbl table +#: slabtop.1:58 +#, no-wrap +msgid "p\tpages per slab\tN/A\n" +msgstr "p\tliczba stron na płytę\tN/A\n" + +#. type: tbl table +#: slabtop.1:59 +#, no-wrap +msgid "s\tobject size\tOBJ SIZE\n" +msgstr "s\trozmiar obiektu\tROZM.OB.\n" + +#. type: tbl table +#: slabtop.1:60 +#, no-wrap +msgid "u\tcache utilization\tUSE\n" +msgstr "u\twykorzystanie pamięci podręcznej\tUŻ.\n" + +#. type: SH +#: slabtop.1:62 +#, no-wrap +msgid "COMMANDS" +msgstr "POLECENIA" + +#. type: Plain text +#: slabtop.1:66 +msgid "B accepts keyboard commands from the user during use. The following are supported. In the case of letters, both cases are accepted." +msgstr "B w trakcie działania przyjmuje polecenia użytkownika z klawiatury. Poniżej znajduje się lista obsługiwanych; w przypadku liter, akceptowane są obie wielkości." + +#. type: Plain text +#: slabtop.1:70 +msgid "Each of the valid sort characters are also accepted, to change the sort routine. See the section B." +msgstr "Przyjmowany jest każdy poprawny znak kryterium sortowania - zmienia on porządek; więcej w sekcji B." + +#. type: TP +#: slabtop.1:70 +#, no-wrap +msgid "BSPACEBARE>" +msgstr "BSPACJAE>" + +#. type: Plain text +#: slabtop.1:73 +msgid "Refresh the screen." +msgstr "Odświeżenie ekranu." + +#. type: TP +#: slabtop.1:73 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: slabtop.1:76 +msgid "Quit the program." +msgstr "Zakończenie programu." + +#. type: TP +#: slabtop.1:77 +#, no-wrap +msgid "I" +msgstr "I" + +#. type: Plain text +#: slabtop.1:80 +msgid "slab information" +msgstr "informacja o płytach" + +#. type: Plain text +#: slabtop.1:85 +msgid "B(1), B(1), B(1), B(8)" +msgstr "B(1), B(1), B(1), B(8)" + +#. type: Plain text +#: slabtop.1:91 +msgid "Currently, B requires a 2.4 or later kernel (specifically, a version 1.1 or later I). Kernel 2.2 should be supported in the future." +msgstr "Obecnie B wymaga jądra 2.4 lub późniejszego (w szczególności wersji 1.1 lub nowszej I). Jądro 2.2 powinno być obsługiwane w przyszłości." + +#. type: Plain text +#: slabtop.1:95 +msgid "The slabtop statistic header is tracking how many bytes of slabs are being used and is not a measure of physical memory. The 'Slab' field in the /proc/meminfo file is tracking information about used slab physical memory." +msgstr "Nagłówek statystyk programu slabtop śledzi, jak dużo bajtów płyt jest w użyciu, i nie jest miarę pamięci fizycznej. Pole 'Slab' w pliku /proc/meminfo śledzi informacje o użytej pamięci fizycznej płyt." + +#. type: Plain text +#: slabtop.1:97 +msgid "Written by Chris Rivera and Robert Love." +msgstr "Autorami są Chris Rivera i Robert Love." + +#. type: Plain text +#: slabtop.1:101 +msgid "B was inspired by Martin Bligh's perl script, B." +msgstr "B został zainspirowany skryptem perlowym B autorstwa Martina Bligha." + +#. type: TH +#: sysctl.8:9 +#, no-wrap +msgid "SYSCTL" +msgstr "SYSCTL" + +#. type: TH +#: sysctl.8:9 +#, no-wrap +msgid "Jan 2012" +msgstr "sty 2012" + +#. type: TH +#: sysctl.8:9 vmstat.8:3 +#, no-wrap +msgid "System Administration" +msgstr "Administracja systemem" + +#. type: Plain text +#: sysctl.8:12 +msgid "sysctl - configure kernel parameters at runtime" +msgstr "sysctl - konfiguracja parametrów jądra w czasie działania" + +#. type: Plain text +#: sysctl.8:15 +msgid "B [I] [I[B<=>I]] [...]" +msgstr "B [I] [I[B<=>I]] [...]" + +#. type: Plain text +#: sysctl.8:18 +msgid "B [I or I] [...]" +msgstr "B [I lub I] [...]" + +#. type: Plain text +#: sysctl.8:26 +msgid "B is used to modify kernel parameters at runtime. The parameters available are those listed under /proc/sys/. Procfs is required for B support in Linux. You can use B to both read and write sysctl data." +msgstr "B służy do modyfikowania parametrów jądra w czasie działania. Dostępne parametry to te, które są w /proc/sys/. Do obsługi B pod Linuksem wymagany jest procfs. Program B może być używany do odczytu i zapisu danych sysctl." + +#. type: SH +#: sysctl.8:26 +#, no-wrap +msgid "PARAMETERS" +msgstr "PARAMETRY" + +#. type: TP +#: sysctl.8:27 +#, no-wrap +msgid "I" +msgstr "I" + +#. type: Plain text +#: sysctl.8:31 +msgid "The name of a key to read from. An example is kernel.ostype. The '/' separator is also accepted in place of a '.'." +msgstr "Nazwa klucza, z którego mają być odczytane dane, na przykład kernel.ostype. Akceptowany jest także separator '/' zamiast '.'." + +#. type: TP +#: sysctl.8:31 +#, no-wrap +msgid "I=I" +msgstr "I=I" + +#. type: Plain text +#: sysctl.8:44 +msgid "To set a key, use the form I=I where I is the key and I is the value to set it to. If the value contains quotes or characters which are parsed by the shell, you may need to enclose the value in double quotes. This requires the B<-w> parameter to use." +msgstr "Aby ustawić klucz, należy użyć formy I=I, gdzie I to klucz, a I wartość, na jaką klucz ma być ustawiony. Jeśli wartość zawiera apostrofy lub znaki, które są przetwarzane przez powłokę, może być potrzeba ujęcia wartości w cudzysłowy. Wymaga to użycia parametru B<-w>." + +#. type: TP +#: sysctl.8:44 +#, no-wrap +msgid "B<-n>, B<--values>" +msgstr "B<-n>, B<--values>" + +#. type: Plain text +#: sysctl.8:47 +msgid "Use this option to disable printing of the key name when printing values." +msgstr "Ta opcja wyłącza wypisywanie nazwy klucza przy wypisywaniu wartości." + +#. type: TP +#: sysctl.8:47 +#, no-wrap +msgid "B<-e>, B<--ignore>" +msgstr "B<-e>, B<--ignore>" + +#. type: Plain text +#: sysctl.8:50 +msgid "Use this option to ignore errors about unknown keys." +msgstr "Ta opcja powoduje ignorowanie błędów przy nieznanych kluczach." + +#. type: TP +#: sysctl.8:50 +#, no-wrap +msgid "B<-N>, B<--names>" +msgstr "B<-N>, B<--names>" + +#. type: Plain text +#: sysctl.8:54 +msgid "Use this option to only print the names. It may be useful with shells that have programmable completion." +msgstr "Ta opcja powoduje wypisywanie samych nazw. Może być przydatna dla powłok z programowalnym dopełnianiem." + +#. type: Plain text +#: sysctl.8:57 +msgid "Use this option to not display the values set to stdout." +msgstr "Ta opcja powoduje niewyświetlanie ustawianych wartości na standardowym wyjściu." + +#. type: TP +#: sysctl.8:57 +#, no-wrap +msgid "B<-w>, B<--write>" +msgstr "B<-w>, B<--write>" + +#. type: Plain text +#: sysctl.8:60 +msgid "Use this option when you want to change a sysctl setting." +msgstr "Ta opcja pozwala na zmianę ustawienia sysctl." + +#. type: TP +#: sysctl.8:60 +#, no-wrap +msgid "B<-p>[I], B<--load>[=I]" +msgstr "B<-p>[I], B<--load>[=I]" + +#. type: Plain text +#: sysctl.8:68 +msgid "Load in sysctl settings from the file specified or /etc/sysctl.conf if none given. Specifying - as filename means reading data from standard input. Using this option will mean arguments to B are files, which are read in the order they are specified. The file argument may be specified as regular expression." +msgstr "Wczytanie ustawień sysctl z podanego pliku lub /etc/sysctl.conf, jeśli nie podano pliku. Podanie - jako nazwy pliku oznacza odczyt danych ze standardowego wejścia. Użycie tej opcji oznacza, że argumenty B są plikami, które będą czytane w kolejności podania. Argument plikowy może być też podany jako wyrażenie regularne." + +#. type: TP +#: sysctl.8:68 +#, no-wrap +msgid "B<-a>, B<--all>" +msgstr "B<-a>, B<--all>" + +#. type: Plain text +#: sysctl.8:71 +msgid "Display all values currently available." +msgstr "Wyświetlenie wszystkie aktualnie dostępnych wartości." + +#. type: TP +#: sysctl.8:71 +#, no-wrap +msgid "B<--deprecated>" +msgstr "B<--deprecated>" + +#. type: Plain text +#: sysctl.8:76 +msgid "Include deprecated parameters to B<--all> values listing." +msgstr "Dołączenie do listy wartości B<--all> parametrów przestarzałych." + +#. type: TP +#: sysctl.8:76 +#, no-wrap +msgid "B<-b>, B<--binary>" +msgstr "B<-b>, B<--binary>" + +#. type: Plain text +#: sysctl.8:79 +msgid "Print value without new line." +msgstr "Wypisanie wartości bez nowej linii." + +#. type: TP +#: sysctl.8:79 +#, no-wrap +msgid "B<--system>" +msgstr "B<--system>" + +#. type: Plain text +#: sysctl.8:82 +msgid "Load settings from all system configuration files." +msgstr "Wczytanie ustawień ze wszystkich systemowych plików konfiguracyjnych." + +#. type: TP +#: sysctl.8:84 sysctl.conf.5:45 +#, no-wrap +msgid "/run/sysctl.d/*.conf" +msgstr "/run/sysctl.d/*.conf" + +#. type: TQ +#: sysctl.8:86 sysctl.conf.5:47 +#, no-wrap +msgid "/etc/sysctl.d/*.conf" +msgstr "/etc/sysctl.d/*.conf" + +#. type: TQ +#: sysctl.8:88 sysctl.conf.5:49 +#, no-wrap +msgid "/usr/local/lib/sysctl.d/*.conf" +msgstr "/usr/local/lib/sysctl.d/*.conf" + +#. type: TQ +#: sysctl.8:90 sysctl.conf.5:51 +#, no-wrap +msgid "/usr/lib/sysctl.d/*.conf" +msgstr "/usr/lib/sysctl.d/*.conf" + +#. type: TQ +#: sysctl.8:92 sysctl.conf.5:53 +#, no-wrap +msgid "/lib/sysctl.d/*.conf" +msgstr "/lib/sysctl.d/*.conf" + +#. type: TQ +#: sysctl.8:94 sysctl.conf.5:55 +#, no-wrap +msgid "/etc/sysctl.conf" +msgstr "/etc/sysctl.conf" + +#. type: TP +#: sysctl.8:94 +#, no-wrap +msgid "B<-r>, B<--pattern> I" +msgstr "B<-r>, B<--pattern> I" + +#. type: Plain text +#: sysctl.8:101 +msgid "Only apply settings that match I. The I uses extended regular expression syntax." +msgstr "Naniesienie wyłącznie ustawień pasujących do I. I wykorzystuje składnię rozszerzonych wyrażeń regularnych." + +#. type: TP +#: sysctl.8:101 +#, no-wrap +msgid "B<-A>" +msgstr "B<-A>" + +#. type: Plain text +#: sysctl.8:104 sysctl.8:113 +msgid "Alias of B<-a>" +msgstr "Alias dla B<-a>" + +#. type: TP +#: sysctl.8:104 +#, no-wrap +msgid "B<-d>" +msgstr "B<-d>" + +#. type: Plain text +#: sysctl.8:107 +msgid "Alias of B<-h>" +msgstr "Alias dla B<-h>" + +#. type: TP +#: sysctl.8:107 +#, no-wrap +msgid "B<-f>" +msgstr "B<-f>" + +#. type: Plain text +#: sysctl.8:110 +msgid "Alias of B<-p>" +msgstr "Alias dla B<-p>" + +#. type: TP +#: sysctl.8:113 +#, no-wrap +msgid "B<-o>" +msgstr "B<-o>" + +#. type: Plain text +#: sysctl.8:116 sysctl.8:119 +msgid "Does nothing, exists for BSD compatibility." +msgstr "Nic nie robi, istnieje dla zgodności z BSD." + +#. type: TP +#: sysctl.8:116 +#, no-wrap +msgid "B<-x>" +msgstr "B<-x>" + +#. type: Plain text +#: sysctl.8:127 +msgid "/sbin/sysctl -a" +msgstr "/sbin/sysctl -a" + +#. type: Plain text +#: sysctl.8:129 +msgid "/sbin/sysctl -n kernel.hostname" +msgstr "/sbin/sysctl -n kernel.hostname" + +#. type: Plain text +#: sysctl.8:131 +msgid "/sbin/sysctl -w kernel.domainname=\"example.com\"" +msgstr "/sbin/sysctl -w kernel.domainname=\"example.com\"" + +#. type: Plain text +#: sysctl.8:133 +msgid "/sbin/sysctl -p/etc/sysctl.conf" +msgstr "/sbin/sysctl -p/etc/sysctl.conf" + +#. type: Plain text +#: sysctl.8:135 +msgid "/sbin/sysctl -a --pattern forward" +msgstr "/sbin/sysctl -a --pattern forward" + +#. type: Plain text +#: sysctl.8:137 +msgid "/sbin/sysctl -a --pattern forward$" +msgstr "/sbin/sysctl -a --pattern forward$" + +#. type: Plain text +#: sysctl.8:139 +msgid "/sbin/sysctl -a --pattern 'net.ipv4.conf.(eth|wlan)0.arp'" +msgstr "/sbin/sysctl -a --pattern 'net.ipv4.conf.(eth|wlan)0.arp'" + +#. type: Plain text +#: sysctl.8:141 +msgid "/sbin/sysctl --system --pattern '^net.ipv6'" +msgstr "/sbin/sysctl --system --pattern '^net.ipv6'" + +#. type: SH +#: sysctl.8:141 +#, no-wrap +msgid "DEPRECATED PARAMETERS" +msgstr "PARAMETRY PRZESTARZAŁE" + +#. type: Plain text +#: sysctl.8:149 +msgid "The B and B are deprecated. The sysctl command does not allow changing values of these parameters. Users who insist to use deprecated kernel interfaces should push values to /proc file system by other means. For example:" +msgstr "Zmienne B oraz B są przestarzałe. Polecenie sysctl nie pozwala na zmianę wartości tych parametrów. Użytkownicy uporczywie używający przestarzałych interfejsów powinni umieścić wartości w systemie plików /proc w inny sposób, na przykład:" + +#. type: Plain text +#: sysctl.8:151 +msgid "echo 256 E /proc/sys/net/ipv6/neigh/eth0/base_reachable_time" +msgstr "echo 256 E /proc/sys/net/ipv6/neigh/eth0/base_reachable_time" + +#. type: Plain text +#: sysctl.8:153 +msgid "I" +msgstr "I" + +#. type: Plain text +#: sysctl.8:155 +msgid "I" +msgstr "I" + +#. type: Plain text +#: sysctl.8:158 +msgid "B(5) B(7)" +msgstr "B(5) B(7)" + +#. type: Plain text +#: sysctl.8:162 sysctl.conf.5:69 +msgid "E<.UR staikos@0wned.org> George Staikos E<.UE>" +msgstr "E<.UR staikos@0wned.org> George Staikos E<.UE>" + +#. type: TH +#: sysctl.conf.5:9 +#, no-wrap +msgid "SYSCTL.CONF" +msgstr "SYSCTL.CONF" + +#. type: TH +#: sysctl.conf.5:9 +#, no-wrap +msgid "January 2012" +msgstr "styczeń 2012" + +#. type: TH +#: sysctl.conf.5:9 +#, no-wrap +msgid "File Formats" +msgstr "Formaty plików" + +#. type: Plain text +#: sysctl.conf.5:12 +msgid "sysctl.conf - sysctl preload/configuration file" +msgstr "sysctl.conf - plik wartości początkowych/konfiguracyjny sysctl" + +#. type: Plain text +#: sysctl.conf.5:17 +msgid "B is a simple file containing sysctl values to be read in and set by B. The syntax is simply as follows:" +msgstr "B to prosty plik zawierający wartości sysctl do odczytu i ustawienia przez polecenie B. Składnia jest prosta:" + +#. type: Plain text +#: sysctl.conf.5:23 +#, no-wrap +msgid "" +"# comment\n" +"; comment\n" +msgstr "" +"# komentarz\n" +"; komentarz\n" + +#. type: Plain text +#: sysctl.conf.5:25 +#, no-wrap +msgid "token = value\n" +msgstr "token = wartość\n" + +#. type: Plain text +#: sysctl.conf.5:31 +msgid "Note that blank lines are ignored, and whitespace before and after a token or value is ignored, although a value can contain whitespace within. Lines which begin with a # or ; are considered comments and ignored." +msgstr "Uwaga: puste linie są ignorowane, także białe znaki przed i po tokenie lub wartości są ignorowane, natomiast sama wartość może zawierać białe znaki. Linie zaczynające się znakiem # lub ; są uznawane za komentarze i ignorowane." + +#. type: SH +#: sysctl.conf.5:31 +#, no-wrap +msgid "EXAMPLE" +msgstr "PRZYKŁAD" + +#. type: Plain text +#: sysctl.conf.5:41 +#, no-wrap +msgid "" +"# sysctl.conf sample\n" +"#\n" +" kernel.domainname = example.com\n" +"; this one has a space which will be written to the sysctl!\n" +" kernel.modprobe = /sbin/mod probe\n" +msgstr "" +"# przykładowy sysctl.conf\n" +"#\n" +" kernel.domainname = example.com\n" +"; ta wartość zawiera spację, która zostanie zapisana do sysctl!\n" +" kernel.modprobe = /sbin/mod probe\n" + +#. type: Plain text +#: sysctl.conf.5:63 +msgid "The paths where sysctl preload files usually exist. See also sysctl option I<--system>." +msgstr "Ścieżki, gdzie zwykle istnieją pliki do automatycznego wczytywania sysctl. P. także opcja sysctl I<--system>." + +#. type: Plain text +#: sysctl.conf.5:65 +msgid "B(8)" +msgstr "B(8)" + +#. type: TH +#: tload.1:4 +#, no-wrap +msgid "TLOAD" +msgstr "TLOAD" + +#. type: Plain text +#: tload.1:7 +msgid "tload - graphic representation of system load average" +msgstr "tload - graficzna reprezentacja średniego obciążenia systemu" + +#. type: Plain text +#: tload.1:10 +msgid "B [I] [I]" +msgstr "B [I] [I]" + +#. type: Plain text +#: tload.1:15 +msgid "B prints a graph of the current system load average to the specified I (or the tty of the tload process if none is specified)." +msgstr "B wypisuje wykres bieżącego średniego obciążenia systemu na określony I (lub terminal procesu tload, jeśli nie podano żadnego)." + +#. type: TP +#: tload.1:16 +#, no-wrap +msgid "B<-s>, B<--scale> I" +msgstr "B<-s>, B<--scale> I" + +#. type: Plain text +#: tload.1:21 +msgid "The scale option allows a vertical scale to be specified for the display (in characters between graph ticks); thus, a smaller value represents a larger scale, and vice versa." +msgstr "Opcja scale pozwala na określenie pionowej skali wyświetlania (w znakach między podziałką wykresu); mniejsza wartość określa większą skalę i na odwrót." + +#. type: TP +#: tload.1:21 +#, no-wrap +msgid "B<-d>, B<--delay> I" +msgstr "B<-d>, B<--delay> I" + +#. type: Plain text +#: tload.1:25 +msgid "The delay sets the delay between graph updates in I." +msgstr "Opcja delay ustawia opóźnienie między odświeżeniami wykresu na podaną liczbę I." + +#. type: Plain text +#: tload.1:28 +msgid "Display this help text." +msgstr "Wyświetlenie tego opisu." + +#. type: Plain text +#: tload.1:35 +msgid "I load average information" +msgstr "I informacja o średnim obciążeniu" + +#. type: Plain text +#: tload.1:40 +msgid "B(1), B(1), B(1), B(1)" +msgstr "B(1), B(1), B(1), B(1)" + +#. type: Plain text +#: tload.1:48 +msgid "The B<-d>I< delay> option sets the time argument for an B(2); if -d 0 is specified, the alarm is set to 0, which will never send the B and update the display." +msgstr "Opcja B<-d>I< opóźnienie> ustawia czas dla funkcji B(2); jeśli podano -d 0, alarm jest ustawiany na 0, co oznacza, że nigdy nie zostanie wysłany B ani odświeżony ekran." + +#. type: Plain text +#: tload.1:56 +msgid "Branko Lankester, E<.UR david@\\:ods.\\:com> David Engel E<.UE , and> E<.UR johnsonm@\\:redhat.\\:com> Michael K. Johnson E<.UE .>" +msgstr "Branko Lankester, E<.UR david@\\:ods.\\:com> David Engel E<.UE , oraz> E<.UR johnsonm@\\:redhat.\\:com> Michael K. Johnson E<.UE .>" + +#. type: TH +#: uptime.1:3 +#, no-wrap +msgid "UPTIME" +msgstr "UPTIME" + +#. type: TH +#: uptime.1:3 +#, no-wrap +msgid "December 2012" +msgstr "grudzień 2012" + +#. type: Plain text +#: uptime.1:6 +msgid "uptime - Tell how long the system has been running." +msgstr "uptime - informacja, jak długo działa system." + +#. type: Plain text +#: uptime.1:9 +msgid "B [I]" +msgstr "B [I]" + +#. type: Plain text +#: uptime.1:14 +msgid "B gives a one line display of the following information. The current time, how long the system has been running, how many users are currently logged on, and the system load averages for the past 1, 5, and 15 minutes." +msgstr "B w pojedynczej linii podaje następujące informacje: bieżący czas; czas, jak długo działa system; liczbę aktualnie zalogowanych użytkowników; średnie obciążenie systemu dla ostatnich 1, 5 i 15 minut." + +#. type: Plain text +#: uptime.1:17 +msgid "This is the same information contained in the header line displayed by B(1)." +msgstr "Są to te same informacje, które zawiera linia nagłówka wyświetlana przez polecenie B(1)." + +#. type: Plain text +#: uptime.1:26 +msgid "System load averages is the average number of processes that are either in a runnable or uninterruptable state. A process in a runnable state is either using the CPU or waiting to use the CPU. A process in uninterruptable state is waiting for some I/O access, eg waiting for disk. The averages are taken over the three time intervals. Load averages are not normalized for the number of CPUs in a system, so a load average of 1 means a single CPU system is loaded all the time while on a 4 CPU system it means it was idle 75% of the time." +msgstr "Średnie obciążenie systemu to średnia liczba procesów w stanie działającym lub nieprzerywalnym. Proces jest w stanie działającym, kiedy używa procesora lub oczekuje na procesor. Proces jest w stanie nieprzerywalnym, kiedy oczekuje na jakiś dostęp we/wy, np. na dysk. Średnie są obliczane dla trzech okresów czasu. Nie są normalizowane pod kątem liczby procesorów w systemie, więc średnie obciążenie 1 oznacza, że system jednoprocesorowy jest obciążony cały czas, podczas gdy system 4-procesorowy jest bezczynny przez 75% czasu." + +#. type: TP +#: uptime.1:27 +#, no-wrap +msgid "B<-p>, B<--pretty>" +msgstr "B<-p>, B<--pretty>" + +#. type: Plain text +#: uptime.1:30 +msgid "show uptime in pretty format" +msgstr "wyświetlenie czasu działania w ładnym formacie" + +#. type: Plain text +#: uptime.1:33 +msgid "display this help text" +msgstr "wyświetlenie tego opisu" + +#. type: TP +#: uptime.1:33 +#, no-wrap +msgid "B<-s>, B<--since>" +msgstr "B<-s>, B<--since>" + +#. type: Plain text +#: uptime.1:36 +msgid "system up since, in yyyy-mm-dd HH:MM:SS format" +msgstr "początek czasu działania systemu w formacie rrrr-mm-dd GG:MM:SS" + +#. type: Plain text +#: uptime.1:39 +msgid "display version information and exit" +msgstr "wyświetlenie informacji o wersji i zakończenie" + +#. type: TP +#: uptime.1:40 w.1:71 +#, no-wrap +msgid "I" +msgstr "I" + +#. type: Plain text +#: uptime.1:43 w.1:74 +msgid "information about who is currently logged on" +msgstr "informacja o tym, kto jest obecnie zalogowany" + +#. type: TP +#: uptime.1:43 w.1:74 +#, no-wrap +msgid "I" +msgstr "I" + +#. type: Plain text +#: uptime.1:46 w.1:77 +msgid "process information" +msgstr "informacje o procesach" + +#. type: Plain text +#: uptime.1:56 +msgid "B was written by E<.UR greenfie@gauss.\\:rutgers.\\:edu> Larry Greenfield E<.UE> and E<.UR johnsonm@sunsite.\\:unc.\\:edu> Michael K. Johnson E<.UE>" +msgstr "Program B napisali E<.UR greenfie@gauss.\\:rutgers.\\:edu> Larry Greenfield E<.UE> oraz E<.UR johnsonm@sunsite.\\:unc.\\:edu> Michael K. Johnson E<.UE>" + +#. type: Plain text +#: uptime.1:61 +msgid "B(1), B(1), B(5), B(1)" +msgstr "B(1), B(1), B(5), B(1)" + +#. type: TH +#: vmstat.8:3 +#, no-wrap +msgid "VMSTAT" +msgstr "VMSTAT" + +#. type: TH +#: vmstat.8:3 +#, no-wrap +msgid "September 2011" +msgstr "wrzesień 2011" + +#. type: Plain text +#: vmstat.8:6 +msgid "vmstat - Report virtual memory statistics" +msgstr "vmstat - statystyki pamięci wirtualnej" + +#. type: Plain text +#: vmstat.8:10 +msgid "B [options] [I [I]]" +msgstr "B [opcje] [I [I]]" + +#. type: Plain text +#: vmstat.8:14 +msgid "B reports information about processes, memory, paging, block IO, traps, disks and cpu activity." +msgstr "B raportuje informacje o aktywności procesów, pamięci, stronicowania, blokowego we/wy, pułapek, dysków i procesora." + +#. type: Plain text +#: vmstat.8:19 +msgid "The first report produced gives averages since the last reboot. Additional reports give information on a sampling period of length I. The process and memory reports are instantaneous in either case." +msgstr "Pierwszy tworzony raport podaje średnie wartości od ostatniego restartu systemu. Dodatkowe raporty podają informacje dla okresów próbkowania o długości I. Raporty dotyczące procesów i pamięci są w obu przypadkach natychmiastowe." + +#. type: TP +#: vmstat.8:20 +#, no-wrap +msgid "I" +msgstr "I" + +#. type: Plain text +#: vmstat.8:27 +msgid "The I between updates in seconds. If no I is specified, only one report is printed with the average values since boot." +msgstr "I pomiędzy uaktualnieniami w sekundach. Jeśli nie podano I, wypisywany jest tylko raport z wartościami średnimi od rozruchu systemu." + +#. type: TP +#: vmstat.8:27 +#, no-wrap +msgid "I" +msgstr "I" + +#. type: Plain text +#: vmstat.8:34 +msgid "Number of updates. In absence of I, when I is defined, default is infinite." +msgstr "Liczba uaktualnień. W przypadku braku I, jeśli podano I, domyślna jest nieskończoność." + +#. type: TP +#: vmstat.8:34 +#, no-wrap +msgid "B<-a>, B<--active>" +msgstr "B<-a>, B<--active>" + +#. type: Plain text +#: vmstat.8:37 +msgid "Display active and inactive memory, given a 2.5.41 kernel or better." +msgstr "Wyświetlenie pamięci aktywnej i nieaktywnej, jeśli używane jest jądro 2.5.41 lub nowsze." + +#. type: TP +#: vmstat.8:37 +#, no-wrap +msgid "B<-f>, B<--forks>" +msgstr "B<-f>, B<--forks>" + +#. type: Plain text +#: vmstat.8:45 +msgid "The B<-f> switch displays the number of forks since boot. This includes the fork, vfork, and clone system calls, and is equivalent to the total number of tasks created. Each process is represented by one or more tasks, depending on thread usage. This display does not repeat." +msgstr "Opcja B<-f> wyświetla liczbę rozgałęzień procesów od rozruchu systemu. Liczba ta obejmuje wywołania systemowe fork, vfork oraz clone; jest odpowiednikiem całkowitej liczby utworzonych zadań. Każdy proces jest reprezentowany przez jedno lub więcej zadań, w zależności od wykorzystania wątków. Ten widok się nie powtarza." + +#. type: TP +#: vmstat.8:45 +#, no-wrap +msgid "B<-m>, B<--slabs>" +msgstr "B<-m>, B<--slabs>" + +#. type: Plain text +#: vmstat.8:48 +msgid "Displays slabinfo." +msgstr "Wyświetlenie slabinfo." + +#. type: TP +#: vmstat.8:48 +#, no-wrap +msgid "B<-n>, B<--one-header>" +msgstr "B<-n>, B<--one-header>" + +#. type: Plain text +#: vmstat.8:51 +msgid "Display the header only once rather than periodically." +msgstr "Wyświetlenie nagłówka tylko raz zamiast regularnie." + +#. type: TP +#: vmstat.8:51 +#, no-wrap +msgid "B<-s>, B<--stats>" +msgstr "B<-s>, B<--stats>" + +#. type: Plain text +#: vmstat.8:55 +msgid "Displays a table of various event counters and memory statistics. This display does not repeat." +msgstr "Wyświetlenie tabeli różnych liczników zdarzeń i statystyk pamięci. Ten widok się nie powtarza." + +#. type: TP +#: vmstat.8:55 +#, no-wrap +msgid "B<-d>, B<--disk>" +msgstr "B<-d>, B<--disk>" + +#. type: Plain text +#: vmstat.8:58 +msgid "Report disk statistics (2.5.70 or above required)." +msgstr "Raport statystyk dysku (wymagane jądro 2.5.70 lub nowsze)." + +#. type: TP +#: vmstat.8:58 +#, no-wrap +msgid "B<-D>, B<--disk-sum>" +msgstr "B<-D>, B<--disk-sum>" + +#. type: Plain text +#: vmstat.8:61 +msgid "Report some summary statistics about disk activity." +msgstr "Raport pewnych statystyk zbiorczych dotyczących aktywności dysku." + +#. type: TP +#: vmstat.8:61 +#, no-wrap +msgid "B<-p>, B<--partition> I" +msgstr "B<-p>, B<--partition> I" + +#. type: Plain text +#: vmstat.8:64 +msgid "Detailed statistics about partition (2.5.70 or above required)." +msgstr "Szczegółowe statystyki dotyczące partycji (wymagane jądro 2.5.70 lub nowsze)." + +#. type: TP +#: vmstat.8:64 +#, no-wrap +msgid "B<-S>, B<--unit> I" +msgstr "B<-S>, B<--unit> I" + +#. type: Plain text +#: vmstat.8:76 +msgid "Switches outputs between 1000 (I), 1024 (I), 1000000 (I), or 1048576 (I) bytes. Note this does not change the swap (si/so) or block (bi/bo) fields." +msgstr "Przełączenie wyjścia między jednostkami 1000 (I), 1024 (I),1000000 (I) lub 1048576 (I) bajtów. Opcja nie zmienia pól operacji wymiany (si/so) ani blokowych (bi/bo)." + +#. type: TP +#: vmstat.8:76 +#, no-wrap +msgid "B<-t>, B<--timestamp>" +msgstr "B<-t>, B<--timestamp>" + +#. type: Plain text +#: vmstat.8:79 +msgid "Append timestamp to each line" +msgstr "Dołączenie znacznika czasu do każdej linii" + +#. type: Plain text +#: vmstat.8:84 +msgid "Wide output mode (useful for systems with higher amount of memory, where the default output mode suffers from unwanted column breakage). The output is wider than 80 characters per line." +msgstr "Tryb szerokiego wyjścia (przydatny dla systemów z dużą ilością pamięci, gdzie domyślny tryb wyjścia cierpi przez niechciane łamanie kolumn). Wyjście jest szersze niż 80 znaków w linii." + +#. type: SH +#: vmstat.8:91 +#, no-wrap +msgid "FIELD DESCRIPTION FOR VM MODE" +msgstr "OPIS PÓL DLA TRYBU VM" + +#. type: SS +#: vmstat.8:92 +#, no-wrap +msgid "Procs" +msgstr "Proc." + +#. type: Plain text +#: vmstat.8:97 +#, no-wrap +msgid "" +"r: The number of runnable processes (running or waiting for run time).\n" +"b: The number of processes in uninterruptible sleep.\n" +msgstr "" +"r: Liczba procesów działających (działających lub czekających na czas pracy).\n" +"b: Liczba procesów w nieprzerywalnym śnie.\n" + +#. type: SS +#: vmstat.8:99 +#, no-wrap +msgid "Memory" +msgstr "Pamięć" + +#. type: Plain text +#: vmstat.8:108 +#, no-wrap +msgid "" +"swpd: the amount of virtual memory used.\n" +"free: the amount of idle memory.\n" +"buff: the amount of memory used as buffers.\n" +"cache: the amount of memory used as cache.\n" +"inact: the amount of inactive memory. (-a option)\n" +"active: the amount of active memory. (-a option)\n" +msgstr "" +"swap: ilość użytej pamięci wirtualnej.\n" +"wolna: ilość pamięci bezczynnej.\n" +"bufor: ilość pamięci używanej jako bufory.\n" +"cache: ilość pamięci używanej jako podręczna.\n" +"nieakt: ilość pamięci nieaktywnej (opcja -a).\n" +"akt: ilość pamięci aktywnej (opcja -a).\n" + +#. type: SS +#: vmstat.8:110 +#, no-wrap +msgid "Swap" +msgstr "Swap" + +#. type: Plain text +#: vmstat.8:115 +#, no-wrap +msgid "" +"si: Amount of memory swapped in from disk (/s).\n" +"so: Amount of memory swapped to disk (/s).\n" +msgstr "" +"si: Ilość pamięci wymiany wczytanej z dysku (/s).\n" +"so: Ilość pamięci wymiany zapisanej na dysk (/s).\n" + +#. type: SS +#: vmstat.8:117 vmstat.8:161 +#, no-wrap +msgid "IO" +msgstr "IO" + +#. type: Plain text +#: vmstat.8:122 +#, no-wrap +msgid "" +"bi: Blocks received from a block device (blocks/s).\n" +"bo: Blocks sent to a block device (blocks/s).\n" +msgstr "" +"bi: Bloki odebrane z urządzenia blokowego (bloki/s).\n" +"bo: Bloki wysłane do urządzenia blokowego (bloki/s).\n" + +#. type: SS +#: vmstat.8:124 +#, no-wrap +msgid "System" +msgstr "System" + +#. type: Plain text +#: vmstat.8:129 +#, no-wrap +msgid "" +"in: The number of interrupts per second, including the clock.\n" +"cs: The number of context switches per second.\n" +msgstr "" +"in: Liczba przerwań na sekundę, włącznie z zegarowym.\n" +"cs: Liczba przełączeń kontekstu na sekundę.\n" + +#. type: SS +#: vmstat.8:131 +#, no-wrap +msgid "CPU" +msgstr "CPU" + +#. type: Plain text +#: vmstat.8:134 +msgid "These are percentages of total CPU time." +msgstr "Procenty całkowitego czasu procesora." + +#. type: Plain text +#: vmstat.8:140 +#, no-wrap +msgid "" +"us: Time spent running non-kernel code. (user time, including nice time)\n" +"sy: Time spent running kernel code. (system time)\n" +"id: Time spent idle. Prior to Linux 2.5.41, this includes IO-wait time.\n" +"wa: Time spent waiting for IO. Prior to Linux 2.5.41, included in idle.\n" +"st: Time stolen from a virtual machine. Prior to Linux 2.6.11, unknown.\n" +msgstr "" +"us: Czas spędzony w kodzie poza jądrem (czas użytkownika, w tym nice).\n" +"sy: Czas spędzony w kodzie jądra (czas systemu)\n" +"id: Czas spędzony bezczynnie. Przed Linuksem 2.5.41 obejmował czas IO-wait.\n" +"wa: Czas spędzony na oczekiwaniu na we/wy. Przed 2.5.41 zawarty w bezczynnym.\n" +"st: Czas skradziony wirtualnej maszynie. Przed Linuksem 2.6.11 nieznany.\n" + +#. type: SH +#: vmstat.8:142 +#, no-wrap +msgid "FIELD DESCRIPTION FOR DISK MODE" +msgstr "OPIS PÓL DLA TRYBU DYSKOWEGO" + +#. type: SS +#: vmstat.8:143 +#, no-wrap +msgid "Reads" +msgstr "Odczyty" + +#. type: Plain text +#: vmstat.8:150 +#, no-wrap +msgid "" +"total: Total reads completed successfully\n" +"merged: grouped reads (resulting in one I/O)\n" +"sectors: Sectors read successfully\n" +"ms: milliseconds spent reading\n" +msgstr "" +"total: wszystkie odczyty zakończone poprawnie\n" +"merged: odczyty zgrupowane (zakończone w jednym we/wy)\n" +"sectors: sektory odczytane poprawnie\n" +"ms: milisekundy spędzone na odczycie\n" + +#. type: SS +#: vmstat.8:152 +#, no-wrap +msgid "Writes" +msgstr "Zapisy" + +#. type: Plain text +#: vmstat.8:159 +#, no-wrap +msgid "" +"total: Total writes completed successfully\n" +"merged: grouped writes (resulting in one I/O)\n" +"sectors: Sectors written successfully\n" +"ms: milliseconds spent writing\n" +msgstr "" +"total: wszystkie zapisy zakończone poprawnie\n" +"merged: zapisy zgrupowane (zakończone w jednym we/wy)\n" +"sectors: sektory zapisane poprawnie\n" +"ms: milisekundy spędzone na zapisie\n" + +#. type: Plain text +#: vmstat.8:166 +#, no-wrap +msgid "" +"cur: I/O in progress\n" +"s: seconds spent for I/O\n" +msgstr "" +"cur: operacje we/wy w trakcie\n" +"s: sekundy spędzone na operacjach we/wy\n" + +#. type: SH +#: vmstat.8:168 +#, no-wrap +msgid "FIELD DESCRIPTION FOR DISK PARTITION MODE" +msgstr "OPIS PÓL DLA TRYBU PARTYCJI DYSKU" + +#. type: Plain text +#: vmstat.8:174 +#, no-wrap +msgid "" +"reads: Total number of reads issued to this partition\n" +"read sectors: Total read sectors for partition\n" +"writes : Total number of writes issued to this partition\n" +"requested writes: Total number of write requests made for partition\n" +msgstr "" +"reads: całkowita liczba odczytów zleconych dla tej partycji\n" +"read sectors: całkowita liczba sektorów odczytanych z partycji\n" +"writes: całkowita liczba zapisów zleconych dla tej partycji\n" +"requested writes: całkowita liczba żądań zapisu dla partycji\n" + +#. type: SH +#: vmstat.8:176 +#, no-wrap +msgid "FIELD DESCRIPTION FOR SLAB MODE" +msgstr "OPIS PÓL DLA TRYBU PŁYT" + +#. type: Plain text +#: vmstat.8:183 +#, no-wrap +msgid "" +"cache: Cache name\n" +"num: Number of currently active objects\n" +"total: Total number of available objects\n" +"size: Size of each object\n" +"pages: Number of pages with at least one active object\n" +msgstr "" +"cache: nazwa pamięci podręcznej\n" +"num: liczba obecnie aktywnych obiektów\n" +"total: całkowita liczba dostępnych obiektów\n" +"size: rozmiar każdego obiektu\n" +"pages: liczba stron z przynajmniej jednym aktywnym obiektem\n" + +#. type: Plain text +#: vmstat.8:187 +msgid "B does not require special permissions." +msgstr "B nie wymaga specjalnych uprawnień." + +#. type: Plain text +#: vmstat.8:191 +msgid "These reports are intended to help identify system bottlenecks. Linux B does not count itself as a running process." +msgstr "Niniejsze raporty mają na celu pomoc przy identyfikacji wąskich gardeł w systemie. Linuksowy B nie liczy siebie jako działającego procesu." + +#. type: Plain text +#: vmstat.8:194 +msgid "All linux blocks are currently 1024 bytes. Old kernels may report blocks as 512 bytes, 2048 bytes, or 4096 bytes." +msgstr "Wszystkie bloki dla Linuksa mają obecnie 1024 bajty. Stare jądra mogły używać bloków 512-, 2048- lub 4096-bajtowych." + +#. type: Plain text +#: vmstat.8:197 +msgid "Since procps 3.1.9, vmstat lets you choose units (k, K, m, M). Default is K (1024 bytes) in the default mode." +msgstr "Od wersji procps 3.1.9, vmstat pozwala wybrać jednostki (k, K, m, M). Domyślna to K (1024 bajty) w trybie domyślnym." + +#. type: Plain text +#: vmstat.8:199 +msgid "vmstat uses slabinfo 1.1" +msgstr "vmstat wykorzystuje slabinfo 1.1" + +#. type: Plain text +#: vmstat.8:205 +#, no-wrap +msgid "" +"/proc/meminfo\n" +"/proc/stat\n" +"/proc/*/stat\n" +msgstr "" +"/proc/meminfo\n" +"/proc/stat\n" +"/proc/*/stat\n" + +#. type: Plain text +#: vmstat.8:213 +msgid "B(1), B(1), B(1), B(1), B(1), B(1)" +msgstr "B(1), B(1), B(1), B(1), B(1), B(1)" + +#. type: Plain text +#: vmstat.8:216 +msgid "Does not tabulate the block io per device or count the number of system calls." +msgstr "Nie raportuje blokowego we/wy per urządzenie ani nie liczy wywołań systemowych." + +#. type: Plain text +#: vmstat.8:221 +msgid "Written by E<.UR al172@yfn.\\:ysu.\\:edu> Henry Ware E<.UE .>" +msgstr "Autorem jest E<.UR al172@yfn.\\:ysu.\\:edu> Henry Ware E<.UE .>" + +#. type: Plain text +#: vmstat.8:226 +msgid "E<.UR ffrederick@users.\\:sourceforge.\\:net> Fabian Fr\\('ed\\('erick E<.UE> (diskstat, slab, partitions...)" +msgstr "E<.UR ffrederick@users.\\:sourceforge.\\:net> Fabian Fr\\('ed\\('erick E<.UE> (dyski, płyty, partycje...)" + +#. type: TH +#: w.1:3 +#, no-wrap +msgid "W" +msgstr "W" + +#. type: TH +#: w.1:3 +#, no-wrap +msgid "May 2012" +msgstr "maj 2012" + +#. type: Plain text +#: w.1:6 +msgid "w - Show who is logged on and what they are doing." +msgstr "w - wyświetlanie informacji, kto jest zalogowany i co robi." + +#. type: Plain text +#: w.1:9 +msgid "B [I] I [...]" +msgstr "B [I] I [...]" + +#. type: Plain text +#: w.1:15 +msgid "B displays information about the users currently on the machine, and their processes. The header shows, in this order, the current time, how long the system has been running, how many users are currently logged on, and the system load averages for the past 1, 5, and 15 minutes." +msgstr "B wyświetla informacje o użytkownikach obecnych na maszynie oraz ich procesach. Nagłówek pokazuje, w tej kolejności, aktualny czas, jak długo system działa, jak wielu użytkowników jest obecnie zalogowanych oraz średnie obciążenie systemu przez ostatnie 1, 5 oraz 15 minut." + +#. type: Plain text +#: w.1:19 +msgid "The following entries are displayed for each user: login name, the tty name, the remote host, login time, idle time, JCPU, PCPU, and the command line of their current process." +msgstr "Dla każdego użytkownika wyświetlane są następujące wpisy: nazwa terminala (tty), host zdalny, czas zalogowania, czas bezczynności, JCPU, PCPU oraz linia poleceń bieżącego procesu." + +#. type: Plain text +#: w.1:23 +msgid "The JCPU time is the time used by all processes attached to the tty. It does not include past background jobs, but does include currently running background jobs." +msgstr "Czas JCPU to czas wykorzystany przez wszystkie procesy podłączone do terminala. Nie obejmuje wcześniejszych zadań w tle, ale obejmuje procesy obecnie działające w tle." + +#. type: Plain text +#: w.1:26 +msgid "The PCPU time is the time used by the current process, named in the \"what\" field." +msgstr "Czas PCPU to czas wykorzystany przez bieżący proces, uwidoczniony w polu \"co\"." + +#. type: SH +#: w.1:26 +#, no-wrap +msgid "COMMAND-LINE OPTIONS" +msgstr "OPCJE LINII POLECEŃ" + +#. type: TP +#: w.1:27 +#, no-wrap +msgid "B<-h>, B<--no-header>" +msgstr "B<-h>, B<--no-header>" + +#. type: Plain text +#: w.1:30 +msgid "Don't print the header." +msgstr "Bez wypisywania nagłówka." + +#. type: TP +#: w.1:30 +#, no-wrap +msgid "B<-u>, B<--no-current>" +msgstr "B<-u>, B<--no-current>" + +#. type: Plain text +#: w.1:35 +msgid "Ignores the username while figuring out the current process and cpu times. To demonstrate this, do a \"su\" and do a \"w\" and a \"w -u\"." +msgstr "Ignorowanie nazwy użytkownika przy sprawdzaniu bieżącego procesu i czasów procesora. Różnicę można zobaczyć po wykonaniu \"su\", a następnie \"w\" oraz \"w -u\"." + +#. type: TP +#: w.1:35 +#, no-wrap +msgid "B<-s>, B<--short>" +msgstr "B<-s>, B<--short>" + +#. type: Plain text +#: w.1:38 +msgid "Use the short format. Don't print the login time, JCPU or PCPU times." +msgstr "Użycie formatu krótkiego - bez wypisywania czasu zalogowania oraz czasów JCPU i PCPU." + +#. type: TP +#: w.1:38 +#, no-wrap +msgid "B<-f>, B<--from>" +msgstr "B<-f>, B<--from>" + +#. type: Plain text +#: w.1:48 +msgid "Toggle printing the B (remote hostname) field. The default as released is for the B field to not be printed, although your system administrator or distribution maintainer may have compiled a version in which the B field is shown by default." +msgstr "Przełączanie wyświetlania pola B (nazwy hosta zdalnego). Domyślnie w źródłach pole B nie jest wypisywane, ale administrator systemu lub dystrybutor mógł skompilować wersję, która domyślnie pokazuje pole B." + +#. type: TP +#: w.1:51 +#, no-wrap +msgid "B<-i>, B<--ip-addr>" +msgstr "B<-i>, B<--ip-addr>" + +#. type: Plain text +#: w.1:54 +msgid "Display IP address instead of hostname for B field." +msgstr "Wyświetlanie adresu IP zamiast nazwy hosta w polu B." + +#. type: TP +#: w.1:57 +#, no-wrap +msgid "B<-o>, B<--old-style>" +msgstr "B<-o>, B<--old-style>" + +#. type: Plain text +#: w.1:60 +msgid "Old style output. Prints blank space for idle times less than one minute." +msgstr "Wyjście w starym stylu. Wypisywanie pustego miejsca dla czasów bezczynności poniżej minuty." + +#. type: TP +#: w.1:60 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: w.1:63 +msgid "Show information about the specified user only." +msgstr "Wyświetlanie informacji tylko o podanym użytkowniku." + +#. type: SH +#: w.1:63 +#, no-wrap +msgid "ENVIRONMENT" +msgstr "ŚRODOWISKO" + +#. type: TP +#: w.1:64 +#, no-wrap +msgid "PROCPS_USERLEN" +msgstr "PROCPS_USERLEN" + +#. type: Plain text +#: w.1:67 +msgid "Override the default width of the username column. Defaults to 8." +msgstr "Nadpisanie domyślnej szerokości kolumny z nazwą użytkownika. Domyślnie 8." + +#. type: TP +#: w.1:67 +#, no-wrap +msgid "PROCPS_FROMLEN" +msgstr "PROCPS_FROMLEN" + +#. type: Plain text +#: w.1:70 +msgid "Override the default width of the from column. Defaults to 16." +msgstr "Nadpisanie domyślnej szerokości kolumny B. Domyślnie 16." + +#. type: Plain text +#: w.1:84 +msgid "B(1), B(1), B(1), B(1), B(5), B(1)" +msgstr "B(1), B(1), B(1), B(1), B(5), B(1)" + +#. type: Plain text +#: w.1:94 +msgid "B was re-written almost entirely by Charles Blake, based on the version by E<.UR greenfie@\\:gauss.\\:rutgers.\\:edu> Larry Greenfield E<.UE> and E<.UR johnsonm@\\:redhat.\\:com> Michael K. Johnson E<.UE>" +msgstr "Program B został przepisany prawie w całości przez Charlesa Blake'a w oparciu o wersję, którą napisali E<.UR greenfie@\\:gauss.\\:rutgers.\\:edu> Larry Greenfield E<.UE> oraz E<.UR johnsonm@\\:redhat.\\:com> Michael K. Johnson E<.UE>" + +#. type: TH +#: watch.1:1 +#, no-wrap +msgid "WATCH" +msgstr "WATCH" + +#. type: Plain text +#: watch.1:4 +msgid "watch - execute a program periodically, showing output fullscreen" +msgstr "watch - regularne uruchamianie programu z wyświetlaniem wyjścia na pełnym ekranie" + +#. type: Plain text +#: watch.1:7 +msgid "B [I] I" +msgstr "B [I] I" + +#. type: Plain text +#: watch.1:17 +msgid "B runs I repeatedly, displaying its output and errors (the first screenfull). This allows you to watch the program output change over time. By default, the program is run every 2 seconds. By default, B will run until interrupted." +msgstr "B powtarza uruchamianie I, wyświetlając jego wyjście oraz błędy (przy czym wyjście na pełnym ekranie). Pozwala to obserwować zmianę wyjścia programu w czasie. Domyślnie program jest uruchamiany co 2 sekundy. B domyślnie działa aż do przerwania." + +#. type: TP +#: watch.1:18 +#, no-wrap +msgid "B<-d>, B<--differences> [I]" +msgstr "B<-d>, B<--differences> [I]" + +#. type: Plain text +#: watch.1:23 +msgid "Highlight the differences between successive updates. Option will read optional argument that changes highlight to be permanent, allowing to see what has changed at least once since first iteration." +msgstr "Podświetlanie różnic między kolejnymi uaktualnieniami. Opcja może mieć opcjonalny argument, który zmienia podświetlenie na trwałe, pozwalające zobaczyć, co zmieniło się przynajmniej raz od pierwszej iteracji." + +#. type: TP +#: watch.1:23 +#, no-wrap +msgid "B<-n>, B<--interval> I" +msgstr "B<-n>, B<--interval> I" + +#. type: Plain text +#: watch.1:27 +msgid "Specify update interval. The command will not allow quicker than 0.1 second interval, in which the smaller values are converted." +msgstr "Określenie odstępu między uaktualnieniami. Polecenie nie będzie uruchamiane częściej niż co 0.1 sekundy - na taką wartość są zamieniane krótsze okresy." + +#. type: TP +#: watch.1:27 +#, no-wrap +msgid "B<-p>, B<--precise>" +msgstr "B<-p>, B<--precise>" + +#. type: Plain text +#: watch.1:39 +msgid "Make B attempt to run I every I seconds. Try it with B and notice how the fractional seconds stays (nearly) the same, as opposed to normal mode where they continuously increase." +msgstr "Próba uruchamiania I co podaną liczbę I. Można wypróbować tę opcję z poleceniem B i obserwować, jak ułamki sekund pozostają (prawie) takie same, w przeciwieństwie do trybu zwykłego, gdzie stale się zwiększają." + +#. type: TP +#: watch.1:39 +#, no-wrap +msgid "B<-t>, B<--no-title>" +msgstr "B<-t>, B<--no-title>" + +#. type: Plain text +#: watch.1:43 +msgid "Turn off the header showing the interval, command, and current time at the top of the display, as well as the following blank line." +msgstr "Wyłączenie nagłówka pokazującego okres, polecenie oraz czas bieżący na górze ekranu, a także następującej po nim pustej linii." + +#. type: TP +#: watch.1:43 +#, no-wrap +msgid "B<-b>, B<--beep>" +msgstr "B<-b>, B<--beep>" + +#. type: Plain text +#: watch.1:46 +msgid "Beep if command has a non-zero exit." +msgstr "Sygnał dźwiękowy w przypadku niezerowego kodu wyjścia polecenia." + +#. type: TP +#: watch.1:46 +#, no-wrap +msgid "B<-e>, B<--errexit>" +msgstr "B<-e>, B<--errexit>" + +#. type: Plain text +#: watch.1:49 +msgid "Freeze updates on command error, and exit after a key press." +msgstr "Zamrożenie uaktualnień po błędzie polecenia, zakończenie pracy po naciśnięciu klawisza." + +#. type: TP +#: watch.1:49 +#, no-wrap +msgid "B<-g>, B<--chgexit>" +msgstr "B<-g>, B<--chgexit>" + +#. type: Plain text +#: watch.1:54 +msgid "Exit when the output of I changes." +msgstr "Zakończenie, gdy wyjście I się zmieni." + +#. type: TP +#: watch.1:54 +#, no-wrap +msgid "B<-c>, B<--color>" +msgstr "B<-c>, B<--color>" + +#. type: Plain text +#: watch.1:57 +msgid "Interpret ANSI color and style sequences." +msgstr "Interpretowanie sekwencji kolorów i stylów ANSI" + +#. type: TP +#: watch.1:57 +#, no-wrap +msgid "B<-x>, B<--exec>" +msgstr "B<-x>, B<--exec>" + +#. type: Plain text +#: watch.1:66 +msgid "I is given to B which means that you may need to use extra quoting to get the desired effect. This with the --exec option, which passes the command to B(2) instead." +msgstr "I jest przekazywane do B, co oznacza, że może być potrzeba użycia dodatkowego cytowania do osiągnięcia pożądanego efektu. Z opcją --exec polecenie jest natomiast przekazywane do funkcji B(2)." + +#. type: TP +#: watch.1:69 +#, no-wrap +msgid "B<-v>, B<--version>" +msgstr "B<-v>, B<--version>" + +#. type: SH +#: watch.1:72 +#, no-wrap +msgid "NOTE" +msgstr "UWAGA" + +#. type: Plain text +#: watch.1:79 +msgid "Note that POSIX option processing is used (i.e., option processing stops at the first non-option argument). This means that flags after I don't get interpreted by B itself." +msgstr "Uwaga: używany jest wariant POSIX przetwarzania opcji (tzn. przetwarzanie opcji kończy się na pierwszym argumencie nie będącym opcją). Oznacza to, że flagi podane po I nie są interpretowane przez program B." + +#. type: Plain text +#: watch.1:82 +msgid "To watch for mail, you might do" +msgstr "Aby obserwować pocztę, można wykonać" + +#. type: Plain text +#: watch.1:84 +msgid "watch -n 60 from" +msgstr "watch -n 60 from" + +#. type: Plain text +#: watch.1:86 +msgid "To watch the contents of a directory change, you could use" +msgstr "Aby obserwować zmiany zawartości katalogu, można użyć" + +#. type: Plain text +#: watch.1:88 +msgid "watch -d ls -l" +msgstr "watch -d ls -l" + +#. type: Plain text +#: watch.1:90 +msgid "If you're only interested in files owned by user joe, you might use" +msgstr "Jeżeli interesujące są tylko pliki, których właścicielem jest użytkownik joe, można użyć" + +#. type: Plain text +#: watch.1:92 +msgid "watch -d 'ls -l | fgrep joe'" +msgstr "watch -d 'ls -l | fgrep joe'" + +#. type: Plain text +#: watch.1:94 +msgid "To see the effects of quoting, try these out" +msgstr "Aby zobaczyć efekty cytowania, można wypróbować" + +#. type: Plain text +#: watch.1:96 +msgid "watch echo $$" +msgstr "watch echo $$" + +#. type: Plain text +#: watch.1:98 +msgid "watch echo '$$'" +msgstr "watch echo '$$'" + +#. type: Plain text +#: watch.1:100 +msgid "watch echo \"'\"'$$'\"'\"" +msgstr "watch echo \"'\"'$$'\"'\"" + +#. type: Plain text +#: watch.1:104 +msgid "To see the effect of precision time keeping, try adding I<-p> to" +msgstr "Aby zobaczyć efekt precyzyjnej obsługi czasu, można spróbować dodać I<-p> do" + +#. type: Plain text +#: watch.1:106 +msgid "watch -n 10 sleep 1" +msgstr "watch -n 10 sleep 1" + +#. type: Plain text +#: watch.1:108 +msgid "You can watch for your administrator to install the latest kernel with" +msgstr "Można obserwować, jak administrator instaluje najnowsze jądro, przy użyciu" + +#. type: Plain text +#: watch.1:110 +msgid "watch uname -r" +msgstr "watch uname -r" + +#. type: Plain text +#: watch.1:116 +msgid "(Note that I<-p> isn't guaranteed to work across reboots, especially in the face of B or other bootup time-changing mechanisms)" +msgstr "(Uwaga: I<-p> nie daje gwarancji działania między restartami systemu, szczególnie w obliczu B czy innych mechanizmów zmieniających czas w trakcie rozruchu)" + +#. type: Plain text +#: watch.1:121 +msgid "Upon terminal resize, the screen will not be correctly repainted until the next scheduled update. All B<--differences> highlighting is lost on that update as well." +msgstr "Przy zmianie rozmiaru terminala ekran nie zostanie poprawnie odrysowany aż do następnego uaktualnienia. Przy tym uaktualnieniu wszystkie podświetlenia B<--differences> zostaną utracone." + +#. type: Plain text +#: watch.1:124 +msgid "Non-printing characters are stripped from program output. Use \"cat -v\" as part of the command pipeline if you want to see them." +msgstr "Znaki niedrukowalne są usuwane z wyjścia programu. Aby je zobaczyć, można użyć \"cat -v\" jako części potoku polecenia." + +#. type: Plain text +#: watch.1:128 +msgid "Combining Characters that are supposed to display on the character at the last column on the screen may display one column early, or they may not display at all." +msgstr "Znaki dołączane, które mają być wyświetlane na znaku w ostatniej kolumnie ekranu, mogą wyświetlać się o jedną kolumnę za wcześnie albo wcale." + +#. type: Plain text +#: watch.1:132 +msgid "Combining Characters never count as different in I<--differences> mode. Only the base character counts." +msgstr "Znaki dołączane nigdy nie liczą się jako różne w trybie I<--differences>. Liczy się tylko znak podstawowy." + +#. type: Plain text +#: watch.1:135 +msgid "Blank lines directly after a line which ends in the last column do not display." +msgstr "Puste wiersze bezpośrednio po wierszu kończącym się w ostatniej kolumnie, nie są wyświetlane." + +#. type: Plain text +#: watch.1:151 +msgid "I<--precise> mode doesn't yet have advanced temporal distortion technology to compensate for a I that takes more than I seconds to execute. B also can get into a state where it rapid-fires as many executions of I as it can to catch up from a previous executions running longer than I (for example, B taking ages on a DNS lookup)." +msgstr "Tryb I<--precise> nie ma jeszcze zaawansowanej technologii zakrzywienia czasoprzestrzeni w celu skompensowania przypadku wykonywania I dłużej niż I. B może też wejść w stan, w którym szybko uruchamia wiele instancji I, aby dogonić poprzednie działające więcej niż I (np. B trwający wieki przez wyszukiwania DNS)." + +#. type: Plain text +#: watch.1:161 +msgid "Various failures." +msgstr "Różne niepowodzenia." + +#. type: TP +#: watch.1:161 +#, no-wrap +msgid "B<2>" +msgstr "B<2>" + +#. type: Plain text +#: watch.1:164 +msgid "Forking the process to watch failed." +msgstr "Nie udało się odgałęzić procesu do obserwacji." + +#. type: TP +#: watch.1:164 +#, no-wrap +msgid "B<3>" +msgstr "B<3>" + +#. type: Plain text +#: watch.1:167 +msgid "Replacing child process stdout with write side pipe failed." +msgstr "Nie udało się zastąpić standardowego wyjścia procesu potomnego stroną piszącą potoku." + +#. type: TP +#: watch.1:167 +#, no-wrap +msgid "B<4>" +msgstr "B<4>" + +#. type: Plain text +#: watch.1:170 +msgid "Command execution failed." +msgstr "Nie udało się uruchomić polecenia." + +#. type: TP +#: watch.1:170 +#, no-wrap +msgid "B<5>" +msgstr "B<5>" + +#. type: Plain text +#: watch.1:173 +msgid "Closing child process write pipe failed." +msgstr "Nie udało się zamknąć potoku piszącego procesu potomnego." + +#. type: TP +#: watch.1:173 +#, no-wrap +msgid "B<7>" +msgstr "B<7>" + +#. type: Plain text +#: watch.1:176 +msgid "IPC pipe creation failed." +msgstr "Nie udało się utworzyć potoku IPC." + +#. type: TP +#: watch.1:176 +#, no-wrap +msgid "B<8>" +msgstr "B<8>" + +#. type: Plain text +#: watch.1:181 +msgid "Getting child process return value with B(2) failed, or command exited up on error." +msgstr "Nie udało się uzyskać kodu powrotu procesu potomnego przez B(2) lub polecenie zakończyło się błędem." + +#. type: TP +#: watch.1:181 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: watch.1:184 +msgid "The watch will propagate command exit status as child exit status." +msgstr "Program watch propaguje kod wyjścia polecenia jako kod wyjścia potomka." + +#. type: Plain text +#: watch.1:209 +msgid "The original B was written by E<.UR rembo@\\:unisoft.\\:com> Tony Rems E<.UE> in 1991, with mods and corrections by Francois Pinard. It was reworked and new features added by E<.UR mkc@\\:acm.\\:org> Mike Coleman E<.UE> in 1999. The beep, exec, and error handling features were added by E<.UR morty@\\:frakir.\\:org> Morty Abzug E<.UE> in 2008. On a not so dark and stormy morning in March of 2003, E<.UR asd@\\:suespammers.\\:org> Anthony DeRobertis E<.UE> got sick of his watches that should update every minute eventually updating many seconds after the minute started, and added microsecond precision. Unicode support was added in 2009 by E<.UR procps@\\:rrod.\\:net> Jarrod Lowe E<.UE>" +msgstr "Oryginalny program B napisał E<.UR rembo@\\:unisoft.\\:com> Tony Rems E<.UE> w roku 1991, z modyfikacjami i poprawkami autorstwa Francoisa Pinarda. Następnie przepisał go dodając nowe opcje E<.UR mkc@\\:acm.\\:org> Mike Coleman E<.UE> w 1999. Opcje sygnału dźwiękowego, uruchamiania przez exec oraz obsługi błędów dodał E<.UR morty@\\:frakir.\\:org> Morty Abzug E<.UE> w 2008. Pewnego niezbyt ciemnego i burzowego poranka w marcu 2003 E<.UR asd@\\:suespammers.\\:org> Anthony DeRobertis E<.UE> miał dość obserwacji, które powinny uruchamiać się co minutę, uaktualniających się wiele sekund po początkowej minucie, i dodał precyzję mikrosekundową. Obsługę Unicode dodał w 2009 roku E<.UR procps@\\:rrod.\\:net> Jarrod Lowe E<.UE>" diff --git a/po/de.po b/po/de.po index 8e92fdcb..0845b49a 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: procps-ng-3.3.10-rc1\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" "Last-Translator: Mario Blättermann \n" "Language-Team: German \n" @@ -18,7 +18,7 @@ msgstr "" "X-Generator: Poedit 1.5.4\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 msgid " %s [options]\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" 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" 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." msgstr "" -#: free.c:328 +#: free.c:329 #, c-format msgid "seconds argument `%s' failed" msgstr "Sekunden-Argument »%s« fehlgeschlagen " -#: free.c:331 +#: free.c:332 #, c-format msgid "seconds argument `%s' is not positive number" msgstr "Sekunden-Argument »%s« ist keine positive Zahl" -#: free.c:337 +#: free.c:338 msgid "failed to parse count argument" msgstr "Anzahl im Argument konnte nicht verarbeitet werden" -#: free.c:340 +#: free.c:341 #, c-format msgid "failed to parse count argument: '%s'" msgstr "Anzahl im Argument konnte nicht verarbeitet werden: »%s«" -#: free.c:361 +#: free.c:362 #, c-format msgid "" " total used free shared buffers " @@ -142,7 +142,7 @@ msgstr "" " gesamt benutzt frei gemeins. Puffer " "Cache verfügbar" -#: free.c:363 +#: free.c:364 #, c-format msgid "" " total used free shared buff/cache " @@ -151,23 +151,23 @@ msgstr "" " gesamt benutzt frei gemns. Puffer/Cache " "verfügbar" -#: free.c:366 +#: free.c:367 msgid "Mem:" msgstr "Speicher:" -#: free.c:386 +#: free.c:387 msgid "Low:" msgstr "Niedrig:" -#: free.c:392 +#: free.c:393 msgid "High:" msgstr "Hoch:" -#: free.c:399 +#: free.c:400 msgid "Swap:" msgstr "Swap:" -#: free.c:406 +#: free.c:407 msgid "Total:" msgstr "Gesamt:" @@ -323,11 +323,11 @@ msgstr "Keine Zahl: %s" msgid "Error reading reference namespace information\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" msgstr "Interner Fehler" -#: pgrep.c:878 +#: pgrep.c:876 #, c-format msgid "" "-L without -F makes no sense\n" @@ -336,7 +336,7 @@ msgstr "" "-L ohne -F ergibt keinen Sinn.\n" "Rufen Sie »%s --help« auf für weitere Informationen." -#: pgrep.c:885 +#: pgrep.c:883 #, c-format msgid "" "pidfile not valid\n" @@ -345,7 +345,7 @@ msgstr "" "pidfile ist ungültig\n" "Rufen Sie »%s --help« auf für weitere Informationen." -#: pgrep.c:893 +#: pgrep.c:891 #, c-format msgid "" "only one pattern can be provided\n" @@ -354,7 +354,7 @@ msgstr "" "nur ein Muster kann angegeben werden\n" "Rufen Sie »%s --help« auf für weitere Informationen." -#: pgrep.c:897 +#: pgrep.c:895 #, c-format msgid "" "no matching criteria specified\n" @@ -363,12 +363,12 @@ msgstr "" "keine Übereinstimmungskriterien angegeben\n" "Rufen Sie »%s --help« auf für weitere Informationen." -#: pgrep.c:924 +#: pgrep.c:922 #, c-format msgid "%s killed (pid %lu)\n" msgstr "%s abgewürgt (PID %lu)\n" -#: pgrep.c:930 +#: pgrep.c:928 #, c-format msgid "killing pid %ld failed" msgstr "Abwürgen von Prozess-ID %ld fehlgeschlagen" @@ -399,7 +399,7 @@ msgstr "" " -o, --omit-pid Prozesse mit den angegebenen PID(s)\n" " auslassen\n" -#: pidof.c:270 +#: pidof.c:268 #, c-format msgid "illegal omit pid value (%s)!\n" msgstr "Ungültiger Wert für auszulassende PID (%s)!\n" @@ -553,8 +553,8 @@ msgstr " gesamt %16ldK\n" msgid " total %8ldK\n" msgstr " gesamt %8ldK\n" -#: pmap.c:767 skill.c:502 skill.c:535 skill.c:624 tload.c:128 tload.c:133 -#: vmstat.c:959 vmstat.c:968 watch.c:707 +#: 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:708 msgid "failed to parse argument" 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" 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 msgid " %s [options] pid...\n" msgstr " %s [Optionen] pid …\n" -#: pwdx.c:114 +#: pwdx.c:113 #, c-format msgid "invalid process id: %s" msgstr "ungültige Prozess‐ID: %s" @@ -1715,56 +1715,56 @@ msgstr "" "Negative Prioritätskennziffern sind Benutzern mit Administratorrechten\n" "vorbehalten.\n" -#: skill.c:462 +#: skill.c:457 #, c-format msgid "unknown signal name %s" msgstr "Unbekannter Signalname %s" -#: skill.c:482 +#: skill.c:477 #, c-format msgid "invalid argument %c" msgstr "ungültiges Argument %c" -#: skill.c:515 +#: skill.c:513 #, c-format msgid "something at line %d\n" msgstr "etwas in Zeile %d\n" -#: skill.c:538 +#: skill.c:536 #, c-format msgid "priority %lu out of range" msgstr "Priorität %lu ist außerhalb des Wertebereiches" -#: skill.c:653 +#: skill.c:649 #, c-format msgid "invalid pid number %s" msgstr "ungültige PID-Nummer %s" -#: skill.c:657 +#: skill.c:653 msgid "error reading reference namespace information" msgstr "Fehler beim Lesen der Informationen für Referenz-Namensraum" -#: skill.c:665 +#: skill.c:661 msgid "invalid namespace list" msgstr "Ungültige Namensraumliste" -#: skill.c:703 +#: skill.c:699 msgid "no process selection criteria" msgstr "Keine Kriterien zur Prozessauswahl" -#: skill.c:706 +#: skill.c:702 msgid "general flags may not be repeated" 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" 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" msgstr "-v ergibt keinen Sinn mit -i und -f" -#: skill.c:756 +#: skill.c:752 #, c-format msgid "skill: \"%s\" is not supported\n" msgstr "skill: »%s« wird nicht unterstützt\n" @@ -2120,7 +2120,7 @@ msgid "Effective User Id" msgstr "Effektive Benutzer‐ID" #. Translation Hint: maximum 'USER' = 7 -#: top/top_nls.c:133 w.c:590 +#: top/top_nls.c:133 w.c:587 msgid "USER" msgstr "USER" @@ -3422,7 +3422,7 @@ msgstr "" #: top/top_nls.c:646 #, c-format 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 to ~1select~5 an option; 'q' or to " "~1end~5 !\n" "Options~2: ~1%s\n" @@ -3431,7 +3431,7 @@ msgstr "" #: top/top_nls.c:651 #, c-format 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" "Or~2: to ~1select another~5; 'q' or 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" msgstr "Partition wurde nicht gefunden\n" -#: watch.c:89 +#: watch.c:90 #, c-format msgid " %s [options] command\n" msgstr " %s [Optionen] Befehl\n" -#: watch.c:91 +#: watch.c:92 msgid " -b, --beep beep if command has a non-zero exit\n" msgstr "" " -e, --errexit Warnklang abspielen, wenn die Ausgabe des\n" " Befehls nicht Null ist\n" -#: watch.c:92 +#: watch.c:93 msgid " -c, --color interpret ANSI color and style sequences\n" msgstr " -c, --color ANSI-Farb- und Stilsequenzen interpretieren\n" -#: watch.c:93 +#: watch.c:94 msgid "" " -d, --differences[=]\n" " highlight changes between updates\n" @@ -3953,181 +3953,164 @@ msgstr "" " Änderungen zwischen Aktualisierungen\n" " hervorheben\n" -#: watch.c:95 +#: watch.c:96 msgid " -e, --errexit exit if command has a non-zero exit\n" msgstr "" " -e, --errexit abbrechen, wenn die Ausgabe des Befehls\n" " nicht Null ist\n" -#: watch.c:96 +#: watch.c:97 msgid " -g, --chgexit exit when output from command changes\n" msgstr "" " -g, --chgexit beenden, wenn sich die Ausgabe des Befehls\n" " ändert\n" -#: watch.c:97 +#: watch.c:98 msgid " -n, --interval seconds to wait between updates\n" msgstr "" " -n, --interval Wartezeit zwischen Aktualisierungen\n" " in Sekunden\n" -#: watch.c:98 +#: watch.c:99 msgid " -p, --precise attempt run command in precise intervals\n" msgstr "" " -p, --precise versuchen, den Befehl in präzisen\n" " Intervallen auszuführen\n" -#: watch.c:99 +#: watch.c:100 msgid " -t, --no-title turn off header\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" msgstr "" " -x, --exec auszuführenden Befehl übergeben anstelle\n" " von »sh -c«\n" -#: watch.c:103 +#: watch.c:104 msgid " -v, --version output version information and exit\n" msgstr " -v, --version Versionsinformation anzeigen und beenden\n" -#: watch.c:375 +#: watch.c:376 #, c-format msgid "Every %.1fs: " msgstr "Alle %.1fs: " -#: watch.c:436 +#: watch.c:437 msgid "unable to create IPC pipes" msgstr "IPC-Pipes konnten nicht angelegt werden" -#: watch.c:446 +#: watch.c:447 msgid "unable to fork process" msgstr "Prozess kann nicht geforkt werden" -#: watch.c:451 +#: watch.c:452 msgid "dup2 failed" msgstr "dup2 fehlgeschlagen" -#: watch.c:458 +#: watch.c:459 #, c-format msgid "unable to execute '%s'" msgstr "»%s« kann nicht ausgeführt werden" -#: watch.c:475 +#: watch.c:476 msgid "fdopen" msgstr "fdopen" -#: watch.c:621 +#: watch.c:622 msgid "waitpid" msgstr "waitpid" -#: watch.c:629 +#: watch.c:630 msgid "command exit with a non-zero status, press a key to exit" msgstr "" "der Befehl wurde mit einem von Null verschiedenen Exit-Status beendet, " "drücken Sie eine Taste zum Beenden" -#: watch.c:754 +#: watch.c:755 #, c-format msgid "unicode handling error\n" msgstr "Unicode-Verarbeitungsfehler\n" -#: watch.c:760 +#: watch.c:761 #, c-format msgid "unicode handling error (malloc)\n" msgstr "Unicode-Verarbeitungsfehler (malloc)\n" -#: w.c:240 w.c:255 +#: w.c:241 w.c:256 #, c-format msgid " %2ludays" msgstr " %2lu Tage" #. Translation Hint: Minutes:Seconds #. Translation Hint: Hours:Minutes -#: w.c:249 w.c:259 +#: w.c:250 w.c:260 #, c-format msgid " %2lu:%02um" msgstr " %2lu:%02u m" #. Translation Hint: Seconds:Centiseconds -#: w.c:267 +#: w.c:268 #, c-format msgid " %2lu.%02us" msgstr " %2lu.%02u s" -#: w.c:449 +#: w.c:451 msgid " -h, --no-header do not print header\n" msgstr " -h, --no-header keinen Header ausgeben\n" -#: w.c:450 +#: w.c:452 msgid " -u, --no-current ignore current process username\n" msgstr " -u, --no-current Benutzername des aktuellen Prozesses ignorieren\n" -#: w.c:451 +#: w.c:453 msgid " -s, --short short format\n" msgstr " -s, --short Kurzformat\n" -#: w.c:452 +#: w.c:454 msgid " -f, --from show remote hostname field\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" msgstr " -o, --old-style Ausgabe im alten Stil\n" -#: w.c:454 +#: w.c:456 msgid "" " -i, --ip-addr display IP address instead of hostname (if possible)\n" msgstr "" " -i, --ip-addr IP-Adresse anstelle des Rechnernamens anzeigen\n" " (falls möglich)\n" -#: w.c:551 +#: w.c:553 #, c-format msgid "" "User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n" msgstr "" -#: w.c:561 +#: w.c:563 #, c-format msgid "" "from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n" 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 #. * headers. Try to keep alignment intact. -#: w.c:590 +#: w.c:587 #, c-format msgid "%-*s TTY " msgstr "%-*s TTY " -#: w.c:592 +#: w.c:589 msgid "FROM" msgstr "VON" -#: w.c:594 +#: w.c:591 #, c-format msgid " LOGIN@ IDLE JCPU PCPU WHAT\n" msgstr "" -#: w.c:596 +#: w.c:593 #, c-format msgid " IDLE WHAT\n" msgstr "" @@ -4173,3 +4156,14 @@ msgstr "" #, c-format msgid "%s from %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" diff --git a/po/fr.po b/po/fr.po index 0da5b738..3ce1535b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: procps-ng 3.3.10-rc1\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" "Last-Translator: Stéphane Aulery \n" "Language-Team: French \n" @@ -32,7 +32,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\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 msgid " %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" 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" 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." msgstr "" -#: free.c:328 +#: free.c:329 #, c-format msgid "seconds argument `%s' failed" msgstr "l'argument des secondes « %s » n'est pas valable" -#: free.c:331 +#: free.c:332 #, c-format msgid "seconds argument `%s' is not positive number" msgstr "l'argument des secondes « %s » n'est pas un nombre positif" -#: free.c:337 +#: free.c:338 msgid "failed to parse count argument" msgstr "l'argument du nombre de répétitions ne peut pas être décodé" -#: free.c:340 +#: free.c:341 #, c-format msgid "failed to parse count argument: '%s'" msgstr "échec du décodage de l'argument du nombre de répétitions: « %s »" -#: free.c:361 +#: free.c:362 #, c-format msgid "" " total used free shared buffers " @@ -157,7 +157,7 @@ msgstr "" " total utilisé libre partagé tampons " "cache disponible" -#: free.c:363 +#: free.c:364 #, c-format msgid "" " total used free shared buff/cache " @@ -166,23 +166,23 @@ msgstr "" " total utilisé libre partagé tamp/cache " "disponible" -#: free.c:366 +#: free.c:367 msgid "Mem:" msgstr "Mem:" -#: free.c:386 +#: free.c:387 msgid "Low:" msgstr "Basse:" -#: free.c:392 +#: free.c:393 msgid "High:" msgstr "Haute:" -#: free.c:399 +#: free.c:400 msgid "Swap:" msgstr "Partition d'échange:" -#: free.c:406 +#: free.c:407 msgid "Total:" msgstr "Total:" @@ -344,11 +344,11 @@ msgid "Error reading reference namespace information\n" msgstr "" "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" msgstr "erreur interne" -#: pgrep.c:878 +#: pgrep.c:876 #, c-format msgid "" "-L without -F makes no sense\n" @@ -357,7 +357,7 @@ msgstr "" "-L sans -F n'a pas de sens\n" "Essayez « %s --help » pour plus d'informations." -#: pgrep.c:885 +#: pgrep.c:883 #, c-format msgid "" "pidfile not valid\n" @@ -366,7 +366,7 @@ msgstr "" "fichier pid pas valable\n" "Essayez « %s --help » pour plus d'informations." -#: pgrep.c:893 +#: pgrep.c:891 #, c-format msgid "" "only one pattern can be provided\n" @@ -375,7 +375,7 @@ msgstr "" "fournissez un seul motif à la fois\n" "Essayez « %s --help » pour plus d'informations." -#: pgrep.c:897 +#: pgrep.c:895 #, c-format msgid "" "no matching criteria specified\n" @@ -384,12 +384,12 @@ msgstr "" "aucun critère correspondant spécifié\n" "Essayez « %s --help » pour plus d'informations." -#: pgrep.c:924 +#: pgrep.c:922 #, c-format msgid "%s killed (pid %lu)\n" msgstr "%s tué (pid %lu)\n" -#: pgrep.c:930 +#: pgrep.c:928 #, c-format msgid "killing pid %ld failed" msgstr "le pid %ld n'a pu être tué" @@ -418,7 +418,7 @@ msgstr "" msgid " -o, --omit-pid omit processes with PID\n" msgstr " -o, --omit-pid omet les processus avec ce PID\n" -#: pidof.c:270 +#: pidof.c:268 #, c-format msgid "illegal omit pid value (%s)!\n" msgstr "valeur de pid à omettre invalide (%s) !\n" @@ -570,8 +570,8 @@ msgstr " total %16ldK\n" msgid " 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 -#: vmstat.c:959 vmstat.c:968 watch.c:707 +#: 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:708 msgid "failed to parse 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" msgstr "-L comme H/-m/m mais sans PID/PGID/SID/SESS à suivre pour NLWP" -#: pwdx.c:38 +#: pwdx.c:37 #, c-format msgid " %s [options] pid...\n" msgstr " %s [options] pid…\n" -#: pwdx.c:114 +#: pwdx.c:113 #, c-format msgid "invalid process id: %s" msgstr "ID de processus invalide: %s" @@ -1732,57 +1732,57 @@ msgstr "" "rapide).\n" "Les priorités négatives sont accessibles aux seuls administrateurs.\n" -#: skill.c:462 +#: skill.c:457 #, c-format msgid "unknown signal name %s" msgstr "nom de signal %s inconnu" -#: skill.c:482 +#: skill.c:477 #, c-format msgid "invalid argument %c" msgstr "argument %c invalide" -#: skill.c:515 +#: skill.c:513 #, c-format msgid "something at line %d\n" msgstr "quelque chose à la ligne %d\n" -#: skill.c:538 +#: skill.c:536 #, c-format msgid "priority %lu out of range" msgstr "priorité %lu hors limites" -#: skill.c:653 +#: skill.c:649 #, c-format msgid "invalid pid number %s" msgstr "numéro de pid %s invalide" -#: skill.c:657 +#: skill.c:653 msgid "error reading reference namespace information" msgstr "" "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" msgstr "liste d'espace de noms invalide" -#: skill.c:703 +#: skill.c:699 msgid "no process selection criteria" msgstr "aucun critère de sélection de processus" -#: skill.c:706 +#: skill.c:702 msgid "general flags may not be repeated" 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" 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" msgstr "-v n'a pas de sens avec -i et -f" -#: skill.c:756 +#: skill.c:752 #, c-format msgid "skill: \"%s\" is not supported\n" msgstr "compétence: « %s » n'est pas supporté\n" @@ -2142,7 +2142,7 @@ msgid "Effective User Id" msgstr "ID util. effectif" #. Translation Hint: maximum 'USER' = 7 -#: top/top_nls.c:133 w.c:590 +#: top/top_nls.c:133 w.c:587 msgid "USER" 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" #: top/top_nls.c:646 -#, c-format +#, fuzzy, c-format 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 to ~1select~5 an option; 'q' or to " "~1end~5 !\n" "Options~2: ~1%s\n" @@ -3582,9 +3582,9 @@ msgstr "" "Options~2: ~1%s\n" #: top/top_nls.c:651 -#, c-format +#, fuzzy, c-format 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" "Or~2: to ~1select another~5; 'q' or 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" msgstr "la partition n'a pas été trouvée\n" -#: watch.c:89 +#: watch.c:90 #, c-format msgid " %s [options] command\n" msgstr " %s [options] commande\n" -#: watch.c:91 +#: watch.c:92 msgid " -b, --beep beep if command has a non-zero exit\n" msgstr "" " -b, --beep émet un bip si la commande sort avec un code non " "nul\n" -#: watch.c:92 +#: watch.c:93 msgid " -c, --color interpret ANSI color and style sequences\n" msgstr "" " -c, --color interprète les séquences de couleurs et de styles " "ANSI\n" -#: watch.c:93 +#: watch.c:94 msgid "" " -d, --differences[=]\n" " highlight changes between updates\n" @@ -4109,132 +4109,132 @@ msgstr "" " met en évidence les changements entre mises à " "jours\n" -#: watch.c:95 +#: watch.c:96 msgid " -e, --errexit exit if command has a non-zero exit\n" msgstr "" " -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" msgstr "" " -g, --chgexit termine quand la sortie de la commande change\n" -#: watch.c:97 +#: watch.c:98 msgid " -n, --interval seconds to wait between updates\n" msgstr " -n, --interval secondes de délai entre mises à jours\n" -#: watch.c:98 +#: watch.c:99 msgid " -p, --precise attempt run command in precise intervals\n" msgstr "" " -p, --precise essaie d'exécuter la commande à intervalles " "réguliers\n" -#: watch.c:99 +#: watch.c:100 msgid " -t, --no-title turn off header\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" msgstr "" " -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" msgstr " -v, --version affiche les informations de version et sort\n" -#: watch.c:375 +#: watch.c:376 #, c-format msgid "Every %.1fs: " msgstr "Toutes les %.1lfs: " -#: watch.c:436 +#: watch.c:437 msgid "unable to create IPC pipes" msgstr "impossible de créer les tubes IPC" -#: watch.c:446 +#: watch.c:447 msgid "unable to fork process" msgstr "impossible de clôner le processus" -#: watch.c:451 +#: watch.c:452 msgid "dup2 failed" msgstr "dup2 a échoué" -#: watch.c:458 +#: watch.c:459 #, c-format msgid "unable to execute '%s'" msgstr "impossible d'exécuter « %s »" -#: watch.c:475 +#: watch.c:476 msgid "fdopen" msgstr "fdopen" -#: watch.c:621 +#: watch.c:622 msgid "waitpid" msgstr "waitpid" -#: watch.c:629 +#: watch.c:630 msgid "command exit with a non-zero status, press a key to exit" msgstr "" "la commande s'est terminée avec un statut non nul, pressez une touche pour " "terminer" -#: watch.c:754 +#: watch.c:755 #, c-format msgid "unicode handling error\n" msgstr "erreur de gestion de unicode\n" -#: watch.c:760 +#: watch.c:761 #, c-format msgid "unicode handling error (malloc)\n" msgstr "erreur de gestion de unicode (malloc)\n" -#: w.c:240 w.c:255 +#: w.c:241 w.c:256 #, c-format msgid " %2ludays" msgstr "%2lujours" #. Translation Hint: Minutes:Seconds #. Translation Hint: Hours:Minutes -#: w.c:249 w.c:259 +#: w.c:250 w.c:260 #, c-format msgid " %2lu:%02um" msgstr " %2lu:%02um" #. Translation Hint: Seconds:Centiseconds -#: w.c:267 +#: w.c:268 #, c-format msgid " %2lu.%02us" msgstr " %2lu.%02us" -#: w.c:449 +#: w.c:451 msgid " -h, --no-header do not print header\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" msgstr "" " -u, --no-current ignore le nom d'utilisateur du processus courant\n" -#: w.c:451 +#: w.c:453 msgid " -s, --short short format\n" msgstr " -s, --short format court\n" -#: w.c:452 +#: w.c:454 msgid " -f, --from show remote hostname field\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" msgstr " -o, --old-style sortie dans l'ancien style\n" -#: w.c:454 +#: w.c:456 msgid "" " -i, --ip-addr display IP address instead of hostname (if possible)\n" msgstr "" " -i, --ip-addr affiche l'adresse IP au lieu du nom d'hôte (si " "possible)\n" -#: w.c:551 +#: w.c:553 #, c-format msgid "" "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 " "entre 8 et %i, ignoré.\n" -#: w.c:561 +#: w.c:563 #, c-format msgid "" "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 " "%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 #. * headers. Try to keep alignment intact. -#: w.c:590 +#: w.c:587 #, c-format msgid "%-*s TTY " msgstr "%-*s TTY " -#: w.c:592 +#: w.c:589 msgid "FROM" msgstr "DE " -#: w.c:594 +#: w.c:591 #, c-format msgid " LOGIN@ IDLE JCPU PCPU WHAT\n" msgstr " LOGIN@ IDLE JCPU PCPU QUOI\n" -#: w.c:596 +#: w.c:593 #, c-format msgid " IDLE WHAT\n" msgstr " IDLE QUOI\n" @@ -4336,6 +4319,17 @@ msgstr "%s de %s\n" #~ msgid "alternate System.map file must follow 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 "" #~ " -o, --old use old format (without -/+buffers/cache line)\n" #~ msgstr "" diff --git a/po/pl.po b/po/pl.po index c32fbe92..5316bf5a 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: procps-ng-3.3.10-rc1\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" "Last-Translator: Jakub Bogusz \n" "Language-Team: Polish \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\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 msgid " %s [options]\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" 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" 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." msgstr "" -#: free.c:328 +#: free.c:329 #, c-format msgid "seconds argument `%s' failed" msgstr "niezrozumiały argument liczby sekund `%s'" -#: free.c:331 +#: free.c:332 #, c-format msgid "seconds argument `%s' is not positive number" msgstr "argument liczby sekund `%s' nie jest liczbą dodatnią" -#: free.c:337 +#: free.c:338 msgid "failed to parse count argument" msgstr "niezrozumiały argument liczby powtórzeń" -#: free.c:340 +#: free.c:341 #, c-format msgid "failed to parse count argument: '%s'" msgstr "niezrozumiały argument liczby powtórzeń: '%s'" -#: free.c:361 +#: free.c:362 #, c-format msgid "" " total used free shared buffers " @@ -139,7 +139,7 @@ msgstr "" " razem użyte wolne dzielone bufory w " "cache dostępne" -#: free.c:363 +#: free.c:364 #, c-format msgid "" " total used free shared buff/cache " @@ -148,23 +148,23 @@ msgstr "" " razem użyte wolne dzielone buf/cache " "dostępne" -#: free.c:366 +#: free.c:367 msgid "Mem:" msgstr "Pamięć:" -#: free.c:386 +#: free.c:387 msgid "Low:" msgstr "Niska:" -#: free.c:392 +#: free.c:393 msgid "High:" msgstr "Wysoka:" -#: free.c:399 +#: free.c:400 msgid "Swap:" msgstr "Wymiana:" -#: free.c:406 +#: free.c:407 msgid "Total:" msgstr "Razem:" @@ -322,11 +322,11 @@ msgstr "nie podano liczby: %s" msgid "Error reading reference namespace information\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" msgstr "błąd wewnętrzny" -#: pgrep.c:878 +#: pgrep.c:876 #, c-format msgid "" "-L without -F makes no sense\n" @@ -335,7 +335,7 @@ msgstr "" "-L bez -F nie ma sensu\n" "`%s --help' pokaże więcej informacji." -#: pgrep.c:885 +#: pgrep.c:883 #, c-format msgid "" "pidfile not valid\n" @@ -344,7 +344,7 @@ msgstr "" "nieprawidłowy plik pid\n" "`%s --help' pokaże więcej informacji." -#: pgrep.c:893 +#: pgrep.c:891 #, c-format msgid "" "only one pattern can be provided\n" @@ -353,7 +353,7 @@ msgstr "" "można podać tylko jeden wzorzec\n" "`%s --help' pokaże więcej informacji." -#: pgrep.c:897 +#: pgrep.c:895 #, c-format msgid "" "no matching criteria specified\n" @@ -362,12 +362,12 @@ msgstr "" "nie podano kryterium dopasowania\n" "`%s --help' pokaże więcej informacji." -#: pgrep.c:924 +#: pgrep.c:922 #, c-format msgid "%s killed (pid %lu)\n" msgstr "zabito %s (pid %lu)\n" -#: pgrep.c:930 +#: pgrep.c:928 #, c-format msgid "killing pid %ld failed" msgstr "zabicie PID-u %ld nie powiodło się" @@ -395,7 +395,7 @@ msgstr "" msgid " -o, --omit-pid omit processes with PID\n" msgstr " -o, --omit-pid pominięcie procesów o podanych PID-ach\n" -#: pidof.c:270 +#: pidof.c:268 #, c-format msgid "illegal omit pid value (%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" msgstr " razem %8ldK\n" -#: pmap.c:767 skill.c:502 skill.c:535 skill.c:624 tload.c:128 tload.c:133 -#: vmstat.c:959 vmstat.c:968 watch.c:707 +#: 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:708 msgid "failed to parse 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 "" "-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 msgid " %s [options] pid...\n" msgstr "%s [opcje] pid...\n" -#: pwdx.c:114 +#: pwdx.c:113 #, c-format msgid "invalid process id: %s" msgstr "błędny identyfikator procesu: %s" @@ -1692,56 +1692,56 @@ msgstr "" "Numer priorytetu to liczba od +20 (najwolniej) do -20 (najszybciej).\n" "Liczby ujemne są zarezerwowane dla administratorów.\n" -#: skill.c:462 +#: skill.c:457 #, c-format msgid "unknown signal name %s" msgstr "nieznana nazwa sygnału %s" -#: skill.c:482 +#: skill.c:477 #, c-format msgid "invalid argument %c" msgstr "błędny argument %c" -#: skill.c:515 +#: skill.c:513 #, c-format msgid "something at line %d\n" msgstr "coś w linii %d\n" -#: skill.c:538 +#: skill.c:536 #, c-format msgid "priority %lu out of range" msgstr "priorytet %lu jest spoza zakresu" -#: skill.c:653 +#: skill.c:649 #, c-format msgid "invalid pid number %s" msgstr "błędny numer pid %s" -#: skill.c:657 +#: skill.c:653 msgid "error reading reference namespace information" msgstr "błąd odczytu informacji o przestrzeni nazw odniesienia" -#: skill.c:665 +#: skill.c:661 msgid "invalid namespace list" msgstr "błędna lista przestrzeni nazw" -#: skill.c:703 +#: skill.c:699 msgid "no process selection criteria" msgstr "nie podano kryteriów wyboru" -#: skill.c:706 +#: skill.c:702 msgid "general flags may not be repeated" msgstr "flag ogólnych nie można powtarzać" -#: skill.c:709 +#: skill.c:705 msgid "-i makes no sense with -v, -f, and -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" msgstr "-v nie ma sensu z -i ani -f" -#: skill.c:756 +#: skill.c:752 #, c-format msgid "skill: \"%s\" is not supported\n" msgstr "skill: \"%s\" nie jest obsługiwany\n" @@ -2097,7 +2097,7 @@ msgid "Effective User Id" msgstr "Id. użytkownika efektywnego" #. Translation Hint: maximum 'USER' = 7 -#: top/top_nls.c:133 w.c:590 +#: top/top_nls.c:133 w.c:587 msgid "USER" 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" #: top/top_nls.c:646 -#, c-format +#, fuzzy, c-format 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 to ~1select~5 an option; 'q' or to " "~1end~5 !\n" "Options~2: ~1%s\n" @@ -3524,9 +3524,9 @@ msgstr "" "Opcje~2: ~1%s\n" #: top/top_nls.c:651 -#, c-format +#, fuzzy, c-format 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" "Or~2: to ~1select another~5; 'q' or 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" msgstr "nie znaleziono partycji\n" -#: watch.c:89 +#: watch.c:90 #, c-format msgid " %s [options] command\n" msgstr " %s [opcje] polecenie\n" -#: watch.c:91 +#: watch.c:92 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" -#: watch.c:92 +#: watch.c:93 msgid " -c, --color interpret ANSI color and style sequences\n" msgstr "" " -c, --color interpretowanie sekwencji kolorów i styli ANSI\n" -#: watch.c:93 +#: watch.c:94 msgid "" " -d, --differences[=]\n" " highlight changes between updates\n" @@ -4045,132 +4045,132 @@ msgstr "" " -d, --differences[=]\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" 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" msgstr "" " -g, --chgexit zakończenie, jeśli wyjście polecenia się zmieni\n" -#: watch.c:97 +#: watch.c:98 msgid " -n, --interval seconds to wait between updates\n" msgstr "" " -n, --interval liczba sekund do odczekania między uaktualnieniami\n" -#: watch.c:98 +#: watch.c:99 msgid " -p, --precise attempt run command in precise intervals\n" msgstr "" " -p, --precise próba uruchamiania polecenia w dokładnych " "odstępach\n" -#: watch.c:99 +#: watch.c:100 msgid " -t, --no-title turn off header\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" msgstr "" " -x, --exec przekazanie polecenia do uruchomienia zamiast \"sh -" "c\"\n" -#: watch.c:103 +#: watch.c:104 msgid " -v, --version output version information and exit\n" msgstr " -v, --version wypisanie informacji o wejściu i zakończenie\n" -#: watch.c:375 +#: watch.c:376 #, c-format msgid "Every %.1fs: " msgstr "Co %.1fs: " -#: watch.c:436 +#: watch.c:437 msgid "unable to create IPC pipes" msgstr "nie można utworzyć potoków IPC" -#: watch.c:446 +#: watch.c:447 msgid "unable to fork process" msgstr "nie można rozgałęzić procesu" -#: watch.c:451 +#: watch.c:452 msgid "dup2 failed" msgstr "dup2 nie powiodło się" -#: watch.c:458 +#: watch.c:459 #, c-format msgid "unable to execute '%s'" msgstr "nie można uruchomić '%s'" -#: watch.c:475 +#: watch.c:476 msgid "fdopen" msgstr "fdopen" -#: watch.c:621 +#: watch.c:622 msgid "waitpid" msgstr "waitpid" -#: watch.c:629 +#: watch.c:630 msgid "command exit with a non-zero status, press a key to exit" msgstr "" "polecenie zakończyło się kodem błędnym; proszę nacisnąć klawisz, aby " "zakończyć" -#: watch.c:754 +#: watch.c:755 #, c-format msgid "unicode handling error\n" msgstr "błąd obsługi unikodu\n" -#: watch.c:760 +#: watch.c:761 #, c-format msgid "unicode handling error (malloc)\n" msgstr "błąd obsługi unikodu (malloc)\n" -#: w.c:240 w.c:255 +#: w.c:241 w.c:256 #, c-format msgid " %2ludays" msgstr " %2ludni" #. Translation Hint: Minutes:Seconds #. Translation Hint: Hours:Minutes -#: w.c:249 w.c:259 +#: w.c:250 w.c:260 #, c-format msgid " %2lu:%02um" msgstr " %2lu:%02um" #. Translation Hint: Seconds:Centiseconds -#: w.c:267 +#: w.c:268 #, c-format msgid " %2lu.%02us" msgstr " %2lu.%02us" -#: w.c:449 +#: w.c:451 msgid " -h, --no-header do not print header\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" msgstr " -u, --no-current pominiecie użytkownika bieżącego procesu\n" -#: w.c:451 +#: w.c:453 msgid " -s, --short short format\n" msgstr " -s, --short format krótki\n" -#: w.c:452 +#: w.c:454 msgid " -f, --from show remote hostname field\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" msgstr " -o, --old-style wyjście w starym stylu\n" -#: w.c:454 +#: w.c:456 msgid "" " -i, --ip-addr display IP address instead of hostname (if possible)\n" msgstr "" " -i, --ip-addr wyświetlanie adresów IP zamiast nazw (jeśli to " "możliwe)\n" -#: w.c:551 +#: w.c:553 #, c-format msgid "" "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, " "zignorowano.\n" -#: w.c:561 +#: w.c:563 #, c-format msgid "" "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, " "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 #. * headers. Try to keep alignment intact. -#: w.c:590 +#: w.c:587 #, c-format msgid "%-*s TTY " msgstr "%-*s TTY " -#: w.c:592 +#: w.c:589 msgid "FROM" msgstr "Z " -#: w.c:594 +#: w.c:591 #, c-format msgid " LOGIN@ IDLE JCPU PCPU WHAT\n" msgstr " ZAL.OD BEZCZ. JCPU PCPU CO\n" -#: w.c:596 +#: w.c:593 #, c-format msgid " IDLE WHAT\n" msgstr " BEZCZ. CO\n" @@ -4270,3 +4254,13 @@ msgstr "%s z pakietu %s\n" #~ msgid "alternate System.map file must follow N" #~ 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" diff --git a/po/procps-ng.pot b/po/procps-ng.pot index 98222d8e..471e4f8c 100644 --- a/po/procps-ng.pot +++ b/po/procps-ng.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\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" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\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 msgid " %s [options]\n" msgstr "" @@ -94,7 +94,7 @@ msgstr "" msgid " -w, --wide wide output\n" msgstr "" -#: free.c:95 w.c:456 +#: free.c:95 w.c:458 msgid " --help display this help and exit\n" msgstr "" @@ -102,91 +102,55 @@ msgstr "" msgid "Multiple unit options doesn't make sense." msgstr "" -#: free.c:328 +#: free.c:329 #, c-format msgid "seconds argument `%s' failed" msgstr "" -#: free.c:331 +#: free.c:332 #, c-format msgid "seconds argument `%s' is not positive number" msgstr "" -#: free.c:337 +#: free.c:338 msgid "failed to parse count argument" msgstr "" -#: free.c:340 +#: free.c:341 #, c-format msgid "failed to parse count argument: '%s'" msgstr "" -#: free.c:361 +#: free.c:362 #, c-format msgid " total used free shared buffers cache available" msgstr "" -#: free.c:363 +#: free.c:364 #, c-format msgid " total used free shared buff/cache available" msgstr "" -#: free.c:366 +#: free.c:367 msgid "Mem:" msgstr "" -#: free.c:386 +#: free.c:387 msgid "Low:" msgstr "" -#: free.c:392 +#: free.c:393 msgid "High:" msgstr "" -#: free.c:399 +#: free.c:400 msgid "Swap:" msgstr "" -#: free.c:406 +#: free.c:407 msgid "Total:" 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 msgid "write error" msgstr "" @@ -326,44 +290,44 @@ msgstr "" msgid "Error reading reference namespace information\n" 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" msgstr "" -#: pgrep.c:878 +#: pgrep.c:876 #, c-format msgid "" "-L without -F makes no sense\n" "Try `%s --help' for more information." msgstr "" -#: pgrep.c:885 +#: pgrep.c:883 #, c-format msgid "" "pidfile not valid\n" "Try `%s --help' for more information." msgstr "" -#: pgrep.c:893 +#: pgrep.c:891 #, c-format msgid "" "only one pattern can be provided\n" "Try `%s --help' for more information." msgstr "" -#: pgrep.c:897 +#: pgrep.c:895 #, c-format msgid "" "no matching criteria specified\n" "Try `%s --help' for more information." msgstr "" -#: pgrep.c:924 +#: pgrep.c:922 #, c-format msgid "%s killed (pid %lu)\n" msgstr "" -#: pgrep.c:930 +#: pgrep.c:928 #, c-format msgid "killing pid %ld failed" msgstr "" @@ -389,7 +353,7 @@ msgstr "" msgid " -o, --omit-pid omit processes with PID\n" msgstr "" -#: pidof.c:270 +#: pidof.c:268 #, c-format msgid "illegal omit pid value (%s)!\n" msgstr "" @@ -538,8 +502,8 @@ msgstr "" msgid " total %8ldK\n" msgstr "" -#: pmap.c:767 skill.c:502 skill.c:535 skill.c:624 tload.c:128 tload.c:133 -#: vmstat.c:959 vmstat.c:968 watch.c:707 +#: 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:708 msgid "failed to parse argument" msgstr "" @@ -1470,12 +1434,12 @@ msgstr "" msgid "-L with H/-m/m but no PID/PGID/SID/SESS for NLWP to follow" msgstr "" -#: pwdx.c:38 +#: pwdx.c:37 #, c-format msgid " %s [options] pid...\n" msgstr "" -#: pwdx.c:114 +#: pwdx.c:113 #, c-format msgid "invalid process id: %s" msgstr "" @@ -1603,56 +1567,56 @@ msgid "" "Negative priority numbers are restricted to administrative users.\n" msgstr "" -#: skill.c:462 +#: skill.c:457 #, c-format msgid "unknown signal name %s" msgstr "" -#: skill.c:482 +#: skill.c:477 #, c-format msgid "invalid argument %c" msgstr "" -#: skill.c:515 +#: skill.c:513 #, c-format msgid "something at line %d\n" msgstr "" -#: skill.c:538 +#: skill.c:536 #, c-format msgid "priority %lu out of range" msgstr "" -#: skill.c:653 +#: skill.c:649 #, c-format msgid "invalid pid number %s" msgstr "" -#: skill.c:657 +#: skill.c:653 msgid "error reading reference namespace information" msgstr "" -#: skill.c:665 +#: skill.c:661 msgid "invalid namespace list" msgstr "" -#: skill.c:703 +#: skill.c:699 msgid "no process selection criteria" msgstr "" -#: skill.c:706 +#: skill.c:702 msgid "general flags may not be repeated" msgstr "" -#: skill.c:709 +#: skill.c:705 msgid "-i makes no sense with -v, -f, and -n" msgstr "" -#: skill.c:711 +#: skill.c:707 msgid "-v makes no sense with -i and -f" msgstr "" -#: skill.c:756 +#: skill.c:752 #, c-format msgid "skill: \"%s\" is not supported\n" msgstr "" @@ -1992,7 +1956,7 @@ msgid "Effective User Id" msgstr "" #. Translation Hint: maximum 'USER' = 7 -#: top/top_nls.c:133 w.c:590 +#: top/top_nls.c:133 w.c:587 msgid "USER" msgstr "" @@ -3168,7 +3132,7 @@ msgstr "" #: top/top_nls.c:646 #, c-format 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 to ~1select~5 an option; 'q' or to ~1end~5 !\n" "Options~2: ~1%s\n" msgstr "" @@ -3176,7 +3140,7 @@ msgstr "" #: top/top_nls.c:651 #, c-format 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" "Or~2: to ~1select another~5; 'q' or to ~1end~5 !\n" msgstr "" @@ -3650,181 +3614,202 @@ msgstr "" msgid "partition was not found\n" 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[=]\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 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 msgid " %2ludays" msgstr "" #. Translation Hint: Minutes:Seconds #. Translation Hint: Hours:Minutes -#: w.c:249 w.c:259 +#: w.c:250 w.c:260 #, c-format msgid " %2lu:%02um" msgstr "" #. Translation Hint: Seconds:Centiseconds -#: w.c:267 +#: w.c:268 #, c-format msgid " %2lu.%02us" msgstr "" -#: w.c:449 +#: w.c:451 msgid " -h, --no-header do not print header\n" msgstr "" -#: w.c:450 +#: w.c:452 msgid " -u, --no-current ignore current process username\n" msgstr "" -#: w.c:451 +#: w.c:453 msgid " -s, --short short format\n" msgstr "" -#: w.c:452 +#: w.c:454 msgid " -f, --from show remote hostname field\n" msgstr "" -#: w.c:453 +#: w.c:455 msgid " -o, --old-style old style output\n" msgstr "" -#: w.c:454 +#: w.c:456 msgid " -i, --ip-addr display IP address instead of hostname (if possible)\n" msgstr "" -#: w.c:551 +#: w.c:553 #, c-format msgid "User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n" msgstr "" -#: w.c:561 +#: w.c:563 #, c-format msgid "from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n" 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 #. * headers. Try to keep alignment intact. -#: w.c:590 +#: w.c:587 #, c-format msgid "%-*s TTY " msgstr "" -#: w.c:592 +#: w.c:589 msgid "FROM" msgstr "" -#: w.c:594 +#: w.c:591 #, c-format msgid " LOGIN@ IDLE JCPU PCPU WHAT\n" msgstr "" -#: w.c:596 +#: w.c:593 #, c-format msgid " IDLE WHAT\n" msgstr "" -#: watch.c:89 -#, 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 +#: include/c.h:153 msgid "" -" -d, --differences[=]\n" -" highlight changes between updates\n" +"\n" +"Usage:\n" msgstr "" -#: watch.c:95 -msgid " -e, --errexit exit if command has a non-zero exit\n" +#: include/c.h:154 +msgid "" +"\n" +"Options:\n" msgstr "" -#: watch.c:96 -msgid " -g, --chgexit exit when output from command changes\n" +#: include/c.h:155 +msgid "\n" msgstr "" -#: watch.c:97 -msgid " -n, --interval seconds to wait between updates\n" +#: include/c.h:156 +msgid " -h, --help display this help and exit\n" msgstr "" -#: watch.c:98 -msgid " -p, --precise attempt run command in precise intervals\n" +#: include/c.h:157 +msgid " -V, --version output version information and exit\n" msgstr "" -#: watch.c:99 -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 +#: include/c.h:158 #, c-format -msgid "Every %.1fs: " +msgid "" +"\n" +"For more details see %s.\n" msgstr "" -#: watch.c:436 -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 +#: include/c.h:160 #, c-format -msgid "unable to execute '%s'" -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" +msgid "%s from %s\n" msgstr "" diff --git a/po/uk.po b/po/uk.po index e88a8e97..96563c1f 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: procps-ng-3.3.10-rc1\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" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" @@ -19,7 +19,7 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\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 msgid " %s [options]\n" msgstr " %s [параметри]\n" @@ -109,7 +109,7 @@ msgstr "" msgid " -w, --wide wide output\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" msgstr " --help показати цю довідку та вийти\n" @@ -117,26 +117,26 @@ msgstr " --help показати цю довідку та вийти\n" msgid "Multiple unit options doesn't make sense." msgstr "" -#: free.c:328 +#: free.c:329 #, c-format msgid "seconds argument `%s' failed" msgstr "помилка аргументу секунд, «%s»" -#: free.c:331 +#: free.c:332 #, c-format msgid "seconds argument `%s' is not positive number" msgstr "аргумент секунд, «%s», не є додатним числом" -#: free.c:337 +#: free.c:338 msgid "failed to parse count argument" msgstr "не вдалося обробити аргумент кількості" -#: free.c:340 +#: free.c:341 #, c-format msgid "failed to parse count argument: '%s'" msgstr "не вдалося обробити аргумент кількості: «%s»" -#: free.c:361 +#: free.c:362 #, c-format msgid "" " total used free shared buffers " @@ -145,7 +145,7 @@ msgstr "" " загалом використ. вільна спільна буфери " "кеш дост." -#: free.c:363 +#: free.c:364 #, c-format msgid "" " total used free shared buff/cache " @@ -153,23 +153,23 @@ msgid "" msgstr "" " загалом використ. вільна спільна буфери/кеш дост." -#: free.c:366 +#: free.c:367 msgid "Mem:" msgstr "Пам.:" -#: free.c:386 +#: free.c:387 msgid "Low:" msgstr "Нижня:" -#: free.c:392 +#: free.c:393 msgid "High:" msgstr "Верхня:" -#: free.c:399 +#: free.c:400 msgid "Swap:" msgstr "Своп.:" -#: free.c:406 +#: free.c:407 msgid "Total:" msgstr "Загалом:" @@ -336,11 +336,11 @@ msgstr "не є числом: %s" msgid "Error reading reference namespace information\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" msgstr "внутрішня помилка" -#: pgrep.c:878 +#: pgrep.c:876 #, c-format msgid "" "-L without -F makes no sense\n" @@ -349,7 +349,7 @@ msgstr "" "-L без -F позбавлений сенсу\n" "Спробуйте «%s --help», щоб отримати додаткову інформацію." -#: pgrep.c:885 +#: pgrep.c:883 #, c-format msgid "" "pidfile not valid\n" @@ -358,7 +358,7 @@ msgstr "" "некоректний pidfile\n" "Спробуйте команду «%s --help», щоб дізнатися більше." -#: pgrep.c:893 +#: pgrep.c:891 #, c-format msgid "" "only one pattern can be provided\n" @@ -367,7 +367,7 @@ msgstr "" "можна вказувати лише один шаблон\n" "Спробуйте «%s --help», щоб отримати додаткову інформацію." -#: pgrep.c:897 +#: pgrep.c:895 #, c-format msgid "" "no matching criteria specified\n" @@ -376,12 +376,12 @@ msgstr "" "не вказано критеріїв відповідності\n" "Спробуйте «%s --help», щоб отримати додаткову інформацію." -#: pgrep.c:924 +#: pgrep.c:922 #, c-format msgid "%s killed (pid %lu)\n" msgstr "роботу %s завершено (pid %lu)\n" -#: pgrep.c:930 +#: pgrep.c:928 #, c-format msgid "killing pid %ld failed" msgstr "не вдалося завершити роботу pid %ld" @@ -410,7 +410,7 @@ msgstr "" msgid " -o, --omit-pid omit processes with PID\n" msgstr " -o, --omit-pid пропускати процеси із вказаним PID\n" -#: pidof.c:270 +#: pidof.c:268 #, c-format msgid "illegal omit pid value (%s)!\n" msgstr "некоректне значення pid для пропускання (%s)!\n" @@ -562,8 +562,8 @@ msgstr " загалом %16ld К\n" msgid " total %8ldK\n" msgstr " загалом %8ld К\n" -#: pmap.c:767 skill.c:502 skill.c:535 skill.c:624 tload.c:128 tload.c:133 -#: vmstat.c:959 vmstat.c:968 watch.c:707 +#: 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:708 msgid "failed to parse argument" 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" msgstr "-L з H/-m/m, але немає PID/PGID/SID/SESS для використання з NLWP" -#: pwdx.c:38 +#: pwdx.c:37 #, c-format msgid " %s [options] pid...\n" msgstr " %s [параметри] pid...\n" -#: pwdx.c:114 +#: pwdx.c:113 #, c-format msgid "invalid process id: %s" msgstr "некоректний ідентифікатор процесу: %s" @@ -1711,56 +1711,56 @@ msgstr "" "Від’ємними значеннями можуть скористатися лише користувачі з\n" "адміністративними правами доступу.\n" -#: skill.c:462 +#: skill.c:457 #, c-format msgid "unknown signal name %s" msgstr "невідома назва сигналу, %s" -#: skill.c:482 +#: skill.c:477 #, c-format msgid "invalid argument %c" msgstr "некоректний аргумент, %c" -#: skill.c:515 +#: skill.c:513 #, c-format msgid "something at line %d\n" msgstr "щось у рядку %d\n" -#: skill.c:538 +#: skill.c:536 #, c-format msgid "priority %lu out of range" msgstr "рівень пріоритетності %lu лежить поза межами припустимого діапазону" -#: skill.c:653 +#: skill.c:649 #, c-format msgid "invalid pid number %s" msgstr "некоректне число pid %s" -#: skill.c:657 +#: skill.c:653 msgid "error reading reference namespace information" msgstr "помилка під час спроби читання даних щодо еталонного простору назв" -#: skill.c:665 +#: skill.c:661 msgid "invalid namespace list" msgstr "некоректний список просторів назв" -#: skill.c:703 +#: skill.c:699 msgid "no process selection criteria" msgstr "немає критерію вибору процесу" -#: skill.c:706 +#: skill.c:702 msgid "general flags may not be repeated" msgstr "не можна повторювати загальні прапорці" -#: skill.c:709 +#: skill.c:705 msgid "-i makes no sense with -v, -f, and -n" msgstr "-i не має сенсу з -v, -f та -n" -#: skill.c:711 +#: skill.c:707 msgid "-v makes no sense with -i and -f" msgstr "-v не має сенсу з -i та -f" -#: skill.c:756 +#: skill.c:752 #, c-format msgid "skill: \"%s\" is not supported\n" msgstr "skill: підтримки «%s» не передбачено\n" @@ -2117,7 +2117,7 @@ msgid "Effective User Id" msgstr "Ідентифікатор ефективного користувача" #. Translation Hint: maximum 'USER' = 7 -#: top/top_nls.c:133 w.c:590 +#: top/top_nls.c:133 w.c:587 msgid "USER" 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" #: top/top_nls.c:646 -#, c-format +#, fuzzy, c-format 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 to ~1select~5 an option; 'q' or to " "~1end~5 !\n" "Options~2: ~1%s\n" @@ -3554,9 +3554,9 @@ msgstr "" "Пункти~2: ~1%s\n" #: top/top_nls.c:651 -#, c-format +#, fuzzy, c-format 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" "Or~2: to ~1select another~5; 'q' or to ~1end~5 !\n" @@ -4060,24 +4060,24 @@ msgstr "для -S слід вказати k, K, m або M (типовою од msgid "partition was not found\n" msgstr "розділ не знайдено\n" -#: watch.c:89 +#: watch.c:90 #, c-format msgid " %s [options] command\n" msgstr " %s [параметри] команда\n" -#: watch.c:91 +#: watch.c:92 msgid " -b, --beep beep if command has a non-zero exit\n" msgstr "" " -b, --beep гудок, якщо виконання команди завершується " "ненульовим станом\n" -#: watch.c:92 +#: watch.c:93 msgid " -c, --color interpret ANSI color and style sequences\n" msgstr "" " -c, --color обробляти послідовності символів ANSI для кольорів " "і стилю\n" -#: watch.c:93 +#: watch.c:94 msgid "" " -d, --differences[=]\n" " highlight changes between updates\n" @@ -4085,129 +4085,129 @@ msgstr "" " -d, --differences[=<сталість>]\n" " позначати відмінності між оновленнями\n" -#: watch.c:95 +#: watch.c:96 msgid " -e, --errexit exit if command has a non-zero exit\n" msgstr "" " -e, --errexit вийти, якщо виконання команди завершується " "ненульовим станом\n" -#: watch.c:96 +#: watch.c:97 msgid " -g, --chgexit exit when output from command changes\n" msgstr "" " -g, --chgexit вийти, якщо змінюються дані, виведені командою\n" -#: watch.c:97 +#: watch.c:98 msgid " -n, --interval seconds to wait between updates\n" msgstr " -n, --interval <число> кількість секунд очікування між оновленнями\n" -#: watch.c:98 +#: watch.c:99 msgid " -p, --precise attempt run command in precise intervals\n" msgstr "" " -p, --precise намагатися виконувати команду з точними проміжками\n" -#: watch.c:99 +#: watch.c:100 msgid " -t, --no-title turn off header\n" msgstr " -t, --no-title вимкнути заголовок\n" -#: watch.c:100 +#: watch.c:101 msgid " -x, --exec pass command to exec instead of \"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" msgstr " -v, --version вивести інформацію про версію та вийти\n" -#: watch.c:375 +#: watch.c:376 #, c-format msgid "Every %.1fs: " msgstr "Кожні %.1f с: " -#: watch.c:436 +#: watch.c:437 msgid "unable to create IPC pipes" msgstr "не вдалося створити канали IPC" -#: watch.c:446 +#: watch.c:447 msgid "unable to fork process" msgstr "не вдалося розгалузити процес" -#: watch.c:451 +#: watch.c:452 msgid "dup2 failed" msgstr "помилка dup2" -#: watch.c:458 +#: watch.c:459 #, c-format msgid "unable to execute '%s'" msgstr "не вдалося виконати «%s»" -#: watch.c:475 +#: watch.c:476 msgid "fdopen" msgstr "fdopen" -#: watch.c:621 +#: watch.c:622 msgid "waitpid" msgstr "waitpid" -#: watch.c:629 +#: watch.c:630 msgid "command exit with a non-zero status, press a key to exit" msgstr "" "виконання команди завершено з ненульовим повідомлення щодо стану, натисніть " "клавішу, щоб завершити роботу" -#: watch.c:754 +#: watch.c:755 #, c-format msgid "unicode handling error\n" msgstr "помилка обробки unicode\n" -#: watch.c:760 +#: watch.c:761 #, c-format msgid "unicode handling error (malloc)\n" msgstr "помилка обробки unicode (malloc)\n" -#: w.c:240 w.c:255 +#: w.c:241 w.c:256 #, c-format msgid " %2ludays" msgstr " %2lu днів" #. Translation Hint: Minutes:Seconds #. Translation Hint: Hours:Minutes -#: w.c:249 w.c:259 +#: w.c:250 w.c:260 #, c-format msgid " %2lu:%02um" msgstr " %2lu:%02um" #. Translation Hint: Seconds:Centiseconds -#: w.c:267 +#: w.c:268 #, c-format msgid " %2lu.%02us" msgstr " %2lu,%02us" -#: w.c:449 +#: w.c:451 msgid " -h, --no-header do not print header\n" msgstr " -h, --no-header не виводити заголовок\n" -#: w.c:450 +#: w.c:452 msgid " -u, --no-current ignore current process username\n" msgstr " -u, --no-current ігнорувати ім’я користувача поточного процесу\n" -#: w.c:451 +#: w.c:453 msgid " -s, --short short format\n" msgstr " -s, --short скорочений формат\n" -#: w.c:452 +#: w.c:454 msgid " -f, --from show remote hostname field\n" msgstr " -f, --from вивести поле назви віддаленого вузла\n" -#: w.c:453 +#: w.c:455 msgid " -o, --old-style old style output\n" msgstr " -o, --old-style виведення даних у застарілому форматі\n" -#: w.c:454 +#: w.c:456 msgid "" " -i, --ip-addr display IP address instead of hostname (if possible)\n" msgstr "" " -i, --ip-addr виводити IP-адресу замість назви вузла (якщо можна)\n" -#: w.c:551 +#: w.c:553 #, c-format msgid "" "User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n" @@ -4215,7 +4215,7 @@ msgstr "" "Значення довжини для середовища користувача, PROCPS_USERLEN, має належати " "діапазону від 8 до %i, ігноруємо.\n" -#: w.c:561 +#: w.c:563 #, c-format msgid "" "from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n" @@ -4223,38 +4223,23 @@ msgstr "" "значення довжини вхідних даних середовища, PROCPS_FROMLEN, має бути від 8 до " "%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 #. * headers. Try to keep alignment intact. -#: w.c:590 +#: w.c:587 #, c-format msgid "%-*s TTY " msgstr "%-*s TTY " -#: w.c:592 +#: w.c:589 msgid "FROM" msgstr "З" -#: w.c:594 +#: w.c:591 #, c-format msgid " LOGIN@ IDLE JCPU PCPU WHAT\n" msgstr " LOGIN@ IDLE JCPU PCPU WHAT\n" -#: w.c:596 +#: w.c:593 #, c-format msgid " IDLE WHAT\n" msgstr " IDLE WHAT\n" @@ -4307,6 +4292,15 @@ msgstr "%s з %s\n" #~ msgid "alternate System.map file must follow N" #~ 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 "" #~ " -o, --old use old format (without -/+buffers/cache line)\n" #~ msgstr "" diff --git a/po/vi.po b/po/vi.po index 9c6d180e..7fad24f7 100644 --- a/po/vi.po +++ b/po/vi.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: procps-ng 3.3.10-rc1\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" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" @@ -19,7 +19,7 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\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 msgid " %s [options]\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" 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" 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." msgstr "" -#: free.c:328 +#: free.c:329 #, c-format msgid "seconds argument `%s' failed" msgstr "đối số thứ hai “%s” bị lỗi" -#: free.c:331 +#: free.c:332 #, c-format msgid "seconds argument `%s' is not positive number" 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" msgstr "gặp lỗi khi phân tích số lượng đối số" -#: free.c:340 +#: free.c:341 #, c-format msgid "failed to parse count argument: '%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 msgid "" " total used free shared buffers " @@ -141,7 +141,7 @@ msgstr "" " tổng dùng trống chsẻ đệm nhớ " "tạm sẵn sàng" -#: free.c:363 +#: free.c:364 #, c-format msgid "" " total used free shared buff/cache " @@ -150,23 +150,23 @@ msgstr "" " tổng dùng trống chsẻ đệm/tạm sẵn " "sàng" -#: free.c:366 +#: free.c:367 msgid "Mem:" msgstr "BNhớ:" -#: free.c:386 +#: free.c:387 msgid "Low:" msgstr "Thấp:" -#: free.c:392 +#: free.c:393 msgid "High:" msgstr "Cao:" -#: free.c:399 +#: free.c:400 msgid "Swap:" msgstr "Tráo đổi:" -#: free.c:406 +#: free.c:407 msgid "Total:" msgstr "Tổng:" @@ -320,11 +320,11 @@ msgstr "không phải con số: %s" 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" -#: 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" msgstr "lỗi nội bộ" -#: pgrep.c:878 +#: pgrep.c:876 #, c-format msgid "" "-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" "Chạy “%s --help” để biết thêm chi tiết." -#: pgrep.c:885 +#: pgrep.c:883 #, c-format msgid "" "pidfile not valid\n" @@ -342,7 +342,7 @@ msgstr "" "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." -#: pgrep.c:893 +#: pgrep.c:891 #, c-format msgid "" "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" "Hãy chạy lệnh “%s --help” để có thêm thông tin." -#: pgrep.c:897 +#: pgrep.c:895 #, c-format msgid "" "no matching criteria specified\n" @@ -360,12 +360,12 @@ msgstr "" "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." -#: pgrep.c:924 +#: pgrep.c:922 #, c-format msgid "%s killed (pid %lu)\n" msgstr "đã giết %s (mã số tiến trình %lu)\n" -#: pgrep.c:930 +#: pgrep.c:928 #, c-format msgid "killing pid %ld failed" msgstr "gặp lỗi khi giết tiến trình mã số %ld" @@ -392,7 +392,7 @@ msgstr "" msgid " -o, --omit-pid omit processes with PID\n" msgstr " -o, --omit-pid bỏ qua các tiến trình có mã số này\n" -#: pidof.c:270 +#: pidof.c:268 #, c-format 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" @@ -541,8 +541,8 @@ msgstr " tổng %16ldK\n" msgid " total %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 -#: vmstat.c:959 vmstat.c:968 watch.c:707 +#: 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:708 msgid "failed to parse argument" 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" 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 msgid " %s [options] pid...\n" msgstr " %s [các-tùy-chọn] pid...\n" -#: pwdx.c:114 +#: pwdx.c:113 #, c-format msgid "invalid process id: %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" "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 msgid "unknown signal name %s" msgstr "không hiểu tên tín hiệu: %s" -#: skill.c:482 +#: skill.c:477 #, c-format msgid "invalid argument %c" msgstr "đối số %c không hợp lệ" -#: skill.c:515 +#: skill.c:513 #, c-format msgid "something at line %d\n" msgstr "cái gì đó tại dòng %d\n" -#: skill.c:538 +#: skill.c:536 #, c-format msgid "priority %lu out of range" msgstr "mức ưu tiên %lu nằm ngoài phạm vi" -#: skill.c:653 +#: skill.c:649 #, c-format msgid "invalid pid number %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" 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" 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" 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" 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" 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" msgstr "-v không hợp lý với -i và -f" -#: skill.c:756 +#: skill.c:752 #, c-format msgid "skill: \"%s\" is not supported\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" #. Translation Hint: maximum 'USER' = 7 -#: top/top_nls.c:133 w.c:590 +#: top/top_nls.c:133 w.c:587 msgid "USER" 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" #: top/top_nls.c:646 -#, c-format +#, fuzzy, c-format 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 to ~1select~5 an option; 'q' or to " "~1end~5 !\n" "Options~2: ~1%s\n" @@ -3511,9 +3511,9 @@ msgstr "" "Tùy chọn~2: ~1%s\n" #: top/top_nls.c:651 -#, c-format +#, fuzzy, c-format 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" "Or~2: to ~1select another~5; 'q' or 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" msgstr "không tìm thấy phân vùng\n" -#: watch.c:89 +#: watch.c:90 #, c-format msgid " %s [options] command\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" 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" msgstr " -c, --color phiên dịch màu ANSI và dãy kiểu\n" -#: watch.c:93 +#: watch.c:94 msgid "" " -d, --differences[=]\n" " highlight changes between updates\n" @@ -4031,122 +4031,122 @@ msgstr "" " -d, --differences[=]\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" 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" 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 seconds to wait between updates\n" msgstr " -n, --interval 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" 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" 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" 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" 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 msgid "Every %.1fs: " msgstr "Mỗi %.1fs: " -#: watch.c:436 +#: watch.c:437 msgid "unable to create IPC pipes" msgstr "không thể tạo đường ống IPC" -#: watch.c:446 +#: watch.c:447 msgid "unable to fork process" msgstr "không thể rẽ nhánh tiến trình" -#: watch.c:451 +#: watch.c:452 msgid "dup2 failed" msgstr "dup2 bị lỗi" -#: watch.c:458 +#: watch.c:459 #, c-format msgid "unable to execute '%s'" msgstr "không thể thực hiện “%s”" -#: watch.c:475 +#: watch.c:476 msgid "fdopen" msgstr "fdopen" -#: watch.c:621 +#: watch.c:622 msgid "waitpid" msgstr "waitpid" -#: watch.c:629 +#: watch.c:630 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" -#: watch.c:754 +#: watch.c:755 #, c-format msgid "unicode handling error\n" msgstr "xử lý unicode gặp lỗi\n" -#: watch.c:760 +#: watch.c:761 #, c-format msgid "unicode handling error (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 msgid " %2ludays" msgstr " %2lungày" #. Translation Hint: Minutes:Seconds #. Translation Hint: Hours:Minutes -#: w.c:249 w.c:259 +#: w.c:250 w.c:260 #, c-format msgid " %2lu:%02um" msgstr " %2lu:%02uphút" #. Translation Hint: Seconds:Centiseconds -#: w.c:267 +#: w.c:268 #, c-format msgid " %2lu.%02us" msgstr " %2lu.%02ugiây" -#: w.c:449 +#: w.c:451 msgid " -h, --no-header do not print header\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" 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" 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" 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" msgstr " -o, --old-style hiển thị kiểu cũ\n" -#: w.c:454 +#: w.c:456 msgid "" " -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" -#: w.c:551 +#: w.c:553 #, c-format msgid "" "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à " "%d, nên bỏ qua\n" -#: w.c:561 +#: w.c:563 #, c-format msgid "" "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ỏ " "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 #. * headers. Try to keep alignment intact. -#: w.c:590 +#: w.c:587 #, c-format msgid "%-*s TTY " msgstr "%-*s TTY " -#: w.c:592 +#: w.c:589 msgid "FROM" msgstr "TỪ" -#: w.c:594 +#: w.c:591 #, c-format msgid " LOGIN@ IDLE JCPU PCPU WHAT\n" msgstr " ĐNHẬP@ NGHỈ JCPU PCPU GÌ\n" -#: w.c:596 +#: w.c:593 #, c-format msgid " IDLE WHAT\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" #~ 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 "" #~ " -o, --old use old format (without -/+buffers/cache line)\n" #~ msgstr "" From 57396ae39d869c62a9095006c76482c5df198b3c Mon Sep 17 00:00:00 2001 From: Craig Small Date: Sun, 9 Aug 2015 17:45:19 +1000 Subject: [PATCH 26/43] build-sys: Update Library Version procps v3.3.11 will bring Library API 5:0:0 The reason for the change is the removal of some calls and the addition of others. The newlib branch should hopefully reset some of these changes to a much slower pace. Signed-off-by: Craig Small --- Makefile.am | 2 +- NEWS | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index aca94b90..f1bd6b98 100644 --- a/Makefile.am +++ b/Makefile.am @@ -136,7 +136,7 @@ w_SOURCES = w.c lib/fileutils.c # proc/libprocps.la # See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -LIBprocps_CURRENT=4 +LIBprocps_CURRENT=5 LIBprocps_REVISION=0 LIBprocps_AGE=0 diff --git a/NEWS b/NEWS index af985014..f60c14a1 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ procps-ng-NEXT ---------------- + * libprocps API 5:0:0 * pgrep: don't crash with -a -w flags. Merge 33, Debian #768190 * skill: command line with signal number interpreted correctly * pmap: print process name even if smaps is unreadable Debian #775624 From de985eced583f18df273146b110491b0f7404aab Mon Sep 17 00:00:00 2001 From: Craig Small Date: Sun, 9 Aug 2015 17:54:49 +1000 Subject: [PATCH 27/43] RELEASE 3.3.11 Update NEWS file to number this release. Signed-off-by: Craig Small --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index f60c14a1..bf646bd3 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -procps-ng-NEXT +procps-ng-3.3.11 ---------------- * libprocps API 5:0:0 * pgrep: don't crash with -a -w flags. Merge 33, Debian #768190 From e3d9ee04d92adbb4ab5dad4186556e32f075f328 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Sat, 15 Aug 2015 15:42:40 +1000 Subject: [PATCH 28/43] Update NEWS for next version --- NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS b/NEWS index bf646bd3..43552c83 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +procps-ng-NEXT +---------------- + procps-ng-3.3.11 ---------------- * libprocps API 5:0:0 From 4bd0e539aff370e7e15a4eadfb90cc425004fa30 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Sat, 15 Aug 2015 16:23:37 +1000 Subject: [PATCH 29/43] ps: sort by cgroup A rather small fix to sort by cgroup. This sorting function could be used for other string vector entries, but I can't see why you want to for, say, environment. Reference: https://bugs.debian.org/692279 Signed-off-by: Craig Small --- NEWS | 1 + ps/output.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 43552c83..50c7b7ae 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ procps-ng-NEXT ---------------- + * ps: sort by cgroup Debian #692279 procps-ng-3.3.11 ---------------- diff --git a/ps/output.c b/ps/output.c index 63ba2688..35286c0b 100644 --- a/ps/output.c +++ b/ps/output.c @@ -96,6 +96,18 @@ static int sr_nop(const proc_t* a, const proc_t* b){ return 0; } +static int sr_cgroup(const proc_t* a, const proc_t* b) +{ + int i; + int cmpval; + for (i=0; a->cgroup[i] != NULL && b->cgroup[i] != NULL; i++) { + if ((cmpval = strcmp(a->cgroup[i], b->cgroup[i])) != 0) + return cmpval; + } + return 0; +} + + #define CMP_STR(NAME) \ static int sr_ ## NAME(const proc_t* P, const proc_t* Q) { \ return strcmp(P->NAME, Q->NAME); \ @@ -1439,7 +1451,7 @@ static const format_struct format_array[] = { {"bsdtime", "TIME", pr_bsdtime, sr_nop, 6, 0, LNX, ET|RIGHT}, {"c", "C", pr_c, sr_pcpu, 2, 0, SUN, ET|RIGHT}, {"caught", "CAUGHT", pr_sigcatch, sr_nop, 9, 0, BSD, TO|SIGNAL}, /*sigcatch*/ -{"cgroup", "CGROUP", pr_cgroup, sr_nop, 27,CGRP, LNX, PO|UNLIMITED}, +{"cgroup", "CGROUP", pr_cgroup, sr_cgroup, 27,CGRP, LNX, PO|UNLIMITED}, {"class", "CLS", pr_class, sr_sched, 3, 0, XXX, TO|LEFT}, {"cls", "CLS", pr_class, sr_sched, 3, 0, HPU, TO|RIGHT}, /*says HPUX or RT*/ {"cmaj_flt", "-", pr_nop, sr_cmaj_flt, 1, 0, LNX, AN|RIGHT}, From 0ee090ae16a3a98ba64a1bb8108597328a4c05b0 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Sat, 15 Aug 2015 17:10:38 +1000 Subject: [PATCH 30/43] ps: display control group name The cgroup field while shown as a vector is a concatenated string, so alot of the complexity of sorting and displaying has gone. This change simplifies the cgroup sorting and adds display and sorting for the name attribute of the cgroup, if found. Signed-off-by: Craig Small --- NEWS | 1 + ps/output.c | 47 ++++++++++++++++++++++++++++++++++++++++------- ps/ps.1 | 6 +++++- 3 files changed, 46 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index 50c7b7ae..b30aedf3 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ procps-ng-NEXT ---------------- * ps: sort by cgroup Debian #692279 + * ps: display control group name with -o cgname procps-ng-3.3.11 ---------------- diff --git a/ps/output.c b/ps/output.c index 35286c0b..4722fee5 100644 --- a/ps/output.c +++ b/ps/output.c @@ -98,13 +98,29 @@ static int sr_nop(const proc_t* a, const proc_t* b){ static int sr_cgroup(const proc_t* a, const proc_t* b) { - int i; - int cmpval; - for (i=0; a->cgroup[i] != NULL && b->cgroup[i] != NULL; i++) { - if ((cmpval = strcmp(a->cgroup[i], b->cgroup[i])) != 0) - return cmpval; - } - return 0; + /* This is a "vector" of one */ + if (*a->cgroup == NULL || *b->cgroup == NULL) + return 0; + return strcmp(*a->cgroup, *b->cgroup); +} + +static int sr_cgname(const proc_t* a, const proc_t* b) +{ + char *aname, *bname; + /* This is a "vector" of one */ + if (*a->cgroup == NULL || *b->cgroup == NULL) + return 0; + aname = strstr(*a->cgroup, ":name="); + bname = strstr(*b->cgroup, ":name="); + /* check for missing names, they win */ + if (aname == NULL || aname[6] == '\0') { + if (bname == NULL || bname[6] == '\0') + return 0; + return -1; + } else if (bname == NULL || bname[6] == '\0') + return 1; + return strcmp(aname+6,bname+6); + } @@ -455,6 +471,22 @@ static int pr_cgroup(char *restrict const outbuf,const proc_t *restrict const pp return max_rightward-rightward; } +static int pr_cgname(char *restrict const outbuf,const proc_t *restrict const pp) { + int rightward = max_rightward; + int i; + char *name; + + if ((name = strstr(*pp->cgroup, ":name=")) != NULL) { + name += 6; + if (name != '\0') { + escape_str(outbuf, name, OUTBUF_SIZE, &rightward); + return max_rightward - rightward; + } + } + /* fallback: use full cgroup for name */ + return pr_cgroup(outbuf, pp); +} + /* Non-standard, from SunOS 5 */ static int pr_fname(char *restrict const outbuf, const proc_t *restrict const pp){ char *endp = outbuf; @@ -1451,6 +1483,7 @@ static const format_struct format_array[] = { {"bsdtime", "TIME", pr_bsdtime, sr_nop, 6, 0, LNX, ET|RIGHT}, {"c", "C", pr_c, sr_pcpu, 2, 0, SUN, ET|RIGHT}, {"caught", "CAUGHT", pr_sigcatch, sr_nop, 9, 0, BSD, TO|SIGNAL}, /*sigcatch*/ +{"cgname", "CGNAME", pr_cgname, sr_cgname, 27,CGRP, LNX, PO|UNLIMITED}, {"cgroup", "CGROUP", pr_cgroup, sr_cgroup, 27,CGRP, LNX, PO|UNLIMITED}, {"class", "CLS", pr_class, sr_sched, 3, 0, XXX, TO|LEFT}, {"cls", "CLS", pr_class, sr_sched, 3, 0, HPU, TO|RIGHT}, /*says HPUX or RT*/ diff --git a/ps/ps.1 b/ps/ps.1 index bce55bd9..ee9c38f0 100644 --- a/ps/ps.1 +++ b/ps/ps.1 @@ -4,7 +4,7 @@ .\" Quick hack conversion by Albert Cahalan, 1998. .\" Licensed under version 2 of the Gnu General Public License. .\" -.TH PS 1 "June 2015" "procps-ng" "User Commands" +.TH PS 1 "August 2015" "procps-ng" "User Commands" .\" .\" To render this page: .\" groff -t -b -man -X -P-resolution -P100 -Tps ps.1 & @@ -1080,6 +1080,10 @@ format is displayed. (alias .BR sig_catch , \ sigcatch ). T} +cgname CGNAME T{ +display name of control groups to which the process belongs. +T} + cgroup CGROUP T{ display control groups to which the process belongs. T} From 049e2066892f7fc3c1011d0e7af25fc15028c374 Mon Sep 17 00:00:00 2001 From: John Keeping Date: Tue, 18 Aug 2015 12:05:11 +0100 Subject: [PATCH 31/43] configure.ac: do not check for C++ compiler We do not have any C++ code, so there is no point in checking for C++ tools in the configure script. Signed-off-by: John Keeping --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac index 675e2184..ac5ac9fa 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,6 @@ AC_CONFIG_HEADERS([config.h]) # Checks for programs. AC_USE_SYSTEM_EXTENSIONS(_GNU_SOURCE) -AC_PROG_CXX AC_PROG_AWK AC_PROG_CC AC_PROG_CC_STDC From 99fa7f9f57f52afdf648584879f37980731215d5 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Tue, 1 Sep 2015 21:28:07 +1000 Subject: [PATCH 32/43] watch: Correctly process [m Remove lib dependency The commit referenced below made the ANSI sequence [m be interpreted as [0m However this change was put in the incorrect place and would reference an undefined pointer, causing a crash. Thanks to Jimmy Theis for the second heads-up. watch doesn't need any libprocps functions so it is no longer linked to them. References: commit a5937e4e943eaf28b378a318566d6968f2b167be https://www.freelists.org/post/procps/watch-crashes-but-its-not-the-latest-commit-fault https://www.freelists.org/post/procps/Segmentation-fault-in-watch-3311 --- Makefile.am | 2 +- watch.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index f1bd6b98..fe1f12f9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,7 +96,7 @@ dist_man_MANS += \ slabtop_SOURCES = slabtop.c lib/strutils.c lib/fileutils.c slabtop_LDADD = $(LDADD) @NCURSES_LIBS@ watch_SOURCES = watch.c lib/strutils.c lib/fileutils.c -watch_LDADD = $(LDADD) @WATCH_NCURSES_LIBS@ +watch_LDADD = @WATCH_NCURSES_LIBS@ top_top_SOURCES = \ top/top.h \ top/top.c \ diff --git a/watch.c b/watch.c index de46730c..58b4dbc8 100644 --- a/watch.c +++ b/watch.c @@ -228,10 +228,12 @@ static void process_ansi(FILE * fp) * attributes to apply, but typically there are between 1 and 3. */ - if (*endptr == '\0') set_ansi_attribute(0); /* [m treated as [0m */ - for (endptr = numstart = buf; *endptr != '\0'; numstart = endptr + 1) + for (endptr = numstart = buf; *endptr != '\0'; numstart = endptr + 1) { set_ansi_attribute(strtol(numstart, &endptr, 10)); + if (numstart == endptr) + set_ansi_attribute(0); /* [m treated as [0m */ + } } static void __attribute__ ((__noreturn__)) do_exit(int status) From 0822f49e8e1da50751762847b6a8ab4eec1d963f Mon Sep 17 00:00:00 2001 From: Craig Small Date: Sat, 24 Oct 2015 01:23:31 +0000 Subject: [PATCH 33/43] Remove CI from readme as the function has been integrated --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index b7007a8e..72ba2f6f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -[![build status](https://ci.gitlab.com/projects/2142/status.png?ref=master)](https://ci.gitlab.com/projects/2142?ref=master) - procps ====== @@ -50,4 +48,4 @@ page. The email list for the developers and users of procps is found at http://www.freelists.org/archive/procps/ 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. \ No newline at end of file From aeef4e68035226561c090b05e80e7963dd076d3e Mon Sep 17 00:00:00 2001 From: Craig Small Date: Sat, 24 Oct 2015 01:35:01 +0000 Subject: [PATCH 34/43] added new CI status button --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 72ba2f6f..712bfe38 100644 --- a/README.md +++ b/README.md @@ -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 ====== From 97cde50b359781548ab1663010ca939e0f04e9cd Mon Sep 17 00:00:00 2001 From: Craig Small Date: Sat, 24 Oct 2015 13:17:36 +1100 Subject: [PATCH 35/43] free: use correct end sentinel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When scaling values, the last item was integer 0 but the loop checked for character '0'. This was reported by 付腾桂 Thanks for the report and patch. --- free.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/free.c b/free.c index 6c72138c..f86ab951 100644 --- a/free.c +++ b/free.c @@ -148,7 +148,7 @@ static const char *scale_size(unsigned long size, int flags, struct commandline_ /* human readable output */ up = nextup; - for (i = 1; up[0] != '0'; i++, up++) { + for (i = 1; up[0] != 0; i++, up++) { switch (i) { case 1: if (4 >= snprintf(buf, sizeof(buf), "%ld%c", (long)size * 1024, *up)) From 05d751c4f076a2f0118b914c5e51cfbb4762ad8e Mon Sep 17 00:00:00 2001 From: Craig Small Date: Sat, 24 Oct 2015 14:15:07 +1100 Subject: [PATCH 36/43] free: use SReclaimable in cached The previous commit added all of slab into the cache value. The thing was is cached in this context is something you can get back and reclaim if under memory pressure. The problem was slab parameter includes both reclaimable and unreclaimable values which doesn't make sense in this context. This commit make cached only use the reclaimable component. References: http://www.freelists.org/post/procps/OmegaPhilxxxxxxxxxxxxx-Bug799716-free-considers-cached-to-include-SUnreclaim https://github.com/brndnmtthws/conky/issues/130 https://bugs.debian.org/799716 Commits: 6cb75efef85f735b72e6c96f197f358f511f8ed9 --- free.1 | 2 +- proc/sysinfo.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/free.1 b/free.1 index 1cd01ef2..15f2b768 100644 --- a/free.1 +++ b/free.1 @@ -32,7 +32,7 @@ kernels 2.6.32, displayed as zero if not available) Memory used by kernel buffers (Buffers in /proc/meminfo) .TP \fBcache\fR -Memory used by the page cache and slabs (Cached and Slab in /proc/meminfo) +Memory used by the page cache and slabs (Cached and SReclaimable in /proc/meminfo) .TP \fBbuff/cache\fR Sum of \fBbuffers\fR and \fBcache\fR diff --git a/proc/sysinfo.c b/proc/sysinfo.c index b0af54f0..0619f20e 100644 --- a/proc/sysinfo.c +++ b/proc/sysinfo.c @@ -704,7 +704,7 @@ nextline: if(kb_inactive==~0UL){ kb_inactive = kb_inact_dirty + kb_inact_clean + kb_inact_laundry; } - kb_main_cached = kb_page_cache + kb_slab; + kb_main_cached = kb_page_cache + kb_slab_reclaimable; kb_swap_used = kb_swap_total - kb_swap_free; /* if kb_main_available is greater than kb_main_total or our calculation of From 08ef0f5714eea8b77509a826d9985686682a8d01 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Sat, 24 Oct 2015 14:41:54 +1100 Subject: [PATCH 37/43] Removed empty test --- .gitlab-ci.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e1e58e0f..9ba57d9a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,4 @@ # This file is generated by GitLab CI -'': - script: [] - tags: - except: - - tags Testsuites: script: - "./autogen.sh" From b2f49b105d23c833d733bf7dfb99cb98e4cae383 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Mon, 26 Oct 2015 11:18:52 +1100 Subject: [PATCH 38/43] Closes: #9 ps: Remove Unix98 output limitations ps previously followed the Unix98 standard when it comes to user-defined output, sometimes. This meant you could have user output format with a header that included commas and equals signs. It was dependent on if ps thought you wanted sysv or bsd format and THAT was dependent on things in previous options. It was very confusing to a user because ps p $$ -o pid=,comm= gave you a two-column output but ps -p $$ -o pid=,comm= would give you a one column output with the header ",comm=" The -p versus p means (to ps) you want sysv or bsd parsing. Unix98 standard or not, this is plainly just silly. The commit removes any of the quirks Unix98 has with user defined output. If you really wanted a ps header with commas in the output, today isn't your day. Signed-off-by: Craig Small --- ps/common.h | 2 +- ps/global.c | 17 +++++------------ ps/parser.c | 22 +++------------------- ps/sortformat.c | 11 +---------- 4 files changed, 10 insertions(+), 42 deletions(-) diff --git a/ps/common.h b/ps/common.h index 6903bf70..fc4d3a8e 100644 --- a/ps/common.h +++ b/ps/common.h @@ -322,7 +322,7 @@ extern char *myname; /* sortformat.c */ 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); /* select.c */ diff --git a/ps/global.c b/ps/global.c index 91ca7426..7ab7774d 100644 --- a/ps/global.c +++ b/ps/global.c @@ -285,14 +285,7 @@ static const char *set_personality(void){ return NULL; case_default: /* use defaults for ps, ignoring other environment variables */ - return NULL; - 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; case_aix: @@ -334,8 +327,9 @@ static const char *set_personality(void){ case_irix: case_sgi: s = getenv("_XPG"); - if(s && s[0]>'0' && s[0]<='9') personality = PER_BROKEN_o; - else personality = PER_IRIX_l; + if(s && s[0]>'0' && s[0]<='9') + return NULL; + personality = PER_IRIX_l; return NULL; case_os390: /* IBM's OS/390 OpenEdition on the S/390 mainframe */ @@ -346,13 +340,13 @@ static const char *set_personality(void){ case_hp: case_hpux: - personality = PER_BROKEN_o | PER_HPUX_x; + personality = PER_HPUX_x; return NULL; case_svr4: case_sysv: case_sco: - personality = PER_BROKEN_o | PER_SVR4_x; + personality = PER_SVR4_x; return NULL; case_posix: @@ -360,7 +354,6 @@ static const char *set_personality(void){ case_unix95: case_unix98: case_unix: - personality = PER_BROKEN_o; return NULL; } diff --git a/ps/parser.c b/ps/parser.c index 568d51e4..8d533b38 100644 --- a/ps/parser.c +++ b/ps/parser.c @@ -51,7 +51,6 @@ static int ps_argc; /* global argc */ static char **ps_argv; /* global argv */ static int thisarg; /* index into ps_argv */ 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 */ #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){ if(*(flagptr+1)){ /* argument is part of ps_argv[thisarg] */ - not_pure_unix = 1; return flagptr+1; } 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]; 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){ case 'A': trace("-A selects all processes\n"); @@ -415,7 +401,7 @@ static const char *parse_sysv_option(void){ trace("-o user-defined format\n"); arg=get_opt_arg(); 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 */ case 'p': /* end */ 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]); at = arg_type(ps_argv[thisarg]); trace("ps_argv[thisarg] is %s\n", ps_argv[thisarg]); - if(at != ARG_SYSV) not_pure_unix = 1; switch(at){ case ARG_GNU: err = parse_gnu_option(); @@ -1212,7 +1197,7 @@ int arg_parse(int argc, char *argv[]){ if(err) goto try_bsd; err = thread_option_check(); if(err) goto try_bsd; - err = process_sf_options(!not_pure_unix); + err = process_sf_options(); if(err) goto try_bsd; err = select_bits_setup(); if(err) goto try_bsd; @@ -1231,7 +1216,6 @@ try_bsd: ps_argv = argv; thisarg = 0; /* no need to reset flagptr */ - not_pure_unix=1; force_bsd=1; prefer_bsd_defaults=1; if(!( (PER_OLD_m|PER_BSD_m) & personality )) /* if default m setting... */ @@ -1242,7 +1226,7 @@ try_bsd: if(err2) goto total_failure; err2 = thread_option_check(); if(err2) goto total_failure; - err2 = process_sf_options(!not_pure_unix); + err2 = process_sf_options(); if(err2) goto total_failure; err2 = select_bits_setup(); if(err2) goto total_failure; diff --git a/ps/sortformat.c b/ps/sortformat.c index eeec7e96..5ffc25b2 100644 --- a/ps/sortformat.c +++ b/ps/sortformat.c @@ -31,7 +31,6 @@ #include "common.h" 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 already_parsed_sort = 0; /* redundantly set in & out of fn */ static int already_parsed_format = 0; @@ -205,7 +204,6 @@ double_percent: /*************************************************************** * Used to parse option O lists. Option O is shared between * 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 */ static const char *format_parse(sf_node *sfn){ @@ -235,9 +233,6 @@ static const char *format_parse(sf_node *sfn){ } need_item=1; break; - case '=': - if(broken) goto out; - /* fall through */ default: if(need_item) items++; need_item=0; @@ -499,7 +494,6 @@ static const char *short_sort_parse(sf_node *sfn){ /* * Used to parse option O lists. Option O is shared between * 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. */ static const char *parse_O_option(sf_node *sfn){ @@ -750,12 +744,9 @@ static const char *generate_sysv_list(void){ * sorting and formatting. Users may expect one or the other. * 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; - if(personality & PER_BROKEN_o) localbroken = 1; - if(personality & PER_GOOD_o) localbroken = 0; - broken = localbroken; if(sf_list){ const char *err; err = parse_O_option(sf_list); From b1f7b2a50967e69ce2e3d02372203fe70b6486c9 Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Tue, 20 Oct 2015 00:00:00 -0500 Subject: [PATCH 39/43] top: update the man document reporting bugs suggestion Signed-off-by: Jim Warner --- top/top.1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/top/top.1 b/top/top.1 index d73bc895..aff7ce94 100644 --- a/top/top.1 +++ b/top/top.1 @@ -68,7 +68,7 @@ . .\" Document ///////////////////////////////////////////////////////////// .\" ---------------------------------------------------------------------- -.TH TOP 1 "June 2015" "procps-ng" "User Commands" +.TH TOP 1 "October 2015" "procps-ng" "User Commands" .\" ---------------------------------------------------------------------- .\" ---------------------------------------------------------------------- @@ -2314,8 +2314,9 @@ of travel for the command lines being shown. .\" ---------------------------------------------------------------------- .SH 8. BUGS .\" ---------------------------------------------------------------------- -To report bugs, follow the instructions at: - http://www.debian.org/Bugs/Reporting +Please send bug reports to +.UR procps@freelists.org +.UE . .\" ---------------------------------------------------------------------- .SH 9. HISTORY Former top From c7201d52eb093cbc5e942085eedcbf21b8434eb3 Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Wed, 21 Oct 2015 00:00:00 -0500 Subject: [PATCH 40/43] top: miscellaneous accumulated tweaks to code/comments A patch containing the following miscellaneous tweaks: . remove a function that handled former library errors [ that function should have gone bye-bye with 3.3.11 ] [ when those 'wchan' provisions were much simplified ] Signed-off-by: Jim Warner --- top/top.c | 15 --------------- top/top.h | 1 - 2 files changed, 16 deletions(-) diff --git a/top/top.c b/top/top.c index 9d0e56aa..c01b9834 100644 --- a/top/top.c +++ b/top/top.c @@ -574,21 +574,6 @@ static void error_exit (const char *str) { } // end: error_exit - /* - * Handle library errors ourselves rather than accept a default - * fprintf to stderr (since we've mucked with the termios struct) */ -static void library_err (const char *fmts, ...) NORETURN; -static void library_err (const char *fmts, ...) { - static char tmp[MEDBUFSIZ]; - va_list va; - - va_start(va, fmts); - vsnprintf(tmp, sizeof(tmp), fmts, va); - va_end(va); - error_exit(tmp); -} // end: library_err - - /* * Catches all remaining signals not otherwise handled */ static void sig_abexit (int sig) { diff --git a/top/top.h b/top/top.h index ddf34f13..789b9b30 100644 --- a/top/top.h +++ b/top/top.h @@ -682,7 +682,6 @@ typedef struct WIN_t { //atic void at_eoj (void); //atic void bye_bye (const char *str); //atic void error_exit (const char *str); -//atic void library_err (const char *fmts, ...); //atic void sig_abexit (int sig); //atic void sig_endpgm (int dont_care_sig); //atic void sig_paused (int dont_care_sig); From e1cd74eec9f7dd6918476e963a3a57d99ae61e3d Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Thu, 22 Oct 2015 00:00:00 -0500 Subject: [PATCH 41/43] top: do not co-mingle strings/numbers under namespaces Craig's recent commit under that newlib branch dealing with namespace support has prompted me to review top's handling of those fields. Currently, when such a field is zero, top displays a dash ('-'). This will mean the justification toggles ('j/J') will behave incorrectly. This patch simply allows the potential zero to display or be suppressed with the already existing '0' toggle. Signed-off-by: Jim Warner --- top/top.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/top/top.c b/top/top.c index c01b9834..7f18ff18 100644 --- a/top/top.c +++ b/top/top.c @@ -5390,8 +5390,8 @@ static const char *task_show (const WIN_t *q, const proc_t *p) { case EU_NS5: // USERNS case EU_NS6: // UTSNS { long ino = p->ns[i - EU_NS1]; - if (ino > 0) cp = make_num(ino, W, Jn, i); - else cp = make_str("-", W, Js, i); + if (Rc.zero_suppress && 0 >= ino) cp = make_str("", W, Js, i); + else cp = make_num(ino, W, Jn, i); } break; #ifdef OOMEM_ENABLE From 489d23a132a03c80c4d48e10c13b21ad2e318fb8 Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Fri, 23 Oct 2015 00:00:00 -0500 Subject: [PATCH 42/43] top: ATEOJ_RPTHSH prints hash table entries less often We'll following the newlib approach to hashing: . a 'PIDs at max depth:' portion of that UNREF_RPTHASH enabled #define is now published only when the maximum depth of hash table entry chains exceed depths of one. Signed-off-by: Jim Warner --- top/top.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/top/top.c b/top/top.c index 7f18ff18..2591c3ab 100644 --- a/top/top.c +++ b/top/top.c @@ -530,7 +530,7 @@ static void bye_bye (const char *str) { "\t -----\n" "\t %5d total entries occupied\n", cross_foot); - if (maxdepth_sav) { + if (maxdepth_sav > 1) { fprintf(stderr, "\nPIDs at max depth: "); for (i = 0; i < HHASH_SIZ; i++) if (depths[i] == maxdepth_sav) { From 94e4749be3ea218a57c22034dd45b80325c35586 Mon Sep 17 00:00:00 2001 From: Jim Warner Date: Sat, 24 Oct 2015 00:00:00 -0500 Subject: [PATCH 43/43] top: extend '=' key to include active 'locate' request It is documented behavior that when certain other keys are active, sorts column highlighting will temporarily be disabled. Among those keys is the 'L' (locate/find) provision. The equals ('=') key can be used to restore column highlighting by resetting other keys, except 1. When a locate/find is active, the '=' key will have no effect on 'x' column highlighting, which still remains disabled. Further, when 'L' is active an 'x' keystroke is processed changing the state of column highlighting but without any visual clue (since it's yet disabled). So this commit just extends the '=' key to embrace 'L' processing resets, just like other highlight disabling keys while avoiding 'x' state changes if approproiate. Signed-off-by: Jim Warner --- top/top.1 | 13 +++++++------ top/top.c | 8 +++++++- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/top/top.1 b/top/top.1 index aff7ce94..a21613c5 100644 --- a/top/top.1 +++ b/top/top.1 @@ -1019,10 +1019,11 @@ those \*(CIs applicable to \*(AM. Removes restrictions on which tasks are shown. This command will reverse any `i' (idle tasks) and `n' (max tasks) commands that might be active. -It also provides for an exit from PID monitoring, User filtering -and Other filtering. +It also provides for an exit from PID monitoring, User filtering, +Other filtering and Locate processing. See the `\-p' \*(CO for a discussion of PID monitoring, the `U' or `u' -\*(CIs for User filtering and the `O' or `o' \*(CIs for Other filtering. +\*(CIs for User filtering the `O' or `o' \*(CIs for Other filtering +and `L' or `&' \*(CIs for Locate processing. Additionally, any window that has been scrolled will be reset with this command. @@ -1631,8 +1632,8 @@ as the only display element. .TP 7 *\ \ \fB=\fR | \fB+\fR\ \ :\fIEqualize-(reinitialize)-Window(s) \fR The `=' key forces the \*(CW's \*(TD to be visible. -It also reverses any `i' (idle tasks), `n' (max tasks), `u/U' (user filter) -and `o/O' (other filter) commands that might be active. +It also reverses any `i' (idle tasks), `n' (max tasks), `u/U' (user filter), +\`o/O' (other filter) and 'L' (locate) commands that might be active. Also, if the window had been scrolled, it will be reset with this command. \*(XT 5c. SCROLLING a Window for additional information regarding vertical and horizontal scrolling. @@ -1641,7 +1642,7 @@ The `+' key does the same for all windows. The four \*(TDs will reappear, evenly balanced. They will also have retained any customizations you had previously applied, except for the `i' (idle tasks), `n' (max tasks), `u/U' -(user filter), `o/O' (other filter) and scrolling \*(CIs. +(user filter), `o/O' (other filter), `L' (locate) and scrolling \*(CIs. .TP 7 *\ \ \fBA\fR\ \ :\fIAlternate-Display-Mode\fR toggle \fR diff --git a/top/top.c b/top/top.c index 2591c3ab..a9932222 100644 --- a/top/top.c +++ b/top/top.c @@ -3852,6 +3852,11 @@ static void win_reset (WIN_t *q) { #endif Monpidsidx = 0; osel_clear(q); + q->findstr[0] = '\0'; +#ifndef USE_X_COLHDR + // NOHISEL_xxx is redundant (already turned off by osel_clear) + OFFw(q, NOHIFND_xxx | NOHISEL_xxx); +#endif } // end: win_reset @@ -4654,7 +4659,8 @@ static void keys_task (int ch) { TOGw(w, Show_HICOLS); capsmk(w); #else - if (ENUviz(w, w->rc.sortindx)) { + if (ENUviz(w, w->rc.sortindx) + && !CHKw(w, NOHIFND_xxx | NOHISEL_xxx)) { TOGw(w, Show_HICOLS); if (ENUpos(w, w->rc.sortindx) < w->begpflg) { if (CHKw(w, Show_HICOLS)) w->begpflg += 2;