From: Chet Ramey Date: Fri, 9 Dec 2011 01:07:17 +0000 (-0500) Subject: commit bash-20090401 snapshot X-Git-Tag: bash-4.3-alpha~234 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ccad779577c4b9be6196dfe837c40178d02f5cc;p=thirdparty%2Fbash.git commit bash-20090401 snapshot --- diff --git a/CWRU/CWRU.chlog b/CWRU/CWRU.chlog index ef585c996..197b5021c 100644 --- a/CWRU/CWRU.chlog +++ b/CWRU/CWRU.chlog @@ -7801,7 +7801,7 @@ builtins/fc.def set -o history has been enabled (interactive or not) should use it in the last_hist calculation as if it were on. Same calculation in fc_gethnum and fc_builtin. Fixes bug reported by - + Ian Kelling sig.c - change termsig_sighandler to terminate immediately if it gets called @@ -7830,3 +7830,28 @@ array.c before shifting in the new element 0 - array_shift needs to use element_index(a->head->prev) to set the max_index, not a simple decrement, to deal with sparse arrays + + 4/1 + --- +bashline.c + - in bash_dequote_filename, return right away after copying the + backslash if the last character in the string to be expanded + is a backslash. The old code copied an extra NUL and overwrote + the bounds checking. Fixes bug reported by Shawn Starr + https://bugzilla.redhat.com/show_bug.cgi?id=488649 + + 4/3 + --- +subst.c + - in pat_subst.c, make sure to copy one character from the input + string in the case of a null pattern match, since we substitute + on the null match and then increment past the current character. + Not doing this means that each character of the original string + is replaced because of the null matches. Fixes debian bug + reported bhy Louis-David Mitterrand + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=522160 + +lib/sh/winsize.c + - incorporate contents of readline/rlwinsize.h to get all the various + system dependencies right when trying to find TIOCGWINSZ. Fixes + bug reported by Dan Price diff --git a/CWRU/CWRU.chlog~ b/CWRU/CWRU.chlog~ index cb5349717..0acf78dc9 100644 --- a/CWRU/CWRU.chlog~ +++ b/CWRU/CWRU.chlog~ @@ -7801,7 +7801,7 @@ builtins/fc.def set -o history has been enabled (interactive or not) should use it in the last_hist calculation as if it were on. Same calculation in fc_gethnum and fc_builtin. Fixes bug reported by - + Ian Kelling sig.c - change termsig_sighandler to terminate immediately if it gets called @@ -7828,3 +7828,25 @@ array.c invalidated where necessary in other functions - array_rshift needs to set max_index to 0 if the array was empty before shifting in the new element 0 + - array_shift needs to use element_index(a->head->prev) to set the + max_index, not a simple decrement, to deal with sparse arrays + + 4/1 + --- +bashline.c + - in bash_dequote_filename, return right away after copying the + backslash if the last character in the string to be expanded + is a backslash. The old code copied an extra NUL and overwrote + the bounds checking. Fixes bug reported by Shawn Starr + https://bugzilla.redhat.com/show_bug.cgi?id=488649 + + 4/3 + --- +subst.c + - in pat_subst.c, make sure to copy one character from the input + string in the case of a null pattern match, since we substitute + on the null match and then increment past the current character. + Not doing this means that each character of the original string + is replaced because of the null matches. Fixes debian bug + reported bhy Louis-David Mitterrand + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=522160 diff --git a/bashline.c b/bashline.c index c5e836973..307c6ea6d 100644 --- a/bashline.c +++ b/bashline.c @@ -3225,7 +3225,7 @@ bash_dequote_filename (text, quote_char) *r++ = *++p; if (*p == '\0') - break; + return ret; /* XXX - was break; */ continue; } /* Close quote. */ diff --git a/execute_cmd.c~ b/execute_cmd.c~ index 6bb93a3b1..2cf4b5443 100644 --- a/execute_cmd.c~ +++ b/execute_cmd.c~ @@ -3592,7 +3592,10 @@ execute_simple_command (simple_command, pipe_in, pipe_out, async, fds_to_close) begin_unwind_frame ("simple-command"); if (echo_command_at_execute) +{ +itrace("execute_simple_command: xtrace_print_word_list: %s", words->word->word); xtrace_print_word_list (words, 1); +} builtin = (sh_builtin_func_t *)NULL; func = (SHELL_VAR *)NULL; @@ -4005,7 +4008,6 @@ execute_function (var, words, flags, fds_to_close, async, subshell) array_push (bash_source_a, sfile); t = itos (executing_line_number ()); -itrace("execute_function (%s): pushing %s %s", this_shell_function->name, sfile, t); array_push (bash_lineno_a, t); free (t); #endif diff --git a/lib/sh/winsize.c b/lib/sh/winsize.c index 81ebb378c..54ba61497 100644 --- a/lib/sh/winsize.c +++ b/lib/sh/winsize.c @@ -30,16 +30,33 @@ #include -#if !defined (STRUCT_WINSIZE_IN_SYS_IOCTL) -/* For struct winsize on SCO */ -/* sys/ptem.h has winsize but needs mblk_t from sys/stream.h */ -# if defined (HAVE_SYS_PTEM_H) && defined (TIOCGWINSZ) && defined (SIGWINCH) -# if defined (HAVE_SYS_STREAM_H) -# include -# endif +/* Try to find the definitions of `struct winsize' and TIOGCWINSZ */ + +#if defined (GWINSZ_IN_SYS_IOCTL) && !defined (TIOCGWINSZ) +# include +#endif /* GWINSZ_IN_SYS_IOCTL && !TIOCGWINSZ */ + +#if defined (STRUCT_WINSIZE_IN_TERMIOS) && !defined (STRUCT_WINSIZE_IN_SYS_IOCTL) +# include +#endif /* STRUCT_WINSIZE_IN_TERMIOS && !STRUCT_WINSIZE_IN_SYS_IOCTL */ + +/* Not in either of the standard places, look around. */ +#if !defined (STRUCT_WINSIZE_IN_TERMIOS) && !defined (STRUCT_WINSIZE_IN_SYS_IOCTL) +# if defined (HAVE_SYS_STREAM_H) +# include +# endif /* HAVE_SYS_STREAM_H */ +# if defined (HAVE_SYS_PTEM_H) /* SVR4.2, at least, has it here */ # include -# endif /* HAVE_SYS_PTEM_H && TIOCGWINSZ && SIGWINCH */ -#endif /* !STRUCT_WINSIZE_IN_SYS_IOCTL */ +# define _IO_PTEM_H /* work around SVR4.2 1.1.4 bug */ +# endif /* HAVE_SYS_PTEM_H */ +# if defined (HAVE_SYS_PTE_H) /* ??? */ +# include +# endif /* HAVE_SYS_PTE_H */ +#endif /* !STRUCT_WINSIZE_IN_TERMIOS && !STRUCT_WINSIZE_IN_SYS_IOCTL */ + +#if defined (M_UNIX) && !defined (_SCO_DS) && !defined (tcflow) +# define tcflow(fd, action) ioctl(fd, TCXONC, action) +#endif #include diff --git a/lib/sh/winsize.c~ b/lib/sh/winsize.c~ new file mode 100644 index 000000000..81ebb378c --- /dev/null +++ b/lib/sh/winsize.c~ @@ -0,0 +1,83 @@ +/* winsize.c - handle window size changes and information. */ + +/* Copyright (C) 2005 Free Software Foundation, Inc. + + This file is part of GNU Bash, the Bourne Again SHell. + + Bash is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + Bash is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with Bash. If not, see . +*/ + +#include "config.h" + +#include + +#include "bashtypes.h" + +#if defined (HAVE_UNISTD_H) +# include +#endif + +#include + +#if !defined (STRUCT_WINSIZE_IN_SYS_IOCTL) +/* For struct winsize on SCO */ +/* sys/ptem.h has winsize but needs mblk_t from sys/stream.h */ +# if defined (HAVE_SYS_PTEM_H) && defined (TIOCGWINSZ) && defined (SIGWINCH) +# if defined (HAVE_SYS_STREAM_H) +# include +# endif +# include +# endif /* HAVE_SYS_PTEM_H && TIOCGWINSZ && SIGWINCH */ +#endif /* !STRUCT_WINSIZE_IN_SYS_IOCTL */ + +#include + +/* Return the fd from which we are actually getting input. */ +#define input_tty() (shell_tty != -1) ? shell_tty : fileno (stderr) + +#if !defined (errno) +extern int errno; +#endif /* !errno */ + +extern int shell_tty; + +#if defined (READLINE) +extern void rl_set_screen_size __P((int, int)); +#endif +extern void sh_set_lines_and_columns __P((int, int)); + +void +get_new_window_size (from_sig, rp, cp) + int from_sig; + int *rp, *cp; +{ +#if defined (TIOCGWINSZ) + struct winsize win; + int tty; + + tty = input_tty (); + if (tty >= 0 && (ioctl (tty, TIOCGWINSZ, &win) == 0) && + win.ws_row > 0 && win.ws_col > 0) + { + sh_set_lines_and_columns (win.ws_row, win.ws_col); +#if defined (READLINE) + rl_set_screen_size (win.ws_row, win.ws_col); + if (rp) + *rp = win.ws_row; + if (cp) + *cp = win.ws_col; +#endif + } +#endif +} diff --git a/po/cs.gmo b/po/cs.gmo index 42ae24650..763445694 100644 Binary files a/po/cs.gmo and b/po/cs.gmo differ diff --git a/po/es.gmo b/po/es.gmo index a9c9aee33..9951720fd 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/id.gmo b/po/id.gmo index 1b7447fe4..22b583a81 100644 Binary files a/po/id.gmo and b/po/id.gmo differ diff --git a/po/lt.po b/po/lt.po index b783b81ef..1f299f7b4 100644 --- a/po/lt.po +++ b/po/lt.po @@ -1,22 +1,21 @@ -# translation of bash-4.0-pre1.po to Lithuanian +# translation of bash-4.0.po to Lithuanian # Copyright (C) 2008 Free Software Foundation, Inc. # This file is distributed under the same license as the bash package. # -# Gintautas Miliauskas , 2008. +# Gintautas Miliauskas , 2009. msgid "" msgstr "" -"Project-Id-Version: bash-4.0-pre1\n" +"Project-Id-Version: bash-4.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-02-19 14:53-0500\n" -"PO-Revision-Date: 2009-02-13 16:28+0200\n" +"PO-Revision-Date: 2009-03-25 16:49+0200\n" "Last-Translator: Gintautas Miliauskas \n" "Language-Team: Lithuanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" -"100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: arrayfunc.c:50 msgid "bad array subscript" @@ -68,7 +67,7 @@ msgstr "%s: trūksta dvitaškio skirtuko" #: builtins/bind.def:120 builtins/bind.def:123 msgid "line editing not enabled" -msgstr "" +msgstr "eilutės redagavimas neįgalintas" #: builtins/bind.def:206 #, c-format @@ -127,7 +126,7 @@ msgstr "OLDPWD nenustatytas" #: builtins/common.c:101 #, c-format msgid "line %d: " -msgstr "" +msgstr "eilutė %d: " #: builtins/common.c:139 error.c:260 #, c-format @@ -438,11 +437,8 @@ msgstr[2] "Aplinkos komandos, atitinkančios raktažodį „" #: builtins/help.def:168 #, c-format -msgid "" -"no help topics match `%s'. Try `help help' or `man -k %s' or `info %s'." -msgstr "" -"nėra žinyno temų, atitinkančių „%s“. Bandykite „help help“, „man -k %s“ arba " -"„info %s“." +msgid "no help topics match `%s'. Try `help help' or `man -k %s' or `info %s'." +msgstr "nėra žinyno temų, atitinkančių „%s“. Bandykite „help help“, „man -k %s“ arba „info %s“." #: builtins/help.def:185 #, c-format @@ -460,12 +456,10 @@ msgid "" "A star (*) next to a name means that the command is disabled.\n" "\n" msgstr "" -"Šios aplinkos komandos vidinės. Jei norite pamatyti šį sąrašą, įveskite " -"„help“.\n" +"Šios aplinkos komandos vidinės. Jei norite pamatyti šį sąrašą, įveskite „help“.\n" "Įveskite „help fn“, jei norite sužinoti daugiau apie funkciją „fn“.\n" "Įveskite „info bash“, jei norite daugiau sužinoti apie aplinką apskritai.\n" -"Naudokite „man -k“ ir „info“, jei norite sužinoti daugiau apie komandas, " -"nesančiasšiame sąraše.\n" +"Naudokite „man -k“ ir „info“, jei norite sužinoti daugiau apie komandas, nesančiasšiame sąraše.\n" "\n" "Žvaigždutė (*) prie vardo reiškia, kad komanda išjungta.\n" "\n" @@ -590,12 +584,10 @@ msgid "" " \twith its position in the stack\n" " \n" " Arguments:\n" -" +N\tDisplays the Nth entry counting from the left of the list shown " -"by\n" +" +N\tDisplays the Nth entry counting from the left of the list shown by\n" " \tdirs when invoked without options, starting with zero.\n" " \n" -" -N\tDisplays the Nth entry counting from the right of the list shown " -"by\n" +" -N\tDisplays the Nth entry counting from the right of the list shown by\n" "\tdirs when invoked without options, starting with zero." msgstr "" @@ -760,7 +752,7 @@ msgstr "%s: nepavyko gauti limito: %s" #: builtins/ulimit.def:453 msgid "limit" -msgstr "" +msgstr "riba" #: builtins/ulimit.def:465 builtins/ulimit.def:765 #, c-format @@ -783,7 +775,7 @@ msgstr "„%c“: netaisyklingas simbolinės veiksenos simbolis" #: error.c:89 error.c:320 error.c:322 error.c:324 msgid " line " -msgstr "" +msgstr " eilutė " #: error.c:164 #, c-format @@ -890,8 +882,7 @@ msgstr "eksponentė mažesnis už 0" #: expr.c:826 msgid "identifier expected after pre-increment or pre-decrement" -msgstr "" -"po prieš-didinimo ar prieš-mažinimo operatoriaus tikėtasi identifikatoriaus" +msgstr "po prieš-didinimo ar prieš-mažinimo operatoriaus tikėtasi identifikatoriaus" #: expr.c:854 msgid "missing `)'" @@ -919,9 +910,9 @@ msgid "value too great for base" msgstr "per didelė pagrindo reikšmė" #: expr.c:1328 -#, fuzzy, c-format +#, c-format msgid "%s: expression error\n" -msgstr "%s: tikėtasi skaitinės išraiškos" +msgstr "%s: išraiškos klaida\n" #: general.c:61 msgid "getcwd: cannot access parent directories" @@ -974,11 +965,11 @@ msgstr "describe_pid: %ld: tokio pid nėra" #: jobs.c:1416 #, c-format msgid "Signal %d" -msgstr "" +msgstr "Signalas %d" #: jobs.c:1430 jobs.c:1455 msgid "Done" -msgstr "" +msgstr "Atlikta" #: jobs.c:1435 siglist.c:122 msgid "Stopped" @@ -996,7 +987,7 @@ msgstr "" #: jobs.c:1457 #, c-format msgid "Done(%d)" -msgstr "" +msgstr "Atlikta(%d)" #: jobs.c:1459 #, c-format @@ -1005,7 +996,7 @@ msgstr "" #: jobs.c:1462 msgid "Unknown status" -msgstr "" +msgstr "Nežinoma būsena" #: jobs.c:1549 #, c-format @@ -1380,7 +1371,7 @@ msgstr "Neturiu vardo!" #: shell.c:1778 #, c-format msgid "GNU bash, version %s-(%s)\n" -msgstr "" +msgstr "GNU bash, versija %s-(%s)\n" #: shell.c:1779 #, c-format @@ -1401,8 +1392,7 @@ msgstr "Aplinkos parametrai:\n" #: shell.c:1786 msgid "\t-irsD or -c command or -O shopt_option\t\t(invocation only)\n" -msgstr "" -"\t-irsD arba -c komanda arba -O shopt_nustatymas\t\t(tik iškvietimui)\n" +msgstr "\t-irsD arba -c komanda arba -O shopt_nustatymas\t\t(tik iškvietimui)\n" #: shell.c:1801 #, c-format @@ -1412,9 +1402,7 @@ msgstr "\t-%s arba -o nustatymas\n" #: shell.c:1807 #, fuzzy, c-format msgid "Type `%s -c \"help set\"' for more information about shell options.\n" -msgstr "" -"Bandykite „%s --help“ arba „%s --usage“, jei norite gauti daugiau " -"informacijos.\n" +msgstr "Bandykite „%s --help“ arba „%s --usage“, jei norite gauti daugiau informacijos.\n" #: shell.c:1808 #, fuzzy, c-format @@ -1506,7 +1494,7 @@ msgstr "Sustabdyta (signalas)" #: siglist.c:126 msgid "Continue" -msgstr "" +msgstr "Tęsti" #: siglist.c:134 msgid "Child death or stop" @@ -1574,7 +1562,7 @@ msgstr "proceso migravimas į kitą CPU" #: siglist.c:198 msgid "programming error" -msgstr "" +msgstr "programavimo klaida" #: siglist.c:202 msgid "HFT monitor mode granted" @@ -1590,16 +1578,16 @@ msgstr "" #: siglist.c:214 msgid "Information request" -msgstr "" +msgstr "Informacijos užklausa" #: siglist.c:222 msgid "Unknown Signal #" -msgstr "" +msgstr "Nežinomas signalas #" #: siglist.c:224 #, c-format msgid "Unknown Signal #%d" -msgstr "" +msgstr "Nežinomas signalas #%d" #: subst.c:1181 subst.c:1302 #, c-format @@ -1719,8 +1707,7 @@ msgstr "run_pending_traps: bloga trap_list[%d] reikšmė: %p" #: trap.c:328 #, c-format -msgid "" -"run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" +msgid "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "run_pending_traps: signalo doroklė yra SIG_DFL, siunčiamas %d (%s) sau" #: trap.c:372 @@ -1769,30 +1756,27 @@ msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "" #: version.c:46 -#, fuzzy msgid "Copyright (C) 2009 Free Software Foundation, Inc." -msgstr "Autorinės teisės (C) 2008 Free Software Foundation, Inc." +msgstr "Autorinės teisės (C) 2009 Free Software Foundation, Inc." #: version.c:47 -msgid "" -"License GPLv3+: GNU GPL version 3 or later \n" -msgstr "" +msgid "License GPLv3+: GNU GPL version 3 or later \n" +msgstr "Licencija GPLv3+: GNU GPL versija 3 arba naujesnė \n" #: version.c:86 #, c-format msgid "GNU bash, version %s (%s)\n" -msgstr "" +msgstr "GNU bash, versija %s (%s)\n" #: version.c:91 #, c-format msgid "This is free software; you are free to change and redistribute it.\n" -msgstr "" +msgstr "Tai yra laisva programinė įranga; jūs esate laisvas keisti ir platinti ją.\n" #: version.c:92 #, c-format msgid "There is NO WARRANTY, to the extent permitted by law.\n" -msgstr "" +msgstr "Nėra JOKIOS GARANTIJOS, kiek tik tą leidžia įstatymas.\n" #: xmalloc.c:92 #, c-format @@ -1836,105 +1820,103 @@ msgstr "xrealloc: %s:%d: nepavyko išskirti %lu baitų" #: builtins.c:43 msgid "alias [-p] [name[=value] ... ]" -msgstr "" +msgstr "alias [-p] [pavadinimas[=reikšmė] ... ]" #: builtins.c:47 msgid "unalias [-a] name [name ...]" -msgstr "" +msgstr "unalias [-a] pavadinimas [pavadinimas ...]" #: builtins.c:51 -msgid "" -"bind [-lpvsPVS] [-m keymap] [-f filename] [-q name] [-u name] [-r keyseq] [-" -"x keyseq:shell-command] [keyseq:readline-function or readline-command]" +msgid "bind [-lpvsPVS] [-m keymap] [-f filename] [-q name] [-u name] [-r keyseq] [-x keyseq:shell-command] [keyseq:readline-function or readline-command]" msgstr "" #: builtins.c:54 msgid "break [n]" -msgstr "" +msgstr "break [n]" #: builtins.c:56 msgid "continue [n]" -msgstr "" +msgstr "continue [n]" #: builtins.c:58 msgid "builtin [shell-builtin [arg ...]]" -msgstr "" +msgstr "builtin [aplinkos-komanda [arg ...]]" #: builtins.c:61 msgid "caller [expr]" -msgstr "" +msgstr "caller [išraiška]" #: builtins.c:64 msgid "cd [-L|-P] [dir]" -msgstr "" +msgstr "cd [-L|-P] [aplankas]" #: builtins.c:66 msgid "pwd [-LP]" -msgstr "" +msgstr "pwd [-LP]" #: builtins.c:68 msgid ":" -msgstr "" +msgstr ":" #: builtins.c:70 msgid "true" -msgstr "" +msgstr "true" #: builtins.c:72 msgid "false" -msgstr "" +msgstr "false" #: builtins.c:74 msgid "command [-pVv] command [arg ...]" -msgstr "" +msgstr "command [-pVv] komanda [arg ...]" #: builtins.c:76 msgid "declare [-aAfFilrtux] [-p] [name[=value] ...]" -msgstr "" +msgstr "declare [-aAfFilrtux] [-p] [pavadinimas[=reikšmė] ...]" #: builtins.c:78 msgid "typeset [-aAfFilrtux] [-p] name[=value] ..." -msgstr "" +msgstr "typeset [-aAfFilrtux] [-p] pavadinimas[=reikšmė] ..." #: builtins.c:80 msgid "local [option] name[=value] ..." -msgstr "" +msgstr "local [option] pavadinimas[=reikšmė] ..." #: builtins.c:83 msgid "echo [-neE] [arg ...]" -msgstr "" +msgstr "echo [-neE] [arg ...]" #: builtins.c:87 msgid "echo [-n] [arg ...]" -msgstr "" +msgstr "echo [-n] [arg ...]" #: builtins.c:90 msgid "enable [-a] [-dnps] [-f filename] [name ...]" -msgstr "" +msgstr "enable [-a] [-dnps] [-f failopavadinimas] [pavadinimas ...]" #: builtins.c:92 msgid "eval [arg ...]" -msgstr "" +msgstr "eval [arg ...]" #: builtins.c:94 msgid "getopts optstring name [arg]" -msgstr "" +msgstr "getopts optsekos pavadinimas [arg]" #: builtins.c:96 msgid "exec [-cl] [-a name] [command [arguments ...]] [redirection ...]" -msgstr "" +msgstr "exec [-cl] [-a pavadinimas] [komanda [argumentai ...]] [nukreipimas ...]" #: builtins.c:98 msgid "exit [n]" -msgstr "" +msgstr "exit [n]" #: builtins.c:100 msgid "logout [n]" -msgstr "" +msgstr "logout [n]" #: builtins.c:103 msgid "fc [-e ename] [-lnr] [first] [last] or fc -s [pat=rep] [command]" -msgstr "" +msgstr "fc [-e evardas] [-lnr] [pirm] [pask] arba fc -s [pat=rep] [komanda]" #: builtins.c:107 msgid "fg [job_spec]" @@ -1953,9 +1935,7 @@ msgid "help [-ds] [pattern ...]" msgstr "" #: builtins.c:121 -msgid "" -"history [-c] [-d offset] [n] or history -anrw [filename] or history -ps arg " -"[arg...]" +msgid "history [-c] [-d offset] [n] or history -anrw [filename] or history -ps arg [arg...]" msgstr "" #: builtins.c:125 @@ -1967,107 +1947,100 @@ msgid "disown [-h] [-ar] [jobspec ...]" msgstr "" #: builtins.c:132 -msgid "" -"kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l " -"[sigspec]" -msgstr "" +msgid "kill [-s sigspec | -n signum | -sigspec] pid | jobspec ... or kill -l [sigspec]" +msgstr "kill [-s sigspec | -n signum | -sigspec] pid | darbospec ... arba kill -l [sigspec]" #: builtins.c:134 msgid "let arg [arg ...]" -msgstr "" +msgstr "let arg [arg ...]" #: builtins.c:136 -msgid "" -"read [-ers] [-a array] [-d delim] [-i text] [-n nchars] [-p prompt] [-t " -"timeout] [-u fd] [name ...]" +msgid "read [-ers] [-a array] [-d delim] [-i text] [-n nchars] [-p prompt] [-t timeout] [-u fd] [name ...]" msgstr "" #: builtins.c:138 msgid "return [n]" -msgstr "" +msgstr "return [n]" #: builtins.c:140 msgid "set [--abefhkmnptuvxBCHP] [-o option-name] [arg ...]" -msgstr "" +msgstr "set [--abefhkmnptuvxBCHP] [-o nustatymas] [arg ...]" #: builtins.c:142 msgid "unset [-f] [-v] [name ...]" -msgstr "" +msgstr "unset [-f] [-v] [pavadinimas ...]" #: builtins.c:144 msgid "export [-fn] [name[=value] ...] or export -p" -msgstr "" +msgstr "export [-fn] [pavadinimas[=vertė] ...] arba export -p" #: builtins.c:146 msgid "readonly [-af] [name[=value] ...] or readonly -p" -msgstr "" +msgstr "readonly [-af] [pavadinimas[=vertė] ...] arba readonly -p" #: builtins.c:148 -#, fuzzy msgid "shift [n]" -msgstr "postūmių skaičius" +msgstr "shift [n]" #: builtins.c:150 -#, fuzzy msgid "source filename [arguments]" -msgstr "reikia failo pavadinimo argumento" +msgstr "source failopavadinimas [argumentai]" #: builtins.c:152 -#, fuzzy msgid ". filename [arguments]" -msgstr "reikia failo pavadinimo argumento" +msgstr ". failopavadinimas [argumentai]" #: builtins.c:155 msgid "suspend [-f]" -msgstr "" +msgstr "suspend [-f]" #: builtins.c:158 msgid "test [expr]" -msgstr "" +msgstr "test [išrk]" #: builtins.c:160 msgid "[ arg... ]" -msgstr "" +msgstr "[ arg... ]" #: builtins.c:162 msgid "times" -msgstr "" +msgstr "times" #: builtins.c:164 msgid "trap [-lp] [[arg] signal_spec ...]" -msgstr "" +msgstr "trap [-lp] [[arg] signalo_spec ...]" #: builtins.c:166 msgid "type [-afptP] name [name ...]" -msgstr "" +msgstr "type [-afptP] pavadinimas [pavadinimas ...]" #: builtins.c:169 msgid "ulimit [-SHacdefilmnpqrstuvx] [limit]" -msgstr "" +msgstr "ulimit [-SHacdefilmnpqrstuvx] [riba]" #: builtins.c:172 msgid "umask [-p] [-S] [mode]" -msgstr "" +msgstr "umask [-p] [-S] [režimas]" #: builtins.c:175 msgid "wait [id]" -msgstr "" +msgstr "wait [id]" #: builtins.c:179 msgid "wait [pid]" -msgstr "" +msgstr "wait [pid]" #: builtins.c:182 msgid "for NAME [in WORDS ... ] ; do COMMANDS; done" -msgstr "" +msgstr "for PAVADINIMAS [in ŽODŽIAI ... ] ; do KOMANDOS; done" #: builtins.c:184 msgid "for (( exp1; exp2; exp3 )); do COMMANDS; done" -msgstr "" +msgstr "for (( išrk1; išrk2; išrk3 )); do KOMANDOS; done" #: builtins.c:186 msgid "select NAME [in WORDS ... ;] do COMMANDS; done" -msgstr "" +msgstr "select PAVADINIMAS [in ŽODŽIAI ... ;] do KOMANDOS; done" #: builtins.c:188 msgid "time [-p] pipeline" @@ -2078,18 +2051,16 @@ msgid "case WORD in [PATTERN [| PATTERN]...) COMMANDS ;;]... esac" msgstr "" #: builtins.c:192 -msgid "" -"if COMMANDS; then COMMANDS; [ elif COMMANDS; then COMMANDS; ]... [ else " -"COMMANDS; ] fi" -msgstr "" +msgid "if COMMANDS; then COMMANDS; [ elif COMMANDS; then COMMANDS; ]... [ else COMMANDS; ] fi" +msgstr "if KOMANDOS; then KOMANDOS; [ elif KOMANDOS; then KOMANDOS; ]... [ else KOMANDOS; ] fi" #: builtins.c:194 msgid "while COMMANDS; do COMMANDS; done" -msgstr "" +msgstr "while KOMANDOS; do KOMANDOS; done" #: builtins.c:196 msgid "until COMMANDS; do COMMANDS; done" -msgstr "" +msgstr "until KOMANDOS; do KOMANDOS; done" #: builtins.c:198 msgid "coproc [NAME] command [redirections]" @@ -2097,15 +2068,15 @@ msgstr "" #: builtins.c:200 msgid "function name { COMMANDS ; } or name () { COMMANDS ; }" -msgstr "" +msgstr "funkcijos pavadinimas { KOMANDOS ; } arba name () { KOMANDOS ; }" #: builtins.c:202 msgid "{ COMMANDS ; }" -msgstr "" +msgstr "{ KOMANDOS ; }" #: builtins.c:204 msgid "job_spec [&]" -msgstr "" +msgstr "darbo_spec [&]" #: builtins.c:206 msgid "(( expression ))" @@ -2117,39 +2088,34 @@ msgstr "[[ išraiška ]]" #: builtins.c:210 msgid "variables - Names and meanings of some shell variables" -msgstr "" +msgstr "kintamieji – Kai kurių aplinkos kintamųjų pavadinimai ir reikšmės" #: builtins.c:213 msgid "pushd [-n] [+N | -N | dir]" -msgstr "" +msgstr "pushd [-n] [+N | -N | dir]" #: builtins.c:217 msgid "popd [-n] [+N | -N]" -msgstr "" +msgstr "popd [-n] [+N | -N]" #: builtins.c:221 msgid "dirs [-clpv] [+N] [-N]" -msgstr "" +msgstr "dirs [-clpv] [+N] [-N]" #: builtins.c:224 msgid "shopt [-pqsu] [-o] [optname ...]" -msgstr "" +msgstr "shopt [-pqsu] [-o] [optvardas ...]" #: builtins.c:226 msgid "printf [-v var] format [arguments]" -msgstr "" +msgstr "printf [-v kint] formatas [argumentai]" #: builtins.c:229 -msgid "" -"complete [-abcdefgjksuv] [-pr] [-o option] [-A action] [-G globpat] [-W " -"wordlist] [-F function] [-C command] [-X filterpat] [-P prefix] [-S suffix] " -"[name ...]" +msgid "complete [-abcdefgjksuv] [-pr] [-o option] [-A action] [-G globpat] [-W wordlist] [-F function] [-C command] [-X filterpat] [-P prefix] [-S suffix] [name ...]" msgstr "" #: builtins.c:233 -msgid "" -"compgen [-abcdefgjksuv] [-o option] [-A action] [-G globpat] [-W wordlist] " -"[-F function] [-C command] [-X filterpat] [-P prefix] [-S suffix] [word]" +msgid "compgen [-abcdefgjksuv] [-o option] [-A action] [-G globpat] [-W wordlist] [-F function] [-C command] [-X filterpat] [-P prefix] [-S suffix] [word]" msgstr "" #: builtins.c:237 @@ -2157,15 +2123,11 @@ msgid "compopt [-o|+o option] [name ...]" msgstr "" #: builtins.c:240 -msgid "" -"mapfile [-n count] [-O origin] [-s count] [-t] [-u fd] [-C callback] [-c " -"quantum] [array]" +msgid "mapfile [-n count] [-O origin] [-s count] [-t] [-u fd] [-C callback] [-c quantum] [array]" msgstr "" #: builtins.c:242 -msgid "" -"readarray [-n count] [-O origin] [-s count] [-t] [-u fd] [-C callback] [-c " -"quantum] [array]" +msgid "readarray [-n count] [-O origin] [-s count] [-t] [-u fd] [-C callback] [-c quantum] [array]" msgstr "" #: builtins.c:254 @@ -2184,8 +2146,7 @@ msgid "" " -p\tPrint all defined aliases in a reusable format\n" " \n" " Exit Status:\n" -" alias returns true unless a NAME is supplied for which no alias has " -"been\n" +" alias returns true unless a NAME is supplied for which no alias has been\n" " defined." msgstr "" "„alias“ be argumentų arba su -p nuostata išspausdina alternatyviųjų\n" @@ -2222,24 +2183,20 @@ msgid "" " Options:\n" " -m keymap Use KEYMAP as the keymap for the duration of this\n" " command. Acceptable keymap names are emacs,\n" -" emacs-standard, emacs-meta, emacs-ctlx, vi, vi-" -"move,\n" +" emacs-standard, emacs-meta, emacs-ctlx, vi, vi-move,\n" " vi-command, and vi-insert.\n" " -l List names of functions.\n" " -P List function names and bindings.\n" " -p List functions and bindings in a form that can be\n" " reused as input.\n" -" -S List key sequences that invoke macros and their " -"values\n" -" -s List key sequences that invoke macros and their " -"values\n" +" -S List key sequences that invoke macros and their values\n" +" -s List key sequences that invoke macros and their values\n" " in a form that can be reused as input.\n" " -V List variable names and values\n" " -v List variable names and values in a form that can\n" " be reused as input.\n" " -q function-name Query about which keys invoke the named function.\n" -" -u function-name Unbind all keys which are bound to the named " -"function.\n" +" -u function-name Unbind all keys which are bound to the named function.\n" " -r keyseq Remove the binding for KEYSEQ.\n" " -f filename Read key bindings from FILENAME.\n" " -x keyseq:shell-command\tCause SHELL-COMMAND to be executed when\n" @@ -2280,8 +2237,7 @@ msgid "" " \n" " Execute SHELL-BUILTIN with arguments ARGs without performing command\n" " lookup. This is useful when you wish to reimplement a shell builtin\n" -" as a shell function, but need to execute the builtin within the " -"function.\n" +" as a shell function, but need to execute the builtin within the function.\n" " \n" " Exit Status:\n" " Returns the exit status of SHELL-BUILTIN, or false if SHELL-BUILTIN is\n" @@ -2318,22 +2274,16 @@ msgstr "" msgid "" "Change the shell working directory.\n" " \n" -" Change the current directory to DIR. The default DIR is the value of " -"the\n" +" Change the current directory to DIR. The default DIR is the value of the\n" " HOME shell variable.\n" " \n" -" The variable CDPATH defines the search path for the directory " -"containing\n" -" DIR. Alternative directory names in CDPATH are separated by a colon " -"(:).\n" -" A null directory name is the same as the current directory. If DIR " -"begins\n" +" The variable CDPATH defines the search path for the directory containing\n" +" DIR. Alternative directory names in CDPATH are separated by a colon (:).\n" +" A null directory name is the same as the current directory. If DIR begins\n" " with a slash (/), then CDPATH is not used.\n" " \n" -" If the directory is not found, and the shell option `cdable_vars' is " -"set,\n" -" the word is assumed to be a variable name. If that variable has a " -"value,\n" +" If the directory is not found, and the shell option `cdable_vars' is set,\n" +" the word is assumed to be a variable name. If that variable has a value,\n" " its value is used for DIR.\n" " \n" " Options:\n" @@ -2407,8 +2357,7 @@ msgid "" "Execute a simple command or display information about commands.\n" " \n" " Runs COMMAND with ARGS suppressing shell function lookup, or display\n" -" information about the specified COMMANDs. Can be used to invoke " -"commands\n" +" information about the specified COMMANDs. Can be used to invoke commands\n" " on disk when a function with the same name exists.\n" " \n" " Options:\n" @@ -2449,8 +2398,7 @@ msgid "" " Variables with the integer attribute have arithmetic evaluation (see\n" " the `let' command) performed when the variable is assigned a value.\n" " \n" -" When used in a function, `declare' makes NAMEs local, as with the " -"`local'\n" +" When used in a function, `declare' makes NAMEs local, as with the `local'\n" " command.\n" " \n" " Exit Status:\n" @@ -2554,8 +2502,7 @@ msgstr "" msgid "" "Execute arguments as a shell command.\n" " \n" -" Combine ARGs into a single string, use the result as input to the " -"shell,\n" +" Combine ARGs into a single string, use the result as input to the shell,\n" " and execute the resulting commands.\n" " \n" " Exit Status:\n" @@ -2608,8 +2555,7 @@ msgid "" "Replace the shell with the given command.\n" " \n" " Execute COMMAND, replacing this shell with the specified program.\n" -" ARGUMENTS become the arguments to COMMAND. If COMMAND is not " -"specified,\n" +" ARGUMENTS become the arguments to COMMAND. If COMMAND is not specified,\n" " any redirections take effect in the current shell.\n" " \n" " Options:\n" @@ -2617,13 +2563,11 @@ msgid "" " -c\t\texecute COMMAND with an empty environment\n" " -l\t\tplace a dash in the zeroth argument to COMMAND\n" " \n" -" If the command cannot be executed, a non-interactive shell exits, " -"unless\n" +" If the command cannot be executed, a non-interactive shell exits, unless\n" " the shell option `execfail' is set.\n" " \n" " Exit Status:\n" -" Returns success unless COMMAND is not found or a redirection error " -"occurs." +" Returns success unless COMMAND is not found or a redirection error occurs." msgstr "" #: builtins.c:689 @@ -2634,16 +2578,14 @@ msgid "" " Exits the shell with a status of N. If N is omitted, the exit status\n" " is that of the last command executed." msgstr "" -"Išeiti iš aplinkos su klaidos kodu N. Jei N nenurodytas, išeinant " -"nustatomas\n" +"Išeiti iš aplinkos su klaidos kodu N. Jei N nenurodytas, išeinant nustatomas\n" " paskutinės vykdytos komandos klaidos kodas." #: builtins.c:698 msgid "" "Exit a login shell.\n" " \n" -" Exits a login shell with exit status N. Returns an error if not " -"executed\n" +" Exits a login shell with exit status N. Returns an error if not executed\n" " in a login shell." msgstr "" @@ -2651,15 +2593,13 @@ msgstr "" msgid "" "Display or execute commands from the history list.\n" " \n" -" fc is used to list or edit and re-execute commands from the history " -"list.\n" +" fc is used to list or edit and re-execute commands from the history list.\n" " FIRST and LAST can be numbers specifying the range, or FIRST can be a\n" " string, which means the most recent command beginning with that\n" " string.\n" " \n" " Options:\n" -" -e ENAME\tselect which editor to use. Default is FCEDIT, then " -"EDITOR,\n" +" -e ENAME\tselect which editor to use. Default is FCEDIT, then EDITOR,\n" " \t\tthen vi\n" " -l \tlist lines instead of editing\n" " -n\tomit line numbers when listing\n" @@ -2673,8 +2613,7 @@ msgid "" " the last command.\n" " \n" " Exit Status:\n" -" Returns success or status of executed command; non-zero if an error " -"occurs." +" Returns success or status of executed command; non-zero if an error occurs." msgstr "" #: builtins.c:738 @@ -2693,10 +2632,8 @@ msgstr "" msgid "" "Move jobs to the background.\n" " \n" -" Place the jobs identified by each JOB_SPEC in the background, as if " -"they\n" -" had been started with `&'. If JOB_SPEC is not present, the shell's " -"notion\n" +" Place the jobs identified by each JOB_SPEC in the background, as if they\n" +" had been started with `&'. If JOB_SPEC is not present, the shell's notion\n" " of the current job is used.\n" " \n" " Exit Status:\n" @@ -2708,8 +2645,7 @@ msgid "" "Remember or display program locations.\n" " \n" " Determine and remember the full pathname of each command NAME. If\n" -" no arguments are given, information about remembered commands is " -"displayed.\n" +" no arguments are given, information about remembered commands is displayed.\n" " \n" " Options:\n" " -d\t\tforget the remembered location of each NAME\n" @@ -2745,8 +2681,7 @@ msgid "" " PATTERN\tPattern specifiying a help topic\n" " \n" " Exit Status:\n" -" Returns success unless PATTERN is not found or an invalid option is " -"given." +" Returns success unless PATTERN is not found or an invalid option is given." msgstr "" #: builtins.c:816 @@ -2776,8 +2711,7 @@ msgid "" " \n" " If the $HISTTIMEFORMAT variable is set and not null, its value is used\n" " as a format string for strftime(3) to print the time stamp associated\n" -" with each displayed history entry. No time stamps are printed " -"otherwise.\n" +" with each displayed history entry. No time stamps are printed otherwise.\n" " \n" " Exit Status:\n" " Returns success unless an invalid option is given or an error occurs." @@ -2853,8 +2787,7 @@ msgid "" " Evaluate each ARG as an arithmetic expression. Evaluation is done in\n" " fixed-width integers with no check for overflow, though division by 0\n" " is trapped and flagged as an error. The following list of operators is\n" -" grouped into levels of equal-precedence operators. The levels are " -"listed\n" +" grouped into levels of equal-precedence operators. The levels are listed\n" " in order of decreasing precedence.\n" " \n" " \tid++, id--\tvariable post-increment, post-decrement\n" @@ -2896,16 +2829,13 @@ msgid "" "Read a line from the standard input and split it into fields.\n" " \n" " Reads a single line from the standard input, or from file descriptor FD\n" -" if the -u option is supplied. The line is split into fields as with " -"word\n" +" if the -u option is supplied. The line is split into fields as with word\n" " splitting, and the first word is assigned to the first NAME, the second\n" " word to the second NAME, and so on, with any leftover words assigned to\n" -" the last NAME. Only the characters found in $IFS are recognized as " -"word\n" +" the last NAME. Only the characters found in $IFS are recognized as word\n" " delimiters.\n" " \n" -" If no NAMEs are supplied, the line read is stored in the REPLY " -"variable.\n" +" If no NAMEs are supplied, the line read is stored in the REPLY variable.\n" " \n" " Options:\n" " -a array\tassign the words read to sequential indices of the array\n" @@ -2920,8 +2850,7 @@ msgid "" " \t\tattempting to read\n" " -r\t\tdo not allow backslashes to escape any characters\n" " -s\t\tdo not echo input coming from a terminal\n" -" -t timeout\ttime out and return failure if a complete line of input " -"is\n" +" -t timeout\ttime out and return failure if a complete line of input is\n" " \t\tnot read withint TIMEOUT seconds. The value of the TMOUT\n" " \t\tvariable is the default timeout. TIMEOUT may be a\n" " \t\tfractional number. If TIMEOUT is 0, read returns success only\n" @@ -2930,8 +2859,7 @@ msgid "" " -u fd\t\tread from file descriptor FD instead of the standard input\n" " \n" " Exit Status:\n" -" The return code is zero, unless end-of-file is encountered, read times " -"out,\n" +" The return code is zero, unless end-of-file is encountered, read times out,\n" " or an invalid file descriptor is supplied as the argument to -u." msgstr "" @@ -2990,8 +2918,7 @@ msgid "" " physical same as -P\n" " pipefail the return value of a pipeline is the status of\n" " the last command to exit with a non-zero status,\n" -" or zero if no command exited with a non-zero " -"status\n" +" or zero if no command exited with a non-zero status\n" " posix change the behavior of bash where the default\n" " operation differs from the Posix standard to\n" " match the standard\n" @@ -3039,8 +2966,7 @@ msgid "" " -f\ttreat each NAME as a shell function\n" " -v\ttreat each NAME as a shell variable\n" " \n" -" Without options, unset first tries to unset a variable, and if that " -"fails,\n" +" Without options, unset first tries to unset a variable, and if that fails,\n" " tries to unset a function.\n" " \n" " Some variables cannot be unset; also see `readonly'.\n" @@ -3054,8 +2980,7 @@ msgid "" "Set export attribute for shell variables.\n" " \n" " Marks each NAME for automatic export to the environment of subsequently\n" -" executed commands. If VALUE is supplied, assign VALUE before " -"exporting.\n" +" executed commands. If VALUE is supplied, assign VALUE before exporting.\n" " \n" " Options:\n" " -f\trefer to shell functions\n" @@ -3163,8 +3088,7 @@ msgid "" " -x FILE True if the file is executable by you.\n" " -O FILE True if the file is effectively owned by you.\n" " -G FILE True if the file is effectively owned by your group.\n" -" -N FILE True if the file has been modified since it was last " -"read.\n" +" -N FILE True if the file has been modified since it was last read.\n" " \n" " FILE1 -nt FILE2 True if file1 is newer than file2 (according to\n" " modification date).\n" @@ -3185,8 +3109,7 @@ msgid "" " STRING1 != STRING2\n" " True if the strings are not equal.\n" " STRING1 < STRING2\n" -" True if STRING1 sorts before STRING2 " -"lexicographically.\n" +" True if STRING1 sorts before STRING2 lexicographically.\n" " STRING1 > STRING2\n" " True if STRING1 sorts after STRING2 lexicographically.\n" " \n" @@ -3221,8 +3144,7 @@ msgstr "" msgid "" "Display process times.\n" " \n" -" Prints the accumulated user and system times for the shell and all of " -"its\n" +" Prints the accumulated user and system times for the shell and all of its\n" " child processes.\n" " \n" " Exit Status:\n" @@ -3233,8 +3155,7 @@ msgstr "" msgid "" "Trap signals and other events.\n" " \n" -" Defines and activates handlers to be run when the shell receives " -"signals\n" +" Defines and activates handlers to be run when the shell receives signals\n" " or other conditions.\n" " \n" " ARG is a command to be read and executed when the shell receives the\n" @@ -3243,26 +3164,22 @@ msgid "" " value. If ARG is the null string each SIGNAL_SPEC is ignored by the\n" " shell and by the commands it invokes.\n" " \n" -" If a SIGNAL_SPEC is EXIT (0) ARG is executed on exit from the shell. " -"If\n" +" If a SIGNAL_SPEC is EXIT (0) ARG is executed on exit from the shell. If\n" " a SIGNAL_SPEC is DEBUG, ARG is executed before every simple command.\n" " \n" -" If no arguments are supplied, trap prints the list of commands " -"associated\n" +" If no arguments are supplied, trap prints the list of commands associated\n" " with each signal.\n" " \n" " Options:\n" " -l\tprint a list of signal names and their corresponding numbers\n" " -p\tdisplay the trap commands associated with each SIGNAL_SPEC\n" " \n" -" Each SIGNAL_SPEC is either a signal name in or a signal " -"number.\n" +" Each SIGNAL_SPEC is either a signal name in or a signal number.\n" " Signal names are case insensitive and the SIG prefix is optional. A\n" " signal may be sent to the shell with \"kill -signal $$\".\n" " \n" " Exit Status:\n" -" Returns success unless a SIGSPEC is invalid or an invalid option is " -"given." +" Returns success unless a SIGSPEC is invalid or an invalid option is given." msgstr "" #: builtins.c:1349 @@ -3291,16 +3208,14 @@ msgid "" " NAME\tCommand name to be interpreted.\n" " \n" " Exit Status:\n" -" Returns success if all of the NAMEs are found; fails if any are not " -"found." +" Returns success if all of the NAMEs are found; fails if any are not found." msgstr "" #: builtins.c:1380 msgid "" "Modify shell resource limits.\n" " \n" -" Provides control over the resources available to the shell and " -"processes\n" +" Provides control over the resources available to the shell and processes\n" " it creates, on systems that allow such control.\n" " \n" " Options:\n" @@ -3364,13 +3279,11 @@ msgid "" " Waits for the process identified by ID, which may be a process ID or a\n" " job specification, and reports its termination status. If ID is not\n" " given, waits for all currently active child processes, and the return\n" -" status is zero. If ID is a a job specification, waits for all " -"processes\n" +" status is zero. If ID is a a job specification, waits for all processes\n" " in the job's pipeline.\n" " \n" " Exit Status:\n" -" Returns the status of ID; fails if ID is invalid or an invalid option " -"is\n" +" Returns the status of ID; fails if ID is invalid or an invalid option is\n" " given." msgstr "" @@ -3383,8 +3296,7 @@ msgid "" " and the return code is zero. PID must be a process ID.\n" " \n" " Exit Status:\n" -" Returns the status of ID; fails if ID is invalid or an invalid option " -"is\n" +" Returns the status of ID; fails if ID is invalid or an invalid option is\n" " given." msgstr "" @@ -3469,17 +3381,12 @@ msgstr "" msgid "" "Execute commands based on conditional.\n" " \n" -" The `if COMMANDS' list is executed. If its exit status is zero, then " -"the\n" -" `then COMMANDS' list is executed. Otherwise, each `elif COMMANDS' list " -"is\n" +" The `if COMMANDS' list is executed. If its exit status is zero, then the\n" +" `then COMMANDS' list is executed. Otherwise, each `elif COMMANDS' list is\n" " executed in turn, and if its exit status is zero, the corresponding\n" -" `then COMMANDS' list is executed and the if command completes. " -"Otherwise,\n" -" the `else COMMANDS' list is executed, if present. The exit status of " -"the\n" -" entire construct is the exit status of the last command executed, or " -"zero\n" +" `then COMMANDS' list is executed and the if command completes. Otherwise,\n" +" the `else COMMANDS' list is executed, if present. The exit status of the\n" +" entire construct is the exit status of the last command executed, or zero\n" " if no condition tested true.\n" " \n" " Exit Status:\n" @@ -3532,8 +3439,7 @@ msgid "" "Define shell function.\n" " \n" " Create a shell function named NAME. When invoked as a simple command,\n" -" NAME runs COMMANDs in the calling shell's context. When NAME is " -"invoked,\n" +" NAME runs COMMANDs in the calling shell's context. When NAME is invoked,\n" " the arguments are passed to the function as $1...$n, and the function's\n" " name is in $FUNCNAME.\n" " \n" @@ -3584,12 +3490,9 @@ msgstr "" msgid "" "Execute conditional command.\n" " \n" -" Returns a status of 0 or 1 depending on the evaluation of the " -"conditional\n" -" expression EXPRESSION. Expressions are composed of the same primaries " -"used\n" -" by the `test' builtin, and may be combined using the following " -"operators:\n" +" Returns a status of 0 or 1 depending on the evaluation of the conditional\n" +" expression EXPRESSION. Expressions are composed of the same primaries used\n" +" by the `test' builtin, and may be combined using the following operators:\n" " \n" " ( EXPRESSION )\tReturns the value of EXPRESSION\n" " ! EXPRESSION\t\tTrue if EXPRESSION is false; else false\n" @@ -3737,12 +3640,10 @@ msgid "" " \twith its position in the stack\n" " \n" " Arguments:\n" -" +N\tDisplays the Nth entry counting from the left of the list shown " -"by\n" +" +N\tDisplays the Nth entry counting from the left of the list shown by\n" " \tdirs when invoked without options, starting with zero.\n" " \n" -" -N\tDisplays the Nth entry counting from the right of the list shown " -"by\n" +" -N\tDisplays the Nth entry counting from the right of the list shown by\n" " \tdirs when invoked without options, starting with zero.\n" " \n" " Exit Status:\n" @@ -3754,8 +3655,7 @@ msgid "" "Set and unset shell options.\n" " \n" " Change the setting of each shell option OPTNAME. Without any option\n" -" arguments, list all shell options with an indication of whether or not " -"each\n" +" arguments, list all shell options with an indication of whether or not each\n" " is set.\n" " \n" " Options:\n" @@ -3779,25 +3679,20 @@ msgid "" " -v var\tassign the output to shell variable VAR rather than\n" " \t\tdisplay it on the standard output\n" " \n" -" FORMAT is a character string which contains three types of objects: " -"plain\n" -" characters, which are simply copied to standard output; character " -"escape\n" +" FORMAT is a character string which contains three types of objects: plain\n" +" characters, which are simply copied to standard output; character escape\n" " sequences, which are converted and copied to the standard output; and\n" -" format specifications, each of which causes printing of the next " -"successive\n" +" format specifications, each of which causes printing of the next successive\n" " argument.\n" " \n" -" In addition to the standard format specifications described in printf" -"(1)\n" +" In addition to the standard format specifications described in printf(1)\n" " and printf(3), printf interprets:\n" " \n" " %b\texpand backslash escape sequences in the corresponding argument\n" " %q\tquote the argument in a way that can be reused as shell input\n" " \n" " Exit Status:\n" -" Returns success unless an invalid option is given or a write or " -"assignment\n" +" Returns success unless an invalid option is given or a write or assignment\n" " error occurs." msgstr "" "printf formatuoja ir spausdina ARGUMENTUS nurodytu FORMATU. FORMATAS\n" @@ -3816,10 +3711,8 @@ msgstr "" msgid "" "Specify how arguments are to be completed by Readline.\n" " \n" -" For each NAME, specify how arguments are to be completed. If no " -"options\n" -" are supplied, existing completion specifications are printed in a way " -"that\n" +" For each NAME, specify how arguments are to be completed. If no options\n" +" are supplied, existing completion specifications are printed in a way that\n" " allows them to be reused as input.\n" " \n" " Options:\n" @@ -3840,8 +3733,7 @@ msgid "" "Display possible completions depending on the options.\n" " \n" " Intended to be used from within a shell function generating possible\n" -" completions. If the optional WORD argument is supplied, matches " -"against\n" +" completions. If the optional WORD argument is supplied, matches against\n" " WORD are generated.\n" " \n" " Exit Status:\n" @@ -3856,12 +3748,9 @@ msgstr "" msgid "" "Modify or display completion options.\n" " \n" -" Modify the completion options for each NAME, or, if no NAMEs are " -"supplied,\n" -" the completion currently begin executed. If no OPTIONs are givenm, " -"print\n" -" the completion options for each NAME or the current completion " -"specification.\n" +" Modify the completion options for each NAME, or, if no NAMEs are supplied,\n" +" the completion currently begin executed. If no OPTIONs are givenm, print\n" +" the completion options for each NAME or the current completion specification.\n" " \n" " Options:\n" " \t-o option\tSet completion option OPTION for each NAME\n" @@ -3885,24 +3774,18 @@ msgstr "" msgid "" "Read lines from the standard input into an array variable.\n" " \n" -" Read lines from the standard input into the array variable ARRAY, or " -"from\n" -" file descriptor FD if the -u option is supplied. The variable MAPFILE " -"is\n" +" Read lines from the standard input into the array variable ARRAY, or from\n" +" file descriptor FD if the -u option is supplied. The variable MAPFILE is\n" " the default ARRAY.\n" " \n" " Options:\n" -" -n count\tCopy at most COUNT lines. If COUNT is 0, all lines are " -"copied.\n" -" -O origin\tBegin assigning to ARRAY at index ORIGIN. The default " -"index is 0.\n" +" -n count\tCopy at most COUNT lines. If COUNT is 0, all lines are copied.\n" +" -O origin\tBegin assigning to ARRAY at index ORIGIN. The default index is 0.\n" " -s count \tDiscard the first COUNT lines read.\n" " -t\t\tRemove a trailing newline from each line read.\n" -" -u fd\t\tRead lines from file descriptor FD instead of the standard " -"input.\n" +" -u fd\t\tRead lines from file descriptor FD instead of the standard input.\n" " -C callback\tEvaluate CALLBACK each time QUANTUM lines are read.\n" -" -c quantum\tSpecify the number of lines read between each call to " -"CALLBACK.\n" +" -c quantum\tSpecify the number of lines read between each call to CALLBACK.\n" " \n" " Arguments:\n" " ARRAY\t\tArray variable name to use for file data.\n" @@ -3911,8 +3794,7 @@ msgid "" " CALLBACK is evaluated, it is supplied the index of the next array\n" " element to be assigned as an additional argument.\n" " \n" -" If not supplied with an explicit origin, mapfile will clear ARRAY " -"before\n" +" If not supplied with an explicit origin, mapfile will clear ARRAY before\n" " assigning to it.\n" " \n" " Exit Status:\n" @@ -3938,8 +3820,7 @@ msgstr "" #~ msgid "can be used used to provide a stack trace." #~ msgstr "gali būti panaudota generuojant steko išrašą (stack trace)." -#~ msgid "" -#~ "The value of EXPR indicates how many call frames to go back before the" +#~ msgid "The value of EXPR indicates how many call frames to go back before the" #~ msgstr "EXPR reikšmė nurodo, per kiek kvietimo freimų eiti atgal prieš" #~ msgid "current one; the top frame is frame 0." @@ -3960,12 +3841,10 @@ msgstr "" #~ msgid "back up through the list with the `popd' command." #~ msgstr "sąrašu su „popd“ komanda." -#~ msgid "" -#~ "The -l flag specifies that `dirs' should not print shorthand versions" +#~ msgid "The -l flag specifies that `dirs' should not print shorthand versions" #~ msgstr "Parametras -l nurodo, kad „dirs“ neturėtų spausdinti sutrumpintų" -#~ msgid "" -#~ "of directories which are relative to your home directory. This means" +#~ msgid "of directories which are relative to your home directory. This means" #~ msgstr "aplankų, santykinių namų aplinkui, pavadinimų. Tai reiškia, kad" #, fuzzy @@ -3975,26 +3854,22 @@ msgstr "" #~ msgid "causes `dirs' to print the directory stack with one entry per line," #~ msgstr "„dirs“ išveda aplankų steką po vieną pavadinimą eilutėje," -#~ msgid "" -#~ "prepending the directory name with its position in the stack. The -p" +#~ msgid "prepending the directory name with its position in the stack. The -p" #~ msgstr "prieš pavadinimą prirašoma aplanko pozicija steke. Parametras -p" #~ msgid "flag does the same thing, but the stack position is not prepended." #~ msgstr "turi tokį patį efektą, tačiau pozicija steke neišvedama." -#~ msgid "" -#~ "The -c flag clears the directory stack by deleting all of the elements." +#~ msgid "The -c flag clears the directory stack by deleting all of the elements." #~ msgstr "Parametras -c išvalo aplankų steką." -#~ msgid "" -#~ "+N displays the Nth entry counting from the left of the list shown by" +#~ msgid "+N displays the Nth entry counting from the left of the list shown by" #~ msgstr "+N rodo N-tąjį įrašą skaičiuojant iš kairės sąraše, rodomame" #~ msgid " dirs when invoked without options, starting with zero." #~ msgstr " „dirs“, iškviesto be parametrų (skaičiuojama nuo nulio)." -#~ msgid "" -#~ "-N displays the Nth entry counting from the right of the list shown by" +#~ msgid "-N displays the Nth entry counting from the right of the list shown by" #~ msgstr "-N rodo N-tajį įrašą skaičiuojant iš dešinės sąraše, rodomame" #~ msgid "Adds a directory to the top of the directory stack, or rotates" @@ -4046,8 +3921,7 @@ msgstr "" #~ msgstr "steko viršūnėje esančiu." #~ msgid "+N removes the Nth entry counting from the left of the list" -#~ msgstr "" -#~ "+N pašalina N-tąjį įrašą skaičiuojant iš kairės sąraše, išvedamame „dir“" +#~ msgstr "+N pašalina N-tąjį įrašą skaičiuojant iš kairės sąraše, išvedamame „dir“" #~ msgid " shown by `dirs', starting with zero. For example: `popd +0'" #~ msgstr " (skaičiuojama nuo nulio). Pavyzdžiui: „popd +0“" @@ -4056,9 +3930,7 @@ msgstr "" #~ msgstr " pašalina pirmąjį aplanką, „popd +1“ – antrąjį." #~ msgid "-N removes the Nth entry counting from the right of the list" -#~ msgstr "" -#~ "+N pašalina N-tąjį įrašą skaičiuojant iš dešinės sąraše, išvedamame " -#~ "„dir“" +#~ msgstr "+N pašalina N-tąjį įrašą skaičiuojant iš dešinės sąraše, išvedamame „dir“" #~ msgid " shown by `dirs', starting with zero. For example: `popd -0'" #~ msgstr " (skaičiuojama nuo nulio). Pavyzdžiui: „popd -0“" @@ -4066,8 +3938,7 @@ msgstr "" #~ msgid " removes the last directory, `popd -1' the next to last." #~ msgstr " pašalina paskutinį aplanką, „popd -1“ – priešpaskutinį." -#~ msgid "" -#~ "-n suppress the normal change of directory when removing directories" +#~ msgid "-n suppress the normal change of directory when removing directories" #~ msgstr " išjungti įprastą darbinio aplanko keitimą šalinant aplankus" #~ msgid " from the stack, so only the stack is manipulated." @@ -4131,15 +4002,12 @@ msgstr "" #~ " „local“ gali būti naudojamas tik funkcijose; jis sukuria kintamąjį,\n" #~ " matomą tik pačioje funkcijoje ir jos dukterinėse funkcijose." -#~ msgid "" -#~ "Output the ARGs. If -n is specified, the trailing newline is suppressed." +#~ msgid "Output the ARGs. If -n is specified, the trailing newline is suppressed." #~ msgstr "" -#~ "Išspausdinti ARGUMENTUS. Jei nurodytas -n, nespausdinamas naujos " -#~ "eilutės\n" +#~ "Išspausdinti ARGUMENTUS. Jei nurodytas -n, nespausdinamas naujos eilutės\n" #~ " simbolis pabaigoje." -#~ msgid "" -#~ "Read ARGs as input to the shell and execute the resulting command(s)." +#~ msgid "Read ARGs as input to the shell and execute the resulting command(s)." #~ msgstr "Skaityti ARGUMENTUS kaip aplinkos komandas ir jas vykdyti." #~ msgid "Logout of a login shell." @@ -4163,8 +4031,7 @@ msgstr "" #~ " Jei nurodytas „-v“, unset veiks tik su kintamaisiais. Jei nurodytas\n" #~ " „-f“, unset veiks tik su funkcijomis. Jei nenurodytas nei vienas iš\n" #~ " šių parametrų, unset pirmiausiai bandys pašalinti kintamąjį, ir jei\n" -#~ " tai nepasiseks, bandys pašalinti funkciją. Kai kurie kintamieji " -#~ "negali\n" +#~ " tai nepasiseks, bandys pašalinti funkciją. Kai kurie kintamieji negali\n" #~ " būti pašalinti; žr. „readonly“." #~ msgid "" @@ -4173,8 +4040,7 @@ msgstr "" #~ " being a login shell if it is; just suspend anyway." #~ msgstr "" #~ "Sustabdyti šios aplinkos darbą, kol bus gautas SIGCONT\n" -#~ " signalas. Jei nurodyta „-f“, nesiskųsti, jei ši aplinka yra " -#~ "prisijungimo\n" +#~ " signalas. Jei nurodyta „-f“, nesiskųsti, jei ši aplinka yra prisijungimo\n" #~ " aplinka (login shell) ir sustabdyti ją bet kuriuo atveju." #~ msgid "" @@ -4188,14 +4054,10 @@ msgstr "" #~ msgid "" #~ "For each NAME, specify how arguments are to be completed.\n" -#~ " If the -p option is supplied, or if no options are supplied, " -#~ "existing\n" -#~ " completion specifications are printed in a way that allows them to " -#~ "be\n" -#~ " reused as input. The -r option removes a completion specification " -#~ "for\n" -#~ " each NAME, or, if no NAMEs are supplied, all completion " -#~ "specifications." +#~ " If the -p option is supplied, or if no options are supplied, existing\n" +#~ " completion specifications are printed in a way that allows them to be\n" +#~ " reused as input. The -r option removes a completion specification for\n" +#~ " each NAME, or, if no NAMEs are supplied, all completion specifications." #~ msgstr "" #~ "Kiekvienam VARDUI nurodyti, kaip argumentai turėtų būti užbaigti.\n" #~ " Jei pateiktas -p nustatymas arba nepateikta jokių nustatymų,\n" diff --git a/po/nl.gmo b/po/nl.gmo index c56b4761b..890c0cd82 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/sk.gmo b/po/sk.gmo index 7c8efd2bb..769b001fc 100644 Binary files a/po/sk.gmo and b/po/sk.gmo differ diff --git a/po/sv.gmo b/po/sv.gmo index 2c003b86a..15eda2c52 100644 Binary files a/po/sv.gmo and b/po/sv.gmo differ diff --git a/po/sv.po b/po/sv.po index e07e2f8c9..1a5b5a65a 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,16 +1,16 @@ # Swedish translation of bash -# Copyright © 2008 Free Software Foundation, Inc. +# Copyright © 2008, 2009 Free Software Foundation, Inc. # This file is distributed under the same license as the bash package. -# Göran Uddeborg , 2008. +# Göran Uddeborg , 2008, 2009. # -# $Revision: 1.4 $ +# $Revision: 1.6 $ # msgid "" msgstr "" -"Project-Id-Version: bash 4.0-pre1\n" +"Project-Id-Version: bash 4.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-25 11:13-0400\n" -"PO-Revision-Date: 2009-02-26 22:32+0100\n" +"POT-Creation-Date: 2009-02-19 14:53-0500\n" +"PO-Revision-Date: 2009-03-25 19:35+0100\n" "Last-Translator: Göran Uddeborg \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" @@ -18,80 +18,84 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: arrayfunc.c:49 +#: arrayfunc.c:50 msgid "bad array subscript" msgstr "felaktigt vektorindex" -#: arrayfunc.c:312 builtins/declare.def:467 +#: arrayfunc.c:313 builtins/declare.def:474 #, c-format msgid "%s: cannot convert indexed to associative array" msgstr "%s: det går inte att konvertera en indexerad vektor till associativ" -#: arrayfunc.c:478 +#: arrayfunc.c:479 #, c-format msgid "%s: invalid associative array key" msgstr "%s: ogiltig nyckel till associativ vektor" -#: arrayfunc.c:480 +#: arrayfunc.c:481 #, c-format msgid "%s: cannot assign to non-numeric index" msgstr "%s: det går inte att tilldela till ickenumeriska index" -#: arrayfunc.c:516 +#: arrayfunc.c:517 #, c-format msgid "%s: %s: must use subscript when assigning associative array" msgstr "%s: %s: måste använda index vid tilldelning av associativ vektor" -#: bashhist.c:382 +#: bashhist.c:379 #, c-format msgid "%s: cannot create: %s" msgstr "%s: det går inte att skapa: %s" -#: bashline.c:3190 +#: bashline.c:3413 msgid "bash_execute_unix_command: cannot find keymap for command" msgstr "bash_execute_unix_command: det går inte att hitta en tangentbindning för kommandot" -#: bashline.c:3268 +#: bashline.c:3491 #, c-format msgid "%s: first non-whitespace character is not `\"'" msgstr "%s: första ickeblanka tecknet är inte '\"'" -#: bashline.c:3297 +#: bashline.c:3520 #, c-format msgid "no closing `%c' in %s" msgstr "ingen avslutande \"%c\" i %s" -#: bashline.c:3331 +#: bashline.c:3554 #, c-format msgid "%s: missing colon separator" msgstr "%s: kolonseparator saknas" -#: builtins/bind.def:199 +#: builtins/bind.def:120 builtins/bind.def:123 +msgid "line editing not enabled" +msgstr "radredigering är inte aktiverat" + +#: builtins/bind.def:206 #, c-format msgid "`%s': invalid keymap name" msgstr "\"%s\": ogiltigt tangentbindningsnamn" -#: builtins/bind.def:238 +#: builtins/bind.def:245 #, c-format msgid "%s: cannot read: %s" msgstr "%s: det går inte att läsa: %s" -#: builtins/bind.def:253 +#: builtins/bind.def:260 #, c-format msgid "`%s': cannot unbind" msgstr "\"%s\": det går inte att avbinda" -#: builtins/bind.def:288 builtins/bind.def:318 +#: builtins/bind.def:295 builtins/bind.def:325 #, c-format msgid "`%s': unknown function name" msgstr "\"%s\": okänt funktionsnamn" -#: builtins/bind.def:296 +#: builtins/bind.def:303 #, c-format msgid "%s is not bound to any keys.\n" msgstr "%s är inte bundet till några tangenter.\n" -#: builtins/bind.def:300 +#: builtins/bind.def:307 #, c-format msgid "%s can be invoked via " msgstr "%s kan anropas via " @@ -104,6 +108,16 @@ msgstr "slingräknare" msgid "only meaningful in a `for', `while', or `until' loop" msgstr "endast meningsfullt i en \"for\"-, \"while\"- eller \"until\"-slinga" +#: builtins/caller.def:133 +msgid "" +"Returns the context of the current subroutine call.\n" +" \n" +" Without EXPR, returns " +msgstr "" +"Returnera kontexten för det aktuella subrutinanropet.\n" +" \n" +" Utan UTTR, returnerar " + #: builtins/cd.def:215 msgid "HOME not set" msgstr "HOME är inte satt" @@ -112,130 +126,145 @@ msgstr "HOME är inte satt" msgid "OLDPWD not set" msgstr "OLDPWD är inte satt" -#: builtins/common.c:107 +#: builtins/common.c:101 #, c-format msgid "line %d: " msgstr "rad %d: " -#: builtins/common.c:124 +#: builtins/common.c:139 error.c:260 +#, c-format +msgid "warning: " +msgstr "varning: " + +#: builtins/common.c:153 #, c-format msgid "%s: usage: " msgstr "%s: användning: " -#: builtins/common.c:137 test.c:822 +#: builtins/common.c:166 test.c:822 msgid "too many arguments" msgstr "för många argument" -#: builtins/common.c:162 shell.c:493 shell.c:774 +#: builtins/common.c:191 shell.c:493 shell.c:774 #, c-format msgid "%s: option requires an argument" msgstr "%s: flaggan kräver ett argument" -#: builtins/common.c:169 +#: builtins/common.c:198 #, c-format msgid "%s: numeric argument required" msgstr "%s: numeriskt argument krävs" -#: builtins/common.c:176 +#: builtins/common.c:205 #, c-format msgid "%s: not found" msgstr "%s: finns inte" -#: builtins/common.c:185 shell.c:787 +#: builtins/common.c:214 shell.c:787 #, c-format msgid "%s: invalid option" msgstr "%s: ogiltig flagga" -#: builtins/common.c:192 +#: builtins/common.c:221 #, c-format msgid "%s: invalid option name" msgstr "%s: ogiltigt flaggnamn" -#: builtins/common.c:199 general.c:231 general.c:236 +#: builtins/common.c:228 general.c:231 general.c:236 #, c-format msgid "`%s': not a valid identifier" msgstr "\"%s\": inte en giltig identifierare" -#: builtins/common.c:209 +#: builtins/common.c:238 msgid "invalid octal number" msgstr "ogiltigt oktalt tal" -#: builtins/common.c:211 +#: builtins/common.c:240 msgid "invalid hex number" msgstr "ogiltigt hexadecimalt tal" -#: builtins/common.c:213 expr.c:1255 +#: builtins/common.c:242 expr.c:1255 msgid "invalid number" msgstr "ogiltigt tal" -#: builtins/common.c:221 +#: builtins/common.c:250 #, c-format msgid "%s: invalid signal specification" msgstr "%s: ogiltig signalspecifikation" -#: builtins/common.c:228 +#: builtins/common.c:257 #, c-format msgid "`%s': not a pid or valid job spec" msgstr "\"%s\": inte en pid eller giltig jobbspecifikation" -#: builtins/common.c:235 error.c:453 +#: builtins/common.c:264 error.c:453 #, c-format msgid "%s: readonly variable" msgstr "%s: endast läsbar variabel" -#: builtins/common.c:243 +#: builtins/common.c:272 #, c-format msgid "%s: %s out of range" msgstr "%s: %s utanför giltigt intervall" -#: builtins/common.c:243 builtins/common.c:245 +#: builtins/common.c:272 builtins/common.c:274 msgid "argument" msgstr "argument" -#: builtins/common.c:245 +#: builtins/common.c:274 #, c-format msgid "%s out of range" msgstr "%s utanför giltigt intervall" -#: builtins/common.c:253 +#: builtins/common.c:282 #, c-format msgid "%s: no such job" msgstr "%s: inget sådant jobb" -#: builtins/common.c:261 +#: builtins/common.c:290 #, c-format msgid "%s: no job control" msgstr "%s: ingen jobbstyrning" -#: builtins/common.c:263 +#: builtins/common.c:292 msgid "no job control" msgstr "ingen jobbstyrning" -#: builtins/common.c:273 +#: builtins/common.c:302 #, c-format msgid "%s: restricted" msgstr "%s: begränsat" -#: builtins/common.c:275 +#: builtins/common.c:304 msgid "restricted" msgstr "begränsat" -#: builtins/common.c:283 +#: builtins/common.c:312 #, c-format msgid "%s: not a shell builtin" msgstr "%s: inte inbyggt i skalet" -#: builtins/common.c:292 +#: builtins/common.c:321 #, c-format msgid "write error: %s" msgstr "skrivfel: %s" -#: builtins/common.c:523 +#: builtins/common.c:329 +#, c-format +msgid "error setting terminal attributes: %s" +msgstr "fel när terminalattribut ställdes in: %s" + +#: builtins/common.c:331 +#, c-format +msgid "error getting terminal attributes: %s" +msgstr "fel när terminalattribut hämtades: %s" + +#: builtins/common.c:563 #, c-format msgid "%s: error retrieving current directory: %s: %s\n" msgstr "%s: fel när aktuell katalog hämtades: %s: %s\n" -#: builtins/common.c:589 builtins/common.c:591 +#: builtins/common.c:629 builtins/common.c:631 #, c-format msgid "%s: ambiguous job spec" msgstr "%s: tvetydig jobbspecifikation" @@ -271,17 +300,17 @@ msgstr "kan endast användas i en funktion" msgid "cannot use `-f' to make functions" msgstr "det går inte att använda \"-f\" för att göra funktioner" -#: builtins/declare.def:365 execute_cmd.c:4696 +#: builtins/declare.def:365 execute_cmd.c:4818 #, c-format msgid "%s: readonly function" msgstr "%s: endast läsbar funktion" -#: builtins/declare.def:454 +#: builtins/declare.def:461 #, c-format msgid "%s: cannot destroy array variables in this way" msgstr "%s: det går inte att förstöra vektorvariabler på detta sätt" -#: builtins/declare.def:461 +#: builtins/declare.def:468 #, c-format msgid "%s: cannot convert associative to indexed array" msgstr "%s: det går inte att konvertera en associativ vektor till indexerad" @@ -310,7 +339,7 @@ msgstr "%s: inte dynamiskt laddad" msgid "%s: cannot delete: %s" msgstr "%s: kan inte ta bort: %s" -#: builtins/evalfile.c:134 builtins/hash.def:169 execute_cmd.c:4553 +#: builtins/evalfile.c:134 builtins/hash.def:169 execute_cmd.c:4675 #: shell.c:1439 #, c-format msgid "%s: is a directory" @@ -326,7 +355,7 @@ msgstr "%s: inte en normal fil" msgid "%s: file is too large" msgstr "%s: filen är för stor" -#: builtins/evalfile.c:185 execute_cmd.c:4623 shell.c:1449 +#: builtins/evalfile.c:185 execute_cmd.c:4745 shell.c:1449 #, c-format msgid "%s: cannot execute binary file" msgstr "%s: det går inte att köra binär fil" @@ -446,7 +475,7 @@ msgstr "det går inte att använda mer än en av -anrw" msgid "history position" msgstr "historieposition" -#: builtins/history.def:366 +#: builtins/history.def:365 #, c-format msgid "%s: history expansion failed" msgstr "%s: historieexpansionen misslyckades" @@ -473,55 +502,55 @@ msgstr "Okänt fel" msgid "expression expected" msgstr "uttryck förväntades" -#: builtins/mapfile.def:215 builtins/read.def:271 +#: builtins/mapfile.def:241 builtins/read.def:272 #, c-format msgid "%s: invalid file descriptor specification" msgstr "%s: ogiltig filidentifierarspecifikation" -#: builtins/mapfile.def:223 builtins/read.def:278 +#: builtins/mapfile.def:249 builtins/read.def:279 #, c-format msgid "%d: invalid file descriptor: %s" msgstr "%d: ogiltig filbeskrivare: %s" -#: builtins/mapfile.def:232 builtins/mapfile.def:270 +#: builtins/mapfile.def:258 builtins/mapfile.def:296 #, c-format msgid "%s: invalid line count" msgstr "%s: ogiltigt radantal" -#: builtins/mapfile.def:243 +#: builtins/mapfile.def:269 #, c-format msgid "%s: invalid array origin" msgstr "%s: ogiltig vektorstart" -#: builtins/mapfile.def:260 +#: builtins/mapfile.def:286 #, c-format msgid "%s: invalid callback quantum" msgstr "%s: ogiltigt återanropskvanta" -#: builtins/mapfile.def:292 +#: builtins/mapfile.def:318 msgid "empty array variable name" msgstr "tomt vektorvariabelnamn" -#: builtins/mapfile.def:313 +#: builtins/mapfile.def:339 msgid "array variable support required" msgstr "stöd för vektorvariabler krävs" -#: builtins/printf.def:364 +#: builtins/printf.def:367 #, c-format msgid "`%s': missing format character" msgstr "\"%s\": formateringstecken saknas" -#: builtins/printf.def:541 +#: builtins/printf.def:544 #, c-format msgid "`%c': invalid format character" msgstr "\"%c\": ogiltigt formateringstecken" -#: builtins/printf.def:568 +#: builtins/printf.def:571 #, c-format msgid "warning: %s: %s" msgstr "varning: %s: %s" -#: builtins/printf.def:747 +#: builtins/printf.def:750 msgid "missing hex digit for \\x" msgstr "hexadecimal siffra saknas för \\x" @@ -665,17 +694,17 @@ msgstr "" " \n" " Den inbyggda \"dirs\" visar katalogstacken." -#: builtins/read.def:247 +#: builtins/read.def:248 #, c-format msgid "%s: invalid timeout specification" msgstr "%s: ogiltig tidsgränsspecifikation" -#: builtins/read.def:569 +#: builtins/read.def:574 #, c-format msgid "read error: %d: %s" msgstr "läsfel: %d: %s" -#: builtins/return.def:68 +#: builtins/return.def:73 msgid "can only `return' from a function or sourced script" msgstr "det går bara att göra \"return\" från en funktion eller källinläst skript" @@ -707,11 +736,11 @@ msgstr "%s: inte en funktion" msgid "shift count" msgstr "skiftantal" -#: builtins/shopt.def:250 +#: builtins/shopt.def:254 msgid "cannot set and unset shell options simultaneously" msgstr "det går inte att sätta och ta bort skalflaggor samtidigt" -#: builtins/shopt.def:315 +#: builtins/shopt.def:319 #, c-format msgid "%s: invalid shell option name" msgstr "%s: ogiltigt skalflaggsnamn" @@ -815,11 +844,6 @@ msgstr "senaste kommando: %s\n" msgid "Aborting..." msgstr "Avbryter..." -#: error.c:260 -#, c-format -msgid "warning: " -msgstr "varning: " - #: error.c:405 msgid "unknown command error" msgstr "okänt kommandofel" @@ -846,36 +870,36 @@ msgstr "%s: obunden variabel" msgid "\atimed out waiting for input: auto-logout\n" msgstr "\atiden gick ut i väntan på indata: automatisk utloggning\n" -#: execute_cmd.c:483 +#: execute_cmd.c:491 #, c-format msgid "cannot redirect standard input from /dev/null: %s" msgstr "det går inte att omdiregera standard in från /dev/null: %s" -#: execute_cmd.c:1079 +#: execute_cmd.c:1112 #, c-format msgid "TIMEFORMAT: `%c': invalid format character" msgstr "TIMEFORMAT: \"%c\": ogiltigt formateringstecken" -#: execute_cmd.c:1930 +#: execute_cmd.c:2011 msgid "pipe error" msgstr "rörfel" -#: execute_cmd.c:4243 +#: execute_cmd.c:4363 #, c-format msgid "%s: restricted: cannot specify `/' in command names" msgstr "%s: begränsat: det går inte att ange \"/\" i kommandonamn" -#: execute_cmd.c:4334 +#: execute_cmd.c:4454 #, c-format msgid "%s: command not found" msgstr "%s: kommandot finns inte" -#: execute_cmd.c:4586 +#: execute_cmd.c:4708 #, c-format msgid "%s: %s: bad interpreter" msgstr "%s: %s: felaktig tolk" -#: execute_cmd.c:4735 +#: execute_cmd.c:4857 #, c-format msgid "cannot duplicate fd %d to fd %d" msgstr "det går inte att duplicera fb %d till fb %d" @@ -950,7 +974,7 @@ msgstr "%s: uttrycksfel\n" msgid "getcwd: cannot access parent directories" msgstr "getcwd: det går inte att komma åt föräldrakatalogen" -#: input.c:94 subst.c:4551 +#: input.c:94 subst.c:4559 #, c-format msgid "cannot reset nodelay mode for fd %d" msgstr "det går inte att återställa fördröjningsfritt läge för fb %d" @@ -965,144 +989,144 @@ msgstr "det går inte att allokera en ny filbeskrivare för bashindata från fb msgid "save_bash_input: buffer already exists for new fd %d" msgstr "save_bash_input: buffert finns redan för ny fb %d" -#: jobs.c:464 +#: jobs.c:466 msgid "start_pipeline: pgrp pipe" msgstr "start_pipeline: pgrp rör" -#: jobs.c:879 +#: jobs.c:887 #, c-format msgid "forked pid %d appears in running job %d" msgstr "avgrenad pid %d fins i körande jobb %d" -#: jobs.c:997 +#: jobs.c:1005 #, c-format msgid "deleting stopped job %d with process group %ld" msgstr "tar bort stoppat jobb %d med processgrupp %ld" -#: jobs.c:1102 +#: jobs.c:1110 #, c-format msgid "add_process: process %5ld (%s) in the_pipeline" msgstr "add_process: process %5ld (%s) i the_pipeline" -#: jobs.c:1105 +#: jobs.c:1113 #, c-format msgid "add_process: pid %5ld (%s) marked as still alive" msgstr "add_process: pid %5ld (%s) markerad som fortfarande vid liv" -#: jobs.c:1393 +#: jobs.c:1401 #, c-format msgid "describe_pid: %ld: no such pid" msgstr "describe_pid: %ld: ingen sådan pid" -#: jobs.c:1408 +#: jobs.c:1416 #, c-format msgid "Signal %d" msgstr "Signal %d" -#: jobs.c:1422 jobs.c:1447 +#: jobs.c:1430 jobs.c:1455 msgid "Done" msgstr "Klart" -#: jobs.c:1427 siglist.c:122 +#: jobs.c:1435 siglist.c:122 msgid "Stopped" msgstr "Stoppat" -#: jobs.c:1431 +#: jobs.c:1439 #, c-format msgid "Stopped(%s)" msgstr "Stoppat(%s)" -#: jobs.c:1435 +#: jobs.c:1443 msgid "Running" msgstr "Kör" -#: jobs.c:1449 +#: jobs.c:1457 #, c-format msgid "Done(%d)" msgstr "Klart(%d)" -#: jobs.c:1451 +#: jobs.c:1459 #, c-format msgid "Exit %d" msgstr "Avslut %d" -#: jobs.c:1454 +#: jobs.c:1462 msgid "Unknown status" msgstr "Okänd status" -#: jobs.c:1541 +#: jobs.c:1549 #, c-format msgid "(core dumped) " msgstr "(minnesutskrift skapad) " -#: jobs.c:1560 +#: jobs.c:1568 #, c-format msgid " (wd: %s)" msgstr " (ak: %s)" -#: jobs.c:1761 +#: jobs.c:1771 #, c-format msgid "child setpgid (%ld to %ld)" msgstr "barns setpgid (%ld till %ld)" -#: jobs.c:2089 nojobs.c:576 +#: jobs.c:2099 nojobs.c:585 #, c-format msgid "wait: pid %ld is not a child of this shell" msgstr "wait: pid %ld är inte ett barn till detta skal" -#: jobs.c:2316 +#: jobs.c:2326 #, c-format msgid "wait_for: No record of process %ld" msgstr "wait_for: Ingen uppgift om process %ld" -#: jobs.c:2588 +#: jobs.c:2598 #, c-format msgid "wait_for_job: job %d is stopped" msgstr "wait_for_job: jobb %d är stoppat" -#: jobs.c:2810 +#: jobs.c:2820 #, c-format msgid "%s: job has terminated" msgstr "%s: jobbet har avslutat" -#: jobs.c:2819 +#: jobs.c:2829 #, c-format msgid "%s: job %d already in background" msgstr "%s: jobb %d är redan i bakgrunden" -#: jobs.c:3482 +#: jobs.c:3492 #, c-format msgid "%s: line %d: " msgstr "%s: rad %d: " -#: jobs.c:3496 nojobs.c:805 +#: jobs.c:3506 nojobs.c:814 #, c-format msgid " (core dumped)" msgstr " (minnesutskrift skapad)" -#: jobs.c:3508 jobs.c:3521 +#: jobs.c:3518 jobs.c:3531 #, c-format msgid "(wd now: %s)\n" msgstr "(ak nu: %s)\n" -#: jobs.c:3553 +#: jobs.c:3563 msgid "initialize_job_control: getpgrp failed" msgstr "initialize_job_control: getpgrp misslyckades" -#: jobs.c:3613 +#: jobs.c:3623 msgid "initialize_job_control: line discipline" msgstr "initialize_job_control: linjedisciplin" -#: jobs.c:3623 +#: jobs.c:3633 msgid "initialize_job_control: setpgid" msgstr "initialize_job_control: setpgid" -#: jobs.c:3651 +#: jobs.c:3661 #, c-format msgid "cannot set terminal process group (%d)" msgstr "det går inte att sätta terminalprocessgrupp (%d)" -#: jobs.c:3656 +#: jobs.c:3666 msgid "no job control in this shell" msgstr "ingen jobbstyrning i detta skal" @@ -1235,103 +1259,103 @@ msgstr "här-dokument på rad %d avgränsas av filslut (ville ha \"%s\")" msgid "make_redirection: redirection instruction `%d' out of range" msgstr "make_redirection: omdirigeringsinstruktion \"%d\" utanför giltigt intervall" -#: parse.y:2982 parse.y:3204 +#: parse.y:2986 parse.y:3218 #, c-format msgid "unexpected EOF while looking for matching `%c'" msgstr "oväntat filslut vid sökning efter matchande \"%c\"" -#: parse.y:3708 +#: parse.y:3722 msgid "unexpected EOF while looking for `]]'" msgstr "oväntat filslut vid sökning efter \"]]\"" -#: parse.y:3713 +#: parse.y:3727 #, c-format msgid "syntax error in conditional expression: unexpected token `%s'" msgstr "syntaxfel i villkorligt uttryck: oväntad symbol \"%s\"" -#: parse.y:3717 +#: parse.y:3731 msgid "syntax error in conditional expression" msgstr "syntaxfel i villkorligt uttryck" -#: parse.y:3795 +#: parse.y:3809 #, c-format msgid "unexpected token `%s', expected `)'" msgstr "oväntad symbol \"%s\", \")\" förväntades" -#: parse.y:3799 +#: parse.y:3813 msgid "expected `)'" msgstr "\")\" förväntades" -#: parse.y:3827 +#: parse.y:3841 #, c-format msgid "unexpected argument `%s' to conditional unary operator" msgstr "oväntat argument \"%s\" till villkorlig unär operator" -#: parse.y:3831 +#: parse.y:3845 msgid "unexpected argument to conditional unary operator" msgstr "oväntat argument till villkorlig unär operator" -#: parse.y:3871 +#: parse.y:3885 #, c-format msgid "unexpected token `%s', conditional binary operator expected" msgstr "oväntad symbol \"%s\", villkorlig binär operator förväntades" -#: parse.y:3875 +#: parse.y:3889 msgid "conditional binary operator expected" msgstr "villkorlig binär operato förväntades" -#: parse.y:3892 +#: parse.y:3906 #, c-format msgid "unexpected argument `%s' to conditional binary operator" msgstr "oväntat argument \"%s\" till villkorlig binär operator" -#: parse.y:3896 +#: parse.y:3910 msgid "unexpected argument to conditional binary operator" msgstr "oväntat argument till villkorlig binär operator" -#: parse.y:3907 +#: parse.y:3921 #, c-format msgid "unexpected token `%c' in conditional command" msgstr "oväntad symbol \"%c\" i villkorligt kommando" -#: parse.y:3910 +#: parse.y:3924 #, c-format msgid "unexpected token `%s' in conditional command" msgstr "oväntad symbol \"%s\" i villkorligt kommando" -#: parse.y:3914 +#: parse.y:3928 #, c-format msgid "unexpected token %d in conditional command" msgstr "oväntad symbol %d i villkorligt kommando" -#: parse.y:5181 +#: parse.y:5195 #, c-format msgid "syntax error near unexpected token `%s'" msgstr "syntaxfel när den oväntade symbolen \"%s\"" -#: parse.y:5199 +#: parse.y:5213 #, c-format msgid "syntax error near `%s'" msgstr "syntaxfel nära \"%s\"" -#: parse.y:5209 +#: parse.y:5223 msgid "syntax error: unexpected end of file" msgstr "syntaxfel: oväntat filslut" -#: parse.y:5209 +#: parse.y:5223 msgid "syntax error" msgstr "syntaxfel" -#: parse.y:5271 +#: parse.y:5285 #, c-format msgid "Use \"%s\" to leave the shell.\n" msgstr "Använd \"%s\" fär att lämna skalet.\n" -#: parse.y:5433 +#: parse.y:5447 msgid "unexpected EOF while looking for matching `)'" msgstr "oväntat filslut när matchande \")\" söktes" -#: pcomplete.c:1016 +#: pcomplete.c:1018 #, c-format msgid "completion: function `%s' not found" msgstr "komplettering: funktion \"%s\" finns inte" @@ -1341,45 +1365,45 @@ msgstr "komplettering: funktion \"%s\" finns inte" msgid "progcomp_insert: %s: NULL COMPSPEC" msgstr "progcomp_insert: %s: NULL COMPSPEC" -#: print_cmd.c:287 +#: print_cmd.c:285 #, c-format msgid "print_command: bad connector `%d'" msgstr "print_command: felaktig anslutning \"%d\"" -#: print_cmd.c:1347 +#: print_cmd.c:1348 #, c-format msgid "cprintf: `%c': invalid format character" msgstr "cprintf: \"%c\": ogiltigt formateringstecken" -#: redir.c:104 +#: redir.c:105 msgid "file descriptor out of range" msgstr "filbeskrivare utanför giltigt intervall" -#: redir.c:146 +#: redir.c:148 #, c-format msgid "%s: ambiguous redirect" msgstr "%s: tvetydig omdirigering" -#: redir.c:150 +#: redir.c:152 #, c-format msgid "%s: cannot overwrite existing file" msgstr "%s: begränsad: det går inte att skriva över en existerande fil" -#: redir.c:155 +#: redir.c:157 #, c-format msgid "%s: restricted: cannot redirect output" msgstr "%s: begränsad: det går inte att omdirigera utdata" -#: redir.c:160 +#: redir.c:162 #, c-format msgid "cannot create temp file for here-document: %s" msgstr "det går inte att skapa temporärfil för här-dokument: %s" -#: redir.c:515 +#: redir.c:517 msgid "/dev/(tcp|udp)/host/port not supported without networking" msgstr "/dev/(tcp|udp)/host/port stöds inte utan nätverksfunktion" -#: redir.c:992 +#: redir.c:1023 msgid "redirection error: cannot duplicate fd" msgstr "omdirigeringsfel: det går inte att duplicera fb" @@ -1396,16 +1420,16 @@ msgstr "/tmp måste vara ett giltigt katalognamn" msgid "%c%c: invalid option" msgstr "%c%c: ogiltig flagga" -#: shell.c:1637 +#: shell.c:1638 msgid "I have no name!" msgstr "Jag har inget namn!" -#: shell.c:1777 +#: shell.c:1778 #, c-format msgid "GNU bash, version %s-(%s)\n" msgstr "GNU bash, version %s-(%s)\n" -#: shell.c:1778 +#: shell.c:1779 #, c-format msgid "" "Usage:\t%s [GNU long option] [option] ...\n" @@ -1414,41 +1438,41 @@ msgstr "" "Användning:\t%s [GNU lång flagga] [flagga] ...\n" "\t\t%s [GNU lång flagga] [flagga] skriptfil ...\n" -#: shell.c:1780 +#: shell.c:1781 msgid "GNU long options:\n" msgstr "GNU långa flaggor:\n" -#: shell.c:1784 +#: shell.c:1785 msgid "Shell options:\n" msgstr "Skalflaggor:\n" -#: shell.c:1785 +#: shell.c:1786 msgid "\t-irsD or -c command or -O shopt_option\t\t(invocation only)\n" msgstr "\t-irsD eller -c kommando eller -O shopt_flagga\t\t(bara uppstart)\n" -#: shell.c:1800 +#: shell.c:1801 #, c-format msgid "\t-%s or -o option\n" msgstr "\t-%s eller -o flagga\n" -#: shell.c:1806 +#: shell.c:1807 #, c-format msgid "Type `%s -c \"help set\"' for more information about shell options.\n" msgstr "Skriv \"%s -c 'help set'\" för mer information om skalflaggor.\n" -#: shell.c:1807 +#: shell.c:1808 #, c-format msgid "Type `%s -c help' for more information about shell builtin commands.\n" msgstr "Skriv \"%s -c help\" för mer information om inbyggda skalkommandon.\n" -#: shell.c:1808 +#: shell.c:1809 #, c-format msgid "Use the `bashbug' command to report bugs.\n" msgstr "" "Använd kommandot \"bashbug\" för att rapportera fel.\n" "Skicka synpunkter på översättningen till .\n" -#: sig.c:576 +#: sig.c:583 #, c-format msgid "sigprocmask: %d: invalid operation" msgstr "sigprocmask: %d: ogiltig operation" @@ -1622,77 +1646,77 @@ msgstr "Okänd signal nr " msgid "Unknown Signal #%d" msgstr "Okänd signal nr %d" -#: subst.c:1177 subst.c:1298 +#: subst.c:1181 subst.c:1302 #, c-format msgid "bad substitution: no closing `%s' in %s" msgstr "felaktig substitution: ingen avslutande \"%s\" i %s" -#: subst.c:2450 +#: subst.c:2458 #, c-format msgid "%s: cannot assign list to array member" msgstr "%s: det går inte att tilldela listor till vektormedlemmar" -#: subst.c:4448 subst.c:4464 +#: subst.c:4456 subst.c:4472 msgid "cannot make pipe for process substitution" msgstr "det går inte att skapa rör för processubstitution" -#: subst.c:4496 +#: subst.c:4504 msgid "cannot make child for process substitution" msgstr "det går inte att skapa barn för processubstitution" -#: subst.c:4541 +#: subst.c:4549 #, c-format msgid "cannot open named pipe %s for reading" msgstr "det går inte att öppna namngivet rör %s för läsning" -#: subst.c:4543 +#: subst.c:4551 #, c-format msgid "cannot open named pipe %s for writing" msgstr "det går inte att öppna namngivet rör %s för skrivning" -#: subst.c:4561 +#: subst.c:4569 #, c-format msgid "cannot duplicate named pipe %s as fd %d" msgstr "det går inte att duplicera namngivet rör %s som fb %d" -#: subst.c:4757 +#: subst.c:4765 msgid "cannot make pipe for command substitution" msgstr "det går inte att skapa rör för kommandosubstitution" -#: subst.c:4791 +#: subst.c:4799 msgid "cannot make child for command substitution" msgstr "det går inte att skapa barn för kommandosubstitution" -#: subst.c:4808 +#: subst.c:4816 msgid "command_substitute: cannot duplicate pipe as fd 1" msgstr "command_substitute: det går inte att duplicera rör som fb 1" -#: subst.c:5310 +#: subst.c:5318 #, c-format msgid "%s: parameter null or not set" msgstr "%s: parametern tom eller inte satt" -#: subst.c:5600 +#: subst.c:5608 #, c-format msgid "%s: substring expression < 0" msgstr "%s: delstränguttryck < 0" -#: subst.c:6646 +#: subst.c:6660 #, c-format msgid "%s: bad substitution" msgstr "%s: felaktig substitution" -#: subst.c:6722 +#: subst.c:6740 #, c-format msgid "$%s: cannot assign in this way" msgstr "$%s: det går inte att tilldela på detta sätt" -#: subst.c:7441 +#: subst.c:7499 #, c-format msgid "bad substitution: no closing \"`\" in %s" msgstr "felaktig ersättning: ingen avslutande \"`\" i %s" -#: subst.c:8314 +#: subst.c:8375 #, c-format msgid "no match: %s" msgstr "ingen match: %s" @@ -1729,68 +1753,68 @@ msgstr "%s: binär operator förväntades" msgid "missing `]'" msgstr "\"]\" saknas" -#: trap.c:200 +#: trap.c:201 msgid "invalid signal number" msgstr "ogiltigt signalnummer" -#: trap.c:323 +#: trap.c:324 #, c-format msgid "run_pending_traps: bad value in trap_list[%d]: %p" msgstr "run_pending_traps: felaktigt värde i trap_list[%d]: %p" -#: trap.c:327 +#: trap.c:328 #, c-format msgid "run_pending_traps: signal handler is SIG_DFL, resending %d (%s) to myself" msgstr "run_pending_traps: signalhanterare är SIG_DFL, skickar om %d (%s) till mig själv" -#: trap.c:371 +#: trap.c:372 #, c-format msgid "trap_handler: bad signal %d" msgstr "trap_handler: felaktig signal %d" -#: variables.c:354 +#: variables.c:358 #, c-format msgid "error importing function definition for `%s'" msgstr "fel vid import av funktionsdefinition för \"%s\"" -#: variables.c:732 +#: variables.c:736 #, c-format msgid "shell level (%d) too high, resetting to 1" msgstr "skalnivå (%d) för hög, återställer till 1" -#: variables.c:1891 +#: variables.c:1898 msgid "make_local_variable: no function context at current scope" msgstr "make_local_variable: ingen funktionskontext i aktuellt sammanhang" -#: variables.c:3120 +#: variables.c:3127 msgid "all_local_variables: no function context at current scope" msgstr "all_local_variables: ingen funktionskontext i aktuellt sammanhang" -#: variables.c:3337 variables.c:3346 +#: variables.c:3344 variables.c:3353 #, c-format msgid "invalid character %d in exportstr for %s" msgstr "ogiltigt tecken %d i exportstr för %s" -#: variables.c:3352 +#: variables.c:3359 #, c-format msgid "no `=' in exportstr for %s" msgstr "inget \"=\" i exportstr för %s" -#: variables.c:3787 +#: variables.c:3794 msgid "pop_var_context: head of shell_variables not a function context" msgstr "pop_var_context: huvudet på shell_variables är inte en funktionskontext" -#: variables.c:3800 +#: variables.c:3807 msgid "pop_var_context: no global_variables context" msgstr "pop_var_context: ingen kontext global_variables" -#: variables.c:3874 +#: variables.c:3881 msgid "pop_scope: head of shell_variables not a temporary environment scope" msgstr "pop_scope: huvudet på shell_variables är inte en temporär omgivningsräckvidd" #: version.c:46 -msgid "Copyright (C) 2008 Free Software Foundation, Inc." -msgstr "Copyright © 2008 Free Software Foundation, Inc." +msgid "Copyright (C) 2009 Free Software Foundation, Inc." +msgstr "Copyright © 2009 Free Software Foundation, Inc." #: version.c:47 msgid "License GPLv3+: GNU GPL version 3 or later \n" @@ -2096,66 +2120,74 @@ msgid "until COMMANDS; do COMMANDS; done" msgstr "until KOMMANDON; do KOMMANDON; done" #: builtins.c:198 +msgid "coproc [NAME] command [redirections]" +msgstr "coproc [NAMN] kommando [omdirigeringar]" + +#: builtins.c:200 msgid "function name { COMMANDS ; } or name () { COMMANDS ; }" msgstr "function namn { KOMMANDON ; } or namn () { KOMMANDON ; }" -#: builtins.c:200 +#: builtins.c:202 msgid "{ COMMANDS ; }" msgstr "{ KOMMANDON ; }" -#: builtins.c:202 +#: builtins.c:204 msgid "job_spec [&]" msgstr "jobbspec [&]" -#: builtins.c:204 +#: builtins.c:206 msgid "(( expression ))" msgstr "(( uttryck ))" -#: builtins.c:206 +#: builtins.c:208 msgid "[[ expression ]]" msgstr "[[ uttryck ]]" -#: builtins.c:208 +#: builtins.c:210 msgid "variables - Names and meanings of some shell variables" msgstr "variabler - Namn och betydelse av några skalvariabler" -#: builtins.c:211 +#: builtins.c:213 msgid "pushd [-n] [+N | -N | dir]" msgstr "pushd [-n] [+N | -N | kat]" -#: builtins.c:215 +#: builtins.c:217 msgid "popd [-n] [+N | -N]" msgstr "popd [-n] [+N | -N]" -#: builtins.c:219 +#: builtins.c:221 msgid "dirs [-clpv] [+N] [-N]" msgstr "dirs [-clpv] [+N] [-N]" -#: builtins.c:222 +#: builtins.c:224 msgid "shopt [-pqsu] [-o] [optname ...]" msgstr "shopt [-pqsu] [-o] [flgnamn ...]" -#: builtins.c:224 +#: builtins.c:226 msgid "printf [-v var] format [arguments]" msgstr "printf [-v var] format [argument]" -#: builtins.c:227 +#: builtins.c:229 msgid "complete [-abcdefgjksuv] [-pr] [-o option] [-A action] [-G globpat] [-W wordlist] [-F function] [-C command] [-X filterpat] [-P prefix] [-S suffix] [name ...]" msgstr "complete [-abcdefgjksuv] [-pr] [-o flagga] [-A åtgärd] [-G globmnst] [-W ordlista] [-F funktion] [-C kommando] [-X filtermnst] [-P prefix] [-S suffix] [namn ...]" -#: builtins.c:231 +#: builtins.c:233 msgid "compgen [-abcdefgjksuv] [-o option] [-A action] [-G globpat] [-W wordlist] [-F function] [-C command] [-X filterpat] [-P prefix] [-S suffix] [word]" msgstr "compgen [-abcdefgjksuv] [-o flagga] [-A åtgärd] [-G globmnst] [-W ordlista] [-F funktion] [-C kommando] [-X filtermnst] [-P prefix] [-S suffix] [ord]" -#: builtins.c:235 +#: builtins.c:237 msgid "compopt [-o|+o option] [name ...]" msgstr "compopt [-o|+o flagga] [namn ...]" -#: builtins.c:238 +#: builtins.c:240 msgid "mapfile [-n count] [-O origin] [-s count] [-t] [-u fd] [-C callback] [-c quantum] [array]" msgstr "mapfile [-n antal] [-O start] [-s antal] [-t] [-u fb] [-C återanrop] [-c kvanta] [vektor]" -#: builtins.c:250 +#: builtins.c:242 +msgid "readarray [-n count] [-O origin] [-s count] [-t] [-u fd] [-C callback] [-c quantum] [array]" +msgstr "readarray [-n antal] [-O start] [-s antal] [-t] [-u fb] [-C återanrop] [-c kvanta] [vektor]" + +#: builtins.c:254 msgid "" "Define or display aliases.\n" " \n" @@ -2189,7 +2221,7 @@ msgstr "" " alias returnerar sant om inte ett NAMN ges för vilket inget alias har\n" " definierats." -#: builtins.c:272 +#: builtins.c:276 msgid "" "Remove each NAME from the list of defined aliases.\n" " \n" @@ -2205,7 +2237,7 @@ msgstr "" " \n" " Returnerar framgång om inte ett NAMN inte är ett existerande alias." -#: builtins.c:285 +#: builtins.c:289 msgid "" "Set Readline key bindings and variables.\n" " \n" @@ -2274,7 +2306,7 @@ msgstr "" " Slutstatus:\n" " bind returnerar 0 om inte en okänd flagga ges eller ett fel inträffar." -#: builtins.c:322 +#: builtins.c:326 msgid "" "Exit for, while, or until loops.\n" " \n" @@ -2292,7 +2324,7 @@ msgstr "" " Slutstatus:\n" " Returvärdet är 0 förutsatt att N är större eller lika med 1." -#: builtins.c:334 +#: builtins.c:338 msgid "" "Resume for, while, or until loops.\n" " \n" @@ -2310,7 +2342,7 @@ msgstr "" " Slutstatus:\n" " Slutstatus är 0 förutsatt att N är större eller lika med 1." -#: builtins.c:346 +#: builtins.c:350 msgid "" "Execute shell builtins.\n" " \n" @@ -2333,7 +2365,7 @@ msgstr "" " Returnerar slutstatus från SKALINBYGGD, eller falkst om SKALINBYGGD inte\n" " är inbyggd i skalet." -#: builtins.c:361 +#: builtins.c:365 msgid "" "Return the context of the current subroutine call.\n" " \n" @@ -2361,7 +2393,7 @@ msgstr "" " Returnerar 0 om inte skalet inte kör en skalfunktion eller UTTR är\n" " ogiltigt." -#: builtins.c:379 +#: builtins.c:383 msgid "" "Change the shell working directory.\n" " \n" @@ -2411,7 +2443,7 @@ msgstr "" " Slutstatus:\n" " Returnerar 0 om katalogen är ändrad; skilt från noll annars." -#: builtins.c:407 +#: builtins.c:411 msgid "" "Print the name of the current working directory.\n" " \n" @@ -2439,7 +2471,7 @@ msgstr "" " Returnerar 0 om inte en ogiltig flagga anges eller den aktuella katalogen\n" " inte kan läsas." -#: builtins.c:424 +#: builtins.c:428 msgid "" "Null command.\n" " \n" @@ -2455,7 +2487,7 @@ msgstr "" " Slutstatus:\n" " Lyckas alltid." -#: builtins.c:435 +#: builtins.c:439 msgid "" "Return a successful result.\n" " \n" @@ -2467,7 +2499,7 @@ msgstr "" " Slutstatus:\n" " Lyckas alltid." -#: builtins.c:444 +#: builtins.c:448 msgid "" "Return an unsuccessful result.\n" " \n" @@ -2479,7 +2511,7 @@ msgstr "" " Slutstatus:\n" " Misslyckas alltid." -#: builtins.c:453 +#: builtins.c:457 msgid "" "Execute a simple command or display information about commands.\n" " \n" @@ -2512,7 +2544,7 @@ msgstr "" " Returnerar slutstatus från KOMMANDO, eller misslyckande om KOMMANDO inte\n" " finns." -#: builtins.c:472 +#: builtins.c:476 msgid "" "Set variable values and attributes.\n" " \n" @@ -2578,7 +2610,7 @@ msgstr "" " Slutstatus:\n" " Returnerar framgång om inte en ogiltig flagga ges eller ett fel inträffar." -#: builtins.c:508 +#: builtins.c:512 msgid "" "Set variable values and attributes.\n" " \n" @@ -2588,7 +2620,7 @@ msgstr "" " \n" " Föråldrat. Se \"help declare\"." -#: builtins.c:516 +#: builtins.c:520 msgid "" "Define local variables.\n" " \n" @@ -2614,7 +2646,7 @@ msgstr "" " Returnerar framgång om inte en ogiltig flagga ges, ett fel inträffar\n" " eller skalet inte exekverar en funktion." -#: builtins.c:533 +#: builtins.c:537 msgid "" "Write arguments to the standard output.\n" " \n" @@ -2672,7 +2704,7 @@ msgstr "" " Slutstatus:\n" " Returnerar framgång om inte ett skrivfel inträffar." -#: builtins.c:567 +#: builtins.c:571 msgid "" "Write arguments to the standard output.\n" " \n" @@ -2694,7 +2726,7 @@ msgstr "" " Slutstatus:\n" " Returnerar framgång om inte ett skrivfel inträffar." -#: builtins.c:582 +#: builtins.c:586 msgid "" "Enable and disable shell builtins.\n" " \n" @@ -2748,7 +2780,7 @@ msgstr "" " Returnerar framgång om inte NAMN inte är inbyggd i skalet eller ett fel\n" " inträffar." -#: builtins.c:610 +#: builtins.c:614 msgid "" "Execute arguments as a shell command.\n" " \n" @@ -2766,7 +2798,7 @@ msgstr "" " Slutstatus:\n" " Returnerar slutstatus av kommandot eller framgång om kommandot är tomt." -#: builtins.c:622 +#: builtins.c:626 msgid "" "Parse option arguments.\n" " \n" @@ -2843,7 +2875,7 @@ msgstr "" " Returnerar framgång om en flagga hittas, misslyckas om slutet av\n" " flaggorna nås eller ett fel inträffar." -#: builtins.c:664 +#: builtins.c:668 msgid "" "Replace the shell with the given command.\n" " \n" @@ -2880,7 +2912,7 @@ msgstr "" " Returnerar framgång om inte KOMMANDO inte finns eller ett fel vid\n" " omdirigering inträffar." -#: builtins.c:685 +#: builtins.c:689 msgid "" "Exit the shell.\n" " \n" @@ -2892,7 +2924,7 @@ msgstr "" " Avslutar skalet med statusen N. Om N utelämnas är slutstatusen den\n" " hos det sist körda kommandot." -#: builtins.c:694 +#: builtins.c:698 msgid "" "Exit a login shell.\n" " \n" @@ -2904,7 +2936,7 @@ msgstr "" " Avslutar ett inloggningsskal med slutstatus N. Returnerar ett fel om\n" " det inte körs i ett inloggningsskal." -#: builtins.c:704 +#: builtins.c:708 msgid "" "Display or execute commands from the history list.\n" " \n" @@ -2955,7 +2987,7 @@ msgstr "" " Returnerar framgång eller status på exekverat kommando, skilt från noll\n" " om ett fel inträffar." -#: builtins.c:734 +#: builtins.c:738 msgid "" "Move job to the foreground.\n" " \n" @@ -2976,7 +3008,7 @@ msgstr "" " Status på kommandot som placerades i förgrunden, eller misslyckande om\n" " ett fel inträffar." -#: builtins.c:749 +#: builtins.c:753 msgid "" "Move jobs to the background.\n" " \n" @@ -2997,7 +3029,7 @@ msgstr "" " Returnerar framgång om inte jobbstyrning inte är aktiverat eller ett fel\n" " inträffar." -#: builtins.c:763 +#: builtins.c:767 msgid "" "Remember or display program locations.\n" " \n" @@ -3038,7 +3070,7 @@ msgstr "" " Slutstatus:\n" " Returnerar framgång om inte NAMN inte hittas eller en ogiltig flagga ges." -#: builtins.c:788 +#: builtins.c:792 msgid "" "Display information about builtin commands.\n" " \n" @@ -3076,7 +3108,7 @@ msgstr "" " Slutstatus:\n" " Returnerar framgång om inte MÖNSTER inte finns eller en ogiltig flagga ges." -#: builtins.c:812 +#: builtins.c:816 msgid "" "Display or manipulate the history list.\n" " \n" @@ -3137,7 +3169,7 @@ msgstr "" " Slutstatus:\n" " Returnerar framgång om inte en ogiltig flagga ges eller ett fel inträffar." -#: builtins.c:848 +#: builtins.c:852 msgid "" "Display status of jobs.\n" " \n" @@ -3180,7 +3212,7 @@ msgstr "" " Returnerar framgång om inte en ogiltig flagga ges eller ett fel inträffar.\n" " Om -x används returneras slutstatus från KOMMANDO." -#: builtins.c:875 +#: builtins.c:879 msgid "" "Remove jobs from current shell.\n" " \n" @@ -3210,7 +3242,7 @@ msgstr "" " Slutstatus:\n" " Returnerar framgång om inte en ogiltig flagga eller JOBBSPEC ges." -#: builtins.c:894 +#: builtins.c:898 msgid "" "Send a signal to a job.\n" " \n" @@ -3251,7 +3283,7 @@ msgstr "" " Returnerar framgång om inte en ogiltig flagga angivits eller ett fel\n" " inträffar." -#: builtins.c:917 +#: builtins.c:921 msgid "" "Evaluate arithmetic expressions.\n" " \n" @@ -3334,7 +3366,7 @@ msgstr "" " Slutstatus:\n" " Om det sista ARG beräknas till 0, returnerar let 1; let returnerar 0 annars." -#: builtins.c:962 +#: builtins.c:966 msgid "" "Read a line from the standard input and split it into fields.\n" " \n" @@ -3363,8 +3395,9 @@ msgid "" " -t timeout\ttime out and return failure if a complete line of input is\n" " \t\tnot read withint TIMEOUT seconds. The value of the TMOUT\n" " \t\tvariable is the default timeout. TIMEOUT may be a\n" -" \t\tfractional number. The exit status is greater than 128 if\n" -" \t\tthe timeout is exceeded\n" +" \t\tfractional number. If TIMEOUT is 0, read returns success only\n" +" \t\tif input is available on the specified file descriptor. The\n" +" \t\texit status is greater than 128 if the timeout is exceeded\n" " -u fd\t\tread from file descriptor FD instead of the standard input\n" " \n" " Exit Status:\n" @@ -3398,14 +3431,16 @@ msgstr "" " -t tidgräns\tsluta vänta och returnera misslyckande om inte en\n" " \t\tkomplett rad lästs inom TIDSGRÄNS sekunder. Värdet på variabeln\n" " \t\tTMOUT är standardvärdet på tidsgränsen. TIDSGRÄNS kan vara ett\n" -" \t\tbråktal. Slutstatus är större än 128 om tidsgränsen överskrids\n" +" \t\tbråktal. Om TIDSGRÄNS är 0 returnerar read lyckad status bara\n" +"\t\tom det finns indata tillgängligt på den angivna filbeskrivaren.\n" +" Slutstatus är större än 128 om tidsgränsen överskrids\n" " -u fb\t\tläs från filbeskrivare FB istället för standard in\n" " \n" " Slutstatus:\n" " Returkoden är noll om inte filslut nås, läsningens tidsgräns överskrids\n" " eller en ogiltig filbeskrivare ges som argument till -u." -#: builtins.c:1001 +#: builtins.c:1006 msgid "" "Return from a shell function.\n" " \n" @@ -3426,7 +3461,7 @@ msgstr "" " Returnerar N, eller misslyckande om skalet inte kör en funktion eller\n" " skript." -#: builtins.c:1014 +#: builtins.c:1019 msgid "" "Set or unset values of shell options and positional parameters.\n" " \n" @@ -3586,7 +3621,7 @@ msgstr "" " Slutstatus:\n" " Returnerar framgång om inte en ogiltig flagga ges." -#: builtins.c:1096 +#: builtins.c:1101 msgid "" "Unset values and attributes of shell variables and functions.\n" " \n" @@ -3621,7 +3656,7 @@ msgstr "" " Returnerar framgång om inte en ogiltig flagga ges eller NAMN endast är\n" " läsbart." -#: builtins.c:1116 +#: builtins.c:1121 msgid "" "Set export attribute for shell variables.\n" " \n" @@ -3653,7 +3688,7 @@ msgstr "" " Slutstatus:\n" " Returnerar framgång om inte en ogiltig flagga ges eller NAMN är ogiltigt." -#: builtins.c:1135 +#: builtins.c:1140 msgid "" "Mark shell variables as unchangeable.\n" " \n" @@ -3689,7 +3724,7 @@ msgstr "" " Slutstatus:\n" " Returnerar framgång om inte en ogiltig flagga ges eller NAMN är ogiltigt." -#: builtins.c:1156 +#: builtins.c:1161 msgid "" "Shift positional parameters.\n" " \n" @@ -3707,7 +3742,7 @@ msgstr "" " Slutstatus:\n" " Returnerar framgång om inte N är negativt eller större än $#." -#: builtins.c:1168 builtins.c:1183 +#: builtins.c:1173 builtins.c:1188 msgid "" "Execute commands from a file in the current shell.\n" " \n" @@ -3730,7 +3765,7 @@ msgstr "" " Returnerar status på det sista kommandot som körs i FILNAMN, misslyckas\n" " om FILNAMN inte kan läsas." -#: builtins.c:1199 +#: builtins.c:1204 msgid "" "Suspend shell execution.\n" " \n" @@ -3755,7 +3790,7 @@ msgstr "" " Returnerar framgång om inte jobbstyrning inte är aktiverat eller ett fel\n" " inträffar." -#: builtins.c:1215 +#: builtins.c:1220 msgid "" "Evaluate conditional expression.\n" " \n" @@ -3901,7 +3936,7 @@ msgstr "" " Returnerar framgång om UTTR beräknas till sant. Misslyckas ifall UTTR\n" " beräknas till falskt eller ett ogiltigt argument ges." -#: builtins.c:1291 +#: builtins.c:1296 msgid "" "Evaluate conditional expression.\n" " \n" @@ -3913,7 +3948,7 @@ msgstr "" " Detta är en synonym till det inbyggda \"test\", men det sista argumentet\n" " måste vara en bokstavlig \"]\", för att matcha den inledande \"[\"." -#: builtins.c:1300 +#: builtins.c:1305 msgid "" "Display process times.\n" " \n" @@ -3931,7 +3966,7 @@ msgstr "" " Slutstatus:\n" " Lyckas alltid." -#: builtins.c:1312 +#: builtins.c:1317 msgid "" "Trap signals and other events.\n" " \n" @@ -3990,7 +4025,7 @@ msgstr "" " Returnerar framgång om inte en SIGSPEC är ogiltig eller en ogiltig flagga\n" " ges." -#: builtins.c:1344 +#: builtins.c:1349 msgid "" "Display information about command type.\n" " \n" @@ -4044,7 +4079,7 @@ msgstr "" " Slutstatus:\n" " Returnerar framgång om alla NAMNen finns, misslyckas om något inte finns." -#: builtins.c:1375 +#: builtins.c:1380 msgid "" "Modify shell resource limits.\n" " \n" @@ -4126,7 +4161,7 @@ msgstr "" " Slutstatus:\n" " Returnerar framgång om inte en ogiltig flagga anges eller ett fel inträffar." -#: builtins.c:1420 +#: builtins.c:1425 msgid "" "Display or set file mode mask.\n" " \n" @@ -4160,7 +4195,7 @@ msgstr "" " Returnerar framgång om inte RÄTTIGHETER är ogiltig eller en ogiltig flagga\n" " ges." -#: builtins.c:1440 +#: builtins.c:1445 msgid "" "Wait for job completion and return exit status.\n" " \n" @@ -4186,7 +4221,7 @@ msgstr "" " Returnerar status på ID, misslyckas ifall ID är ogiltig eller en ogiltig\n" " flagga ges." -#: builtins.c:1458 +#: builtins.c:1463 msgid "" "Wait for process completion and return exit status.\n" " \n" @@ -4208,7 +4243,7 @@ msgstr "" " Returnerar status på ID, misslyckas ifall ID är ogiltig eller en ogiltig\n" " flagga ges." -#: builtins.c:1473 +#: builtins.c:1478 msgid "" "Execute commands for each member in a list.\n" " \n" @@ -4230,7 +4265,7 @@ msgstr "" " Slutstatus:\n" " Returnerar status för det sist exekverade kommandot." -#: builtins.c:1487 +#: builtins.c:1492 msgid "" "Arithmetic for loop.\n" " \n" @@ -4260,7 +4295,7 @@ msgstr "" " Slutstatus:\n" " Returnerar statusen från det sist exekverade kommandot." -#: builtins.c:1505 +#: builtins.c:1510 msgid "" "Select words from a list and execute commands.\n" " \n" @@ -4295,7 +4330,7 @@ msgstr "" " Sluttatus:\n" " Returnerar statusen från det sist exekverade kommandot." -#: builtins.c:1526 +#: builtins.c:1531 msgid "" "Report time consumed by pipeline's execution.\n" " \n" @@ -4324,7 +4359,7 @@ msgstr "" " Slutstatus:\n" " Returstatusen är returstatusen från RÖR." -#: builtins.c:1543 +#: builtins.c:1548 msgid "" "Execute commands based on pattern matching.\n" " \n" @@ -4342,7 +4377,7 @@ msgstr "" " Slutstatus:\n" " Returnerar statusen från det sist exekverade kommandot." -#: builtins.c:1555 +#: builtins.c:1560 msgid "" "Execute commands based on conditional.\n" " \n" @@ -4370,7 +4405,7 @@ msgstr "" " Slutstatus:\n" " Returnerar status från det sist exekverade kommandot." -#: builtins.c:1572 +#: builtins.c:1577 msgid "" "Execute commands as long as a test succeeds.\n" " \n" @@ -4388,7 +4423,7 @@ msgstr "" " Slutstatus:\n" " Returnerar statusen från det sist exekverade kommandot." -#: builtins.c:1584 +#: builtins.c:1589 msgid "" "Execute commands as long as a test does not succeed.\n" " \n" @@ -4406,7 +4441,29 @@ msgstr "" " Slutstatus:\n" " Returnerar statusen från det sist exekverade kommandot." -#: builtins.c:1596 +#: builtins.c:1601 +msgid "" +"Create a coprocess named NAME.\n" +" \n" +" Execute COMMAND asynchronously, with the standard output and standard\n" +" input of the command connected via a pipe to file descriptors assigned\n" +" to indices 0 and 1 of an array variable NAME in the executing shell.\n" +" The default NAME is \"COPROC\".\n" +" \n" +" Exit Status:\n" +" Returns the exit status of COMMAND." +msgstr "" +"Skapa en koprocess med namnet NAMN.\n" +" \n" +" Kör KOMMANDO asynkront, med standard ut och standard in för kommandot\n" +" ansluta via ett rör till fildeskriptorer tilldelade indexen 0 och 1 i\n" +" en vektorvariabel NAMN i skalet som kör. Standardvärde på NAMN är\n" +" \"COPROC\".\n" +" \n" +" Slutstatus:\n" +" Returnerar statusen från KOMMANDO." + +#: builtins.c:1615 msgid "" "Define shell function.\n" " \n" @@ -4428,7 +4485,7 @@ msgstr "" " Slutstatus:\n" " Returnerar framgång om inte NAMN endast är läsbart." -#: builtins.c:1610 +#: builtins.c:1629 msgid "" "Group commands as a unit.\n" " \n" @@ -4446,7 +4503,7 @@ msgstr "" " Slutstatus:\n" " Returnerar stutusen från det sist exekverade kommandot." -#: builtins.c:1622 +#: builtins.c:1641 msgid "" "Resume job in foreground.\n" " \n" @@ -4470,7 +4527,7 @@ msgstr "" " Slutstatus:\n" " Returnerar statusen på det återupptagna jobbet." -#: builtins.c:1637 +#: builtins.c:1656 msgid "" "Evaluate arithmetic expression.\n" " \n" @@ -4488,7 +4545,7 @@ msgstr "" " Slutstatus:\n" " Returnerar 1 om UTTRYCK beräknas till 0, returnerar 0 annars." -#: builtins.c:1649 +#: builtins.c:1668 msgid "" "Execute conditional command.\n" " \n" @@ -4535,7 +4592,7 @@ msgstr "" " Slutstatus:\n" " 0 eller 1 beroende på värdet av UTTRYCK." -#: builtins.c:1675 +#: builtins.c:1694 msgid "" "Common shell variable names and usage.\n" " \n" @@ -4640,7 +4697,7 @@ msgstr "" " HISTIGNORE\tEn kolonseparerad lista av mönster som används för att\n" " \t\tbestämma vilka kommandon som skall sparas i historielistan.\n" -#: builtins.c:1732 +#: builtins.c:1751 msgid "" "Add directories to stack.\n" " \n" @@ -4698,7 +4755,7 @@ msgstr "" " Returnerar framgång om inte ett ogiltigt argument ges eller bytet av\n" " katalog misslyckas." -#: builtins.c:1766 +#: builtins.c:1785 msgid "" "Remove directories from stack.\n" " \n" @@ -4748,7 +4805,7 @@ msgstr "" " Returnerar framgång om inte ett ogiltigt argument ges eller bytet av\n" " katalog misslyckas." -#: builtins.c:1796 +#: builtins.c:1815 msgid "" "Display directory stack.\n" " \n" @@ -4798,7 +4855,7 @@ msgstr "" " Slutstatus:\n" " Returnerar framgång om inte en ogiltig flagga ges eller ett fel inträffar." -#: builtins.c:1825 +#: builtins.c:1844 msgid "" "Set and unset shell options.\n" " \n" @@ -4833,7 +4890,7 @@ msgstr "" " Returnerar framgång om FLGNAMN är aktiverat, misslyckas om en ogiltig\n" " flagga ges eller FLGNAMN är avaktiverat." -#: builtins.c:1846 +#: builtins.c:1865 msgid "" "Formats and prints ARGUMENTS under control of the FORMAT.\n" " \n" @@ -4880,7 +4937,7 @@ msgstr "" " Returnerar framgång om inte en ogiltig flagga ges eller ett skriv-\n" " eller tilldelningsfel inträffar." -#: builtins.c:1873 +#: builtins.c:1892 msgid "" "Specify how arguments are to be completed by Readline.\n" " \n" @@ -4917,7 +4974,7 @@ msgstr "" " Slutstatus:\n" " Returnerar framgång om inte en ogiltig flagga ges eller ett fel inträffar." -#: builtins.c:1896 +#: builtins.c:1915 msgid "" "Display possible completions depending on the options.\n" " \n" @@ -4937,7 +4994,7 @@ msgstr "" " Slutstatus:\n" " Returnerar framgång om inte en ogiltig flagga ges eller ett fel inträffar." -#: builtins.c:1911 +#: builtins.c:1930 msgid "" "Modify or display completion options.\n" " \n" @@ -4986,9 +5043,9 @@ msgstr "" " Returnerar framgång om inte en ogiltig flagga ges eller NAMN inte har\n" " någon kompletteringsspecifikaation definierad." -#: builtins.c:1939 +#: builtins.c:1958 msgid "" -"Read lines from a file into an array variable.\n" +"Read lines from the standard input into an array variable.\n" " \n" " Read lines from the standard input into the array variable ARRAY, or from\n" " file descriptor FD if the -u option is supplied. The variable MAPFILE is\n" @@ -5006,15 +5063,17 @@ msgid "" " Arguments:\n" " ARRAY\t\tArray variable name to use for file data.\n" " \n" -" If -C is supplied without -c, the default quantum is 5000.\n" +" If -C is supplied without -c, the default quantum is 5000. When\n" +" CALLBACK is evaluated, it is supplied the index of the next array\n" +" element to be assigned as an additional argument.\n" " \n" " If not supplied with an explicit origin, mapfile will clear ARRAY before\n" " assigning to it.\n" " \n" " Exit Status:\n" -" Returns success unless an invald option is given or ARRAY is readonly." +" Returns success unless an invalid option is given or ARRAY is readonly." msgstr "" -"Läs rader fån en fil till en vektorvariabel.\n" +"Läs rader från standard in till en vektorvariabel.\n" " \n" " Läs rader från standard in till vektorvariabeln VEKTOR, eller från\n" " filbeskrivaren FB om flaggan -u ges. Variabeln MAPFILE är standard\n" @@ -5033,7 +5092,8 @@ msgstr "" " Argument:\n" " VEKTOR\t\tNamn på vektorvariabel att använda för fildata.\n" " \n" -" Om -C ges utan -c är standardkvanta 5000.\n" +" Om -C ges utan -c är standardkvanta 5000. När ÅTERANROP evalueras får\n" +" den indexet på nästa vektorelement som ett extra argument.\n" " \n" " Om det inte ges någon specificerad start kommer mapfile nollställa VEKTOR\n" " före tilldelning till den.\n" @@ -5041,3 +5101,13 @@ msgstr "" " Slutstatus:\n" " Returnerar framgång om inte en ogiltig flagga ges eller VEKTOR är\n" " oföränderlig." + +#: builtins.c:1990 +msgid "" +"Read lines from a file into an array variable.\n" +" \n" +" A synonym for `mapfile'." +msgstr "" +"Läs rader från en fil till en vektorvariabel.\n" +" \n" +" En synonym till \"mapfile\"." diff --git a/subst.c b/subst.c index 13eda5fbd..d67e39f96 100644 --- a/subst.c +++ b/subst.c @@ -6027,7 +6027,13 @@ pat_subst (string, pat, rep, mflags) break; if (s == e) - e++, str++; /* avoid infinite recursion on zero-length match */ + { + /* On a zero-length match, make sure we copy one character, since + we increment one character to avoid infinite recursion. */ + RESIZE_MALLOCED_BUFFER (ret, rptr, 1, rsize, 64); + ret[rptr++] = *str++; + e++; /* avoid infinite recursion on zero-length match */ + } } /* Now copy the unmatched portion of the input string */ diff --git a/subst.c.save b/subst.c.save index 2f19988d5..74bd05ab2 100644 --- a/subst.c.save +++ b/subst.c.save @@ -2058,7 +2058,7 @@ string_list_dollar_at (list, quoted) #if 0 tlist = ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) || (ifs && *ifs == 0)) #else - tlist = (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) + tlist = (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES|Q_PATQUOTE)) #endif ? quote_list (list) : list_quote_escapes (list); @@ -4313,6 +4313,12 @@ expand_word_unsplit (word, quoted) WORD_LIST *result; expand_no_split_dollar_star = 1; +#if defined (HANDLE_MULTIBYTE) + if (ifs_firstc[0] == 0) +#else + if (ifs_firstc == 0) +#endif + word->flags |= W_NOSPLIT; result = call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL); expand_no_split_dollar_star = 0; @@ -4320,13 +4326,26 @@ expand_word_unsplit (word, quoted) } /* Perform shell expansions on WORD, but do not perform word splitting or - quote removal on the result. */ + quote removal on the result. Virtually identical to expand_word_unsplit; + could be combined if implementations don't diverge. */ WORD_LIST * expand_word_leave_quoted (word, quoted) WORD_DESC *word; int quoted; { - return (call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL)); + WORD_LIST *result; + + expand_no_split_dollar_star = 1; +#if defined (HANDLE_MULTIBYTE) + if (ifs_firstc[0] == 0) +#else + if (ifs_firstc == 0) +#endif + word->flags |= W_NOSPLIT; + result = call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL); + expand_no_split_dollar_star = 0; + + return result; } #if defined (PROCESS_SUBSTITUTION) @@ -6008,7 +6027,14 @@ pat_subst (string, pat, rep, mflags) break; if (s == e) - e++, str++; /* avoid infinite recursion on zero-length match */ + { + /* On a zero-length match, make sure we copy one character, since + we increment one character below to avoid infinite recursion. */ + RESIZE_MALLOCED_BUFFER (ret, rptr, 1, rsize, 64); + strncpy (ret + rptr, str, 1); + rptr += 1; + e++, str++; /* avoid infinite recursion on zero-length match */ + } } /* Now copy the unmatched portion of the input string */ @@ -7005,14 +7031,14 @@ param_expand (string, sindex, quoted, expanded_something, even if it's quoted. */ if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) && list == 0) temp = (char *)NULL; - else if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) + else if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES|Q_PATQUOTE)) { /* If we have "$*" we want to make a string of the positional parameters, separated by the first character of $IFS, and quote the whole string, including the separators. If IFS is unset, the parameters are separated by ' '; if $IFS is null, the parameters are concatenated. */ - temp = (quoted & Q_DOUBLE_QUOTES) ? string_list_dollar_star (list) : string_list (list); + temp = (quoted & (Q_DOUBLE_QUOTES|Q_PATQUOTE)) ? string_list_dollar_star (list) : string_list (list); temp1 = quote_string (temp); if (*temp == 0) tflag |= W_HASQUOTEDNULL; @@ -7067,6 +7093,7 @@ param_expand (string, sindex, quoted, expanded_something, string might need it (consider "\"$@\""), but we need some way to signal that the final split on the first character of $IFS should be done, even though QUOTED is 1. */ + /* XXX - should this test include Q_PATQUOTE? */ if (quoted_dollar_at_p && (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))) *quoted_dollar_at_p = 1; if (contains_dollar_at) diff --git a/subst.c~ b/subst.c~ index 7dd48fcc3..74bd05ab2 100644 --- a/subst.c~ +++ b/subst.c~ @@ -4313,7 +4313,12 @@ expand_word_unsplit (word, quoted) WORD_LIST *result; expand_no_split_dollar_star = 1; - word->flags |= W_NOSPLIT; +#if defined (HANDLE_MULTIBYTE) + if (ifs_firstc[0] == 0) +#else + if (ifs_firstc == 0) +#endif + word->flags |= W_NOSPLIT; result = call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL); expand_no_split_dollar_star = 0; @@ -4331,7 +4336,12 @@ expand_word_leave_quoted (word, quoted) WORD_LIST *result; expand_no_split_dollar_star = 1; - word->flags |= W_NOSPLIT; +#if defined (HANDLE_MULTIBYTE) + if (ifs_firstc[0] == 0) +#else + if (ifs_firstc == 0) +#endif + word->flags |= W_NOSPLIT; result = call_expand_word_internal (word, quoted, 0, (int *)NULL, (int *)NULL); expand_no_split_dollar_star = 0; @@ -6017,7 +6027,14 @@ pat_subst (string, pat, rep, mflags) break; if (s == e) - e++, str++; /* avoid infinite recursion on zero-length match */ + { + /* On a zero-length match, make sure we copy one character, since + we increment one character below to avoid infinite recursion. */ + RESIZE_MALLOCED_BUFFER (ret, rptr, 1, rsize, 64); + strncpy (ret + rptr, str, 1); + rptr += 1; + e++, str++; /* avoid infinite recursion on zero-length match */ + } } /* Now copy the unmatched portion of the input string */ diff --git a/tests/run-trap b/tests/run-trap index b44844356..14f687403 100644 --- a/tests/run-trap +++ b/tests/run-trap @@ -1,6 +1,6 @@ -echo "warning: UNIX versions number signals differently. If output differing" >&2 -echo "warning: only in line numbers is produced, please do not consider this" >&2 -echo "warning: a test failure." >&2 +echo "warning: UNIX versions number signals and schedule processes differently." >&2 +echo "warning: If output differing only in line numbers is produced, please" >&2 +echo "warning: do not consider this a test failure." >&2 ${THIS_SH} ./trap.tests > /tmp/xx 2>&1 diff /tmp/xx trap.right && rm -f /tmp/xx diff --git a/tests/run-trap~ b/tests/run-trap~ new file mode 100644 index 000000000..b44844356 --- /dev/null +++ b/tests/run-trap~ @@ -0,0 +1,6 @@ +echo "warning: UNIX versions number signals differently. If output differing" >&2 +echo "warning: only in line numbers is produced, please do not consider this" >&2 +echo "warning: a test failure." >&2 + +${THIS_SH} ./trap.tests > /tmp/xx 2>&1 +diff /tmp/xx trap.right && rm -f /tmp/xx